| Message ID | 20240102015808.132373-21-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-user: Improve host and guest page size handling | expand |
On 1/2/24 05:57, Richard Henderson wrote: > For reserved_va, place all non-fixed maps then proceed > as for MAP_FIXED. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > linux-user/mmap.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/linux-user/mmap.c b/linux-user/mmap.c > index cc983bedbd..42eb3eb2b4 100644 > --- a/linux-user/mmap.c > +++ b/linux-user/mmap.c > @@ -540,17 +540,19 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len, > host_offset = offset & -host_page_size; > > /* > - * If the user is asking for the kernel to find a location, do that > - * before we truncate the length for mapping files below. > + * For reserved_va, we are in full control of the allocation. > + * Find a suitible hole and convert to MAP_FIXED. > */ > - if (!(flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { > + if (reserved_va && !(flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { > host_len = len + offset - host_offset; > - host_len = ROUND_UP(host_len, host_page_size); > - start = mmap_find_vma(real_start, host_len, TARGET_PAGE_SIZE); > + start = mmap_find_vma(real_start, host_len, > + MAX(host_page_size, TARGET_PAGE_SIZE)); > if (start == (abi_ulong)-1) { > errno = ENOMEM; > return -1; > } > + start += offset - host_offset; > + flags |= MAP_FIXED; > } > > /* Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
On Tue, Jan 02, 2024 at 12:57:55PM +1100, Richard Henderson wrote: > For reserved_va, place all non-fixed maps then proceed > as for MAP_FIXED. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > linux-user/mmap.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/linux-user/mmap.c b/linux-user/mmap.c > index cc983bedbd..42eb3eb2b4 100644 > --- a/linux-user/mmap.c > +++ b/linux-user/mmap.c > @@ -540,17 +540,19 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len, > host_offset = offset & -host_page_size; > > /* > - * If the user is asking for the kernel to find a location, do that > - * before we truncate the length for mapping files below. > + * For reserved_va, we are in full control of the allocation. > + * Find a suitible hole and convert to MAP_FIXED. suitable? [...] Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
diff --git a/linux-user/mmap.c b/linux-user/mmap.c index cc983bedbd..42eb3eb2b4 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -540,17 +540,19 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len, host_offset = offset & -host_page_size; /* - * If the user is asking for the kernel to find a location, do that - * before we truncate the length for mapping files below. + * For reserved_va, we are in full control of the allocation. + * Find a suitible hole and convert to MAP_FIXED. */ - if (!(flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { + if (reserved_va && !(flags & (MAP_FIXED | MAP_FIXED_NOREPLACE))) { host_len = len + offset - host_offset; - host_len = ROUND_UP(host_len, host_page_size); - start = mmap_find_vma(real_start, host_len, TARGET_PAGE_SIZE); + start = mmap_find_vma(real_start, host_len, + MAX(host_page_size, TARGET_PAGE_SIZE)); if (start == (abi_ulong)-1) { errno = ENOMEM; return -1; } + start += offset - host_offset; + flags |= MAP_FIXED; } /*
For reserved_va, place all non-fixed maps then proceed as for MAP_FIXED. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- linux-user/mmap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)