Skip to contentSkip to conversation

target/xtensa: add cpu_set_fcr/fsr helpers to sync fp_status

PATCH In review Matt Turner 4 participants 8 messages Jun 10 – Jun 24

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 target/xtensa: add cpu_set_fcr/fsr helpers to sync fp_status

Factor FCR→fp_status and FSR→fp_status synchronisation out of the wur_fpu{2k,}_fcr/wur_fpu_fsr helpers into cpu_set_fcr(), cpu_set_fsr(), and cpu_get_fsr(). Signal delivery code needs to restore the FP rounding mode and exception flags without duplicating the flag-mapping tables.

cpu_set_fcr() applies the union mask 0xfffff07f (superset of the wur_fpu_fcr mask 0x0000007f and the wur_fpu2k_fcr mask 0xfffff07f) so that FCR bits valid only on fpu2k configs are preserved while MBZ bits 7-11 are always cleared.

---
 target/xtensa/cpu.h        |   4 ++
 target/xtensa/fpu_helper.c | 111 ++++++++++++++++++++-----------------
 2 files changed, 64 insertions(+), 51 deletions(-)
target/xtensa/cpu.h +4 -0
index 75cfeee6e3..442e98bd1b 100644
@@ -642,6 +642,10 @@ static inline void xtensa_select_static_vectors(CPUXtensaState *env,
 }
 void xtensa_runstall(CPUXtensaState *env, bool runstall);
 
+uint32_t cpu_get_fsr(CPUXtensaState *env);
+void cpu_set_fcr(CPUXtensaState *env, uint32_t v);
+void cpu_set_fsr(CPUXtensaState *env, uint32_t v);
+
 #define XTENSA_OPTION_BIT(opt) (((uint64_t)1) << (opt))
 #define XTENSA_OPTION_ALL (~(uint64_t)0)
 
target/xtensa/fpu_helper.c +60 -51

126 lines not on this page · raw message

Signature · 1 line
2.53.0
#1 lore raw

PATCH 2/2 linux-user/xtensa: save/restore FP registers across signal delivery

The Xtensa FCR rounding-mode (RM) bits are not held only in env->uregs[FCR]: they are also reflected into env->fp_status via set_float_rounding_mode(). Similarly, FSR exception flags are mirrored into env->fp_status. Every write to FCR/FSR goes through helper_wur_fpu{2k,}_fcr / helper_wur_fpu_fsr which keep the two in sync.

restore_sigcontext() previously wrote nothing back for xtregs, leaving env->fp_status with whatever rounding mode and exception flags the signal handler last installed. Any FP instruction in the interrupted code could then operate with the wrong mode. FP data registers f0-f15 were also not saved, so any FP operation in the signal handler would silently corrupt them.

Add target_xtensa_xtregs_fp (f[16] as float32, FCR, FSR) for XTENSA_OPTION_FP_COPROCESSOR cores (e.g. dsp3400) and target_xtensa_xtregs_dfp (f[16] as float64, FCR, FSR) for XTENSA_OPTION_DFP_COPROCESSOR cores (e.g. de233_fpu), unioned in the signal frame. setup_sigcontext() saves all FP registers and points sc_xtregs at the sub-frame. restore_sigcontext() restores f0-f15 then calls cpu_set_fcr()/cpu_set_fsr() so fp_status round-trips correctly across signal delivery.

---
Worth noting that the ABI layout issue remains open: QEMU's xtregs structure is self-consistent but doesn't match the real kernel's core-specific opt+user+cp layout, and fixing it properly would require exposing the XCHAL SA list sizes in XtensaConfig.

 linux-user/xtensa/signal.c | 73 +++++++++++++++++++++++++++++++++++---
 1 file changed, 68 insertions(+), 5 deletions(-)
linux-user/xtensa/signal.c +68 -5
index ef8b0c3a27..b8d73468d0 100644
@@ -21,6 +21,7 @@
 #include "user-internals.h"
 #include "signal-common.h"
 #include "linux-user/trace.h"
