mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Yicong Yang <yangyicong@huawei.com>
To: Yury Norov <yury.norov@gmail.com>, <linux-kernel@vger.kernel.org>,
	<linux-mm@kvack.org>
Cc: Ingo Molnar <mingo@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Ben Segall <bsegall@google.com>,
	Daniel Bristot de Oliveira <bristot@redhat.com>,
	Dietmar Eggemann <dietmar.eggemann@arm.com>,
	Jacob Keller <jacob.e.keller@intel.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Juri Lelli <juri.lelli@redhat.com>, Mel Gorman <mgorman@suse.de>,
	Peter Lafreniere <peter@n8pjl.ca>,
	Steven Rostedt <rostedt@goodmis.org>,
	Tariq Toukan <tariqt@nvidia.com>,
	Valentin Schneider <vschneid@redhat.com>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	<shiju.jose@huawei.com>, <jonathan.cameron@huawei.com>,
	<prime.zeng@huawei.com>, <yangyicong@hisilicon.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Rasmus Villemoes <linux@rasmusvillemoes.dk>,
	Guenter Roeck <linux@roeck-us.net>
Subject: Re: [PATCH 3/4] sched: fix sched_numa_find_nth_cpu() in CPU-less case
Date: Mon, 14 Aug 2023 16:43:14 +0800	[thread overview]
Message-ID: <7c24e857-fe86-4c2a-68bc-58152bac1f39@huawei.com> (raw)
In-Reply-To: <20230810162442.9863-4-yury.norov@gmail.com>

Hi Yury,

On 2023/8/11 0:24, Yury Norov wrote:
> When the node provided by user is CPU-less, corresponding record in
> sched_domains_numa_masks is not set. Trying to dereference it in the
> following code leads to kernel crash.
> 
> To avoid it, start searching from the nearest node with CPUs.
> 
> Fixes: cd7f55359c90 ("sched: add sched_numa_find_nth_cpu()")
> Reported-by: Yicong Yang <yangyicong@hisilicon.com>
> Closes: https://lore.kernel.org/lkml/CAAH8bW8C5humYnfpW3y5ypwx0E-09A3QxFE1JFzR66v+mO4XfA@mail.gmail.com/T/
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Closes: https://lore.kernel.org/lkml/ZMHSNQfv39HN068m@yury-ThinkPad/T/#mf6431cb0b7f6f05193c41adeee444bc95bf2b1c4
> Signed-off-by: Yury Norov <yury.norov@gmail.com>
> ---
> 
> This has been discovered and fixed by Yicong Yang:
> 
> https://lore.kernel.org/lkml/CAAH8bW8C5humYnfpW3y5ypwx0E-09A3QxFE1JFzR66v+mO4XfA@mail.gmail.com/T/
> 
> When discovering Guenter's failure report for sparc64, I found it's due to
> the same problem. And while fixing, I found an opportunity to generalize
> nearest NUMA node search and avoid code duplication.
> 
> Yicong, if you like this approach, please feel free to add your co-developed-by
> or any appropriate tags.
> 

Looks fine to me. One nit below.

Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>

>  kernel/sched/topology.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
> index d3a3b2646ec4..66b387172b6f 100644
> --- a/kernel/sched/topology.c
> +++ b/kernel/sched/topology.c
> @@ -2113,10 +2113,14 @@ static int hop_cmp(const void *a, const void *b)
>   */
>  int sched_numa_find_nth_cpu(const struct cpumask *cpus, int cpu, int node)
>  {
> -	struct __cmp_key k = { .cpus = cpus, .node = node, .cpu = cpu };
> +	struct __cmp_key k = { .cpus = cpus, .cpu = cpu };
>  	struct cpumask ***hop_masks;
>  	int hop, ret = nr_cpu_ids;
>  
> +	/* CPU-less node entries are uninitialized in sched_domains_numa_masks */
> +	node = numa_nearest_node(node, N_CPU);
> +	k.node = node;
> +

We may also have problem if node == NUMA_NO_NODE, is it better to mention this
in the function comment or check it before we going on? Currently this function
is only used in cpumask_local_spread() and the caller has already checked it, but
considering this is an export function so somebody may use it directly.

I wondering whether we should put this block within the protection of rcu_read_lock()
for some issues like hotplug or not. Is it possible if @node become CPU-less subsequently?

>  	rcu_read_lock();
>  
>  	k.masks = rcu_dereference(sched_domains_numa_masks);
> 

  reply	other threads:[~2023-08-14  8:45 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-10 16:24 [PATCH 0/4] sched fixes Yury Norov
2023-08-10 16:24 ` [PATCH 1/4] numa: generalize numa_map_to_online_node() Yury Norov
2023-08-11  8:48   ` Andy Shevchenko
2023-08-10 16:24 ` [PATCH 2/4] sched/fair: fix opencoded numa_nearest_node() Yury Norov
2023-08-11  8:50   ` Andy Shevchenko
2023-08-10 16:24 ` [PATCH 3/4] sched: fix sched_numa_find_nth_cpu() in CPU-less case Yury Norov
2023-08-14  8:43   ` Yicong Yang [this message]
2023-08-10 16:24 ` [PATCH 4/4] sched: fix sched_numa_find_nth_cpu() in non-NUMA case Yury Norov

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=7c24e857-fe86-4c2a-68bc-58152bac1f39@huawei.com \
    --to=yangyicong@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=bristot@redhat.com \
    --cc=bsegall@google.com \
    --cc=dietmar.eggemann@arm.com \
    --cc=jacob.e.keller@intel.com \
    --cc=jonathan.cameron@huawei.com \
    --cc=juri.lelli@redhat.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux@rasmusvillemoes.dk \
    --cc=linux@roeck-us.net \
    --cc=mgorman@suse.de \
    --cc=mingo@redhat.com \
    --cc=peter@n8pjl.ca \
    --cc=peterz@infradead.org \
    --cc=prime.zeng@huawei.com \
    --cc=rostedt@goodmis.org \
    --cc=shiju.jose@huawei.com \
    --cc=tariqt@nvidia.com \
    --cc=vincent.guittot@linaro.org \
    --cc=vschneid@redhat.com \
    --cc=yangyicong@hisilicon.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®