[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 19/31] linux-user: Handle tags in lock_user/unlock_user
From: |
Richard Henderson |
Subject: |
[PATCH v5 19/31] linux-user: Handle tags in lock_user/unlock_user |
Date: |
Wed, 3 Feb 2021 08:59:58 -1000 |
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>
---
linux-user/uaccess.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/linux-user/uaccess.c b/linux-user/uaccess.c
index 30d01f8b30..c696913016 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);
+ if (len != 0) {
+ memcpy(host_ptr_conv, host_ptr, len);
}
g_free(host_ptr);
}
--
2.25.1
- Re: [PATCH v5 13/31] linux-user: Explicitly untag memory management syscalls, (continued)
- [PATCH v5 12/31] exec: Use cpu_untagged_addr in g2h; split out g2h_untagged, Richard Henderson, 2021/02/03
- [PATCH v5 11/31] exec: Introduce cpu_untagged_addr, Richard Henderson, 2021/02/03
- [PATCH v5 19/31] linux-user: Handle tags in lock_user/unlock_user,
Richard Henderson <=
- [PATCH v5 23/31] linux-user/aarch64: Implement PR_MTE_TCF and PR_MTE_TAG, Richard Henderson, 2021/02/03
- [PATCH v5 04/31] exec: Use uintptr_t in cpu_ldst.h, Richard Henderson, 2021/02/03
- [PATCH v5 09/31] linux-user: Do not use guest_addr_valid for h2g_valid, Richard Henderson, 2021/02/03
- [PATCH v5 14/31] linux-user: Use guest_range_valid in access_ok, Richard Henderson, 2021/02/03
- [PATCH v5 16/31] linux-user: Use cpu_untagged_addr in access_ok; split out *_untagged, Richard Henderson, 2021/02/03
- [PATCH v5 15/31] exec: Rename guest_{addr,range}_valid to *_untagged, Richard Henderson, 2021/02/03