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: 13454358 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 D25E6C072A2 for ; Mon, 13 Nov 2023 19:14:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 056A56B026C; Mon, 13 Nov 2023 14:14:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BE76C6B025F; 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 61A4F6B0261; Mon, 13 Nov 2023 14:14:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2EFFD6B025F for ; Mon, 13 Nov 2023 14:14:14 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0F5C740568 for ; Mon, 13 Nov 2023 19:14:14 +0000 (UTC) X-FDA: 81453881628.07.5BC1E3D Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf01.hostedemail.com (Postfix) with ESMTP id 0706040014 for ; Mon, 13 Nov 2023 19:14:11 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HHcoCLJz; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=99zJP070; spf=pass (imf01.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none 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=mRge4tn8AOyKqllhp/LWhG7OC3rpWRAypfG4D7BFSes=; b=1CO0zfLAT+yqNDr0MIARlMyGPveJcwxhBwGTFc5eCsHZWTVdvYNvMXyrOkY0EmnytOMVp3 oKKuRGUMdwrVeLNN+B3Jb6cInKg+xTXsmN52/cis0syYQQ+M8AY5WpS1TzsSf03hyH4E7d dhMmhID0KVngkUoSK9FRiLqXIztJ4wY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699902852; a=rsa-sha256; cv=none; b=QSnbM2ULdRriKoSTDMRIkp6Ec9/Ox/wb1qIJoFQ7gbntAZY+GBPx7PM9tb8bCe5Ln/t5pe vjxPylaKQZ8MSAzYRUI0HvFWrB0IhthqOfZEazhdZQwOKrW3JdYCI+8zGlZwhc/Bf8OMZA 8Bc943X1nOsbhF1d65BUgWL1fNpJLao= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HHcoCLJz; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=99zJP070; spf=pass (imf01.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none 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-Rspamd-Queue-Id: 0706040014 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 3j91whaxpwzuaqonzckrd3asuwubezch X-HE-Tag: 1699902851-358446 X-HE-Meta: U2FsdGVkX18kU+Q3RCWbQPDZ/vvdfffRxP5bnOHCF8Giqd8WAgzSirAGKTBnUSgNx//zK5HsoazjvNFV/HJgxjM89EWquhtCtAV/nNO3Vww8aNqqzMFAtH4DrJhOX+BuOLutNpI9g4CnXLvyYYRia7RZnSKGYPUxa32E2Br6Ku8RKlORx0N2UDGv8MbmaaJ+qikn+oqC9B9nZrPQPmhkBtvpP7dOWzFVyKoCHMRQ5NEvMzyKiDYQmBLFTm8OV8nax9M6/3sMK7YWD451gWNS76BazXOVd8cVfXdeTdXHTGDnALUfcX08gPIA7XEbRaXEvENRoeAE571WwrMYvLFDDg0W/XEVuAq57b7hYvNyIymetu1dHMQVs4+fKaaMWqD5xWFMZUcRLSX/uUjgA/FUHePqR1bh4k+/mCDc6Qq32oUkC0uXfUtWDlcPGsSXyMMLLJWnXjS9uMSNEnnYBGGjZs2QrWXspXP2wc9oWhmXIj5utDpY+sC4dvkjw5DgWR2rXqSgofsoydIGiAVT6UbnNFWQn1nEch2m27JtkUMqXEcyct6I6WIVfD3qKZMgkNm9gzktzqZKbaZro/CjtPYMGaO/e2n0QETO8aGmgWSITEK9TH8EN6TlC3z4PS8Q0t9XTB5O+w0w2cEb7GkWNVS5USaqOwdH4DfkjLb5IKxElxY3rLPjvV2XQsmO46yPP86DH937tRxN48JuyOcVWgkvUxzNQzLmFt5vPHcbTWaiCViEv5uTSkmlNFiDZMtqX0dAS2GGwlEPrEQKGqp+puPJ/LuxmzJAaUrwl7fbpDfODYd4Y9xl9KIaQdirnfV+hE5jBqGmzT+nAqcFVjg6gC1+zzWj/oExrVGXX7JCmQ/PERblqRbF+I9zrmmqXgaWb1dSBXi2agx8e7ptxzoC0vQB1s3g3tGrQ3Hi7HCUONt3dZoQKYe7N4kjRxOOlO44E+EzSMB5wkUXsHZ8+bFKy2W Xv5WPqhd z1LSWMq0cob6d2PL/ZptjeYQoFSmTi+8lmpVCsBNfy+i+/qB3hD28jPdp9f2Lj0lPSEhMh6JHKgy1H2nPZcMSxQ3lDmXbWK3M0RhPRkZ47NJVcBy7vXqB+LSaIF7BPfKH/OCOMFTmFHLg6UnbtjMw1cQjrBzlZ8qh9T3BOu2NQPEpmMj7V5bm3g4Ri2Nx6ruBN33I6eRepaFR1zEK+ublHSIvGpE+C83jHBxaWr64SiQz2a1v1jYRK15HWfLxaFChzb3FzXGwS5SxO0eaNhwC+LsSfYbKheCbY9uKt4kZe+ZfNzJQ5brZAz7yfA== 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: 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,