[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 02/19] linux-user: fix tcg/mmap test
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH 02/19] linux-user: fix tcg/mmap test |
Date: |
Fri, 09 Dec 2016 17:12:52 +0000 |
User-agent: |
mu4e 0.9.18; emacs 25.1.90.2 |
Pranith Kumar <address@hidden> writes:
> From: Marc-André Lureau <address@hidden>
>
> tests/tcg/mmap test fails with values other than default target page
> size. When creating a map beyond EOF, extra anonymous pages are added up
> to the target page boundary. Currently, this operation is performed only
> when qemu_real_host_page_size < TARGET_PAGE_SIZE, but it should be
> performed if the configured page size (qemu -p) is larger than
> qemu_real_host_page_size too.
>
> (also fixes some style issues to please checkpatch)
>
> Signed-off-by: Marc-André Lureau <address@hidden>
> Signed-off-by: Pranith Kumar <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
but again doesn't really need to be in this series
> ---
> linux-user/mmap.c | 27 ++++++++++++++-------------
> 1 file changed, 14 insertions(+), 13 deletions(-)
>
> diff --git a/linux-user/mmap.c b/linux-user/mmap.c
> index 61685bf..0794a43 100644
> --- a/linux-user/mmap.c
> +++ b/linux-user/mmap.c
> @@ -418,31 +418,32 @@ abi_long target_mmap(abi_ulong start, abi_ulong len,
> int prot,
> }
>
> /* When mapping files into a memory area larger than the file, accesses
> - to pages beyond the file size will cause a SIGBUS.
> + to pages beyond the file size will cause a SIGBUS.
>
> For example, if mmaping a file of 100 bytes on a host with 4K pages
> emulating a target with 8K pages, the target expects to be able to
> access the first 8K. But the host will trap us on any access beyond
> - 4K.
> + 4K.
>
> When emulating a target with a larger page-size than the hosts, we
> may need to truncate file maps at EOF and add extra anonymous pages
> up to the targets page boundary. */
>
> - if ((qemu_real_host_page_size < TARGET_PAGE_SIZE)
> - && !(flags & MAP_ANONYMOUS)) {
> - struct stat sb;
> + if ((qemu_real_host_page_size < qemu_host_page_size) &&
> + !(flags & MAP_ANONYMOUS)) {
> + struct stat sb;
>
> - if (fstat (fd, &sb) == -1)
> - goto fail;
> + if (fstat(fd, &sb) == -1) {
> + goto fail;
> + }
>
> /* Are we trying to create a map beyond EOF?. */
> - if (offset + len > sb.st_size) {
> - /* If so, truncate the file map at eof aligned with
> - the hosts real pagesize. Additional anonymous maps
> - will be created beyond EOF. */
> - len = REAL_HOST_PAGE_ALIGN(sb.st_size - offset);
> - }
> + if (offset + len > sb.st_size) {
> + /* If so, truncate the file map at eof aligned with
> + the hosts real pagesize. Additional anonymous maps
> + will be created beyond EOF. */
> + len = REAL_HOST_PAGE_ALIGN(sb.st_size - offset);
> + }
> }
>
> if (!(flags & MAP_FIXED)) {
--
Alex Bennée
- [Qemu-devel] [PATCH v5 00/19] Cleanup of TCG tests, Pranith Kumar, 2016/12/01
- [Qemu-devel] [PATCH 02/19] linux-user: fix tcg/mmap test, Pranith Kumar, 2016/12/01
- [Qemu-devel] [PATCH 01/19] linux-user: fix settime old value location, Pranith Kumar, 2016/12/01
- [Qemu-devel] [PATCH 04/19] tests/tcg: comment unused code, Pranith Kumar, 2016/12/01
- [Qemu-devel] [PATCH 03/19] check-help: add some hint to run a single test, Pranith Kumar, 2016/12/01
- [Qemu-devel] [PATCH 07/19] linux-test: fix set/getitimer returned timer check, Pranith Kumar, 2016/12/01
- [Qemu-devel] [PATCH 06/19] linux-test: fix build, Pranith Kumar, 2016/12/01