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 37054C369A5 for ; Tue, 8 Apr 2025 15:15:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 66FE36B002B; Tue, 8 Apr 2025 11:15:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A8B26B002C; Tue, 8 Apr 2025 11:15:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35F6B6B002D; Tue, 8 Apr 2025 11:15:56 -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 122AF6B002B for ; Tue, 8 Apr 2025 11:15:56 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EA28F1CB2B7 for ; Tue, 8 Apr 2025 15:15:56 +0000 (UTC) X-FDA: 83311226712.01.65DAC33 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by imf26.hostedemail.com (Postfix) with ESMTP id 084C2140016 for ; Tue, 8 Apr 2025 15:15:54 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=AD+6+8Cr; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf26.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.53 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=1744125355; 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=KsXh5DQxErvfpk4smRVJmZEnTcpSTG4dia/PFYIhGps=; b=0QSC/TI4tZ1Kghzs1vTm7Gw8XIxuFS+Q8FWPZ10F6p6tyC7zWpHm//mxiT1G/BMJuGdyRB VGA5FeUhjRMEEUi6mJoj7BymuC+6oFab4rdsgDNg/iPrdpEyFSH7NHPYgUq7HYuAfnToXL 8QcmoB4c1xhUgXfJApbbL/sI+wVWvOs= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=AD+6+8Cr; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf26.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.53 as permitted sender) smtp.mailfrom=urezki@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744125355; a=rsa-sha256; cv=none; b=rwm8ud/4lWqjyYzJc69D1Lh0PKI7ehGVuyZAgyJSINvwC+cIgvmJyOMaQDfp9hAzmMtgHB zenpYXTRiE7P7oysfntnegeORlZ8ehfCYWVfuMDHwjPtOQnpJreg3gB6cH3Lsc1PrkSSzF bvvbiQvYeyFu36zGkebyjW1/2vcFsAs= Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5497590ffbbso1499602e87.1 for ; Tue, 08 Apr 2025 08:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744125353; x=1744730153; darn=kvack.org; 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=KsXh5DQxErvfpk4smRVJmZEnTcpSTG4dia/PFYIhGps=; b=AD+6+8CrIbd1nSsMp+GaP9otlPVsdJCprKqvVfwPcaJoqZKxpV2FMd5vFsQe7Na+ns 7Sigxg9ezkzC9EMna37UJoVZzqRn6DVSCtOsiGisxDHJjRXekxHw9P53kH7mSaCtJPeV OO1CKVINI9BgqLl/AvK5TyI2P2GuRIh3t0sdtUiTyv9wuThmn891szduB0SBS4Z/9CbJ IpE1h1kAKHpptwo1Q9dsAgJaf4ujQ4pqrr9k3WCQq++FoJeD+Gb18W69bqwo8qXVCenB loNlAmqEu0yZxUPHE9fkXJN8E6BM9FbGxtlOiaImujqBEalCngmeah8DnAfP0QNN07c2 vzjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744125353; x=1744730153; 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=KsXh5DQxErvfpk4smRVJmZEnTcpSTG4dia/PFYIhGps=; b=qrCsE8iHht/GsCSw06uraI6USBXtd344rlM0ESRSNQp4xhaTeGCUHsE9qa0p7Hml5W IuCA/1qD4j2kaEQEyeXKNysvjhQAkOEAxJfbnrRupG5myrBEZaXyFl6LtvYHu8TP7zeO CCUrR1stXn6nXxSTlkQ3c7Gw4f5VbXmklPNYUr/6EzjhKfS5pBULRpbS240eJAvglOog dcnQY4RWx9puODy1/pyxndzoKwK3usU/jEh1vSj7fRTbws1Ur01/PNrKgfyYta9lwytm ceoKEd6FL2m25LWN7VuAsZnMsCZjNyMakSElD++jWraXFOz92840n6jS9SiWotYTLuas 3D2w== X-Gm-Message-State: AOJu0YzFjjHyCMz4pyiI+GIkHA2OYl7rTaKngNGuxJgeD28Hv8EUl5Li TOu/WBG0ydTV4MTApKiAyWjOOAS2zxSCKDMAeYzI0LglF6xhzVSC X-Gm-Gg: ASbGncs1SEJUpqARwuXhx/g6oCt+KffZTFcREaXiPxDDZmYPGzKv3p2r0zMJBdGmTsu DBE2FIyaMeal3Vd8Oq5XWR+bWEzS6Ak4FQSXtAALWI0shy9U9JQGNcQ3vg5/c5ytfMxhmXZg6Rx yUNkP3DMBLTr3dVxME2htXReYkvCprhiVitTTmZIrBGdwyBGnbZe1xWzA+CnXTJu1WVcDxpN/Kb XdMB/okCdeRvGb8H43jcno4maoFzuWrauym6gSW5JHK8HTIWqHmQ+S+98eWVMwAaA7g0r5XM0ZQ RhlQ+TfgYD6g4tAXyUK3Q7D2rMFQawjdpT7XFA12 X-Google-Smtp-Source: AGHT+IG3TspJwCuKgEmft6MBazVSp/G5+tumxJQNv+3l09dfWKlmBOe4Xrw0OAYyhJ1p2HPzq8wT2g== X-Received: by 2002:ac2:4bcc:0:b0:54b:ec1:63dd with SMTP id 2adb3069b0e04-54c232e259dmr4514605e87.20.1744125353086; Tue, 08 Apr 2025 08:15:53 -0700 (PDT) Received: from pc638.lan ([2001:9b1:d5a0:a500:2d8:61ff:fec9:d743]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e65db49sm1548603e87.206.2025.04.08.08.15.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 08:15:52 -0700 (PDT) From: "Uladzislau Rezki (Sony)" To: Andrew Morton Cc: linux-mm@kvack.org, LKML , Christoph Hellwig , Uladzislau Rezki , Oleksiy Avramchenko Subject: [PATCH 2/3] vmalloc: Switch to for_each_vmap_node() helper Date: Tue, 8 Apr 2025 17:15:48 +0200 Message-Id: <20250408151549.77937-2-urezki@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250408151549.77937-1-urezki@gmail.com> References: <20250408151549.77937-1-urezki@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam01 X-Stat-Signature: o9r4xa36ohhkmmgbgi11q5wmcffz8x3k X-Rspam-User: X-Rspamd-Queue-Id: 084C2140016 X-HE-Tag: 1744125354-82612 X-HE-Meta: U2FsdGVkX1/WUBZ9iIH5HRC1ZfyZudDDo5AjwjbDdG6KT073yEvrpJR8wrc0OmXAo4RsWhBGLRZ/KDcD7yWLO9NWYr55f4rNYVC3VgO2x49zwY3ZjF7SmPXsaSKEg+0PgOj1G0rJv0f4c4kq4gRIXM+VWukUfwbbfs55mdfnICjo3KZa5jEpufyBgKacBx/nDlN6LYWMVNM4EFv995UTPswIquz7Y5uVTlgutO+A6bIkNy1iznPVYuARo6bKeAchPTIkZs3Xo8EmesanXuP0XvA+0Zut9NULoG6eHulqx7sSzCqBHP/ChmbxbFgJ8vWi1ILSUCSJFpC2bKR0IBRvAndtNeMGty9+y4/4cHoZnJObxyDC9YqUlYoUGvgo67ZoVt2Cr2s90MbiqdjN+/V1LvrAAUHOGMyuZDsnUW0D3QRygWsjp8aC9XUOk6CdwvUwQW2N0tqFaSOAcK3BZJ8yM6O+r8/26n90VZYJaWSDxIbhWpjDJv8FK4lS2dCO7JiL5hqoALa1sOp8TWRfwSOBYbJaeqjHgDJTpmCm/QzND7UmOW1dD/vTKMKa8SvGhtBeIMDjiWxTXzp7AkDbxaGvJlpq1KYybmkuLqCohu1PBFjzZ5EXOfbbv1OMe1OGgSNuUwH0AYX7fop/bAxw74RSSgWyNic5EBNkKUNCDhK/IIQk+tFoeblG37dOfs6EAiN5H6XewTO94eg7pfQzY9f6D8SEZxBawsYClYmNgQEsY114c3MYfogcTIChoT6B7eoiWTYpOBKOye2jEhTR/w5hZxz93rYCgFzZLFjcZpQ16y3JJr727vgXsqYdg7najJFIOYdaGu94XsUT+1cBdattaBpPeM3GNlPKBNaF7cZ4jz+2Km5aI5Brjyz8FwfEXssTGoLeWzIcitmgAde4sKPnCK7WjZug6mPIH8s20xcF88cBbsPT35eOqeEmPQ2gdoXUqNc82BnwA9CgswCO3E6 8GHaiSAs QEZ7zMC0rSCq3K8Mnc8zssFLI5gFzwcFWqONdxVwk7BRF/cgyNjsyTlSgS/dRlqSA/Pi43vX3mP6K+uuQ8MH0j2F4B3dDXBDDBa3hlcvVdvYCaUvy4ATJtflEDV597tELAefTgrp6oWtcdZ5e99PlEfpW/Tm3pSgarNKd6hA7e9aw/c293XEfvf2sKnsX81/lnI81uZjXs7lD8jCMMAXvrdXmNyyV0SWISi2DwD0JgaDXxWysaDKCWf8qdiUbFvlpOoph236UO4nIXxowP+dM+tVcaiWNy3TkW+Q6GMInSAkKYA1B12J+gGmbtYc/jki+a8IhMMcwAdJN/OClG/LEGKtNVvAckVocbtQJpsZ8nOyatjMq53TED9IDxS2gr3o25qnlGB24NEPawbejGoG4eevVMpJmn876+kocecf418vFIJQ= 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: There are places which can be updated easily to use the helper to iterate over all vmap-nodes. This is what this patch does. The aim is to improve readability and simplify the code. Signed-off-by: Uladzislau Rezki (Sony) --- mm/vmalloc.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index e42ea20713dc7..3ff9acd64c077 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1061,12 +1061,11 @@ find_vmap_area_exceed_addr_lock(unsigned long addr, struct vmap_area **va) { unsigned long va_start_lowest; struct vmap_node *vn; - int i; repeat: - for (i = 0, va_start_lowest = 0; i < nr_vmap_nodes; i++) { - vn = &vmap_nodes[i]; + va_start_lowest = 0; + for_each_vmap_node(vn) { spin_lock(&vn->busy.lock); *va = __find_vmap_area_exceed_addr(addr, &vn->busy.root); @@ -4946,11 +4945,8 @@ static void show_purge_info(struct seq_file *m) { struct vmap_node *vn; struct vmap_area *va; - int i; - - for (i = 0; i < nr_vmap_nodes; i++) { - vn = &vmap_nodes[i]; + for_each_vmap_node(vn) { spin_lock(&vn->lazy.lock); list_for_each_entry(va, &vn->lazy.head, list) { seq_printf(m, "0x%pK-0x%pK %7ld unpurged vm_area\n", @@ -4966,11 +4962,8 @@ static int vmalloc_info_show(struct seq_file *m, void *p) struct vmap_node *vn; struct vmap_area *va; struct vm_struct *v; - int i; - - for (i = 0; i < nr_vmap_nodes; i++) { - vn = &vmap_nodes[i]; + for_each_vmap_node(vn) { spin_lock(&vn->busy.lock); list_for_each_entry(va, &vn->busy.head, list) { if (!va->vm) { @@ -5123,8 +5116,7 @@ static void vmap_init_nodes(void) } #endif - for (n = 0; n < nr_vmap_nodes; n++) { - vn = &vmap_nodes[n]; + for_each_vmap_node(vn) { vn->busy.root = RB_ROOT; INIT_LIST_HEAD(&vn->busy.head); spin_lock_init(&vn->busy.lock); @@ -5145,15 +5137,13 @@ static void vmap_init_nodes(void) static unsigned long vmap_node_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { - unsigned long count; + unsigned long count = 0; struct vmap_node *vn; - int i, j; - - for (count = 0, i = 0; i < nr_vmap_nodes; i++) { - vn = &vmap_nodes[i]; + int i; - for (j = 0; j < MAX_VA_SIZE_PAGES; j++) - count += READ_ONCE(vn->pool[j].len); + for_each_vmap_node(vn) { + for (i = 0; i < MAX_VA_SIZE_PAGES; i++) + count += READ_ONCE(vn->pool[i].len); } return count ? count : SHRINK_EMPTY; @@ -5162,10 +5152,10 @@ vmap_node_shrink_count(struct shrinker *shrink, struct shrink_control *sc) static unsigned long vmap_node_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) { - int i; + struct vmap_node *vn; - for (i = 0; i < nr_vmap_nodes; i++) - decay_va_pool_node(&vmap_nodes[i], true); + for_each_vmap_node(vn) + decay_va_pool_node(vn, true); return SHRINK_STOP; } -- 2.39.5