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 BCC88C7EE32 for ; Sat, 28 Jun 2025 10:25:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B6D56B0098; Sat, 28 Jun 2025 06:25:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 48E9D6B0099; Sat, 28 Jun 2025 06:25:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3CB206B009A; Sat, 28 Jun 2025 06:25:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 291546B0098 for ; Sat, 28 Jun 2025 06:25:48 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6920859609 for ; Sat, 28 Jun 2025 10:25:47 +0000 (UTC) X-FDA: 83604428334.24.391499C Received: from mailrelay-egress12.pub.mailoutpod2-cph3.one.com (mailrelay-egress12.pub.mailoutpod2-cph3.one.com [46.30.211.187]) by imf30.hostedemail.com (Postfix) with ESMTP id 8D6888000F for ; Sat, 28 Jun 2025 10:25:45 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=tKbMwsNy; dkim=pass header.d=konsulko.se header.s=ed1 header.b=3Cx0u+rk ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751106345; 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=cg6Mb0y63NoDrvRbc/wKLzTLQZaf3be1Lhc8PUfhwzc=; b=zg5eBEDLvjPEAEUNT4lbR8RQTSsCQ4p+5qHhbd/NCLB73pX7648+y2PYIu2ImB2rcxWBke zbQ6XhyHsyHx50SvjyqtRDgwQ7htnParn5Dld+UTayxWSI1eObmK4HzwKWOFeK4fk3/GAX lR59ZlqtpWUwxpD66m4/g36BAs39aEE= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=tKbMwsNy; dkim=pass header.d=konsulko.se header.s=ed1 header.b=3Cx0u+rk; spf=none (imf30.hostedemail.com: domain of vitaly.wool@konsulko.se has no SPF policy when checking 46.30.211.187) smtp.mailfrom=vitaly.wool@konsulko.se; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751106345; a=rsa-sha256; cv=none; b=M0itXYEWjJiQTayoqiDSaLiXXAtQ5GSFMPnIjD8p4XLaFn6hn00/R6rKs+IfMyFrmFhZxs xHeRzA2zI0R2FK9UUtgdB/pI7fIwsN8OcNFuKuEMXCuJ6Rt7fLfchKJ6wpIx9XS6X4+nSc yIHmVS4CQEhzDO42tQxhrgtlzTefrCg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1751106343; x=1751711143; d=konsulko.se; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=cg6Mb0y63NoDrvRbc/wKLzTLQZaf3be1Lhc8PUfhwzc=; b=tKbMwsNyIkt/bTwNj0rS4UH6zvFFzJGbmhgbVHAJ8ZrDQvIffWCH35ZERPZcXT9QhCH71fR4StMiM jVjszMRLvMi6fdD7suY6HOypKZ5Se3srobtzUe8Hk4TfqtL+iygxsb0RkqmWhGOGDCqlehnaX+7NrU bBb8c24fuxRzXVM/DuRegAdlOfit1b5a04jbiQPJX7fjZjga5wIn4s1CQq1wbTk4/YSqxZwB+sRG0v 10KWxXiKk2KJdntER5viXvFyBhWY8ioy0B+diRjvU/iUOE1eJtMJtWgBAdHBIHqlUaVlz2pa0zbT6S bZVlamSlWDszecFpA9LaMXbCEnp8VBg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1751106343; x=1751711143; d=konsulko.se; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=cg6Mb0y63NoDrvRbc/wKLzTLQZaf3be1Lhc8PUfhwzc=; b=3Cx0u+rk5lfa4MfnUhs/vJ1SknAS8kGUuR/1qfyj1wr2+IhX8NDzDPItusiR62t0dkPGSm1AIytPe cIi3ui7Dg== X-HalOne-ID: 3d44602b-540a-11f0-b10f-85eb291bc831 Received: from slottsdator.home (host-90-238-19-233.mobileonline.telia.com [90.238.19.233]) by mailrelay5.pub.mailoutpod2-cph3.one.com (Halon) with ESMTPSA id 3d44602b-540a-11f0-b10f-85eb291bc831; Sat, 28 Jun 2025 10:25:42 +0000 (UTC) From: Vitaly Wool To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, Uladzislau Rezki , Danilo Krummrich , Alice Ryhl , rust-for-linux@vger.kernel.org, Vitaly Wool Subject: [PATCH v8 1/4] mm/vmalloc: allow to set node and align in vrealloc Date: Sat, 28 Jun 2025 12:25:37 +0200 Message-Id: <20250628102537.2542789-1-vitaly.wool@konsulko.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250628102315.2542656-1-vitaly.wool@konsulko.se> References: <20250628102315.2542656-1-vitaly.wool@konsulko.se> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 8D6888000F X-Stat-Signature: 3zdkw3f84ynw75y3y978kttfeorgme3c X-Rspam-User: X-HE-Tag: 1751106345-314534 X-HE-Meta: U2FsdGVkX19qB1Oft3hU4LlFriZIOW1p7wDfKhl83J8VE6ObgcS9/mcr+vIGE+SvqKxsiXJnbHCxs/QEaeZ+ULV1wB2gVbxjMrX1j/lA1NGgyya1HmzVfWEqufCa29JOIfhtWOP4RX6Y7u1qmt7oVb6O6bdJHKG6eY1z+ABWT4vpF/UcP6niUQ+VAUh38HVnokFV2kh3PwcMID8q4ufZqWH8q3kBoFGW4ck1S9x0w4qREcPJ2mPSp84RCDhPKDj90Rsv0S5j4FmuV2n1k0Cb1g4kOd3WrLwzGYpz1ikec4WIUxJdXOPbB5ulGLXIAz+BK4chTCYHC9zPammMYjRfpYwOCZLU3ciBy0ZABWyMjDjuXFPsQPr6QqdOFKdL8JFv95JN7HKzZITZuEBH6iiKsSYnTGwkfRsOPCV7AzTkazru4M8HAqD6CZnPk42Q3km6jjBkzNvdIBqqY+h85kmyqtT3z7cwkidyCr1J66XnEEvFOaCIF6L+EnRu33J+xvLkVkx0SpzedRL3sC1v6yh4onM+6/bDy4OrzqRJCtpVoxuIgA320jC/WGBTJpAAzqmbb454NFc/sOhtuisZp0Nzv4lo26SSToi9UuDM+FyfuBnTOqLeBs40ZmEflFkrFrNcQpmr/uUDsNn9Rda5TpoPPGAFsrOIoSGPsuuQPOyFXVTX50Bc59+V26KLG/zhEa8f1hE0fSKDXAVov2CuEuh5mPEKn89+iCcgI9CQlzxyjWE6AJaGPwHiXnsqDi+ZpSoGuARTonxEiK/sI20NXHaXfEEdMQAkenG7yzvBNFVscvajQ2CLTNtb2Sa4Oh17YbdSqJEaDZHEko0a1CXGcvFlzOVc3CU9VWZMaImKkOt3Zh26p3PeGBXVn76g+LkYY0/IJT0HbWbhz778Hp7zc4smFJSYWU2PSfpuiijbqXMsVuAF1XkNq4RC5Zgf5AKcAtZKrkT8pRXZ2e+py3yjVkl yefa/BN3 a9tW9Mbo0ZhzB2cPSgBA/Z5C+oCL17e2EYD6SlLUe6tR/rLslz/QiKEhKEBUrUu/fi3vS/gFOcEOtHoZfsraPCxnaZjKrp5HODIm6qV9kJYHHT/9HFzv7D24TWi6LU71coFdXmgqePDj+DjlfEaC+GYJVb87sgtlYed+Tzkq5vViM8dM= 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: Reimplement vrealloc() to be able to set node and alignment should a user need to do so. Rename the function to vrealloc_node_align() to better match what it actually does now and introduce macros for vrealloc() and friends for backward compatibility. With that change we also provide the ability for the Rust part of the kernel to set node and aligmnent in its allocations. Signed-off-by: Vitaly Wool --- include/linux/vmalloc.h | 12 +++++++++--- mm/vmalloc.c | 20 ++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index fdc9aeb74a44..68791f7cb3ba 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -197,9 +197,15 @@ extern void *__vcalloc_noprof(size_t n, size_t size, gfp_t flags) __alloc_size(1 extern void *vcalloc_noprof(size_t n, size_t size) __alloc_size(1, 2); #define vcalloc(...) alloc_hooks(vcalloc_noprof(__VA_ARGS__)) -void * __must_check vrealloc_noprof(const void *p, size_t size, gfp_t flags) - __realloc_size(2); -#define vrealloc(...) alloc_hooks(vrealloc_noprof(__VA_ARGS__)) +void *__must_check vrealloc_node_align_noprof(const void *p, size_t size, + unsigned long align, gfp_t flags, int nid) __realloc_size(2); +#define vrealloc_node_noprof(_p, _s, _f, _nid) \ + vrealloc_node_align_noprof(_p, _s, 1, _f, _nid) +#define vrealloc_noprof(_p, _s, _f) \ + vrealloc_node_align_noprof(_p, _s, 1, _f, NUMA_NO_NODE) +#define vrealloc_node_align(...) alloc_hooks(vrealloc_node_align_noprof(__VA_ARGS__)) +#define vrealloc_node(...) alloc_hooks(vrealloc_node_noprof(__VA_ARGS__)) +#define vrealloc(...) alloc_hooks(vrealloc_noprof(__VA_ARGS__)) extern void vfree(const void *addr); extern void vfree_atomic(const void *addr); diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 6dbcdceecae1..d633ac0ff977 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -4089,12 +4089,15 @@ void *vzalloc_node_noprof(unsigned long size, int node) EXPORT_SYMBOL(vzalloc_node_noprof); /** - * vrealloc - reallocate virtually contiguous memory; contents remain unchanged + * vrealloc_node_align_noprof - reallocate virtually contiguous memory; contents + * remain unchanged * @p: object to reallocate memory for * @size: the size to reallocate + * @align: requested alignment * @flags: the flags for the page level allocator + * @nid: node id * - * If @p is %NULL, vrealloc() behaves exactly like vmalloc(). If @size is 0 and + * If @p is %NULL, vrealloc_XXX() behaves exactly like vmalloc(). If @size is 0 and * @p is not a %NULL pointer, the object pointed to is freed. * * If __GFP_ZERO logic is requested, callers must ensure that, starting with the @@ -4111,7 +4114,8 @@ EXPORT_SYMBOL(vzalloc_node_noprof); * Return: pointer to the allocated memory; %NULL if @size is zero or in case of * failure */ -void *vrealloc_noprof(const void *p, size_t size, gfp_t flags) +void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align, + gfp_t flags, int nid) { struct vm_struct *vm = NULL; size_t alloced_size = 0; @@ -4135,6 +4139,13 @@ void *vrealloc_noprof(const void *p, size_t size, gfp_t flags) if (WARN(alloced_size < old_size, "vrealloc() has mismatched area vs requested sizes (%p)\n", p)) return NULL; + if (WARN(nid != NUMA_NO_NODE && nid != page_to_nid(vmalloc_to_page(p)), + "vrealloc() has mismatched nids\n")) + return NULL; + if (WARN((uintptr_t)p & (align - 1), + "will not reallocate with a bigger alignment (0x%lx)\n", + align)) + return NULL; } /* @@ -4166,7 +4177,8 @@ void *vrealloc_noprof(const void *p, size_t size, gfp_t flags) } /* TODO: Grow the vm_area, i.e. allocate and map additional pages. */ - n = __vmalloc_noprof(size, flags); + n = __vmalloc_node_noprof(size, align, flags, nid, __builtin_return_address(0)); + if (!n) return NULL; -- 2.39.2