From patchwork Tue Nov 30 22:05:21 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: 12694230 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 963EDC433EF for ; Tue, 30 Nov 2021 22:07:47 +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=vzN578BBnoY5zVZg1jT4BD0NSsMkRRpW24EeVw7T/kI=; b=sTrbGEFTaHrsG+ DkXsG3R3BZQ6Iz8CzvvDm9bE2wT8R2whhX+fEqrdugvDollEHo+eFQxb/09lJLgXzazfuE3FFtenl ytmmVgrPzhXNDR5eGeuVfHqzuFNymcDrVgC9ygeCql78p5O6XrGXNmG3x+ZODV7xBWtMPL2irjADQ WbZmeXZ8DpVhmaj00GettAnISUza5kFEpXB4LptlvLJNa11MBr26moK4g4h6+cmo9lJ6YrEpYcbh/ NcObCQrVIAFEICCXKZUdi7HpEyPy3FZuT12firIGOpuz0b8m5c7tdTf5WGHiy/pJTdJVh4119PZII tn2DjVVk6npgrDw0UwoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1msBGB-006txr-MQ; Tue, 30 Nov 2021 22:05:59 +0000 Received: from out2.migadu.com ([188.165.223.204]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1msBFc-006tm7-UD for linux-arm-kernel@lists.infradead.org; Tue, 30 Nov 2021 22:05:26 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1638309923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Sut+qBc/xV6+rquXwy7nNFMfUaiQqTwNo5aWH6qdopo=; b=WwhQMs8PwhXg9dDZqlZCT7BjyO7SWZPsU4ZwYH1vFkVIBZbfpa6Z83VGLTpJhxQlL7iGAi Y/emAI/e33o2Zc3zJuV+sUrVSl7FQOAQfv7aB/jnfSApRT198Ze8FLgqwnq9vwVJzpD2xS P3z/jaLvrMDttERZ5WtCuA2SarVBSWg= 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 12/31] kasan, page_alloc: move kernel_init_free_pages in post_alloc_hook Date: Tue, 30 Nov 2021 23:05:21 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211130_140525_185746_A2ADFD2C X-CRM114-Status: GOOD ( 12.12 ) 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 Pull the kernel_init_free_pages() call in post_alloc_hook() out of the big if clause for better code readability. This also allows for more simplifications in the following patch. This patch does no functional changes. Signed-off-by: Andrey Konovalov --- mm/page_alloc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c78befc4e057..ba950889f5ea 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2421,14 +2421,18 @@ inline void post_alloc_hook(struct page *page, unsigned int order, init = false; } if (kasan_has_integrated_init()) { - if (!init_tags) + if (!init_tags) { kasan_unpoison_pages(page, order, init); + + /* Note that memory is already initialized by KASAN. */ + init = false; + } } else { kasan_unpoison_pages(page, order, init); - - if (init) - kernel_init_free_pages(page, 1 << order); } + /* If memory is still not initialized, do it now. */ + if (init) + kernel_init_free_pages(page, 1 << order); /* Propagate __GFP_SKIP_KASAN_POISON to page flags. */ if (IS_ENABLED(CONFIG_KASAN_HW_TAGS) && (gfp_flags & __GFP_SKIP_KASAN_POISON))