From: Andrew Jones <ajones@ventanamicro.com>
To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Yury Norov <yury.norov@gmail.com>
Subject: Re: [PATCH] RISC-V: Fix /proc/cpuinfo cpumask warning
Date: Tue, 11 Oct 2022 20:23:56 +0200 [thread overview]
Message-ID: <20221011182356.xbgvpoddhe4st6va@kamzik> (raw)
In-Reply-To: <20221011175040.1782772-1-ajones@ventanamicro.com>
Boris pointed out on my x86 version of this patch that I didn't
give nearly enough information on why I sent it. Sorry about that!
I've tried to fill in some of that information in my reply to him
[1]. Sorry for lazily just pointing to that link here, but I'll
send a v2 with the information properly added tomorrow.
[1] https://lore.kernel.org/all/20221011181715.dpayrpjueha7kxoj@kamzik/
Thanks,
drew
On Tue, Oct 11, 2022 at 07:50:40PM +0200, Andrew Jones wrote:
> Upcoming cpumask changes will start issuing warnings[*] when cpu
> indices equal to nr_cpu_ids are passed to cpumask_next* functions.
> Ensure we don't generate a warning when reading /proc/cpuinfo 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>
> ---
> arch/riscv/kernel/cpu.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c
> index 4aa8cd749441..592ff065e09f 100644
> --- a/arch/riscv/kernel/cpu.c
> +++ b/arch/riscv/kernel/cpu.c
> @@ -166,9 +166,12 @@ static void print_mmu(struct seq_file *f)
>
> static void *c_start(struct seq_file *m, loff_t *pos)
> {
> - *pos = cpumask_next(*pos - 1, cpu_online_mask);
> - if ((*pos) < nr_cpu_ids)
> - return (void *)(uintptr_t)(1 + *pos);
> + if (*pos < nr_cpu_ids) {
> + *pos = cpumask_next(*pos - 1, cpu_online_mask);
> + if (*pos < nr_cpu_ids)
> + return (void *)(uintptr_t)(1 + *pos);
> + }
> +
> return NULL;
> }
>
> --
> 2.37.3
>
prev parent reply other threads:[~2022-10-11 18:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-11 17:50 Andrew Jones
2022-10-11 18:23 ` Andrew Jones [this message]
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=20221011182356.xbgvpoddhe4st6va@kamzik \
--to=ajones@ventanamicro.com \
--cc=aou@eecs.berkeley.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®