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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 B4446C433E0 for ; Wed, 10 Mar 2021 21:04:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 621B064FDF for ; Wed, 10 Mar 2021 21:04:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232016AbhCJVD5 (ORCPT ); Wed, 10 Mar 2021 16:03:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231827AbhCJVDw (ORCPT ); Wed, 10 Mar 2021 16:03:52 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A375DC061574 for ; Wed, 10 Mar 2021 13:03:52 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id s21so2039147pfm.1 for ; Wed, 10 Mar 2021 13:03:52 -0800 (PST) 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=kgZRDWg+E5eBmEuNfvh5FPMkh8S3VA4zLnMLimy3dco=; b=YN0Z/Vhtni4MgeYq5ZXFSPAnmyYH+lkZC+AUrGdL1FSjOP6FTEcki8jRb9CpsNidan bTf6DVBu9IZ9qccH7IA+cOlRe8qbtBRf7N3rHBrgr/zXFmg3FnjjA8PO7MJE/yIDO1/a qFVyvQ+I7V0ur72vLR6/jxgCfMQLRlBhrNqzU= 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=kgZRDWg+E5eBmEuNfvh5FPMkh8S3VA4zLnMLimy3dco=; b=q7BwEsND9jmxOICE8XnfpBlXIdYZ/Xppi+y+b8NshlH72Yn3cO/PgayefHk9j6JB37 V+trn8pZxQ20V+BhzJ2WgLh1RMR2FFSofKJgEb45h4/04Q7DiHCsMilPX1p8oeLAKd8r emLUpLyrADskqAlCc/9twhcXM4z+Y0Mjcg5SyKplO2xvN6zVAmNqnrVZ6uHjPuOgfgVV DBmVE8zwev+sDVEAAxYV6KGLoXjYLgk7Eo8NUCXdYjOUqwnmJ8frW6edq9lrmU/KGiT8 Ssjf365758WHPmql3rLOjQevWsMZ0mEEf+knEhf9L9Ww4tGK/OJOvrzPsbd07HcBQOU9 I3/Q== X-Gm-Message-State: AOAM5332bFsGHL5GoJCz4S4OKnRChPrMOvsL0TQmL+sUoZJt5j7vzGTd RiXybAXaIsLGVewSlqZs+EG5Og== X-Google-Smtp-Source: ABdhPJx0EQbJUnNqWnWy4ORz94xOvLvvXICL3tLfic8hpJEypnFS58ssYytUjMkPtAFORl44nriB/w== X-Received: by 2002:aa7:9154:0:b029:1ee:fa0d:24dd with SMTP id 20-20020aa791540000b02901eefa0d24ddmr4403109pfi.17.1615410232053; Wed, 10 Mar 2021 13:03:52 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id m7sm236760pjc.54.2021.03.10.13.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 13:03:51 -0800 (PST) Date: Wed, 10 Mar 2021 13:03:50 -0800 From: Kees Cook To: Andrey Konovalov Cc: Alexander Potapenko , Thomas Gleixner , Elena Reshetova , the arch/x86 maintainers , Andy Lutomirski , Peter Zijlstra , Catalin Marinas , Will Deacon , Mark Rutland , Alexander Popov , Ard Biesheuvel , Jann Horn , kernel-hardening@lists.openwall.com, linux-hardening@vger.kernel.org, Linux ARM , Linux Memory Management List , LKML , Vlastimil Babka , David Hildenbrand , Mike Rapoport , Andrew Morton , Jonathan Corbet , Randy Dunlap Subject: Re: [PATCH v5 3/7] init_on_alloc: Unpessimize default-on builds Message-ID: <202103101303.6E6569C1@keescook> References: <20210309214301.678739-1-keescook@chromium.org> <20210309214301.678739-4-keescook@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 10, 2021 at 01:52:04PM +0100, Andrey Konovalov wrote: > On Tue, Mar 9, 2021 at 10:43 PM Kees Cook wrote: > > > > Right now, the state of CONFIG_INIT_ON_ALLOC_DEFAULT_ON (and > > ...ON_FREE...) did not change the assembly ordering of the static branch > > tests. Use the new jump_label macro to check CONFIG settings to default > > to the "expected" state, unpessimizes the resulting assembly code. > > > > Reviewed-by: Alexander Potapenko > > Link: https://lore.kernel.org/lkml/CAG_fn=X0DVwqLaHJTO6Jw7TGcMSm77GKHinrd0m_6y0SzWOrFA@mail.gmail.com/ > > Signed-off-by: Kees Cook > > --- > > include/linux/mm.h | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/include/linux/mm.h b/include/linux/mm.h > > index bf341a9bfe46..2ccd856ac0d1 100644 > > --- a/include/linux/mm.h > > +++ b/include/linux/mm.h > > @@ -2874,7 +2874,8 @@ static inline void kernel_unpoison_pages(struct page *page, int numpages) { } > > DECLARE_STATIC_KEY_MAYBE(CONFIG_INIT_ON_ALLOC_DEFAULT_ON, init_on_alloc); > > static inline bool want_init_on_alloc(gfp_t flags) > > { > > - if (static_branch_unlikely(&init_on_alloc)) > > + if (static_branch_maybe(CONFIG_INIT_ON_ALLOC_DEFAULT_ON, > > + &init_on_alloc)) > > return true; > > return flags & __GFP_ZERO; > > } > > @@ -2882,7 +2883,8 @@ static inline bool want_init_on_alloc(gfp_t flags) > > DECLARE_STATIC_KEY_MAYBE(CONFIG_INIT_ON_FREE_DEFAULT_ON, init_on_free); > > static inline bool want_init_on_free(void) > > { > > - return static_branch_unlikely(&init_on_free); > > + return static_branch_maybe(CONFIG_INIT_ON_FREE_DEFAULT_ON, > > + &init_on_free); > > } > > > > extern bool _debug_pagealloc_enabled_early; > > Should we also update slab_want_init_on_alloc() and slab_want_init_on_free()? Whoops! Thank you; I will update and resend. :) -- Kees Cook 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=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 A3448C433DB for ; Wed, 10 Mar 2021 21:05:36 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2408464FC4 for ; Wed, 10 Mar 2021 21:05:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2408464FC4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/d0j/qobliJMpTn1Yq+eQuqBltEjJ3VhWX1LYGlRM4E=; b=Vd4CAC/IgM5NTudDsqrCBMkMk 8vSOCBc23r1XIxN0gutwZe8jJWgIP5dHmYQ8jnxq3YNMe5w3+5l8uCI0utoS2C9GzhAs/Wj96qWZi 4Nb1BGnwa9yNmDm4YRU4Bdhd13/jslSN0XGNJMn1LuXcJctlW84lP9Q1ypUqj8m7bXcIqemjMsDz8 he1iVlHboEl18gxr7xTxcrr5C8gU1Lsid2cxA9GVrGcgJHAuBOFVNOM61cg7sPQRF8/ZfHDmKmg0L 66UY9guoje3v+UKe/oVtxBwyGBVQPyPbVg8iSwMOVaEoE6lVKMOEs7OB933Hc44NGvV7Rt5DwMp5q lOgEzEJZg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lK5zs-007iVS-Oe; Wed, 10 Mar 2021 21:04:00 +0000 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lK5zl-007iTj-Iu for linux-arm-kernel@lists.infradead.org; Wed, 10 Mar 2021 21:03:58 +0000 Received: by mail-pg1-x529.google.com with SMTP id 16so5790148pgo.13 for ; Wed, 10 Mar 2021 13:03:53 -0800 (PST) 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=kgZRDWg+E5eBmEuNfvh5FPMkh8S3VA4zLnMLimy3dco=; b=YN0Z/Vhtni4MgeYq5ZXFSPAnmyYH+lkZC+AUrGdL1FSjOP6FTEcki8jRb9CpsNidan bTf6DVBu9IZ9qccH7IA+cOlRe8qbtBRf7N3rHBrgr/zXFmg3FnjjA8PO7MJE/yIDO1/a qFVyvQ+I7V0ur72vLR6/jxgCfMQLRlBhrNqzU= 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=kgZRDWg+E5eBmEuNfvh5FPMkh8S3VA4zLnMLimy3dco=; b=d7jgdCbf+0N9k7zh7Eybv4Kadnaxv0nrGuV4qa95kS7eAQ5+32kHIw7X9O7DZ9m8Wv OVtT8EQs6mScAl+1OJ73ROvo7LkOt+zrjZLSdHVZDOMHtdioRyi3IcHPyCK2O3cMx2ph otMr0vcoBn/tsDQXnMjG2wvVLUNbNysPfzXzMr7yoBHQXVqkLU21ANCruV3QeqiEPFSa oXA/eOozGUvk8qgxmgRZGV5ou+8c0oSUvCesVWssc9zkLcPh00XHKoEJ3kvhHiwQXOoS oP+hWBHMoekvdFsjSD9Hwcyi93XT85yhZxWkzlN8OGCu7OyiJ4VvabXmidGS9kqHOMKx QbHA== X-Gm-Message-State: AOAM532C/e8Jp9hjKwN0tngsG51Hf6a6cIpNboL5J8RLsExVO7tAs8ru djqMWTQsPcwukS4XCq/XhfPQtA== X-Google-Smtp-Source: ABdhPJx0EQbJUnNqWnWy4ORz94xOvLvvXICL3tLfic8hpJEypnFS58ssYytUjMkPtAFORl44nriB/w== X-Received: by 2002:aa7:9154:0:b029:1ee:fa0d:24dd with SMTP id 20-20020aa791540000b02901eefa0d24ddmr4403109pfi.17.1615410232053; Wed, 10 Mar 2021 13:03:52 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id m7sm236760pjc.54.2021.03.10.13.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 13:03:51 -0800 (PST) Date: Wed, 10 Mar 2021 13:03:50 -0800 From: Kees Cook To: Andrey Konovalov Cc: Alexander Potapenko , Thomas Gleixner , Elena Reshetova , the arch/x86 maintainers , Andy Lutomirski , Peter Zijlstra , Catalin Marinas , Will Deacon , Mark Rutland , Alexander Popov , Ard Biesheuvel , Jann Horn , kernel-hardening@lists.openwall.com, linux-hardening@vger.kernel.org, Linux ARM , Linux Memory Management List , LKML , Vlastimil Babka , David Hildenbrand , Mike Rapoport , Andrew Morton , Jonathan Corbet , Randy Dunlap Subject: Re: [PATCH v5 3/7] init_on_alloc: Unpessimize default-on builds Message-ID: <202103101303.6E6569C1@keescook> References: <20210309214301.678739-1-keescook@chromium.org> <20210309214301.678739-4-keescook@chromium.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210310_210353_926512_1279539F X-CRM114-Status: GOOD ( 22.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Mar 10, 2021 at 01:52:04PM +0100, Andrey Konovalov wrote: > On Tue, Mar 9, 2021 at 10:43 PM Kees Cook wrote: > > > > Right now, the state of CONFIG_INIT_ON_ALLOC_DEFAULT_ON (and > > ...ON_FREE...) did not change the assembly ordering of the static branch > > tests. Use the new jump_label macro to check CONFIG settings to default > > to the "expected" state, unpessimizes the resulting assembly code. > > > > Reviewed-by: Alexander Potapenko > > Link: https://lore.kernel.org/lkml/CAG_fn=X0DVwqLaHJTO6Jw7TGcMSm77GKHinrd0m_6y0SzWOrFA@mail.gmail.com/ > > Signed-off-by: Kees Cook > > --- > > include/linux/mm.h | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/include/linux/mm.h b/include/linux/mm.h > > index bf341a9bfe46..2ccd856ac0d1 100644 > > --- a/include/linux/mm.h > > +++ b/include/linux/mm.h > > @@ -2874,7 +2874,8 @@ static inline void kernel_unpoison_pages(struct page *page, int numpages) { } > > DECLARE_STATIC_KEY_MAYBE(CONFIG_INIT_ON_ALLOC_DEFAULT_ON, init_on_alloc); > > static inline bool want_init_on_alloc(gfp_t flags) > > { > > - if (static_branch_unlikely(&init_on_alloc)) > > + if (static_branch_maybe(CONFIG_INIT_ON_ALLOC_DEFAULT_ON, > > + &init_on_alloc)) > > return true; > > return flags & __GFP_ZERO; > > } > > @@ -2882,7 +2883,8 @@ static inline bool want_init_on_alloc(gfp_t flags) > > DECLARE_STATIC_KEY_MAYBE(CONFIG_INIT_ON_FREE_DEFAULT_ON, init_on_free); > > static inline bool want_init_on_free(void) > > { > > - return static_branch_unlikely(&init_on_free); > > + return static_branch_maybe(CONFIG_INIT_ON_FREE_DEFAULT_ON, > > + &init_on_free); > > } > > > > extern bool _debug_pagealloc_enabled_early; > > Should we also update slab_want_init_on_alloc() and slab_want_init_on_free()? Whoops! Thank you; I will update and resend. :) -- Kees Cook _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel