Commit 2b40d231 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.1-pull-request' into staging 



Add statx
Fix netlink with IFLA_BR_MULTI_BOOLOPT
Fix mips (EXCP_FPE, struct flock)

# gpg: Signature made Tue 02 Jul 2019 16:05:18 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-4.1-pull-request:
  linux-user: move QEMU_IFLA_BR_MULTI_BOOLOPT to the good function
  linux-user: Handle EXCP_FPE properly for MIPS
  linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK
  linux-user: Fix target_flock structure for MIPS O64 ABI
  linux-user: Add support for strace for statx() syscall
  linux-user: Add support for translation of statx() syscall

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 374f63f6 01154f79

linux-user/fd-trans.c

+6 −6
Original line number Diff line number Diff line
@@ -483,6 +483,12 @@ static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr, 
    case QEMU_IFLA_BR_ROOT_ID:

    case QEMU_IFLA_BR_BRIDGE_ID:

        break;

    /* br_boolopt_multi { uint32_t, uint32_t } */

    case QEMU_IFLA_BR_MULTI_BOOLOPT:

        u32 = NLA_DATA(nlattr);

        u32[0] = tswap32(u32[0]); /* optval */

        u32[1] = tswap32(u32[1]); /* optmask */

        break;

    default:

        gemu_log("Unknown QEMU_IFLA_BR type %d\n", nlattr->nla_type);

        break;
@@ -546,12 +552,6 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, 
    case QEMU_IFLA_BRPORT_ROOT_ID:

    case QEMU_IFLA_BRPORT_BRIDGE_ID:

        break;

    /* br_boolopt_multi { uint32_t, uint32_t } */

    case QEMU_IFLA_BR_MULTI_BOOLOPT:

        u32 = NLA_DATA(nlattr);

        u32[0] = tswap32(u32[0]); /* optval */

        u32[1] = tswap32(u32[1]); /* optmask */

        break;

    default:

        gemu_log("Unknown QEMU_IFLA_BRPORT type %d\n", nlattr->nla_type);

        break;

linux-user/generic/fcntl.h

+5 −3
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ struct target_f_owner_ex { 
#define TARGET_F_SHLCK         8

#endif



#ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK

#ifndef TARGET_ARCH_FLOCK_PAD

#define TARGET_ARCH_FLOCK_PAD

#endif
@@ -129,13 +130,12 @@ struct target_flock { 
    short l_whence;

    abi_long l_start;

    abi_long l_len;

#if defined(TARGET_MIPS)

    abi_long l_sysid;

#endif

    int l_pid;

    TARGET_ARCH_FLOCK_PAD

};

#endif



#ifndef TARGET_HAVE_ARCH_STRUCT_FLOCK64

#ifndef TARGET_ARCH_FLOCK64_PAD

#define TARGET_ARCH_FLOCK64_PAD

#endif
@@ -149,3 +149,5 @@ struct target_flock64 { 
    TARGET_ARCH_FLOCK64_PAD

};

#endif



#endif

linux-user/mips/cpu_loop.c

+17 −0
Original line number Diff line number Diff line
@@ -540,6 +540,23 @@ done_syscall: 
            info.si_code = TARGET_ILL_ILLOPC;

            queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

            break;

        case EXCP_FPE:

            info.si_signo = TARGET_SIGFPE;

            info.si_errno = 0;

            info.si_code = TARGET_FPE_FLTUNK;

            if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_INVALID) {

                info.si_code = TARGET_FPE_FLTINV;

            } else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_DIV0) {

                info.si_code = TARGET_FPE_FLTDIV;

            } else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_OVERFLOW) {

                info.si_code = TARGET_FPE_FLTOVF;

            } else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_UNDERFLOW) {

                info.si_code = TARGET_FPE_FLTUND;

            } else if (GET_FP_CAUSE(env->active_fpu.fcr31) & FP_INEXACT) {

                info.si_code = TARGET_FPE_FLTRES;

            }

            queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

            break;

        /* The code below was inspired by the MIPS Linux kernel trap

         * handling code in arch/mips/kernel/traps.c.

         */

linux-user/mips/target_fcntl.h

+15 −2
Original line number Diff line number Diff line
@@ -27,8 +27,21 @@ 
#define TARGET_F_SETOWN        24       /*  for sockets. */