+#include "target/xtensa/cpu.h"
 
 struct target_sigcontext {
     abi_ulong sc_pc;
@@ -43,10 +44,25 @@ struct target_ucontext {
     target_sigset_t tuc_sigmask;
 };
 
+struct target_xtensa_xtregs_fp {
+    uint32_t f[16];
+    uint32_t fcr;
+    uint32_t fsr;
+};
+
+struct target_xtensa_xtregs_dfp {
+    uint64_t f[16];
+    uint32_t fcr;
+    uint32_t fsr;
+};
+
 struct target_rt_sigframe {
     target_siginfo_t info;
     struct target_ucontext uc;
-    /* TODO: xtregs */
+    union {
+        struct target_xtensa_xtregs_fp fp;
+        struct target_xtensa_xtregs_dfp dfp;
+    } xtregs;
     uint8_t retcode[6];
     abi_ulong window[4];
 };
@@ -107,6 +123,7 @@ static int flush_window_regs(CPUXtensaState *env)
 }
 
 static int setup_sigcontext(struct target_rt_sigframe *frame,
+                            abi_ulong frame_addr,
                             CPUXtensaState *env)
 {
     struct target_sigcontext *sc = &frame->uc.tuc_mcontext;
@@ -123,8 +140,25 @@ static int setup_sigcontext(struct target_rt_sigframe *frame,
     for (i = 0; i < 16; ++i) {
         __put_user(env->regs[i], sc->sc_a + i);
     }
-    __put_user(0, &sc->sc_xtregs);
-    /* TODO: xtregs */
+    if (xtensa_option_enabled(env->config, XTENSA_OPTION_DFP_COPROCESSOR)) {
+        for (i = 0; i < 16; ++i) {
+            __put_user(env->fregs[i].f64, &frame->xtregs.dfp.f[i]);
+        }
+        __put_user(env->uregs[FCR], &frame->xtregs.dfp.fcr);
+        __put_user(cpu_get_fsr(env), &frame->xtregs.dfp.fsr);
+        __put_user(frame_addr + offsetof(struct target_rt_sigframe, xtregs),
+                   &sc->sc_xtregs);
+    } else if (xtensa_option_enabled(env->config, XTENSA_OPTION_FP_COPROCESSOR)) {
+        for (i = 0; i < 16; ++i) {
+            __put_user(env->fregs[i].f32[FP_F32_LOW], &frame->xtregs.fp.f[i]);
+        }
+        __put_user(env->uregs[FCR], &frame->xtregs.fp.fcr);
+        __put_user(cpu_get_fsr(env), &frame->xtregs.fp.fsr);
+        __put_user(frame_addr + offsetof(struct target_rt_sigframe, xtregs),
+                   &sc->sc_xtregs);
+    } else {
+        __put_user(0, &sc->sc_xtregs);
+    }
     return 1;
 }
 
@@ -190,7 +224,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
     __put_user(0, &frame->uc.tuc_flags);
     __put_user(0, &frame->uc.tuc_link);
     target_save_altstack(&frame->uc.tuc_stack, env);
-    if (!setup_sigcontext(frame, env)) {
+    if (!setup_sigcontext(frame, frame_addr, env)) {
         unlock_user_struct(frame, frame_addr, 0);
         goto give_sigsegv;
     }
@@ -266,7 +300,36 @@ static void restore_sigcontext(CPUXtensaState *env,
     for (i = 0; i < 16; ++i) {
         __get_user(env->regs[i], sc->sc_a + i);
     }
-    /* TODO: xtregs */
+    {
+        abi_ulong xtregs_addr;
+
+        __get_user(xtregs_addr, &sc->sc_xtregs);
+        if (xtregs_addr) {
+            if (xtensa_option_enabled(env->config,
+                                      XTENSA_OPTION_DFP_COPROCESSOR)) {
+                uint32_t fcr, fsr;
+
+                for (i = 0; i < 16; ++i) {
+                    __get_user(env->fregs[i].f64, &frame->xtregs.dfp.f[i]);
+                }
+                __get_user(fcr, &frame->xtregs.dfp.fcr);
+                __get_user(fsr, &frame->xtregs.dfp.fsr);
+                cpu_set_fcr(env, fcr);
+                cpu_set_fsr(env, fsr);
+            } else if (xtensa_option_enabled(env->config,
+                                             XTENSA_OPTION_FP_COPROCESSOR)) {
+                uint32_t fcr, fsr;
+
+                for (i = 0; i < 16; ++i) {
+                    __get_user(env->fregs[i].f32[FP_F32_LOW], &frame->xtregs.fp.f[i]);
+                }
+                __get_user(fcr, &frame->xtregs.fp.fcr);
+                __get_user(fsr, &frame->xtregs.fp.fsr);
+                cpu_set_fcr(env, fcr);
+                cpu_set_fsr(env, fsr);
+            }
+        }
+    }
 }
 
 long do_rt_sigreturn(CPUXtensaState *env)
Signature · 1 line
2.53.0
#2 lore raw

Re: [PATCH 2/2] linux-user/xtensa: save/restore FP registers across signal delivery

Quoted 20 lines · Matt Turner
linux-user/xtensa/signal.c +20 -0
+    {
+        abi_ulong xtregs_addr;
+
+        __get_user(xtregs_addr, &sc->sc_xtregs);
+        if (xtregs_addr) {
+            if (xtensa_option_enabled(env->config,
+                                      XTENSA_OPTION_DFP_COPROCESSOR)) {
+                uint32_t fcr, fsr;
+
+                for (i = 0; i < 16; ++i) {
+                    __get_user(env->fregs[i].f64, &frame->xtregs.dfp.f[i]);
+                }
+                __get_user(fcr, &frame->xtregs.dfp.fcr);
+                __get_user(fsr, &frame->xtregs.dfp.fsr);
+                cpu_set_fcr(env, fcr);
+                cpu_set_fsr(env, fsr);
+            } else if (xtensa_option_enabled(env->config,
+                                             XTENSA_OPTION_FP_COPROCESSOR)) {
+                uint32_t fcr, fsr;
+

linux-user/xtensa/signal.c static void restore_sigcontext(CPUXtensaState *env, · line 332

Quoted 10 lines
linux-user/xtensa/signal.c +10 -0
+                for (i = 0; i < 16; ++i) {
+                    __get_user(env->fregs[i].f32[FP_F32_LOW], &frame->xtregs.fp.f[i]);
+                }
+                __get_user(fcr, &frame->xtregs.fp.fcr);
+                __get_user(fsr, &frame->xtregs.fp.fsr);
+                cpu_set_fcr(env, fcr);
+                cpu_set_fsr(env, fsr);
+            }
+        }
+    }

Unlike setup_sigcontext, where you know you're writing into target_rt_sigframe, here you're reading from an arbitrary address. You need to lock the new region.

r~

#3 lore raw

PATCH 2/2 linux-user/xtensa: save/restore FP registers across signal delivery

In reply to Matt Turner

Add support for saving and restoring f0-f15 across signal delivery. The target_xtensa_xtregs_fp struct carries 32-bit f-regs for cores with XTENSA_OPTION_FP_COPROCESSOR; target_xtensa_xtregs_dfp carries 64-bit f-regs for cores with XTENSA_OPTION_DFP_COPROCESSOR.

Lock the xtregs region via lock_user before reading on sigreturn, since sc_xtregs is a user-space pointer that may lie outside the locked sigframe.

---
 linux-user/xtensa/signal.c | 96 ++++++++++++++++++++++++++++++++++----
 1 file changed, 88 insertions(+), 8 deletions(-)
linux-user/xtensa/signal.c +88 -8
index ef8b0c3a27..e3f9da322b 100644
@@ -21,6 +21,7 @@
 #include "user-internals.h"
 #include "signal-common.h"
 #include "linux-user/trace.h"
+#include "target/xtensa/cpu.h"
 
 struct target_sigcontext {
     abi_ulong sc_pc;
@@ -43,10 +44,25 @@ struct target_ucontext {
     target_sigset_t tuc_sigmask;
 };
 
+struct target_xtensa_xtregs_fp {
+    uint32_t f[16];
+    uint32_t fcr;
+    uint32_t fsr;
+};
+
+struct target_xtensa_xtregs_dfp {
+    uint64_t f[16];
+    uint32_t fcr;
+    uint32_t fsr;
+};
+
 struct target_rt_sigframe {
     target_siginfo_t info;
     struct target_ucontext uc;
-    /* TODO: xtregs */
+    union {
+        struct target_xtensa_xtregs_fp fp;
+        struct target_xtensa_xtregs_dfp dfp;
+    } xtregs;
     uint8_t retcode[6];
     abi_ulong window[4];
 };
@@ -107,6 +123,7 @@ static int flush_window_regs(CPUXtensaState *env)
 }
 
 static int setup_sigcontext(struct target_rt_sigframe *frame,
+                            abi_ulong frame_addr,
                             CPUXtensaState *env)
 {
     struct target_sigcontext *sc = &frame->uc.tuc_mcontext;
@@ -123,8 +140,25 @@ static int setup_sigcontext(struct target_rt_sigframe *frame,
     for (i = 0; i < 16; ++i) {
         __put_user(env->regs[i], sc->sc_a + i);
     }
-    __put_user(0, &sc->sc_xtregs);
-    /* TODO: xtregs */
+    if (xtensa_option_enabled(env->config, XTENSA_OPTION_DFP_COPROCESSOR)) {
+        for (i = 0; i < 16; ++i) {
+            __put_user(env->fregs[i].f64, &frame->xtregs.dfp.f[i]);
+        }
+        __put_user(env->uregs[FCR], &frame->xtregs.dfp.fcr);
+        __put_user(cpu_get_fsr(env), &frame->xtregs.dfp.fsr);
+        __put_user(frame_addr + offsetof(struct target_rt_sigframe, xtregs),
+                   &sc->sc_xtregs);
+    } else if (xtensa_option_enabled(env->config, XTENSA_OPTION_FP_COPROCESSOR)) {
+        for (i = 0; i < 16; ++i) {
+            __put_user(env->fregs[i].f32[FP_F32_LOW], &frame->xtregs.fp.f[i]);
+        }
+        __put_user(env->uregs[FCR], &frame->xtregs.fp.fcr);
+        __put_user(cpu_get_fsr(env), &frame->xtregs.fp.fsr);
+        __put_user(frame_addr + offsetof(struct target_rt_sigframe, xtregs),
+                   &sc->sc_xtregs);
+    } else {
+        __put_user(0, &sc->sc_xtregs);
+    }
     return 1;
 }
 
@@ -190,7 +224,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
     __put_user(0, &frame->uc.tuc_flags);
     __put_user(0, &frame->uc.tuc_link);
     target_save_altstack(&frame->uc.tuc_stack, env);
-    if (!setup_sigcontext(frame, env)) {
+    if (!setup_sigcontext(frame, frame_addr, env)) {
         unlock_user_struct(frame, frame_addr, 0);
         goto give_sigsegv;
     }
@@ -243,8 +277,8 @@ give_sigsegv:
     force_sigsegv(sig);
 }
 
-static void restore_sigcontext(CPUXtensaState *env,
-                               struct target_rt_sigframe *frame)
+static int restore_sigcontext(CPUXtensaState *env,
+                              struct target_rt_sigframe *frame)
 {
     struct target_sigcontext *sc = &frame->uc.tuc_mcontext;
     uint32_t ps;
@@ -266,7 +300,51 @@ static void restore_sigcontext(CPUXtensaState *env,
     for (i = 0; i < 16; ++i) {
         __get_user(env->regs[i], sc->sc_a + i);
     }
-    /* TODO: xtregs */
+    {
+        abi_ulong xtregs_addr;
+
+        __get_user(xtregs_addr, &sc->sc_xtregs);
+        if (xtregs_addr) {
+            if (xtensa_option_enabled(env->config,
+                                      XTENSA_OPTION_DFP_COPROCESSOR)) {
+                struct target_xtensa_xtregs_dfp *xtregs;
+                uint32_t fcr, fsr;
+
+                xtregs = lock_user(VERIFY_READ, xtregs_addr,
+                                   sizeof(*xtregs), 1);
+                if (!xtregs) {
+                    return 0;
+                }
+                for (i = 0; i < 16; ++i) {
+                    __get_user(env->fregs[i].f64, &xtregs->f[i]);
+                }
+                __get_user(fcr, &xtregs->fcr);
+                __get_user(fsr, &xtregs->fsr);
+                unlock_user(xtregs, xtregs_addr, 0);
+                cpu_set_fcr(env, fcr);
+                cpu_set_fsr(env, fsr);
+            } else if (xtensa_option_enabled(env->config,
+                                             XTENSA_OPTION_FP_COPROCESSOR)) {
+                struct target_xtensa_xtregs_fp *xtregs;
+                uint32_t fcr, fsr;
+
+                xtregs = lock_user(VERIFY_READ, xtregs_addr,
+                                   sizeof(*xtregs), 1);
+                if (!xtregs) {
+                    return 0;
+                }
+                for (i = 0; i < 16; ++i) {
+                    __get_user(env->fregs[i].f32[FP_F32_LOW], &xtregs->f[i]);
+                }
+                __get_user(fcr, &xtregs->fcr);
+                __get_user(fsr, &xtregs->fsr);
+                unlock_user(xtregs, xtregs_addr, 0);
+                cpu_set_fcr(env, fcr);
+                cpu_set_fsr(env, fsr);
+            }
+        }
+    }
+    return 1;
 }
 
 long do_rt_sigreturn(CPUXtensaState *env)
@@ -282,7 +360,9 @@ long do_rt_sigreturn(CPUXtensaState *env)
     target_to_host_sigset(&set, &frame->uc.tuc_sigmask);
     set_sigmask(&set);
 
-    restore_sigcontext(env, frame);
+    if (!restore_sigcontext(env, frame)) {
+        goto badframe;
+    }
     target_restore_altstack(&frame->uc.tuc_stack, env);
 
     unlock_user_struct(frame, frame_addr, 0);
Signature · 1 line
2.53.0
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] linux-user/xtensa: save/restore FP registers across signal delivery

Quoted 5 lines · Matt Turner

Add support for saving and restoring f0-f15 across signal delivery. The target_xtensa_xtregs_fp struct carries 32-bit f-regs for cores with XTENSA_OPTION_FP_COPROCESSOR; target_xtensa_xtregs_dfp carries 64-bit f-regs for cores with XTENSA_OPTION_DFP_COPROCESSOR.

Quoted 8 lines

Lock the xtregs region via lock_user before reading on sigreturn, since sc_xtregs is a user-space pointer that may lie outside the locked sigframe.

---
  linux-user/xtensa/signal.c | 96 ++++++++++++++++++++++++++++++++++----
  1 file changed, 88 insertions(+), 8 deletions(-)

r~

#5 lore raw

Re: [PATCH 2/2] linux-user/xtensa: save/restore FP registers across signal delivery

In reply to Matt Turner
Quoted 8 lines · Matt Turner

Add support for saving and restoring f0-f15 across signal delivery. The target_xtensa_xtregs_fp struct carries 32-bit f-regs for cores with XTENSA_OPTION_FP_COPROCESSOR; target_xtensa_xtregs_dfp carries 64-bit f-regs for cores with XTENSA_OPTION_DFP_COPROCESSOR.

Lock the xtregs region via lock_user before reading on sigreturn, since sc_xtregs is a user-space pointer that may lie outside the locked sigframe.

Now this is kind of fun.

linux-user/xtensa/signal.c long do_rt_sigreturn(CPUXtensaState *env) · line 365

Quoted 8 lines
linux-user/xtensa/signal.c +3 -1
@@ -282,7 +360,9 @@ long do_rt_sigreturn(CPUXtensaState *env)
      target_to_host_sigset(&set, &frame->uc.tuc_sigmask);
      set_sigmask(&set);
 
-    restore_sigcontext(env, frame);
+    if (!restore_sigcontext(env, frame)) {
+        goto badframe;
+    }

There's another patch for linux-user/xtensa which is queued up for the stable series:

54e08dbe8f linux-user/xtensa: fix unlock of uninitialized frame pointer on sigreturn

This patch (fix unlock of frame pointer) removes goto badframe from this same function. With that patch applied, the compiler complains:

linux-user/xtensa/signal.c: In function ‘do_rt_sigreturn’:
linux-user/xtensa/signal.c:293:1: error: label ‘badframe’ defined but
not used [-Werror=unused-label]
cc1: all warnings being treated as errors

and the build fails.

But this works on master because of this patch (6858e3a71c save/restore FP registers").

So, I should either extend 54e08dbe8f in stable series to remove the now-unused label, or include this 6858e3a71c change *too* (with the previous 7e859bacea).

Does it hurt to pick 7e859bacea and 6858e3a71c to the stable series? This feels like another bugfix too, but a bit more involved. And it builds at passes all tests, at least.

Thanks,

/mjt

#6 lore raw

Re: [PATCH 2/2] linux-user/xtensa: save/restore FP registers across signal delivery

Quoted 37 lines · Michael Tokarev
Quoted 8 lines · Matt Turner

Add support for saving and restoring f0-f15 across signal delivery. The target_xtensa_xtregs_fp struct carries 32-bit f-regs for cores with XTENSA_OPTION_FP_COPROCESSOR; target_xtensa_xtregs_dfp carries 64-bit f-regs for cores with XTENSA_OPTION_DFP_COPROCESSOR.

Lock the xtregs region via lock_user before reading on sigreturn, since sc_xtregs is a user-space pointer that may lie outside the locked sigframe.

Now this is kind of fun.

linux-user/xtensa/signal.c long do_rt_sigreturn(CPUXtensaState *env) · line 364

Quoted 7 lines
linux-user/xtensa/signal.c +3 -1
@@ -282,7 +360,9 @@ long do_rt_sigreturn(CPUXtensaState *env)
       target_to_host_sigset(&set, &frame->uc.tuc_sigmask);
       set_sigmask(&set);
-    restore_sigcontext(env, frame);
+    if (!restore_sigcontext(env, frame)) {
+        goto badframe;
+    }

There's another patch for linux-user/xtensa which is queued up for the stable series:

54e08dbe8f linux-user/xtensa: fix unlock of uninitialized frame pointer on sigreturn

This patch (fix unlock of frame pointer) removes goto badframe from this same function.  With that patch applied, the compiler complains:

 linux-user/xtensa/signal.c: In function ‘do_rt_sigreturn’:
 linux-user/xtensa/signal.c:293:1: error: label ‘badframe’ defined but not used [-Werror=unused-label]
 cc1: all warnings being treated as errors

and the build fails.

But this works on master because of this patch (6858e3a71c save/restore FP registers").

Quoted 7 lines

So, I should either extend 54e08dbe8f in stable series to remove the now-unused label, or include this 6858e3a71c change *too* (with the previous 7e859bacea).

Does it hurt to pick 7e859bacea and 6858e3a71c to the stable series? This feels like another bugfix too, but a bit more involved.  And it builds at passes all tests, at least.

I suggest to pull in all patches to keep difference to head minimal.

Helge

Reviewed-by on v1 1/2
#7 lore raw
In reply to Matt Turner
Quoted 10 lines · Matt Turner

Factor FCR→fp_status and FSR→fp_status synchronisation out of the wur_fpu{2k,}_fcr/wur_fpu_fsr helpers into cpu_set_fcr(), cpu_set_fsr(), and cpu_get_fsr(). Signal delivery code needs to restore the FP rounding mode and exception flags without duplicating the flag-mapping tables.

cpu_set_fcr() applies the union mask 0xfffff07f (superset of the wur_fpu_fcr mask 0x0000007f and the wur_fpu2k_fcr mask 0xfffff07f) so that FCR bits valid only on fpu2k configs are preserved while MBZ bits 7-11 are always cleared.

Quoted 5 lines
---
  target/xtensa/cpu.h        |   4 ++
  target/xtensa/fpu_helper.c | 111 ++++++++++++++++++++-----------------
  2 files changed, 64 insertions(+), 51 deletions(-)

r~