From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (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 467FC3043CE for ; Mon, 23 Feb 2026 16:01:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771862512; cv=none; b=VwuQiAehM+6Apxv1UEo5CD75TsOcDCkuAu9Gd7e29HATRNnhipPTI9pgKYUyWxwNCws0speV4akyt+bg9grHBQMIt8JKORBygYGh4LfXGAUsLQWn3QZnFOQ7u9Pw5w08RJL6LZMK2qBfkvEAue0bIw6iWwPjkw5NgvpfEgws2Nk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771862512; c=relaxed/simple; bh=ihwCY+885/DJ41iFQibyxx318RHDEpAXKJdoYYRfTsk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=F029rexPWJomJpCQ0IHn93XjOVjzduK9clmWUd0DUfXwZ4FBjyDZnBlGw9A+kyxuw8JcLZPSbMIpQQgqycnKNpBZoCqdbgP6vFhHwZRh7T2xTvE5ntjbqVQPXau9CT7VjNKyeWu4Wxz6MpNIfByeQqCi8eHHlZMeN5xLxuheUXc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org; spf=pass smtp.mailfrom=cmpxchg.org; dkim=pass (2048-bit key) header.d=cmpxchg.org header.i=@cmpxchg.org header.b=IV4BS7wx; arc=none smtp.client-ip=209.85.160.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg.org header.i=@cmpxchg.org header.b="IV4BS7wx" Received: by mail-qt1-f194.google.com with SMTP id d75a77b69052e-506989e8516so37365741cf.0 for ; Mon, 23 Feb 2026 08:01:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg.org; s=google; t=1771862510; x=1772467310; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OE3e/mRY2hQ14eIolnufoTqQ/7nanRq+a9D/btXLD44=; b=IV4BS7wxDKognmsq6eH3ouZ0uTp5VA+Gs4S3kXRgd8plyAJclFj4fg168vqVBOGbcO c+8/p94T77zPPuUXK4qwT17/up7xo57dyYuiUN2iYf78VU/X807u4Fn/zSCEUI2lbmGi qWhSrkkqvVY2IYcXa3k+6j41lZpjHnu4IhffsEpKhq5kUM2jxSBrDsiZxWYQDkAILtx2 RS7e2+NnAXsdyDEUKCyRQOKkDk4+Az7v4+xQcjZmgAFI4BBB+q5PnNlPZzk46pLH2D2H Ki+1HrAV2qINm4qD9qA6IRD65s393ZYcdsJyRo6R9BDR1PWJN8w4I1FUtlTFUMOBEOZC e6fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771862510; x=1772467310; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=OE3e/mRY2hQ14eIolnufoTqQ/7nanRq+a9D/btXLD44=; b=Hf7sZRCchFa1nhsI6w2bL1OJil9qjvGg+9FKgRxHYJ9G2yd4lybN8kYPyhDnmPZR25 OJlDgrQaogs2k5+u1ljTx2s2ggoK8A1fzI7RZQyxVlM4ynMD+fxNkN87akWg+yK6v/L7 7ChApCLzqVfqK132V18PIxX0Am5iJu1kV1O2glcV+G7r6355922jvvvMwMPLcVXv8Ygs OHLjYAbp1ZbVLMZKS5+WnUxTvDGEkbefEASaULVyzmqqj329VrNo+9dKWNMz0pKFUAE4 033W3QzjD9mAJuzV9zjQdofRu94mXPdbJgx3laXukcXnlFX7bTnuUwMI82nreDghUwTd gH0Q== X-Forwarded-Encrypted: i=1; AJvYcCUxGqR4e9j8azYxDvqyVEb2Y6S41OlNz7Jqa07y3zLtA91vE98U3o7BxPiTI+t9Rc6kB0BAhPhueLWSZS8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/COSmrHjGDLVgAqymUH2W7b+JppAGQ5VtploqiE8ktluok8K0 X4MG7xajT2ZgcQ96jKYwWaC9sf6zCngGaAee5Ju9o41lAUYz3HeJmVNH0jsFzsJCcFM= X-Gm-Gg: AZuq6aLFw2zLpRuDP5vt9ROldojjhFVra24ZOnai8glhjYfzERG3kAktBDSksWNmczk B9v0Vb+J2ggZho/6VPeWdJ2fa9z8d6jTEQqLdlaNDALtg2B0z/aGtPeQZF74ay1+CXiTeCV8n6b N/TKyVjcroJEg+gXpOSuYMgKvvpwJhHrip4Z7qZZkf4U6fGBpIyW+KnA5XpiBVtWxaJiieIkGGc Mpl+TBRIFyxyGy4/fCSgq9X0y2pSFZl11ERynv/v0Z10hcIeDzeNV2bqpXB1F5WOWoGl7GB2qW5 I4GiGZEiqmVkahVdBGDjAdG91xJTAcJXeol+0LGD/JOllTONkDVwkJDNlJpJoqK5bp8VV72XwKj 7UGRUYCagJdFvDiCXVWtCl2MT9KkagAGKXSiCY1w9+7gbKs0IPmRExJkrf8EhjEexp0OXJ2STbO 5Hnsy3Yvu5qOmTzAwJAtOqNA== X-Received: by 2002:a05:622a:14:b0:502:9a98:34b6 with SMTP id d75a77b69052e-5070bbde388mr116096171cf.19.1771862508740; Mon, 23 Feb 2026 08:01:48 -0800 (PST) Received: from localhost ([2603:7000:c00:3a00:365a:60ff:fe62:ff29]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-5070d6c9de8sm70140001cf.26.2026.02.23.08.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 08:01:47 -0800 (PST) From: Johannes Weiner To: Andrew Morton Cc: 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: [PATCH v2 1/2] mm: vmalloc: streamline vmalloc memory accounting Date: Mon, 23 Feb 2026 11:01:06 -0500 Message-ID: <20260223160147.3792777-1-hannes@cmpxchg.org> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use a vmstat counter instead of a custom, open-coded atomic. This has the added benefit of making the data available per-node, and prepares for cleaning up the memcg accounting as well. Acked-by: Shakeel Butt Signed-off-by: Johannes Weiner --- fs/proc/meminfo.c | 3 ++- include/linux/mmzone.h | 1 + include/linux/vmalloc.h | 3 --- mm/vmalloc.c | 19 ++++++++++--------- mm/vmstat.c | 1 + 5 files changed, 14 insertions(+), 13 deletions(-) V2: - Fix mod_node_page_state() pgdat argument (Shakeel) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index a458f1e112fd..549793f44726 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -126,7 +126,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v) show_val_kb(m, "Committed_AS: ", committed); seq_printf(m, "VmallocTotal: %8lu kB\n", (unsigned long)VMALLOC_TOTAL >> 10); - show_val_kb(m, "VmallocUsed: ", vmalloc_nr_pages()); + show_val_kb(m, "VmallocUsed: ", + global_node_page_state(NR_VMALLOC)); show_val_kb(m, "VmallocChunk: ", 0ul); show_val_kb(m, "Percpu: ", pcpu_nr_pages()); diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index fc5d6c88d2f0..64df797d45c6 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -220,6 +220,7 @@ enum node_stat_item { NR_KERNEL_MISC_RECLAIMABLE, /* reclaimable non-slab kernel pages */ NR_FOLL_PIN_ACQUIRED, /* via: pin_user_page(), gup flag: FOLL_PIN */ NR_FOLL_PIN_RELEASED, /* pages returned via unpin_user_page() */ + NR_VMALLOC, NR_KERNEL_STACK_KB, /* measured in KiB */ #if IS_ENABLED(CONFIG_SHADOW_CALL_STACK) NR_KERNEL_SCS_KB, /* measured in KiB */ diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index e8e94f90d686..3b02c0c6b371 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -286,8 +286,6 @@ int unregister_vmap_purge_notifier(struct notifier_block *nb); #ifdef CONFIG_MMU #define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START) -unsigned long vmalloc_nr_pages(void); - int vm_area_map_pages(struct vm_struct *area, unsigned long start, unsigned long end, struct page **pages); void vm_area_unmap_pages(struct vm_struct *area, unsigned long start, @@ -304,7 +302,6 @@ static inline void set_vm_flush_reset_perms(void *addr) #else /* !CONFIG_MMU */ #define VMALLOC_TOTAL 0UL -static inline unsigned long vmalloc_nr_pages(void) { return 0; } static inline void set_vm_flush_reset_perms(void *addr) {} #endif /* CONFIG_MMU */ diff --git a/mm/vmalloc.c b/mm/vmalloc.c index e286c2d2068c..a5fc7795aafd 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1063,14 +1063,8 @@ static BLOCKING_NOTIFIER_HEAD(vmap_notify_list); static void drain_vmap_area_work(struct work_struct *work); static DECLARE_WORK(drain_vmap_work, drain_vmap_area_work); -static __cacheline_aligned_in_smp atomic_long_t nr_vmalloc_pages; static __cacheline_aligned_in_smp atomic_long_t vmap_lazy_nr; -unsigned long vmalloc_nr_pages(void) -{ - return atomic_long_read(&nr_vmalloc_pages); -} - static struct vmap_area *__find_vmap_area(unsigned long addr, struct rb_root *root) { struct rb_node *n = root->rb_node; @@ -3463,11 +3457,11 @@ void vfree(const void *addr) * High-order allocs for huge vmallocs are split, so * can be freed as an array of order-0 allocations */ + if (!(vm->flags & VM_MAP_PUT_PAGES)) + dec_node_page_state(page, NR_VMALLOC); __free_page(page); cond_resched(); } - if (!(vm->flags & VM_MAP_PUT_PAGES)) - atomic_long_sub(vm->nr_pages, &nr_vmalloc_pages); kvfree(vm->pages); kfree(vm); } @@ -3655,6 +3649,8 @@ vm_area_alloc_pages(gfp_t gfp, int nid, continue; } + mod_node_page_state(page_pgdat(page), NR_VMALLOC, 1 << large_order); + split_page(page, large_order); for (i = 0; i < (1U << large_order); i++) pages[nr_allocated + i] = page + i; @@ -3675,6 +3671,7 @@ vm_area_alloc_pages(gfp_t gfp, int nid, if (!order) { while (nr_allocated < nr_pages) { unsigned int nr, nr_pages_request; + int i; /* * A maximum allowed request is hard-coded and is 100 @@ -3698,6 +3695,9 @@ vm_area_alloc_pages(gfp_t gfp, int nid, nr_pages_request, pages + nr_allocated); + for (i = nr_allocated; i < nr_allocated + nr; i++) + inc_node_page_state(pages[i], NR_VMALLOC); + nr_allocated += nr; /* @@ -3722,6 +3722,8 @@ vm_area_alloc_pages(gfp_t gfp, int nid, if (unlikely(!page)) break; + mod_node_page_state(page_pgdat(page), NR_VMALLOC, 1 << order); + /* * High-order allocations must be able to be treated as * independent small pages by callers (as they can with @@ -3864,7 +3866,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); - atomic_long_add(area->nr_pages, &nr_vmalloc_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, diff --git a/mm/vmstat.c b/mm/vmstat.c index d6e814c82952..bc199c7cd07b 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1270,6 +1270,7 @@ const char * const vmstat_text[] = { [I(NR_KERNEL_MISC_RECLAIMABLE)] = "nr_kernel_misc_reclaimable", [I(NR_FOLL_PIN_ACQUIRED)] = "nr_foll_pin_acquired", [I(NR_FOLL_PIN_RELEASED)] = "nr_foll_pin_released", + [I(NR_VMALLOC)] = "nr_vmalloc", [I(NR_KERNEL_STACK_KB)] = "nr_kernel_stack", #if IS_ENABLED(CONFIG_SHADOW_CALL_STACK) [I(NR_KERNEL_SCS_KB)] = "nr_shadow_call_stack", -- 2.53.0