From: Andrew Jones <ajones@ventanamicro.com>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
Yury Norov <yury.norov@gmail.com>,
Jonas Bonn <jonas@southpole.se>,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
Stafford Horne <shorne@gmail.com>,
openrisc@lists.librecores.org,
Michael Ellerman <mpe@ellerman.id.au>,
linuxppc-dev@lists.ozlabs.org, Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
linux-s390@vger.kernel.org
Subject: Re: [PATCH v2] x86: Fix /proc/cpuinfo cpumask warning
Date: Wed, 12 Oct 2022 14:42:15 +0200 [thread overview]
Message-ID: <20221012124215.edmgo6767yipfkt2@kamzik> (raw)
In-Reply-To: <20221012082422.uavybxdfmv4xkhxi@kamzik>
Adding more people and lists to CC in order to point this patch out,
because, based on a quick grep of cpuinfo seq operations, I think at least
openrisc, powerpc, and s390 also need an equivalent patch (and I've
already sent a patch for riscv). While the test is simple (see next
paragraph) I'm not equipped to test on each architecture.
To test, just build a kernel with DEBUG_PER_CPU_MAPS enabled, boot to a
shell, do 'cat /proc/cpuinfo', and look for a kernel warning.
Thanks,
drew
On Wed, Oct 12, 2022 at 10:24:22AM +0200, Andrew Jones wrote:
> On Wed, Oct 12, 2022 at 10:19:05AM +0200, Andrew Jones wrote:
> > Commit 78e5a3399421 ("cpumask: fix checking valid cpu range") has
> > started issuing warnings[*] when cpu indices equal to nr_cpu_ids - 1
> > are passed to cpumask_next* functions. seq_read_iter() and cpuinfo's
> > start and next seq operations implement a pattern like
> >
> > n = cpumask_next(n - 1, mask);
> > show(n);
> > while (1) {
> > ++n;
> > n = cpumask_next(n - 1, mask);
> > if (n >= nr_cpu_ids)
> > break;
> > show(n);
> > }
> >
> > which will issue the warning when reading /proc/cpuinfo. Ensure no
> > warning is generated by validating the cpu index before calling
> > cpumask_next().
> >
> > [*] Warnings will only appear with DEBUG_PER_CPU_MAPS enabled.
> >
> > Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
> > Cc: Yury Norov <yury.norov@gmail.com>
> > ---
>
> Forgot the changelog...
>
> v2:
> - Added all the information I should have in the first place to the
> commit message [Boris]
> - Changed style of fix [Boris]
>
> > arch/x86/kernel/cpu/proc.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
> > index 099b6f0d96bd..94ac02c8dd6f 100644
> > --- a/arch/x86/kernel/cpu/proc.c
> > +++ b/arch/x86/kernel/cpu/proc.c
> > @@ -153,6 +153,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
> >
> > static void *c_start(struct seq_file *m, loff_t *pos)
> > {
> > + if (*pos >= nr_cpu_ids)
> > + return NULL;
> > +
> > *pos = cpumask_next(*pos - 1, cpu_online_mask);
> > if ((*pos) < nr_cpu_ids)
> > return &cpu_data(*pos);
> > --
> > 2.37.3
> >
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <ajones@ventanamicro.com>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Jonas Bonn <jonas@southpole.se>,
linux-s390@vger.kernel.org,
Alexander Gordeev <agordeev@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Yury Norov <yury.norov@gmail.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Heiko Carstens <hca@linux.ibm.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Thomas Gleixner <tglx@linutronix.de>,
linuxppc-dev@lists.ozlabs.org, openrisc@lists.librecores.org
Subject: Re: [PATCH v2] x86: Fix /proc/cpuinfo cpumask warning
Date: Wed, 12 Oct 2022 14:42:15 +0200 [thread overview]
Message-ID: <20221012124215.edmgo6767yipfkt2@kamzik> (raw)
In-Reply-To: <20221012082422.uavybxdfmv4xkhxi@kamzik>
Adding more people and lists to CC in order to point this patch out,
because, based on a quick grep of cpuinfo seq operations, I think at least
openrisc, powerpc, and s390 also need an equivalent patch (and I've
already sent a patch for riscv). While the test is simple (see next
paragraph) I'm not equipped to test on each architecture.
To test, just build a kernel with DEBUG_PER_CPU_MAPS enabled, boot to a
shell, do 'cat /proc/cpuinfo', and look for a kernel warning.
Thanks,
drew
On Wed, Oct 12, 2022 at 10:24:22AM +0200, Andrew Jones wrote:
> On Wed, Oct 12, 2022 at 10:19:05AM +0200, Andrew Jones wrote:
> > Commit 78e5a3399421 ("cpumask: fix checking valid cpu range") has
> > started issuing warnings[*] when cpu indices equal to nr_cpu_ids - 1
> > are passed to cpumask_next* functions. seq_read_iter() and cpuinfo's
> > start and next seq operations implement a pattern like
> >
> > n = cpumask_next(n - 1, mask);
> > show(n);
> > while (1) {
> > ++n;
> > n = cpumask_next(n - 1, mask);
> > if (n >= nr_cpu_ids)
> > break;
> > show(n);
> > }
> >
> > which will issue the warning when reading /proc/cpuinfo. Ensure no
> > warning is generated by validating the cpu index before calling
> > cpumask_next().
> >
> > [*] Warnings will only appear with DEBUG_PER_CPU_MAPS enabled.
> >
> > Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
> > Cc: Yury Norov <yury.norov@gmail.com>
> > ---
>
> Forgot the changelog...
>
> v2:
> - Added all the information I should have in the first place to the
> commit message [Boris]
> - Changed style of fix [Boris]
>
> > arch/x86/kernel/cpu/proc.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
> > index 099b6f0d96bd..94ac02c8dd6f 100644
> > --- a/arch/x86/kernel/cpu/proc.c
> > +++ b/arch/x86/kernel/cpu/proc.c
> > @@ -153,6 +153,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
> >
> > static void *c_start(struct seq_file *m, loff_t *pos)
> > {
> > + if (*pos >= nr_cpu_ids)
> > + return NULL;
> > +
> > *pos = cpumask_next(*pos - 1, cpu_online_mask);
> > if ((*pos) < nr_cpu_ids)
> > return &cpu_data(*pos);
> > --
> > 2.37.3
> >
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <ajones@ventanamicro.com>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Jonas Bonn <jonas@southpole.se>,
linux-s390@vger.kernel.org,
Alexander Gordeev <agordeev@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Yury Norov <yury.norov@gmail.com>,
Heiko Carstens <hca@linux.ibm.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Thomas Gleixner <tglx@linutronix.de>,
linuxppc-dev@lists.ozlabs.org, Stafford Horne <shorne@gmail.com>,
openrisc@lists.librecores.org
Subject: Re: [PATCH v2] x86: Fix /proc/cpuinfo cpumask warning
Date: Wed, 12 Oct 2022 14:42:15 +0200 [thread overview]
Message-ID: <20221012124215.edmgo6767yipfkt2@kamzik> (raw)
In-Reply-To: <20221012082422.uavybxdfmv4xkhxi@kamzik>
Adding more people and lists to CC in order to point this patch out,
because, based on a quick grep of cpuinfo seq operations, I think at least
openrisc, powerpc, and s390 also need an equivalent patch (and I've
already sent a patch for riscv). While the test is simple (see next
paragraph) I'm not equipped to test on each architecture.
To test, just build a kernel with DEBUG_PER_CPU_MAPS enabled, boot to a
shell, do 'cat /proc/cpuinfo', and look for a kernel warning.
Thanks,
drew
On Wed, Oct 12, 2022 at 10:24:22AM +0200, Andrew Jones wrote:
> On Wed, Oct 12, 2022 at 10:19:05AM +0200, Andrew Jones wrote:
> > Commit 78e5a3399421 ("cpumask: fix checking valid cpu range") has
> > started issuing warnings[*] when cpu indices equal to nr_cpu_ids - 1
> > are passed to cpumask_next* functions. seq_read_iter() and cpuinfo's
> > start and next seq operations implement a pattern like
> >
> > n = cpumask_next(n - 1, mask);
> > show(n);
> > while (1) {
> > ++n;
> > n = cpumask_next(n - 1, mask);
> > if (n >= nr_cpu_ids)
> > break;
> > show(n);
> > }
> >
> > which will issue the warning when reading /proc/cpuinfo. Ensure no
> > warning is generated by validating the cpu index before calling
> > cpumask_next().
> >
> > [*] Warnings will only appear with DEBUG_PER_CPU_MAPS enabled.
> >
> > Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
> > Cc: Yury Norov <yury.norov@gmail.com>
> > ---
>
> Forgot the changelog...
>
> v2:
> - Added all the information I should have in the first place to the
> commit message [Boris]
> - Changed style of fix [Boris]
>
> > arch/x86/kernel/cpu/proc.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
> > index 099b6f0d96bd..94ac02c8dd6f 100644
> > --- a/arch/x86/kernel/cpu/proc.c
> > +++ b/arch/x86/kernel/cpu/proc.c
> > @@ -153,6 +153,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
> >
> > static void *c_start(struct seq_file *m, loff_t *pos)
> > {
> > + if (*pos >= nr_cpu_ids)
> > + return NULL;
> > +
> > *pos = cpumask_next(*pos - 1, cpu_online_mask);
> > if ((*pos) < nr_cpu_ids)
> > return &cpu_data(*pos);
> > --
> > 2.37.3
> >
next prev parent reply other threads:[~2022-10-12 12:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-12 8:19 [PATCH v2] x86: Fix /proc/cpuinfo cpumask warning Andrew Jones
2022-10-12 8:24 ` Andrew Jones
2022-10-12 12:42 ` Andrew Jones [this message]
2022-10-12 12:42 ` Andrew Jones
2022-10-12 12:42 ` Andrew Jones
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=20221012124215.edmgo6767yipfkt2@kamzik \
--to=ajones@ventanamicro.com \
--cc=agordeev@linux.ibm.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=openrisc@lists.librecores.org \
--cc=shorne@gmail.com \
--cc=stefan.kristiansson@saunalahti.fi \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yury.norov@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.