[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/18] linux-user: init_guest_space: Don't try to ali
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 17/18] linux-user: init_guest_space: Don't try to align if we'll reject it |
Date: |
Tue, 13 Mar 2018 18:33:54 +0100 |
From: Luke Shumaker <address@hidden>
If the ensure-alignment code gets triggered, then the
"if (host_start && real_start != current_start)" check will always trigger,
so save 2 syscalls and put that check first.
Note that we can't just switch to using MAP_FIXED for that check, because
then we couldn't differentiate between a failure because "there isn't
enough space" and "there isn't enough space *here*".
Signed-off-by: Luke Shumaker <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/elfload.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index c6491a8d35..5c64299961 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1845,6 +1845,11 @@ unsigned long init_guest_space(unsigned long host_start,
return (unsigned long)-1;
}
+ /* Check to see if the address is valid. */
+ if (host_start && real_start != current_start) {
+ goto try_again;
+ }
+
/* Ensure the address is properly aligned. */
if (real_start & ~qemu_host_page_mask) {
/* Ideally, we adjust like
@@ -1879,11 +1884,6 @@ unsigned long init_guest_space(unsigned long host_start,
aligned_start = real_start;
}
- /* Check to see if the address is valid. */
- if (host_start && aligned_start != current_start) {
- goto try_again;
- }
-
#if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
/* On 32-bit ARM, we need to also be able to map the commpage. */
int valid = init_guest_commpage(aligned_start - guest_start,
--
2.14.3
- [Qemu-devel] [PULL 07/18] linux-user: fix target_mprotect/target_munmap error return values, (continued)
- [Qemu-devel] [PULL 07/18] linux-user: fix target_mprotect/target_munmap error return values, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 06/18] linux-user: fix assertion in shmdt, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 05/18] linux-user: fix mmap/munmap/mprotect/mremap/shmat, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 04/18] linux-user: Support f_flags in statfs when available., Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 09/18] qemu-binfmt-conf.sh: add qemu-xtensa, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 02/18] linux-user: Remove the unused "not implemented" signal handling stubs, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 08/18] linux-user: drop unused target_msync function, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 01/18] linux-user: Drop unicore32 code, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 10/18] linux-user: Use #if to only call validate_guest_space for 32-bit ARM target, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 12/18] linux-user: init_guest_space: Clean up if we can't initialize the commpage, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 17/18] linux-user: init_guest_space: Don't try to align if we'll reject it,
Laurent Vivier <=
- [Qemu-devel] [PULL 14/18] linux-user: init_guest_space: Clarify page alignment logic, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 11/18] linux-user: Rename validate_guest_space => init_guest_commpage, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 16/18] linux-user: init_guest_space: Clean up control flow a bit, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 15/18] linux-user: init_guest_commpage: Add a comment about size check, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 18/18] linux-user: init_guest_space: Add a comment about search strategy, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 13/18] linux-user: init_guest_space: Correctly handle guest_start in commpage initialization, Laurent Vivier, 2018/03/13
- Re: [Qemu-devel] [PULL 00/18] Linux user for 2.12 patches, no-reply, 2018/03/14
- Re: [Qemu-devel] [PULL 00/18] Linux user for 2.12 patches, Peter Maydell, 2018/03/15