linux-next: build failure after merge of the arm-perf tree

linux-next: build failure after merge of the arm-perf tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 658 bytes --]

Hi all,

After merging the arm-perf tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/perf/arm_cspmu/ampere_cspmu.c: In function 'ampere_cspmu_set_ev_filter':
drivers/perf/arm_cspmu/ampere_cspmu.c:164:9: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
  164 |         writel(threshold, cspmu->base0 + PMAUXR0);
      |         ^~~~~~
cc1: all warnings being treated as errors

Caused by commit

  290a9c0e55f8 ("perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU")

I have used the arm-perf tree from next-20231009 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the arm-perf tree

[Ilkka Koskinen]

Hi Stephen,

On Mon, 9 Oct 2023, Stephen Rothwell wrote:
> Hi all,
>
> After merging the arm-perf tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/perf/arm_cspmu/ampere_cspmu.c: In function 'ampere_cspmu_set_ev_filter':
> drivers/perf/arm_cspmu/ampere_cspmu.c:164:9: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
>  164 |         writel(threshold, cspmu->base0 + PMAUXR0);
>      |         ^~~~~~
> cc1: all warnings being treated as errors
>
> Caused by commit
>
>  290a9c0e55f8 ("perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU")
>
> I have used the arm-perf tree from next-20231009 for today.

Thanks for catching the bug! It doesn't seem to happen on arm64 build but 
I can reproduce it on x86_64 build indeed.


Will, it seems that "#include <linux/io.h>" is missing from 
ampere_cspmu.c. After that also x86_64 build goes through. How would you 
like to get the bug fixed? Shall I submit a new version of the patch, and 
you would replace the old patch with the new one or is it better to
create a completely new patch that only adds the missing include line?

Cheers, Ilkka

Re: linux-next: build failure after merge of the arm-perf tree

[Will Deacon]

On Mon, Oct 09, 2023 at 10:45:18PM -0700, Ilkka Koskinen wrote:
> 
> Hi Stephen,
> 
> On Mon, 9 Oct 2023, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the arm-perf tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/perf/arm_cspmu/ampere_cspmu.c: In function 'ampere_cspmu_set_ev_filter':
> > drivers/perf/arm_cspmu/ampere_cspmu.c:164:9: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
> >  164 |         writel(threshold, cspmu->base0 + PMAUXR0);
> >      |         ^~~~~~
> > cc1: all warnings being treated as errors
> > 
> > Caused by commit
> > 
> >  290a9c0e55f8 ("perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU")
> > 
> > I have used the arm-perf tree from next-20231009 for today.
> 
> Thanks for catching the bug! It doesn't seem to happen on arm64 build but I
> can reproduce it on x86_64 build indeed.
> 
> 
> Will, it seems that "#include <linux/io.h>" is missing from ampere_cspmu.c.
> After that also x86_64 build goes through. How would you like to get the bug
> fixed? Shall I submit a new version of the patch, and you would replace the
> old patch with the new one or is it better to
> create a completely new patch that only adds the missing include line?

If it's just a missing include, I can chuck a patch on top to fix it myself.
I'll double-check it resolves the problem and then update the branch.

Thanks!

Will

Re: linux-next: build failure after merge of the arm-perf tree

[Will Deacon]

On Tue, Oct 10, 2023 at 06:50:13PM +0100, Will Deacon wrote:
> On Mon, Oct 09, 2023 at 10:45:18PM -0700, Ilkka Koskinen wrote:
> > On Mon, 9 Oct 2023, Stephen Rothwell wrote:
> > > After merging the arm-perf tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > drivers/perf/arm_cspmu/ampere_cspmu.c: In function 'ampere_cspmu_set_ev_filter':
> > > drivers/perf/arm_cspmu/ampere_cspmu.c:164:9: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
> > >  164 |         writel(threshold, cspmu->base0 + PMAUXR0);
> > >      |         ^~~~~~
> > > cc1: all warnings being treated as errors
> > > 
> > > Caused by commit
> > > 
> > >  290a9c0e55f8 ("perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU")
> > > 
> > > I have used the arm-perf tree from next-20231009 for today.
> > 
> > Thanks for catching the bug! It doesn't seem to happen on arm64 build but I
> > can reproduce it on x86_64 build indeed.
> > 
> > 
> > Will, it seems that "#include <linux/io.h>" is missing from ampere_cspmu.c.
> > After that also x86_64 build goes through. How would you like to get the bug
> > fixed? Shall I submit a new version of the patch, and you would replace the
> > old patch with the new one or is it better to
> > create a completely new patch that only adds the missing include line?
> 
> If it's just a missing include, I can chuck a patch on top to fix it myself.
> I'll double-check it resolves the problem and then update the branch.

