[PATCH v11 29/31] linux-user: Implement CPU-specific signal handler for loongarch64 hosts

WANG Xuerui posted 31 patches 2 years, 10 months ago
Maintainers: Riku Voipio <riku.voipio@iki.fi>, Richard Henderson <richard.henderson@linaro.org>, WANG Xuerui <git@xen0n.name>
[PATCH v11 29/31] linux-user: Implement CPU-specific signal handler for loongarch64 hosts
Posted by WANG Xuerui 2 years, 10 months ago
Signed-off-by: WANG Xuerui <git@xen0n.name>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 linux-user/host/loongarch64/host-signal.h | 87 +++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 linux-user/host/loongarch64/host-signal.h

diff --git a/linux-user/host/loongarch64/host-signal.h b/linux-user/host/loongarch64/host-signal.h
new file mode 100644
index 0000000000..05e2c82371
--- /dev/null
+++ b/linux-user/host/loongarch64/host-signal.h
@@ -0,0 +1,87 @@
+/*
+ * host-signal.h: signal info dependent on the host architecture
+ *
+ * Copyright (c) 2003-2005 Fabrice Bellard
+ * Copyright (c) 2021 WANG Xuerui <git@xen0n.name>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef LOONGARCH64_HOST_SIGNAL_H
+#define LOONGARCH64_HOST_SIGNAL_H
+
+static inline uintptr_t host_signal_pc(ucontext_t *uc)
+{
+    return uc->uc_mcontext.__pc;
+}
+
+static inline void host_signal_set_pc(ucontext_t *uc, uintptr_t pc)
+{
+    uc->uc_mcontext.__pc = pc;
+}
+
+static inline bool host_signal_write(siginfo_t *info, ucontext_t *uc)
+{
+    const uint32_t *pinsn = (const uint32_t *)host_signal_pc(uc);
+    uint32_t insn = pinsn[0];
+
+    /* Detect store by reading the instruction at the program counter.  */
+    switch ((insn >> 26) & 0b111111) {
+    case 0b001000: /* {ll,sc}.[wd] */
+        switch ((insn >> 24) & 0b11) {
+        case 0b01: /* sc.w */
+        case 0b11: /* sc.d */
+            return true;
+        }
+        break;
+    case 0b001001: /* {ld,st}ox4.[wd] ({ld,st}ptr.[wd]) */
+        switch ((insn >> 24) & 0b11) {
+        case 0b01: /* stox4.w (stptr.w) */
+        case 0b11: /* stox4.d (stptr.d) */
+            return true;
+        }
+        break;
+    case 0b001010: /* {ld,st}.* family */
+        switch ((insn >> 22) & 0b1111) {
+        case 0b0100: /* st.b */
+        case 0b0101: /* st.h */
+        case 0b0110: /* st.w */
+        case 0b0111: /* st.d */
+        case 0b1101: /* fst.s */
+        case 0b1111: /* fst.d */
+            return true;
+        }
+        break;
+    case 0b001110: /* indexed, atomic, bounds-checking memory operations */
+        uint32_t sel = (insn >> 15) & 0b11111111111;
+
+        switch (sel) {
+        case 0b00000100000: /* stx.b */
+        case 0b00000101000: /* stx.h */
+        case 0b00000110000: /* stx.w */
+        case 0b00000111000: /* stx.d */
+        case 0b00001110000: /* fstx.s */
+        case 0b00001111000: /* fstx.d */
+        case 0b00011101100: /* fstgt.s */
+        case 0b00011101101: /* fstgt.d */
+        case 0b00011101110: /* fstle.s */
+        case 0b00011101111: /* fstle.d */
+        case 0b00011111000: /* stgt.b */
+        case 0b00011111001: /* stgt.h */
+        case 0b00011111010: /* stgt.w */
+        case 0b00011111011: /* stgt.d */
+        case 0b00011111100: /* stle.b */
+        case 0b00011111101: /* stle.h */
+        case 0b00011111110: /* stle.w */
+        case 0b00011111111: /* stle.d */
+        case 0b00011000000 ... 0b00011100011: /* am* insns */
+            return true;
+        }
+        break;
+    }
+
+    return false;
+}
+
+#endif
-- 
2.34.0


