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 357D0C27C4F for ; Fri, 31 May 2024 16:43:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C08426B00AE; Fri, 31 May 2024 12:43:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8F896B00AF; Fri, 31 May 2024 12:43:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A0A6C6B00B0; Fri, 31 May 2024 12:43:03 -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 7F2126B00AE for ; Fri, 31 May 2024 12:43:03 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3881A161808 for ; Fri, 31 May 2024 16:43:03 +0000 (UTC) X-FDA: 82179260646.16.FF44A3A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf29.hostedemail.com (Postfix) with ESMTP id 7AAB3120021 for ; Fri, 31 May 2024 16:43:01 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LJxSOJZz; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf29.hostedemail.com: domain of kees@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=kees@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717173781; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Saeq2k+NPAJztkBrMiqKdztf8Mmi6wxGgMz+6zbFdq0=; b=ARwmAbXa5h32/LV0sQCKlEhJckhj4eIZAfN7uzJbrigGVX58vjYg12Ol2KGXHFXyJ/TX8y taWkX8DEgE/7ozryXLS2XQtEUVc5iwlqcxnBJ11GuJ3Wmvjdb7igFlvyCcIW8ANLe2bjrE dC4acZwDKFZvzrQvl5Nk1ohUh4pcraw= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LJxSOJZz; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf29.hostedemail.com: domain of kees@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=kees@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717173781; a=rsa-sha256; cv=none; b=HqMeH4yBudOcRemk1hWYYFMRkfpYB8qoUtee90ZsccDu345qU/6V5+2aU2ylL8I0ZxlZ1N 2VqitqjC3Zx8R+Ga23+R8P8pMbhicRH6KuBR9xACMz635TRz4Y9dyAJncR/IB9qwrTioae Hg4NICRmPjrOScktJYTZBg3ECsi2VIw= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id AF34462C21; Fri, 31 May 2024 16:43:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59C18C116B1; Fri, 31 May 2024 16:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717173780; bh=h9xEb88Q0BWA/HKbvxBqBPuQDNJV6+lkfys9wgwSsd4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LJxSOJZzlU7TkY1lfyEgw7d4dSBX70y+IdQxau1AYjYqMhq3n9Aeng0lWxYyrMfVm WvX1s1qSiNqT5sxYn/WmHZCV7Wxs7AIvQGQt4zHIWEYv5cQAQF5dmiBHx/ibv864wu 6LPZGsE3A6AaH2lXyQBmfa49XHreH6tvw8cCnrdQQz03L8W9wCbMUEqRdzqD6bOr1T 4SiriN9dvIFHLtb+5WRrARo0pKcQ7IZYGS1mTF5TnZ/85a/dJ4Gay/dFALwYogYo0Z urv031NJ5vNmqL3OhGq4RKc27FvzzG2gwO8ZuRkQ3mQU4ilHrFQq8C8WbN3TmkQdY4 sRB6tfzzLGwug== Date: Fri, 31 May 2024 09:42:59 -0700 From: Kees Cook To: Vlastimil Babka Cc: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-hardening@vger.kernel.org, "GONG, Ruiqi" , Xiu Jianfeng , Suren Baghdasaryan , Kent Overstreet , Jann Horn , Matteo Rizzo , Thomas Graf , Herbert Xu , julien.voisin@dustri.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 2/6] mm/slab: Plumb kmem_buckets into __do_kmalloc_node() Message-ID: <202405310941.62F7B2859C@keescook> References: <20240424213019.make.366-kees@kernel.org> <20240424214104.3248214-2-keescook@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 7AAB3120021 X-Stat-Signature: 7cix3uw483ssiakaaojzurcimq647hdb X-HE-Tag: 1717173781-755238 X-HE-Meta: U2FsdGVkX18KV/GXL8C/PfleKrbKDJJY0BgdCrlFx2i6kkuuqjkiLw4+zoOTD4EJnAP8M3k7z09E0sYFSPv4zoCzH0oFbY+ODPRU5EN4oxOyTO8DoVo1iVpkrIMtRz2G0Rm+WAiE67o1MtnkUP01wdrUicOhrguHJCkjg3t0TkDm044UmUyMxuTbgoSUCJ6kaxN+KCZ9IgCgLK4QKmg2juXcehqelknEVJsbu2/un64cO3LbWjCbQ68Sf/lw3eNFJHW2FcsxUmfJHGqHczYJrU1PT2sey8ygpWYFrJ8GT4Wl3impotwgaCkqZFy3U3Co/ACeHwk8R7K5yGyIi+sduK/My2+HUbUbDcJfRoD0J+OkgYFc9MBBKBdW2qzAh4mfOiv26rCscU/nal7XiINyJn37KIxJ4ACCX1g8pzTlTE2oGlmwEQaJ2RBhLiahmFt0lsWgSkwOf4IV9jEnzbAMzTx+Esm2PL1aTV0se7Qiei4BVMMSOhBmiVxcvQtin3+BV+AklMOdD4yc2/8xwJiIgefUH8s7mQcOPF0qazwaX6AWl+f2a2tWmyiu5caX8k9gR0EtrhEnqdXpHW/InWWLu0crMQX2ExBdNJSykooktCzsSVzLZfY85SCCaUJK/1Opfb0HpbyKP+rKBECVxTlzkeYPOyPe708TGcsv+XlugHlArZVq3A81giOrfyEDgmt2LmytM+SKzOl6AApEwZ+S1dz7/YGqAelzbc4lETSFtPoS4y3EmM7Qw5i/Tf1SjgbMd/eJLl6WRdeRaVYmOP5WBaJnOkAxkDhTi36bt5GXJ0+mEkXoRdGe9Mn2jhjTor2B2QmBoTE2VelmSqma68r754Gqpm76CoB2r5gBENxjxM5fZjkYgxDqTbW3HC7jTT2n5x2DwQXbmMtqSb7uYTCbYUMYiboQl1rZdMhTRCaeYP1G5JWtcXxRyu3oSs9pkRlMpyRaYUn816iEYKfSJfL cNWStV53 eGipiEIgzxChXPefWUp+unY5CvZa3rsWgPsAiuOHAnoUStLoNSN2voV0qfMYSz0YJCxvS/R3cjr4MZv6UcEHlLb/K4ywPklIR/xWihGTOC8Znnji+xt3QnKnx2WXJvyQzUgBhovhtp9q7iskflN0UhfARMZHE7UlsdqiC5lgjVqK1JxhsuMHO2P6AoyguazAoeR48VmhsBkxAM4xcAbO+cp/9/8FkwFm18wSkLy+K423X1ckZ/UV4PUCbWtxqCVkpvxxNRBYP+Xm32GDUyyZCDC8YXt8VOWPYbsB+m2e5s7NuoxJIcEbj2qHcvSR/Qt6ybV1INb7/HhfDiTqoDLiMnSbzDw8Kn6UJZeAmLJuDe3HQ8/BIcRHMIgkdR2jWzSF5feGXmlcdUasO4UFHEfMZkS0A8V8z4CNt3+zElet2l2BVtbx1JMBEdJ0olbb9xIinQYyXHfKsH+lzfhuRpLqlwZC7JnHHJQHNN8UBUjHitEZUENSllIqCbvqHpz4gk9pjcwzQFywmg8vRA6b85aXZ2ZaFmPzK10gk6LSD+xPyl9RQt9PzLvpCrSVwqKBSvE1i0vHFWTb2S7HaPs1Y1J1P5n9PEey83D7bEjFrS2yffUIIreCj6Fdn1ze2Y2jNuLI9iD2r3nDIiT1S2KTBZpaXnCT2bZS/XEofAIpXMdHNPllYWzwWAJGnb7vwQJ4DdUpO/DbV5utIRemLO3E= 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: On Fri, May 24, 2024 at 03:38:58PM +0200, Vlastimil Babka wrote: > On 4/24/24 11:40 PM, Kees Cook wrote: > > To be able to choose which buckets to allocate from, make the buckets > > available to the lower level kmalloc interfaces by adding them as the > > first argument. Where the bucket is not available, pass NULL, which means > > "use the default system kmalloc bucket set" (the prior existing behavior), > > as implemented in kmalloc_slab(). > > > > Signed-off-by: Kees Cook > > --- > > Cc: Vlastimil Babka > > Cc: Christoph Lameter > > Cc: Pekka Enberg > > Cc: David Rientjes > > Cc: Joonsoo Kim > > Cc: Andrew Morton > > Cc: Roman Gushchin > > Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> > > Cc: linux-mm@kvack.org > > Cc: linux-hardening@vger.kernel.org > > --- > > include/linux/slab.h | 16 ++++++++-------- > > lib/fortify_kunit.c | 2 +- > > mm/slab.h | 6 ++++-- > > mm/slab_common.c | 4 ++-- > > mm/slub.c | 14 +++++++------- > > mm/util.c | 2 +- > > 6 files changed, 23 insertions(+), 21 deletions(-) > > > > diff --git a/include/linux/slab.h b/include/linux/slab.h > > index c8164d5db420..07373b680894 100644 > > --- a/include/linux/slab.h > > +++ b/include/linux/slab.h > > @@ -569,8 +569,8 @@ static __always_inline void kfree_bulk(size_t size, void **p) > > kmem_cache_free_bulk(NULL, size, p); > > } > > > > -void *__kmalloc_node_noprof(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment > > - __alloc_size(1); > > +void *__kmalloc_node_noprof(kmem_buckets *b, size_t size, gfp_t flags, int node) > > + __assume_kmalloc_alignment __alloc_size(2); > > #define __kmalloc_node(...) alloc_hooks(__kmalloc_node_noprof(__VA_ARGS__)) > > > > void *kmem_cache_alloc_node_noprof(struct kmem_cache *s, gfp_t flags, > > @@ -679,7 +679,7 @@ static __always_inline __alloc_size(1) void *kmalloc_node_noprof(size_t size, gf > > kmalloc_caches[kmalloc_type(flags, _RET_IP_)][index], > > flags, node, size); > > } > > - return __kmalloc_node_noprof(size, flags, node); > > + return __kmalloc_node_noprof(NULL, size, flags, node); > > This is not ideal as now every kmalloc_node() callsite will now have to add > the NULL parameter even if this is not enabled. Could the new parameter be > only added depending on the respective config? I felt like it was much simpler to add an argument to the existing call path than to create a duplicate API that had 1 extra argument. However, if you want this behind a Kconfig option, I can redefine the argument list based on that? -- Kees Cook