In the end I just fixed up your commit, as it was still on the HEAD of the
branch. Update now pushed out!

Cheers,

Will

Re: linux-next: build failure after merge of the arm-perf tree

[Ilkka Koskinen]

On Tue, 10 Oct 2023, Will Deacon wrote:
> On Tue, Oct 10, 2023 at 06:50:13PM +0100, Will Deacon wrote:
>> On Mon, Oct 09, 2023 at 10:45:18PM -0700, Ilkka Koskinen wrote:
>>> On Mon, 9 Oct 2023, Stephen Rothwell wrote:
>>>> After merging the arm-perf tree, today's linux-next build (x86_64
>>>> allmodconfig) failed like this:
>>>>
>>>> drivers/perf/arm_cspmu/ampere_cspmu.c: In function 'ampere_cspmu_set_ev_filter':
>>>> drivers/perf/arm_cspmu/ampere_cspmu.c:164:9: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
>>>>  164 |         writel(threshold, cspmu->base0 + PMAUXR0);
>>>>      |         ^~~~~~
>>>> cc1: all warnings being treated as errors
>>>>
>>>> Caused by commit
>>>>
>>>>  290a9c0e55f8 ("perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU")
>>>>
>>>> I have used the arm-perf tree from next-20231009 for today.
>>>
>>> Thanks for catching the bug! It doesn't seem to happen on arm64 build but I
>>> can reproduce it on x86_64 build indeed.
>>>
>>>
>>> Will, it seems that "#include <linux/io.h>" is missing from ampere_cspmu.c.
>>> After that also x86_64 build goes through. How would you like to get the bug
>>> fixed? Shall I submit a new version of the patch, and you would replace the
>>> old patch with the new one or is it better to
>>> create a completely new patch that only adds the missing include line?
>>
>> If it's just a missing include, I can chuck a patch on top to fix it myself.
>> I'll double-check it resolves the problem and then update the branch.
>
> In the end I just fixed up your commit, as it was still on the HEAD of the
> branch. Update now pushed out!
>
> Cheers,
>
> Will

Sounds perfect! Thank you Will, much appreciated!

Cheers, Ilkka

Re: linux-next: build failure after merge of the arm-perf tree

[Will Deacon]

On Wed, Dec 13, 2023 at 10:15:25AM +0000, James Clark wrote:
> On 13/12/2023 09:30, Will Deacon wrote:
> > On Wed, Dec 13, 2023 at 10:09:31AM +1100, Stephen Rothwell wrote:
> >> After merging the arm-perf tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> In file included from drivers/perf/arm_dmc620_pmu.c:26:
> >> include/linux/perf/arm_pmu.h:15:10: fatal error: asm/cputype.h: No such file or directory
> >>    15 | #include <asm/cputype.h>
> >>       |          ^~~~~~~~~~~~~~~
> > 
> > Damn, I tested with allnoconfig, defconfig and allmodconfig before I pushed,
> > but only for ARCH=arm64. Thanks for reporting this.
> > 
> >> I can't easily tell what caused this - possibly commit
> >>
> >>   a5f4ca68f348 ("perf/arm_dmc620: Remove duplicate format attribute #defines")
> >>
> >> I have used the arm-perf and arm64 trees from next-20231212 for today
> >> (since the arm64 tree merged the arm-perf tree).
> > 
> > That looks likely. I'll try reverting it and see if it resolves the problem
> > locally.
> > 
> 
> Oops sorry about that, I didn't expect that change to break the x86
> build so I didn't test it there, but it's because of CONFIG_COMPILE_TEST.

No problem, these things happen!

