[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/10] linux-user: init_guest_space: Don't try to al
From: |
Luke Shumaker |
Subject: |
[Qemu-devel] [PATCH 08/10] linux-user: init_guest_space: Don't try to align if we'll reject it |
Date: |
Thu, 28 Dec 2017 13:08:11 -0500 |
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>
---
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 5c0ad65611..1b7583d659 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1871,6 +1871,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
@@ -1905,11 +1910,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.15.1
- [Qemu-devel] [PATCH 00/10] linux-user: Speed up guest space initialization on 32-bit ARM target, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 02/10] linux-user: Rename validate_guest_space => init_guest_commpage, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 06/10] linux-user: init_guest_commpage: Add a comment about size check, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 05/10] linux-user: init_guest_space: Clarify page alignment logic, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 04/10] linux-user: init_guest_space: Correctly handle guest_start in commpage initialization, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 03/10] linux-user: init_guest_space: Clean up if we can't initialize the commpage, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 08/10] linux-user: init_guest_space: Don't try to align if we'll reject it,
Luke Shumaker <=
- [Qemu-devel] [PATCH 10/10] linux-user: init_guest_space: Try to make ARM space+commpage continuous, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 01/10] linux-user: Use #if to only call validate_guest_space for 32-bit ARM target, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 07/10] linux-user: init_guest_space: Clean up control flow a bit, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 09/10] linux-user: init_guest_space: Add a comment about search strategy, Luke Shumaker, 2017/12/28