[Qemu-devel] [PULL v2 00/14] Linux user for upstream patches

[Qemu-devel] [PULL v2 00/14] Linux user for upstream patches

[Laurent Vivier]

The following changes since commit 5dae13cd71f0755a1395b5a4cde635b8a6ee3f58:

  Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into staging (2017-02-14 09:55:48 +0000)

are available in the git repository at:

  git://github.com/vivier/qemu.git tags/linux-user-for-upstream-pull-request

for you to fetch changes up to 21992cb6794a5f8edb0cee01bdfe0b03d0438dac:

  linux-user: Add FICLONE and FICLONERANGE ioctls (2017-02-16 15:29:30 +0100)

----------------------------------------------------------------
To help Riku in his maintainer role of linux-user, I've proposed
to help him to manage this pull request.

This series is based on his branch linux-user-for-upstream at:

    https://git.linaro.org/people/riku.voipio/qemu.git

I have added some reviewed patches from the mailing list since
the last pull request.

I have tested this series by creating some containers:

ppc64   fedora-21
ppc     debian-8
aarch64 centos-7.2

All these containers can boot and run as expected
(create an user, log in as this user, install packages with yum/dnf/apt-get
using sudo)

I have tested the LTP-20170116 in the ppc container (big-endian 32bit)
on an x86_64 host (little-endian 64bit). The result is: 

Total Tests: 1111
Total Skipped Tests: 174
Total Failures: 68
Kernel Version: 4.9.5-200.fc25.x86_64
Machine Architecture: ppc
Hostname: debian-8-ppc

v2:
    Fix John Paul Adrian Glaubitz author name
----------------------------------------------------------------

Helge Deller (1):
  linux-user: Add FICLONE and FICLONERANGE ioctls

John Paul Adrian Glaubitz (2):
  linux-user: Update sh4 syscall definitions to match Linux 4.8
  linux-user: Update m68k syscall definitions to match Linux 4.6

Jose Ricardo Ziviani (1):
  linux-user: fill target sigcontext struct accordingly

Laurent Vivier (1):
  linux-user: manage two new IFLA host message types

Lena Djokic (3):
  linux-user: Fix inotify_init1 support
  linux-user: Fix readahead
  linux-user: Fix mq_open

Marc-André Lureau (2):
  linux-user: fix settime old value location
  linux-user: fix tcg/mmap test

Peter Maydell (1):
  linux-user: Use correct types in load_symbols()

Richard Henderson (1):
  linux-user: Fix s390x safe-syscall for z900

Riku Voipio (2):
  linux-user: remove ifdef __USER_MISC
  linux-user: drop __cygwin__ ifdef

 linux-user/elfload.c                     | 22 +++++++++++++++-------
 linux-user/host/s390x/safe-syscall.inc.S |  2 +-
 linux-user/ioctls.h                      |  5 +++++
 linux-user/m68k/syscall_nr.h             |  3 +++
 linux-user/mmap.c                        |  9 +++------
 linux-user/sh4/syscall_nr.h              | 14 ++++++++++++++
 linux-user/signal.c                      |  5 +++++
 linux-user/strace.c                      |  2 --
 linux-user/syscall.c                     | 26 +++++++++++++++++++-------
 linux-user/syscall_defs.h                |  4 ++++
 linux-user/syscall_types.h               |  6 ++++++
 11 files changed, 75 insertions(+), 23 deletions(-)

-- 
2.9.3

[Qemu-devel] [PULL v2 01/14] linux-user: remove ifdef __USER_MISC

[Laurent Vivier]

From: Riku Voipio <riku.voipio@linaro.org>

