From nobody Wed Nov 19 22:24:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1618588072; cv=none; d=zohomail.com; s=zohoarc; b=cN2oS9PKEYebxm0+woxADjxLWQWLkSdqO2pl46duTc72hGncHRud2FjdH0gtn0TmG325UlaqJvP52WLgGO767OWxEG4ki8ipNDYd4uFLVBi6vv5iHsJEGfXuyE78k3tiXNOtjkEEmDgK097a3GcPPTC9UO0WWPYYA61OUEFgSa4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618588072; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=if0vnWyamMhyIJ1S5y+s/TPp7PWolRbGVssSzyJvS6c=; b=VLjL22QuZpuU23QhZhSWt73q1xI0ZOlOs+/SjAo4pmB0dA+IkmMcdAbDMFPQujQ/bNrPLHYCfiHPmNQJyktFXqAVRuxEQ1QxFkJfVDpbzF0ggo7dHr46+x75+n1ylCaWp7kaua6d47USkiAjAqQCvedCiOA0Q92iqjF1E1aqwH4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618588072577999.123733340017; Fri, 16 Apr 2021 08:47:52 -0700 (PDT) Received: from localhost ([::1]:47760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXQhD-0001E1-Ez for importer@patchew.org; Fri, 16 Apr 2021 11:47:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXQd4-0005m4-IK for qemu-devel@nongnu.org; Fri, 16 Apr 2021 11:43:36 -0400 Received: from foss.arm.com ([217.140.110.172]:37196) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXQcw-0005p8-4f for qemu-devel@nongnu.org; Fri, 16 Apr 2021 11:43:34 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5113612FC; Fri, 16 Apr 2021 08:43:25 -0700 (PDT) Received: from e112269-lin.arm.com (autoplooker.cambridge.arm.com [10.1.194.57]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 854F53F99C; Fri, 16 Apr 2021 08:43:22 -0700 (PDT) From: Steven Price To: Catalin Marinas , Marc Zyngier , Will Deacon Subject: [PATCH v11 1/6] arm64: mte: Sync tags for pages where PTE is untagged Date: Fri, 16 Apr 2021 16:43:04 +0100 Message-Id: <20210416154309.22129-2-steven.price@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210416154309.22129-1-steven.price@arm.com> References: <20210416154309.22129-1-steven.price@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=217.140.110.172; envelope-from=steven.price@arm.com; helo=foss.arm.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Peter Maydell , "Dr. David Alan Gilbert" , Andrew Jones , Haibo Xu , Suzuki K Poulose , qemu-devel@nongnu.org, Dave Martin , Juan Quintela , Richard Henderson , linux-kernel@vger.kernel.org, Steven Price , James Morse , Julien Thierry , Thomas Gleixner , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" A KVM guest could store tags in a page even if the VMM hasn't mapped the page with PROT_MTE. So when restoring pages from swap we will need to check to see if there are any saved tags even if !pte_tagged(). However don't check pages which are !pte_valid_user() as these will not have been swapped out. Signed-off-by: Steven Price --- arch/arm64/include/asm/pgtable.h | 2 +- arch/arm64/kernel/mte.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgta= ble.h index e17b96d0e4b5..cf4b52a33b3c 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -312,7 +312,7 @@ static inline void set_pte_at(struct mm_struct *mm, uns= igned long addr, __sync_icache_dcache(pte); =20 if (system_supports_mte() && - pte_present(pte) && pte_tagged(pte) && !pte_special(pte)) + pte_present(pte) && (pte_val(pte) & PTE_USER) && !pte_special(pte)) mte_sync_tags(ptep, pte); =20 __check_racy_pte_update(mm, ptep, pte); diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index b3c70a612c7a..e016ab57ea36 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -26,17 +26,23 @@ u64 gcr_kernel_excl __ro_after_init; =20 static bool report_fault_once =3D true; =20 -static void mte_sync_page_tags(struct page *page, pte_t *ptep, bool check_= swap) +static void mte_sync_page_tags(struct page *page, pte_t *ptep, bool check_= swap, + bool pte_is_tagged) { pte_t old_pte =3D READ_ONCE(*ptep); =20 if (check_swap && is_swap_pte(old_pte)) { swp_entry_t entry =3D pte_to_swp_entry(old_pte); =20 - if (!non_swap_entry(entry) && mte_restore_tags(entry, page)) + if (!non_swap_entry(entry) && mte_restore_tags(entry, page)) { + set_bit(PG_mte_tagged, &page->flags); return; + } } =20 + if (!pte_is_tagged || test_and_set_bit(PG_mte_tagged, &page->flags)) + return; + page_kasan_tag_reset(page); /* * We need smp_wmb() in between setting the flags and clearing the @@ -54,11 +60,13 @@ void mte_sync_tags(pte_t *ptep, pte_t pte) struct page *page =3D pte_page(pte); long i, nr_pages =3D compound_nr(page); bool check_swap =3D nr_pages =3D=3D 1; + bool pte_is_tagged =3D pte_tagged(pte); =20 /* if PG_mte_tagged is set, tags have already been initialised */ for (i =3D 0; i < nr_pages; i++, page++) { - if (!test_and_set_bit(PG_mte_tagged, &page->flags)) - mte_sync_page_tags(page, ptep, check_swap); + if (!test_bit(PG_mte_tagged, &page->flags)) + mte_sync_page_tags(page, ptep, check_swap, + pte_is_tagged); } } =20 --=20 2.20.1