> a5f4ca68f348 is the offending commit, and reverting it would fix it (it
> was just a tidyup). But this change below also works. That include was
> to build ARM_PMU_PROBE which is only used in perf_event_v6.c (and v7)
> which both already include asm/cputype.h. Although maybe that would be a
> bit of a hack.
> 
> diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h
> index 337f01674b38..a4876b1c481a 100644
> --- a/include/linux/perf/arm_pmu.h
> +++ b/include/linux/perf/arm_pmu.h
> @@ -12,7 +12,6 @@
>  #include <linux/perf_event.h>
>  #include <linux/platform_device.h>
>  #include <linux/sysfs.h>
> -#include <asm/cputype.h>
> 
>  #ifdef CONFIG_ARM_PMU

I agree that this feels like a bit of a bodge, so I'll revert for now and
maybe we can revisit things later.

Cheers,

Will

Re: linux-next: build failure after merge of the arm-perf tree

[James Clark]

On 13/12/2023 09:30, Will Deacon wrote:
> Hi Stephen, [+James]
> 
> On Wed, Dec 13, 2023 at 10:09:31AM +1100, Stephen Rothwell wrote:
>> After merging the arm-perf tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> In file included from drivers/perf/arm_dmc620_pmu.c:26:
>> include/linux/perf/arm_pmu.h:15:10: fatal error: asm/cputype.h: No such file or directory
>>    15 | #include <asm/cputype.h>
>>       |          ^~~~~~~~~~~~~~~
> 
> Damn, I tested with allnoconfig, defconfig and allmodconfig before I pushed,
> but only for ARCH=arm64. Thanks for reporting this.
> 
>> I can't easily tell what caused this - possibly commit
>>
>>   a5f4ca68f348 ("perf/arm_dmc620: Remove duplicate format attribute #defines")
>>
>> I have used the arm-perf and arm64 trees from next-20231212 for today
>> (since the arm64 tree merged the arm-perf tree).
> 
> That looks likely. I'll try reverting it and see if it resolves the problem
> locally.
> 
> Cheers,
> 
> Will


Oops sorry about that, I didn't expect that change to break the x86
build so I didn't test it there, but it's because of CONFIG_COMPILE_TEST.

a5f4ca68f348 is the offending commit, and reverting it would fix it (it
was just a tidyup). But this change below also works. That include was
to build ARM_PMU_PROBE which is only used in perf_event_v6.c (and v7)
which both already include asm/cputype.h. Although maybe that would be a
bit of a hack.

diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h
index 337f01674b38..a4876b1c481a 100644
--- a/include/linux/perf/arm_pmu.h
+++ b/include/linux/perf/arm_pmu.h
@@ -12,7 +12,6 @@
 #include <linux/perf_event.h>
 #include <linux/platform_device.h>
 #include <linux/sysfs.h>
-#include <asm/cputype.h>

 #ifdef CONFIG_ARM_PMU

Re: linux-next: build failure after merge of the arm-perf tree

[Will Deacon]

Hi Stephen, [+James]

On Wed, Dec 13, 2023 at 10:09:31AM +1100, Stephen Rothwell wrote:
> After merging the arm-perf tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/perf/arm_dmc620_pmu.c:26:
> include/linux/perf/arm_pmu.h:15:10: fatal error: asm/cputype.h: No such file or directory
>    15 | #include <asm/cputype.h>
>       |          ^~~~~~~~~~~~~~~

Damn, I tested with allnoconfig, defconfig and allmodconfig before I pushed,
but only for ARCH=arm64. Thanks for reporting this.

> I can't easily tell what caused this - possibly commit
> 
>   a5f4ca68f348 ("perf/arm_dmc620: Remove duplicate format attribute #defines")
> 
> I have used the arm-perf and arm64 trees from next-20231212 for today
> (since the arm64 tree merged the arm-perf tree).

That looks likely. I'll try reverting it and see if it resolves the problem
locally.

Cheers,

Will

linux-next: build failure after merge of the arm-perf tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

Hi all,

After merging the arm-perf tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/perf/arm_dmc620_pmu.c:26:
include/linux/perf/arm_pmu.h:15:10: fatal error: asm/cputype.h: No such file or directory
   15 | #include <asm/cputype.h>
      |          ^~~~~~~~~~~~~~~

I can't easily tell what caused this - possibly commit

  a5f4ca68f348 ("perf/arm_dmc620: Remove duplicate format attribute #defines")

I have used the arm-perf and arm64 trees from next-20231212 for today
(since the arm64 tree merged the arm-perf tree).

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]