From patchwork Tue Nov 30 21:39:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 12648181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA2EAC433F5 for ; Tue, 30 Nov 2021 21:43:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C8CC86B007D; Tue, 30 Nov 2021 16:40:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C15DE6B007E; Tue, 30 Nov 2021 16:40:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB6C26B0080; Tue, 30 Nov 2021 16:40:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0198.hostedemail.com [216.40.44.198]) by kanga.kvack.org (Postfix) with ESMTP id 94D9C6B007D for ; Tue, 30 Nov 2021 16:40:55 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 358E488496 for ; Tue, 30 Nov 2021 21:40:45 +0000 (UTC) X-FDA: 78866916408.11.3CA442E Received: from out0.migadu.com (out0.migadu.com [94.23.1.103]) by imf22.hostedemail.com (Postfix) with ESMTP id B8B1A1901 for ; Tue, 30 Nov 2021 21:40:43 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: andrey.konovalov@linux.dev To: Marco Elver , Alexander Potapenko , Vincenzo Frascino , Catalin Marinas , Peter Collingbourne Cc: Andrey Konovalov , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Andrew Morton , linux-mm@kvack.org, Will Deacon , linux-arm-kernel@lists.infradead.org, Evgenii Stepanov , linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH 05/31] kasan, page_alloc: init memory of skipped pages on free Date: Tue, 30 Nov 2021 22:39:11 +0100 Message-Id: <62e844bae175b9f354cda6f72ba140438e83791a.1638308023.git.andreyknvl@google.com> In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: wsw8ez1d6qoqrjngcmd98y6beyexsw66 X-Rspamd-Queue-Id: B8B1A1901 X-Rspamd-Server: rspam07 Authentication-Results: imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of andrey.konovalov@linux.dev designates 94.23.1.103 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-HE-Tag: 1638308443-324891 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: From: Andrey Konovalov Since commit 7a3b83537188 ("kasan: use separate (un)poison implementation for integrated init"), when all init, kasan_has_integrated_init(), and skip_kasan_poison are true, free_pages_prepare() doesn't initialize the page. This is wrong. Fix it by remembering whether kasan_poison_pages() performed initialization, and call kernel_init_free_pages() if it didn't. Fixes: 7a3b83537188 ("kasan: use separate (un)poison implementation for integrated init") Signed-off-by: Andrey Konovalov --- mm/page_alloc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0673db27dd12..2ada09a58e4b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1360,9 +1360,14 @@ static __always_inline bool free_pages_prepare(struct page *page, * With hardware tag-based KASAN, memory tags must be set before the * page becomes unavailable via debug_pagealloc or arch_free_page. */ - if (!skip_kasan_poison) + if (!skip_kasan_poison) { kasan_poison_pages(page, order, init); - if (init && !kasan_has_integrated_init()) + + /* Memory is already initialized if KASAN did it internally. */ + if (kasan_has_integrated_init()) + init = false; + } + if (init) kernel_init_free_pages(page, 1 << order); /*