From patchwork Wed Jun 19 19:33:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13704459 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 054E1C41513 for ; Wed, 19 Jun 2024 19:34:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A94D06B0450; Wed, 19 Jun 2024 15:34:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A6C186B019D; Wed, 19 Jun 2024 15:34:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C8106B019D; Wed, 19 Jun 2024 15:34:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2F0DD6B019D for ; Wed, 19 Jun 2024 15:34:01 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id DD31F1414FB for ; Wed, 19 Jun 2024 19:34:00 +0000 (UTC) X-FDA: 82248638640.02.4406BA8 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf23.hostedemail.com (Postfix) with ESMTP id 10BBD14000F for ; Wed, 19 Jun 2024 19:33:58 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BCyQBt5W; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.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=1718825629; 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=CxOEO+GaUnU9l2X1JMr3pflfon1oWNou5sDuU09joDk=; b=sIEZAZD5b5ELGyATeEGoh6RF79kLh6sk+E5tZ41+tnckEQ4TB1hVHalptx5Sur2Nl0zDKQ KaXwj312qtrt7vq9/+X3s6P2jY5osdkdElyy6dMBFGK9wozEo5SV3poTs+JfNlZX9MaHv/ DPchM6/CpW4jt8V6L2b49Xc8D8Cw6WU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718825629; a=rsa-sha256; cv=none; b=Nq82prop/P/dJ9xRjLbPcTHReJVG/0yEVtk/Mna+ibBQsdoJduVVGYa6w9s4/c8R1c6WpA fcCj/LtytJA3MEdlN/CPzzUGEgCJ4WFFunliATIC7wh/SC2cj7ZGNT4i2aENJ6VTq9Z7/h udKOSA3/ipr1IbV33GXhgTILDl3B49E= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BCyQBt5W; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of kees@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=kees@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 07E6A61F79; Wed, 19 Jun 2024 19:33:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A50BDC4AF08; Wed, 19 Jun 2024 19:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718825637; bh=jbXDHZFgMTEqVuIbGpjVHki9R28/opuEqbu8dA+PhS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BCyQBt5W1LB+VIF0YRwWomc9oJnTKvhC4csl7t1FMqLzr79+LCzMZ4GfPx8Bjh64c K5A5x5XbgSx5bgRgdJgtfY+lYnkb6uee9IXIWSJq2FAtOvKwmMk2w5rYr6qbEb/nMh t+0gx1Sef/GMlGPyl/jpTXLHHwqH5h2rPL3mPe8HNZrXFJKXE0/mz5/9OnvGTG1QFj CCb8pT3aO3iucUMGBBD+k7BbUpejJRBIqxb7hTUa3H77t576ojcEVt9ITWRL832ZtH +kDguxYTHditwu84pRw6xbaV/NsenVniruEylET1/8p1QmUYSru3OQ9+5iIBWPKe6F GgEkkm9+qdgeA== From: Kees Cook To: Vlastimil Babka Cc: Kees Cook , "GONG, Ruiqi" , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , jvoisin , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Xiu Jianfeng , Suren Baghdasaryan , Kent Overstreet , Jann Horn , Matteo Rizzo , Thomas Graf , Herbert Xu , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-hardening@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v5 1/6] mm/slab: Introduce kmem_buckets typedef Date: Wed, 19 Jun 2024 12:33:49 -0700 Message-Id: <20240619193357.1333772-1-kees@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240619192131.do.115-kees@kernel.org> References: <20240619192131.do.115-kees@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1406; i=kees@kernel.org; h=from:subject; bh=jbXDHZFgMTEqVuIbGpjVHki9R28/opuEqbu8dA+PhS0=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBmczKh6T8pqxaDs77JF9cx/6sa+j5FaKjCYQYlt 8Av1OrjnquJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZnMyoQAKCRCJcvTf3G3A JnDmD/4lPT3IQnslSsmLm0/93PDrMo6dacPrg3fO6iYYge5SRvS8tMrXtla/rIN7FC2Vv9yTvN8 3aMsnyY8X5gSVBi6NnUdOanCs2w+MziAmdDjP4Gaevg1LQRWCzOfOak5shXpArYv+qoZdPw0Ttt LD1n9zWURQ830r1QQ/RiHGcwhlQNTeHINjMW18GIve5hEb2ZaV19FJPBMQP6GyIMeboDi5Zy0m/ RiXCicXZkU2K/T6W7jvQfVD85odLnhPoVFL98TUkeaPAn2aBj54T6GgYlPyc4B1N07E2F7TfLiy OfVAoefI78Tcp2cB03HV8piNNGzhTPM+siCg8NfUxReQDbmLjmWDYw0cPwbZBLrPP+xZ+1vvP0J wmve26MopNZXLnm6/NWvBZQs4gQxk/7OUINSKKWjdRYwClbZWqq0iqM+jyoeuaHxGeb5tpNYp9M FHMNBNVA95dzB3FexZlV/JwN2CkvN4ZnJd163nXWHOHdkxwPQSZcT7/uB1h7U1LJb1urQasc4Pj NUiE6wks+0i9AhkcnSPdNbCqXJMzNe7e9vTU2fFtj6CnSGGGha+HRGmubAwnN7u1F0tTw7tujn+ J+njOxDXJY1DPMy0lGGI+GwZY+8vnPIeWOLFnRXSn/4ph5gnyx7KOyiXxIkxiLJTt5dJbbJJHZF pcTcJxJ0nTDzcHQ= = X-Developer-Key: i=kees@kernel.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 10BBD14000F X-Stat-Signature: jn75r5gqsrigqij8c1dtt8aqf8dxqzpt X-Rspam-User: X-HE-Tag: 1718825638-530176 X-HE-Meta: U2FsdGVkX193fEPgS/40gCisk218k0AORA5YLo9w0/yjvx6fpfzZkjZgc0GV0hysMxtgCAYqxmBCEXBXlNci98pPQ+/svDIBRURSG8A1VptacPMBER5xRJcvQEi+fIZxEW6BeecpfLcQWxAzro4VoW3+cT9lvCJ5Aj019OA0QVTpz8w3rUCb3TkWgjXoTwUeGCGlvSzujvWmDEDsAxs/1Rwz9zbzk5thpj/RrMg7pGwVXGWnP5vQrZTJh4pURzX/p1NQPMdN8ZWYANCYe+RTSXgbTt5Q2ntO6FV5yfLXAfc9MY6A3oQ11XgRjb9o8/E94T99/bufY9qFdi09URYiEtAL88fyrjGAT24anS0xKPoLx9xisJWIUcQuo2u+bhGH+x82z/2NpTV5pRo8J7OgaEQdpRnsFhqRtrXT6436Z01qhveKM50Tr0SPPznKT6S+1Fs+E0N81+vNmgciQiZ6owUiTEfUjLU1R1Qf8I7pSLW+GVD9964QWI9Xgk+JUgPxd13c/NF9W/atWehWJ8u2fTlC5FOAo+DqqlIvPvVuvSpwUbBBKti23rA2ZXLars4RJdOohlL44fWTNEE81FGLUTUO7g+9XsXgTsYcGKYajniMq+JUaGzDW/SS2j1kgHgnA19tBqCyKdaRXQADlzkjQnfbzBRAK81plESQ7e3XtkEJUGVi9lQzJP+SHb/Rvg44tVASgZPtA9Gh1EnfXTPIVy9m4oAnqTvZvqmQCsOhVlSEmmVT2A5de0dZT88Y3UwHiyfz7r8T9S7WgBFku5SL7H6ZVMA7dOTa1p5bQyMJreexfh9oTeWJmaV2AazMTtYWtgWRt5tdWO9JQVDsnFcD08T59PxZvITmgVSEju+8sguu0wnRyJJTJG4wtt1rAueXOtf+hwf41pwwECch+LyWXRNJSuRh8m/X6EaYHlKtHELEmjuuDnTWt93ZegaFNuSaLaigLf+RNRMIuiQZXcJ o1rKg2mi xWl+hiYrqWzCHI4LgTvKeuY/2KXFZbK/zXKT2v4+Y27B9PhSbrUO+T3GJ+c0EvBFYhfJ9WOFLUMoTtYRg4hnwJZLZ/wyViOnYXbrTH/YROA9qZxJXQbNvnLQVypAjJGp6ekeutHhkvzysmGNAeTRQMTNn+5+2GcTLd2Eb/p0AwxmF71rSDDWyJrunfeV3hwQfedC7izv6OQzA11CK0GGljme/1Hg3ekje+djm+6Zc9UT/ATgIWSHNKlx39DatByFuLSHAfnk3mRQ1UXA9ciIqFI5CN8McIHIEJw0TYb6jHMexzXQ8vXITES6ImzoBsEz2p2fsPWiu5Z00GBEUyiQh4KycTjKXylAXnsqEMSAynx6O2EdUJh+Hsve8SorCqYRCxTYiyMK14mphnObTkzWidUo8RXmvcIRpuQiy 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: Encapsulate the concept of a single set of kmem_caches that are used for the kmalloc size buckets. Redefine kmalloc_caches as an array of these buckets (for the different global cache buckets). Signed-off-by: Kees Cook --- include/linux/slab.h | 5 +++-- mm/slab_common.c | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index ed6bee5ec2b6..8a006fac57c6 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -426,8 +426,9 @@ enum kmalloc_cache_type { NR_KMALLOC_TYPES }; -extern struct kmem_cache * -kmalloc_caches[NR_KMALLOC_TYPES][KMALLOC_SHIFT_HIGH + 1]; +typedef struct kmem_cache * kmem_buckets[KMALLOC_SHIFT_HIGH + 1]; + +extern kmem_buckets kmalloc_caches[NR_KMALLOC_TYPES]; /* * Define gfp bits that should not be set for KMALLOC_NORMAL. diff --git a/mm/slab_common.c b/mm/slab_common.c index 1560a1546bb1..e0b1c109bed2 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -653,8 +653,7 @@ static struct kmem_cache *__init create_kmalloc_cache(const char *name, return s; } -struct kmem_cache * -kmalloc_caches[NR_KMALLOC_TYPES][KMALLOC_SHIFT_HIGH + 1] __ro_after_init = +kmem_buckets kmalloc_caches[NR_KMALLOC_TYPES] __ro_after_init = { /* initialization for https://llvm.org/pr42570 */ }; EXPORT_SYMBOL(kmalloc_caches);