From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66642364055 for ; Mon, 23 Feb 2026 15:12:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771859574; cv=none; b=ibGaNgKATL2bihNHcdb9Ena7ExSPmebrxpamwuZpvfp+roLdyKVHdvdmuyGkSDxVm3SfQZvjbYbQr8bbg/ARYNVJfukZfkc1hVv2r7JSrgH1TjkJzx9vWwfeYIgywz4XfflMfE76l1+ZuM5TIVfXQMveKWA+7BM9oTEFtg09nME= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771859574; c=relaxed/simple; bh=CYkBXoTf/dSuKGzEl9Jo4E5MEUaThQGWXjgL1xUJ8PI=; h=From:Date:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=q0EG3XHL40Zwzz0LKJSdI86O5u5WETD6fcqOD/lScv4srz83IQ73u/nMXFWtc1eEBLnxT+4dH+1dH6k66+ep3/sM2drM3v1ZO+R0U/9D6I3yrTDy4Y+2lu/x8pm/SfTK7xxCWAwpbfcuyxAKjxxtP5huo0cDhIOndJq+iGKuGis= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Kqj2g8lG; arc=none smtp.client-ip=209.85.167.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kqj2g8lG" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-59e4a04f059so5708571e87.2 for ; Mon, 23 Feb 2026 07:12:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771859572; x=1772464372; darn=vger.kernel.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=ztMTHoPevsynxwNBJLriX2EMDeNpsudFj4ZJFPjQr+o=; b=Kqj2g8lGmeJGcfAmXbZ75DDhL1rY/3pcx2Cd5RhMiblttUJUAvFzIxJirtfX9/w14h BPlMY6ylStBX/bKkLwgPczx0928yEtOWJ4MoJf5SDjTK+4eLMfOX7XiH+B80imFXYhjY Y84ul8bO72o/Rj4PSBa4Axbk+8FQnS3/vTaoKvBKfTtSDAaUIzZP9cogy9bqzA/Vlrbc eNWWsXqXCA4G1t7sWVL6fb2siNA/XGfbjOAEan1aiO+QFNcXyOXyppD3+XMP1Cu8iVlZ /vp5PTn2C8bEvTduT1XSrXtmMQK/GtRTYvlkT1q5W1ifxawRW/kMVmCZRLVCuZtISFms U7cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771859572; x=1772464372; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ztMTHoPevsynxwNBJLriX2EMDeNpsudFj4ZJFPjQr+o=; b=ujCKp1oHg5KWkbieLW5HNKXeDLW5i/z0qPhKnj2R67lEvzHW2foXg1URE1Bkrtp8ok YmYoJgujxeC0aO2lYaIeW9k5DAGsRQD81IxF82mvlC3bX+5dFMacoIGQHUc6haHgvIYn QQA+syLsJvzY7nuiW/KBqHvK148LRjbYES+X/BDTbOApFcHSk/IM0dxd8qfhNmQMCul0 xAtYfA0jPzy9/2AhOY5TKrCl6E87SxV/jsw7qFAE9yScLUJRKiG92KrNcdXc2EcsnMjz HgWJj19lK4jcsc9t1n9debLdH/vwBryLgd+iE/NkjIxdx6ptYiShGd21IZoBddSMDOMz XzNw== X-Forwarded-Encrypted: i=1; AJvYcCWOupclB1LcVftDbub864EkSNcEXIvHSTbnN9lqhMKDVEhVCG/uvz4gIAUSnyz7YaWa3GJOWvon/jyqK1M=@vger.kernel.org X-Gm-Message-State: AOJu0Yx283EST6kF36nt1J+UD44GkWeyTYeqTpAiu6ilOfWPXrs10t5Z IawMPEIfvp8chro7DN9kr+DZmmqQCCbXFdZUw6HnS5FhIAsm7XvsBsFo X-Gm-Gg: AZuq6aJb6f1bXtYZUo9c0Cs02HVeeSOoTujgaEzQZU0bam6QhFhj6Kcvm+5eOLuHAua eIQzKezpMxsK3321rcQg2EznDy1/MQvL7Iur13+Crt8cO4Ju6JrMeT0++/A8N8iReGvjk5em8HQ FfJkrZ4E/vWM1WEIjHQHE6l7ERhn2N34YA4wBhGE8MQABknT1dI5IBVkSLGniKHEieLvG+sGbps FttXsxu4LKyMuhCdiiFa4taYcSHTGheKBRbuh+NjNonUQRBakcQ//AF3mlpxzQaytxpKe8plKkM HwtcDP+rcaac2/AMzwwWWdcgDynjPQSfgJxe8TP+ePhUGmvkI1egH8JxrCmmZKE3Z2JJ6FYTVpd hB3aK0ezEBM5G/NUi8m8gaTn9VkXSfi9nY2HPp+u2cEWJmFTuCyjDayvfJliUv1Oj1+dZJSVFlr eNVzvjYArPqvlGER2PlmFC6e4cPls9fiaROTazHejzPfwRFbpXeeT9 X-Received: by 2002:a05:6512:3a96:b0:59d:e589:c973 with SMTP id 2adb3069b0e04-5a0ed9b038fmr2771294e87.48.1771859571444; Mon, 23 Feb 2026 07:12:51 -0800 (PST) Received: from pc636 (host-90-233-215-147.mobileonline.telia.com. [90.233.215.147]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a0eeb458bcsm1610898e87.62.2026.02.23.07.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 07:12:51 -0800 (PST) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Mon, 23 Feb 2026 16:12:48 +0100 To: Johannes Weiner Cc: Andrew Morton , Uladzislau Rezki , Joshua Hahn , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] mm: memcontrol: switch to native NR_VMALLOC vmstat counter Message-ID: References: <20260220191035.3703800-1-hannes@cmpxchg.org> <20260220191035.3703800-2-hannes@cmpxchg.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260220191035.3703800-2-hannes@cmpxchg.org> On Fri, Feb 20, 2026 at 02:10:35PM -0500, Johannes Weiner wrote: > Eliminates the custom memcg counter and results in a single, > consolidated accounting call in vmalloc code. > > Signed-off-by: Johannes Weiner > --- > include/linux/memcontrol.h | 1 - > mm/memcontrol.c | 4 ++-- > mm/vmalloc.c | 16 ++++------------ > 3 files changed, 6 insertions(+), 15 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 67f154de10bc..c7cc4e50e59a 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -35,7 +35,6 @@ enum memcg_stat_item { > MEMCG_SWAP = NR_VM_NODE_STAT_ITEMS, > MEMCG_SOCK, > MEMCG_PERCPU_B, > - MEMCG_VMALLOC, > MEMCG_KMEM, > MEMCG_ZSWAP_B, > MEMCG_ZSWAPPED, > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 129eed3ff5bb..fef5bdd887e0 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -317,6 +317,7 @@ static const unsigned int memcg_node_stat_items[] = { > NR_SHMEM_THPS, > NR_FILE_THPS, > NR_ANON_THPS, > + NR_VMALLOC, > NR_KERNEL_STACK_KB, > NR_PAGETABLE, > NR_SECONDARY_PAGETABLE, > @@ -339,7 +340,6 @@ static const unsigned int memcg_stat_items[] = { > MEMCG_SWAP, > MEMCG_SOCK, > MEMCG_PERCPU_B, > - MEMCG_VMALLOC, > MEMCG_KMEM, > MEMCG_ZSWAP_B, > MEMCG_ZSWAPPED, > @@ -1359,7 +1359,7 @@ static const struct memory_stat memory_stats[] = { > { "sec_pagetables", NR_SECONDARY_PAGETABLE }, > { "percpu", MEMCG_PERCPU_B }, > { "sock", MEMCG_SOCK }, > - { "vmalloc", MEMCG_VMALLOC }, > + { "vmalloc", NR_VMALLOC }, > { "shmem", NR_SHMEM }, > #ifdef CONFIG_ZSWAP > { "zswap", MEMCG_ZSWAP_B }, > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index a49a46de9c4f..8773bc0c4734 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -3446,9 +3446,6 @@ void vfree(const void *addr) > > if (unlikely(vm->flags & VM_FLUSH_RESET_PERMS)) > vm_reset_perms(vm); > - /* All pages of vm should be charged to same memcg, so use first one. */ > - 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]; > > @@ -3458,7 +3455,7 @@ void vfree(const void *addr) > * can be freed as an array of order-0 allocations > */ > if (!(vm->flags & VM_MAP_PUT_PAGES)) > - dec_node_page_state(page, NR_VMALLOC); > + mod_lruvec_page_state(page, NR_VMALLOC, -1); > __free_page(page); > cond_resched(); > } > @@ -3649,7 +3646,7 @@ vm_area_alloc_pages(gfp_t gfp, int nid, > continue; > } > > - mod_node_page_state(page, NR_VMALLOC, 1 << large_order); > + mod_lruvec_page_state(page, NR_VMALLOC, 1 << large_order); > > split_page(page, large_order); > for (i = 0; i < (1U << large_order); i++) > @@ -3696,7 +3693,7 @@ vm_area_alloc_pages(gfp_t gfp, int nid, > pages + nr_allocated); > > for (i = nr_allocated; i < nr_allocated + nr; i++) > - inc_node_page_state(pages[i], NR_VMALLOC); > + mod_lruvec_page_state(pages[i], NR_VMALLOC, 1); > > nr_allocated += nr; > > @@ -3722,7 +3719,7 @@ vm_area_alloc_pages(gfp_t gfp, int nid, > if (unlikely(!page)) > break; > > - mod_node_page_state(page, NR_VMALLOC, 1 << order); > + mod_lruvec_page_state(page, NR_VMALLOC, 1 << order); > > /* > * High-order allocations must be able to be treated as > @@ -3866,11 +3863,6 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, > vmalloc_gfp_adjust(gfp_mask, page_order), node, > page_order, nr_small_pages, area->pages); > > - /* All pages of vm should be charged to same memcg, so use first one. */ > - 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 > * allocation request, free them via vfree() if any. > -- > 2.53.0 > LGTM: Reviewed-by: Uladzislau Rezki (Sony)