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 17584C19F2A for ; Mon, 8 Aug 2022 01:32:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB4118E0005; Sun, 7 Aug 2022 21:32:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A3CD58E0001; Sun, 7 Aug 2022 21:32:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DDC38E0005; Sun, 7 Aug 2022 21:32:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7D6AB8E0001 for ; Sun, 7 Aug 2022 21:32:11 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5176B16062A for ; Mon, 8 Aug 2022 01:32:11 +0000 (UTC) X-FDA: 79774699662.13.B0408D5 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf29.hostedemail.com (Postfix) with ESMTP id 7BD12120148 for ; Mon, 8 Aug 2022 01:32:10 +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 sin.source.kernel.org (Postfix) with ESMTPS id 63EBCCE0F6E; Mon, 8 Aug 2022 01:32:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92420C433D6; Mon, 8 Aug 2022 01:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922324; bh=zR12wUi8RY0WfdWWtyBQpmxoI/kb8IcDNKjQXmqjbSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mhMalInAR0Oewih73p7i3b/pMR06z+3JDRxC5qewGmpsoLIAzFdg1XRDs4l3yIGXW E9uMx3BrVLAHVRe5Rg+t8bMxWKnJTRQ72ExYL8oQivF64MWU+bp/iJVacUrmylUrSG PyA9kqJRYzpdt5+D7Yw79jM+sOWou/lgdoU1pFTVIrENfezOLTjzKdHu8+sZ1xNZT5 MA44gevD41Ca231aY9Lc7lq2tlKhwew3W4xja4mXDfyU2t+XfwAvb5jyq4jQsJiFMb JU2x5RGl2/Ww7ZQY/yqhSUH0/1XS8KMo/uf1C6OAPmpBLc01O8d82mDy0NDgkYP+XC DxJLCXlHsF78Q== 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, broonie@kernel.org, ebiederm@xmission.com, zhengqi.arch@bytedance.com, alexandru.elisei@arm.com, peterx@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Subject: [PATCH AUTOSEL 5.19 11/58] mm: kasan: Skip unpoisoning of user pages Date: Sun, 7 Aug 2022 21:30:29 -0400 Message-Id: <20220808013118.313965-11-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=1659922331; a=rsa-sha256; cv=none; b=QJldbaciklEHPMfNURWNSL/HBGN6AzeA6kBuOtRKH8tDamD29/peEqznC1PKZie5a72N/d c2NtUJx6Fo6FDrDRVUHBi1A7341Rl7BSLTUwLFHzB0FJ59mvuJN7CYEirDaOa//cg9g+sb dDbdm17OHhgNKOcxe5AgV31mhHVAnkA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mhMalInA; spf=pass (imf29.hostedemail.com: domain of sashal@kernel.org designates 145.40.73.55 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=1659922331; 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=/O5th34AWcdryKACv+ZaG331w7ZFERtHXRHVSemUIfU=; b=GNDzNcjhG7VoopVPgJReUpIC7llAO/q2Wny+eTyMmhXThDYdB+18eMONkAu2jNSgVX9hbb 1brlNKuRtN2gtDSgW16ZBB1on54e9Ow6wInZivAKimxMKWaSj1YXmyqqjglBhPguOIkvaD uCakgneiH86jP0Gr2uqzmzviUBEJqM8= X-Rspamd-Queue-Id: 7BD12120148 Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mhMalInA; spf=pass (imf29.hostedemail.com: domain of sashal@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: of8gw9faezoqepdpucsumo8xytxemfhz X-HE-Tag: 1659922330-238721 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 c5e11768e5c1..cdf3ffa0c223 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -927,6 +927,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 2d2ccae933c2..0ace7759acd2 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 b5b14b78c4fd..4d5c30dc757f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2397,6 +2397,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); @@ -2422,8 +2423,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); @@ -2438,6 +2437,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