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 D9D02C54798 for ; Fri, 23 Feb 2024 13:01:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A5F06B006E; Fri, 23 Feb 2024 08:01:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 32EDC6B0071; Fri, 23 Feb 2024 08:01:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A8F36B0072; Fri, 23 Feb 2024 08:01:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 080D86B006E for ; Fri, 23 Feb 2024 08:01:13 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CA145C1150 for ; Fri, 23 Feb 2024 13:01:12 +0000 (UTC) X-FDA: 81823079184.24.F802AD3 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by imf18.hostedemail.com (Postfix) with ESMTP id 2F8B81C002A for ; Fri, 23 Feb 2024 13:01:08 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=m7m1boU2; spf=pass (imf18.hostedemail.com: domain of rulin.huang@intel.com designates 198.175.65.9 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=1708693270; 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:in-reply-to:references:references:dkim-signature; bh=NYpbMI1UQOD9zIXAdvl8v15H47thtkolgSBKYC19Z7c=; b=pq6sgVFmdv4mgCSoz+7GvGb3qadDtk2qCQnePOYmv1A6i9HtDd5LE5oOIWNv2KsXo6FiF0 o58vAX4gt7CGB6W0vYIPBRVd03P0kfcq+lOXucslsySLduWcULo1BR2sboqEd+/8suuoCa W5QFa8xZ2cnOGRmfmClYCMvcdHvA41Q= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=m7m1boU2; spf=pass (imf18.hostedemail.com: domain of rulin.huang@intel.com designates 198.175.65.9 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=1708693270; a=rsa-sha256; cv=none; b=6f+1gA5Y6fyPSmUERVkzvzYUVTt2MLzvKC9ctEJMOw37ngra9zLugtK4GFgJerYgK9x/f4 8zCXzNtKkDTql96zCG5DBmxbE/WGLer9Rz2uq3YM8JvGKjQKtTBLrvxF/eUyzX1nppv1s3 vWh0EOIV228tqZL1hbk2Z4IAbFAiu8g= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708693270; x=1740229270; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8zCjAhelcZ3RRKa7WFuIXi9YgEQhHdl4OA8stTHmYYE=; b=m7m1boU29cvX6VxYffRcmdEdWXYypTZV3kMXOL7GQUrvovoCET6OB8BN i8LSrc4o2APUjjzqwCD9yioim3lhjUIvVBsyws0Y4qixlRc9Axz8L9WFa NUoQ7SD8G/56BA//JSIXPRj/JdKjf98xA+ZerZpppl1uLoIhhzRrCgq/h CtJQrARaCKG5ql8j+f8zim3/JT6IVn+OdGZu9Nk9l/KJEpcbZEN399sor Fjqhgu+lyW+8acGptouc8o9MavSh5Qi666ipU0ESSPslnexUUsoiBIJng wh78HOd1O+wBrvQu7Q1mdIusTGp4jJYJX1IefSwy8fOw5Y9hHZbMm8T5J g==; X-IronPort-AV: E=McAfee;i="6600,9927,10992"; a="25479601" X-IronPort-AV: E=Sophos;i="6.06,180,1705392000"; d="scan'208";a="25479601" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2024 05:01:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,180,1705392000"; d="scan'208";a="10596216" Received: from linux-pnp-server-09.sh.intel.com ([10.239.176.190]) by orviesa004.jf.intel.com with ESMTP; 23 Feb 2024 05:01:04 -0800 From: rulinhuang To: urezki@gmail.com, bhe@redhat.com Cc: 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 v5] mm/vmalloc: lock contention optimization under multi-threading Date: Fri, 23 Feb 2024 08:03:19 -0500 Message-ID: <20240223130318.112198-2-rulin.huang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240207033059.1565623-1-rulin.huang@intel.com> References: <20240207033059.1565623-1-rulin.huang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2F8B81C002A X-Rspam-User: X-Stat-Signature: dzmao84sjgi4nqpsbr55ojcpb979bw37 X-Rspamd-Server: rspam01 X-HE-Tag: 1708693268-867127 X-HE-Meta: U2FsdGVkX18ixa2k2DIEgiUlRmMzHPACiKpHkjBao4VcKgQO1AG6JfyI6vd9aTPkDU1aROxrO9Wrvq8Y9PvmcfscRs/f4g5TvtIYJSIGvGm1ept3ltHh/Re53uey+WyPMrjXQAGSJHVk2M/QF2cMCyc9ZSrnpDT+XMUysK8/N05dJA4VNeD/noAzsWjN5RV7pd1f5xipxWVuhRhv2WjNTIMpuPsYArihk6KXR8eNA6H4tnnOxWN5HcmLwgtdX3oLByZMiwA7YTuHzgIKNaAAqOU+Q5ug11WTbj+r1gmX0AxXn4DklS+uU4q9V4AQmW4nK79dGE3cykX/V+bgJn3v0sLFYYIOpOGzh42T6DLqfNDxlsZt6K3PlXEG8/GUqarj+9YZdkrg3psfqjmzqyb7CoRHw4hJlhuHnYHKhYj3HbCSnEJ+kATeYmM6U4cPyAJHFAhO7wXNgBInhJoI4rjoIFYrzJ2GYEIUwpTP6jwtrnu4TzJTqqyqGoHOkytA118IXVZWNGOPfIBM4jCBaADNFOstTZuPUr2Y7WMmNFI+BMDwfx0TXiIP3D9tOfF6sqp96cHcmUY6Ras29JPi2G+Y6BRJqYvvJCVEqbt8/jUObrPoMyDXMOcZBh9+angM4ohJVjLSkWp/JumpJj9wyC/bEICPCeYsoEny99YFhc6wJMIxfqPQSVtu7o55XbV4fD+iSoHSsxTjFdsUEewGXXbKxduNmLREpjhDe6ZXAa2giO5wsEa4OEBHTUw+o/KMnkf/1Aq/YmqHgSgNQITAar45Bg+pU8lFLupMO+4hmhWVz89uePVhVfK8OD6NIkCFJGQHWKekCuc+9hSdW5cxxVNyz7lE0Z79yby5V6d2q1Xub1uToOcAILf/iMopxICVn+vJ 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_area 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_area lock is contended. By doing so, the need to acquire the lock twice can also be eliminated. With the above change, tested on intel icelake platform(160 vcpu, kernel v6.7), a 6% performance improvement and a 7% reduction in overall spinlock hotspot are gained on stress-ng/pthread(https://github.com/ColinIanKing/stress-ng), which is the stress test of thread creations. 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() --- mm/vmalloc.c | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 25a8df497255..6baaf08737f8 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,7 +2998,7 @@ 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; @@ -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); } base-commit: c09a8e005eff6c064e2e9f11549966c36a724fbf -- 2.43.0