Commit 9abfc88a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/xtensa/tags/20180402-xtensa' into staging 



xtensa-specific fixes for linux-user:

- fix flushing registers for signal processing in call8 and call12 frames;
- fix PC value for restarted syscalls;
- fix sysv IPC structures;
- fix fadvise64 syscall;

generic fixes for linux-user:

- fix QEMU assertion in multithreaded application by calling cpu_copy
  under clone_lock;
- fix mq_getsetattr implementation;
- fix error propagation in clock_gettime;
- implement clock_settime.

# gpg: Signature made Mon 02 Apr 2018 18:07:08 BST
# gpg:                using RSA key 51F9CC91F83FA044
# gpg: Good signature from "Max Filippov <filippov@cadence.com>"
# gpg:                 aka "Max Filippov <max.filippov@cogentembedded.com>"
# gpg:                 aka "Max Filippov <jcmvbkbc@gmail.com>"
# Primary key fingerprint: 2B67 854B 98E5 327D CDEB  17D8 51F9 CC91 F83F A044

* remotes/xtensa/tags/20180402-xtensa:
  target/xtensa: linux-user: fix fadvise64 call
  linux-user: implement clock_settime
  linux-user: fix error propagation in clock_gettime
  target/xtensa: linux-user: fix sysv IPC structures
  linux-user: fix mq_getsetattr implementation
  linux-user: call cpu_copy under clone_lock
  target/xtensa: linux-user: rewind pc for restarted syscall
  target/xtensa: fix flush_window_regs

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 13b65ec5 64a563dd

linux-user/main.c

+3 −0
Original line number Diff line number Diff line
@@ -4006,6 +4006,9 @@ void cpu_loop(CPUXtensaState *env) 
                    break;



                case -TARGET_ERESTARTSYS:

                    env->pc -= 3;

                    break;



                case -TARGET_QEMU_ESIGRETURN:

                    break;

                }

linux-user/signal.c

