From patchwork Mon Nov 13 19:13:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 13454355 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 1086CC4332F for ; Mon, 13 Nov 2023 19:14:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 62A4B6B0269; Mon, 13 Nov 2023 14:14:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CC016B025E; Mon, 13 Nov 2023 14:14:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F78F6B0269; Mon, 13 Nov 2023 14:14:14 -0500 (EST) 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 2656E6B025E for ; Mon, 13 Nov 2023 14:14:14 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EE0EF40544 for ; Mon, 13 Nov 2023 19:14:13 +0000 (UTC) X-FDA: 81453881586.08.479477E Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf20.hostedemail.com (Postfix) with ESMTP id 26F251C001E for ; Mon, 13 Nov 2023 19:14:11 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="EDCJw7/r"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="XvG+/Cd6"; dmarc=none; spf=pass (imf20.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699902852; 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=gc35dnOv0z/EAYeff3HVhELHQaD+6wOr4+QtkQBoL1I=; b=tClK6JoEfkvZ4ZWHUr5wsR/h1818F2NNm9Hdg2OoUu6AE3HZuFxWxOVvwGGZqND2Ux/bY/ VwP+nntlYYwrlwqqN7RRXmu9o/NS8XlYOQrwubKLbz1sOXldcjaHrMB+RrZCgLroMOmpKU u8tEgI3sH0R5iRVPMo1Lrf90pHy1vCE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="EDCJw7/r"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="XvG+/Cd6"; dmarc=none; spf=pass (imf20.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699902852; a=rsa-sha256; cv=none; b=RlpKXBt0JC8g8qQ5j/WSlSKK7PnHuh5qIytu82uW5kmZjbBDqT8wam12VTTlcZ4RI9Ssje EJGxoW1P0gDvfsZxb4YcGybxBXtzRubeb1mIPDDUKKUf8r2YD1u2Y5BLDDuaDfb3e1Bzhs +CmhI+puTMFFwHb9WOpw7GUxeZJE2RU= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 65BE321907; Mon, 13 Nov 2023 19:14:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1699902850; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gc35dnOv0z/EAYeff3HVhELHQaD+6wOr4+QtkQBoL1I=; b=EDCJw7/roK4MJaGkU14p7h8EBhfXYzuP/WlUFEOe2dGtZqjNUnSMvScfIAJ/FO52DWZDaL Z6cDhB/GmQZv5YJ93bBTADu1UCCBIiMFtj4b91Cd6Z21fEm1cvG/1oK7AvA5EJyi/sZlLf L6O1lt8kY6UFrTSPoc/K3pmMj1MvuFQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1699902850; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gc35dnOv0z/EAYeff3HVhELHQaD+6wOr4+QtkQBoL1I=; b=XvG+/Cd6vmoYcWYk3ojvTjgGdjVWUVN4PHtt2WQD4hTve7EG627AAqQ5PhHtvnSmcWmdgp L+huqwPyRsV05aBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 040D313907; Mon, 13 Nov 2023 19:14:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eJtLAIJ1UmVFOgAAMHmgww (envelope-from ); Mon, 13 Nov 2023 19:14:10 +0000 From: Vlastimil Babka To: David Rientjes , Christoph Lameter , Pekka Enberg , Joonsoo Kim Cc: Andrew Morton , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Roman Gushchin , linux-mm@kvack.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Marco Elver , Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , Kees Cook , kasan-dev@googlegroups.com, cgroups@vger.kernel.org, Vlastimil Babka Subject: [PATCH 03/20] KFENCE: cleanup kfence_guarded_alloc() after CONFIG_SLAB removal Date: Mon, 13 Nov 2023 20:13:44 +0100 Message-ID: <20231113191340.17482-25-vbabka@suse.cz> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231113191340.17482-22-vbabka@suse.cz> References: <20231113191340.17482-22-vbabka@suse.cz> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 26F251C001E X-Stat-Signature: bbkh4yafeapk8cxguqipw4weufhu3qba X-HE-Tag: 1699902851-548676 X-HE-Meta: U2FsdGVkX18hH5hWuST9QH+oSVAbYv9jQDPL7LmlOE0ehitROdnA4tU/vwYkSHTgkYIu4GZCeJs//D8ANvkA4VQgTkNcPoHW6XdqKuTxaRUZWKWPXepxZB4+x1eqMpUPqWlyw/3hxvKePHcNkWnInfePchy3N6PmSb3b8PjdEayw+kDUBFeA79Vuo1E58xIAmfVKDhFhUAf/boQl9ZC7Z4jpmkvNePoEvMBt9kaWX0AfkatCyGJ8P6q5oDPgKD08r1eTA4unhvh/bXwuXuTe1oLIAykpZc0TsFcc3npy8wm7gATcmgCVR3LGySSDejMLbm6kLnuhDYetKd06dZW32+t9crt9/8ui56gY8Fytoc8A1oXfpkdkZ2wuIAtW0vuO/4r5LnzZP3ujeEM4cY/RXmlPLhmhFg1J94PhTL75x9A+MIVoE+qAweTVIJ1vKo8YoVjk+BKgrxy3IA7w/tLSHCqKVuFoxcS9sz2nvELkSHMPGzFA+5N9x7qHYXm29bO/P9vkv8vGRAWaNdbLPDPdw2wRyksqsKRRCeyuvNJ79wznoePTqwPvmRWrC0anEdR/dEDRufsa2WhvwAn8Sp0JlNPGgCZUVju689bhC4aia9LYm7fowMqlE8oE4el7iPYNWGqG57FBvvqddaa2N1I1hb8Y5sOkPq450uRzjXn5Dh/zNPMHA8G+35y5g9q8ujN/b1TRwQB/aIi4c7tcnKgcbkZfrvVBl8CMCTdcdNYcipHMB6/1qbF48n3mmGKWIARQE7VsBhSNsDMKoJCdlKOO8G1PB0HuOnxowhT24z7IUuHfF0swMlvHbwfs4OrCwH8fyol67eTQMAl1YGZPr+1zYCXPIfzupb4VEX5UxpWObAirmkhZNtEF9kReMwGmkStdqmCspbeLBRWaWKl/6pDnGvWEsEECHF3JnOwYIBdgx96e3L5WV7AeJGk/aF13E7GZWR25R83XpUw8fXlY2p8 b4R7Gqrg E0CCctSWH1wXaPQPt6pIj22hqNbGwxohjXtdFMxS+Zrw0k2LCVVTuBmMk3ACAPn+9C56P+AwxB75uGflC+axvVrl99fd7eRtQFAU9TjZF4fJxHzpW3cquU/SU45ihzrXLLIIIliDV9knjfVCVzzeR8Jop9Oy5aRCg5tdJcpApWK2JgueRDITWQisDP5LI+WgY6M8Pj1ZHHYNojcCDcKi3uKjg+5RKFYd089UkEJkOzPGBxVJkkfXa7WeznN6eVY5uym627yr2m/876+yY+xVZHeT6PIGbjfMpATUYfrIiLGipcK7C8fqYBGcySA== 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: Some struct slab fields are initialized differently for SLAB and SLUB so we can simplify with SLUB being the only remaining allocator. Signed-off-by: Vlastimil Babka Reviewed-by: Kees Cook Reviewed-by: Marco Elver --- mm/kfence/core.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mm/kfence/core.c b/mm/kfence/core.c index 3872528d0963..8350f5c06f2e 100644 --- a/mm/kfence/core.c +++ b/mm/kfence/core.c @@ -463,11 +463,7 @@ static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t g /* Set required slab fields. */ slab = virt_to_slab((void *)meta->addr); slab->slab_cache = cache; -#if defined(CONFIG_SLUB) slab->objects = 1; -#elif defined(CONFIG_SLAB) - slab->s_mem = addr; -#endif /* Memory initialization. */ set_canary(meta);