From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B941DC5475B for ; Thu, 7 Mar 2024 03:38:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4CEFB6B00F8; Wed, 6 Mar 2024 22:38:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 47F046B00F9; Wed, 6 Mar 2024 22:38:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 394B16B00FA; Wed, 6 Mar 2024 22:38:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 288066B00F8 for ; Wed, 6 Mar 2024 22:38:36 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C11491A1086 for ; Thu, 7 Mar 2024 03:38:35 +0000 (UTC) X-FDA: 81868835790.10.E828580 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 247A98000E for ; Thu, 7 Mar 2024 03:38:33 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WingxE1I; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709782714; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=2vznKFdjEQh3Hx7ci6OGrOLtatnJe9ZKpAF7T9E0NWA=; b=PuIqvGTrQOsTzMBldTrNHXRDLYNgPJ8snU4EFcTppRZ7VV6UBylKC9AgAnW2g5LWzsOojj t6xTMkSePYjm9Bs31Ex/V/JjEr983mWciv9oC1ydygRDYyWyffGAM7j4ySgPI08aiveHv5 LzWZKQ3Mh3e0IieimQHV8cY1Rv2bmaE= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WingxE1I; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709782714; a=rsa-sha256; cv=none; b=tQoz85Q5HC9Cwpln0OeG4nsEWXFedfOnu/tNBzOGlFc9Gefzsbc96dJbSv4UuJpNlRoK+c U36WFddtx6PEckchXlMUmEwW0zmM5zdF8sK7xmfgE63iQ2wsniyVY0zPr8Xj7Sd8+GcSkL LBaTN2GFS8wK7SthKFq/2L+GyIuFrls= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709782713; 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=2vznKFdjEQh3Hx7ci6OGrOLtatnJe9ZKpAF7T9E0NWA=; b=WingxE1IaLhzdkQU2zAg27jwzetsoieoaOcbSyDHBtSYANP+WgITRa2r6Fibh/q2w6lNIk QD4Y8MnFHmtSAXN/a/CK3HLwB41OeVkmErxqUx+d5rgglbiAK8tXLLx1gGzzmvWtADiMa7 EnzzGcLNB8OmABjkLQSkH3EJd4Ar7Wo= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-198-LvPdOutuOsmwRTPV4glN5Q-1; Wed, 06 Mar 2024 22:38:29 -0500 X-MC-Unique: LvPdOutuOsmwRTPV4glN5Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 57FE31C41A0D; Thu, 7 Mar 2024 03:38:28 +0000 (UTC) Received: from localhost (unknown [10.72.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A9ED2200B01D; Thu, 7 Mar 2024 03:38:27 +0000 (UTC) Date: Thu, 7 Mar 2024 11:38:24 +0800 From: Baoquan He To: rulin.huang@intel.com Cc: urezki@gmail.com, akpm@linux-foundation.org, colin.king@intel.com, hch@infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, lstoakes@gmail.com, tianyou.li@intel.com, tim.c.chen@intel.com, wangyang.guo@intel.com, zhiguo.zhou@intel.com Subject: Re: [PATCH v8] mm/vmalloc: Eliminated the lock contention from twice to once Message-ID: References: <20240307021440.64967-1-rulin.huang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240307021440.64967-1-rulin.huang@intel.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Rspamd-Queue-Id: 247A98000E X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 4mfcfyemsoe9kpcpnpyhehje5irmdy3m X-HE-Tag: 1709782713-332255 X-HE-Meta: U2FsdGVkX1/xQn193NkKXSJPgn2ZmxR1xltXhBjcY1hGlkZ9omHVXdjuoBZoy175W6tUilA4LxmXlrtxw1U0kWFoUW9uJsqKJGUYUom6mkGKT4C0dLRC64IkK/XhYV1K6mHIQYq6kuu9K4NAxxgmMjGFS/v+GG1aqB61Aa0Qmb4f7PYANhjH6m24hJPyHqXq+hvSsKUOIuHuiUVcy4GvIFlJdqRW3a1zkOxDY3bAGraOxvOe+6LSItI3lw3L1lcVUUa0g+AziHg0wLHn/WsdwMPdZTwiCUiwYJCMPnlOHZByYyUcn9dg1Y07gxaRBb5rtbs8IxoYSmvtb54/GveOq1OQfFHTBns+tr11CnisEdU/uhbgdHWJKKUcOMYdS0wOu1UQjKMYGCSR4yL4FogkCShkhdTXV+p7OKoHrrk5bvaMAjqOJ528sVIWUfm0gKRqK7Rv+FO4q+oMGrgTmAWTGNkrk5JM8C79O87lbS2gDvs6yriLR6brMq+Cr5ZvVmUHtNI8UWSXqFZkUdrhrq0wlQfHY/Sc4fXi3e4JZlzGq77jSBnR2e5g9K5oaTU6VNjv9JelgeJWWfgMy2HcAnRfJ3v6IgXs02P3qRTvruybNf/zEtfD5Om0Mdu3AsNVZ7skBgMttQHzPdxzJ7p9nwClxEAX4G3ZzayBdeXY94LGpN7vDbVBZSadVgpgWZYbeUST6nsakmZ28rsS/HwfCFw6VECvELmoxHNQtjGljLg4oAuUuHwX5Sxbfe55By/TwzyoExv94EcGnOiEe/GRHzEM1kovP7lZg8Ck2PKXSz03TuSGoCYp71H2rJo6PCR2JutW2FKBeXT5aDD8eKg3nRe3Kvg7YBaoesxWvBP3TgjeE48edK2XS80Y7MbMcGDgEXY/+7wWXiBkxJBWfqdUo5BXoQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 03/06/24 at 09:14pm, rulinhuang wrote: > When allocating a new memory area where the mapping address range is > known, it is observed that the vmap_node->busy.lock is acquired twice. > > The first acquisition occurs in the alloc_vmap_area() function when > inserting the vm area into the vm mapping red-black tree. The second > acquisition occurs in the setup_vmalloc_vm() function when updating the > properties of the vm, such as flags and address, etc. > > Combine these two operations together in alloc_vmap_area(), which > improves scalability when the vmap_node->busy.lock is contended. > By doing so, the need to acquire the lock twice can also be eliminated > to once. > > With the above change, tested on intel sapphire rapids > platform(224 vcpu), a 4% performance improvement is > gained on stress-ng/pthread(https://github.com/ColinIanKing/stress-ng), > which is the stress test of thread creations. > > Co-developed-by: "Chen, Tim C" > Signed-off-by: "Chen, Tim C" > Co-developed-by: "King, Colin" > Signed-off-by: "King, Colin" > Signed-off-by: rulinhuang > --- > V1 -> V2: Avoided the partial initialization issue of vm and > separated insert_vmap_area() from alloc_vmap_area() > V2 -> V3: Rebased on 6.8-rc5 > V3 -> V4: Rebased on mm-unstable branch > V4 -> V5: Canceled the split of alloc_vmap_area() > and keep insert_vmap_area() > V5 -> V6: Added bug_on > V6 -> V7: Adjusted the macros > V7 -> V8: Removed bugs_on and adjustion of macros > --- > mm/vmalloc.c | 50 ++++++++++++++++++++++---------------------------- > 1 file changed, 22 insertions(+), 28 deletions(-) LGTM, Reviewed-by: Baoquan He > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 25a8df497255..f933a62fef50 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -1841,15 +1841,26 @@ node_alloc(unsigned long size, unsigned long align, > return va; > } > > +static inline void setup_vmalloc_vm(struct vm_struct *vm, > + struct vmap_area *va, unsigned long flags, const void *caller) > +{ > + vm->flags = flags; > + vm->addr = (void *)va->va_start; > + vm->size = va->va_end - va->va_start; > + vm->caller = caller; > + va->vm = vm; > +} > + > /* > * Allocate a region of KVA of the specified size and alignment, within the > - * vstart and vend. > + * vstart and vend. If vm is passed in, the two will also be bound. > */ > static struct vmap_area *alloc_vmap_area(unsigned long size, > unsigned long align, > unsigned long vstart, unsigned long vend, > int node, gfp_t gfp_mask, > - unsigned long va_flags) > + unsigned long va_flags, struct vm_struct *vm, > + unsigned long flags, const void *caller) > { > struct vmap_node *vn; > struct vmap_area *va; > @@ -1912,6 +1923,9 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, > va->vm = NULL; > va->flags = (va_flags | vn_id); > > + if (vm) > + setup_vmalloc_vm(vm, va, flags, caller); > + > vn = addr_to_node(va->va_start); > > spin_lock(&vn->busy.lock); > @@ -2486,7 +2500,8 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) > va = alloc_vmap_area(VMAP_BLOCK_SIZE, VMAP_BLOCK_SIZE, > VMALLOC_START, VMALLOC_END, > node, gfp_mask, > - VMAP_RAM|VMAP_BLOCK); > + VMAP_RAM|VMAP_BLOCK, NULL, > + 0, NULL); > if (IS_ERR(va)) { > kfree(vb); > return ERR_CAST(va); > @@ -2843,7 +2858,8 @@ void *vm_map_ram(struct page **pages, unsigned int count, int node) > struct vmap_area *va; > va = alloc_vmap_area(size, PAGE_SIZE, > VMALLOC_START, VMALLOC_END, > - node, GFP_KERNEL, VMAP_RAM); > + node, GFP_KERNEL, VMAP_RAM, > + NULL, 0, NULL); > if (IS_ERR(va)) > return NULL; > > @@ -2946,26 +2962,6 @@ void __init vm_area_register_early(struct vm_struct *vm, size_t align) > kasan_populate_early_vm_area_shadow(vm->addr, vm->size); > } > > -static inline void setup_vmalloc_vm_locked(struct vm_struct *vm, > - struct vmap_area *va, unsigned long flags, const void *caller) > -{ > - vm->flags = flags; > - vm->addr = (void *)va->va_start; > - vm->size = va->va_end - va->va_start; > - vm->caller = caller; > - va->vm = vm; > -} > - > -static void setup_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va, > - unsigned long flags, const void *caller) > -{ > - struct vmap_node *vn = addr_to_node(va->va_start); > - > - spin_lock(&vn->busy.lock); > - setup_vmalloc_vm_locked(vm, va, flags, caller); > - spin_unlock(&vn->busy.lock); > -} > - > static void clear_vm_uninitialized_flag(struct vm_struct *vm) > { > /* > @@ -3002,14 +2998,12 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, > if (!(flags & VM_NO_GUARD)) > size += PAGE_SIZE; > > - va = alloc_vmap_area(size, align, start, end, node, gfp_mask, 0); > + va = alloc_vmap_area(size, align, start, end, node, gfp_mask, 0, area, flags, caller); > if (IS_ERR(va)) { > kfree(area); > return NULL; > } > > - setup_vmalloc_vm(area, va, flags, caller); > - > /* > * Mark pages for non-VM_ALLOC mappings as accessible. Do it now as a > * best-effort approach, as they can be mapped outside of vmalloc code. > @@ -4584,7 +4578,7 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, > > spin_lock(&vn->busy.lock); > insert_vmap_area(vas[area], &vn->busy.root, &vn->busy.head); > - setup_vmalloc_vm_locked(vms[area], vas[area], VM_ALLOC, > + setup_vmalloc_vm(vms[area], vas[area], VM_ALLOC, > pcpu_get_vm_areas); > spin_unlock(&vn->busy.lock); > } > > base-commit: f4239a5d7acc1b5ff9bac4d5471000b952279ef0 > -- > 2.43.0 >