| Message ID | 20231113191340.17482-25-vbabka@suse.cz |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1419753vqg;
Mon, 13 Nov 2023 11:14:30 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IG8UqLJvBbCs0wnFfP1R9x+7CcLems2xuPjcauPCIBOa8jiXcOlk1zYNquQUWQ9MxL09T7O
X-Received: by 2002:a17:903:1108:b0:1c3:c687:478c with SMTP id
n8-20020a170903110800b001c3c687478cmr194997plh.8.1699902870057;
Mon, 13 Nov 2023 11:14:30 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1699902870; cv=none;
d=google.com; s=arc-20160816;
b=GnLf29vutRwRMbVjbjXcLpwhZR0d0FQn2hbgvt3z/7FksZCz7e4yJLmusddSQiYwnJ
hBdSxHGSOEsSbLkiH+hOqV1HazEIHPJqeZme6BcN4Xc598WUS/bByfiPJeCWxl9OIaeB
mJXFoLrnS63pw24aUJ8E1qIPgpvZivzy+0C4AnLo+qXgo1yG10f4BVKTY7JdAqpQ4yC2
frUBLQsP+W29/bcnlCqrqXb3CuoR3SgW5IxrPlDfr8/uWW9lpAxaobvjotrsfT8R9Uhb
OUpUbxBQDvbFbYpqJO9I1blr0u42JTcLuRyxyoVXRZ//pdSfA1/bTapfkxTcucrponSI
Vy4A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from
:dkim-signature:dkim-signature;
bh=gc35dnOv0z/EAYeff3HVhELHQaD+6wOr4+QtkQBoL1I=;
fh=RPAmrUlnQQdc1FhCirEqyhGh/OnPyRxUfAdj7ygPMx4=;
b=DSgC11iggcJak/H3ISHWyg+EyGrDxEXsHd8YBao+QiJgJfX0nocXGmLOBpxJHjF3sJ
m/73guoqmAtYFVQjBmVPfkCG87Uh5Pmf3pQ4u+R1CmZR+6xg76svDp5F9hWcCIkfKVfX
EUtsVx+uiqnZbLwkS5eHlWkLyMVXT6ZbbTP7lrFmFv8jJVv4b/pIhwiXaQobVzvyMgGd
+lBiWOnv2/hc6PO3VOmd4FxwSS91Bg0f/TQHidN7ZDZOpgMqv4J7XERwKccuaVjZjrGg
XRtbj7SOQ6jU4i6Kic4hCdwYTAX0kspgZd8dBjzYvpUCQbZY72UYgMFL2oBwPBFxGBwj
fcEQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b="EDCJw7/r";
dkim=neutral (no key) header.i=@suse.cz;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from snail.vger.email (snail.vger.email. [23.128.96.37])
by mx.google.com with ESMTPS id
j6-20020a170902c3c600b001c9d03042b6si6033467plj.7.2023.11.13.11.14.29
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 13 Nov 2023 11:14:30 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Authentication-Results: mx.google.com;
dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b="EDCJw7/r";
dkim=neutral (no key) header.i=@suse.cz;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by snail.vger.email (Postfix) with ESMTP id 27CB1802924D;
Mon, 13 Nov 2023 11:14:29 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231869AbjKMTOW (ORCPT <rfc822;lhua1029@gmail.com> + 30 others);
Mon, 13 Nov 2023 14:14:22 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42570 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231240AbjKMTOP (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 13 Nov 2023 14:14:15 -0500
Received: from smtp-out1.suse.de (smtp-out1.suse.de
[IPv6:2001:67c:2178:6::1c])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6FC210EC;
Mon, 13 Nov 2023 11:14:11 -0800 (PST)
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 <vbabka@suse.cz>); Mon, 13 Nov 2023 19:14:10 +0000
From: Vlastimil Babka <vbabka@suse.cz>
To: David Rientjes <rientjes@google.com>,
Christoph Lameter <cl@linux.com>,
Pekka Enberg <penberg@kernel.org>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Hyeonggon Yoo <42.hyeyoo@gmail.com>,
Roman Gushchin <roman.gushchin@linux.dev>, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, patches@lists.linux.dev,
Andrey Ryabinin <ryabinin.a.a@gmail.com>,
Alexander Potapenko <glider@google.com>,
Andrey Konovalov <andreyknvl@gmail.com>,
Dmitry Vyukov <dvyukov@google.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Marco Elver <elver@google.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@kernel.org>,
Shakeel Butt <shakeelb@google.com>,
Muchun Song <muchun.song@linux.dev>,
Kees Cook <keescook@chromium.org>, kasan-dev@googlegroups.com,
cgroups@vger.kernel.org, Vlastimil Babka <vbabka@suse.cz>
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
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
SPF_HELO_NONE,SPF_SOFTFAIL,T_SCC_BODY_TEXT_LINE autolearn=no
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]);
Mon, 13 Nov 2023 11:14:29 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1782477352067081091
X-GMAIL-MSGID: 1782477352067081091
|
| Series |
remove the SLAB allocator
|
|
Commit Message
Vlastimil Babka
Nov. 13, 2023, 7:13 p.m. UTC
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 <vbabka@suse.cz>
---
mm/kfence/core.c | 4 ----
1 file changed, 4 deletions(-)
Comments
On Mon, Nov 13, 2023 at 08:13:44PM +0100, Vlastimil Babka wrote: > 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 <vbabka@suse.cz> Reviewed-by: Kees Cook <keescook@chromium.org>
On Mon, 13 Nov 2023 at 20:14, Vlastimil Babka <vbabka@suse.cz> wrote: > > 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 <vbabka@suse.cz> Reviewed-by: Marco Elver <elver@google.com> > --- > 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); > -- > 2.42.1 >
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);