From patchwork Mon Nov 13 19:13:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 164614 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1420738vqg; Mon, 13 Nov 2023 11:16:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IEXFDVPeKDAMbksbmhzpSXH37DNh6hjlNTY7D0CDS7cNv0WZ6ZG1Hg77ObW8FvDS1s2woTR X-Received: by 2002:a05:6808:10c9:b0:3ae:b06:2131 with SMTP id s9-20020a05680810c900b003ae0b062131mr10647513ois.0.1699902965610; Mon, 13 Nov 2023 11:16:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699902965; cv=none; d=google.com; s=arc-20160816; b=iZgHbbFhyjfcZCxnz2wMi9gZ/fe9S8hhpAT/uixDJhWlhQcFw7tkb1mn0j55OgkOW6 sx4L17tYEG9jRHH4l6zdiUpbCcm/R6rjnFKtwyskgdKWevB0Sh12e1aqwSJWisc5AVlh bszHxjsfn90r4bCtMYZjgZO/lyQRS/H2c4PXSDjGxaWVNt8yzhkuGT1huP13WDO8RtJg LCRH0RCxxLSy8E7pt7auZjzg7V0aiSdLkKXQt6jLYw+Uu2J0P1/x/4wh6sypfR3jyxnT 4chNir0ov7kgS/P1s3Mnj0Tp9U/8ygDvJl1j2+iO8K0xU6Iv00WkVjimsUTFpF2QmVbe 0JAQ== 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=mRge4tn8AOyKqllhp/LWhG7OC3rpWRAypfG4D7BFSes=; fh=RPAmrUlnQQdc1FhCirEqyhGh/OnPyRxUfAdj7ygPMx4=; b=GDcMbViScp23zYEWiPcD/MBW5OIUyWaVJ4+Gl3LQ11KFCN90yTm1uo9aH7oqpBlhjD 5ZpUaevwkK4aRPmG/loX33tMzdLQSL4Zntig+8jMfOQVjQjgiSGCWUloeaoDb9Tn1O4f i76D6dVDuKssXWsQLdjYnAPd0zHS4xUn3Hal9/zNt5dzCg/DLgAJQMJLAzcdLLa7dCGX i3Z+Tgbb5txnPGM8qhQvBh8MQrBbBSXCT4SIX/H+jCcPCwJV/dNFAJpFXi5nq7HJrlOU +8Bzr0vphAUjfIVGFs6hat6E/KOn+6h0vWcK249b7BVpzdAoR9+yTU/PVifSazTKHN6c wj0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=HHcoCLJz; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519 header.b=99zJP070; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id s1-20020a637701000000b0059f0cebd046si6309740pgc.729.2023.11.13.11.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 11:16:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=HHcoCLJz; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519 header.b=99zJP070; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 89D78807FCC5; Mon, 13 Nov 2023 11:15:07 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231916AbjKMTO0 (ORCPT + 30 others); Mon, 13 Nov 2023 14:14:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231587AbjKMTOP (ORCPT ); Mon, 13 Nov 2023 14:14:15 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D82F10F4; Mon, 13 Nov 2023 11:14:12 -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-out2.suse.de (Postfix) with ESMTPS id B38D31F855; 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=mRge4tn8AOyKqllhp/LWhG7OC3rpWRAypfG4D7BFSes=; b=HHcoCLJzUSrl+916dDaAr5L+rvBNg5EZJWNJ9FU4oO7iyyszbPOakAPDNlvZ2GWxEftVBG ofoRQ+2PBJ4yVIu4WjIvysjjPDJ5nRcI9hz9oteiKTthU9sITUeBJNGTM4v6d8/hQo7EQD uOGx3A9MV09VFuJNRsmG+Tub99aXD54= 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=mRge4tn8AOyKqllhp/LWhG7OC3rpWRAypfG4D7BFSes=; b=99zJP070iXpx8T3/klzNmEBMXzHWZVlEJ1/bVB97fYfcPbzX7Zz58ZAsiBm2S4kVXdT2fR D29wYOXRt0pISTCw== 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 63ACE13398; 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 cICdF4J1UmVFOgAAMHmgww (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 04/20] mm/memcontrol: remove CONFIG_SLAB #ifdef guards Date: Mon, 13 Nov 2023 20:13:45 +0100 Message-ID: <20231113191340.17482-26-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-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 13 Nov 2023 11:15:07 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782477451998860521 X-GMAIL-MSGID: 1782477451998860521 With SLAB removed, these are never true anymore so we can clean up. Signed-off-by: Vlastimil Babka Reviewed-by: Kees Cook Acked-by: Michal Hocko --- mm/memcontrol.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 774bd6e21e27..947fb50eba31 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5149,7 +5149,7 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of, return ret; } -#if defined(CONFIG_MEMCG_KMEM) && (defined(CONFIG_SLAB) || defined(CONFIG_SLUB_DEBUG)) +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_SLUB_DEBUG) static int mem_cgroup_slab_show(struct seq_file *m, void *p) { /* @@ -5258,8 +5258,7 @@ static struct cftype mem_cgroup_legacy_files[] = { .write = mem_cgroup_reset, .read_u64 = mem_cgroup_read_u64, }, -#if defined(CONFIG_MEMCG_KMEM) && \ - (defined(CONFIG_SLAB) || defined(CONFIG_SLUB_DEBUG)) +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_SLUB_DEBUG) { .name = "kmem.slabinfo", .seq_show = mem_cgroup_slab_show,