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 081C8C4345F for ; Wed, 24 Apr 2024 21:41:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 89A7A6B0313; Wed, 24 Apr 2024 17:41:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 84AD18D0031; Wed, 24 Apr 2024 17:41:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6ED1A6B0315; Wed, 24 Apr 2024 17:41:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 527AE6B0313 for ; Wed, 24 Apr 2024 17:41:10 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C69FF41101 for ; Wed, 24 Apr 2024 21:41:09 +0000 (UTC) X-FDA: 82045746258.05.7139797 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by imf28.hostedemail.com (Postfix) with ESMTP id CEC95C0024 for ; Wed, 24 Apr 2024 21:41:07 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=kbyKnWGp; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf28.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.50 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713994867; 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=6DE0gOuM6fqjcPRbynz9LQpOkql4Ebi3pYsD8G1TJgY=; b=T4wZf3TBmM6r0WKLB3wo8cVxuUOd1Wtm+FpbEHLFAijLX0jvYRtbZnncLpbCTzT0J7zkdL D41PyEBM9BNX3VP2D2BwqRxELymAfZ9zh53vyny4qR1D6jKuFlJVE9MQWk5LNdC3UlC66G dltHQcboQ0NjGNaBvFtd2pvum6gJ5pM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=kbyKnWGp; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf28.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.50 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713994867; a=rsa-sha256; cv=none; b=d1Of+nqxoAD7mbZqjjZ18tbl3satJOaWc9QbYbyuYlA+14qC87eeM5zIZT596/gKeSBYxA ThT1CixF/Vtt59xu3kHXRhIzVwf+1UCIcNV0EUjaAtkVvBaVO6nOTGnlnYjBADVG+nuu4H rga8TDsQEgn7oaKjTYPp1FHfxgJvvw8= Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-6eb7ee5a776so226608a34.3 for ; Wed, 24 Apr 2024 14:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1713994867; x=1714599667; darn=kvack.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; bh=6DE0gOuM6fqjcPRbynz9LQpOkql4Ebi3pYsD8G1TJgY=; b=kbyKnWGp260lD0HQBaD6v3xPRXbTPeJZGtNHO2lx37i8m/GvhjYkSjXW/P+YmUe8/c onH4ltldAU0H058PxhKLhIp3p3uDJrKLXIFQqoIQZuQXX6NxYgbermHg+aG3NNzW5s6V Q2U7HqLMYkbGAVqXVqbudR06D3i3bVJQFKLeI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713994867; x=1714599667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6DE0gOuM6fqjcPRbynz9LQpOkql4Ebi3pYsD8G1TJgY=; b=hMWmuA7pXZB9mlap6aJWz5miboFiWIXP0KICdeEoIkteIRc2fraaVY16VnVq5/dzIB hYWTc4Xd10vTgVRO5EXA+JRP4sNuaspKBOiJ19Pwa5IAHnzEfcJFNU0IjJpRMQ4+9mrS wBThWNFcp7bffvH3OeAi3YChoHgP67bCduf8TglYtdrIJijTJTAksuUoRaa2nl/dyiqu /fs0RKsgLUA7VIcmXr2ChMbWTtnDfhZef1vXaLfz4DTUtf6ISCOYxLaee7ItkewxbK4t ZAi02XjmpmpX039t91EcQnohwCVuq2EMVIDC9hKq76Qb6uQmixfGybsfYfbYFWihXvOE RzcQ== X-Forwarded-Encrypted: i=1; AJvYcCXSG29uelmRMLaW/W9sjqejl++qep+/JmV+nwCMqPgWst3nrNRuy/n3V8xsCSq1toydO/6CFE+bNnepyGwCGxMau+0= X-Gm-Message-State: AOJu0YwYVJPZRR8F3EL40sacIIRKQ2uA8G2M1e9lBde+8DDQl1SVck5d CNn6XP/EEOuoNRy7NH9q1sH1/CMDFuW5/WZk2IkUCF9jmjXXLQ21hRxjAFHGUg== X-Google-Smtp-Source: AGHT+IEqM/ZyN3r0s9cglQZ0+oH+dar1+xY2j0+uac8cA/8FmytsL1pSqxY54sZztW/PC55nIBocHg== X-Received: by 2002:a05:6830:1d61:b0:6e6:b125:b8d0 with SMTP id l1-20020a0568301d6100b006e6b125b8d0mr4471407oti.13.1713994866613; Wed, 24 Apr 2024 14:41:06 -0700 (PDT) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id i193-20020a636dca000000b005f7ff083182sm9774009pgc.36.2024.04.24.14.41.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 14:41:05 -0700 (PDT) From: Kees Cook To: Vlastimil Babka Cc: Kees Cook , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.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, linux-hardening@vger.kernel.org Subject: [PATCH v3 1/6] mm/slab: Introduce kmem_buckets typedef Date: Wed, 24 Apr 2024 14:40:58 -0700 Message-Id: <20240424214104.3248214-1-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240424213019.make.366-kees@kernel.org> References: <20240424213019.make.366-kees@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1775; i=keescook@chromium.org; h=from:subject; bh=dMZ82hcwMjPtLdK0cTsVIA5XzWAQXcfcJoTMZY0cUd4=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBmKXxu1YqNqwqk+P9UKDsX65CurgWZ4S/pDrKwg o4x/WCX9JeJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZil8bgAKCRCJcvTf3G3A JgHJD/47Q2MOcnzIviSgiD9VouiFmZpwzwVRRYkpLKsHQDoOvqMkZvk/eKBcgJq7gI4b4L0nlze 3A4oC+r7H2g5vpgNw2p9z0EvkqMxob05GHM58weuoSuAoQlXoGaw8CGnTLUzMStUBs7/mjNJP7N jOKumU3iDrflgcJc8zmRfTB9E2KEATWvOZpmZXea50xRjV/3n4cNGXAFgjVoaJv0vle6qpuUpb6 4OjdpzYsgmcST6rSqXidR/GKMAB9VIysWDYtFpipd8ZaFlRYrPqxbk9P/tbMGhgzbo+vVyvufOf 9GZtcQ8ed6xSFYIBM/lH9glEEfR8YyZQxwBlds599HevRmXmoSWUPAj2emDPcIvv9Nf/tBXqHHH EWle9HYub+cnGXO/ZZ7LHLFRn/1xE9ZnjnDir4uCUoHG2fQSN2yQimLPC7cQJ+aTFR+m0dAh/c/ IuScgHhC15yj0hphSDAQKOWHZdYclS69YaXCB6e8Z3GigOOs7SyRG+YXT5td5GtFI7ySlTKt9ql FdT7fBLlt3yFZUbcU9V/WM/2KZIR5WW8tMM2o74bV5l26yXIbdLO/yM3/Xy7OqmuhR4PIKn84Hb XLjEi93Mic+97/CkVzIvgfpa1UrRqOJQZVeWYgnDsADwKhZyn5oSzRhJesWrnlZSD/WDntlCm6P 3QTXTa8PTS1ijDg== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: CEC95C0024 X-Stat-Signature: d98zhmutu7ns7gtoy3q6j1pettfw3oz4 X-HE-Tag: 1713994867-763342 X-HE-Meta: U2FsdGVkX1/kg+oz44HlPcnfQN/rHCKIFcOrWW+pE0mxn2vzsRrTPU6ETuNKkxiERFgzuWu6ttVBA/xfeuGYrt1QFd9dtCkYKEV+dTh78nqG+kBEMMsdkzOXOHkHdUCPmBCMjWFZxEwRFm+v4E+0Z9z5Gc/4TxVV66n3HBRarAvH1o5MAKHlqUNAbtZK7S5yvYDqUKtiZm1SG9lCT1zQbMn3mnYYa3enM2195tn4Mn6upWMBErctXoR1NCYM8y70etsgjKwLSp52xwpPKOruKNEYRWLxiWJ2qf/nRQl8sUlCQGIRm/SOcLB/BhoZBs++PO6/7253FXgJ1KCn2+2OydLFAWPpXy15XNf8GBizBY5FbbeCQDa9/YNFvDwUisBt9gxfr3yEt06GpmfXOaq5xnBgw0dTAhKaGi1mgFo14vpfL8eLo1nnPm8cDglN6tcY5GXK9D8XWHQ19NE2wI2VLMthapMS3aOTliQBKkWF/bajJcqxt9uJM93wpZy5AE0P97LEJYwo79Pyd6tYbR2FpdjSvJa3+P7zOQViAJotyLLx7Meh4sT6jIwTZmgySDYveFER0zNI+WXwLVx6uz2UB2whQ5fctN0wP2CVK7EGuyDm/L8IZd0B8St7/Vu9DxK4Y0cgCOULDiEEanQPESxvDfwykt9diAX6HfT1wcQh+juyKoVPNiU3wCCE5rAgkCqicQVGWA396PO/EhqBIWLAuMHwLNsWmnX4h9/dF9va9lBztv7qKGD+xuryqqMe6F2BVPKMZ+hI38juMK0v2J1gI8kE+NW46vyLpO8xawmE5W0O0gIeBMuG6z32nCqjePU1tMCdpULfTVVs8v5zLzxrN28OOG0iYJWWYz6aCLMGx8zCDpk8qTkemFFghyn/uZVysDO3tmOSkKGbU2aofxt+P0jsMEoDPGRZ3pZkOp7HTx2mbDatBZMN/usFDHU8LeJHlXVs4q01nJDxq0LOivY 75V0XjHQ Ecd2dk7X1s3KmiNGSivYqT68uY4+gFP4GVVaCSmBc6XCdABloATSIh+8alClOTng5ZC3suthFUH/Mog2NZuJMR+OHdc+79dbYXLVfUX4zoZ4JJIvSLEGEptaJeixBQ+5Upp4Eeg4c039Zql7QkgBfMQUe7tRcyX3KbBGq+fimVXIx3BhZfvPckM6y2hciGStsCpLaiwECrTSoXi5Cfx/rQDp1oVeNzWWFV8FOAaItURZz8GfQXTwGq0Q69qPwjGAMNRObPczxqWnBM9NHBa52sorOo8ljom4AkGqicMejRKhtW0g/yUE7XtdO6QtQfZIr1LT5WfjIi9EyS9NtHpQ5JDMl4Zt1T6Vx0YTJSsk8MQm1qOHhff0pYuU0RfENlG6Hf0bEAxP5QXix8y0RK1ZHCvlyuxyKsJvmuWr4fQi7Ae3BRrllxKTrH12W908PeF0PVgK1fVMglz1oFZ108mi7EpLBzj2XZDUk7iB1Yp/T0cppZXesWfq4FplzSxwqbulRtVIqSKwf6mgLOOIR4pwIct65pZPd+2i5TNkSNRHcV8lwz71uwQjfa3zzK3Hpu06cMgfxxkwt2thVTqFgLZRGm5todEl3mHf41OYmUWNSAYeRfNRc1YrA7DotIW/omhFamNy5TOJ++uBSl/jrAcldJ0M66xnbCIEXcpmDu5IrQip/Xu+d6tV9x/+rNrpTCu/a+81cVOZW0o43manOwWi+1kRJ4pLzJjMZ46lWxOdjYhz+BF9/o2bkKDjgV2xES2yZthneM5P12FhOWUZ+Y85TWdI1XueLyz9t0736WBcTd491M0qJH+VSIvGwyf5tseFtqt0SmCYIxSdtN98AN3WXuzAhrqHYO1+Ua4M8xH4Qrn8nNfIuFGljzkqf990vgOgG5iVELd0Hq/zULDLBfRVfFEARPA5iDX+rey6IXQ16ffpSlZ4= 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 --- 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 --- 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 4cc37ef22aae..c8164d5db420 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 8664da88e843..db9e1b15efd5 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); -- 2.34.1