[Qemu-devel] [PATCH v2 1/2] linux-user: fix settime old value location

[Qemu-devel] [PATCH v2 1/2] linux-user: fix settime old value location

[Pranith Kumar]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

old_value is the 4th argument of timer_settime(), not the 2nd.

CC: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[pranith: review comments]
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
 linux-user/syscall.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7b77503f94..724607be43 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -12027,7 +12027,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
             target_to_host_itimerspec(&hspec_new, arg3);
             ret = get_errno(
                           timer_settime(htimer, arg2, &hspec_new, &hspec_old));
-            host_to_target_itimerspec(arg2, &hspec_old);
+            if (arg4 && host_to_target_itimerspec(arg4, &hspec_old)) {
+                goto efault;
+            }
         }
         break;
     }
-- 
2.11.0

[Qemu-devel] [PATCH v2 2/2] linux-user: fix tcg/mmap test

[Pranith Kumar]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

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.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[pranith: dropped checkpatch changes]
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/mmap.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 61685bf79e..d0d494f138 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -429,20 +429,21 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
        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)) {
-- 
2.11.0

Re: [Qemu-devel] [PATCH v2 1/2] linux-user: fix settime old value location

[Laurent Vivier]

Le 18/01/2017 à 20:24, Pranith Kumar a écrit :
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> old_value is the 4th argument of timer_settime(), not the 2nd.
> 
> CC: Laurent Vivier <laurent@vivier.eu>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> [pranith: review comments]
> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  linux-user/syscall.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 7b77503f94..724607be43 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -12027,7 +12027,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
>              target_to_host_itimerspec(&hspec_new, arg3);

as said by Peter in his first comment, target_to_host_itimerspec() can
return -TARGET_EFAULT. You should fix that too.

Thanks,
Laurent

Re: [Qemu-devel] [PATCH v2 1/2] linux-user: fix settime old value location

[Pranith Kumar]

On Wed, Jan 18, 2017 at 2:59 PM, Laurent Vivier <laurent@vivier.eu> wrote:
> Le 18/01/2017 à 20:24, Pranith Kumar a écrit :
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> old_value is the 4th argument of timer_settime(), not the 2nd.
>>
>> CC: Laurent Vivier <laurent@vivier.eu>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> [pranith: review comments]
>> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
>> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>>  linux-user/syscall.c | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
>> index 7b77503f94..724607be43 100644
>> --- a/linux-user/syscall.c
>> +++ b/linux-user/syscall.c
>> @@ -12027,7 +12027,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
>>              target_to_host_itimerspec(&hspec_new, arg3);
>
> as said by Peter in his first comment, target_to_host_itimerspec() can
> return -TARGET_EFAULT. You should fix that too.

Hmm, shoddy job by me. I missed his comments from the first time. Will fix them.

Thanks,
-- 
Pranith