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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A11EBC25B07 for ; Mon, 8 Aug 2022 01:34:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E19D08E0001; Sun, 7 Aug 2022 21:34:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC10E8E0005; Sun, 7 Aug 2022 21:34:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C3E298E0001; Sun, 7 Aug 2022 21:34:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9449E8E0005 for ; Sun, 7 Aug 2022 21:34:27 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6EAD01C5CDD for ; Mon, 8 Aug 2022 01:34:27 +0000 (UTC) X-FDA: 79774705374.16.7F58B63 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id 0974D40164 for ; Mon, 8 Aug 2022 01:34:26 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2D17A60CF6; Mon, 8 Aug 2022 01:34:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7EB5AC4347C; Mon, 8 Aug 2022 01:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922465; bh=JtrVEr5W6o4PTfK4Bmq8esY7T57/MzFocy7PfA1w1aE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WYyIycURzuMnap5flovGBRkJKnfzeZSdCHMxZJs6sOKBsFabdMoXRM7drqwKv5Xqn eDgTB5GNNP1vu9f+2S0uB4Q0OB3rkNiLW629t9OZ1iqRgo2sgGIuhuggIxTEPW4g7x B3Bd7KADlZAvn26fKGu/6X2CY6T63NrvecFgCu3oGHRn5Z+XCXsVAe7KG6S6nN0/zW mk8DUw5TB/cdrYSuV+wksW3WTv/csCrPP/QPYoKneqVHaAeDDG37RfZHTMVM3on33s HmeImyWGlNSmL/zRx2AFr9cuZ+5vu5d77y6sePuITrA2f/De/GY1f5cpaukDUeiFfV bwUIeyToj1r3g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Catalin Marinas , Andrey Ryabinin , Andrey Konovalov , Peter Collingbourne , Vincenzo Frascino , Will Deacon , Sasha Levin , linux-mm@kvack.org Subject: [PATCH AUTOSEL 5.18 10/53] mm: kasan: Skip page unpoisoning only if __GFP_SKIP_KASAN_UNPOISON Date: Sun, 7 Aug 2022 21:33:05 -0400 Message-Id: <20220808013350.314757-10-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013350.314757-1-sashal@kernel.org> References: <20220808013350.314757-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659922467; a=rsa-sha256; cv=none; b=2A3t48VyvGftb8NVb9ZlO3lmiHAjHgSMWiVNz3GfqSrkaRC0C+g4tJax76062gqz5z09Mw WVsgaffuCe6GhilZpN6U6LWDT8lyfXE1bUSH0PEwXM4o1TevTCHndmaO0GqNhINxRQGqjX phLbEvsbAXx/pFTFTAJCAkuSyLt/WUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659922467; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=go2vGQ/BQ9FIjKfHcEpehXUIHrp7Cwm9sS6B+KwpMwA=; b=jGdipmIVJ6z3mpW6eyKpyrRU4h46F0s2HjT/0kdbpWkQOmy6Z80yQNTmL9L7psdIhIFCBN g4M1LS6bxRTlN6zftBlAGeTK39FxXAIFP9yocTJGYYRrLNK1QeCF4xQGLPv3soicZASPQH er2E21yJ4l9Vg05QjYO4j8BrP9v5Ar0= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=WYyIycUR; spf=pass (imf04.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Stat-Signature: 1z9dada8rcm9khbwyniact8jnhpi8hfj X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 0974D40164 Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=WYyIycUR; spf=pass (imf04.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-HE-Tag: 1659922466-332423 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: Catalin Marinas [ Upstream commit 6d05141a393071e104bf5be5ad4d0c79c6dff343 ] Currently post_alloc_hook() skips the kasan unpoisoning if the tags will be zeroed (__GFP_ZEROTAGS) or __GFP_SKIP_KASAN_UNPOISON is passed. Since __GFP_ZEROTAGS is now accompanied by __GFP_SKIP_KASAN_UNPOISON, remove the extra check. Signed-off-by: Catalin Marinas Cc: Andrey Ryabinin Cc: Andrey Konovalov Cc: Peter Collingbourne Cc: Vincenzo Frascino Reviewed-by: Vincenzo Frascino Reviewed-by: Andrey Konovalov Link: https://lore.kernel.org/r/20220610152141.2148929-4-catalin.marinas@arm.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- mm/page_alloc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index edef84efba76..2a894ba742e4 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2346,7 +2346,7 @@ static inline bool check_new_pcp(struct page *page, unsigned int order) } #endif /* CONFIG_DEBUG_VM */ -static inline bool should_skip_kasan_unpoison(gfp_t flags, bool init_tags) +static inline bool should_skip_kasan_unpoison(gfp_t flags) { /* Don't skip if a software KASAN mode is enabled. */ if (IS_ENABLED(CONFIG_KASAN_GENERIC) || @@ -2358,12 +2358,10 @@ static inline bool should_skip_kasan_unpoison(gfp_t flags, bool init_tags) return true; /* - * With hardware tag-based KASAN enabled, skip if either: - * - * 1. Memory tags have already been cleared via tag_clear_highpage(). - * 2. Skipping has been requested via __GFP_SKIP_KASAN_UNPOISON. + * With hardware tag-based KASAN enabled, skip if this has been + * requested via __GFP_SKIP_KASAN_UNPOISON. */ - return init_tags || (flags & __GFP_SKIP_KASAN_UNPOISON); + return flags & __GFP_SKIP_KASAN_UNPOISON; } static inline bool should_skip_init(gfp_t flags) @@ -2415,7 +2413,7 @@ inline void post_alloc_hook(struct page *page, unsigned int order, /* Note that memory is already initialized by the loop above. */ init = false; } - if (!should_skip_kasan_unpoison(gfp_flags, init_tags)) { + if (!should_skip_kasan_unpoison(gfp_flags)) { /* Unpoison shadow memory or set memory tags. */ kasan_unpoison_pages(page, order, init); -- 2.35.1