From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Moore <paul@paul-moore•com>
Cc: Luo Gengkun <luogengkun@huaweicloud•com>,
Ingo Molnar <mingo@kernel•org>,
Namhyung Kim <namhyung@kernel•org>,
Ravi Bangoria <ravi.bangoria@amd•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the security tree
Date: Mon, 24 Mar 2025 15:37:12 +1100 [thread overview]
Message-ID: <20250324153712.6a2b2a5c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1811 bytes --]
Hi all,
After merging the security tree, today's linux-next build (x86_64
allmodconfig) failed like this:
arch/x86/events/amd/ibs.c: In function 'perf_ibs_handle_irq':
arch/x86/events/amd/ibs.c:1207:13: error: too many arguments to function 'perf_allow_kernel'
1207 | perf_allow_kernel(&event->attr)) {
| ^~~~~~~~~~~~~~~~~
In file included from arch/x86/events/amd/ibs.c:9:
include/linux/perf_event.h:1675:5: note: declared here
1675 | int perf_allow_kernel(void);
| ^~~~~~~~~~~~~~~~~
Caused by commit
9ec84f79c5a7 ("perf: Remove unnecessary parameter of security check")
interacting with commit
50a53b60e141 ("perf/amd/ibs: Prevent leaking sensitive data to userspace")
From Linus' tree.
I have applied the following merge resolution patch.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 24 Mar 2025 15:25:18 +1100
Subject: [PATCH] fix up for "perf: Remove unnecessary parameter of security check"
interacting with commit
50a53b60e141 ("perf/amd/ibs: Prevent leaking sensitive data to userspace")
From Linus' tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/x86/events/amd/ibs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c
index e36c9c63c97c..30157ab98cea 100644
--- a/arch/x86/events/amd/ibs.c
+++ b/arch/x86/events/amd/ibs.c
@@ -1204,7 +1204,7 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)
* unprivileged users.
*/
if ((event->attr.sample_type & PERF_SAMPLE_RAW) &&
- perf_allow_kernel(&event->attr)) {
+ perf_allow_kernel()) {
perf_ibs_phyaddr_clear(perf_ibs, &ibs_data);
}
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-03-24 4:37 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-24 4:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-06-02 16:16 linux-next: build failure after merge of the security tree Mark Brown
2026-06-02 16:31 ` Paul Moore
2026-06-02 16:52 ` Daniel Borkmann
2026-06-02 17:26 ` Paul Moore
2026-06-02 18:40 ` Paul Moore
2026-06-02 19:16 ` Mark Brown
2026-06-02 20:13 ` Paul Moore
2026-06-02 21:45 ` Paul Moore
2026-06-03 12:42 ` Mark Brown
2026-06-03 14:43 ` Paul Moore
2025-02-10 1:18 Stephen Rothwell
2025-02-10 3:44 ` Paul Moore
2025-02-10 3:53 ` Stephen Rothwell
2025-02-10 14:51 ` Paul Moore
2020-07-08 4:00 Stephen Rothwell
2020-07-13 2:04 ` Stephen Rothwell
2020-07-13 2:06 ` Stephen Rothwell
2020-07-29 23:35 ` Stephen Rothwell
2020-07-30 2:35 ` James Morris
2020-07-30 2:59 ` Stephen Rothwell
2020-07-30 5:03 ` Stephen Rothwell
2020-08-04 3:36 ` James Morris
2019-08-12 4:58 Stephen Rothwell
2019-08-12 17:34 ` Kees Cook
2019-08-19 3:21 ` Stephen Rothwell
2019-08-19 3:38 ` Stephen Rothwell
2019-08-21 16:39 ` James Morris
2017-08-23 11:12 Stephen Rothwell
2017-08-17 2:51 Stephen Rothwell
2017-08-17 3:24 ` Kees Cook
2016-05-19 4:01 Stephen Rothwell
[not found] ` <20160519140120.23b345a1-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2016-05-19 10:11 ` David Howells
2016-05-19 23:14 ` Stephen Rothwell
2016-05-20 3:07 ` Steve French
2015-08-17 5:29 Stephen Rothwell
2015-08-17 6:04 ` Stephen Rothwell
2015-08-26 14:45 ` David Howells
2014-07-25 9:21 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250324153712.6a2b2a5c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luogengkun@huaweicloud$(echo .)com \
--cc=mingo@kernel$(echo .)org \
--cc=namhyung@kernel$(echo .)org \
--cc=paul@paul-moore$(echo .)com \
--cc=ravi.bangoria@amd$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox