QEMU-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [PATCH v7 24/31] linux-user/aarch64: Implement PROT_MTE
Date: Fri, 12 Feb 2021 10:48:55 -0800
Message-ID: <20210212184902.1251044-25-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210212184902.1251044-1-richard.henderson@linaro.org>

Remember the PROT_MTE bit as PAGE_MTE/PAGE_TARGET_2.
Otherwise this does not yet have effect.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/exec/cpu-all.h    |  1 +
 linux-user/syscall_defs.h |  1 +
 target/arm/cpu.h          |  1 +
 linux-user/mmap.c         | 22 ++++++++++++++--------
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index d6ad774c01..09b9be845d 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -284,6 +284,7 @@ extern intptr_t qemu_host_page_mask;
 #endif
 /* Target-specific bits that will be used via page_get_flags().  */
 #define PAGE_TARGET_1  0x0080
+#define PAGE_TARGET_2  0x0200
 
 #if defined(CONFIG_USER_ONLY)
 void page_dump(FILE *f);
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index f98c1c1c8d..46a960fccb 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1311,6 +1311,7 @@ struct target_winsize {
 
 #ifdef TARGET_AARCH64
 #define TARGET_PROT_BTI         0x10
+#define TARGET_PROT_MTE         0x20
 #endif
 
 /* Common */
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 72a0819eb8..efa1618c4d 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -3608,6 +3608,7 @@ static inline MemTxAttrs *typecheck_memtxattrs(MemTxAttrs *x)
  * AArch64 usage of the PAGE_TARGET_* bits for linux-user.
  */
 #define PAGE_BTI  PAGE_TARGET_1
+#define PAGE_MTE  PAGE_TARGET_2
 
 #ifdef TARGET_TAGGED_ADDRESSES
 /**
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 6690384752..85e218ab1d 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -84,18 +84,24 @@ static int validate_prot_to_pageflags(int *host_prot, int prot)
                | (prot & PROT_EXEC ? PROT_READ : 0);
 
 #ifdef TARGET_AARCH64
-    /*
-     * The PROT_BTI bit is only accepted if the cpu supports the feature.
-     * Since this is the unusual case, don't bother checking unless
-     * the bit has been requested.  If set and valid, record the bit
-     * within QEMU's page_flags.
-     */
-    if (prot & TARGET_PROT_BTI) {
+    {
         ARMCPU *cpu = ARM_CPU(thread_cpu);
-        if (cpu_isar_feature(aa64_bti, cpu)) {
+
+        /*
+         * The PROT_BTI bit is only accepted if the cpu supports the feature.
+         * Since this is the unusual case, don't bother checking unless
+         * the bit has been requested.  If set and valid, record the bit
+         * within QEMU's page_flags.
+         */
+        if ((prot & TARGET_PROT_BTI) && cpu_isar_feature(aa64_bti, cpu)) {
             valid |= TARGET_PROT_BTI;
             page_flags |= PAGE_BTI;
         }
+        /* Similarly for the PROT_MTE bit. */
+        if ((prot & TARGET_PROT_MTE) && cpu_isar_feature(aa64_mte, cpu)) {
+            valid |= TARGET_PROT_MTE;
+            page_flags |= PAGE_MTE;
+        }
     }
 #endif
 
-- 
2.25.1



  parent reply index

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-12 18:48 [PATCH v7 00/31] target-arm: Implement ARMv8.5-MemTag, user mode Richard Henderson
2021-02-12 18:48 ` [PATCH v7 01/31] tcg: Introduce target-specific page data for user-only Richard Henderson
2021-02-12 18:48 ` [PATCH v7 02/31] linux-user: Introduce PAGE_ANON Richard Henderson
2021-02-12 18:48 ` [PATCH v7 03/31] exec: Use uintptr_t for guest_base Richard Henderson
2021-02-12 18:58   ` Philippe Mathieu-Daudé
2021-02-12 18:48 ` [PATCH v7 04/31] exec: Use uintptr_t in cpu_ldst.h Richard Henderson
2021-02-12 19:05   ` Philippe Mathieu-Daudé
2021-02-12 18:48 ` [PATCH v7 05/31] exec: Improve types for guest_addr_valid Richard Henderson
2021-02-12 19:07   ` Philippe Mathieu-Daudé
2021-02-12 18:48 ` [PATCH v7 06/31] linux-user: Check for overflow in access_ok Richard Henderson
2021-02-12 18:48 ` [PATCH v7 07/31] linux-user: Tidy VERIFY_READ/VERIFY_WRITE Richard Henderson
2021-02-12 18:48 ` [PATCH v7 08/31] bsd-user: " Richard Henderson
2021-02-12 18:48 ` [PATCH v7 09/31] linux-user: Do not use guest_addr_valid for h2g_valid Richard Henderson
2021-02-12 18:48 ` [PATCH v7 10/31] linux-user: Fix guest_addr_valid vs reserved_va Richard Henderson
2021-02-12 18:48 ` [PATCH v7 11/31] exec: Introduce cpu_untagged_addr Richard Henderson
2021-02-12 18:48 ` [PATCH v7 12/31] exec: Use cpu_untagged_addr in g2h; split out g2h_untagged Richard Henderson
2021-02-12 18:48 ` [PATCH v7 13/31] linux-user: Explicitly untag memory management syscalls Richard Henderson
2021-02-12 18:48 ` [PATCH v7 14/31] linux-user: Use guest_range_valid in access_ok Richard Henderson
2021-02-12 18:48 ` [PATCH v7 15/31] exec: Rename guest_{addr,range}_valid to *_untagged Richard Henderson
2021-02-12 18:48 ` [PATCH v7 16/31] linux-user: Use cpu_untagged_addr in access_ok; split out *_untagged Richard Henderson
2021-02-12 18:48 ` [PATCH v7 17/31] linux-user: Move lock_user et al out of line Richard Henderson
2021-02-12 20:35   ` Philippe Mathieu-Daudé
2021-02-16 12:57   ` Peter Maydell
2021-02-12 18:48 ` [PATCH v7 18/31] linux-user: Fix types in uaccess.c Richard Henderson
2021-02-12 20:34   ` Philippe Mathieu-Daudé
2021-02-12 18:48 ` [PATCH v7 19/31] linux-user: Handle tags in lock_user/unlock_user Richard Henderson
2021-02-12 18:48 ` [PATCH v7 20/31] linux-user/aarch64: Implement PR_TAGGED_ADDR_ENABLE Richard Henderson
2021-02-12 18:48 ` [PATCH v7 21/31] target/arm: Improve gen_top_byte_ignore Richard Henderson
2021-02-12 18:48 ` [PATCH v7 22/31] target/arm: Use the proper TBI settings for linux-user Richard Henderson
2021-02-12 18:48 ` [PATCH v7 23/31] linux-user/aarch64: Implement PR_MTE_TCF and PR_MTE_TAG Richard Henderson
2021-02-12 18:48 ` Richard Henderson [this message]
2021-02-12 18:48 ` [PATCH v7 25/31] target/arm: Split out syndrome.h from internals.h Richard Henderson
2021-02-12 19:07   ` Philippe Mathieu-Daudé
2021-02-12 18:48 ` [PATCH v7 26/31] linux-user/aarch64: Pass syndrome to EXC_*_ABORT Richard Henderson
2021-02-12 18:48 ` [PATCH v7 27/31] linux-user/aarch64: Signal SEGV_MTESERR for sync tag check fault Richard Henderson
2021-02-12 18:48 ` [PATCH v7 28/31] linux-user/aarch64: Signal SEGV_MTEAERR for async tag check error Richard Henderson
2021-02-12 18:49 ` [PATCH v7 29/31] target/arm: Add allocation tag storage for user mode Richard Henderson
2021-02-12 18:49 ` [PATCH v7 30/31] target/arm: Enable MTE for user-only Richard Henderson
2021-02-12 18:49 ` [PATCH v7 31/31] tests/tcg/aarch64: Add mte smoke tests Richard Henderson
2021-02-12 19:39 ` [PATCH v7 00/31] target-arm: Implement ARMv8.5-MemTag, user mode no-reply
2021-02-16 13:49 ` Peter Maydell

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=20210212184902.1251044-25-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.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

QEMU-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git
	git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git
	git clone --mirror https://lore.kernel.org/qemu-devel/2 qemu-devel/git/2.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \
		qemu-devel@nongnu.org
	public-inbox-index qemu-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git