Re: [PATCH v11 29/31] linux-user: Implement CPU-specific signal handler for loongarch64 hosts
Posted by gaosong 2 years, 9 months ago
HI,

On 2021/12/21 下午1:41, WANG Xuerui wrote:
> +    case 0b001110: /* indexed, atomic, bounds-checking memory operations */
> +        uint32_t sel = (insn >> 15) & 0b11111111111;
> +
> +        switch (sel) {
> +        case 0b00000100000: /* stx.b */
> +        case 0b00000101000: /* stx.h */
> +        case 0b00000110000: /* stx.w */
> +        case 0b00000111000: /* stx.d */
> +        case 0b00001110000: /* fstx.s */
> +        case 0b00001111000: /* fstx.d */
> +        case 0b00011101100: /* fstgt.s */
> +        case 0b00011101101: /* fstgt.d */
> +        case 0b00011101110: /* fstle.s */
> +        case 0b00011101111: /* fstle.d */
> +        case 0b00011111000: /* stgt.b */
> +        case 0b00011111001: /* stgt.h */
> +        case 0b00011111010: /* stgt.w */
> +        case 0b00011111011: /* stgt.d */
> +        case 0b00011111100: /* stle.b */
> +        case 0b00011111101: /* stle.h */
> +        case 0b00011111110: /* stle.w */
> +        case 0b00011111111: /* stle.d */
> +        case 0b00011000000 ... 0b00011100011: /* am* insns */
> +            return true;
> +        }
> +        break;
> +    }

We build qemu-x86_64 on LoongArch machine, but got an error,

../linux-user/host/loongarch64/host-signal.h:57:9: error: a label can only be part of a statement and a declaration is not a statement
          uint32_t sel = (insn >> 15) & 0b11111111111;
          ^~~~~~~~