This preprocessor macro isn't set anywhere. Remove
the check so -strace can show these options.

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/strace.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/linux-user/strace.c b/linux-user/strace.c
index 489dbc9..8fb1b6e 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -90,10 +90,8 @@ if( cmd == val ) { \
     output_cmd( IPC_STAT );
     output_cmd( IPC_INFO );
     /* msgctl() commands */
-    #ifdef __USER_MISC
     output_cmd( MSG_STAT );
     output_cmd( MSG_INFO );
-    #endif
     /* shmctl() commands */
     output_cmd( SHM_LOCK );
     output_cmd( SHM_UNLOCK );
-- 
2.9.3

[Qemu-devel] [PULL v2 02/14] linux-user: drop __cygwin__ ifdef

[Laurent Vivier]

From: Riku Voipio <riku.voipio@linaro.org>

linux-user doesn't work on cygwin anyways.

Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/mmap.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 61685bf..4ed9cad 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -193,9 +193,6 @@ static int mmap_frag(abi_ulong real_start,
 
 #if HOST_LONG_BITS == 64 && TARGET_ABI_BITS == 64
 # define TASK_UNMAPPED_BASE  (1ul << 38)
-#elif defined(__CYGWIN__)
-/* Cygwin doesn't have a whole lot of address space.  */
-# define TASK_UNMAPPED_BASE  0x18000000
 #else
 # define TASK_UNMAPPED_BASE  0x40000000
 #endif
-- 
2.9.3

[Qemu-devel] [PULL v2 03/14] linux-user: Fix s390x safe-syscall for z900

[Laurent Vivier]

From: Richard Henderson <rth@twiddle.net>

The LT instruction was added in the extended immediate facility
introduced with the z9-109 processor.

Cc: Riku Voipio <riku.voipio@iki.fi>
Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Fixes: c9bc3437a905b660561a26cd4ecc64579843267b
Suggested-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/host/s390x/safe-syscall.inc.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/host/s390x/safe-syscall.inc.S b/linux-user/host/s390x/safe-syscall.inc.S
index f1b446a..414b44a 100644
--- a/linux-user/host/s390x/safe-syscall.inc.S
+++ b/linux-user/host/s390x/safe-syscall.inc.S
@@ -72,7 +72,7 @@ safe_syscall_base:
 	 */
 safe_syscall_start:
 	/* if signal_pending is non-zero, don't do the call */
-	lt	%r0,0(%r8)
+	icm	%r0,15,0(%r8)
 	jne	2f
 	svc	0
 safe_syscall_end:
-- 
2.9.3

[Qemu-devel] [PULL v2 04/14] linux-user: Fix inotify_init1 support

[Laurent Vivier]

From: Lena Djokic <Lena.Djokic@rt-rk.com>

This commit adds necessary conversion of argument passed to inotify_init1.
inotify_init1 flags can be IN_NONBLOCK and IN_CLOEXEC which rely on O_NONBLOCK
and O_CLOEXEC and those can have different values on different platforms.

Signed-off-by: Lena Djokic <Lena.Djokic@rt-rk.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/syscall.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9be8e95..fccd631 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11561,7 +11561,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 #ifdef CONFIG_INOTIFY1
 #if defined(TARGET_NR_inotify_init1) && defined(__NR_inotify_init1)
     case TARGET_NR_inotify_init1:
-        ret = get_errno(sys_inotify_init1(arg1));
+        ret = get_errno(sys_inotify_init1(target_to_host_bitmask(arg1,
+                                          fcntl_flags_tbl)));
         break;
 #endif
 #endif
-- 
2.9.3

[Qemu-devel] [PULL v2 05/14] linux-user: Fix readahead

[Laurent Vivier]

From: Lena Djokic <Lena.Djokic@rt-rk.com>

Calculation of 64-bit offset was not correct for all cases.

Signed-off-by: Lena Djokic <Lena.Djokic@rt-rk.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/syscall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index fccd631..3e88dd1 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11228,7 +11228,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
             arg3 = arg4;
             arg4 = arg5;
         }
-        ret = get_errno(readahead(arg1, ((off64_t)arg3 << 32) | arg2, arg4));
+        ret = get_errno(readahead(arg1, target_offset64(arg2, arg3) , arg4));
 #else
         ret = get_errno(readahead(arg1, arg2, arg3));
 #endif
-- 
2.9.3

[Qemu-devel] [PULL v2 06/14] linux-user: Fix mq_open

[Laurent Vivier]

From: Lena Djokic <Lena.Djokic@rt-rk.com>

If fourth argument is NULL it should be passed without
using lock_user function which would, in that case, return
EFAULT, and system call supports passing NULL as fourth argument.

Signed-off-by: Lena Djokic <Lena.Djokic@rt-rk.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/syscall.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 3e88dd1..c1d6f76 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11583,17 +11583,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
     case TARGET_NR_mq_open:
         {
             struct mq_attr posix_mq_attr;
+            struct mq_attr *pposix_mq_attr;
             int host_flags;
 
             host_flags = target_to_host_bitmask(arg2, fcntl_flags_tbl);
-            if (copy_from_user_mq_attr(&posix_mq_attr, arg4) != 0) {
-                goto efault;
+            pposix_mq_attr = NULL;
+            if (arg4) {
+                if (copy_from_user_mq_attr(&posix_mq_attr, arg4) != 0) {
+                    goto efault;
+                }
+                pposix_mq_attr = &posix_mq_attr;
             }
             p = lock_user_string(arg1 - 1);
             if (!p) {
                 goto efault;
             }
-            ret = get_errno(mq_open(p, host_flags, arg3, &posix_mq_attr));
+            ret = get_errno(mq_open(p, host_flags, arg3, pposix_mq_attr));
             unlock_user (p, arg1, 0);
         }
         break;
-- 
2.9.3

[Qemu-devel] [PULL v2 07/14] linux-user: manage two new IFLA host message types

[Laurent Vivier]

Add QEMU_IFLA_GSO_MAX_SEGS and QEMU_IFLA_GSO_MAX_SIZE
in host_to_target_data_link_rtattr().

These two messages are sent by the host kernel when
we use "sudo".

Found with qemu-m68k and Debian etch-m68k (sudo 1.6.8p12-4) and
host kernel 4.7.6-200.fc24.x86_64

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <1477530049-15676-1-git-send-email-laurent@vivier.eu>
---
 linux-user/syscall.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index c1d6f76..d982a27 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2326,6 +2326,8 @@ static abi_long host_to_target_data_link_rtattr(struct rtattr *rtattr)
     case QEMU_IFLA_GROUP:
     case QEMU_IFLA_MASTER:
     case QEMU_IFLA_NUM_VF:
+    case QEMU_IFLA_GSO_MAX_SEGS:
+    case QEMU_IFLA_GSO_MAX_SIZE:
         u32 = RTA_DATA(rtattr);
         *u32 = tswap32(*u32);
         break;
-- 
2.9.3

[Qemu-devel] [PULL v2 08/14] linux-user: Update sh4 syscall definitions to match Linux 4.8

[Laurent Vivier]

From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20170116223140.18634-2-glaubitz@physik.fu-berlin.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/sh4/syscall_nr.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/linux-user/sh4/syscall_nr.h b/linux-user/sh4/syscall_nr.h
index e99f735..d6c1e05 100644
--- a/linux-user/sh4/syscall_nr.h
+++ b/linux-user/sh4/syscall_nr.h
@@ -372,3 +372,17 @@
 #define TARGET_NR_process_vm_writev     366
 #define TARGET_NR_kcmp                  367
 #define TARGET_NR_finit_module          368
+#define TARGET_NR_sched_getattr         369
+#define TARGET_NR_sched_setattr         370
+#define TARGET_NR_renameat2             371
+#define TARGET_NR_seccomp               372
+#define TARGET_NR_getrandom             373
+#define TARGET_NR_memfd_create          374
+#define TARGET_NR_bpf                   375
+#define TARGET_NR_execveat              376
+#define TARGET_NR_userfaultfd           377
+#define TARGET_NR_membarrier            378
+#define TARGET_NR_mlock2                379
+#define TARGET_NR_copy_file_range       380
+#define TARGET_NR_preadv2               381
+#define TARGET_NR_pwritev2              382
-- 
2.9.3

[Qemu-devel] [PULL v2 09/14] linux-user: Update m68k syscall definitions to match Linux 4.6

[Laurent Vivier]

From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20170116224915.19430-2-glaubitz@physik.fu-berlin.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/m68k/syscall_nr.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/linux-user/m68k/syscall_nr.h b/linux-user/m68k/syscall_nr.h
index 4b50fb2..d239551 100644
--- a/linux-user/m68k/syscall_nr.h
+++ b/linux-user/m68k/syscall_nr.h
@@ -376,3 +376,6 @@
 #define TARGET_NR_userfaultfd           373
 #define TARGET_NR_membarrier            374
 #define TARGET_NR_mlock2                375
+#define TARGET_NR_copy_file_range       376
+#define TARGET_NR_preadv2               377
+#define TARGET_NR_pwritev2              378
-- 
2.9.3

[Qemu-devel] [PULL v2 10/14] linux-user: fix settime old value location

[Laurent Vivier]

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

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

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20170119151533.29328-1-bobby.prani@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/syscall.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index d982a27..f569f82 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -12043,10 +12043,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
             timer_t htimer = g_posix_timers[timerid];
             struct itimerspec hspec_new = {{0},}, hspec_old = {{0},};
 
-            target_to_host_itimerspec(&hspec_new, arg3);
+            if (target_to_host_itimerspec(&hspec_new, arg3)) {
+                goto efault;
+            }
             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.9.3

[Qemu-devel] [PULL v2 11/14] linux-user: fix tcg/mmap test

[Laurent Vivier]

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>
Message-Id: <20170119151533.29328-2-bobby.prani@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/mmap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 4ed9cad..4888f53 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -426,9 +426,9 @@ 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;
-- 
2.9.3

[Qemu-devel] [PULL v2 12/14] linux-user: fill target sigcontext struct accordingly

[Laurent Vivier]

From: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com>

A segfault is noticed when an emulated program uses any of ucontext
regs fields. Risu detected this issue in the following operation when
handling a signal:
  ucontext_t *uc = (ucontext_t*)uc;
  uc->uc_mcontext.regs->nip += 4;

but this works fine:
  uc->uc_mcontext.gp_regs[PT_NIP] += 4;

This patch set regs to a valid location as well as other sigcontext
fields.

Signed-off-by: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <1485900317-3256-1-git-send-email-joserz@linux.vnet.ibm.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/signal.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linux-user/signal.c b/linux-user/signal.c
index 5064de0..8209539 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -5155,6 +5155,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
     target_ulong rt_sf_addr, newsp = 0;
     int i, err = 0;
 #if defined(TARGET_PPC64)
+    struct target_sigcontext *sc = 0;
     struct image_info *image = ((TaskState *)thread_cpu->opaque)->info;
 #endif
 
@@ -5183,6 +5184,10 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
 #if defined(TARGET_PPC64)
     mctx = &rt_sf->uc.tuc_sigcontext.mcontext;
     trampptr = &rt_sf->trampoline[0];
+
+    sc = &rt_sf->uc.tuc_sigcontext;
+    __put_user(h2g(mctx), &sc->regs);
+    __put_user(sig, &sc->signal);
 #else
     mctx = &rt_sf->uc.tuc_mcontext;
     trampptr = (uint32_t *)&rt_sf->uc.tuc_mcontext.tramp;
-- 
2.9.3

[Qemu-devel] [PULL v2 13/14] linux-user: Use correct types in load_symbols()

[Laurent Vivier]

From: Peter Maydell <peter.maydell@linaro.org>

Coverity doesn't like the code in load_symbols() which assumes
it can use 'int' for a variable that might hold an offset into
the guest ELF file, because in a 64-bit guest that could
overflow. Guest binaries with 2GB sections aren't very likely
and this isn't a security issue because we fully trust the
guest linux-user binary anyway, but we might as well use the
right types, which will placate Coverity. Use uint64_t to
hold section sizes, and bail out if the symbol table is too
large rather than just overflowing an int.

(Coverity issue CID1005776)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1486249533-5260-1-git-send-email-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/elfload.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 8271227..f520d77 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2262,6 +2262,7 @@ static int symcmp(const void *s0, const void *s1)
 static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias)
 {
     int i, shnum, nsyms, sym_idx = 0, str_idx = 0;
+    uint64_t segsz;
     struct elf_shdr *shdr;
     char *strings = NULL;
     struct syminfo *s = NULL;
@@ -2293,19 +2294,26 @@ static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias)
         goto give_up;
     }
 
