From patchwork Fri Mar 1 15:54:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Rulin" X-Patchwork-Id: 13578641 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 34302C5475B for ; Fri, 1 Mar 2024 15:51:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BF1E6B0081; Fri, 1 Mar 2024 10:51:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9469E6B0082; Fri, 1 Mar 2024 10:51:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C3506B0083; Fri, 1 Mar 2024 10:51:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 6179B6B0081 for ; Fri, 1 Mar 2024 10:51:26 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F3A05A11B0 for ; Fri, 1 Mar 2024 15:51:25 +0000 (UTC) X-FDA: 81848909730.14.569B496 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by imf08.hostedemail.com (Postfix) with ESMTP id E3B76160015 for ; Fri, 1 Mar 2024 15:51:23 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=KOuqAoTQ; spf=pass (imf08.hostedemail.com: domain of rulin.huang@intel.com designates 192.198.163.17 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=1709308284; 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=d+IpvwFLLyvE7ikE4yEpOks4VSdczhpopVoaRh+unko=; b=159w0Es08tHdSOvlfPQMDJE2Ipo6ctHhuhbag4XindJPY5PzyEKFJFcVGJvtEGkUtkSRAS RXB1sS+qkyLyAOUDozVpF30Z1msi5zjtthP/thu38pnPaxLIs8E8wklJelzGpWxeLWqJZj idPjfmg9uIf3BsuwI1INrKwvAPeECQ8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709308284; a=rsa-sha256; cv=none; b=XGTWb5q+0d3h30dMkH1kX7AOWa+O9P21rmTBPywfH33xLPr/S/9EKLPt06c+jvGRtbJM9j OYXW6L04KDBRVNi0xcmcvvOryMEHoozx19/VRmP90oWe8QUUhkjBfgz66GpmsJOPPe4u0G Mk7/21FbPbMa82dPOY4dpCE02GZUl18= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=KOuqAoTQ; spf=pass (imf08.hostedemail.com: domain of rulin.huang@intel.com designates 192.198.163.17 as permitted sender) smtp.mailfrom=rulin.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709308284; x=1740844284; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PDWDDt4QR97SNsCyWpItSkT/i9E2ArftSSSpich7b2U=; b=KOuqAoTQwzClkMyPKnqDaP+lJr3tTquh7EKtzU6Z9J9LyVxRXc8DpjcR fr3xQrWOlolDx++naV5xhca0UXmMLL2+vuf1vWQNkBEC9XHe3KClh+WWa xT6IgfpwHxBj1Ca9aBBdvXLr0h9uu3nckgkjqU3aqiciD/+hEa8oqwiWU ZsaIEyvGlc0uJKhg3ow5TwcLduEugKtE15ZzyP8NPfB38HMzLUoskPjJV 7qqsrpOzDCvm6XxIAPWzH1PgzaJHrWYKcMaKsJvdcIyMZSZBSwj2ZF6+G rS/cKR84xjH8Oe0AUzTg5tAPhlPlbbx4LfHTsmBJ1SwJbZ04Ucgw4Hi3L w==; X-IronPort-AV: E=McAfee;i="6600,9927,11000"; a="3700842" X-IronPort-AV: E=Sophos;i="6.06,196,1705392000"; d="scan'208";a="3700842" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2024 07:51:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,196,1705392000"; d="scan'208";a="8370205" Received: from linux-pnp-server-09.sh.intel.com ([10.239.176.190]) by fmviesa008.fm.intel.com with ESMTP; 01 Mar 2024 07:51:20 -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 v7 1/2] mm/vmalloc: Moved macros with no functional change happened Date: Fri, 1 Mar 2024 10:54:16 -0500 Message-ID: <20240301155417.1852290-2-rulin.huang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240301155417.1852290-1-rulin.huang@intel.com> References: <20240301155417.1852290-1-rulin.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: E3B76160015 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: ke3fg8858pz8ot9pkimt6opm13uobh9c X-HE-Tag: 1709308283-258402 X-HE-Meta: U2FsdGVkX19tWDYMKF1yL6m17oae0Y6DcUZcdqfiNaSIvhEX6ERlu1skZcdG1jID02RksgW2LG1Zc4AbFtF0iahmrvvE7glf/H+bfmKm6y1veIPMqQjJKTOShOmcCHVEIkRXEWD9GLc1qlnA2/blN8f8o+sYWR4E7jadEiU1wt0rmPv1gaFa0rqilSFZFlzDDrFDIgpPTSaJfIS5H6tMGGtx1nJlocN7DTs2T8/hs5XyIVZvCx/vIbAvFdvGr+NzHDvQMFMgQbnFxd25drKPzzUDNVxKDx61IOrOGYiETXfBQ3jHDyHidYBF7LfDqd0MxwlmGliW1zOyl9ASh54J9VyGh0itJR2Xs7pDOia37aV7Cs+PJ5XC6zX1lEXiIw0cs81MVZHH8Szh9iD1j6/nvdX3WyKg5wKM8AVkksTlq4i3KcH3wgTi5ALGtiFdM0tZPTb9av9Sfvrlcb4T1tNmN698aM77yljUGC/pQziBcSTXcdinDQbwaBj91ECa5I6vobd1kA/iOz9f0sSfC41m5ntkBJymeb3pMWlHVS6jZDI/aGBcsISzIw/FP+iALmhlYxh+3tprShpmcBE6gjD4QFbLJTPZy+5AtbGwCPxmi3AiU0U7XNSazASiK7MqLeZLK3GIVpUi/joigYVs2WxT0V2ZZ7IR31nL4HIpizAjgIOAeXgI3oaM5UhTY2Z7vn5IHpbi46VX9xiVa2da2i9TMXSsU/c9QsdOsQ3Nsz7KUTMgFYiLB2dWih8u9fU8g7zbMyClj6A+tD4pdpt1YHYA0i30RGBbwq6DNkrQf5aLVDaWtjcqXdqjaDJWY2VyXbADORk34EPHk0tUyGrIShHkMnkMkK9k++TNmQtcdiRxyRG1nVfUsJmgmyKwSF66ML7p 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: Moved data structures and basic helpers related to per cpu kva allocator up too to along with these macros with no functional change happened. Signed-off-by: rulinhuang Reviewed-by: Baoquan He Reviewed-by: Uladzislau Rezki (Sony) --- V6 -> V7: Adjusted the macros --- mm/vmalloc.c | 262 +++++++++++++++++++++++++-------------------------- 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 25a8df497255..fc027a61c12e 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -887,6 +887,137 @@ is_vn_id_valid(unsigned int node_id) return false; } +/* + * 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; + + /* + * An xarray requires an extra memory dynamically to + * be allocated. If it is an issue, we can use rb-tree + * instead. + */ + struct xarray vmap_blocks; +}; + +struct vmap_block { + spinlock_t lock; + struct vmap_area *va; + unsigned long free, dirty; + DECLARE_BITMAP(used_map, VMAP_BBMAP_BITS); + unsigned long dirty_min, dirty_max; /*< dirty range */ + struct list_head free_list; + struct rcu_head rcu_head; + struct list_head purge; +}; + +/* Queue of free and dirty vmap blocks, for allocation and flushing purposes */ +static DEFINE_PER_CPU(struct vmap_block_queue, vmap_block_queue); + +/* + * In order to fast access to any "vmap_block" associated with a + * specific address, we use a hash. + * + * A per-cpu vmap_block_queue is used in both ways, to serialize + * an access to free block chains among CPUs(alloc path) and it + * also acts as a vmap_block hash(alloc/free paths). It means we + * overload it, since we already have the per-cpu array which is + * used as a hash table. When used as a hash a 'cpu' passed to + * per_cpu() is not actually a CPU but rather a hash index. + * + * A hash function is addr_to_vb_xa() which hashes any address + * to a specific index(in a hash) it belongs to. This then uses a + * per_cpu() macro to access an array with generated index. + * + * An example: + * + * CPU_1 CPU_2 CPU_0 + * | | | + * V V V + * 0 10 20 30 40 50 60 + * |------|------|------|------|------|------|... + * CPU0 CPU1 CPU2 CPU0 CPU1 CPU2 + * + * - CPU_1 invokes vm_unmap_ram(6), 6 belongs to CPU0 zone, thus + * it access: CPU0/INDEX0 -> vmap_blocks -> xa_lock; + * + * - CPU_2 invokes vm_unmap_ram(11), 11 belongs to CPU1 zone, thus + * it access: CPU1/INDEX1 -> vmap_blocks -> xa_lock; + * + * - CPU_0 invokes vm_unmap_ram(20), 20 belongs to CPU2 zone, thus + * it access: CPU2/INDEX2 -> vmap_blocks -> xa_lock. + * + * This technique almost always avoids lock contention on insert/remove, + * however xarray spinlocks protect against any contention that remains. + */ +static struct xarray * +addr_to_vb_xa(unsigned long addr) +{ + int index = (addr / VMAP_BLOCK_SIZE) % num_possible_cpus(); + + return &per_cpu(vmap_block_queue, index).vmap_blocks; +} + +/* + * We should probably have a fallback mechanism to allocate virtual memory + * out of partially filled vmap blocks. However vmap block sizing should be + * fairly reasonable according to the vmalloc size, so it shouldn't be a + * big problem. + */ + +static unsigned long addr_to_vb_idx(unsigned long addr) +{ + addr -= VMALLOC_START & ~(VMAP_BLOCK_SIZE-1); + addr /= VMAP_BLOCK_SIZE; + return addr; +} + +static void *vmap_block_vaddr(unsigned long va_start, unsigned long pages_off) +{ + unsigned long addr; + + addr = va_start + (pages_off << PAGE_SHIFT); + BUG_ON(addr_to_vb_idx(addr) != addr_to_vb_idx(va_start)); + return (void *)addr; +} + static __always_inline unsigned long va_size(struct vmap_area *va) { @@ -2327,137 +2458,6 @@ static struct vmap_area *find_unlink_vmap_area(unsigned long addr) /*** 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; - - /* - * An xarray requires an extra memory dynamically to - * be allocated. If it is an issue, we can use rb-tree - * instead. - */ - struct xarray vmap_blocks; -}; - -struct vmap_block { - spinlock_t lock; - struct vmap_area *va; - unsigned long free, dirty; - DECLARE_BITMAP(used_map, VMAP_BBMAP_BITS); - unsigned long dirty_min, dirty_max; /*< dirty range */ - struct list_head free_list; - struct rcu_head rcu_head; - struct list_head purge; -}; - -/* Queue of free and dirty vmap blocks, for allocation and flushing purposes */ -static DEFINE_PER_CPU(struct vmap_block_queue, vmap_block_queue); - -/* - * In order to fast access to any "vmap_block" associated with a - * specific address, we use a hash. - * - * A per-cpu vmap_block_queue is used in both ways, to serialize - * an access to free block chains among CPUs(alloc path) and it - * also acts as a vmap_block hash(alloc/free paths). It means we - * overload it, since we already have the per-cpu array which is - * used as a hash table. When used as a hash a 'cpu' passed to - * per_cpu() is not actually a CPU but rather a hash index. - * - * A hash function is addr_to_vb_xa() which hashes any address - * to a specific index(in a hash) it belongs to. This then uses a - * per_cpu() macro to access an array with generated index. - * - * An example: - * - * CPU_1 CPU_2 CPU_0 - * | | | - * V V V - * 0 10 20 30 40 50 60 - * |------|------|------|------|------|------|... - * CPU0 CPU1 CPU2 CPU0 CPU1 CPU2 - * - * - CPU_1 invokes vm_unmap_ram(6), 6 belongs to CPU0 zone, thus - * it access: CPU0/INDEX0 -> vmap_blocks -> xa_lock; - * - * - CPU_2 invokes vm_unmap_ram(11), 11 belongs to CPU1 zone, thus - * it access: CPU1/INDEX1 -> vmap_blocks -> xa_lock; - * - * - CPU_0 invokes vm_unmap_ram(20), 20 belongs to CPU2 zone, thus - * it access: CPU2/INDEX2 -> vmap_blocks -> xa_lock. - * - * This technique almost always avoids lock contention on insert/remove, - * however xarray spinlocks protect against any contention that remains. - */ -static struct xarray * -addr_to_vb_xa(unsigned long addr) -{ - int index = (addr / VMAP_BLOCK_SIZE) % num_possible_cpus(); - - return &per_cpu(vmap_block_queue, index).vmap_blocks; -} - -/* - * We should probably have a fallback mechanism to allocate virtual memory - * out of partially filled vmap blocks. However vmap block sizing should be - * fairly reasonable according to the vmalloc size, so it shouldn't be a - * big problem. - */ - -static unsigned long addr_to_vb_idx(unsigned long addr) -{ - addr -= VMALLOC_START & ~(VMAP_BLOCK_SIZE-1); - addr /= VMAP_BLOCK_SIZE; - return addr; -} - -static void *vmap_block_vaddr(unsigned long va_start, unsigned long pages_off) -{ - unsigned long addr; - - addr = va_start + (pages_off << PAGE_SHIFT); - BUG_ON(addr_to_vb_idx(addr) != addr_to_vb_idx(va_start)); - return (void *)addr; -} - /** * new_vmap_block - allocates new vmap_block and occupies 2^order pages in this * block. Of course pages number can't exceed VMAP_BBMAP_BITS From patchwork Fri Mar 1 15:54:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Rulin" X-Patchwork-Id: 13578642 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 0B81BC54E49 for ; Fri, 1 Mar 2024 15:51:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D3476B0083; Fri, 1 Mar 2024 10:51:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 85B966B0085; Fri, 1 Mar 2024 10:51:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D5556B0087; Fri, 1 Mar 2024 10:51:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 56D856B0083 for ; Fri, 1 Mar 2024 10:51:32 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3638A1404CC for ; Fri, 1 Mar 2024 15:51:32 +0000 (UTC) X-FDA: 81848910024.21.7DBF659 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by imf08.hostedemail.com (Postfix) with ESMTP id 34BA816000E for ; Fri, 1 Mar 2024 15:51:29 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=NYILHS0z; spf=pass (imf08.hostedemail.com: domain of rulin.huang@intel.com designates 192.198.163.17 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=1709308289; 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=4mZk9vk2iZtQtlZGLEQ2oXvXb1w7pfmOTlFb6YhZQOg=; b=BfBnwLru+gZJ4r58XZjSWFVGNtZNgibond8CaifTnfWGDwx62nwS0x4VcfZUlFJ7zkAhNS I8rfP4UieV+DrZPZH1OkPDRgsJbyA0V/5g21po9BCDboiECQ8jWWMwgYjlQQ8rwG2eSPR6 8wOK1kdWQzjrlKJvNey228ZbH7j3Sdw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709308289; a=rsa-sha256; cv=none; b=lzXEswF1iWnA2wq8yz84JRrYwbJ+awfUCK+ma3qf0zAX0UV+2mXOdHN78dHSsBNeK/c69P cGsltdd3aA2UmIELZb46NVBQt7TmKVqXe+HRy1LJcbMqyeO+dybMPO6GxVtJjaaO8YsNOB VkuIg4YEHTkd2u68QF+BOGQ6b9282To= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=NYILHS0z; spf=pass (imf08.hostedemail.com: domain of rulin.huang@intel.com designates 192.198.163.17 as permitted sender) smtp.mailfrom=rulin.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709308289; x=1740844289; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fKIRYBDOdjh4bWSu8rF+M1ucRSxQ8Q/A6JLal5oOMx0=; b=NYILHS0zBBV+NAot/AM+Blhi6tDUMuDpwSO+oABVcLG8RajPlLdnkYa/ eQLOuDm1/kkW1Df4grif3pdOWGZdeI8w9YMszyy5d7FCPbuWx4L/u+ZRq pn9+ECmHq1nGVSTNpvhSNsv9vgD85Ge8utO5ri02ypUfZpVZeJBhbtmZp Hrispw7kWAwQcaDsYpEgYFEMjqOusPh1Y+hA+0ExuHLnnuR7bcUElVm4+ enF9WEyQkD8vlH8DjQJrv5clrgkX34qiBGvBlITOr01GWeSYjBOGTRMFL e2EcIYVpvQywvZV8hcU3LdZyxTNgJxsC1pRzfengAeoMeMf5fFOUSxer2 A==; X-IronPort-AV: E=McAfee;i="6600,9927,11000"; a="3700866" X-IronPort-AV: E=Sophos;i="6.06,196,1705392000"; d="scan'208";a="3700866" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2024 07:51:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,196,1705392000"; d="scan'208";a="8370244" Received: from linux-pnp-server-09.sh.intel.com ([10.239.176.190]) by fmviesa008.fm.intel.com with ESMTP; 01 Mar 2024 07:51:26 -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 v7 2/2] mm/vmalloc: Eliminated the lock contention from twice to once Date: Fri, 1 Mar 2024 10:54:17 -0500 Message-ID: <20240301155417.1852290-3-rulin.huang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240301155417.1852290-1-rulin.huang@intel.com> References: <20240301155417.1852290-1-rulin.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 34BA816000E X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: mpzzzm6o8mws8qa4yypsmi89xt4yxjus X-HE-Tag: 1709308289-429799 X-HE-Meta: U2FsdGVkX18x3Zq2ICbRwkWnFGZMQ8Gw7Su2aNqfR7bCLCIhYqbO9u1T6FlCCdhhIpda2n5EnV3SXq63PY/evCAWIzaOQhtgqqZKTcZA1T+fRchr3t63N2tfYetDhanfEiLTYlf9TmEscJ8kGG8JvgYCPKS1ZkCOzElxm6hPDRD5J2mLWLcWNwkxDYizABK5cYrafZEjUUBw0XEZ4pu6JOWiXcji3NFBp6tR5dzV42nDicGlQKNSj6O6CgamugcNJ9pw3KXArzo7xg6EpvTLOvQeQWkxX88ajoX38IjIt53qx0bUiuPozBGaWhM/7CgHAfHUkL1x6Y6/1l11I6RVotMl37JuLTfRyjy9AsvDhja2McrUGpJgS5bnxZZLCD26YnQD5VSwCsTUW4A5p3IuRqF7i8dsANJU68yb3L6ThspAVaG8/J5hrNm43WhD198kH7Zxx+70uEQ3xMli8MteAVZOwAITJ8AHVb94KTSh7FgqIyk05lBA/XLvmMEFsiI90DBV9kzDC5dIoh5wcLuZgpuFz8PM2AeL8oSwG/rdIS8cTT8ta9lxAaf+t1UayfTYWPceHaRB1JVsJs3rZL0NHZ9+j6+H1Uuo3AtXO2CX2Zz1I1ZIFfGJHI7pRemTKbNbUjaNtTpyu7lzeJUqqODobEO9n/APbCd0WkxVYK7TWNuZAMOf/GlnfaTdzMitjFXmZcXLqDxLbSPE7M4dejdC1ZA6sVhlNQghXrvTUCdeQFvZjGGuojgPeh7sxTG4m0BkvZ7yLjSG2Bu/c/dwuWR3weO4mub2EHvwjYHUc1AQ+bGzVxZGpjL+1BS8T/+cqYxis4IVKwomzpA3TZcPtIcUAcdded1adBa1iBTmH7iYIq41iqQXznb5lEpriflMGMQh 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 Reviewed-by: Baoquan He --- 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 --- mm/vmalloc.c | 52 ++++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index fc027a61c12e..5b7c9156d8da 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1972,15 +1972,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; @@ -2043,6 +2054,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); @@ -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); }