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.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 299E1C56202 for ; Thu, 12 Nov 2020 14:42:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8109B2224D for ; Thu, 12 Nov 2020 14:42:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8109B2224D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 877F36B0072; Thu, 12 Nov 2020 09:42:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 801C16B0073; Thu, 12 Nov 2020 09:42:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6CC5F6B0074; Thu, 12 Nov 2020 09:42:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0130.hostedemail.com [216.40.44.130]) by kanga.kvack.org (Postfix) with ESMTP id 3B7BB6B0072 for ; Thu, 12 Nov 2020 09:42:57 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id CDD9B181AEF0B for ; Thu, 12 Nov 2020 14:42:56 +0000 (UTC) X-FDA: 77476033152.25.meal91_0610e3c27307 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id A9FA21804E3A0 for ; Thu, 12 Nov 2020 14:42:56 +0000 (UTC) X-HE-Tag: meal91_0610e3c27307 X-Filterd-Recvd-Size: 4651 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Thu, 12 Nov 2020 14:42:56 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id D6BE8AB95; Thu, 12 Nov 2020 14:42:54 +0000 (UTC) Subject: Re: [PATCH v2 3/5] kernel/power: allow hibernation with page_poison sanity checking To: David Hildenbrand , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Alexander Potapenko , Kees Cook , Michal Hocko , Mateusz Nosek , Laura Abbott , "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org References: <20201103152237.9853-1-vbabka@suse.cz> <20201103152237.9853-4-vbabka@suse.cz> From: Vlastimil Babka Message-ID: <7811e5ec-c7ae-09a9-7f90-45e14956c4c4@suse.cz> Date: Thu, 12 Nov 2020 15:39:05 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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 11/11/20 4:42 PM, David Hildenbrand wrote: ... >> @@ -1152,12 +1152,18 @@ void clear_free_pages(void) >> if (WARN_ON(!(free_pages_map))) >> return; >> >> - if (IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) || want_init_on_free()) { >> + if (page_poisoning_enabled() || want_init_on_free()) { >> memory_bm_position_reset(bm); >> pfn = memory_bm_next_pfn(bm); >> while (pfn != BM_END_OF_MAP) { >> - if (pfn_valid(pfn)) >> - clear_highpage(pfn_to_page(pfn)); >> + if (pfn_valid(pfn)) { >> + struct page *page = pfn_to_page(pfn); > > ^ empty line missing. And at least I prefer to declare all variables in > the function header. > > I'd even suggest to move this into a separate function like > > clear_or_poison_free_page(struct page *page) > > Ok, fixup below. ----8<---- From cae1e8ccfa57c28ed1b2f5f8a47319b86cbdcfbf Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Thu, 12 Nov 2020 15:33:07 +0100 Subject: [PATCH] kernel/power: allow hibernation with page_poison sanity checking-fix Adapt to __kernel_unpoison_pages fixup. Split out clear_or_poison_free_page() per David Hildenbrand. Signed-off-by: Vlastimil Babka --- include/linux/mm.h | 1 + kernel/power/snapshot.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 861b9392b5dc..d4cfb06a611e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2896,6 +2896,7 @@ static inline void kernel_unpoison_pages(struct page *page, int numpages) #else static inline bool page_poisoning_enabled(void) { return false; } static inline bool page_poisoning_enabled_static(void) { return false; } +static inline void __kernel_poison_pages(struct page *page, int nunmpages) { } static inline void kernel_poison_pages(struct page *page, int numpages) { } static inline void kernel_unpoison_pages(struct page *page, int numpages) { } #endif diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 6b1c84afa891..a3491b29c5cc 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1144,6 +1144,14 @@ void free_basic_memory_bitmaps(void) pr_debug("Basic memory bitmaps freed\n"); } +static void clear_or_poison_free_page(struct page *page) +{ + if (page_poisoning_enabled_static()) + __kernel_poison_pages(page, 1); + else if (want_init_on_free()) + clear_highpage(page); +} + void clear_or_poison_free_pages(void) { struct memory_bitmap *bm = free_pages_map; @@ -1156,14 +1164,8 @@ void clear_or_poison_free_pages(void) memory_bm_position_reset(bm); pfn = memory_bm_next_pfn(bm); while (pfn != BM_END_OF_MAP) { - if (pfn_valid(pfn)) { - struct page *page = pfn_to_page(pfn); - if (page_poisoning_enabled_static()) - kernel_poison_pages(page, 1); - else if (want_init_on_free()) - clear_highpage(page); - - } + if (pfn_valid(pfn)) + clear_or_poison_free_page(pfn_to_page(pfn)); pfn = memory_bm_next_pfn(bm); } -- 2.29.1