+24 −31
Original line number Diff line number Diff line
@@ -7094,52 +7094,45 @@ static abi_ulong get_sigframe(struct target_sigaction *sa, 


static int flush_window_regs(CPUXtensaState *env)

{

    const uint32_t nareg_mask = env->config->nareg - 1;

    uint32_t wb = env->sregs[WINDOW_BASE];

    uint32_t ws = (xtensa_replicate_windowstart(env) >> (wb + 1)) &

        ((1 << env->config->nareg / 4) - 1);

    uint32_t d = ctz32(ws) + 1;

    uint32_t sp;

    abi_long ret = 0;



    wb += d;

    ws >>= d;

    uint32_t ws = xtensa_replicate_windowstart(env) >> (wb + 1);

    unsigned d = ctz32(ws) + 1;

    unsigned i;

    int ret = 0;



    xtensa_sync_phys_from_window(env);

    sp = env->phys_regs[(wb * 4 + 1) & nareg_mask];

    for (i = d; i < env->config->nareg / 4; i += d) {

        uint32_t ssp, osp;

        unsigned j;



    while (ws && ret == 0) {

        int d;

        int i;

        int idx;

        ws >>= d;

        xtensa_rotate_window(env, d);



        if (ws & 0x1) {

            ws >>= 1;

            ssp = env->regs[5];

            d = 1;

        } else if (ws & 0x2) {

            ws >>= 2;

            ssp = env->regs[9];

            ret |= get_user_ual(osp, env->regs[1] - 12);

            osp -= 32;

            d = 2;

            for (i = 0; i < 4; ++i) {

                idx = (wb * 4 + 4 + i) & nareg_mask;

                ret |= put_user_ual(env->phys_regs[idx], sp + (i - 12) * 4);

            }

        } else if (ws & 0x4) {

            ws >>= 3;

            ssp = env->regs[13];

            ret |= get_user_ual(osp, env->regs[1] - 12);

            osp -= 48;

            d = 3;

            for (i = 0; i < 8; ++i) {

                idx = (wb * 4 + 4 + i) & nareg_mask;

                ret |= put_user_ual(env->phys_regs[idx], sp + (i - 16) * 4);

            }

        } else {

            g_assert_not_reached();

        }

        sp = env->phys_regs[((wb + d) * 4 + 1) & nareg_mask];

        for (i = 0; i < 4; ++i) {

            idx = (wb * 4 + i) & nareg_mask;

            ret |= put_user_ual(env->phys_regs[idx], sp + (i - 4) * 4);



        for (j = 0; j < 4; ++j) {

            ret |= put_user_ual(env->regs[j], ssp - 16 + j * 4);

        }

        for (j = 4; j < d * 4; ++j) {

            ret |= put_user_ual(env->regs[j], osp - 16 + j * 4);

        }

        wb += d;

    }

    xtensa_rotate_window(env, d);

    g_assert(env->sregs[WINDOW_BASE] == wb);

    return ret == 0;

}

linux-user/syscall.c

+25 −11
Original line number Diff line number Diff line
@@ -6346,6 +6346,10 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp, 


        ts = g_new0(TaskState, 1);

        init_task_state(ts);



        /* Grab a mutex so that thread setup appears atomic.  */

        pthread_mutex_lock(&clone_lock);



        /* we create a new CPU instance. */

        new_env = cpu_copy(env);

        /* Init regs that differ from the parent.  */
@@ -6364,9 +6368,6 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp, 
            cpu_set_tls (new_env, newtls);

        }



        /* Grab a mutex so that thread setup appears atomic.  */

        pthread_mutex_lock(&clone_lock);



        memset(&info, 0, sizeof(info));

        pthread_mutex_init(&info.mutex, NULL);

        pthread_mutex_lock(&info.mutex);
@@ -11508,7 +11509,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 


#ifdef TARGET_NR_fadvise64_64

    case TARGET_NR_fadvise64_64:

#if defined(TARGET_PPC)

#if defined(TARGET_PPC) || defined(TARGET_XTENSA)

        /* 6 args: fd, advice, offset (high, low), len (high, low) */

        ret = arg2;

        arg2 = arg3;
@@ -11877,13 +11878,25 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
        goto unimplemented_nowarn;

#endif



#ifdef TARGET_NR_clock_settime

    case TARGET_NR_clock_settime:

    {

        struct timespec ts;



        ret = target_to_host_timespec(&ts, arg2);

        if (!is_error(ret)) {

            ret = get_errno(clock_settime(arg1, &ts));

        }

        break;

    }

#endif

#ifdef TARGET_NR_clock_gettime

    case TARGET_NR_clock_gettime:

    {

        struct timespec ts;

        ret = get_errno(clock_gettime(arg1, &ts));

        if (!is_error(ret)) {

            host_to_target_timespec(arg2, &ts);

            ret = host_to_target_timespec(arg2, &ts);

        }

        break;

    }
@@ -12091,15 +12104,16 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
        {

            struct mq_attr posix_mq_attr_in, posix_mq_attr_out;

            ret = 0;

            if (arg3 != 0) {

                ret = mq_getattr(arg1, &posix_mq_attr_out);

                copy_to_user_mq_attr(arg3, &posix_mq_attr_out);

            }

            if (arg2 != 0) {

                copy_from_user_mq_attr(&posix_mq_attr_in, arg2);

                ret |= mq_setattr(arg1, &posix_mq_attr_in, &posix_mq_attr_out);

                ret = get_errno(mq_setattr(arg1, &posix_mq_attr_in,

                                           &posix_mq_attr_out));

            } else if (arg3 != 0) {

                ret = get_errno(mq_getattr(arg1, &posix_mq_attr_out));

            }

            if (ret == 0 && arg3 != 0) {

                copy_to_user_mq_attr(arg3, &posix_mq_attr_out);

            }



        }

        break;

#endif

linux-user/xtensa/target_structs.h

+30 −7
Original line number Diff line number Diff line
@@ -8,21 +8,44 @@ struct target_ipc_perm { 
    abi_uint cuid;                      /* Creator's user ID.  */

    abi_uint cgid;                      /* Creator's group ID.  */

    abi_uint mode;                      /* Read/write permission.  */

    abi_ushort __seq;                   /* Sequence number.  */

    abi_ulong __seq;                    /* Sequence number.  */

    abi_ulong __unused1;

    abi_ulong __unused2;

};



struct target_semid64_ds {

  struct target_ipc_perm sem_perm;

#ifdef TARGET_WORDS_BIGENDIAN

  abi_ulong __unused1;

  abi_ulong sem_otime;

  abi_ulong __unused2;

  abi_ulong sem_ctime;

#else

  abi_ulong sem_otime;

  abi_ulong __unused1;

  abi_ulong sem_ctime;

  abi_ulong __unused2;

#endif

  abi_ulong sem_nsems;

  abi_ulong __unused3;

  abi_ulong __unused4;

};

#define TARGET_SEMID64_DS



struct target_shmid_ds {

    struct target_ipc_perm shm_perm;    /* operation permission struct */

    abi_int shm_segsz;                  /* size of segment in bytes */

    abi_long shm_segsz;                 /* size of segment in bytes */

    abi_long shm_atime;                 /* time of last shmat() */

    abi_ulong __unused1;

    abi_long shm_dtime;                 /* time of last shmdt() */

    abi_long shm_ctime;                 /* time of last change by shmctl() */

    abi_ushort shm_cpid;                /* pid of creator */

    abi_ushort shm_lpid;                /* pid of last shmop */

    abi_ushort shm_nattch;              /* number of current attaches */

    abi_ushort shm_unused;              /* compatibility */

    abi_ulong __unused2;

    abi_long shm_ctime;                 /* time of last change by shmctl() */

    abi_ulong __unused3;

    abi_uint shm_cpid;                  /* pid of creator */

    abi_uint shm_lpid;                  /* pid of last shmop */

    abi_ulong shm_nattch;               /* number of current attaches */

    abi_ulong __unused4;

    abi_ulong __unused5;

};



#endif