From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A86816FF36; Tue, 25 Jun 2024 15:34:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719329644; cv=none; b=PZ2agoeMRUojd5AN3RG2pZJBl3GsFetozyM8rGgBN4l7RqIl2eBY5lMZfufk4pPR0HrB0nHybkJQW4akWDhwY11o7U+TpM3shxOME95i6a5BnCyz0eWCHKfY5Sf5tSYcFx9FrnGdEeHuiKfhfq3BjsNPqe/oFmW6X24EmaaAAvA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719329644; c=relaxed/simple; bh=yrSTLdvsNJuOyrIIDeJhSlKNmfKDLtNCQ44eQ4kZF+Q=; h=From:Date:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=mlapm5eDirLt5ArprLHSmiqq+usVryF6TegoG0QCPozKJUzXe9/Md7pX+CniIsNotPEvABKCce9hTtH40xNRsljiMdEYZrJxY1XD5/BTuyMrJA7QSd4lU1bTFjdXBA8NWWQkl/fG5KuzipQp0lFtLt22jIwdEBbERVygNXh7Otc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=H9z+rctq; arc=none smtp.client-ip=209.85.167.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H9z+rctq" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-52ce6c8db7bso2804127e87.1; Tue, 25 Jun 2024 08:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719329640; x=1719934440; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=fWL9aq1cdURVir5BADc2ZTz6Xz4eWUl6fxWllepmeqQ=; b=H9z+rctqwFgGuLacwSAOq3LjznEXvqY8IlWcQy23uetBDdP7YJBCC0wUzRCBCqjugK Un8lt9lMxqi3h2iwRC4hQ+T9tuAjVH/AaDP8yUlIqdQx7Khl9M2q9zXqB3XUPbmD07HN OZsWHfA7aUSuyR5J2QgrlzrvUDQTpztGcxEbeA/OsNWszQt4TOOywHpuMaIlJWPiqoM2 2yi8fYQ1Gt7fabFlDwMo2xXk1mW7Rxen3Z66cSAl/9SYl1b3RLyERxi9hCGI4eRK1VG9 dR9/q7SAWOIcI4SNPm1Ckos1S7Rb+cPGkxZKDfoCIZwV+Zks5h1GzXVnl9YeoRbj4+nl qjsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719329640; x=1719934440; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fWL9aq1cdURVir5BADc2ZTz6Xz4eWUl6fxWllepmeqQ=; b=lVjCj4oTU/suWMQkoP+L+Svzd20IYUk8Xnv3n2NOlACs7FN8+KuEqCRzcQ3qG3BJtH 9sO2SmVXK8HjIjLoMOmx821XLzj+WVlVjlUuYV6SC9gLf2sWZYehGV8H2Aa8AO+hJhc6 4k/h+wTsrf+MZKzNYiJ5DuoZasdkXb/483gUNIDTUub8rc/vO2Y/zq1gl12i9Rz/9M8q zVyAcqE7kmtIPg2RJZGmR1rhyhA084wyWaS54DIiC/lU2xZE6H2yqwwzdUv/m1QdYBXM X4wtu0gVc+flrqSLDaV8VUatYqg8irVslCkc2zdV93wSMzoFWR+qHBeqDivgVQ4jcdZI Ca0Q== X-Forwarded-Encrypted: i=1; AJvYcCXpnG675aVTTJz5u8iM6TThfWbXAUYPXpxD8kX+VPN+d4U/7rn26ngV3qJcjW9iyn/ZoY0c7eCIYD1XyksKgR3MrJZrEOPHX50BVf4umczBWWGZPPduW5OPYrkAKkRM1sV5vcHZ1fjK9A== X-Gm-Message-State: AOJu0YzK2CCLhPB8Sk0Twus/DMkA4zkGLJSg9y/aOVQrnVF8l9We5DQA qfjRkzMK2tFlznhOdxzrDVyZ3TT+trC28bwC95EFsAYAPiFN/VXs X-Google-Smtp-Source: AGHT+IHnZjnJMconf8H13iDPWZ8xrfkoezsaE3ZY5gP+CacdGRe1jWjN1MqrVToiHaNuNaAbqOT5eQ== X-Received: by 2002:ac2:5119:0:b0:52c:db52:3cb3 with SMTP id 2adb3069b0e04-52ce183b56bmr4507221e87.39.1719329640074; Tue, 25 Jun 2024 08:34:00 -0700 (PDT) Received: from pc636 (host-90-233-219-252.mobileonline.telia.com. [90.233.219.252]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52cf33265d6sm153493e87.160.2024.06.25.08.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 08:33:59 -0700 (PDT) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Tue, 25 Jun 2024 17:33:57 +0200 To: Baoquan He , Hailong Liu Cc: Uladzislau Rezki , Nick Bowler , Hailong Liu , linux-kernel@vger.kernel.org, Linux regressions mailing list , linux-mm@kvack.org, sparclinux@vger.kernel.org, Andrew Morton Subject: Re: PROBLEM: kernel crashes when running xfsdump since ~6.4 Message-ID: References: <20240621033005.6mccm7waduelb4m5@oppo.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Jun 25, 2024 at 09:02:43PM +0800, Baoquan He wrote: > On 06/25/24 at 02:40pm, Uladzislau Rezki wrote: > > On Tue, Jun 25, 2024 at 07:40:21PM +0800, Baoquan He wrote: > > > On 06/25/24 at 12:32pm, Uladzislau Rezki wrote: > > > > On Tue, Jun 25, 2024 at 11:30:33AM +0800, Baoquan He wrote: > > > > > On 06/24/24 at 02:16pm, Uladzislau Rezki wrote: > > > > > > On Fri, Jun 21, 2024 at 10:02:50PM +0800, Baoquan He wrote: > > > > > > > On 06/21/24 at 11:44am, Uladzislau Rezki wrote: > > > > > > > > On Fri, Jun 21, 2024 at 03:07:16PM +0800, Baoquan He wrote: > > > > > > > > > On 06/21/24 at 11:30am, Hailong Liu wrote: > > > > > > > > > > On Thu, 20. Jun 14:02, Nick Bowler wrote: > > > > > > > > > > > On 2024-06-20 02:19, Nick Bowler wrote: > > > > > > > ...... > > > > > > > > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > > > > > > > > > index be2dd281ea76..18e87cafbaf2 100644 > > > > > > > > > --- a/mm/vmalloc.c > > > > > > > > > +++ b/mm/vmalloc.c > > > > > > > > > @@ -2542,7 +2542,7 @@ static DEFINE_PER_CPU(struct vmap_block_queue, vmap_block_queue); > > > > > > > > > static struct xarray * > > > > > > > > > addr_to_vb_xa(unsigned long addr) > > > > > > > > > { > > > > > > > > > - int index = (addr / VMAP_BLOCK_SIZE) % num_possible_cpus(); > > > > > > > > > + int index = (addr / VMAP_BLOCK_SIZE) % nr_cpu_ids; > > > > > > > > > > > > > > > > > > return &per_cpu(vmap_block_queue, index).vmap_blocks; > > > > > > > > > } > > > > > > > > > > > > > > > > > The problem i see is about not-initializing of the: > > > > > > > > > > > > > > > > for_each_possible_cpu(i) { > > > > > > > > struct vmap_block_queue *vbq; > > > > > > > > struct vfree_deferred *p; > > > > > > > > > > > > > > > > vbq = &per_cpu(vmap_block_queue, i); > > > > > > > > spin_lock_init(&vbq->lock); > > > > > > > > INIT_LIST_HEAD(&vbq->free); > > > > > > > > p = &per_cpu(vfree_deferred, i); > > > > > > > > init_llist_head(&p->list); > > > > > > > > INIT_WORK(&p->wq, delayed_vfree_work); > > > > > > > > xa_init(&vbq->vmap_blocks); > > > > > > > > } > > > > > > > > > > > > > > > > > > > > > > > > correctly or fully. It is my bad i did not think that CPUs in a possible mask > > > > > > > > can be non sequential :-/ > > > > > > > > > > > > > > > > nr_cpu_ids - is not the max possible CPU. For example, in Nick case, > > > > > > > > when he has two CPUs, num_possible_cpus() and nr_cpu_ids are the same. > > > > > > > > > > > > > > I checked the generic version of setup_nr_cpu_ids(), from codes, they > > > > > > > are different with my understanding. > > > > > > > > > > > > > > kernel/smp.c > > > > > > > void __init setup_nr_cpu_ids(void) > > > > > > > { > > > > > > > set_nr_cpu_ids(find_last_bit(cpumask_bits(cpu_possible_mask), NR_CPUS) + 1); > > > > > > > } > > > > > > > > > > > > > I see that it is not a weak function, so it is generic, thus the > > > > > > behavior can not be overwritten, which is great. This does what we > > > > > > need. > > > > > > > > > > > > Thank you for checking this you are right! > > > > > > > > > > Thanks for confirming this. > > > > > > > > > > > > > > > > > Then it is just a matter of proper initialization of the hash: > > > > > > > > > > > > > > > > > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > > > > > > index 5d3aa2dc88a8..1733946f7a12 100644 > > > > > > --- a/mm/vmalloc.c > > > > > > +++ b/mm/vmalloc.c > > > > > > @@ -5087,7 +5087,13 @@ void __init vmalloc_init(void) > > > > > > */ > > > > > > vmap_area_cachep = KMEM_CACHE(vmap_area, SLAB_PANIC); > > > > > > > > > > > > - for_each_possible_cpu(i) { > > > > > > + /* > > > > > > + * We use "nr_cpu_ids" here because some architectures > > > > > > + * may have "gaps" in cpu-possible-mask. It is OK for > > > > > > + * per-cpu approaches but is not OK for cases where it > > > > > > + * can be used as hashes also. > > > > > > + */ > > > > > > + for (i = 0; i < nr_cpu_ids; i++) { > > > > > > > > > > I was wrong about earlier comments. Percpu variables are only available > > > > > on possible CPUs. For those nonexistent possible CPUs of static percpu > > > > > variable vmap_block_queue, there isn't memory allocated and mapped for > > > > > them. So accessing into them will cause problem. > > > > > > > > > > In Nick's case, there are only CPU0, CPU2. If you access > > > > > &per_cpu(vmap_block_queue, 1), problem occurs. So I think we may need to > > > > > change to take other way for vbq. E.g: > > > > > 1) Storing the vb in the nearest neighbouring vbq on possible CPU as > > > > > below draft patch; > > > > > 2) create an normal array to store vbq of size nr_cpu_ids, then we can > > > > > store/fetch each vbq on non-possible CPU? > > > > > > > > > A correct way, i think, is to create a normal array. A quick fix can be > > > > to stick to a next possible CPU. > > > > > > > > > The way 1) is simpler, the existing code can be adapted a little just as > > > > > below. > > > > > > > > > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > > > > > index 633363997dec..59a8951cc6c0 100644 > > > > > --- a/mm/vmalloc.c > > > > > +++ b/mm/vmalloc.c > > > > > @@ -2542,7 +2542,10 @@ static DEFINE_PER_CPU(struct vmap_block_queue, vmap_block_queue); > > > > > static struct xarray * > > > > > addr_to_vb_xa(unsigned long addr) > > > > > { > > > > > - int index = (addr / VMAP_BLOCK_SIZE) % num_possible_cpus(); > > > > > + int index = (addr / VMAP_BLOCK_SIZE) % nr_cpu_ids; > > > > > + > > > > > + if (!cpu_possible(idex)) > > > > > + index = cpumask_next(index, cpu_possible_mask); > > > > > > > > > cpumask_next() can return nr_cpu_ids if no next bits set. > > > > > > It won't. nr_cpu_ids is the largest index + 1, the hashed index will > > > be: 0 =< index <= (nr_cpu_ids - 1) e.g cpu_possible_mask is > > > b10001111, the nr_cpu_ids is 8, the largest bit is cpu7. > > > cpu_possible(index) will check that. So the largest bit of cpumask_next() > > > returns is (nr_cpu_ids - 1). > > > > > /** > > * cpumask_next - get the next cpu in a cpumask > > * @n: the cpu prior to the place to search (i.e. return will be > @n) > > * @srcp: the cpumask pointer > > * > > * Return: >= nr_cpu_ids if no further cpus set. > > Ah, I got what you mean. In the vbq case, it may not have chance to get > a return number as nr_cpu_ids. Becuase the hashed index limits the > range to [0, nr_cpu_ids-1], and cpu_possible(index) will guarantee it > won't be the highest cpu number [nr_cpu_ids-1] since CPU[nr_cpu_ids-1] must > be possible CPU. > > Do I miss some corner cases? > Right. We guarantee that a highest CPU is available by doing: % nr_cpu_ids. So we do not need to use *next_wrap() variant. You do not miss anything :) Hailong Liu has proposed more simpler version: diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 11fe5ea208aa..e1e63ffb9c57 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1994,8 +1994,9 @@ static struct xarray * addr_to_vb_xa(unsigned long addr) { int index = (addr / VMAP_BLOCK_SIZE) % num_possible_cpus(); + int cpu = cpumask_nth(index, cpu_possible_mask); - return &per_cpu(vmap_block_queue, index).vmap_blocks; + return &per_cpu(vmap_block_queue, cpu).vmap_blocks; which just takes a next CPU if an index is not set in the cpu_possible_mask. The only thing that can be updated in the patch is to replace num_possible_cpu() by the nr_cpu_ids. Any thoughts? I think we need to fix it by a minor change so it is easier to back-port on stable kernels. -- Uladzislau Rezki