* linux-next: build failure after merge of the arm-perf tree
@ 2023-12-12 23:09 Stephen Rothwell
2023-12-13 9:30 ` Will Deacon
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2023-12-12 23:09 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the arm-perf tree
2023-12-12 23:09 linux-next: build failure after merge of the arm-perf tree Stephen Rothwell
@ 2023-12-13 9:30 ` Will Deacon
2023-12-13 10:15 ` James Clark
0 siblings, 1 reply; 12+ messages in thread
From: Will Deacon @ 2023-12-13 9:30 UTC (permalink / raw)
To: Stephen Rothwell, james.clark
Cc: Catalin Marinas, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the arm-perf tree
2023-12-13 9:30 ` Will Deacon
@ 2023-12-13 10:15 ` James Clark
2023-12-13 10:56 ` Will Deacon
0 siblings, 1 reply; 12+ messages in thread
From: James Clark @ 2023-12-13 10:15 UTC (permalink / raw)
To: Will Deacon, Stephen Rothwell
Cc: Catalin Marinas, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the arm-perf tree
2023-12-13 10:15 ` James Clark
@ 2023-12-13 10:56 ` Will Deacon
0 siblings, 0 replies; 12+ messages in thread
From: Will Deacon @ 2023-12-13 10:56 UTC (permalink / raw)
To: James Clark
Cc: Stephen Rothwell, Catalin Marinas, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: build failure after merge of the arm-perf tree
@ 2025-03-17 0:21 Stephen Rothwell
2025-03-17 15:13 ` Will Deacon
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2025-03-17 0:21 UTC (permalink / raw)
To: Will Deacon
Cc: Robin Murphy, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
Hi all,
After merging the arm-perf tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/perf/arm_cspmu/nvidia_cspmu.c: In function 'nv_cspmu_set_ev_filter':
drivers/perf/arm_cspmu/nvidia_cspmu.c:192:9: error: implicit declaration of function 'writel' [-Wimplicit-function-declaration]
192 | writel(filter, cspmu->base0 + offset);
| ^~~~~~
Caused by commit
6de0298a3925 ("perf/arm_cspmu: Generalise event filtering")
I have used the arm-perf tree from next-20250314 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the arm-perf tree
2025-03-17 0:21 Stephen Rothwell
@ 2025-03-17 15:13 ` Will Deacon
2025-03-17 21:23 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Will Deacon @ 2025-03-17 15:13 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Robin Murphy, Linux Kernel Mailing List, Linux Next Mailing List
On Mon, Mar 17, 2025 at 11:21:46AM +1100, 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/nvidia_cspmu.c: In function 'nv_cspmu_set_ev_filter':
> drivers/perf/arm_cspmu/nvidia_cspmu.c:192:9: error: implicit declaration of function 'writel' [-Wimplicit-function-declaration]
> 192 | writel(filter, cspmu->base0 + offset);
> | ^~~~~~
>
> Caused by commit
>
> 6de0298a3925 ("perf/arm_cspmu: Generalise event filtering")
>
> I have used the arm-perf tree from next-20250314 for today.
Thanks, Stephen. Robin's fixed this now, so you should be able to use
the latest arm-perf tree again.
Will
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the arm-perf tree
2025-03-17 15:13 ` Will Deacon
@ 2025-03-17 21:23 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2025-03-17 21:23 UTC (permalink / raw)
To: Will Deacon
Cc: Robin Murphy, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
Hi Will,
On Mon, 17 Mar 2025 15:13:07 +0000 Will Deacon <will@kernel•org> wrote:
>
> Thanks, Stephen. Robin's fixed this now, so you should be able to use
> the latest arm-perf tree again.
Excellent, thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: build failure after merge of the arm-perf tree
@ 2023-10-09 22:56 Stephen Rothwell
2023-10-10 5:45 ` Ilkka Koskinen
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2023-10-09 22:56 UTC (permalink / raw)
To: Will Deacon
Cc: Ilkka Koskinen, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the arm-perf tree
2023-10-09 22:56 Stephen Rothwell
@ 2023-10-10 5:45 ` Ilkka Koskinen
2023-10-10 17:50 ` Will Deacon
0 siblings, 1 reply; 12+ messages in thread
From: Ilkka Koskinen @ 2023-10-10 5:45 UTC (permalink / raw)
To: Stephen Rothwell, Will Deacon
Cc: Ilkka Koskinen, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the arm-perf tree
2023-10-10 5:45 ` Ilkka Koskinen
@ 2023-10-10 17:50 ` Will Deacon
2023-10-10 18:14 ` Will Deacon
0 siblings, 1 reply; 12+ messages in thread
From: Will Deacon @ 2023-10-10 17:50 UTC (permalink / raw)
To: Ilkka Koskinen
Cc: Stephen Rothwell, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the arm-perf tree
2023-10-10 17:50 ` Will Deacon
@ 2023-10-10 18:14 ` Will Deacon
2023-10-10 20:20 ` Ilkka Koskinen
0 siblings, 1 reply; 12+ messages in thread
From: Will Deacon @ 2023-10-10 18:14 UTC (permalink / raw)
To: Ilkka Koskinen
Cc: Stephen Rothwell, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the arm-perf tree
2023-10-10 18:14 ` Will Deacon
@ 2023-10-10 20:20 ` Ilkka Koskinen
0 siblings, 0 replies; 12+ messages in thread
From: Ilkka Koskinen @ 2023-10-10 20:20 UTC (permalink / raw)
To: Will Deacon
Cc: Ilkka Koskinen, Stephen Rothwell, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2025-03-17 21:23 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-12 23:09 linux-next: build failure after merge of the arm-perf tree Stephen Rothwell
2023-12-13 9:30 ` Will Deacon
2023-12-13 10:15 ` James Clark
2023-12-13 10:56 ` Will Deacon
-- strict thread matches above, loose matches on Subject: below --
2025-03-17 0:21 Stephen Rothwell
2025-03-17 15:13 ` Will Deacon
2025-03-17 21:23 ` Stephen Rothwell
2023-10-09 22:56 Stephen Rothwell
2023-10-10 5:45 ` Ilkka Koskinen
2023-10-10 17:50 ` Will Deacon
2023-10-10 18:14 ` Will Deacon
2023-10-10 20:20 ` Ilkka Koskinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox