From patchwork Mon Nov 13 19:13:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 164607 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1419868vqg; Mon, 13 Nov 2023 11:14:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IFGYWuJephLDTCeAvgpEBhz/DUczSCFPq1XlpA+OOtK13ap8uvqiDNvaLTyt7FIXsV2iH1h X-Received: by 2002:a17:903:1111:b0:1cc:45fe:afbd with SMTP id n17-20020a170903111100b001cc45feafbdmr218260plh.17.1699902881019; Mon, 13 Nov 2023 11:14:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699902881; cv=none; d=google.com; s=arc-20160816; b=y/DSHQzbJu8yGPj7AaT1u6dAVdi+CsZ7aZJYZHCoZWjPuOV9UW9zoT9fE5YdzhvCdu M8uBjcIr9R1lTXzqFqwxq/j4AnyKAv7ENSBz7ursBnt6ixiVp/SVCebtguBiu0+Eyy4c uHmwJ8WzzI6hvfuKJbsjjGJ262iLi/5H/4jmTKdvDGvUm+7mCHeuF35IyWnTKy9VIjOZ iD4gDw/ND7ocT4/QRL/OeFpe70sjPmKI18fG3/1y55l/8uZihkVbKmDIjEBWTruum8hc Hkfiivc1ct7LCsjkSgmT0ClDP9llu43vd3x7JnFf/E6y9y5n4BIQNvFJg6ICX1xWFyne LZ+A== 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=lpvt5s4LImzllAEMKC9yyjTODPwLX4+6Y45s6lDAdck=; fh=RPAmrUlnQQdc1FhCirEqyhGh/OnPyRxUfAdj7ygPMx4=; b=Tlpfp+IicRoN9mSvTQVr9DGhHaBfXBEcVeP3kUCOsiiHqfvbHuAxoPOM3BWKFd+MwE FN78PVFkqxGAfiaVKJrPQ6ZzzfX3VLwEy1B2zbeSmVi4cFHl2N9TDNDAK9CVazMxdhsb ubpxArfI5Zn2FcJbYL35kONrh2GEKTsLZRoj0b0SCKHV1dZXkJl0O105cPKs7XlZSn1L zwGPQy3TAXTppx1dytT+qIyfFfSIqWZTJ5rhvRgyPCSwbX62GFmBjgKVUQgPkbN5rIHV zaRGooQo5RPtRTeIzWuWhHF4/z+15+RSetBtlkTjbVU7Yk2G62oyakBJH1e7TkGDssfH 6QSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=0Zk71Af4; 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 t6-20020a170902a5c600b001c0727658c3si6058211plq.259.2023.11.13.11.14.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 11:14:40 -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=0Zk71Af4; 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 20CAF802925C; Mon, 13 Nov 2023 11:14:39 -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 S231989AbjKMTOc (ORCPT + 30 others); Mon, 13 Nov 2023 14:14:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231713AbjKMTOQ (ORCPT ); Mon, 13 Nov 2023 14:14:16 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 416C01715; Mon, 13 Nov 2023 11:14:13 -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 AE5771F86B; Mon, 13 Nov 2023 19:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1699902851; 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=lpvt5s4LImzllAEMKC9yyjTODPwLX4+6Y45s6lDAdck=; b=0Zk71Af4/ksZViufYFLz4W466HBY9hZ6yjSoaHX3v3J6SOrEeTFMUha4Tk6TWp6ktjmlTY tyWmx5ZTjAXIQL0It+uib+nO4jvjmUvBVn98fw84px5FDHOZc3q/N2qZVErz8XjjyZ8Rv3 nya3pgfa+YY7tev+CjDyBZ95Zxr+uDc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1699902851; 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=lpvt5s4LImzllAEMKC9yyjTODPwLX4+6Y45s6lDAdck=; b=vAhtZGcql9qIWxRJqKiLelqePVQm52ugRXQ7AXX20vnAKjBALODitlzRltKZ2qlT1HLVp2 tD2r1WHZoMl+fJAw== 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 6270F13907; Mon, 13 Nov 2023 19:14:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +BNfF4N1UmVFOgAAMHmgww (envelope-from ); Mon, 13 Nov 2023 19:14:11 +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 07/20] mm/mempool/dmapool: remove CONFIG_DEBUG_SLAB ifdefs Date: Mon, 13 Nov 2023 20:13:48 +0100 Message-ID: <20231113191340.17482-29-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=-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: 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:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782477363591894980 X-GMAIL-MSGID: 1782477363591894980 CONFIG_DEBUG_SLAB is going away with CONFIG_SLAB, so remove dead ifdefs in mempool and dmapool code. Signed-off-by: Vlastimil Babka Reviewed-by: Kees Cook --- mm/dmapool.c | 2 +- mm/mempool.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index a151a21e571b..f0bfc6c490f4 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -36,7 +36,7 @@ #include #include -#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB_DEBUG_ON) +#ifdef CONFIG_SLUB_DEBUG_ON #define DMAPOOL_DEBUG 1 #endif diff --git a/mm/mempool.c b/mm/mempool.c index 734bcf5afbb7..62dcbeb4c2a9 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -20,7 +20,7 @@ #include #include "slab.h" -#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB_DEBUG_ON) +#ifdef CONFIG_SLUB_DEBUG_ON static void poison_error(mempool_t *pool, void *element, size_t size, size_t byte) { @@ -95,14 +95,14 @@ static void poison_element(mempool_t *pool, void *element) kunmap_atomic(addr); } } -#else /* CONFIG_DEBUG_SLAB || CONFIG_SLUB_DEBUG_ON */ +#else /* CONFIG_SLUB_DEBUG_ON */ static inline void check_element(mempool_t *pool, void *element) { } static inline void poison_element(mempool_t *pool, void *element) { } -#endif /* CONFIG_DEBUG_SLAB || CONFIG_SLUB_DEBUG_ON */ +#endif /*CONFIG_SLUB_DEBUG_ON */ static __always_inline void kasan_poison_element(mempool_t *pool, void *element) {