From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 375036EB4D for ; Tue, 25 Jun 2024 03:30:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719286249; cv=none; b=AfdqwLqH+ov99VbgVmGxpcrnA0I1282qpcT9E+6c148y8wkwkSD6GOW7jBknFlkEbRVZ7iGTlr8ILSEX2zgET472tKXLJY4/VFsJVfbjuvKme/VmN9yt2tqpM+aBCDxlcmX9ZDsIBl9kC4+TN/PUYW7jttor8U4F/iykNKIDlV4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719286249; c=relaxed/simple; bh=obtN4FIZCGHWBgEuYxhVZcQaprmAm9UaJ5RFq/VLNBs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Ejidvl/fOo89MUuq1DcGYVKdSmNePwxPcZQZGE7nT8JeuZIoPwEKmgKXdGq2Z1vjhVw5doB9aDR5skcSRw4PdRj5PGD+FK0SdMhLn27BGxYYVA8osjVAv38sDjOdOHw+ukq1YdyMqWhEzR28O4u4jkabN8Vr5kz/YDvZ3ZdOX1M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=emnUOOtn; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="emnUOOtn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719286246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/m8GXm0K69AMAk67ZrMEf4R6vclpB6T2QuYU2G6K8jY=; b=emnUOOtnRLEKYASzOd9OOLTjuk4mTKd8sH6kIzUFQD8WacsCw9MB6TsB+QB4ZRNJD1sloy DaqXBxtg7ga6OzkhwU4Z0pyy4dBiahI8sadxQ8yhYFlu1JT5KXs3zGRdnJW6GSa57WxDft iDr9HYqUbM+UVxGy0kxZ7QW9lehp5Po= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-256-WvBvJypYP3eb65TvXjMe_g-1; Mon, 24 Jun 2024 23:30:41 -0400 X-MC-Unique: WvBvJypYP3eb65TvXjMe_g-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4A4E819560B1; Tue, 25 Jun 2024 03:30:39 +0000 (UTC) Received: from localhost (unknown [10.72.116.8]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CB24F19560BF; Tue, 25 Jun 2024 03:30:37 +0000 (UTC) Date: Tue, 25 Jun 2024 11:30:33 +0800 From: Baoquan He To: Uladzislau Rezki Cc: 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: <75e17b57-1178-4288-b792-4ae68b19915e@draconx.ca> <00d74f24-c49c-460e-871c-d5af64701306@draconx.ca> <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: X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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? 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); return &per_cpu(vmap_block_queue, index).vmap_blocks; } @@ -2556,9 +2559,15 @@ addr_to_vb_xa(unsigned long addr) static unsigned long addr_to_vb_idx(unsigned long addr) { + int id = (addr / VMAP_BLOCK_SIZE) % nr_cpu_ids; + int id_dest = id; + + if (!cpu_possible(id)) + id_dest = cpumask_next(id, cpu_possible_mask); + addr -= VMALLOC_START & ~(VMAP_BLOCK_SIZE-1); addr /= VMAP_BLOCK_SIZE; - return addr; + return addr + (id_dest - id); }