From patchwork Thu Feb 29 08:26:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Rulin" X-Patchwork-Id: 13576822 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 50A1DC48BF6 for ; Thu, 29 Feb 2024 08:26:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F2316B009D; Thu, 29 Feb 2024 03:26:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A1046B009E; Thu, 29 Feb 2024 03:26:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 740A16B009F; Thu, 29 Feb 2024 03:26:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 5DB256B009D for ; Thu, 29 Feb 2024 03:26:40 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 14EA1A0267 for ; Thu, 29 Feb 2024 08:26:40 +0000 (UTC) X-FDA: 81844160160.27.C78C2A2 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by imf18.hostedemail.com (Postfix) with ESMTP id 1EBC01C000E for ; Thu, 29 Feb 2024 08:26:36 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=IOFjDei7; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf18.hostedemail.com: domain of rulin.huang@intel.com designates 192.198.163.7 as permitted sender) smtp.mailfrom=rulin.huang@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709195198; 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=zGPUNNz07XB0K50XItsiJrfw1sE3FLrBNfXLxYiaiho=; b=RPAeXPqGwxXpTCd80YwWcayQMBqFocdbq/Pebu+x9bq6NcyJpRdCgZYKHx8UNO/nSNJ0RF 6Hb74j1mIB77IKfC2SjbfIdtrbWjFLWNd8KjiObQkmv1ikMECdCH/HNStKwywiY444/Imn 5eq1Ju5iSdRpvats+xyKqnQh06v2qzA= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=IOFjDei7; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf18.hostedemail.com: domain of rulin.huang@intel.com designates 192.198.163.7 as permitted sender) smtp.mailfrom=rulin.huang@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709195198; a=rsa-sha256; cv=none; b=HtjRMUzqyMtj6G3G9hkBuqzrMh/etx0V2wTFOSAqpxKh3VP0NJkKo8fx7AfaNUo1RDftF5 91Na62RiTrXzLNeDM49U7BF0YyrIz/OsCxNZYFexIZKsadAiQcI2EQMKxdjwDJES7xa31r mVNi0zfcj5nNVojwhXIsX+XGWKW06YU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709195197; x=1740731197; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=juUcc4UcKK/NL61XUnA4t+5ff677KqidZ2CHwPWtVYc=; b=IOFjDei7wAOfudptzuFt2roBuV1qI8S3xxTc5J/keZHyrA40Xm3YmhAy cJiRPQEAYi1P0Ve6yMZqu/1iKLAG8+c+pWHotiwuuEhE+wa8IsavHlQ6a fPTfCLFiMTdsd8fGJF86vNLTBpdwoTvbLFQK0GmVK4jW/JE2ZiBvoYuJH SBuJOoucUwmxsDSscUrcxubLPpNAOaVgl+lKPsrAlC/3aA5WARQgFmfLw +1Hb3d3MupHyRHHBmHa0bcV6U6gHhA2Sv8IGjRUPs3g45WqfOL9/3P0Eb GjqjjHiH57OybWdHxoZ9MqY7z5845jMW5qbGEK8puo/0qQvz0wOVoPcY/ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10998"; a="29082089" X-IronPort-AV: E=Sophos;i="6.06,192,1705392000"; d="scan'208";a="29082089" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 00:26:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,192,1705392000"; d="scan'208";a="12360365" Received: from a4bf01946c30.jf.intel.com ([10.165.116.30]) by fmviesa004.fm.intel.com with ESMTP; 29 Feb 2024 00:26:33 -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 v6] mm/vmalloc: lock contention optimization under multi-threading Date: Thu, 29 Feb 2024 00:26:11 -0800 Message-ID: <20240229082611.4104839-1-rulin.huang@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 1EBC01C000E X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: p3xzsi3xf9cbhe5uszfnwqoafpjdism9 X-HE-Tag: 1709195196-617629 X-HE-Meta: U2FsdGVkX18H69BPrYbYBgn9LQhe/YgPuvBy5FDzv3QBh1aaGDw3xjfYSEdVYtZWSzAtvE/YIzEBAZPOdPoCKSnXm8TpBZQLntozQd3leNb9LneGnl99O+RirASFQGWbSeJ/j8AgmFfPMfvatuHfwhRLUD4WIfUDcVzeRRIeJNRl+2CbUNRpYQhsopz4GDkx3sTjGFiCURj7HY1ElDRxIx5TXY+IdWf1BkrdaApNnyIqQIDG+0QT7i3SS7/XeidoZUJ6EnbY9wVEpwyyXTvA3iilrZf4y2JY6PHAlguhBeASSK9phEmAh3PfObfJ43+UMk5Jaao+Wi293XhOZOSJXatkaK2IngSsjYoRljzxmUVtUFPqPedfKoUVsfzShhbASAA2ZAGXskJJY/7ha3yL+ynH0Wn1vUqP9QO6LQ7zkKGAl6RtO6P5eXQJQIGd5qJKcBm3XuIXh3/RmbbRyCDNkHk5sSkBlfru8OTgj+uFF4c5E9NxKqGet/BBBN64dLAgSxlKssHjET1CqOcc5cjQZHyGFRg+3aOO26GlXdx8lABe36GD/giTN4ejlKolWBpeqImlrAm12jvWkTPNVvrLSs2hd6tAHL6m+Z34VuNLPE879kcfTev639OVq/IAtQU59T/PFJSxPdjmqWwmA6yp+thnKcYPb2BuMdqD4pEjKFbgIByS94xWdXJx2AonwtORCidYBYRN0liX1OOxv45ZbdgyV5FesSBRBJ3Yiuq3EwaiQ23i2upcciTlZSSZlAxFOpRK7UTOAkDCq+ts30kar+2C98jz/QHeD1YBKc5PB06qjsvl8vT3UDkmsbSFgzuoOUMPWUkMHrn6gbD7CK9JmAafbGAZoBUdyu6Vtt+sNw1or2RWjjLx5arkZ915vmAJ 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. Reviewed-by: Uladzislau Rezki Reviewed-by: Baoquan He Reviewed-by: "Chen, Tim C" Reviewed-by: "King, Colin" Signed-off-by: rulinhuang Signed-off-by: "Chen, Tim C" Signed-off-by: "King, Colin" Reviewed-by: Uladzislau Rezki Reviewed-by: Baoquan He Reviewed-by: "Chen, Tim C" Reviewed-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: cancel the split of alloc_vmap_area() and keep insert_vmap_area() V5 -> V6: add bug_on --- mm/vmalloc.c | 132 +++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 68 deletions(-) base-commit: 7e6ae2db7f319bf9613ec6db8fa3c9bc1de1b346 diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 25a8df497255..5ae028b0d58d 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1841,15 +1841,66 @@ node_alloc(unsigned long size, unsigned long align, return va; } +/*** Per cpu kva allocator ***/ + +/* + * vmap space is limited especially on 32 bit architectures. Ensure there is + * room for at least 16 percpu vmap blocks per CPU. + */ +/* + * If we had a constant VMALLOC_START and VMALLOC_END, we'd like to be able + * to #define VMALLOC_SPACE (VMALLOC_END-VMALLOC_START). Guess + * instead (we just need a rough idea) + */ +#if BITS_PER_LONG == 32 +#define VMALLOC_SPACE (128UL*1024*1024) +#else +#define VMALLOC_SPACE (128UL*1024*1024*1024) +#endif + +#define VMALLOC_PAGES (VMALLOC_SPACE / PAGE_SIZE) +#define VMAP_MAX_ALLOC BITS_PER_LONG /* 256K with 4K pages */ +#define VMAP_BBMAP_BITS_MAX 1024 /* 4MB with 4K pages */ +#define VMAP_BBMAP_BITS_MIN (VMAP_MAX_ALLOC*2) +#define VMAP_MIN(x, y) ((x) < (y) ? (x) : (y)) /* can't use min() */ +#define VMAP_MAX(x, y) ((x) > (y) ? (x) : (y)) /* can't use max() */ +#define VMAP_BBMAP_BITS \ + VMAP_MIN(VMAP_BBMAP_BITS_MAX, \ + VMAP_MAX(VMAP_BBMAP_BITS_MIN, \ + VMALLOC_PAGES / roundup_pow_of_two(NR_CPUS) / 16)) + +#define VMAP_BLOCK_SIZE (VMAP_BBMAP_BITS * PAGE_SIZE) + +/* + * Purge threshold to prevent overeager purging of fragmented blocks for + * regular operations: Purge if vb->free is less than 1/4 of the capacity. + */ +#define VMAP_PURGE_THRESHOLD (VMAP_BBMAP_BITS / 4) + +#define VMAP_RAM 0x1 /* indicates vm_map_ram area*/ +#define VMAP_BLOCK 0x2 /* mark out the vmap_block sub-type*/ +#define VMAP_FLAGS_MASK 0x3 + +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 +1963,11 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, va->vm = NULL; va->flags = (va_flags | vn_id); + if (vm) { + BUG_ON(va_flags & VMAP_RAM); + setup_vmalloc_vm(vm, va, flags, caller); + } + vn = addr_to_node(va->va_start); spin_lock(&vn->busy.lock); @@ -2325,46 +2381,6 @@ static struct vmap_area *find_unlink_vmap_area(unsigned long addr) return NULL; } -/*** Per cpu kva allocator ***/ - -/* - * vmap space is limited especially on 32 bit architectures. Ensure there is - * room for at least 16 percpu vmap blocks per CPU. - */ -/* - * If we had a constant VMALLOC_START and VMALLOC_END, we'd like to be able - * to #define VMALLOC_SPACE (VMALLOC_END-VMALLOC_START). Guess - * instead (we just need a rough idea) - */ -#if BITS_PER_LONG == 32 -#define VMALLOC_SPACE (128UL*1024*1024) -#else -#define VMALLOC_SPACE (128UL*1024*1024*1024) -#endif - -#define VMALLOC_PAGES (VMALLOC_SPACE / PAGE_SIZE) -#define VMAP_MAX_ALLOC BITS_PER_LONG /* 256K with 4K pages */ -#define VMAP_BBMAP_BITS_MAX 1024 /* 4MB with 4K pages */ -#define VMAP_BBMAP_BITS_MIN (VMAP_MAX_ALLOC*2) -#define VMAP_MIN(x, y) ((x) < (y) ? (x) : (y)) /* can't use min() */ -#define VMAP_MAX(x, y) ((x) > (y) ? (x) : (y)) /* can't use max() */ -#define VMAP_BBMAP_BITS \ - VMAP_MIN(VMAP_BBMAP_BITS_MAX, \ - VMAP_MAX(VMAP_BBMAP_BITS_MIN, \ - VMALLOC_PAGES / roundup_pow_of_two(NR_CPUS) / 16)) - -#define VMAP_BLOCK_SIZE (VMAP_BBMAP_BITS * PAGE_SIZE) - -/* - * Purge threshold to prevent overeager purging of fragmented blocks for - * regular operations: Purge if vb->free is less than 1/4 of the capacity. - */ -#define VMAP_PURGE_THRESHOLD (VMAP_BBMAP_BITS / 4) - -#define VMAP_RAM 0x1 /* indicates vm_map_ram area*/ -#define VMAP_BLOCK 0x2 /* mark out the vmap_block sub-type*/ -#define VMAP_FLAGS_MASK 0x3 - struct vmap_block_queue { spinlock_t lock; struct list_head free; @@ -2486,7 +2502,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 +2860,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 +2964,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 +3000,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 +4580,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); }