From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 D4291DDCD for ; Sat, 1 Aug 2026 11:49:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785584980; cv=none; b=X6zDF8mEneFdpBZUhYpkwceDv8n4Q0Z/h+DodpkKvMy1xjqXGsZwDeH2NBEjRutOI/RfEKHIYe5DXgBEYsvJtc4EDxOxmqRjS6EAtKogUZkxFB6ggEe6l35Mvjx49FnRMuIrtuEBzZGC3y5HKmQUrQgTyPyRClWyxFADVa9HBoI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785584980; c=relaxed/simple; bh=S0jBGkXf9N4m9vB8iT182Fx5ygM8owRg32z8S2Frf0Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O3CP1aI3K86B4scGVmZILoHn9I2yHF978po2WshkV1+PMq1P1Ct4oFML5hpkRNafkeH3puWC+DFNcgF7cT36HKQ44DTgzBj0pScP4elS7do5P0+N3byFftAOUL1HpohdrlzxB0FvD53lg87FI57isCjhyivQFXHDsjZmFl8nn5M= 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=RBxY0ZVC; arc=none smtp.client-ip=209.85.167.51 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="RBxY0ZVC" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5b2a44a3b66so1904597e87.1 for ; Sat, 01 Aug 2026 04:49:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785584977; x=1786189777; darn=vger.kernel.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:content-type; bh=ZwR5JXqTMN9zli8Uq7BFLpMJ0Xr4vtGnZsa0PqHGYFY=; b=RBxY0ZVCJrEteKoH20iW1kJvDleSweNTFGtLcOihBaY2WwN1aC8H7y+AEUbPOV5dI3 h1Iqsu0xoFUCHHQZveCNjA8nPwwov2UovF8YHr89CCrGFSea12W3kYj2wQUYrTf4HT/u eFXxLjQHlPeAkslEjKpjCl9IS2Do8nnFA3KyXZglBxTD5U1cgSKPLl5+4kwBs29twOt8 IohBlWAHtA63XXJOIZX14HEHY7R13OepNk9TdHJLKlX88UGRQ/L5+kZWGD8WqNd1ggBF Inov+khx4hUtRc0/pS9jxrOsrecXapAY1gC4lmknFWDAiZeA/yiGxYgrRhmPDHu7qXy9 3AGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785584977; x=1786189777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ZwR5JXqTMN9zli8Uq7BFLpMJ0Xr4vtGnZsa0PqHGYFY=; b=kGTEg70LsdSHtZjoybHgK7bT9BW8psoXbZtlyqaKWTv1SSPb97qHtBVvtE5EMYQeCN I60Wy2896wcyXM0XsA8KtTuKROuQinvKRq8TqBv50EXcsGigFUaLI4gk5+ehPH4KtdOQ +AGblc+n4XzN/gZdWNyNldPVLFL+fw0k40HedlLJfddiZ6Bi0dx0ezaoYzAPoMRUpyC/ 40GeISgJUIMAY0Qzo32GXCJPecjrkLE3SSsM1NX9dD+l6a5k1EqGsdVAf0AO4yp7UvNf rDGxlibhZA0jLHbay6bjGaYx8HGLnJJ0z5IZ5sBlTTAeAELyWzOWkRbH1+IxVGGlIbXN sxkw== X-Forwarded-Encrypted: i=1; AHgh+Rp+qvfIuCStM+l/KkLFWXMpKrUrpmZSeYj+blZpcKmvWJL2r6p/tpw5Hhpb47mKyUd6L9FbMQ3YqdLL2o0=@vger.kernel.org X-Gm-Message-State: AOJu0YziDd+x7LMayjhNf/ifFLPZoJ8UFEzIMUnKD7xC+7WfKeqKXImu OUR7sxX/Jvy0skhqBvgcktqV8G0S87QrZE++AJNeddlc19MFUBu8J6cny2NzCg== X-Gm-Gg: AR+sD10tUAtEG80GB4nIGbFeCgU0kuv4VLmBeK+2xE0NEdG8xI6KsZhgGcdwlOLeX3h sxTHx9TU5qXhTqq+2piZVf9IO4bnI//u5Vs75DmyZXWGU/BNdbojv2pIdmycS0voYL7ey/3owSI 8HdEgbceaKyEPgRF76PHm96jgclpGzjQoY8sD+8epPl7/fQGC/U2ABEkn+Z39o6XAn1hdhlx502 13mGK/k1G6Poih7G/QgaQiqj2UBKS9aaRRY3a4A4pBokMu2qpJte+FKEo//4rUamQC9YaoWlGP4 u/uIFkobIHu2D79WKc1Xd5DkAttek4u9vhhcz0QBfitF1Y/CBws2u8t0Gk6NqVG455zOBC8Pfny FlSL8mHsSVzwlNwCu6noAe65wDC/SQmPrXBO7O3WRLWBQxSKR0GNqhCbuW80GAzu7FpRsbxkIVE W9gtrZ/k7ZDObNphAS8yYXnWgI44C5JDwdSG/1lEOi3CCqwNDNeRtNh9tuOSJEblnoZO3kh2w0b YZ1CeWY4Gn5fVxeV2w4x/icgEOSzGrgCRo3XsFOJpG0INYs2W1XHAHmmA== X-Received: by 2002:a05:6512:2347:b0:5b2:9f7a:29aa with SMTP id 2adb3069b0e04-5b2e4bde7dfmr721283e87.0.1785584976590; Sat, 01 Aug 2026 04:49:36 -0700 (PDT) Received: from localhost.localdomain (46-138-176-102.dynamic.spd-mgts.ru. [46.138.176.102]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b2e23cb4e6sm893160e87.22.2026.08.01.04.49.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2026 04:49:36 -0700 (PDT) From: Artem Lytkin To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, urezki@gmail.com, willy@infradead.org, shivamkalra98@zohomail.in, linux-kernel@vger.kernel.org Subject: [PATCH v4] mm/vmalloc: make vm_struct.nr_pages an unsigned long Date: Sat, 1 Aug 2026 14:49:15 +0300 Message-ID: <20260801114915.115224-1-iprintercanon@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260730130923.9e71be5f477ee3db333cf0f8@linux-foundation.org> References: <20260730130923.9e71be5f477ee3db333cf0f8@linux-foundation.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit vm_struct::nr_pages is an unsigned int, and the file keeps deriving byte counts from it as nr_pages << PAGE_SHIFT. A shift is evaluated in the type of its promoted left operand, so those are 32-bit arithmetic and wrap at 4 GiB of bytes, which is 2^20 pages. Every site depends on a cast being remembered; vmap() has one, two recent commits did not. vread_iter() then computes a size of zero for a 4 GiB VM_ALLOC area and /proc/kcore returns it as zeros while reporting a successful read, which drgn, crash or gdb cannot tell from real memory, and the vrealloc() grow-in-place check declines a request that would have fit. Widen the field so the class of bug goes away instead of one site at a time. Everything feeding or consuming it widens too: vm_area_alloc_pages() and its accumulators, nr_small_pages, new_nr_pages and old_nr_pages, the index range of vm_area_free_pages(), and three page indexes that were plain int. Five casts go. Two prints needed fixing as well, %u in vmalloc_dump_obj() and %d for the unsigned field in vmalloc_info_show(). No bug report behind this, I found it reading the code. The 4 GiB wrap needs only a machine with over 4 GiB of memory. Neither larger threshold is a practical concern: 2^32 pages, where the field itself truncates, is 16 TiB and beyond what hardware can populate, and 2^31, where the plain int indexes break, is 8 TiB and larger than anything in the tree asks for. The int *nr cursor in the mapping path is unchanged and is separate work. Users outside mm/vmalloc.c need no change either. Those handing the count to a narrower parameter cannot drive it near 2^31, and kho_preserve_vmalloc() stores it into a 32-bit ABI field that still receives the same low bits; above 2^32 pages the truncation just moves out of vm_struct into that store. sizeof(struct vm_struct) on x86-64 stays 72 bytes with CONFIG_HAVE_ARCH_HUGE_VMALLOC=n and goes from 72 to 80 with it enabled, both inside the kmalloc-96 bucket it already comes from. Cc: stable@vger.kernel.org Fixes: 0bca23804632 ("mm/vmalloc: use physical page count in vread_iter() for VM_ALLOC areas") Fixes: d57ac904ffdc ("mm/vmalloc: use physical page count for vrealloc() grow-in-place check") Suggested-by: Andrew Morton Reviewed-by: Uladzislau Rezki (Sony) Assisted-by: Claude:claude-fable-5 Signed-off-by: Artem Lytkin --- This is the single switch-to-ulong patch you asked for; v3 crossed with your mail a few hours earlier and was already that, only without the stable tag. So v4 is v3 plus Cc: stable, rebased on today's mm-new. I left the second Fixes: on d57ac904ffdc as well, since the same widening is what fixes the vrealloc() grow-in-place check. Drop it if you would rather the backport hang off one commit. v4: - Cc: stable (Andrew) - corrected the kexec_handover sentence, which claimed a cap that is not there; the ABI field just keeps taking the low 32 bits - rebased on mm-new v3: https://lore.kernel.org/linux-mm/20260730171142.76817-1-iprintercanon@gmail.com/ v2: https://lore.kernel.org/linux-mm/20260730090628.65814-1-iprintercanon@gmail.com/ include/linux/vmalloc.h | 2 +- mm/vmalloc.c | 58 ++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index e4d8d0a9f30f9..aed121d729b01 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -62,7 +62,7 @@ struct vm_struct { #ifdef CONFIG_HAVE_ARCH_HUGE_VMALLOC unsigned int page_order; #endif - unsigned int nr_pages; + unsigned long nr_pages; phys_addr_t phys_addr; const void *caller; unsigned long requested_size; diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 26f32949c2f2e..196da8738cf10 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3404,7 +3404,7 @@ struct vm_struct *remove_vm_area(const void *addr) static inline void set_area_direct_map(const struct vm_struct *area, int (*set_direct_map)(struct page *page)) { - int i; + unsigned long i; /* HUGE_VMALLOC passes small pages to set_direct_map */ for (i = 0; i < area->nr_pages; i++) @@ -3420,7 +3420,7 @@ static void vm_reset_perms(struct vm_struct *area) unsigned long start = ULONG_MAX, end = 0; unsigned int page_order = vm_area_page_order(area); int flush_dmap = 0; - int i; + unsigned long i; /* * Find the start and end range of the direct mappings to make sure that @@ -3493,10 +3493,10 @@ void vfree_atomic(const void *addr) * Caller is responsible for unmapping (vunmap_range) and KASAN * poisoning before calling this. */ -static void vm_area_free_pages(struct vm_struct *vm, unsigned int start_idx, - unsigned int end_idx) +static void vm_area_free_pages(struct vm_struct *vm, unsigned long start_idx, + unsigned long end_idx) { - unsigned int i; + unsigned long i; if (!(vm->flags & VM_MAP_PUT_PAGES)) { for (i = start_idx; i < end_idx; i++) @@ -3819,12 +3819,12 @@ static inline gfp_t vmalloc_gfp_adjust(gfp_t flags, const bool large) return flags; } -static inline unsigned int +static inline unsigned long vm_area_alloc_pages(gfp_t gfp, int nid, - unsigned int order, unsigned int nr_pages, struct page **pages) + unsigned int order, unsigned long nr_pages, struct page **pages) { - unsigned int nr_allocated = 0; - unsigned int nr_remaining = nr_pages; + unsigned long nr_allocated = 0; + unsigned long nr_remaining = nr_pages; unsigned int max_attempt_order = MAX_PAGE_ORDER; struct page *page; int i; @@ -3872,7 +3872,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; + unsigned long i; /* * A maximum allowed request is hard-coded and is 100 @@ -3880,7 +3880,7 @@ vm_area_alloc_pages(gfp_t gfp, int nid, * long preemption off scenario in the bulk-allocator * so the range is [1:100]. */ - nr_pages_request = min(100U, nr_pages - nr_allocated); + nr_pages_request = min(100UL, nr_pages - nr_allocated); /* memory allocation should consider mempolicy, we can't * wrongly use nearest node when nid == NUMA_NO_NODE, @@ -4026,12 +4026,12 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, unsigned long addr = (unsigned long)area->addr; unsigned long size = get_vm_area_size(area); unsigned long array_size; - unsigned int nr_small_pages = size >> PAGE_SHIFT; + unsigned long nr_small_pages = size >> PAGE_SHIFT; unsigned int page_order; unsigned int flags; int ret; - array_size = (unsigned long)nr_small_pages * sizeof(struct page *); + array_size = nr_small_pages * sizeof(struct page *); /* __GFP_NOFAIL and "noblock" flags are mutually exclusive. */ if (!gfpflags_allow_blocking(gfp_mask)) @@ -4525,7 +4525,7 @@ void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align } if (size <= old_size) { - unsigned int new_nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; + unsigned long new_nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; /* Zero out "freed" memory, potentially for future realloc. */ if (want_init_on_free() || want_init_on_alloc(flags)) @@ -4554,7 +4554,7 @@ void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align !(vm->flags & (VM_FLUSH_RESET_PERMS | VM_USERMAP)) && gfp_has_io_fs(flags)) { unsigned long addr = (unsigned long)kasan_reset_tag(p); - unsigned int old_nr_pages = vm->nr_pages; + unsigned long old_nr_pages = vm->nr_pages; /* * Use the node lock to synchronize with concurrent @@ -4567,16 +4567,13 @@ void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align spin_unlock(&vn->busy.lock); /* Notify kmemleak of the reduced allocation size before unmapping. */ - kmemleak_free_part( - (void *)addr + ((unsigned long)new_nr_pages - << PAGE_SHIFT), - (unsigned long)(old_nr_pages - new_nr_pages) - << PAGE_SHIFT); + kmemleak_free_part((void *)addr + + (new_nr_pages << PAGE_SHIFT), + (old_nr_pages - new_nr_pages) + << PAGE_SHIFT); - vunmap_range(addr + ((unsigned long)new_nr_pages - << PAGE_SHIFT), - addr + ((unsigned long)old_nr_pages - << PAGE_SHIFT)); + vunmap_range(addr + (new_nr_pages << PAGE_SHIFT), + addr + (old_nr_pages << PAGE_SHIFT)); vm_area_free_pages(vm, new_nr_pages, old_nr_pages); } @@ -5400,7 +5397,7 @@ bool vmalloc_dump_obj(void *object) struct vmap_area *va; struct vmap_node *vn; unsigned long addr; - unsigned int nr_pages; + unsigned long nr_pages; addr = PAGE_ALIGN((unsigned long) object); vn = addr_to_node(addr); @@ -5420,7 +5417,7 @@ bool vmalloc_dump_obj(void *object) nr_pages = vm->nr_pages; spin_unlock(&vn->busy.lock); - pr_cont(" %u-page vmalloc region starting at %#lx allocated at %pS\n", + pr_cont(" %lu-page vmalloc region starting at %#lx allocated at %pS\n", nr_pages, addr, caller); return true; @@ -5438,16 +5435,17 @@ bool vmalloc_dump_obj(void *object) static void show_numa_info(struct seq_file *m, struct vm_struct *v, unsigned int *counters) { - unsigned int nr; unsigned int step = 1U << vm_area_page_order(v); + unsigned long i; + unsigned int nr; if (!counters) return; memset(counters, 0, nr_node_ids * sizeof(unsigned int)); - for (nr = 0; nr < v->nr_pages; nr += step) - counters[page_to_nid(v->pages[nr])] += step; + for (i = 0; i < v->nr_pages; i += step) + counters[page_to_nid(v->pages[i])] += step; for_each_node_state(nr, N_HIGH_MEMORY) if (counters[nr]) seq_printf(m, " N%u=%u", nr, counters[nr]); @@ -5505,7 +5503,7 @@ static int vmalloc_info_show(struct seq_file *m, void *p) seq_printf(m, " %pS", v->caller); if (v->nr_pages) - seq_printf(m, " pages=%d", v->nr_pages); + seq_printf(m, " pages=%lu", v->nr_pages); if (v->phys_addr) seq_printf(m, " phys=%pa", &v->phys_addr); base-commit: 1dbd7c34bb92dd9c0b0363b75f6ec444299af108 -- 2.43.0