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 02C63C19F2A for ; Mon, 8 Aug 2022 01:34:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 891FE8E0003; Sun, 7 Aug 2022 21:34:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 81D6B8E0001; 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 695408E0003; 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 576208E0001 for ; Sun, 7 Aug 2022 21:34:27 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2D61C4088F for ; Mon, 8 Aug 2022 01:34:27 +0000 (UTC) X-FDA: 79774705374.27.90AFE33 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf24.hostedemail.com (Postfix) with ESMTP id A6B19180173 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 ams.source.kernel.org (Postfix) with ESMTPS id 6BF91B80E0A; Mon, 8 Aug 2022 01:34:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47701C433C1; Mon, 8 Aug 2022 01:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922464; bh=kgAB+hYMrWL6BRi6aNjlpO/7iXT1hjr5DcRiWNx3nuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EV6OGTfE0qLk6HTdmB8z+OMn+hyIkfnDyUeXVFZxB87exBYw2/xFHPYUPZHRnoKpY rKZyKuEcouKDmPZ+ism7aBnKaf4cHTJ+e/LrDnd9U2X+ctjyupX359zFvVH5bPIyB1 /B49ZwSAwlUMz6Bhm8RNllkycL1UfKg6+RnutW2Iy0M8br3qc0tDf9ajBgoz5r2IbA Sznf89BHdCqJBkc0k+ruH8AhsPuRnFCV/BknVAiLpUK7d/WkD8pyo2VfvJXv8otAg9 s3dXP7NMuHZrBp6WHmJ7Ut8YPqUusOOyntRKHfxneGFByyP4w3P3+WC90f7HNBOgIp fTfpcp/NU28Gw== 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 , mark.rutland@arm.com, borntraeger@linux.ibm.com, ebiederm@xmission.com, broonie@kernel.org, peterx@redhat.com, alexandru.elisei@arm.com, zhengqi.arch@bytedance.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Subject: [PATCH AUTOSEL 5.18 09/53] mm: kasan: Skip unpoisoning of user pages Date: Sun, 7 Aug 2022 21:33:04 -0400 Message-Id: <20220808013350.314757-9-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=1659922466; a=rsa-sha256; cv=none; b=iQWPUViEdpGl+TvOAzYTcyqO0pa7AIFJ9BHvsKbduvWlRljnPLt5xraNVheb1nmVGtgPcI X/jNu9/JZElxGcsD4R16CekSB905olFUSJyzzA+rDfzFRIvbSXUhveUq+GDtYWgYI89p8R Jg0+nkgZ9fT939G1Ch64gQiHM1tHq34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659922466; 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=zUYuTwhwAsNKBW3grphNOYAS5a1Yg8eiXgc3ZP3LlZ8=; b=TERGKREuZftYLxldiuaMVM0nLIwLhbXhYKzHN8HeNxjwDKGXtbOYV98SxN+j8FrjdWasFc 2Zzum12a0mhv9rtbP3XEENZOarKDH/3LgjXAzWEv0EGwnh4NYnQEloo/EH7MJlWWvOpZ9r kRB0VsC/ux8DXedeZk7+eG6ecaT3rps= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=EV6OGTfE; spf=pass (imf24.hostedemail.com: domain of sashal@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Stat-Signature: 4amd51my51frndes9pc6xzjz6yzu1urs X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A6B19180173 Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=EV6OGTfE; spf=pass (imf24.hostedemail.com: domain of sashal@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-HE-Tag: 1659922466-324808 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 70c248aca9e7efa85a6664d5ab56c17c326c958f ] Commit c275c5c6d50a ("kasan: disable freed user page poisoning with HW tags") added __GFP_SKIP_KASAN_POISON to GFP_HIGHUSER_MOVABLE. A similar argument can be made about unpoisoning, so also add __GFP_SKIP_KASAN_UNPOISON to user pages. To ensure the user page is still accessible via page_address() without a kasan fault, reset the page->flags tag. With the above changes, there is no need for the arm64 tag_clear_highpage() to reset the page->flags tag. 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-3-catalin.marinas@arm.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/mm/fault.c | 1 - include/linux/gfp.h | 2 +- mm/page_alloc.c | 7 +++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 77341b160aca..f2f21cd6d43f 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -926,6 +926,5 @@ struct page *alloc_zeroed_user_highpage_movable(struct vm_area_struct *vma, void tag_clear_highpage(struct page *page) { mte_zero_clear_page_tags(page_address(page)); - page_kasan_tag_reset(page); set_bit(PG_mte_tagged, &page->flags); } diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 3e3d36fc2109..df0ec30524fb 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -348,7 +348,7 @@ struct vm_area_struct; #define GFP_DMA32 __GFP_DMA32 #define GFP_HIGHUSER (GFP_USER | __GFP_HIGHMEM) #define GFP_HIGHUSER_MOVABLE (GFP_HIGHUSER | __GFP_MOVABLE | \ - __GFP_SKIP_KASAN_POISON) + __GFP_SKIP_KASAN_POISON | __GFP_SKIP_KASAN_UNPOISON) #define GFP_TRANSHUGE_LIGHT ((GFP_HIGHUSER_MOVABLE | __GFP_COMP | \ __GFP_NOMEMALLOC | __GFP_NOWARN) & ~__GFP_RECLAIM) #define GFP_TRANSHUGE (GFP_TRANSHUGE_LIGHT | __GFP_DIRECT_RECLAIM) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5ced6cb260ed..edef84efba76 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2382,6 +2382,7 @@ inline void post_alloc_hook(struct page *page, unsigned int order, bool init = !want_init_on_free() && want_init_on_alloc(gfp_flags) && !should_skip_init(gfp_flags); bool init_tags = init && (gfp_flags & __GFP_ZEROTAGS); + int i; set_page_private(page, 0); set_page_refcounted(page); @@ -2407,8 +2408,6 @@ inline void post_alloc_hook(struct page *page, unsigned int order, * should be initialized as well). */ if (init_tags) { - int i; - /* Initialize both memory and tags. */ for (i = 0; i != 1 << order; ++i) tag_clear_highpage(page + i); @@ -2423,6 +2422,10 @@ inline void post_alloc_hook(struct page *page, unsigned int order, /* Note that memory is already initialized by KASAN. */ if (kasan_has_integrated_init()) init = false; + } else { + /* Ensure page_address() dereferencing does not fault. */ + for (i = 0; i != 1 << order; ++i) + page_kasan_tag_reset(page + i); } /* If memory is still not initialized, do it now. */ if (init) -- 2.35.1