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: 12694215 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8543DC433F5 for ; Tue, 30 Nov 2021 21:43:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YjVi5qcT1l6F0T6QnZfHqWL6VYJBY7qI1ytCek9Ms6Q=; b=n1vjXx6CozEIO1 dapqwX25ZTfvULwFwpZJTjoDtXGcHmMCO/ifVJifODeAsjFCuKzEisNeYmSw2jzcCIBUooyJ/K0IZ 2b3dtuWmccEXOr6EEWT2BB0AwJbu8Q/ikoec28h1Y4hhtp8GW+nJOO9KL6awfFQcvmf4Ye2bs6R2D AJ73v7R+8bQ8xSzq9TXEaaRIQ6GwLKLo94Gjql2cBYG8PMiP+Z8OqNhDgG9PG410FRkZ+VR5wexQ4 dU5eY0fqXFSqjO4xv5sz6QjaUQLu5cEKrykfzVgmTBdCy/dtzTpG0huA+Tp9LxqsIZzgplc0/37Q+ VuwLPKIbvbzUVDoiooOg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1msAt1-006mMU-Tz; Tue, 30 Nov 2021 21:42:04 +0000 Received: from out0.migadu.com ([2001:41d0:2:267::]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1msAro-006lwH-QA for linux-arm-kernel@lists.infradead.org; Tue, 30 Nov 2021 21:40:50 +0000 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211130_134049_077557_8A1C49B9 X-CRM114-Status: GOOD ( 11.50 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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); /*