From patchwork Thu Mar 30 19:06:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzislau Rezki X-Patchwork-Id: 13194741 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 60702C761A6 for ; Thu, 30 Mar 2023 19:06:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E625E900002; Thu, 30 Mar 2023 15:06:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E12506B0078; Thu, 30 Mar 2023 15:06:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB400900002; Thu, 30 Mar 2023 15:06:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id BC0236B0074 for ; Thu, 30 Mar 2023 15:06:45 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8CCF2C0EED for ; Thu, 30 Mar 2023 19:06:45 +0000 (UTC) X-FDA: 80626496370.29.E6C9B50 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by imf19.hostedemail.com (Postfix) with ESMTP id CCF471A0017 for ; Thu, 30 Mar 2023 19:06:43 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=WUzsrGzN; spf=pass (imf19.hostedemail.com: domain of urezki@gmail.com designates 209.85.208.50 as permitted sender) smtp.mailfrom=urezki@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=1680203203; 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=gMDPnWdVAheu+FA3sHgGScLosUagPVFRIRKD4ygdXQc=; b=m1+eHZnj0RtEQe80XaTund7VhaoDY8SMLIM9VSzRzL5XCSP42XT9T1C53H18UuGm0cES/D r+AYcSQFCH2GOogNRfGQkBelZZBOoNcw72tmYvfrx5PX4AAq1aDfsHyXmoij+A1e3swQN7 k4726LosvojNt+PQ5MntHn02+zlCQPY= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=WUzsrGzN; spf=pass (imf19.hostedemail.com: domain of urezki@gmail.com designates 209.85.208.50 as permitted sender) smtp.mailfrom=urezki@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680203203; a=rsa-sha256; cv=none; b=r2TDvdB4o43F9iI1MKEMa7IrFBNejXtVxPqzbvMPk22YgaAMdzdHRioOEzWtuaA9B4SDrk 95aTquQX4BY83c7B4mXaR0/HP7vxe31l2TqahLOZfJ/1KHcKEyLvJvPWyoutK2JeCqHpEc n7eGlEHOG8iC+SCVNkFoCxS4uTYnpXA= Received: by mail-ed1-f50.google.com with SMTP id eh3so80447443edb.11 for ; Thu, 30 Mar 2023 12:06:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680203202; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gMDPnWdVAheu+FA3sHgGScLosUagPVFRIRKD4ygdXQc=; b=WUzsrGzNWUdd1YAcnxKaOXUtvUv60m4ynOJ6mZF/3yOTaGOHil5RqR67nCqK76fiWg qXYstK2Ec/btAxG4dKUELsg5NXB/TY04klx5r/RlH0wcZNoIt1x4oaTw4mqMkP0byHRs crSNNwtzE6ltpnTbf5/bcLbQQgYSXAXbupmZor3cNMlNxnIwvPOdxXPWM60591xokuoC Qdumg3jBYH99mn4dbDsIocFr0807D8RpHRP25kenEtGwUcxHXtd9cqCiNOcQDpBAPZQd 0xB1WHe2Rp7m8x/iRq+NnpWSdnb+cdq40zlKV/eGBf99ye1h7G8lYm3R7J1xBJYLRfLJ 6SyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680203202; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gMDPnWdVAheu+FA3sHgGScLosUagPVFRIRKD4ygdXQc=; b=1Za6vO4TpudKH62WoLCRXPWAshgnylj1tx8y4M9TlDPnRKZVCfZWiIyRYup9n71zG6 y7r2yLU6WjQYQBM+5xKCDVPn1SVYPp+hLvSyPAz3mGIYmUynSOmG3YAahY7cd+GrfJXE 384vopJwuRtxqv4kzbaxxqSO6qPsc6autIbyQ+/rDjM4ay0fRPvX+1rySjnrHlnI1zEs l2tTdTbuCtE8Bp4p2Pfl/k2wkehe8qcq2RPnF+h39IKXepElykAbdvueKsDULz63WwRF Y/bLWL8j52bEw3f7IMSbMds+tKmQ+oLYeiXF2Nozxp1HhpVXuU1xRBBy4hJq4lvjIS4Y d4ag== X-Gm-Message-State: AAQBX9fCi+NG8GM86z1OdMKULcHY3ktb+F5Qul4l7ninbzSzMb2mndFK tssEQMotJS1MKeZ3BvS5kvw= X-Google-Smtp-Source: AKy350Z+T9Xa3XfgAZWVQCHn67yDcdOVbMXZ1ew13MH6IyKVaA2hqPyeLjjE4gSc1jfMWXDPJiZOog== X-Received: by 2002:a17:907:25cd:b0:93e:9362:75fe with SMTP id ae13-20020a17090725cd00b0093e936275femr28223925ejc.76.1680203202187; Thu, 30 Mar 2023 12:06:42 -0700 (PDT) Received: from pc638.lan ([155.137.26.201]) by smtp.gmail.com with ESMTPSA id o18-20020a17090608d200b0092973e209f2sm122240eje.109.2023.03.30.12.06.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 12:06:41 -0700 (PDT) From: "Uladzislau Rezki (Sony)" To: Andrew Morton Cc: linux-mm@kvack.org, LKML , Baoquan He , Lorenzo Stoakes , Christoph Hellwig , Matthew Wilcox , Dave Chinner , Uladzislau Rezki , Oleksiy Avramchenko Subject: [PATCH v4 1/2] mm: vmalloc: Remove a global vmap_blocks xarray Date: Thu, 30 Mar 2023 21:06:38 +0200 Message-Id: <20230330190639.431589-1-urezki@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: doous6mkt3urt8oysbqsekkh93auftwd X-Rspamd-Queue-Id: CCF471A0017 X-HE-Tag: 1680203203-172572 X-HE-Meta: U2FsdGVkX1+RBzJXoZMjJ0/NzGuwJjse44ZOSetiIMmMgBaklKCFZG1HZuo+cfGjZQbpo2u8Smyldi+q5ON5NTB+AXmIRrtueoR/jzyUwfz74bs14+4YUHV1xadhLPyTWkTIovduTndr9RivV6yzSBALvzAMngsXTurgL8HCtM8EukKio7A8CClbqmh0lVofsksmOH9WIHp+Q4hPpBS/9HtraxMpazHdo6+FDq1usBW+duE48Y9bLb4P9zRX/iiGY/wfwgI86524kAHq/2ljtdaYMimC5+zjZ2xaeMvU4j24PCfjV11/IhPqxSJlXZJHD48ytb+V8CKXT156RZbkRanBiU+p3bmYEQjf6xnlVc3RpxyNzN/tBaozMn28Jc6sErdUA1Sz7zyU2p8crkVua5Zhux5SokdHeG/1KgD80VmjPotfIjPymke7jdV+odpV3gf0pg0Zs4sbDdaR2Jn3ehGfiDky8B8Nw+SrZCKhqmoY01OCbjTttki0f30CagFSRsS+xl/hCT4U6SIvahzqVuL9JXFjBWvfmd7rtDsAv3elVxCnfon4r6sID7a2o+4sJdpkGa5ikvyNOQ/+ALJAsE2xB/F6vXJRc1KFdebdW0aZvbU7vBrup8D0BIiVPjjwnDo9X7NiQMTGk/p2MrCrWGv8919C6CL1C/ShPr//1DLs89akhihCgPNgzC5MV0SWJxUu82zI0GWEwPCvk7UoZblzd6Lwew8vODAYoGzmjLkaWMQ+l/fJixelqqOZHr8fcsbfLkSeealXtk3xZ6m+DQ5Wyslqd9w+f5wqXTPqefiNqiNAPArmPjU2oxvMKxxUrahAfGH0o86g4ZEwxnWJGjc/y11aDmwWxMjBT8+HbhG6Kq1c40jlaRnU7q6dUveonROcEJ0xe5kysCci8ky0Elk7x5sefkOFZ+gBdXTuPEDmaS1ysAyLKjC+x3jRihMlnDxqgE0Rl5O3DrVpr0y Hh5Umy45 vfBneZ/qI+WdHoShg6x6n7WUldCEHh2NN6yKo8fu/LloOnpH9QOaSAwbTzvR1lPNUs1ef6maUZw1PJz71iOehMd68C98FmIhdX1bW1Xy4ROeZezFu4hPhBxhfE6jiOmJUOfdGP/vUuTpoGmhvZJPWssKGHhhkm5UOQKiQj+LOS0cd3KLKONbjg+0S2WuZIAdpra0tEURsI1xZUHeVnAy79gD7Ua6YSeUemLvcY5nyIhF6kB++3/RD3HGg6JFBlLyKUFNuqkVOdJmgD9n5QrsXqG0p3+hW1LnwYKAg5d0gRWWKKIc7OzlU0vbKvwQV21hLnOIDD7dqsGvJMjJVgF+xQqSRJ/ePXp8kYI2RfRsfi0jh8WzT8iODlqyZbXe8xWW2liYdOCBnY3uA0ZDlO21LAu4MHxwnFOUb+pYIaNWMq0eTvu8byNIwyNkjkMQ0Lsk/6LsPx51HX1Tq4YYweVV6Nmsy489IIqWvo9WW8cxvgph9LqHjUTWn5hEs4Dvov5gO40Sp 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: 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 ... Running the test_vmalloc.sh run_test_mask=1024 nr_threads=64 nr_pages=5 shows around ~8 percent of throughput improvement of vm_map_ram() and vm_unmap_ram() APIs. 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. v1 - v2: - Add more comments(Andrew Morton req.) - Switch to WARN_ON_ONCE(Lorenzo Stoakes req.) v2 -> v3: - Fix a kernel-doc complain(Matthew Wilcox) v3 -> v4: - Improve comments about hashing logic(Lorenzo Stoakes) - Improve code design(Lorenzo Stoakes) - Keep the addr_to_vb_idx() func. to cut index length(Baoquan He) Signed-off-by: Uladzislau Rezki (Sony) Reviewed-by: Lorenzo Stoakes Reviewed-by: Baoquan He --- mm/vmalloc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 8 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 978194dc2bb8..671d6d5d5b78 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1911,6 +1911,13 @@ static struct vmap_area *find_unlink_vmap_area(unsigned long addr) 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 { @@ -1928,11 +1935,48 @@ struct vmap_block { 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. + * 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_xarray() 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 DEFINE_XARRAY(vmap_blocks); +static struct xarray * +addr_to_vb_xarray(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 @@ -1970,6 +2014,7 @@ 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; + struct xarray *xa; unsigned long vb_idx; int node, err; void *vaddr; @@ -2003,8 +2048,9 @@ 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); + xa = addr_to_vb_xarray(va->va_start); vb_idx = addr_to_vb_idx(va->va_start); - err = xa_insert(&vmap_blocks, vb_idx, vb, gfp_mask); + err = xa_insert(xa, vb_idx, vb, gfp_mask); if (err) { kfree(vb); free_vmap_area(va); @@ -2022,8 +2068,10 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) static void free_vmap_block(struct vmap_block *vb) { struct vmap_block *tmp; + struct xarray *xa; - tmp = xa_erase(&vmap_blocks, addr_to_vb_idx(vb->va->va_start)); + xa = addr_to_vb_xarray(vb->va->va_start); + tmp = xa_erase(xa, addr_to_vb_idx(vb->va->va_start)); BUG_ON(tmp != vb); spin_lock(&vmap_area_lock); @@ -2135,6 +2183,7 @@ static void vb_free(unsigned long addr, unsigned long size) unsigned long offset; unsigned int order; struct vmap_block *vb; + struct xarray *xa; BUG_ON(offset_in_page(size)); BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC); @@ -2143,7 +2192,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)); + + xa = addr_to_vb_xarray(addr); + vb = xa_load(xa, addr_to_vb_idx(addr)); + spin_lock(&vb->lock); bitmap_clear(vb->used_map, offset, (1UL << order)); spin_unlock(&vb->lock); @@ -3486,6 +3538,7 @@ static void vmap_ram_vread(char *buf, char *addr, int count, unsigned long flags { char *start; struct vmap_block *vb; + struct xarray *xa; unsigned long offset; unsigned int rs, re, n; @@ -3503,7 +3556,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)); + xa = addr_to_vb_xarray((unsigned long) addr); + vb = xa_load(xa, addr_to_vb_idx((unsigned long)addr)); if (!vb) goto finished; @@ -4272,6 +4326,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. */ From patchwork Thu Mar 30 19:06:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzislau Rezki X-Patchwork-Id: 13194742 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 3B94CC6FD1D for ; Thu, 30 Mar 2023 19:06:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDC68900003; Thu, 30 Mar 2023 15:06:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF0266B0078; Thu, 30 Mar 2023 15:06:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9CD8D900003; Thu, 30 Mar 2023 15:06:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 8EB586B0074 for ; Thu, 30 Mar 2023 15:06:46 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5B014AC70B for ; Thu, 30 Mar 2023 19:06:46 +0000 (UTC) X-FDA: 80626496412.21.7F1B559 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by imf24.hostedemail.com (Postfix) with ESMTP id 7F83A18000A for ; Thu, 30 Mar 2023 19:06:44 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mNXgQ0SR; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of urezki@gmail.com designates 209.85.208.51 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=1680203204; 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=voXOGIdYOWM2wLNWqmTahTqMnugMmbDeB8dmByAxjSs=; b=pv7WA8ErfOWazPM51p20z9L2t8D7ODzuRW5lLDNW1kbRBoEU9mImqqSlRzGLSf6AatPBBb So/rkwEU/vBytdsLLbfw9uCfHd0WeEL0/EqRyg8XSXNzt+sQBQ3v8n4dAo5PoDjOOhmqTy jA83tN1S1nOt8dGOi5fTS8aSJ7x8l6o= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mNXgQ0SR; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of urezki@gmail.com designates 209.85.208.51 as permitted sender) smtp.mailfrom=urezki@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680203204; a=rsa-sha256; cv=none; b=O/jYjvBJfhFfEqrSKu618Vo92sQvuzFJBXKWkV0LXa7CuSA0OPlPJQrBDa+cyaTDWzQbwP kkUcc7tNmHOUk8gg6OYyAyOUWdVq72Fqkg42aCM6MTk4TC7o3kIHidTWHC2U+ELp0CRAVE Gl37f9k/Sh7t5U/0SoEh1m8Dexn1VY8= Received: by mail-ed1-f51.google.com with SMTP id w9so80561605edc.3 for ; Thu, 30 Mar 2023 12:06:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680203203; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=voXOGIdYOWM2wLNWqmTahTqMnugMmbDeB8dmByAxjSs=; b=mNXgQ0SRS48kDk5F+4+TYcIY68iJFezo2AcCPQVSkQkTvq5hJG0XolZpaqsLaZARmx tFzenxMn1LAXy5MrS+W1o4Upp8BJzcUuOS5hedmSRfR006gAxaUiMnO7XqYQpeLEyQPJ 2lWnIBO8KbOEOhh2UD9M/6BBFnC4IFdp76kciTBnyFArOvmKJgLwfFbO0glV6lVu1JXB YWQH0CGqsBeRqwvmFg3rhKJrvzs43CO9rIxeb9XBquzS7MxCnmPFexNGPfIrvFslsxSK d5UykufwU9IhTzQ7d5VSJwPGE+lJ20pe9QckBuC81p6MTJN2iVuvo3obysSIvoWt6dyc RLYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680203203; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=voXOGIdYOWM2wLNWqmTahTqMnugMmbDeB8dmByAxjSs=; b=L3812HYrTkuxveYaosW7ClthQySfQeQhcBKrJSV01oVVSgyVIkta5xi2pWn8r/Psyq zc3BOZFSusYCBI5DGYOcqFHyJRs4CAj4iNvP1uPH5IUyYHnMwmEKLPFCy045cOQKR/l/ HcAbkvGwKKf4DWow1v9DrksW1JT7I5xZ3Ka82MPDBqaZftfjE4ADUquxLiLKMGwPZHZu wxx39epI7TfUnRMkpDdgNNjTathfK0wyzoSpPrEz6H79ASbHzbAULNENZLxSYEh6G0fA qHPvb6keinOLlcRk3hahyNM9+Kp76jUS1k6YsAQQ9tzPQmMRYlSZRBTEsa72G5wQnBjV 7EEQ== X-Gm-Message-State: AAQBX9cu4Mh2sRgs7P7W+low8vb2thC6G+p2QjrVpNHI6VRn8qdz8U8N uMeEBMinDcg4nq/seNr/QKQ= X-Google-Smtp-Source: AKy350bRthKl0rgnD5bNDKbIzTOBEPf+AIAt2HRlcVZrT3FbMB536ToFxOSzKbPE1+MuS7SWfepGPA== X-Received: by 2002:a17:907:d047:b0:945:2f54:5eae with SMTP id vb7-20020a170907d04700b009452f545eaemr14046768ejc.77.1680203202841; Thu, 30 Mar 2023 12:06:42 -0700 (PDT) Received: from pc638.lan ([155.137.26.201]) by smtp.gmail.com with ESMTPSA id o18-20020a17090608d200b0092973e209f2sm122240eje.109.2023.03.30.12.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 12:06:42 -0700 (PDT) From: "Uladzislau Rezki (Sony)" To: Andrew Morton Cc: linux-mm@kvack.org, LKML , Baoquan He , Lorenzo Stoakes , Christoph Hellwig , Matthew Wilcox , Dave Chinner , Uladzislau Rezki , Oleksiy Avramchenko Subject: [PATCH v4 2/2] lib/test_vmalloc.c: Add vm_map_ram()/vm_unmap_ram() test case Date: Thu, 30 Mar 2023 21:06:39 +0200 Message-Id: <20230330190639.431589-2-urezki@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230330190639.431589-1-urezki@gmail.com> References: <20230330190639.431589-1-urezki@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7F83A18000A X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: w13xeyzy5zq61cm77bc87ib3kneqoe51 X-HE-Tag: 1680203204-792796 X-HE-Meta: U2FsdGVkX193rpJ69G+xDO9Xwckbjz2VU9eeYLduI1BHzwlzqUektE6ULO8g4/cgLxhdE0Bw3RxMhrc3VY6UO6fnc2BsAMS+ZOQSLqLgv5eUxo3V/qpLSctMuO3uMj48rw9pMcSbyDplUY1VC0S1HrrGb86MKiutoB06GI0RssNyhlBaw5TUozWMKV4msBrF8um53wFhqWHurV+V2iRuRTtiHqcVvNxstxVcGoa4UGyD8EE/3MoknvbD0VI3BXcFzej+VQEwFdZErehqV0w7rxSmlU6inHdYpCv4M3/4EF/EWugZpfVKevlrojSbL77+oxGLCjEwCZ+KXNncgIjEq46r0E1jw5uLzlvPYPrZVi4rIdcFRxtorNb0CSpidRK29sTz8Ub1iZ+M3HHWc35UZTR/I2JGUe/D2RyC6jAl57xtVpqLg6jpuEwFnl/I3oxWg6dUFireFjUSVgc4G81AC/7Sq1x0mqv9mm9ARZt/xwXFSveNXocerg7AFuD5Rbk6PEPdtewuDq/fxxKOpoUM0QXvFgCIffJTeWm4zw+sPTTGSw8RkEhTEaUPRe2TL+93nP9MqcFXPspz7Lp5BpEA5fXpcuIfZzS6olh+9OGgL6yScPO4a+YgJAYyq+no45Zp4If/hlnIHGEHcFCG4aOd4gzwuRYW1nuzW7ulgcqij2hakn0IYKEpgc5MObkRnREAhmgbYB7wm0ta+NNUfkfBtimETP8OH9g314qSipKXy2uYhUBCuRASOUuvVgAggy1VG3SIrNtT8rumGwVNwe72KCRw+VqF6PaM3MbNfLj2v3TzPOoAy8Db7PUwQzLBzkjxOW/aO5CtfPdKc1QMdWYqaPPrcEJV4kdiobqQSdqFCoXqqR8AwZlU/Im5rb6xIkElfSSsg30GHTD8/sPsSre1/NWP6FxWFmWmygmygSEPf7Jbod3ERJiFeUZ0JqfXlTIf3X+YrTPfkTMlrRkr381 M2njjrpx XsrUGTLiovC6G6VzzG6Q42PZx3YmpRODhvEQjmff6AFQLrOdAh/OhhABcp3NX+sbTjOB3+IAz1GFrMB3rsHwZ8bJt03r9AUsTcYWzKlt9XxZdjkFq0BBg1q4m8vQDNX6d/CJeNdrOWai656OuWLbHtVaxjQoKJUCobjV86Tb0JLqMvwXAqnDU0RLaRGdUHb8Ve5+z4tGb0CpLnPIL1PYGGYr9qccSGZGVfmvo017N5XmMAAiF0NN1309rlQAlDbD8nG+QroI5ukPPs6XuQMM99DxvfyBf0IIFbYdiUK5GFHj+YZAZxLDMP5lQQrg75NtUJlP5wU+13o2w3t7qe0LDU08I9h9/N9ZgkoOOPK8a5i5YfjD/vS/Ti9n+boukFyhbTAt9el9Lnr0fxqVnGNwHVGIPUuoGQ36khElxA/DweppRW10DvvM2YJqJfllQtu0xPUSh3MRV1k/dGv743AHkxzxykWEnYFZMQdm7BtY2m5sin9S3tHNSajCqYizB9eVi8fqL 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: Add vm_map_ram()/vm_unmap_ram() test case to our stress test-suite. Signed-off-by: Uladzislau Rezki (Sony) Reviewed-by: Lorenzo Stoakes Reviewed-by: Baoquan He --- lib/test_vmalloc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/lib/test_vmalloc.c b/lib/test_vmalloc.c index cd2bdba6d3ed..1622f3f9ec23 100644 --- a/lib/test_vmalloc.c +++ b/lib/test_vmalloc.c @@ -53,6 +53,7 @@ __param(int, run_test_mask, INT_MAX, "\t\tid: 128, name: pcpu_alloc_test\n" "\t\tid: 256, name: kvfree_rcu_1_arg_vmalloc_test\n" "\t\tid: 512, name: kvfree_rcu_2_arg_vmalloc_test\n" + "\t\tid: 1024, name: vm_map_ram_test\n" /* Add a new test case description here. */ ); @@ -358,6 +359,41 @@ kvfree_rcu_2_arg_vmalloc_test(void) return 0; } +static int +vm_map_ram_test(void) +{ + unsigned long nr_allocated; + unsigned int map_nr_pages; + unsigned char *v_ptr; + struct page **pages; + int i; + + map_nr_pages = nr_pages > 0 ? nr_pages:1; + pages = kmalloc(map_nr_pages * sizeof(struct page), GFP_KERNEL); + if (!pages) + return -1; + + nr_allocated = alloc_pages_bulk_array(GFP_KERNEL, map_nr_pages, pages); + if (nr_allocated != map_nr_pages) + goto cleanup; + + /* Run the test loop. */ + for (i = 0; i < test_loop_count; i++) { + v_ptr = vm_map_ram(pages, map_nr_pages, NUMA_NO_NODE); + *v_ptr = 'a'; + vm_unmap_ram(v_ptr, map_nr_pages); + } + +cleanup: + for (i = 0; i < nr_allocated; i++) + __free_page(pages[i]); + + kfree(pages); + + /* 0 indicates success. */ + return nr_allocated != map_nr_pages; +} + struct test_case_desc { const char *test_name; int (*test_func)(void); @@ -374,6 +410,7 @@ static struct test_case_desc test_case_array[] = { { "pcpu_alloc_test", pcpu_alloc_test }, { "kvfree_rcu_1_arg_vmalloc_test", kvfree_rcu_1_arg_vmalloc_test }, { "kvfree_rcu_2_arg_vmalloc_test", kvfree_rcu_2_arg_vmalloc_test }, + { "vm_map_ram_test", vm_map_ram_test }, /* Add a new test case here. */ };