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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E830C433DF for ; Wed, 17 Jun 2020 17:56:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4473F21707 for ; Wed, 17 Jun 2020 17:56:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Gg//lxpF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4473F21707 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B582B6B000A; Wed, 17 Jun 2020 13:56:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B094C6B000C; Wed, 17 Jun 2020 13:56:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9FC336B000D; Wed, 17 Jun 2020 13:56:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0112.hostedemail.com [216.40.44.112]) by kanga.kvack.org (Postfix) with ESMTP id 877C16B000A for ; Wed, 17 Jun 2020 13:56:46 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id F04DC180AD8ED for ; Wed, 17 Jun 2020 17:56:45 +0000 (UTC) X-FDA: 76939459212.21.cloth35_5b09a5d26e09 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id C614F180442E8 for ; Wed, 17 Jun 2020 17:56:45 +0000 (UTC) X-HE-Tag: cloth35_5b09a5d26e09 X-Filterd-Recvd-Size: 4683 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Wed, 17 Jun 2020 17:56:45 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id l24so1659325pgb.5 for ; Wed, 17 Jun 2020 10:56:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=wah6b+5ElzkXhQSXMpu6WP+aPTNfFYkvhbkHvAkhKGg=; b=Gg//lxpFtcoeRTFSTUzVOxJMnX7aWTWzCrGG4vux8gR8wyyWdLJh9xPyFLuLZSYoyt sLoOoC9Czq0XyiX+HKkry+vk+0A2+y3TFmHLM7dzXsLjtXwfhI8Ryr8jgw0VQQvpOL/s U5UJOeITPqpeWC2NnNcRmwZ6WLh2uOnB2ddD4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=wah6b+5ElzkXhQSXMpu6WP+aPTNfFYkvhbkHvAkhKGg=; b=Ptg2+9shtNDtB0ZMW0pIZDMgCl1uxwKtkFTxiC3FF6egl815yqAJI37AXqKFL8GUOu +RUEX0J9w4D4EwLM277jJCElXxk7e3fe8iMdouanl8lsBOBlO68v7YaHAn82lyVuxX9x V680ygTY38YO4zhx8rf/FKffb1HEHs/t2R286Kmb6Vaov/Cn9zyOUabAft5TmkKnqhKZ k1QX/ran/qCGZyAQcqZchQVxDV0zYiRrDe14epCfCzWrBGEdfJISnd4cNyti0n+UATM/ fRikVQdc847h+cM7I0NOQNmo1uK1uZ0sy7VSqJAezEBvxdNyBeRcf4gQOccLB9ZGM8pc f0OA== X-Gm-Message-State: AOAM533+zUl+L7bBGTnyocEHev8UcVt6TnvhzqH11UdhXDNa8F1sX1dV u8WKjCmaMwhkseva9vf9tW9ZkQ== X-Google-Smtp-Source: ABdhPJwoRs2t9ywysSqyyKsH20UwIP5c2oKFuhH+rZ86gi/ru/XeeOa9CjITUhl6f1WA66aIvINaOA== X-Received: by 2002:a62:1849:: with SMTP id 70mr7521391pfy.227.1592416604312; Wed, 17 Jun 2020 10:56:44 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id w77sm513281pff.126.2020.06.17.10.56.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 10:56:43 -0700 (PDT) Date: Wed, 17 Jun 2020 10:56:42 -0700 From: Kees Cook To: Vlastimil Babka Cc: Andrew Morton , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@android.com, vinmenon@codeaurora.org, Matthew Garrett , Roman Gushchin , Jann Horn , Vijayanand Jitta Subject: Re: [PATCH 7/9] mm, slub: introduce kmem_cache_debug_flags() Message-ID: <202006171055.64F6EB665@keescook> References: <20200610163135.17364-1-vbabka@suse.cz> <20200610163135.17364-8-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200610163135.17364-8-vbabka@suse.cz> X-Rspamd-Queue-Id: C614F180442E8 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: On Wed, Jun 10, 2020 at 06:31:33PM +0200, Vlastimil Babka wrote: > There are few places that call kmem_cache_debug(s) (which tests if any of debug > flags are enabled for a cache) immediatelly followed by a test for a specific > flag. The compiler can probably eliminate the extra check, but we can make the > code nicer by introducing kmem_cache_debug_flags() that works like > kmem_cache_debug() (including the static key check) but tests for specifig > flag(s). The next patches will add more users. > > Signed-off-by: Vlastimil Babka > --- > mm/slub.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/mm/slub.c b/mm/slub.c > index 24d3e5f832aa..c8e8b4ae2451 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -122,18 +122,28 @@ DEFINE_STATIC_KEY_FALSE(slub_debug_enabled); > #endif > #endif > > -static inline int kmem_cache_debug(struct kmem_cache *s) > +/* > + * Returns true if any of the specified slub_debug flags is enabled for the > + * cache. Use only for flags parsed by setup_slub_debug() as it also enables > + * the static key. > + */ > +static inline int kmem_cache_debug_flags(struct kmem_cache *s, slab_flags_t flags) This should return slab_flag_t, yes? > { > #ifdef CONFIG_SLUB_DEBUG > if (static_branch_unlikely(&slub_debug_enabled)) > - return s->flags & SLAB_DEBUG_FLAGS; > + return s->flags & flags; > #endif > return 0; > } > > +static inline int kmem_cache_debug(struct kmem_cache *s) And this too, as long as we're making changes here. -- Kees Cook