From: David Hildenbrand <david@redhat.com>
To: Sergei Trofimovich <slyfox@gentoo.org>,
Vlastimil Babka <vbabka@suse.cz>,
Andrew Morton <akpm@linux-foundation.org>,
Andrey Konovalov <andreyknvl@gmail.com>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux-mm@kvack.org
Subject: Re: [PATCH v3] mm: page_alloc: ignore init_on_free=1 for debug_pagealloc=1
Date: Tue, 30 Mar 2021 10:39:40 +0200 [thread overview]
Message-ID: <181e57b8-d606-e974-47d4-7cceebfdfc87@redhat.com> (raw)
In-Reply-To: <20210329222555.3077928-1-slyfox@gentoo.org>
On 30.03.21 00:25, Sergei Trofimovich wrote:
> On !ARCH_SUPPORTS_DEBUG_PAGEALLOC (like ia64) debug_pagealloc=1
> implies page_poison=on:
>
> if (page_poisoning_enabled() ||
> (!IS_ENABLED(CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC) &&
> debug_pagealloc_enabled()))
> static_branch_enable(&_page_poisoning_enabled);
>
> page_poison=on needs to override init_on_free=1.
>
> Before the change it did not work as expected for the following case:
> - have PAGE_POISONING=y
> - have page_poison unset
> - have !ARCH_SUPPORTS_DEBUG_PAGEALLOC arch (like ia64)
> - have init_on_free=1
> - have debug_pagealloc=1
>
> That way we get both keys enabled:
> - static_branch_enable(&init_on_free);
> - static_branch_enable(&_page_poisoning_enabled);
>
> which leads to poisoned pages returned for __GFP_ZERO pages.
>
> After the change we execute only:
> - static_branch_enable(&_page_poisoning_enabled);
> and ignore init_on_free=1.
>
> Acked-by: Vlastimil Babka <vbabka@suse.cz>
> Fixes: 8db26a3d4735 ("mm, page_poison: use static key more efficiently")
> Cc: <stable@vger.kernel.org>
> CC: Andrew Morton <akpm@linux-foundation.org>
> CC: linux-mm@kvack.org
> CC: David Hildenbrand <david@redhat.com>
> CC: Andrey Konovalov <andreyknvl@gmail.com>
> Link: https://lkml.org/lkml/2021/3/26/443
>
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
> ---
> Change since v2:
> - Added 'Fixes:' and 'CC: stable@' suggested by Vlastimil and David
> - Renamed local variable to 'page_poisoning_requested' for
> consistency suggested by David
> - Simplified initialization of page_poisoning_requested suggested
> by David
> - Added 'Acked-by: Vlastimil'
>
> mm/page_alloc.c | 30 +++++++++++++++++-------------
> 1 file changed, 17 insertions(+), 13 deletions(-)
>
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index cfc72873961d..4bb3cdfc47f8 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -764,32 +764,36 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
> */
> void init_mem_debugging_and_hardening(void)
> {
> + bool page_poisoning_requested = false;
> +
> +#ifdef CONFIG_PAGE_POISONING
> + /*
> + * Page poisoning is debug page alloc for some arches. If
> + * either of those options are enabled, enable poisoning.
> + */
> + if (page_poisoning_enabled() ||
> + (!IS_ENABLED(CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC) &&
> + debug_pagealloc_enabled())) {
> + static_branch_enable(&_page_poisoning_enabled);
> + page_poisoning_requested = true;
> + }
> +#endif
> +
> if (_init_on_alloc_enabled_early) {
> - if (page_poisoning_enabled())
> + if (page_poisoning_requested)
> pr_info("mem auto-init: CONFIG_PAGE_POISONING is on, "
> "will take precedence over init_on_alloc\n");
> else
> static_branch_enable(&init_on_alloc);
> }
> if (_init_on_free_enabled_early) {
> - if (page_poisoning_enabled())
> + if (page_poisoning_requested)
> pr_info("mem auto-init: CONFIG_PAGE_POISONING is on, "
> "will take precedence over init_on_free\n");
> else
> static_branch_enable(&init_on_free);
> }
>
> -#ifdef CONFIG_PAGE_POISONING
> - /*
> - * Page poisoning is debug page alloc for some arches. If
> - * either of those options are enabled, enable poisoning.
> - */
> - if (page_poisoning_enabled() ||
> - (!IS_ENABLED(CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC) &&
> - debug_pagealloc_enabled()))
> - static_branch_enable(&_page_poisoning_enabled);
> -#endif
> -
> #ifdef CONFIG_DEBUG_PAGEALLOC
> if (!debug_pagealloc_enabled())
> return;
>
Thanks!
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
prev parent reply other threads:[~2021-03-30 8:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 11:26 [PATCH] mm: page_alloc: ignore init_on_free=1 for page alloc Sergei Trofimovich
2021-03-26 13:48 ` David Hildenbrand
2021-03-26 15:00 ` Andrey Konovalov
2021-03-26 16:42 ` Sergei Trofimovich
2021-03-29 12:10 ` Vlastimil Babka
2021-03-29 22:00 ` Andrey Konovalov
2021-03-29 22:07 ` Vlastimil Babka
2021-03-30 14:48 ` Andrey Konovalov
2021-03-26 14:17 ` Vlastimil Babka
2021-03-26 17:25 ` Sergei Trofimovich
2021-03-27 18:03 ` Sergei Trofimovich
2021-03-27 18:21 ` [PATCH v2] mm: page_alloc: ignore init_on_free=1 for debug_pagealloc=1 Sergei Trofimovich
2021-03-29 9:23 ` David Hildenbrand
2021-03-29 11:59 ` Vlastimil Babka
2021-03-29 22:25 ` [PATCH v3] " Sergei Trofimovich
2021-03-30 8:39 ` David Hildenbrand [this message]
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=181e57b8-d606-e974-47d4-7cceebfdfc87@redhat.com \
--to=david@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=slyfox@gentoo.org \
--cc=stable@vger.kernel.org \
--cc=vbabka@suse.cz \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).