From: Kees Cook <keescook@chromium.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Alexander Potapenko <glider@google.com>,
Elena Reshetova <elena.reshetova@intel.com>,
x86@kernel.org, Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Popov <alex.popov@linux.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Jann Horn <jannh@google.com>, Vlastimil Babka <vbabka@suse.cz>,
David Hildenbrand <david@redhat.com>,
Mike Rapoport <rppt@linux.ibm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Jonathan Corbet <corbet@lwn.net>,
Randy Dunlap <rdunlap@infradead.org>,
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
Date: Mon, 15 Mar 2021 15:15:27 -0700 [thread overview]
Message-ID: <202103151514.AE11A69683@keescook> (raw)
In-Reply-To: <20210315180229.1224655-3-keescook@chromium.org>
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
WARNING: multiple messages have this Message-ID (diff)
From: Kees Cook <keescook@chromium.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Alexander Potapenko <glider@google.com>,
Elena Reshetova <elena.reshetova@intel.com>,
x86@kernel.org, Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Popov <alex.popov@linux.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Jann Horn <jannh@google.com>, Vlastimil Babka <vbabka@suse.cz>,
David Hildenbrand <david@redhat.com>,
Mike Rapoport <rppt@linux.ibm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Jonathan Corbet <corbet@lwn.net>,
Randy Dunlap <rdunlap@infradead.org>,
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
Date: Mon, 15 Mar 2021 15:15:27 -0700 [thread overview]
Message-ID: <202103151514.AE11A69683@keescook> (raw)
In-Reply-To: <20210315180229.1224655-3-keescook@chromium.org>
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-03-15 22:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 18:02 [PATCH v6 0/6] Optionally randomize kernel stack offset each syscall Kees Cook
2021-03-15 18:02 ` Kees Cook
2021-03-15 18:02 ` [PATCH v6 1/6] jump_label: Provide CONFIG-driven build state defaults Kees Cook
2021-03-15 18:02 ` Kees Cook
2021-03-15 18:02 ` [PATCH v6 2/6] init_on_alloc: Optimize static branches Kees Cook
2021-03-15 18:02 ` Kees Cook
2021-03-15 22:15 ` Kees Cook [this message]
2021-03-15 22:15 ` Kees Cook
2021-03-18 12:46 ` Vlastimil Babka
2021-03-18 12:46 ` Vlastimil Babka
2021-03-15 18:02 ` [PATCH v6 3/6] stack: Optionally randomize kernel stack offset each syscall Kees Cook
2021-03-15 18:02 ` Kees Cook
2021-03-15 18:02 ` [PATCH v6 4/6] x86/entry: Enable random_kstack_offset support Kees Cook
2021-03-15 18:02 ` Kees Cook
2021-03-15 18:02 ` [PATCH v6 5/6] arm64: entry: " Kees Cook
2021-03-15 18:02 ` Kees Cook
2021-03-15 18:02 ` [PATCH v6 6/6] lkdtm: Add REPORT_STACK for checking stack offsets Kees Cook
2021-03-15 18:02 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202103151514.AE11A69683@keescook \
--to=keescook@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=alex.popov@linux.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=david@redhat.com \
--cc=elena.reshetova@intel.com \
--cc=glider@google.com \
--cc=jannh@google.com \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=peterz@infradead.org \
--cc=rdunlap@infradead.org \
--cc=rppt@linux.ibm.com \
--cc=tglx@linutronix.de \
--cc=vbabka@suse.cz \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.