From mboxrd@z Thu Jan 1 00:00:00 1970 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 5E4A9C4332F for ; Tue, 14 Nov 2023 04:31:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C03396B0296; Mon, 13 Nov 2023 23:31:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BB1EE6B0298; Mon, 13 Nov 2023 23:31:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A7AF56B029A; Mon, 13 Nov 2023 23:31:55 -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 960CF6B0296 for ; Mon, 13 Nov 2023 23:31:55 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 116B2A097A for ; Tue, 14 Nov 2023 04:31:55 +0000 (UTC) X-FDA: 81455286990.22.32CDFB3 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf26.hostedemail.com (Postfix) with ESMTP id 3528D14001C for ; Tue, 14 Nov 2023 04:31:53 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=YABg143M; spf=pass (imf26.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.175 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699936313; a=rsa-sha256; cv=none; b=q6BP7CkhoA0M+uQ77cFwydgzrv4o2u7O0yvUhFMggTrhSizvgeuiA+u/zP3nBMjxeT3cjz +pBOY+HGrC/RO34o7lEJyNQm6FVXvOAX/RTYxoHqruTVCO/Vr0zRqqCR0jTznvTUYoT9Ld tuUIJnXJ3gUiJTeKdit6Zl2LLkSWUtg= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=YABg143M; spf=pass (imf26.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.175 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699936313; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=VRGeaFnyf6oFg3w2q7Y0wKf4gObnq/HsTjuQwLGdqK8=; b=miAsyRpf/lt4CfGJuHT5HsPmxcBKZd4Yv1wIdEjWzdo3PpROl71m7RjdaOZhWnldVDGQRP Hke9VEATqJy9vngTKYWxTtQEg3rZLMdQVD/OdrRdjZNJR7wv52nLFfZ19vU/84InMy3ayj 9jm0hgUcsCmwF56xw5JirL22q3DTl4s= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1cc1e1e74beso47215205ad.1 for ; Mon, 13 Nov 2023 20:31:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699936312; x=1700541112; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=VRGeaFnyf6oFg3w2q7Y0wKf4gObnq/HsTjuQwLGdqK8=; b=YABg143Mfrw2655y6vIgmAeWTysDe9OzzWSNkC3gkVZs/FzUzgVNqrJM5L/EoAbw+U h4PEoUlDG8un31N9WXwS0y/ihuh4QNAlAqeVdJOmxjqMLXdYLniZLDTtTks2FME2tH/D lvFtiS59MgvC6byyJLIHu+LkWXWxqV/zDWBGg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699936312; x=1700541112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=VRGeaFnyf6oFg3w2q7Y0wKf4gObnq/HsTjuQwLGdqK8=; b=uuyIl3nmnunborQ4QQPfd1vYOJPjGund+XktFoVG+UPb+LmX2BB1pRJjsCxIC1sn6d hn+pDbEbKAqAG8oExv4kHRXN5VgoX4uBLnm5QskHdtJuAb4kWFyrCWdpHC+kdRVFtoQb EJnqsASDKmRGdmNQXAFN8jvnOdeyNhZ/ZhZNB5LPt1OJ2kur61dpWgw7Rj13FtUjmcUz OGl0cqennHkFHieuN8QI2sxQFd7rjTPv3vtM9EZCq3cS+fq40MpvxyVzX0ykTaTnntBx jmEGkCoxtE6/DyxSFX3YZTGmuxDqNC03trGQsIQ3QbLR5UQjo5L55uNq4N3d75GOTDN2 qlig== X-Gm-Message-State: AOJu0Yxp4hRHOKJZdbLyTckHHHcH7oOf38vT94cfnP6MX6x2/o5lGlup Lj3MptreRmBkyI20HpPHAiaHZQ== X-Google-Smtp-Source: AGHT+IFvceFQuU8pAlXLSAPEOVKfVP9ovqBBvtCeG6ahmhd48S+R6ZSbVzn8nuN1wKsAP5TgAinsRQ== X-Received: by 2002:a17:903:2a8c:b0:1ce:8e4:111 with SMTP id lv12-20020a1709032a8c00b001ce08e40111mr1701477plb.27.1699936312112; Mon, 13 Nov 2023 20:31:52 -0800 (PST) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id u1-20020a170902bf4100b001bb9d6b1baasm4768235pls.198.2023.11.13.20.31.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 20:31:51 -0800 (PST) Date: Mon, 13 Nov 2023 20:31:51 -0800 From: Kees Cook To: Vlastimil Babka Cc: David Rientjes , Christoph Lameter , Pekka Enberg , Joonsoo Kim , 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 , kasan-dev@googlegroups.com, cgroups@vger.kernel.org Subject: Re: [PATCH 07/20] mm/mempool/dmapool: remove CONFIG_DEBUG_SLAB ifdefs Message-ID: <202311132030.1B2302BA4@keescook> References: <20231113191340.17482-22-vbabka@suse.cz> <20231113191340.17482-29-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231113191340.17482-29-vbabka@suse.cz> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 3528D14001C X-Stat-Signature: 9ydbs9nqd6tnefzbssaeh6dehpkzcy45 X-Rspam-User: X-HE-Tag: 1699936313-993746 X-HE-Meta: U2FsdGVkX1/PH64HvJTI67hS4YAcQ3A4IzgYOclVusJly1Dof5icXVFAuj31GYSSUs8h5M8l8iFlxjqo9Iy2pRLNhKuDyeSVcGAyhz0hWuXqxs2/o8j58/5QyVupJBwWSpqmWUidVImVNS45egBuUZlONfjT2FrXUCBrwUuRRm+cQuDyUqI6hsXl54fcKvFSpOlL8lLTMI0vTQ2rLKv7Ny/SHq5IujDazzrBRgksA6tSXiOkq17jbkRehqxgNMmyzDwmlaId15SFFYX/IFWYi1gVWNN4vFqA16MIKRuY9r2Jh/cNaB3IPaFxR2a7nc9kWPMmatDKuf2HE+yhjlkSfIfv6ad3hzi4HX4sYt3FfWOoV8dd4UPTYZsPezI86ycSs6xLWn/EdSgQCeyRuxtASEG9kpsCKItQepZ89wOAlgXJ2fHHoaCH1XBb4CKkRfA9IqqDvk+L+fkcuyrQz01Zqljr2O7C6YC0hdL5Yjnf74G1bzyPpILc2HH4Bxk7hK3QvUsVski6/kasHRJ/mmpDoxtmrnr6vaQ3SEABmn8VDCPFUYu56XnJqTUkrINbvHsITtPVu+7a+51sNuoqV27b8ZANK9L8xh2aTB+Iuz3U+3qqQ6oD+c1lEvVn0OMVTXwiEptOe15Z7hxO6Zh3CGmlkBWnTWmX4X0aBzpWOwdzGTRr5kHTAU57K3RdHjvXypTl3mrHZqpdeDpmX7gcrjWx7VsVcu2Y8vR8L+P1Pa1tk+CdAvvU5RnTLbIpJQrFqI0OFtOGAgFZoFAhs8GEy+55N809NFeq5EjTBScKALtAuM532ftEyw2EFQz+eu7XCdhYWWfEPEcsc9ba7YA3Zlgm+cx3vf1VM2kV0pDyGPg1V4RiyXNYwYXt2fQdCYykbaIwHJUO8mPsVWsp7lM5h5HNZtLTiiiLgxSKxm6qlFVRAQGvMrYwXRmtzJee3ZH1oKZKZlRtv3YWRyJ64dEk1A/ VyGHJWNw gvpyQw8TeJ/VETH5zEw9n3kWFtWe1n5SYf1+zx4Mahf1kkHK9xBaPJjgdLuKzG+UM9p4egkr0hE8K0uIEMz3oeYd7FbvO+Y7Swr2ZoiuQfPqKDwJAo0f5ULi4duyr/s4hSDLc3WCM8dB4CaHHLjtIHNh2cvG4GCw3wnR14ZUsSf6PVCyi96Wiy7Jp2eBN9JrB0SIV+y8k6/DfAwUBUJWDXsngW8ib/N1INfjFBlk1xAHp0ctmaIwP0FOYAdfgICSQbBODt8M/AHYtOZOzkFhadL6UASrXq4qlwTRlph3qlAjd3SdLBAJG1yOO9FBmrcYjF0BF/TAB/7Nl1A7R540LsIpR1xLuDrdYvsTmuO4NlQ8kgzUasgd5Kwa1n9Hz2wVjdQUm11wy/IY7+78cJkKDWy+fiRxGFndqkUmQI12X56FNweXFFGBrRwn4ogf2kBGH2Cg6ZUPaUERwMbyHVtn8eKhYg2G9l1xvlid+77LMJxvRJMb0FvnTcp5qqansGRuM7wHk6mhf/ew37q0HoH+k1fK80ryKyTW+YcNZElz38bxsmj65lDKH6+x6cm6sNnRDIGuf 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: On Mon, Nov 13, 2023 at 08:13:48PM +0100, Vlastimil Babka wrote: > CONFIG_DEBUG_SLAB is going away with CONFIG_SLAB, so remove dead ifdefs > in mempool and dmapool code. > > Signed-off-by: Vlastimil Babka > --- > 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 */ nit: space after "*" With that fixed: Reviewed-by: Kees Cook -- Kees Cook