Re: [PATCH v2] perf test amd: Fix build failure with amd-ibs-via-core-pmu.c

[Stephen Rothwell]

Hi all,

On Tue, 6 Jun 2023 14:24:36 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> On Mon, 5 Jun 2023 11:27:57 -0300 Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> wrote:
> >
> > How are things like this resolved in linux-next?  
> 
> Well, if it produces a conflict (or a build failure due to a semantic
> conflict) I will fix it up (maybe using a separate patch such as this)
> and report it so that the maintainers know that they need to let Linus
> know about this when he merges their trees.
> 
> But since neither of those things has happened (it seems that an
> allmodconfig build does not build the tests), I can still take this
> patch and use it to fix up the tip tree merge (since that happens after
> the perf tree merge) starting tomorrow and report it as above.  I will
> then keep applying this patch to the merge until it is no longer needed.
> 
> Please send me the actual patch. (I am assuming that the patch applies
> on top of a recent linux-next release?)

I fetched the patch from lore and have applied it to the tip tree merge
from today.  So the tip and perf folks need to remember to tell Linus
about this fix up patch when they send their pull requests during the
merge window.  I have included the patch here just to be sure.

From:   Ravi Bangoria <ravi.bangoria@xxxxxxx>
To:     <irogers@xxxxxxxxxx>, <acme@xxxxxxxxxx>, <sfr@xxxxxxxxxxxxxxxx>
CC:     <ravi.bangoria@xxxxxxx>, <suzuki.poulose@xxxxxxx>,
        <mike.leach@xxxxxxxxxx>, <leo.yan@xxxxxxxxxx>,
        <john.g.garry@xxxxxxxxxx>, <will@xxxxxxxxxx>,
        <james.clark@xxxxxxx>, <peterz@xxxxxxxxxxxxx>, <mingo@xxxxxxxxxx>,
        <mark.rutland@xxxxxxx>, <alexander.shishkin@xxxxxxxxxxxxxxx>,
        <jolsa@xxxxxxxxxx>, <namhyung@xxxxxxxxxx>,
        <adrian.hunter@xxxxxxxxx>, <kjain@xxxxxxxxxxxxx>,
        <renyu.zj@xxxxxxxxxxxxxxxxx>, <kan.liang@xxxxxxxxxxxxxxx>,
        <zhengjun.xing@xxxxxxxxxxxxxxx>, <maddy@xxxxxxxxxxxxx>,
        <atrajeev@xxxxxxxxxxxxxxxxxx>, <wangming01@xxxxxxxxxxx>,
        <chenhuacai@xxxxxxxxxx>, <sandipan.das@xxxxxxx>,
        <9erthalion6@xxxxxxxxx>, <seanjc@xxxxxxxxxx>, <robh@xxxxxxxxxx>,
        <tmricht@xxxxxxxxxxxxx>, <tegongkang@xxxxxxxxx>,
        <linux-kernel@xxxxxxxxxxxxxxx>, <coresight@xxxxxxxxxxxxxxxx>,
        <linux-arm-kernel@xxxxxxxxxxxxxxxxxxx>,
        <linux-perf-users@xxxxxxxxxxxxxxx>
Subject: [PATCH v2] perf test amd: Fix build failure with amd-ibs-via-core-pmu.c
Date:   Sat, 3 Jun 2023 10:16:50 +0530
Message-ID: <20230603044650.286-1-ravi.bangoria@xxxxxxx>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit

Since amd-ibs-via-core-pmu.c was applied via Peter's tree, some of
the changes came via Arnaldo's tree did not reflect in this file,
which is causing build failures.

  arch/x86/tests/amd-ibs-via-core-pmu.c:47:25: error: ‘pmus’ undeclared
  (first use in this function)
     47 |         if (list_empty(&pmus))
        |                         ^~~~
  arch/x86/tests/amd-ibs-via-core-pmu.c:48:17: error: implicit declaration
  of function ‘perf_pmu__scan’; did you mean
  perf_pmus__scan’? [-Werror=implicit-function-declaration]
     48 |                 perf_pmu__scan(NULL);
        |                 ^~~~~~~~~~~~~~
        |                 perf_pmus__scan
  arch/x86/tests/amd-ibs-via-core-pmu.c:50:19: error: implicit declaration
  of function ‘perf_pmu__find’; did you mean
  perf_pmus__find’? [-Werror=implicit-function-declaration]
     50 |         ibs_pmu = perf_pmu__find("ibs_op");
        |                   ^~~~~~~~~~~~~~
        |                   perf_pmus__find

Fix those.

Fixes: 1eaf496ed386 ("perf pmu: Separate pmu and pmus")
Signed-off-by: Ravi Bangoria <ravi.bangoria@xxxxxxx>
---
v1->v2:
  - Remove unnecessary perf_pmus__scan(NULL) as suggested by Ian.

 tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c b/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c
index 2902798ca5c1..78b1902f6f59 100644
--- a/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c
+++ b/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c
@@ -44,10 +44,7 @@ int test__amd_ibs_via_core_pmu(struct test_suite *test __maybe_unused,
 	int ret = TEST_OK;
 	int fd, i;
 
-	if (list_empty(&pmus))
-		perf_pmu__scan(NULL);
-
-	ibs_pmu = perf_pmu__find("ibs_op");
+	ibs_pmu = perf_pmus__find("ibs_op");
 	if (!ibs_pmu)
 		return TEST_SKIP;
 
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgpPwI_N6hOaR.pgp
Description: OpenPGP digital signature