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 5A6A4C54E41 for ; Thu, 7 Mar 2024 02:11:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCDA76B00DA; Wed, 6 Mar 2024 21:11:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C56FF6B00DB; Wed, 6 Mar 2024 21:11:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD1686B00DC; Wed, 6 Mar 2024 21:11:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9879D6B00DA for ; Wed, 6 Mar 2024 21:11:36 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4BC41A0F5F for ; Thu, 7 Mar 2024 02:11:36 +0000 (UTC) X-FDA: 81868616592.11.A28441A Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by imf16.hostedemail.com (Postfix) with ESMTP id 6A878180013 for ; Thu, 7 Mar 2024 02:11:34 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="AqykEe/i"; spf=pass (imf16.hostedemail.com: domain of rulin.huang@intel.com designates 192.198.163.15 as permitted sender) smtp.mailfrom=rulin.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709777494; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=n2YCvg9TryJQUjlqFHBM7qdfe/RA8+PxIlJAjoGhLyk=; b=8L8BnEuspNB7oR0GjvJMpclnwB3BoC0gZjh+pbmI1XPCHLUuwvxCdRTAR7JFywzW+XUTum aMdEELqcFEpx4h2lIsTzMJsc/32njJMP1RTybQiHUDLdNj+gFwUUoeJaS9upm68kczi61i WvJTTKpTIwHIJkzKsgXExdjur1Y70yg= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="AqykEe/i"; spf=pass (imf16.hostedemail.com: domain of rulin.huang@intel.com designates 192.198.163.15 as permitted sender) smtp.mailfrom=rulin.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709777494; a=rsa-sha256; cv=none; b=vmcGSq2EM4v95bnJPeG7ZCkZmSPtd2Lq++bk4HyAtKkQP0IyS1IQcjPKs8alpnSGJUWR2P DCB6aRCR3JzjZO25CzL9DiKIpXPJ9c2iV5OVAGUsBkJ6jue38CMOUjIzJoroBd/kluyv/w Jgx+7htO3aNTAmqGuxQ99+jHMpFcLpM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709777494; x=1741313494; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=rSVzpqAtaP7VsIqGvDvnM7VnZ7HA9GL+hoNyerON4vw=; b=AqykEe/iPYhB8PFnj1dpGbAt/D+WWQ+wH2GTC/25MF5xXg0RktWt2n5g 2g8CYXm/OX8cqz0Yh8PA2vnzmyf494Y4awL2WDR7KAqVg+mx6++p4UDM1 JxINoDeLhxSQj5sqZXWbZFRpT7uYWjavLQpjCd2z/xv+D0FkIDw0WkQ4H 5SRPk9kshwvcKWWaXrQ1QCFNtx/Wa+bKpN/peoB7AF6qYU1EFgy+Url+g 3OoUCTJMHVXkKVG206N+YykNEgdtyQCK2yq0JWyPl+zG2nvysVa0B7v/Z vKDN0I6UeTOqFsQGIsGoJzLknclh+JyVYz15fz9XqA4yeEM0KwLIGaNq+ g==; X-IronPort-AV: E=McAfee;i="6600,9927,11005"; a="4594951" X-IronPort-AV: E=Sophos;i="6.06,209,1705392000"; d="scan'208";a="4594951" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2024 18:11:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,209,1705392000"; d="scan'208";a="9852876" Received: from linux-pnp-server-09.sh.intel.com ([10.239.176.190]) by fmviesa007.fm.intel.com with ESMTP; 06 Mar 2024 18:11:30 -0800 From: rulinhuang To: urezki@gmail.com, bhe@redhat.com Cc: akpm@linux-foundation.org, colin.king@intel.com, hch@infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, lstoakes@gmail.com, rulin.huang@intel.com, tianyou.li@intel.com, tim.c.chen@intel.com, wangyang.guo@intel.com, zhiguo.zhou@intel.com Subject: [PATCH v8] mm/vmalloc: Eliminated the lock contention from twice to once Date: Wed, 6 Mar 2024 21:14:40 -0500 Message-ID: <20240307021440.64967-1-rulin.huang@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6A878180013 X-Rspam-User: X-Stat-Signature: njkasfmoqakd8j7k83sez4hou6zmkr6o X-Rspamd-Server: rspam01 X-HE-Tag: 1709777494-579904 X-HE-Meta: U2FsdGVkX19TDLx5SDnHRGr+wvEC7Nu97IA2LJXGBJQDfeZUg1avLWn4VzSHmFjItcvcvyEReMy4XmpN94GUZPZ6sFOSRK0zruVzy4Oaj3LhaP3xx83GNlpxkomFSe6Mf/DcakpVsziyB2z3JqYscJch6405NWUjjtafyuS8rJkjSdojA9kxqkz55GTpQB40osGQB9DNCFJNHCZBhuCcMwaXu4i++BvHVhuW2bNSPEJHWjrk3ErGl45BEYKM6OwmXh7cX0ahcHQ19l20cx31UyJRbxbAIUQeehe/joCM6eM8ha/ACUkDbhDgVfY3Z2uGF85dlxvsXukPU3iMUv9ZSBY4JjEHoRva4/AL1YqzYm/USMvDOhII7qi4/gjdouCQ6QLpcB8imhwu3AgPK3h8w812L4gttt2K8Gc5newXY++TsuL7ObtI3z9di8xyihZc/w0BRrLl7jPUj7SARl/c+0YfSxxMokBwhe5YWMP1MqfTEYeUBoPjDlyae2U6YL4++Cu/hYW02AzeOG1h7WC1f1WpY4DhFzsZW8CUg6V2RdqSTR0mcvUorI4apE6ztL9tCXJL2IUeQi8hgOzj8OpTszHkRBhuN2Xhpk7UkG42t2fuWovZEJYX/JtZ/+g/acM7WJV2lhT2o4vwGUP3/F7g+L3TS0h62ZrQMC4yVkfVQSoCpQs3SQAvd7wvaxTZyyXkCo3xMuWTPG4GZ31s9Rdvnk2nrH2RXf+7h6V9ZAw3RJEbsiicZl/cpXXMLHIfRy8iF91pHIV8MbPRGuQtAJOf+XW0eREJYML6gTCFkUPHou1rx1JQqdOFBOstXJMqlGDZGVmEJf0/jxm4jxKk/pdkw+g1CQxvE+2p/gp644UP1FAll4M9ghYK0PJipj9Y9y1z 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: 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(-) 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