#define TARGET_F_GETOWN        23       /*  for sockets. */



#define TARGET_ARCH_FLOCK_PAD abi_long pad[4];

#define TARGET_ARCH_FLOCK64_PAD

#if (TARGET_ABI_BITS == 32)



struct target_flock {

    short l_type;

    short l_whence;

    abi_long l_start;

    abi_long l_len;

    abi_long l_sysid;

    int l_pid;

    abi_long pad[4];

};



#define TARGET_HAVE_ARCH_STRUCT_FLOCK



#endif



#define TARGET_F_GETLK64       33      /*  using 'struct flock64' */

#define TARGET_F_SETLK64       34

linux-user/strace.c

+86 −0
Original line number Diff line number Diff line
@@ -976,6 +976,76 @@ UNUSED static struct flags msg_flags[] = { 
    FLAG_END,

};



UNUSED static struct flags statx_flags[] = {

#ifdef AT_EMPTY_PATH

    FLAG_GENERIC(AT_EMPTY_PATH),

#endif

#ifdef AT_NO_AUTOMOUNT

    FLAG_GENERIC(AT_NO_AUTOMOUNT),

#endif

#ifdef AT_SYMLINK_NOFOLLOW

    FLAG_GENERIC(AT_SYMLINK_NOFOLLOW),

#endif

#ifdef AT_STATX_SYNC_AS_STAT

    FLAG_GENERIC(AT_STATX_SYNC_AS_STAT),

#endif

#ifdef AT_STATX_FORCE_SYNC

    FLAG_GENERIC(AT_STATX_FORCE_SYNC),

#endif

#ifdef AT_STATX_DONT_SYNC

    FLAG_GENERIC(AT_STATX_DONT_SYNC),

#endif

    FLAG_END,

};



UNUSED static struct flags statx_mask[] = {

/* This must come first, because it includes everything.  */

#ifdef STATX_ALL

    FLAG_GENERIC(STATX_ALL),

#endif

/* This must come second; it includes everything except STATX_BTIME.  */

#ifdef STATX_BASIC_STATS

    FLAG_GENERIC(STATX_BASIC_STATS),

#endif

#ifdef STATX_TYPE

    FLAG_GENERIC(STATX_TYPE),

#endif

#ifdef STATX_MODE

    FLAG_GENERIC(STATX_MODE),

#endif

#ifdef STATX_NLINK

    FLAG_GENERIC(STATX_NLINK),

#endif

#ifdef STATX_UID

    FLAG_GENERIC(STATX_UID),

#endif

#ifdef STATX_GID

    FLAG_GENERIC(STATX_GID),

#endif

#ifdef STATX_ATIME

    FLAG_GENERIC(STATX_ATIME),

#endif

#ifdef STATX_MTIME

    FLAG_GENERIC(STATX_MTIME),

#endif

#ifdef STATX_CTIME

    FLAG_GENERIC(STATX_CTIME),

#endif

#ifdef STATX_INO

    FLAG_GENERIC(STATX_INO),

#endif

#ifdef STATX_SIZE

    FLAG_GENERIC(STATX_SIZE),

#endif

#ifdef STATX_BLOCKS

    FLAG_GENERIC(STATX_BLOCKS),

#endif

#ifdef STATX_BTIME

    FLAG_GENERIC(STATX_BTIME),

#endif

    FLAG_END,

};



/*

 * print_xxx utility functions.  These are used to print syscall

 * parameters in certain format.  All of these have parameter
@@ -2611,6 +2681,22 @@ print_tgkill(const struct syscallname *name, 
}

#endif



#ifdef TARGET_NR_statx

static void

print_statx(const struct syscallname *name,

            abi_long arg0, abi_long arg1, abi_long arg2,

            abi_long arg3, abi_long arg4, abi_long arg5)

{

    print_syscall_prologue(name);

    print_at_dirfd(arg0, 0);

    print_string(arg1, 0);

    print_flags(statx_flags, arg2, 0);

    print_flags(statx_mask, arg3, 0);

    print_pointer(arg4, 1);

    print_syscall_epilogue(name);

}

#endif



/*

 * An array of all of the syscalls we know about

 */