I think  we should define  'sel'  before:

     /* Detect store by reading the instruction at the program counter.  */
     switch ((insn >> 26) & 0b111111) {

or
case 0b001110:

      {

           uint32_t set = ...;

           ...

      }

Thanks
Song Gao

Re: [PATCH v11 29/31] linux-user: Implement CPU-specific signal handler for loongarch64 hosts
Posted by WANG Xuerui 2 years, 9 months ago
Hi,

On 12/30/21 11:11, gaosong wrote:
>
> HI,
>
> On 2021/12/21 下午1:41, WANG Xuerui wrote:
>> +    case 0b001110: /* indexed, atomic, bounds-checking memory operations */
>> +        uint32_t sel = (insn >> 15) & 0b11111111111;
>> +
>> +        switch (sel) {
>> +        case 0b00000100000: /* stx.b */
>> +        case 0b00000101000: /* stx.h */
>> +        case 0b00000110000: /* stx.w */
>> +        case 0b00000111000: /* stx.d */
>> +        case 0b00001110000: /* fstx.s */
>> +        case 0b00001111000: /* fstx.d */
>> +        case 0b00011101100: /* fstgt.s */
>> +        case 0b00011101101: /* fstgt.d */
>> +        case 0b00011101110: /* fstle.s */
>> +        case 0b00011101111: /* fstle.d */
>> +        case 0b00011111000: /* stgt.b */
>> +        case 0b00011111001: /* stgt.h */
>> +        case 0b00011111010: /* stgt.w */
>> +        case 0b00011111011: /* stgt.d */
>> +        case 0b00011111100: /* stle.b */
>> +        case 0b00011111101: /* stle.h */
>> +        case 0b00011111110: /* stle.w */
>> +        case 0b00011111111: /* stle.d */
>> +        case 0b00011000000 ... 0b00011100011: /* am* insns */
>> +            return true;
>> +        }
>> +        break;
>> +    }
> We build qemu-x86_64 on LoongArch machine, but got an error,
> ../linux-user/host/loongarch64/host-signal.h:57:9: error: a label can only be part of a statement and a declaration is not a statement
>           uint32_t sel = (insn >> 15) & 0b11111111111;
>           ^~~~~~~~
> I think  we should define  'sel'  before:
>      /* Detect store by reading the instruction at the program counter.  */
>      switch ((insn >> 26) & 0b111111) {
> or
> case 0b001110:
>       {
>            uint32_t set = ...;
>            ...
>       }
I can't reproduce the error on both my development machines (amd64 and 
loongarch64), so I wonder if the issue is related to your particular 
setup (i.e. compiler versions and such)?
Re: [PATCH v11 29/31] linux-user: Implement CPU-specific signal handler for loongarch64 hosts
Posted by Philippe Mathieu-Daudé 2 years, 9 months ago
On Thu, Dec 30, 2021 at 4:50 AM WANG Xuerui <i.qemu@xen0n.name> wrote:
>
> Hi,
>
> On 12/30/21 11:11, gaosong wrote:
>
> HI,
>
> On 2021/12/21 下午1:41, WANG Xuerui wrote:
>
> +    case 0b001110: /* indexed, atomic, bounds-checking memory operations */
> +        uint32_t sel = (insn >> 15) & 0b11111111111;
> +
> +        switch (sel) {
> +        case 0b00000100000: /* stx.b */
> +        case 0b00000101000: /* stx.h */
> +        case 0b00000110000: /* stx.w */
> +        case 0b00000111000: /* stx.d */
> +        case 0b00001110000: /* fstx.s */
> +        case 0b00001111000: /* fstx.d */
> +        case 0b00011101100: /* fstgt.s */
> +        case 0b00011101101: /* fstgt.d */
> +        case 0b00011101110: /* fstle.s */
> +        case 0b00011101111: /* fstle.d */
> +        case 0b00011111000: /* stgt.b */
> +        case 0b00011111001: /* stgt.h */
> +        case 0b00011111010: /* stgt.w */
> +        case 0b00011111011: /* stgt.d */
> +        case 0b00011111100: /* stle.b */
> +        case 0b00011111101: /* stle.h */
> +        case 0b00011111110: /* stle.w */
> +        case 0b00011111111: /* stle.d */
> +        case 0b00011000000 ... 0b00011100011: /* am* insns */
> +            return true;
> +        }
> +        break;
> +    }
>
> We build qemu-x86_64 on LoongArch machine, but got an error,
>
> ../linux-user/host/loongarch64/host-signal.h:57:9: error: a label can only be part of a statement and a declaration is not a statement
>          uint32_t sel = (insn >> 15) & 0b11111111111;
>          ^~~~~~~~
>
> I think  we should define  'sel'  before:
>
>     /* Detect store by reading the instruction at the program counter.  */
>     switch ((insn >> 26) & 0b111111) {
>
> or
> case 0b001110:
>
>      {
>
>           uint32_t set = ...;
>
>           ...
>
>      }
>
> I can't reproduce the error on both my development machines (amd64 and loongarch64), so I wonder if the issue is related to your particular setup (i.e. compiler versions and such)?

I can reproduce, setup:

Project version: 6.2.50
C compiler for the host machine: cc (gcc 8.3.0 "cc (Loongnix
8.3.0-6.lnd.vec.27) 8.3.0")
C linker for the host machine: cc ld.bfd 2.31.1-system
Host machine cpu family: loongarch64
Host machine cpu: loongarch64
C++ compiler for the host machine: c++ (gcc 8.3.0 "c++ (Loongnix
8.3.0-6.lnd.vec.27) 8.3.0")
C++ linker for the host machine: c++ ld.bfd 2.31.1-system