[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/45] linux-user: Handle tags in lock_user/unlock_user
From: |
Peter Maydell |
Subject: |
[PULL 28/45] linux-user: Handle tags in lock_user/unlock_user |
Date: |
Thu, 11 Feb 2021 12:58:43 +0000 |
From: Richard Henderson <richard.henderson@linaro.org>
Resolve the untagged address once, using thread_cpu.
Tidy the DEBUG_REMAP code using glib routines.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20210210000223.884088-20-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
linux-user/uaccess.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/linux-user/uaccess.c b/linux-user/uaccess.c
index 76af6a92b11..c6969130163 100644
--- a/linux-user/uaccess.c
+++ b/linux-user/uaccess.c
@@ -6,36 +6,37 @@
void *lock_user(int type, abi_ulong guest_addr, size_t len, bool copy)
{
+ void *host_addr;
+
+ guest_addr = cpu_untagged_addr(thread_cpu, guest_addr);
if (!access_ok_untagged(type, guest_addr, len)) {
return NULL;
}
+ host_addr = g2h_untagged(guest_addr);
#ifdef DEBUG_REMAP
- {
- void *addr;
- addr = g_malloc(len);
- if (copy) {
- memcpy(addr, g2h(guest_addr), len);
- } else {
- memset(addr, 0, len);
- }
- return addr;
+ if (copy) {
+ host_addr = g_memdup(host_addr, len);
+ } else {
+ host_addr = g_malloc0(len);
}
-#else
- return g2h_untagged(guest_addr);
#endif
+ return host_addr;
}
#ifdef DEBUG_REMAP
void unlock_user(void *host_ptr, abi_ulong guest_addr, size_t len);
{
+ void *host_ptr_conv;
+
if (!host_ptr) {
return;
}
- if (host_ptr == g2h_untagged(guest_addr)) {
+ host_ptr_conv = g2h(thread_cpu, guest_addr);
+ if (host_ptr == host_ptr_conv) {
return;
}
if (len != 0) {
- memcpy(g2h_untagged(guest_addr), host_ptr, len);
+ memcpy(host_ptr_conv, host_ptr, len);
}
g_free(host_ptr);
}
--
2.20.1
- [PULL 23/45] linux-user: Use guest_range_valid in access_ok, (continued)
- [PULL 23/45] linux-user: Use guest_range_valid in access_ok, Peter Maydell, 2021/02/11
- [PULL 21/45] exec: Use cpu_untagged_addr in g2h; split out g2h_untagged, Peter Maydell, 2021/02/11
- [PULL 25/45] linux-user: Use cpu_untagged_addr in access_ok; split out *_untagged, Peter Maydell, 2021/02/11
- [PULL 24/45] exec: Rename guest_{addr,range}_valid to *_untagged, Peter Maydell, 2021/02/11
- [PULL 29/45] linux-user/aarch64: Implement PR_TAGGED_ADDR_ENABLE, Peter Maydell, 2021/02/11
- [PULL 35/45] linux-user/aarch64: Pass syndrome to EXC_*_ABORT, Peter Maydell, 2021/02/11
- [PULL 31/45] target/arm: Use the proper TBI settings for linux-user, Peter Maydell, 2021/02/11
- [PULL 39/45] target/arm: Enable MTE for user-only, Peter Maydell, 2021/02/11
- [PULL 22/45] linux-user: Explicitly untag memory management syscalls, Peter Maydell, 2021/02/11
- [PULL 26/45] linux-user: Move lock_user et al out of line, Peter Maydell, 2021/02/11
- [PULL 28/45] linux-user: Handle tags in lock_user/unlock_user,
Peter Maydell <=
- [PULL 27/45] linux-user: Fix types in uaccess.c, Peter Maydell, 2021/02/11
- [PULL 30/45] target/arm: Improve gen_top_byte_ignore, Peter Maydell, 2021/02/11
- [PULL 32/45] linux-user/aarch64: Implement PR_MTE_TCF and PR_MTE_TAG, Peter Maydell, 2021/02/11
- [PULL 33/45] linux-user/aarch64: Implement PROT_MTE, Peter Maydell, 2021/02/11
- [PULL 34/45] target/arm: Split out syndrome.h from internals.h, Peter Maydell, 2021/02/11
- [PULL 36/45] linux-user/aarch64: Signal SEGV_MTESERR for sync tag check fault, Peter Maydell, 2021/02/11
- [PULL 43/45] tests/qtests: Add npcm7xx emc model test, Peter Maydell, 2021/02/11
- [PULL 41/45] hw/net: Add npcm7xx emc model, Peter Maydell, 2021/02/11
- [PULL 37/45] linux-user/aarch64: Signal SEGV_MTEAERR for async tag check error, Peter Maydell, 2021/02/11
- [PULL 44/45] hw/arm: versal: Use nr_apu_cpus in favor of hard coding 2, Peter Maydell, 2021/02/11