From patchwork Thu Apr 3 05:33:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 14036752 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 5BBE8C3601A for ; Thu, 3 Apr 2025 05:33:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 73E9D280003; Thu, 3 Apr 2025 01:33:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F299280001; Thu, 3 Apr 2025 01:33:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B5B0280003; Thu, 3 Apr 2025 01:33:46 -0400 (EDT) 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 3C87B280001 for ; Thu, 3 Apr 2025 01:33:46 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id EBF2C12170C for ; Thu, 3 Apr 2025 05:33:45 +0000 (UTC) X-FDA: 83291615610.13.43331AD Received: from out-189.mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.189]) by imf26.hostedemail.com (Postfix) with ESMTP id 2E9D1140005 for ; Thu, 3 Apr 2025 05:33:43 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Sd7RZ3+1; spf=pass (imf26.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.189 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743658424; 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=m82CvK78yYT/5lTQIxRkvnm+pZdrU14HxUh0Z7KEcQM=; b=dSEAXoDh4cVB5qP0DJe/qJ2+cPdjMF8wwJJ9l7gtoavCdHhJu8igGFpGz0QPBCKXRc4/Ym zt7A9VvCsRXsczJiFig4ziCmB8MpKvc8BFQWpB3JarAnvSq50BviAkbAwO/k1VYpP4WhSe xIXe1LW3vuPIBHoMdKRk2e1i/IXH2DU= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Sd7RZ3+1; spf=pass (imf26.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.189 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743658424; a=rsa-sha256; cv=none; b=QGAvX/WBaG6/cFpX5QHoc/0hoMxRm4QAjmKFDUBtA9Jlf4cj78CF7QauB/3fnu14d8rdBF 74AfYzKgV0NMdLpBdKSJkO+izlrpuhqYbPn2HirIVER7JB7Lg0uJlESZDtCByYDN9MJj2e RVie6EQ+r5uWx5mGL7b+zdY+ZMKYt9c= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1743658422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=m82CvK78yYT/5lTQIxRkvnm+pZdrU14HxUh0Z7KEcQM=; b=Sd7RZ3+1XIjf/4oyQaMfC5OG9cDChmzgoDmBmT9cTGZFAAsTFqXvT4B6Mht5mMBnTLLChf 2OJTzlLP2Nn624+VwKr3WxUZPnMYv7ejKI8VfK6pblRXU8ANwDkoTefKZJE35blzMJzpiE 5zOJyIYtJorWwQJCsjjYVP+pMSmDNwM= From: Shakeel Butt To: Andrew Morton Cc: Uladzislau Rezki , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: [PATCH] memcg: vmalloc: simplify MEMCG_VMALLOC updates Date: Wed, 2 Apr 2025 22:33:26 -0700 Message-ID: <20250403053326.26860-1-shakeel.butt@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 2E9D1140005 X-Stat-Signature: kiae8enww3akrjpds9pausymoyzoih75 X-HE-Tag: 1743658423-19804 X-HE-Meta: U2FsdGVkX1/jI1LIHQPR/sU+djQ12ysr0r7zPq2VptYA4OUA4Zf6XzGUmOaT48BfQZ2aWqg/64OHZJ0m97zuPNLv6Z8DPMIK1KL5EP1ZRjenMheCXoqX9eoHnKwc7BIudCaT4qrPM7RGMnWwmNnkHxaY+ewTnI641jAVBB0cma9G++oG1lhQtRQCRQhkcd/+6p+S7BjFdHPmRLw28SJHZnE4Mm5dD+RaFBDRzOsl9Mrfdw6+hDtE5+usqbEFRSRkmVw3M9/QfkK+YZROvsHkOmUCXgu8WqhAEFMee155MeaZA1tQhk86NjoGkS27h7EgXI8a/vHrUu3rV2BIAKpvxcAVaIbuu5rZmAh+SfBGZyMX07oonS6vRSZH5R/lMSgtEGuBxJ2hPb9DFu1JBVnM01p6/3TPEjt8q47/UYpg0D9UTXrwkRCYm119OTIlFXkDidPlAYOg9uBZKhMHR3Zf6JBEQ6XOsxNAB1021nWmM39+plBLf+2Xxuq6GcFr9HPeEclphp4tmXeXk98niZCXZ5tZ/woq7nrvStjphZfbOd7Y0RtOVx/xG/IObJ1Kv4tSyzqNxKHzv9rA5GClM2gdWL4fbSgJ1g+eP2M8seo3v/ivWm7tD8Mg7zLjCKRdTm8AvRCcy86abZxd9y7w1QvokYpQswuLVrKpBbGrKbRk07VJ5gJOgMjynVJWESIoRVe0wqXoFfsMjh4Yr7/oafj7+2wKj002d0gTyFQ+tHStP9VCBXZMHNyORO26uc4BGgrEF8nUCeclA/qfPB84pL/6/VBwuSylYqwkfeVcnKn0kOtoK+6Bho1DyTUOruA3uhxktK/xVjJf/ZLNUcnepHyWmDZeJS2jX0PanzlbVjp5WPFbr73bIf9zJuTOtagP+Q0VL3bv+u3waVYiFRtXDXa+ulwIIApmG+K59uK3LQ+jl3mxmCqB7ZY0/yoMv99hBbgMbZd8ZSf/cKSfz3goZCv cJD4LIZn oqHvrLNHPVo4BYO8QSbjJ5D9lTFpOqH4ZxqRXNmuD2UQ+zyH/Oh4akZowjiZ+nNQii4OFlyJw7x0zfjg9TtBsyQ8gE/P1svefb33rnbbZOtM4p6G/M2OjGhhnrMOieNvrqk6ZMUL7R0EKgRXrJg6I9dyCdEDYM5L5xBOvcGdXTEW9My+9YyM/Hf7FlGJU8qjplkf6AGwRd8URCTNtMPyXUZPmIQ== 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: The vmalloc region can either be charged to a single memcg or none. At the moment kernel traverses all the pages backing the vmalloc region to update the MEMCG_VMALLOC stat. However there is no need to look at all the pages as all those pages will be charged to a single memcg or none. Simplify the MEMCG_VMALLOC update by just looking at the first page of the vmalloc region. Signed-off-by: Shakeel Butt Acked-by: Michal Hocko Reviewed-by: Uladzislau Rezki (Sony) Signed-off-by: Shakeel Butt Reviewed-by: Uladzislau Rezki (Sony) --- mm/vmalloc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 3ed720a787ec..cdae76994488 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3370,12 +3370,12 @@ void vfree(const void *addr) if (unlikely(vm->flags & VM_FLUSH_RESET_PERMS)) vm_reset_perms(vm); + if (vm->nr_pages && !(vm->flags & VM_MAP_PUT_PAGES)) + mod_memcg_page_state(vm->pages[0], MEMCG_VMALLOC, -vm->nr_pages); for (i = 0; i < vm->nr_pages; i++) { struct page *page = vm->pages[i]; BUG_ON(!page); - if (!(vm->flags & VM_MAP_PUT_PAGES)) - mod_memcg_page_state(page, MEMCG_VMALLOC, -1); /* * High-order allocs for huge vmallocs are split, so * can be freed as an array of order-0 allocations @@ -3671,12 +3671,9 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, node, page_order, nr_small_pages, area->pages); atomic_long_add(area->nr_pages, &nr_vmalloc_pages); - if (gfp_mask & __GFP_ACCOUNT) { - int i; - - for (i = 0; i < area->nr_pages; i++) - mod_memcg_page_state(area->pages[i], MEMCG_VMALLOC, 1); - } + if (gfp_mask & __GFP_ACCOUNT && area->nr_pages) + mod_memcg_page_state(area->pages[0], MEMCG_VMALLOC, + area->nr_pages); /* * If not enough pages were obtained to accomplish an