From: Steven Price <steven.price@arm.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Marc Zyngier <maz@kernel.org>, Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
Peter Maydell <peter.maydell@linaro.org>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Andrew Jones <drjones@redhat.com>, Haibo Xu <Haibo.Xu@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
qemu-devel@nongnu.org, Dave Martin <Dave.Martin@arm.com>,
Juan Quintela <quintela@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
linux-kernel@vger.kernel.org, Steven Price <steven.price@arm.com>,
James Morse <james.morse@arm.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v14 2/8] arm64: Handle MTE tags zeroing in __alloc_zeroed_user_highpage()
Date: Mon, 7 Jun 2021 12:08:10 +0100 [thread overview]
Message-ID: <20210607110816.25762-3-steven.price@arm.com> (raw)
In-Reply-To: <20210607110816.25762-1-steven.price@arm.com>
From: Catalin Marinas <catalin.marinas@arm.com>
Currently, on an anonymous page fault, the kernel allocates a zeroed
page and maps it in user space. If the mapping is tagged (PROT_MTE),
set_pte_at() additionally clears the tags under a spinlock to avoid a
race on the page->flags. In order to optimise the lock, clear the page
tags on allocation in __alloc_zeroed_user_highpage() if the vma flags
have VM_MTE set.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Steven Price <steven.price@arm.com>
---
arch/arm64/include/asm/page.h | 6 ++++--
arch/arm64/mm/fault.c | 21 +++++++++++++++++++++
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h
index 012cffc574e8..97853570d0f1 100644
--- a/arch/arm64/include/asm/page.h
+++ b/arch/arm64/include/asm/page.h
@@ -13,6 +13,7 @@
#ifndef __ASSEMBLY__
#include <linux/personality.h> /* for READ_IMPLIES_EXEC */
+#include <linux/types.h>
#include <asm/pgtable-types.h>
struct page;
@@ -28,8 +29,9 @@ void copy_user_highpage(struct page *to, struct page *from,
void copy_highpage(struct page *to, struct page *from);
#define __HAVE_ARCH_COPY_HIGHPAGE
-#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
- alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
+struct page *__alloc_zeroed_user_highpage(gfp_t movableflags,
+ struct vm_area_struct *vma,
+ unsigned long vaddr);
#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
#define clear_user_page(page, vaddr, pg) clear_page(page)
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 871c82ab0a30..5a03428e97f3 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -921,3 +921,24 @@ void do_debug_exception(unsigned long addr_if_watchpoint, unsigned int esr,
debug_exception_exit(regs);
}
NOKPROBE_SYMBOL(do_debug_exception);
+
+/*
+ * Used during anonymous page fault handling.
+ */
+struct page *__alloc_zeroed_user_highpage(gfp_t movableflags,
+ struct vm_area_struct *vma,
+ unsigned long vaddr)
+{
+ struct page *page;
+ bool tagged = system_supports_mte() && (vma->vm_flags & VM_MTE);
+
+ page = alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma,
+ vaddr);
+ if (tagged && page) {
+ mte_clear_page_tags(page_address(page));
+ page_kasan_tag_reset(page);
+ set_bit(PG_mte_tagged, &page->flags);
+ }
+
+ return page;
+}
--
2.20.1
next prev parent reply other threads:[~2021-06-07 11:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 11:08 [PATCH v14 0/8] MTE support for KVM guest Steven Price
2021-06-07 11:08 ` [PATCH v14 1/8] arm64: mte: Handle race when synchronising tags Steven Price
2021-06-09 10:30 ` Marc Zyngier
2021-06-09 10:51 ` Steven Price
2021-06-09 11:19 ` Marc Zyngier
2021-06-09 17:41 ` Catalin Marinas
2021-06-10 8:05 ` Steven Price
2021-06-10 14:07 ` Catalin Marinas
2021-06-07 11:08 ` Steven Price [this message]
2021-06-07 17:07 ` [PATCH v14 2/8] arm64: Handle MTE tags zeroing in __alloc_zeroed_user_highpage() Catalin Marinas
2021-06-09 8:56 ` Steven Price
2021-06-07 11:08 ` [PATCH v14 3/8] arm64: mte: Sync tags for pages where PTE is untagged Steven Price
2021-06-07 11:08 ` [PATCH v14 4/8] KVM: arm64: Introduce MTE VM feature Steven Price
2021-06-07 11:08 ` [PATCH v14 5/8] KVM: arm64: Save/restore MTE registers Steven Price
2021-06-07 11:08 ` [PATCH v14 6/8] KVM: arm64: Expose KVM_ARM_CAP_MTE Steven Price
2021-06-07 11:08 ` [PATCH v14 7/8] KVM: arm64: ioctl to fetch/store tags in a guest Steven Price
2021-06-07 17:21 ` Catalin Marinas
2021-06-07 11:08 ` [PATCH v14 8/8] KVM: arm64: Document MTE capability and ioctl Steven Price
2021-06-07 17:32 ` Catalin Marinas
2021-06-09 8:56 ` Steven Price
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210607110816.25762-3-steven.price@arm.com \
--to=steven.price@arm.com \
--cc=Dave.Martin@arm.com \
--cc=Haibo.Xu@arm.com \
--cc=catalin.marinas@arm.com \
--cc=dgilbert@redhat.com \
--cc=drjones@redhat.com \
--cc=james.morse@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=richard.henderson@linaro.org \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).