mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exec: Rename guest_{addr,range}_valid to *_untagged

Browse Source 
The places that use these are better off using untagged
addresses, so do not provide a tagged versions.  Rename
to make it clear about the address type.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210212184902.1251044-16-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2021-02-12 10:48:46 -08:00 committed by Peter Maydell
parent 114556c533
commit 46b12f461c
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accel/tcg/user-exec.c
View File

@ -213,7 +213,8 @@ static int probe_access_internal(CPUArchState *env, target_ulong addr,
g_assert_not_reached(); g_assert_not_reached();
} }
if (!guest_addr_valid(addr) || page_check_range(addr, 1, flags) < 0) { if (!guest_addr_valid_untagged(addr) ||
page_check_range(addr, 1, flags) < 0) {
if (nonfault) { if (nonfault) {
return TLB_INVALID_MASK; return TLB_INVALID_MASK;
} else { } else {

4
include/exec/cpu_ldst.h
View File

@ -87,12 +87,12 @@ static inline void *g2h(CPUState *cs, abi_ptr x)
return g2h_untagged(cpu_untagged_addr(cs, x)); return g2h_untagged(cpu_untagged_addr(cs, x));
} }
static inline bool guest_addr_valid(abi_ulong x) static inline bool guest_addr_valid_untagged(abi_ulong x)
{ {
return x <= GUEST_ADDR_MAX; return x <= GUEST_ADDR_MAX;
} }
static inline bool guest_range_valid(abi_ulong start, abi_ulong len) static inline bool guest_range_valid_untagged(abi_ulong start, abi_ulong len)
{ {
return len - 1 <= GUEST_ADDR_MAX && start <= GUEST_ADDR_MAX - len + 1; return len - 1 <= GUEST_ADDR_MAX && start <= GUEST_ADDR_MAX - len + 1;
} }

14
linux-user/mmap.c
View File

@ -119,7 +119,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int target_prot)
} }
len = TARGET_PAGE_ALIGN(len); len = TARGET_PAGE_ALIGN(len);
end = start + len; end = start + len;
if (!guest_range_valid(start, len)) { if (!guest_range_valid_untagged(start, len)) {
return -TARGET_ENOMEM; return -TARGET_ENOMEM;
} }
if (len == 0) { if (len == 0) {
@ -528,7 +528,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int target_prot,
* It can fail only on 64-bit host with 32-bit target. * It can fail only on 64-bit host with 32-bit target.
* On any other target/host host mmap() handles this error correctly. * On any other target/host host mmap() handles this error correctly.
*/ */
if (end < start || !guest_range_valid(start, len)) { if (end < start || !guest_range_valid_untagged(start, len)) {
errno = ENOMEM; errno = ENOMEM;
goto fail; goto fail;
} }
@ -669,7 +669,7 @@ int target_munmap(abi_ulong start, abi_ulong len)
if (start & ~TARGET_PAGE_MASK) if (start & ~TARGET_PAGE_MASK)
return -TARGET_EINVAL; return -TARGET_EINVAL;
len = TARGET_PAGE_ALIGN(len); len = TARGET_PAGE_ALIGN(len);
if (len == 0 || !guest_range_valid(start, len)) { if (len == 0 || !guest_range_valid_untagged(start, len)) {
return -TARGET_EINVAL; return -TARGET_EINVAL;
} }
@ -727,11 +727,11 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
int prot; int prot;
void *host_addr; void *host_addr;
if (!guest_range_valid(old_addr, old_size) || if (!guest_range_valid_untagged(old_addr, old_size) ||
((flags & MREMAP_FIXED) && ((flags & MREMAP_FIXED) &&
!guest_range_valid(new_addr, new_size)) || !guest_range_valid_untagged(new_addr, new_size)) ||
((flags & MREMAP_MAYMOVE) == 0 && ((flags & MREMAP_MAYMOVE) == 0 &&
!guest_range_valid(old_addr, new_size))) { !guest_range_valid_untagged(old_addr, new_size))) {
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;
} }
@ -779,7 +779,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
if (host_addr != MAP_FAILED) { if (host_addr != MAP_FAILED) {
/* Check if address fits target address space */ /* Check if address fits target address space */
if (!guest_range_valid(h2g(host_addr), new_size)) { if (!guest_range_valid_untagged(h2g(host_addr), new_size)) {
/* Revert mremap() changes */ /* Revert mremap() changes */
host_addr = mremap(g2h_untagged(old_addr), host_addr = mremap(g2h_untagged(old_addr),
new_size, old_size, flags); new_size, old_size, flags);

4
linux-user/qemu.h
View File

@ -494,8 +494,8 @@ extern unsigned long guest_stack_size;
static inline bool access_ok(int type, abi_ulong addr, abi_ulong size) static inline bool access_ok(int type, abi_ulong addr, abi_ulong size)
{ {
if (size == 0 if (size == 0
? !guest_addr_valid(addr) ? !guest_addr_valid_untagged(addr)
: !guest_range_valid(addr, size)) { : !guest_range_valid_untagged(addr, size)) {
return false; return false;
} }
return page_check_range((target_ulong)addr, size, type) == 0; return page_check_range((target_ulong)addr, size, type) == 0;

2
linux-user/syscall.c
View File

@ -4619,7 +4619,7 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env,
return -TARGET_EINVAL; return -TARGET_EINVAL;
} }
} }
if (!guest_range_valid(shmaddr, shm_info.shm_segsz)) { if (!guest_range_valid_untagged(shmaddr, shm_info.shm_segsz)) {
return -TARGET_EINVAL; return -TARGET_EINVAL;
} }