-    i = shdr[str_idx].sh_size;
-    s->disas_strtab = strings = g_try_malloc(i);
-    if (!strings || pread(fd, strings, i, shdr[str_idx].sh_offset) != i) {
+    segsz = shdr[str_idx].sh_size;
+    s->disas_strtab = strings = g_try_malloc(segsz);
+    if (!strings ||
+        pread(fd, strings, segsz, shdr[str_idx].sh_offset) != segsz) {
         goto give_up;
     }
 
-    i = shdr[sym_idx].sh_size;
-    syms = g_try_malloc(i);
-    if (!syms || pread(fd, syms, i, shdr[sym_idx].sh_offset) != i) {
+    segsz = shdr[sym_idx].sh_size;
+    syms = g_try_malloc(segsz);
+    if (!syms || pread(fd, syms, segsz, shdr[sym_idx].sh_offset) != segsz) {
         goto give_up;
     }
 
-    nsyms = i / sizeof(struct elf_sym);
+    if (segsz / sizeof(struct elf_sym) > INT_MAX) {
+        /* Implausibly large symbol table: give up rather than ploughing
+         * on with the number of symbols calculation overflowing
+         */
+        goto give_up;
+    }
+    nsyms = segsz / sizeof(struct elf_sym);
     for (i = 0; i < nsyms; ) {
         bswap_sym(syms + i);
         /* Throw away entries which we do not need.  */
-- 
2.9.3

[Qemu-devel] [PULL v2 14/14] linux-user: Add FICLONE and FICLONERANGE ioctls

[Laurent Vivier]

From: Helge Deller <deller@gmx.de>

Add missing FICLONE and FICLONERANGE ioctls.

Signed-off-by: Helge Deller <deller@gmx.de>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20170211222602.GA6399@ls3530.fritz.box>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/ioctls.h        | 5 +++++
 linux-user/syscall_defs.h  | 4 ++++
 linux-user/syscall_types.h | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 2f6e85b..e6997ff 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -112,6 +112,11 @@
 #ifdef FIBMAP
      IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG))
 #endif
+#ifdef FICLONE
+     IOCTL(FICLONE, IOC_W, TYPE_INT)
+     IOCTL(FICLONERANGE, IOC_W, MK_PTR(MK_STRUCT(STRUCT_file_clone_range)))
+#endif
+
 #ifdef FIGETBSZ
      IOCTL(FIGETBSZ, IOC_R, MK_PTR(TYPE_LONG))
 #endif
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 4442c22..72ca5b1 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1086,6 +1086,10 @@ struct target_pollfd {
 
 #define TARGET_FIBMAP     TARGET_IO(0x00,1)  /* bmap access */
 #define TARGET_FIGETBSZ   TARGET_IO(0x00,2)  /* get the block size used for bmap */
+
+#define TARGET_FICLONE    TARGET_IOW(0x94, 9, int)
+#define TARGET_FICLONERANGE TARGET_IOW(0x94, 13, struct file_clone_range)
+
 /* Note that the ioctl numbers claim type "long" but the actual type
  * used by the kernel is "int".
  */
diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
index 2b8c0c6..24631b0 100644
--- a/linux-user/syscall_types.h
+++ b/linux-user/syscall_types.h
@@ -232,6 +232,12 @@ STRUCT(dm_target_versions,
 STRUCT(dm_target_msg,
        TYPE_ULONGLONG) /* sector */
 
+STRUCT(file_clone_range,
+       TYPE_LONGLONG, /* src_fd */
+       TYPE_ULONGLONG, /* src_offset */
+       TYPE_ULONGLONG, /* src_length */
+       TYPE_ULONGLONG) /* dest_offset */
+
 STRUCT(fiemap_extent,
        TYPE_ULONGLONG, /* fe_logical */
        TYPE_ULONGLONG, /* fe_physical */
-- 
2.9.3

Re: [Qemu-devel] [PULL v2 00/14] Linux user for upstream patches

[Peter Maydell]

On 16 February 2017 at 14:38, Laurent Vivier <laurent@vivier.eu> wrote:
> The following changes since commit 5dae13cd71f0755a1395b5a4cde635b8a6ee3f58:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into staging (2017-02-14 09:55:48 +0000)
>
> are available in the git repository at:
>
>   git://github.com/vivier/qemu.git tags/linux-user-for-upstream-pull-request
>
> for you to fetch changes up to 21992cb6794a5f8edb0cee01bdfe0b03d0438dac:
>
>   linux-user: Add FICLONE and FICLONERANGE ioctls (2017-02-16 15:29:30 +0100)
>
> ----------------------------------------------------------------
> To help Riku in his maintainer role of linux-user, I've proposed
> to help him to manage this pull request.
>
> This series is based on his branch linux-user-for-upstream at:
>
>     https://git.linaro.org/people/riku.voipio/qemu.git
>
> I have added some reviewed patches from the mailing list since
> the last pull request.
>
> I have tested this series by creating some containers:
>
> ppc64   fedora-21
> ppc     debian-8
> aarch64 centos-7.2
>
> All these containers can boot and run as expected
> (create an user, log in as this user, install packages with yum/dnf/apt-get
> using sudo)
>
> I have tested the LTP-20170116 in the ppc container (big-endian 32bit)
> on an x86_64 host (little-endian 64bit). The result is:
>
> Total Tests: 1111
> Total Skipped Tests: 174
> Total Failures: 68
> Kernel Version: 4.9.5-200.fc25.x86_64
> Machine Architecture: ppc
> Hostname: debian-8-ppc
>
> v2:
>     Fix John Paul Adrian Glaubitz author name
> ----------------------------------------------------------------

Sorry, I applied v1 before I noticed you'd done this respin :-(

thanks
-- PMM

Re: [Qemu-devel] [PULL v2 00/14] Linux user for upstream patches

[Laurent Vivier]

Le 16/02/2017 à 17:06, Peter Maydell a écrit :
> On 16 February 2017 at 14:38, Laurent Vivier <laurent@vivier.eu> wrote:
>> The following changes since commit 5dae13cd71f0755a1395b5a4cde635b8a6ee3f58:
>>
>>   Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into staging (2017-02-14 09:55:48 +0000)
>>
>> are available in the git repository at:
>>
>>   git://github.com/vivier/qemu.git tags/linux-user-for-upstream-pull-request
>>
>> for you to fetch changes up to 21992cb6794a5f8edb0cee01bdfe0b03d0438dac:
>>
>>   linux-user: Add FICLONE and FICLONERANGE ioctls (2017-02-16 15:29:30 +0100)
>>
>> ----------------------------------------------------------------
>> To help Riku in his maintainer role of linux-user, I've proposed
>> to help him to manage this pull request.
>>
>> This series is based on his branch linux-user-for-upstream at:
>>
>>     https://git.linaro.org/people/riku.voipio/qemu.git
>>
>> I have added some reviewed patches from the mailing list since
>> the last pull request.
>>
>> I have tested this series by creating some containers:
>>
>> ppc64   fedora-21
>> ppc     debian-8
>> aarch64 centos-7.2
>>
>> All these containers can boot and run as expected
>> (create an user, log in as this user, install packages with yum/dnf/apt-get
>> using sudo)
>>
>> I have tested the LTP-20170116 in the ppc container (big-endian 32bit)
>> on an x86_64 host (little-endian 64bit). The result is:
>>
>> Total Tests: 1111
>> Total Skipped Tests: 174
>> Total Failures: 68
>> Kernel Version: 4.9.5-200.fc25.x86_64
>> Machine Architecture: ppc
>> Hostname: debian-8-ppc
>>
>> v2:
>>     Fix John Paul Adrian Glaubitz author name
>> ----------------------------------------------------------------
> 
> Sorry, I applied v1 before I noticed you'd done this respin :-(

It's fine: the tag was the same, and it seems you've applied it after
I've pushed the v2 to the repo.

The author name is correct:

    Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

Thanks,
Laurent

Re: [Qemu-devel] [PULL v2 00/14] Linux user for upstream patches

[no-reply]

Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Subject: [Qemu-devel] [PULL v2 00/14] Linux user for upstream patches
Message-id: 20170216143816.2384-1-laurent@vivier.eu

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

# Useful git options
git config --local diff.renamelimit 0
git config --local diff.renames True

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 * [new tag]         patchew/20170216143816.2384-1-laurent@vivier.eu -> patchew/20170216143816.2384-1-laurent@vivier.eu
Switched to a new branch 'test'
fatal: Not a valid branch point: '7a37b59f1d28e4b4c0f99f49aa305a59986f6643'.
Traceback (most recent call last):
  File "/usr/bin/patchew", line 410, in test_one
    cwd=clone, stdout=logf, stderr=logf)
  File "/usr/lib64/python3.4/subprocess.py", line 561, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'branch', 'base', '7a37b59f1d28e4b4c0f99f49aa305a59986f6643']' returned non-zero exit status 128



---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org

Re: [Qemu-devel] [PULL v2 00/14] Linux user for upstream patches

[no-reply]

Hi,

This series failed automatic build test. Please find the testing commands and
their output below. If you have docker installed, you can probably reproduce it
locally.

Type: series
Subject: [Qemu-devel] [PULL v2 00/14] Linux user for upstream patches
Message-id: 20170216143816.2384-1-laurent@vivier.eu

=== TEST SCRIPT BEGIN ===
#!/bin/bash
set -e
git submodule update --init dtc
# Let docker tests dump environment info
export SHOW_ENV=1
export J=16
make docker-test-quick@centos6
make docker-test-mingw@fedora
make docker-test-build@min-glib
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
fatal: Not a valid branch point: '7a37b59f1d28e4b4c0f99f49aa305a59986f6643'.
Traceback (most recent call last):
  File "/usr/bin/patchew", line 410, in test_one
    cwd=clone, stdout=logf, stderr=logf)
  File "/usr/lib64/python3.4/subprocess.py", line 561, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'branch', 'base', '7a37b59f1d28e4b4c0f99f49aa305a59986f6643']' returned non-zero exit status 128



---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org