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=-11.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 8DD1DC433E0 for ; Mon, 15 Mar 2021 22:17:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 24E3464F07 for ; Mon, 15 Mar 2021 22:17:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24E3464F07 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 9DD2C6B0036; Mon, 15 Mar 2021 18:17:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 98D9A6B006C; Mon, 15 Mar 2021 18:17:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E14B6B0070; Mon, 15 Mar 2021 18:17:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0052.hostedemail.com [216.40.44.52]) by kanga.kvack.org (Postfix) with ESMTP id 61DB96B0036 for ; Mon, 15 Mar 2021 18:17:27 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 17999364E for ; Mon, 15 Mar 2021 22:17:27 +0000 (UTC) X-FDA: 77923520934.03.15E165E Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf29.hostedemail.com (Postfix) with ESMTP id 4B049227A1 for ; Mon, 15 Mar 2021 22:15:30 +0000 (UTC) Received: by mail-pf1-f172.google.com with SMTP id o3so2816868pfh.11 for ; Mon, 15 Mar 2021 15:15:30 -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=4NJ97PlxHnFzJWJgTtpDT+uKjd7HgYN+0ebu/wLMsHQ=; b=GfeWNb1p88yRfbJnymIfERA/ut8kED0Wo7XExiGoNzml+80Z9oey4U0Ro5ATU1yaU2 HTXnfdZHk6IoQmCWOJmzEb8cMJ+ycjfmtAfwRs9BLtRmg+ZBBxLW7s5f8mLFH9cpacl2 tnpMFAMPUUJ7b6g/nDRVteP7L4YMejkChexPI= 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=4NJ97PlxHnFzJWJgTtpDT+uKjd7HgYN+0ebu/wLMsHQ=; b=Zh7m/77ZIAw+LxdCQ+MvrE4R2hKUMJfzK1DFUjgJFsHp+a5rwtF1VmLB+bvHozpQ8l s99F2XzUb8bbINg8wOi92tq8UhW1d8RxfBOs42s8rMqQumAor0oH6x1+rWSzCjMhpS3+ RbHIWD1bjaRLhSnuYFE7HPCOURT1BQAb/swSE7YgevFTvI/U2vq+LNwnZVvLhkETHMbj 5tDczWM+0LoCLVGExUQSOUJeUwafNA2saJZbhi7Xa+vuGkLe/qzNDPFfoLHXik0+adYB 0OuePNfSvyIsic2V5FmC0gTxjY75Yr76io6gFxPzkXXBV/SvKQhO3Kqirk9peQWiP7J+ gHsA== X-Gm-Message-State: AOAM533Emy/A7VyQPHUSfaAllXS6VZYEKFjduSns7ctiaehmprUD+r3m 6wLAxxL8gCWgxO/D8NyecDan/A== X-Google-Smtp-Source: ABdhPJyTjnc9LdJf0dvdcKWL6IHisbEo+ZUejO8pNco1fmFRm1nNRoQe3Sx5RQqz8b9aU1cRR2xiPQ== X-Received: by 2002:a65:6a0c:: with SMTP id m12mr1019256pgu.161.1615846529292; Mon, 15 Mar 2021 15:15:29 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id s194sm14685269pfs.57.2021.03.15.15.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 15:15:28 -0700 (PDT) Date: Mon, 15 Mar 2021 15:15:27 -0700 From: Kees Cook To: Thomas Gleixner Cc: Alexander Potapenko , Elena Reshetova , x86@kernel.org, Andy Lutomirski , Peter Zijlstra , Catalin Marinas , Will Deacon , Mark Rutland , Alexander Popov , Ard Biesheuvel , Jann Horn , Vlastimil Babka , David Hildenbrand , Mike Rapoport , Andrew Morton , Jonathan Corbet , Randy Dunlap , kernel-hardening@lists.openwall.com, linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v6 2/6] init_on_alloc: Optimize static branches Message-ID: <202103151514.AE11A69683@keescook> References: <20210315180229.1224655-1-keescook@chromium.org> <20210315180229.1224655-3-keescook@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210315180229.1224655-3-keescook@chromium.org> X-Stat-Signature: e9op4orxt3gangczys6w649gqitc5a7t X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 4B049227A1 Received-SPF: none (chromium.org>: No applicable sender policy available) receiver=imf29; identity=mailfrom; envelope-from=""; helo=mail-pf1-f172.google.com; client-ip=209.85.210.172 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1615846530-226713 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 Mon, Mar 15, 2021 at 11:02:25AM -0700, Kees Cook wrote: > diff --git a/mm/slab.h b/mm/slab.h > index 076582f58f68..b0977d525c06 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -601,7 +601,8 @@ static inline void cache_random_seq_destroy(struct kmem_cache *cachep) { } > > static inline bool slab_want_init_on_alloc(gfp_t flags, struct kmem_cache *c) > { > - if (static_branch_unlikely(&init_on_alloc)) { > + if (static_branch_maybe(CONFIG_INIT_ON_FREE_DEFAULT_ON, Gah, this should be CONFIG_INIT_ON_ALLOC_DEFAULT_ON. I'll see if there are any more comments before sending a v7... -Kees > + &init_on_alloc)) { > if (c->ctor) > return false; > if (c->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON)) > @@ -613,7 +614,8 @@ static inline bool slab_want_init_on_alloc(gfp_t flags, struct kmem_cache *c) > > static inline bool slab_want_init_on_free(struct kmem_cache *c) > { > - if (static_branch_unlikely(&init_on_free)) > + if (static_branch_maybe(CONFIG_INIT_ON_FREE_DEFAULT_ON, > + &init_on_free)) > return !(c->ctor || > (c->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON))); > return false; > -- > 2.25.1 > -- Kees Cook