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 8A4E6C54798 for ; Thu, 7 Mar 2024 19:26:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F380C6B027C; Thu, 7 Mar 2024 14:26:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EE9026B027D; Thu, 7 Mar 2024 14:26:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD8596B027E; Thu, 7 Mar 2024 14:26:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id CDDB66B027C for ; Thu, 7 Mar 2024 14:26:17 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 901801C097F for ; Thu, 7 Mar 2024 19:26:17 +0000 (UTC) X-FDA: 81871223994.07.38957E4 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by imf19.hostedemail.com (Postfix) with ESMTP id CF7831A0006 for ; Thu, 7 Mar 2024 19:26:15 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=arOVpW+j; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.43 as permitted sender) smtp.mailfrom=urezki@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709839575; 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=JvAHrOWgvGZRpeE0nYshgsb1o+/iRGWu+GmckAg1TGw=; b=Ahl0FASyJKvyuR/arV4tc9hM+RwHHRgOpF/Sn7QNg2FAM/eJVTFN2dmo1U/DNGvH9no0U3 uLqZguzN0ZdFUuWFLpTOatkwHBaho+Tl+FPLh8e4owQ7LjIvtUSYCa/XjfAmveFZYDx+7x etaTgdVXX8LTMYQXKF5gew0gO+td0Js= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=arOVpW+j; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.43 as permitted sender) smtp.mailfrom=urezki@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709839575; a=rsa-sha256; cv=none; b=lY5KVSil0n8HuWsgq1JCZbKp5qShI8wUHz+H+RfUyhbtGYBGUXTyp6VFXFlnFWI2myi45F SpLOPlMs2tZYNMzrSnlfKa7oQeT1A4njzOKjC5jJWVa35/sY5FyJmUnYxz55vIsbNERrmU UXo3c67Wyptd9xQNDpiguk824IZIft8= Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5131c0691feso1710262e87.1 for ; Thu, 07 Mar 2024 11:26:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709839574; x=1710444374; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=JvAHrOWgvGZRpeE0nYshgsb1o+/iRGWu+GmckAg1TGw=; b=arOVpW+jt/D1xDovcKz0046IejbG7co/l2yElqelqSMYFQUYQn2Zr8+JnSuH5bd3jD I9Db1Qx+p1eVFG4CA+iQYJGDjsMKa208u1OD8/Ge3bKrrjkv5pxrRJxayKexEKkdS6KA mEV+3ZCmVvJVQPs4tiMlWyBdaKoqzIENQrRUap6R+vBQkNzcSwuqLuARih+OqkG8w4Ve DVjKCDCqFue58ENZ4l9bSVuzj89Vo/hXrAn31gC/tHznMcEVg+s8FERvlofyV1L3VrBO 17m3wKOgK6WAPRvFT6OXADPluv5yhK9SNn0hG3XqRPecoP4v79cahpWrPTpp7phaLrnw JgyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709839574; x=1710444374; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JvAHrOWgvGZRpeE0nYshgsb1o+/iRGWu+GmckAg1TGw=; b=ZGo08sx6Ae87aYnaoZ2a/1n0M4pisArNQ/n75fgxeQGSyz9W1CVeBMtJh9swPWzP2S hUr9+UuZ0yI9PjdztN0E4BVp3UkgY6JTxmFNuV4vGDYTuMjkCP7gFLfBCH3PrS3RxGcL szmxQindRbA03QXIK8qa+40L3iGKwPGz+s3qFNciypRpua5Hc7RWQoeQRSIS5ebl/qBv AwrbM6lN/aKitlXG5OovRIWYS/VqpCH8myIGrSRFyPm2UwbHSv+uZfFK8VFNPs9KxYlu KVWFKUdLyyKEv1pa6INXGrqrGYfOzgUnEod59pxuYS/q4DvLMLEJF6vINM0FtLcCHpvK ET/A== X-Forwarded-Encrypted: i=1; AJvYcCVF0wCGQAINHPWtpPkbuIjXFFUcHYKNrB8McYvjfsCEj53e7vALRd2mvHq0K9dH2dORad/4miFWVmKLOz9fqVhKD44= X-Gm-Message-State: AOJu0Ywcebb88E/D5+R+ikZ9M6BXHI3ReXz8kzlL0qhCDzjAkjXjcxo4 lWkXuppSCKIZoT96FFatKItW8YbOEgqSqXTFXCjaHG38e1TBGfND X-Google-Smtp-Source: AGHT+IFVesYlnh2MUChG4BNtHkcE1KeNphAvXWmFLdB2RFMXl2iUKqcB9uDCRtxJMm6DxJAWl4SESA== X-Received: by 2002:a19:7717:0:b0:513:2b24:7599 with SMTP id s23-20020a197717000000b005132b247599mr2104689lfc.46.1709839573570; Thu, 07 Mar 2024 11:26:13 -0800 (PST) Received: from pc638.lan (host-185-121-47-193.sydskane.nu. [185.121.47.193]) by smtp.gmail.com with ESMTPSA id i12-20020ac2522c000000b0051321ac86bcsm3134641lfl.290.2024.03.07.11.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 11:26:13 -0800 (PST) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Thu, 7 Mar 2024 20:26:11 +0100 To: rulinhuang Cc: urezki@gmail.com, bhe@redhat.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-Rspamd-Queue-Id: CF7831A0006 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: swsksrueqm17oby89iyrmiwo73zcim64 X-HE-Tag: 1709839575-307187 X-HE-Meta: U2FsdGVkX1+XqDv2153lGsM6pa+qmrqrGg9h8MEHu/TVW1YoG+2rnwRfmF3WLc8rNqPVkXKqlcUYA0x7l/RFQVzGvS1vndllJ3uDVjnJ1HKf0ESwRi+XNGbaWKh10qemeBuRcRxJyEc4ccpPgbVNxNZv8q8qHLIulH+2MzK1//TSxChifNRnJXOgayDw8CiXjZ32Rvg1WVGg5YvECkQJ11yVxFoH3RimMuXIgnOgQS8A/YDbRA3FMBLYf0o8r7TWAvrf+c0GPuch7Wmim77PEMV0QUo7UtUM0IrSizaw+FLx6IxMXaitN/EYSudfVLm4+sk4qjSDd15pK3C88B0tD7apxkns1wpLTdFE1h+lnzTkLhggsOye5dKPBZM1AIBYwDdJFuqriDalJYXe5gkjXn98tDOVunk4ojfSk+e9/a6EmQa47ZimreS42q96e9gd4aVvzRYxvZT8/KeHaLju0XNPycJN1rvPalkof3jMgCMcR1iqkZfETkRwb/5lGPP3jdbr/4b4SY5dkUOPPTJsnZQNq2h07OmcuO2QsTHyEqmhNvDE0SOSIDygxpKb8/asx0JPHURklJrm2AReOiOjvHPXZkMyjpZdkf+aGG54i9M7brIc9/b7RYHO7WJ2aLOTOkWIeVSUW8F0cm8uNla2D244fm2uXOBE7R1+mSLihZl5eXuKeDzhmxuTevNAZIDP//F96LKhhBnU+qWPW8rcLJz/fDp2rdExm5wwKeqT5aB+rCu+aS6TBBw63iMLhGrABtgscyrP+FZPLrDO4Ugh8kb9yNKqgw3q4M5oYWd+4kHm9rY3nASML9ClTrLfs6T+QM2E04fy7fsCcdvixsZ0ZfaUytuu0YmK8UcJrf1AUFnuTJPyoiMQYEMBIYbtGDaQTfISPAFewewBh8tXC7osoEYgpDbGfC6OGmEQUfpI22JYJthJCE0osrg84NW3EWi144LCOGJOigg46fpIrSG O+mm79Qc ep++sTR7WjFiMxao9/c2fRrqK3xEQxUG6tEPx 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 Wed, Mar 06, 2024 at 09:14:40PM -0500, 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(-) > > 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 > Thank you to be patient and thank you for your work! Reviewed-by: Uladzislau Rezki (Sony) -- Uladzislau Rezki