From: Peter Zijlstra <peterz@infradead.org>
To: Meelis Roos <mroos@linux.ee>
Cc: LKML <linux-kernel@vger.kernel.org>,
x86@kernel.org, Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@kernel.org>, Ingo Molnar <mingo@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Subject: Re: UBSAN: Undefined behaviour in arch/x86/events/intel/p6.c:116:29
Date: Mon, 2 Dec 2019 18:06:33 +0100 [thread overview]
Message-ID: <20191202170633.GN2844@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <02f44ed5-13ac-f9c6-1f35-129c41006900@linux.ee>
On Tue, Nov 26, 2019 at 07:55:08PM +0200, Meelis Roos wrote:
> While testing 5.4 on a Dell D600 (32-bit), I noticed the old UBSAN warnings from p6 perf events.
> I remember having seen these warnings on other p6 era computers too.
>
> [ 2.795167] ================================================================================
> [ 2.795206] UBSAN: Undefined behaviour in arch/x86/events/intel/p6.c:116:29
> [ 2.795235] index 8 is out of range for type 'u64 [8]'
> [ 2.795265] CPU: 0 PID: 1 Comm: swapper Not tainted 5.4.0-03419-g386403a115f9-dirty #18
> [ 2.795266] Hardware name: Dell Computer Corporation Latitude D600 /0X2034, BIOS A16 06/29/2005
> [ 2.795268] Call Trace:
> [ 2.795283] dump_stack+0x16/0x19
> [ 2.795290] ubsan_epilogue+0xb/0x29
> [ 2.795293] __ubsan_handle_out_of_bounds.cold+0x43/0x48
> [ 2.795299] ? sysfs_add_file_mode_ns+0xad/0x180
> [ 2.795304] p6_pmu_event_map+0x3b/0x50
> [ 2.795306] is_visible+0x25/0x30
> [ 2.795308] ? collect_events+0x150/0x150
> [ 2.795310] internal_create_group+0xd8/0x3e0
> [ 2.795312] ? collect_events+0x150/0x150
> [ 2.795314] internal_create_groups.part.0+0x34/0x80
> [ 2.795317] sysfs_create_groups+0x10/0x20
> [ 2.795321] device_add+0x536/0x5a0
> [ 2.795326] ? kvasprintf_const+0x59/0x90
> [ 2.795331] ? kfree_const+0xf/0x30
> [ 2.795334] ? kobject_set_name_vargs+0x6a/0xa0
> [ 2.795338] pmu_dev_alloc+0x8e/0xe0
> [ 2.795344] perf_event_sysfs_init+0x40/0x78
> [ 2.795346] ? stack_map_init+0x17/0x17
> [ 2.795347] do_one_initcall+0x7a/0x1b3
> [ 2.795351] ? do_early_param+0x75/0x75
> [ 2.795354] kernel_init_freeable+0x1ae/0x230
> [ 2.795357] ? rest_init+0x6d/0x6d
> [ 2.795359] kernel_init+0x9/0xf3
> [ 2.795361] ? rest_init+0x6d/0x6d
> [ 2.795363] ret_from_fork+0x2e/0x38
> [ 2.795364] ================================================================================
Does something like so fix it?
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 9a89d98c55bd..f0ab61cd2f68 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -1642,9 +1642,12 @@ static struct attribute_group x86_pmu_format_group __ro_after_init = {
ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr, char *page)
{
- struct perf_pmu_events_attr *pmu_attr = \
+ struct perf_pmu_events_attr *pmu_attr =
container_of(attr, struct perf_pmu_events_attr, attr);
- u64 config = x86_pmu.event_map(pmu_attr->id);
+ u64 config = 0;
+
+ if (pmu_attr->id < x86_pmu.max_events)
+ config = x86_pmu.event_map(pmu_attr->id);
/* string trumps id */
if (pmu_attr->event_str)
next prev parent reply other threads:[~2019-12-02 17:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 17:55 UBSAN: Undefined behaviour in arch/x86/events/intel/p6.c:116:29 Meelis Roos
2019-12-02 17:06 ` Peter Zijlstra [this message]
2019-12-03 13:39 ` Meelis Roos
2019-12-04 12:15 ` Jiri Olsa
2019-12-04 15:06 ` Peter Zijlstra
2019-12-04 15:24 ` Jiri Olsa
2019-12-04 15:44 ` Peter Zijlstra
2019-12-04 19:47 ` Meelis Roos
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=20191202170633.GN2844@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=acme@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=mroos@linux.ee \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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