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 AAB26C19F2A for ; Mon, 8 Aug 2022 01:32:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 473278E0003; Sun, 7 Aug 2022 21:32:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3FB338E0001; Sun, 7 Aug 2022 21:32:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 24E2B8E0003; Sun, 7 Aug 2022 21:32:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 133F88E0001 for ; Sun, 7 Aug 2022 21:32:08 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BFC94408DC for ; Mon, 8 Aug 2022 01:32:07 +0000 (UTC) X-FDA: 79774699494.04.7C56BF1 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf29.hostedemail.com (Postfix) with ESMTP id 41E43120150 for ; Mon, 8 Aug 2022 01:32:07 +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 63C7160DD1; Mon, 8 Aug 2022 01:32:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0B1FC433C1; Mon, 8 Aug 2022 01:32:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922326; bh=C0/FhI6A70p6eEbFTQN5lW3PuelL2uWqCL1sY+gWr34=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OUhrUkEq0djna6IlENyy1IfX9AAeV+w6EZ+G07V+oZYL2I3njOLShI097N9Psgg4e VX9biirTOqKl/Inbc8CJMkMmX4kuFreaFfLuuzV7Ec0nKGeRsrqTJSzkG39nhVfZhO aGDH2vjcHbyv1UBvOOg1QmXpqkbKOIi1bpyVov6SHXQg5uKA1HZUc7IyUOcX9c/sQq o3LN36a8iYFxHBhBXkdcUERwxYO2XOKuxbWLAfTQBcPDkTKQlXhJsTsEK+d7zupIGj wx6Nz9p3rrS0+QyHOv9l8ai2gS7P/yFDltibnqRbc7w5IaXYOxD+qi10u/6Y3AbXch cNfw4mNjhhN0Q== 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.19 12/58] mm: kasan: Skip page unpoisoning only if __GFP_SKIP_KASAN_UNPOISON Date: Sun, 7 Aug 2022 21:30:30 -0400 Message-Id: <20220808013118.313965-12-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013118.313965-1-sashal@kernel.org> References: <20220808013118.313965-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=1659922327; a=rsa-sha256; cv=none; b=w+qlyljpSuS8IndoAvDspQegixcrCxALqJWsgtSCfrTbHmuYhveNdM3uAXRxLBxL/H1jCx qweRDhxauwmnBwOt74GgP+DB3Vd1LDgW3xahUCH+8qnNeuyfrsXTgvyuttGigadSoJgZXq pNVJ8qXD/bsrcnp/Nd0e7PEVaAliLP4= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OUhrUkEq; spf=pass (imf29.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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659922327; 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=6p7N1WWtUWB+JLzAmBm6zO8g+cuTOJ1GUqEV5zvoeNE=; b=A654tMQNi8oH0TsK+E4j4jI8eM9+r+32IfWAciVqtdzgdLDs3AxdtskIBjZrK3HFj4MQ7F tqYYV7Kfk8ek5PfFkd9AvoeFzrEffkV1cLS1ufBN1m/HugNDfqwco9qctv3Jz6fVdE7yz4 WHPHqyHL7ss2RTM/RNxQMKT85CAqt1o= X-Stat-Signature: g9xoyio1tq8ii5q7cmeqmoxoez8xro65 X-Rspamd-Queue-Id: 41E43120150 Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OUhrUkEq; spf=pass (imf29.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-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1659922327-168086 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 4d5c30dc757f..b0bcab50f0a3 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2361,7 +2361,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) || @@ -2373,12 +2373,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) @@ -2430,7 +2428,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