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 CB40CC6FD1C for ; Thu, 23 Mar 2023 21:46:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3009D6B0071; Thu, 23 Mar 2023 17:46:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2B0576B0072; Thu, 23 Mar 2023 17:46:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 177D56B007B; Thu, 23 Mar 2023 17:46:06 -0400 (EDT) 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 085676B0071 for ; Thu, 23 Mar 2023 17:46:06 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C00F51A01D1 for ; Thu, 23 Mar 2023 21:46:05 +0000 (UTC) X-FDA: 80601496290.27.6A307DA Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by imf17.hostedemail.com (Postfix) with ESMTP id DA97B4000A for ; Thu, 23 Mar 2023 21:46:03 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XqngBCcg; spf=pass (imf17.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679607964; 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=Vm3BmmfuBc1fsQRJFUMOsryahKUhHqNWVOs1SaZyGCs=; b=OfkipoAsLEZfxOSZLUL05eaV1wO0+Uzlee5KfUyIu+ykxi68jvndtQIJyX0V8TpmQ0ntOt EodCUK38A8CGFg+o/lb+fp48F+9rXg2mGlTDac2kLHJZkMn6x/4Ii0DASbw67kfwwZAgii faZxZGkAxlNth6hHSLyS+23IR5qzBjk= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XqngBCcg; spf=pass (imf17.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679607964; a=rsa-sha256; cv=none; b=z08O2dsvLu6KO+d3IqRTwWpDxeIT6meTZw/BaOcdaxzQrExDEn50lN3qsISaYsEfvMgN3F iz0S8R8R7ERcbbqu+4xVZcHxFs9H+2Gwt9lQkHSdPfgoCSadugOMTAa7KVZwShdCXocHUf WaBjak3QTpsm3qEMmRsQdEPoDmFEFRg= Received: by mail-wr1-f50.google.com with SMTP id h17so22014911wrt.8 for ; Thu, 23 Mar 2023 14:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679607962; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Vm3BmmfuBc1fsQRJFUMOsryahKUhHqNWVOs1SaZyGCs=; b=XqngBCcgSzCY+OjkJHXKfbD5QNeGvZrVzpqu3rdUk15gH3tgDdbu0Vfu9FCjZmY+Qf gx/FH2BXTroFbgxdgOkJq+6XxojY1MHaM7zRMvMo1T/VyA8cRvk9HFEcTI3RJUyV7LWt 3v/pqAEVbiwjixuEkq7hqVzQEblkpqd1LyFT/25eFGx8IZR0F5ddD0qhBgm+b/t9iBiV cMSx1LAaXfmxsttcCYqaCbL5t289/PiJH9nXP7N29Ioz8wnscOB+BVd/hfH4+e1l/a4G bBl+NN9ixFmf1zU/RQXRWARl5uTHzmtZRZz1d4iLBELAZi96YL+CgmLm2QIA3I4PC0L1 2hwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679607962; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Vm3BmmfuBc1fsQRJFUMOsryahKUhHqNWVOs1SaZyGCs=; b=sxumytgEOxxU9RlyopJ1wgpx/96NzITyxJ9SHdsNAZKyvQxhV1/82ANI+7TaJu9RDv JjIh7AxJH52qoKUS3EW88nqGB8NSdSFXe73wN+RjptB6Iqs860HekC3JA5oI97JeJNc7 d9olagTJLZDMusKb6sA8ItByR3TbaOp5Te2nzPxcM5eWxLSq7eeIBLo3dHLKCVq3rdpq Zlqzt7PeYr9PiTyyKhhtZ/VpAQEOHCA/Wk6dP1fsJoMg4E/vRjNyPYQ2KAkbJf3X+92z kgcBZd3VOTDaHwDM+KWD+810wXKWSlmrD8qYAjuLUw6dmTIs1ftxIT+O1tF4eZIBtTsb yGwA== X-Gm-Message-State: AAQBX9e2s4jyRp9Xz81Uog6N7WTmjKJc5c9DqrCwdJrZD/DiNmLNGCqA l23hsRyWFz2H1/yP8rC+/kA= X-Google-Smtp-Source: AKy350ayEU8oKTHJ9o2jNWejT0uNfgUtwA4/qgWRXxYhZYYSSHwQIUjPoB9gB3bg6cX30WPRHV1Hyw== X-Received: by 2002:adf:fc8e:0:b0:2d9:16f9:aee3 with SMTP id g14-20020adffc8e000000b002d916f9aee3mr467650wrr.14.1679607962034; Thu, 23 Mar 2023 14:46:02 -0700 (PDT) Received: from localhost (host86-156-84-164.range86-156.btcentralplus.com. [86.156.84.164]) by smtp.gmail.com with ESMTPSA id e11-20020a5d65cb000000b002c55de1c72bsm17003870wrw.62.2023.03.23.14.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Mar 2023 14:46:01 -0700 (PDT) Date: Thu, 23 Mar 2023 21:46:00 +0000 From: Lorenzo Stoakes To: "Uladzislau Rezki (Sony)" Cc: Andrew Morton , linux-mm@kvack.org, LKML , Baoquan He , Christoph Hellwig , Matthew Wilcox , Dave Chinner , Oleksiy Avramchenko Subject: Re: [PATCH 1/1] mm: vmalloc: Remove a global vmap_blocks xarray Message-ID: <9ef9690d-cd79-4024-b7f1-eae2916cf5a2@lucifer.local> References: <20230323192111.1501308-1-urezki@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230323192111.1501308-1-urezki@gmail.com> X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: DA97B4000A X-Stat-Signature: iqdfkfdbdj6canazqty3a5i7epchjqp7 X-HE-Tag: 1679607963-922514 X-HE-Meta: U2FsdGVkX1/HmsPe7ejwk3J42+1kC0mjBQ8c3gX5PryNu4JZQvr01IjNWmiLK/2dhV04F1swHNdlsdFFXTMxYsJiUhJTqNrhoGiPla+RlZtBAJgKofO04K/ogi6e3ZAIAp0gGAa9a0l0PEYB+j6LJ/oRufNw1iYsunAGN0md1LSDYHACmVrZ8MSq3hBzK9sdueDy1KIUF+vdVMNP55gar9iVr+bYrcWPm/WLVzJSaL04nfNiydraWeRtXU8B/Qog/0S5gXEmv2hmNEBW+wBKrjemsOPcrpuEXglejLPnzCKdbd45/UWIHX7QVIvEQ4Trm3yd2rq2hViLNRoXhJgesrPt/inFHUsnSGjzo7yG7UDZnXp1pLVE4vJeulg9PnxpBSUKBrbfJKzG2OcpJdi/RspmlBO9cY7/quP9ySjJYCXU2Ti5YABmagq2U0GmrZhHuGzHMJPxqwQPgSsusxmcGdRbVSQ1AwQawg+E0TrbXp2SP6bF7QkaU78KOMpze6M+J1pJGTUo+xYFbTdfIpgim/mHnR6t/Rizt1btzF6II9/TqW1J7gKwrUGX7kxW0SiIi6TOyhx3YVvIXTQVSR6yfCJL4JE11iH4qpYZPXCsZOixfD9rhBIYJCWz599p+BnGzkohWTEvQKVetDqV5SoirQ05aFtyNT2MpzlC4GvG05nDsFQ7v4Fwb0DpiXEa6ZqIoRFjP9esftOuo7GQ5MqrEKS/qblP6bV5yZD7Y/ICPu1XT5Tg7DIYHRj5QQ6ndU9mn+W7n6nnzpFiRL1Qg0yJLDTE+psr3u8lvDY6tls9jkqD9kb6wQ0PoTqDXuS3DZwE5KEaissqY2ajsXGJP2mDZDdzuky27okRZMddguQf/LG7M5HQEXhKNf0GXjdeX1Om/tIaCplkafdiDuvpHQ15CVPZjbqw9G5U9LMG7ZFinn26ofEG0LhgZWzFS1gA88zapb0XKFSOzefybFRJDU/ M4miz9yG 7OhiG3/DggogmfbGZU3tvauzwr53L/PcFPQlSdO+oRIoP/UJgK5drOL68R9OpvzBUk3VTnu63wP+asy9NepAelO+4ETVjVo/09tbYzt8K1AriNaTgyhVuTf/R9uMDcITpxlBerv9UcPOwbUMkt2L4Sgzp6givcfaDVfGdLVJf1Ly5k9Y1VO6A+lzSYyjHLKrRC1RHlmPQXLqr47RLO0yEI9dLym0x4WaAesQ6nTMpu+c3RKM1dFFzOsGNw4Dhlgxz6nOXyedP59jtBUnA85/DmeURqMZC3IF3nKZGUJH81H0UEE6JEDrR/SfcSALNd+Pj1e3Sof2/7k29NdX2i1XLPr6GNIRNwCfXd31uQIORigirNhGs5s6fUIcShvLXA2PKcJb2FSlY8iCDaxnt1jiTP24Wf8RWLx7/ypV612qAJL0no4DlBUQdyPw9zBn+fjRqFn9NH4XAVZzUvq9ZYNLfzwi9NWOTHLjbvFnQ 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: On Thu, Mar 23, 2023 at 08:21:11PM +0100, Uladzislau Rezki (Sony) wrote: > A global vmap_blocks-xarray array can be contented under > heavy usage of the vm_map_ram()/vm_unmap_ram() APIs. The > lock_stat shows that a "vmap_blocks.xa_lock" lock is a > second in a top-list when it comes to contentions: > > > ---------------------------------------- > class name con-bounces contentions ... > ---------------------------------------- > vmap_area_lock: 2554079 2554276 ... > -------------- > vmap_area_lock 1297948 [<00000000dd41cbaa>] alloc_vmap_area+0x1c7/0x910 > vmap_area_lock 1256330 [<000000009d927bf3>] free_vmap_block+0x4a/0xe0 > vmap_area_lock 1 [<00000000c95c05a7>] find_vm_area+0x16/0x70 > -------------- > vmap_area_lock 1738590 [<00000000dd41cbaa>] alloc_vmap_area+0x1c7/0x910 > vmap_area_lock 815688 [<000000009d927bf3>] free_vmap_block+0x4a/0xe0 > vmap_area_lock 1 [<00000000c1d619d7>] __get_vm_area_node+0xd2/0x170 > > vmap_blocks.xa_lock: 862689 862698 ... > ------------------- > vmap_blocks.xa_lock 378418 [<00000000625a5626>] vm_map_ram+0x359/0x4a0 > vmap_blocks.xa_lock 484280 [<00000000caa2ef03>] xa_erase+0xe/0x30 > ------------------- > vmap_blocks.xa_lock 576226 [<00000000caa2ef03>] xa_erase+0xe/0x30 > vmap_blocks.xa_lock 286472 [<00000000625a5626>] vm_map_ram+0x359/0x4a0 > ... > > > that is a result of running vm_map_ram()/vm_unmap_ram() in > a loop. The test creates 64(on 64 CPUs system) threads and > each one maps/unmaps 1 page. > > After this change the "xa_lock" can be considered as a noise > in the same test condition: > > > ... > &xa->xa_lock#1: 10333 10394 ... > -------------- > &xa->xa_lock#1 5349 [<00000000bbbc9751>] xa_erase+0xe/0x30 > &xa->xa_lock#1 5045 [<0000000018def45d>] vm_map_ram+0x3a4/0x4f0 > -------------- > &xa->xa_lock#1 7326 [<0000000018def45d>] vm_map_ram+0x3a4/0x4f0 > &xa->xa_lock#1 3068 [<00000000bbbc9751>] xa_erase+0xe/0x30 > ... > > Nice! Really good to see contention reduced, but in addition I'm a huge fan of us removing the global state in vmalloc and this is a good start. I've noticed a small perf regression after 3 runs of ./test_vmalloc.sh performance from an average of 119356136169 cycles to 120404645782 or +0.9% but this doesn't seem especially egregious. > This patch does not fix vmap_area_lock/free_vmap_area_lock and > purge_vmap_area_lock bottle-necks, it is rather a separate rework. > > Signed-off-by: Uladzislau Rezki (Sony) > --- > mm/vmalloc.c | 50 ++++++++++++++++++++++++++------------------------ > 1 file changed, 26 insertions(+), 24 deletions(-) > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 978194dc2bb8..13b5342bed9a 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -1911,6 +1911,7 @@ static struct vmap_area *find_unlink_vmap_area(unsigned long addr) > struct vmap_block_queue { > spinlock_t lock; > struct list_head free; > + struct xarray vmap_blocks; > }; > > struct vmap_block { > @@ -1927,25 +1928,18 @@ struct vmap_block { > /* Queue of free and dirty vmap blocks, for allocation and flushing purposes */ > static DEFINE_PER_CPU(struct vmap_block_queue, vmap_block_queue); > > -/* > - * XArray of vmap blocks, indexed by address, to quickly find a vmap block > - * in the free path. Could get rid of this if we change the API to return a > - * "cookie" from alloc, to be passed to free. But no big deal yet. > - */ Doesn't this comment still apply? Or is the idea of returning the "cookie" not really viable? > -static DEFINE_XARRAY(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. > - */ Again, is this comment no longer relevant? > +static struct vmap_block_queue * > +addr_to_vbq(unsigned long addr) > +{ > + int cpu = (addr / VMAP_BLOCK_SIZE) % num_possible_cpus(); > + return &per_cpu(vmap_block_queue, cpu); > +} Andrew's already commented on this, so I won't dwell but it does seem odd to subdivide by number of possible CPUs rather than just use the actual CPU. I guess your response to his question will also answer mine :) > > -static unsigned long addr_to_vb_idx(unsigned long addr) > +static unsigned long > +addr_to_vb_va_start(unsigned long addr) > { > - addr -= VMALLOC_START & ~(VMAP_BLOCK_SIZE-1); > - addr /= VMAP_BLOCK_SIZE; > - return addr; > + /* A start address of block an address belongs to. */ A nit, but might be worth referring to the assert in vmap_block_vaddr(), as this comment seems a bit redundant otherwise as it is implied by the code it comments. > + return rounddown(addr, VMAP_BLOCK_SIZE); > } > > static void *vmap_block_vaddr(unsigned long va_start, unsigned long pages_off) > @@ -1953,7 +1947,7 @@ 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)); > + BUG_ON(addr_to_vb_va_start(addr) != addr_to_vb_va_start(va_start)); Maybe nitty, but perhaps better to WARN_ON() here to avoid BUG_ON proliferation? And can't this be the below? WARN_ON(addr_to_vb_va_start(addr) != va_start); > return (void *)addr; > } > > @@ -1970,7 +1964,6 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) > struct vmap_block_queue *vbq; > struct vmap_block *vb; > struct vmap_area *va; > - unsigned long vb_idx; > int node, err; > void *vaddr; > > @@ -2003,8 +1996,8 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) > bitmap_set(vb->used_map, 0, (1UL << order)); > INIT_LIST_HEAD(&vb->free_list); > > - vb_idx = addr_to_vb_idx(va->va_start); > - err = xa_insert(&vmap_blocks, vb_idx, vb, gfp_mask); > + vbq = addr_to_vbq(va->va_start); > + err = xa_insert(&vbq->vmap_blocks, va->va_start, vb, gfp_mask); This seems actually like a nice subtle improvement in that we are now indexing always on va_start explicitly and will always load using addr_to_vb_va_start(). > if (err) { > kfree(vb); > free_vmap_area(va); > @@ -2021,9 +2014,11 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) > > static void free_vmap_block(struct vmap_block *vb) > { > + struct vmap_block_queue *vbq; > struct vmap_block *tmp; > > - tmp = xa_erase(&vmap_blocks, addr_to_vb_idx(vb->va->va_start)); > + vbq = addr_to_vbq(vb->va->va_start); > + tmp = xa_erase(&vbq->vmap_blocks, vb->va->va_start); > BUG_ON(tmp != vb); > > spin_lock(&vmap_area_lock); > @@ -2135,6 +2130,7 @@ static void vb_free(unsigned long addr, unsigned long size) > unsigned long offset; > unsigned int order; > struct vmap_block *vb; > + struct vmap_block_queue *vbq; > > BUG_ON(offset_in_page(size)); > BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC); > @@ -2143,7 +2139,10 @@ static void vb_free(unsigned long addr, unsigned long size) > > order = get_order(size); > offset = (addr & (VMAP_BLOCK_SIZE - 1)) >> PAGE_SHIFT; > - vb = xa_load(&vmap_blocks, addr_to_vb_idx(addr)); > + > + vbq = addr_to_vbq(addr); > + vb = xa_load(&vbq->vmap_blocks, addr_to_vb_va_start(addr)); > + > spin_lock(&vb->lock); > bitmap_clear(vb->used_map, offset, (1UL << order)); > spin_unlock(&vb->lock); > @@ -3486,6 +3485,7 @@ static void vmap_ram_vread(char *buf, char *addr, int count, unsigned long flags > { > char *start; > struct vmap_block *vb; > + struct vmap_block_queue *vbq; > unsigned long offset; > unsigned int rs, re, n; > > @@ -3503,7 +3503,8 @@ static void vmap_ram_vread(char *buf, char *addr, int count, unsigned long flags > * Area is split into regions and tracked with vmap_block, read out > * each region and zero fill the hole between regions. > */ > - vb = xa_load(&vmap_blocks, addr_to_vb_idx((unsigned long)addr)); > + vbq = addr_to_vbq((unsigned long) addr); > + vb = xa_load(&vbq->vmap_blocks, addr_to_vb_va_start((unsigned long) addr)); > if (!vb) > goto finished; > > @@ -4272,6 +4273,7 @@ void __init vmalloc_init(void) > p = &per_cpu(vfree_deferred, i); > init_llist_head(&p->list); > INIT_WORK(&p->wq, delayed_vfree_work); > + xa_init(&vbq->vmap_blocks); > } > > /* Import existing vmlist entries. */ > -- > 2.30.2 >