MIPS: Loongson-3: Enable COP2 usage in kernel
PATCH v3 1/2 MIPS: Loongson-3: Enable COP2 usage in kernel
Loongson-3's COP2 is Multi-Media coprocessor, it is disabled in kernel mode by default. However, gslq/gssq (16-bytes load/store instructions) overrides the instruction format of lwc2/swc2. If we wan't to use gslq/ gssq for optimization in kernel, we should enable COP2 usage in kernel.
Please pay attention that in this patch we only enable COP2 in kernel, which means it will lose ST0_CU2 when a process go to user space (try to use COP2 in user space will trigger an exception and then grab COP2, which is similar to FPU). And as a result, we need to modify the context switching code because the new scheduled process doesn't contain ST0_CU2 in its THERAD_STATUS probably.
---
V3: Stop using ST0_MM and use ST0_CU2 instead (Thank Thomas and Maciej).
arch/mips/boot/compressed/head.S | 7 +++++++ arch/mips/include/asm/stackframe.h | 12 +++++++++--- arch/mips/kernel/head.S | 18 +++++++++--------- arch/mips/kernel/r4k_switch.S | 3 +++ arch/mips/kernel/traps.c | 8 +++++++- 5 files changed, 35 insertions(+), 13 deletions(-)
arch/mips/boot/compressed/head.S +7 -0
@@ -14,11 +14,18 @@ #include <asm/asm.h> #include <asm/regdef.h> +#include <asm/mipsregs.h> .set noreorder .cprestore LEAF(start) start: +#ifdef CONFIG_CPU_LOONGSON64 + mfc0 t0, CP0_STATUS + or t0, ST0_CU2 /* make 16-bytes load/store instructions usable */ + mtc0 t0, CP0_STATUS +#endif + /* Save boot rom start args */ move s0, a0 move s1, a1
arch/mips/include/asm/stackframe.h +9 -3
@@ -42,6 +42,12 @@ cfi_restore \reg \offset \docfi .endm +#ifdef CONFIG_CPU_LOONGSON64 +#define ST0_CUMASK (ST0_CU0 | ST0_CU2) +#else +#define ST0_CUMASK ST0_CU0 +#endif +#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )#define STATMASK 0x3f#else
@@ -450,7 +456,7 @@*/ .macro CLImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_CUMASK | STATMASK or t0, t1 xori t0, STATMASK mtc0 t0, CP0_STATUS
@@ -463,7 +469,7 @@*/ .macro STImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_CUMASK | STATMASK or t0, t1 xori t0, STATMASK & ~1 mtc0 t0, CP0_STATUS
@@ -477,7 +483,7 @@*/ .macro KMODEmfc0 t0,CP0_STATUS - li t1, ST0_CU0 | (STATMASK & ~1) + li t1, ST0_CUMASK | (STATMASK & ~1)#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )andi t2, t0,ST0_IEP srl t2, 2
arch/mips/kernel/head.S +9 -9
@@ -43,20 +43,20 @@ .set pop .endm - .macro setup_c0_status_pri -#ifdef CONFIG_64BIT - setup_c0_status ST0_KX 0 +#ifdef CONFIG_CPU_LOONGSON64 +#define ST0_SET ST0_KX | ST0_CU2 +#elif defined(CONFIG_64BIT) +#define ST0_SET ST0_KX #else - setup_c0_status 0 0 +#define ST0_SET 0 #endif + + .macro setup_c0_status_pri + setup_c0_status ST0_SET 0 .endm .macro setup_c0_status_sec -#ifdef CONFIG_64BIT - setup_c0_status ST0_KX ST0_BEV -#else - setup_c0_status 0 ST0_BEV -#endif + setup_c0_status ST0_SET ST0_BEV .endm #ifndef CONFIG_NO_EXCEPT_FILL
arch/mips/kernel/r4k_switch.S +3 -0
@@ -53,6 +53,9 @@ nor a3, $0, a3 and a2, a3 or a2, t1 +#ifdef CONFIG_CPU_LOONGSON64 + or a2, ST0_CU2 /* make 16-bytes load/store instructions usable */ +#endif mtc0 a2, CP0_STATUS move v0, a0 jr ra
arch/mips/kernel/traps.c +7 -1
@@ -2108,9 +2108,15 @@ static void configure_status(void)* Disable coprocessors and select 32-bit or 64-bit addressing * and the 16/32 or 32/32 FPR register model. Reset the BEV * flag that some firmware may have left set and the TS bit (for -* IP27). Set XX for ISA IV code to work. +* IP27). Set XX for ISA IV code to work, and enable CU2 for +* Loongson-3 to make 16-bytes load/store instructions usable. */ +#ifndef CONFIG_CPU_LOONGSON64 unsigned int status_set =ST0_CU0 ; +#else +unsigned int status_set =ST0_CU0 |ST0_CU2 ; +#endif +#ifdef CONFIG_64BIT status_set |=ST0_FR |ST0_KX |ST0_SX |ST0_UX ;#endif
Signature · 1 line
2.7.0
PATCH v3 2/2 MIPS: Loongson-3: Calculate ra properly when unwinding the stack
Loongson-3 has 16-bytes load/store instructions: gslq and gssq. This patch calculate ra properly when unwinding the stack, if ra is saved by gssq and restored by gslq.
--- arch/mips/kernel/process.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
arch/mips/kernel/process.c +15 -1
@@ -279,7 +279,21 @@ static inline int is_ra_save_ins(union mips_instruction *ip, int *poff) *poff = ip->i_format.simmediate /sizeof (ulong); return 1; } - +#ifdef CONFIG_CPU_LOONGSON64 +if ((ip->loongson3_lswc2_format.opcode == swc2_op) && + (ip->loongson3_lswc2_format.ls ==1 ) && + (ip->loongson3_lswc2_format.fr ==0 ) && + (ip->loongson3_lswc2_format.base ==29 )) { +if (ip->loongson3_lswc2_format.rt ==31 ) { + *poff = ip->loongson3_lswc2_format.offset <<1 ; +return 1 ; + } +if (ip->loongson3_lswc2_format.rq ==31 ) { + *poff = (ip->loongson3_lswc2_format.offset <<1 ) +1 ; +return 1 ; + } + } +#endif return 0 ;#endif }
Signature · 1 line
2.7.0
于 2020年5月2日 GMT+08:00 下午12:55:43, Huacai Chen <[email protected]> 写到:
Quoted 5 lines
Loongson-3's COP2 is Multi-Media coprocessor, it is disabled in kernel mode by default. However, gslq/gssq (16-bytes load/store instructions) overrides the instruction format of lwc2/swc2. If we wan't to use gslq/ gssq for optimization in kernel, we should enable COP2 usage in kernel.
Quoted 8 lines
Please pay attention that in this patch we only enable COP2 in kernel, which means it will lose
ST0_CU2when a process go to user space (try to use COP2 in user space will trigger an exception and then grab COP2, which is similar to FPU). And as a result, we need to modify the context switching code because the new scheduled process doesn't containST0_CU2in itsTHERAD_STATUSprobably.Signed-off-by Huacai Chen <[email protected]>
Quoted 146 lines
---
V3: Stop usingST0_MMand useST0_CU2instead (Thank Thomas and Maciej).arch/mips/boot/compressed/head.S | 7 +++++++ arch/mips/include/asm/stackframe.h | 12 +++++++++--- arch/mips/kernel/head.S | 18 +++++++++--------- arch/mips/kernel/r4k_switch.S | 3 +++ arch/mips/kernel/traps.c | 8 +++++++- 5 files changed, 35 insertions(+), 13 deletions(-)arch/mips/boot/compressed/head.S +1
-0@@ -14,11 +14,18 @@ #include <asm/asm.h> #include <asm/regdef.h> +#include <asm/mipsregs.h> .set noreorder .cprestore LEAF(start)start:
arch/mips/boot/compressed/head.S +6
-0+#ifdef CONFIG_CPU_LOONGSON64 + mfc0 t0, CP0_STATUS + or t0, ST0_CU2 /* make 16-bytes load/store instructions usable */ + mtc0 t0, CP0_STATUS +#endif +/* Save boot rom start args */ move s0, a0 move s1, a1arch/mips/include/asm/stackframe.h +9
-3@@ -42,6 +42,12 @@ cfi_restore \reg \offset \docfi .endm +#ifdef CONFIG_CPU_LOONGSON64 +#define ST0_CUMASK (ST0_CU0 | ST0_CU2) +#else +#define ST0_CUMASK ST0_CU0 +#endif +#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )#define STATMASK 0x3f#else @@ -450,7 +456,7 @@*/ .macro CLImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_CUMASK | STATMASK or t0, t1 xori t0, STATMASK mtc0 t0, CP0_STATUS@@ -463,7 +469,7 @@*/ .macro STImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_CUMASK | STATMASK or t0, t1 xori t0, STATMASK & ~1 mtc0 t0, CP0_STATUS@@ -477,7 +483,7 @@*/ .macro KMODEmfc0 t0,CP0_STATUS - li t1, ST0_CU0 | (STATMASK & ~1) + li t1, ST0_CUMASK | (STATMASK & ~1)#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )andi t2, t0,ST0_IEP srl t2, 2arch/mips/kernel/head.S +9
-9@@ -43,20 +43,20 @@ .set pop .endm - .macro setup_c0_status_pri -#ifdef CONFIG_64BIT - setup_c0_status ST0_KX 0 +#ifdef CONFIG_CPU_LOONGSON64 +#define ST0_SET ST0_KX | ST0_CU2 +#elif defined(CONFIG_64BIT) +#define ST0_SET ST0_KX #else - setup_c0_status 0 0 +#define ST0_SET 0 #endif + + .macro setup_c0_status_pri + setup_c0_status ST0_SET 0 .endm .macro setup_c0_status_sec -#ifdef CONFIG_64BIT - setup_c0_status ST0_KX ST0_BEV -#else - setup_c0_status 0 ST0_BEV -#endif + setup_c0_status ST0_SET ST0_BEV .endm #ifndef CONFIG_NO_EXCEPT_FILLarch/mips/kernel/r4k_switch.S +3
-0@@ -53,6 +53,9 @@ nor a3, $0, a3 and a2, a3 or a2, t1 +#ifdef CONFIG_CPU_LOONGSON64 + or a2, ST0_CU2 /* make 16-bytes load/store instructions usable */ +#endif mtc0 a2, CP0_STATUS move v0, a0 jr raarch/mips/kernel/traps.c +7
-1@@ -2108,9 +2108,15 @@ static void configure_status(void)* Disable coprocessors and select 32-bit or 64-bit addressing * and the 16/32 or 32/32 FPR register model. Reset the BEV * flag that some firmware may have left set and the TS bit (for -* IP27). Set XX for ISA IV code to work. +* IP27). Set XX for ISA IV code to work, and enable CU2 for +* Loongson-3 to make 16-bytes load/store instructions usable. */ +#ifndef CONFIG_CPU_LOONGSON64 unsigned int status_set =ST0_CU0 ; +#else +unsigned int status_set =ST0_CU0 |ST0_CU2 ; +#endif +#ifdef CONFIG_64BIT status_set |=ST0_FR |ST0_KX |ST0_SX |ST0_UX ;#endif
Signature · 1 line
Jiaxun Yang
Hi, Thomas,
Quoted 16 lines · Jiaxun Yang
于 2020年5月2日 GMT+08:00 下午12:55:43, Huacai Chen <[email protected]> 写到:
Quoted 12 lines
Loongson-3's COP2 is Multi-Media coprocessor, it is disabled in kernel mode by default. However, gslq/gssq (16-bytes load/store instructions) overrides the instruction format of lwc2/swc2. If we wan't to use gslq/ gssq for optimization in kernel, we should enable COP2 usage in kernel.
Please pay attention that in this patch we only enable COP2 in kernel, which means it will lose
ST0_CU2when a process go to user space (try to use COP2 in user space will trigger an exception and then grab COP2, which is similar to FPU). And as a result, we need to modify the context switching code because the new scheduled process doesn't containST0_CU2in itsTHERAD_STATUSprobably.
Quoted 4 lines
Quoted 1 line
Signed-off-by Huacai Chen <[email protected]>Reviewed-by Jiaxun Yang <[email protected]>
Does this patch have some unresolved problems, or there is something unclear?
Huacai
Quoted 150 lines
Quoted 137 lines
---
V3: Stop usingST0_MMand useST0_CU2instead (Thank Thomas and Maciej).arch/mips/boot/compressed/head.S | 7 +++++++ arch/mips/include/asm/stackframe.h | 12 +++++++++--- arch/mips/kernel/head.S | 18 +++++++++--------- arch/mips/kernel/r4k_switch.S | 3 +++ arch/mips/kernel/traps.c | 8 +++++++- 5 files changed, 35 insertions(+), 13 deletions(-)arch/mips/boot/compressed/head.S +1
-0@@ -14,11 +14,18 @@ #include <asm/asm.h> #include <asm/regdef.h> +#include <asm/mipsregs.h> .set noreorder .cprestore LEAF(start)start:
arch/mips/boot/compressed/head.S +6
-0+#ifdef CONFIG_CPU_LOONGSON64 + mfc0 t0, CP0_STATUS + or t0, ST0_CU2 /* make 16-bytes load/store instructions usable */ + mtc0 t0, CP0_STATUS +#endif + /* Save boot rom start args */ move s0, a0 move s1, a1arch/mips/include/asm/stackframe.h +9
-3@@ -42,6 +42,12 @@ cfi_restore \reg \offset \docfi .endm +#ifdef CONFIG_CPU_LOONGSON64 +#define ST0_CUMASK (ST0_CU0 | ST0_CU2) +#else +#define ST0_CUMASK ST0_CU0 +#endif +#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )#define STATMASK 0x3f#else @@ -450,7 +456,7 @@*/ .macro CLImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_CUMASK | STATMASK or t0, t1 xori t0, STATMASK mtc0 t0, CP0_STATUS@@ -463,7 +469,7 @@*/ .macro STImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_CUMASK | STATMASK or t0, t1 xori t0, STATMASK & ~1 mtc0 t0, CP0_STATUS@@ -477,7 +483,7 @@*/ .macro KMODEmfc0 t0,CP0_STATUS - li t1, ST0_CU0 | (STATMASK & ~1) + li t1, ST0_CUMASK | (STATMASK & ~1)#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )andi t2, t0,ST0_IEP srl t2, 2arch/mips/kernel/head.S +9
-9@@ -43,20 +43,20 @@ .set pop .endm - .macro setup_c0_status_pri -#ifdef CONFIG_64BIT - setup_c0_status ST0_KX 0 +#ifdef CONFIG_CPU_LOONGSON64 +#define ST0_SET ST0_KX | ST0_CU2 +#elif defined(CONFIG_64BIT) +#define ST0_SET ST0_KX #else - setup_c0_status 0 0 +#define ST0_SET 0 #endif + + .macro setup_c0_status_pri + setup_c0_status ST0_SET 0 .endm .macro setup_c0_status_sec -#ifdef CONFIG_64BIT - setup_c0_status ST0_KX ST0_BEV -#else - setup_c0_status 0 ST0_BEV -#endif + setup_c0_status ST0_SET ST0_BEV .endm #ifndef CONFIG_NO_EXCEPT_FILLarch/mips/kernel/r4k_switch.S +3
-0@@ -53,6 +53,9 @@ nor a3, $0, a3 and a2, a3 or a2, t1 +#ifdef CONFIG_CPU_LOONGSON64 + or a2, ST0_CU2 /* make 16-bytes load/store instructions usable */ +#endif mtc0 a2, CP0_STATUS move v0, a0 jr raarch/mips/kernel/traps.c +2
-1@@ -2108,9 +2108,15 @@ static void configure_status(void)* Disable coprocessors and select 32-bit or 64-bit addressing * and the 16/32 or 32/32 FPR register model. Reset the BEV * flag that some firmware may have left set and the TS bit (for -* IP27). Set XX for ISA IV code to work. +* IP27). Set XX for ISA IV code to work, and enable CU2 for +* Loongson-3 to make 16-bytes load/store instructions usable. arch/mips/kernel/traps.c static void configure_status(void) · line 2122
Quoted 10 lines
arch/mips/kernel/traps.c +5
-0*/ +#ifndef CONFIG_CPU_LOONGSON64 unsigned int status_set =ST0_CU0 ; +#else +unsigned int status_set =ST0_CU0 |ST0_CU2 ; +#endif +#ifdef CONFIG_64BIT status_set |=ST0_FR |ST0_KX |ST0_SX |ST0_UX ;#endif --
Jiaxun Yang
Thomas Bogendoerfer
maintainerQuoted 17 lines · Huacai Chen
Quoted 16 lines · Jiaxun Yang
于 2020年5月2日 GMT+08:00 下午12:55:43, Huacai Chen <[email protected]> 写到:
Quoted 12 lines
Loongson-3's COP2 is Multi-Media coprocessor, it is disabled in kernel mode by default. However, gslq/gssq (16-bytes load/store instructions) overrides the instruction format of lwc2/swc2. If we wan't to use gslq/ gssq for optimization in kernel, we should enable COP2 usage in kernel.
Please pay attention that in this patch we only enable COP2 in kernel, which means it will lose
ST0_CU2when a process go to user space (try to use COP2 in user space will trigger an exception and then grab COP2, which is similar to FPU). And as a result, we need to modify the context switching code because the new scheduled process doesn't containST0_CU2in itsTHERAD_STATUSprobably.
Quoted 5 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Huacai Chen <[email protected]>Reviewed-by Jiaxun Yang <[email protected]>Does this patch have some unresolved problems, or there is something unclear?
yes there is. Since this COP2 is a total black box to me, it would be really helpfull to get some docs for it or at least some information what it exactly does and how you want to use it in kernel code.
Looking closer at the patch I realized, that there is already support for usage of COP2 in user land, which I thought isn't the case (at least I understood that from one of your mails). So is there enough state saving to support this ?
And finally what I stil don't like is the splittering of more #ifdef LOONGSON into common code. I'd prefer a more generic way to enable COPx for in kernel usage. Maybe a more generic config option or a dynamic solution like the one for user land.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Quoted 17 lines · Thomas Bogendoerfer
Quoted 16 lines · Huacai Chen
Quoted 15 lines · Jiaxun Yang
于 2020年5月2日 GMT+08:00 下午12:55:43, Huacai Chen <[email protected]> 写到:
Quoted 12 lines
Loongson-3's COP2 is Multi-Media coprocessor, it is disabled in kernel mode by default. However, gslq/gssq (16-bytes load/store instructions) overrides the instruction format of lwc2/swc2. If we wan't to use gslq/ gssq for optimization in kernel, we should enable COP2 usage in kernel.
Please pay attention that in this patch we only enable COP2 in kernel, which means it will lose
ST0_CU2when a process go to user space (try to use COP2 in user space will trigger an exception and then grab COP2, which is similar to FPU). And as a result, we need to modify the context switching code because the new scheduled process doesn't containST0_CU2in itsTHERAD_STATUSprobably.
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Huacai Chen <[email protected]>Reviewed-by Jiaxun Yang <[email protected]>Does this patch have some unresolved problems, or there is something unclear?
yes there is. Since this COP2 is a total black box to me, it would be really helpfull to get some docs for it or at least some information what it exactly does and how you want to use it in kernel code.
FYI:
Loongson doesn't have any CU2 register. It just reused LWC2 & LDC2 opcode to define some load & store instructions (e.g. 128bit load to two GPRs).
I have a collection of these instructions here[1].
From GS464E (3A2000+), execuating these instruction won't produce COP2 unusable exception. But older Loongson cores (GS464) will still produce COP2 exception, thus we should have CU2 enabled in kernel. That would allow us use to these instructions to optimize kernel.
Quoted 5 lines
Looking closer at the patch I realized, that there is already support for usage of COP2 in user land, which I thought isn't the case (at least I understood that from one of your mails). So is there enough state saving to support this ?
Actually there is no CU2 state for Loongson to save.
Quoted 5 lines
And finally what I stil don't like is the splittering of more #ifdef LOONGSON into common code. I'd prefer a more generic way to enable COPx for in kernel usage. Maybe a more generic config option or a dynamic solution like the one for user land.
Agreed. some Kconfig options or cpuinfo_mips.options can be helpful.
Thanks.
- Jiaxun
[1]: https://github.com/FlyGoat/loongson-insn/
Quoted 3 lines
Thomas.
Hi, Jiaxun
Quoted 49 lines · Jiaxun Yang
Quoted 17 lines · Thomas Bogendoerfer
Quoted 16 lines · Huacai Chen
Quoted 15 lines · Jiaxun Yang
于 2020年5月2日 GMT+08:00 下午12:55:43, Huacai Chen <[email protected]> 写到:
Quoted 12 lines
Loongson-3's COP2 is Multi-Media coprocessor, it is disabled in kernel mode by default. However, gslq/gssq (16-bytes load/store instructions) overrides the instruction format of lwc2/swc2. If we wan't to use gslq/ gssq for optimization in kernel, we should enable COP2 usage in kernel.
Please pay attention that in this patch we only enable COP2 in kernel, which means it will lose
ST0_CU2when a process go to user space (try to use COP2 in user space will trigger an exception and then grab COP2, which is similar to FPU). And as a result, we need to modify the context switching code because the new scheduled process doesn't containST0_CU2in itsTHERAD_STATUSprobably.Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Huacai Chen <[email protected]>Reviewed-by Jiaxun Yang <[email protected]>Does this patch have some unresolved problems, or there is something unclear?
yes there is. Since this COP2 is a total black box to me, it would be really helpfull to get some docs for it or at least some information what it exactly does and how you want to use it in kernel code.
FYI:
Loongson doesn't have any CU2 register. It just reused LWC2 & LDC2 opcode to define some load & store instructions (e.g. 128bit load to two GPRs).I have a collection of these instructions here[1].
From GS464E (3A2000+), execuating these instruction won't produce COP2
unusable
exception. But older Loongson cores (GS464) will still produce COP2 exception, thus
we should have CU2 enabled in kernel. That would allow us use to these instructions
to optimize kernel.Quoted 5 lines
Looking closer at the patch I realized, that there is already support for usage of COP2 in user land, which I thought isn't the case (at least I understood that from one of your mails). So is there enough state saving to support this ?
Quoted 9 lines
Actually there is no CU2 state for Loongson to save.
Quoted 5 lines
And finally what I stil don't like is the splittering of more #ifdef LOONGSON into common code. I'd prefer a more generic way to enable COPx for in kernel usage. Maybe a more generic config option or a dynamic solution like the one for user land.
Agreed. some
Kconfigoptions or cpuinfo_mips.options can be helpful.
So make those codes depend on CONFIG_CPU_LOONGSON3_WORKAROUNDS instead of CONFIG_CPU_LOONGSON64?
Huacai
Quoted 8 lines
Thanks.
- Jiaxun
[1]: https://github.com/FlyGoat/loongson-insn/
Quoted 3 lines
Thomas.
Thomas Bogendoerfer
maintainerQuoted 10 lines · Jiaxun Yang
Quoted 3 lines
yes there is. Since this COP2 is a total black box to me, it would be really helpfull to get some docs for it or at least some information what it exactly does and how you want to use it in kernel code.
FYI:
Loongson doesn't have any CU2 register. It just reused LWC2 & LDC2 opcode to define some load & store instructions (e.g. 128bit load to two GPRs).I have a collection of these instructions here[1].
Quoted 7 lines
From GS464E (3A2000+), execuating these instruction won't produce COP2 unusable
exception. But older Loongson cores (GS464) will still produce COP2 exception, thus
we should have CU2 enabled in kernel. That would allow us use to these instructions
to optimize kernel.
thank you that makes things a little bit clearer.
How will this be used in kernel code ? Special assembler routines or by enabling gcc options ?
Quoted 5 lines
Quoted 4 lines
And finally what I stil don't like is the splittering of more #ifdef LOONGSON into common code. I'd prefer a more generic way to enable COPx for in kernel usage. Maybe a more generic config option or a dynamic solution like the one for user land.
Agreed. some
Kconfigoptions or cpuinfo_mips.options can be helpful.
let's see whether this really is needed.
To me it looks like the COP2 exception support for loongson makes thing worse than it helps. How about the patch below ? There is still a gap between starting the kernel and COP2 enabled for which I'm not sure, if we are hitting COP2 instructions.
Thomas.
arch/mips/include/asm/cop2.h +0 -7
@@ -33,13 +33,6 @@ extern void nlm_cop2_restore(struct nlm_cop2_state *);#define cop2_present 1#define cop2_lazy_restore 0 -#elif defined(CONFIG_CPU_LOONGSON64 ) - -#define cop2_present 1 -#define cop2_lazy_restore 1 -#define cop2_save (r) do { (void)(r); } while (0) -#define cop2_restore (r) do { (void)(r); } while (0) -#else #define cop2_present 0
arch/mips/kernel/traps.c +5 -0
@@ -2194,6 +2194,11 @@ static void configure_status(void)#ifdef CONFIG_64BIT status_set |=ST0_FR |ST0_KX |ST0_SX |ST0_UX ;#endif +#ifdef CONFIG_CPU_LOONGSON64 +/* enable 16-bytes load/store instructions */ + status_set |=ST0_CU2 ; +#endif +if (current_cpu_data.isa_level &MIPS_CPU_ISA_IV ) status_set |=ST0_XX ;if (cpu_has_dsp)
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Quoted 17 lines · Thomas Bogendoerfer
Quoted 9 lines · Jiaxun Yang
Quoted 3 lines
yes there is. Since this COP2 is a total black box to me, it would be really helpfull to get some docs for it or at least some information what it exactly does and how you want to use it in kernel code.
FYI:
Loongson doesn't have any CU2 register. It just reused LWC2 & LDC2 opcode to define some load & store instructions (e.g. 128bit load to two GPRs).I have a collection of these instructions here[1].
Quoted 7 lines
From GS464E (3A2000+), execuating these instruction won't produce COP2
unusable
exception. But older Loongson cores (GS464) will still produce COP2 exception, thus
we should have CU2 enabled in kernel. That would allow us use to these instructions
to optimize kernel.
Quoted 4 lines
thank you that makes things a little bit clearer.
How will this be used in kernel code ? Special assembler routines or by enabling gcc options ?
Via special assembly routines, as -msoft-float will disable generation of these instructions in GCC.
I knew Huacai have out-of-tree memcpy optimization and Xuerui have RAID5 optimiztion with these instructions.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
And finally what I stil don't like is the splittering of more #ifdef LOONGSON into common code. I'd prefer a more generic way to enable COPx for in kernel usage. Maybe a more generic config option or a dynamic solution like the one for user land.
Quoted 7 lines
Quoted 1 line
Agreed. some
Kconfigoptions or cpuinfo_mips.options can be helpful.let's see whether this really is needed.
To me it looks like the COP2 exception support for loongson makes thing worse than it helps. How about the patch below ? There is still a gap between starting the kernel and COP2 enabled for which I'm not sure, if we are hitting COP2 instructions.
Yes, the exception does not really make sense.
What's your opinion Huacai?
For in-kernel usage, we still have to enable it in genex.
Thanks for your advice~
- Jiaxun
Quoted 40 lines
Thomas.
arch/mips/include/asm/cop2.h +0
-7@@ -33,13 +33,6 @@ extern void nlm_cop2_restore(struct nlm_cop2_state *);#define cop2_present 1#define cop2_lazy_restore 0 -#elif defined(CONFIG_CPU_LOONGSON64 ) - -#define cop2_present 1 -#define cop2_lazy_restore 1 -#define cop2_save (r) do { (void)(r); } while (0) -#define cop2_restore (r) do { (void)(r); } while (0) -#else #define cop2_present 0arch/mips/kernel/traps.c +5
-0@@ -2194,6 +2194,11 @@ static void configure_status(void)#ifdef CONFIG_64BIT status_set |=ST0_FR |ST0_KX |ST0_SX |ST0_UX ;#endif +#ifdef CONFIG_CPU_LOONGSON64 +/* enable 16-bytes load/store instructions */ + status_set |=ST0_CU2 ; +#endif +if (current_cpu_data.isa_level &MIPS_CPU_ISA_IV ) status_set |=ST0_XX ;if (cpu_has_dsp)
Thomas Bogendoerfer
maintainerQuoted 44 lines · Jiaxun Yang
Quoted 17 lines · Thomas Bogendoerfer
Quoted 9 lines · Jiaxun Yang
Quoted 3 lines
yes there is. Since this COP2 is a total black box to me, it would be really helpfull to get some docs for it or at least some information what it exactly does and how you want to use it in kernel code.
FYI:
Loongson doesn't have any CU2 register. It just reused LWC2 & LDC2 opcode to define some load & store instructions (e.g. 128bit load to two GPRs).I have a collection of these instructions here[1].
Quoted 7 lines
From GS464E (3A2000+), execuating these instruction won't produce COP2 unusable
exception. But older Loongson cores (GS464) will still produce COP2 exception, thus
we should have CU2 enabled in kernel. That would allow us use to these instructions
to optimize kernel.Quoted 4 lines
thank you that makes things a little bit clearer.
How will this be used in kernel code ? Special assembler routines or by enabling gcc options ?
Via special assembly routines, as -msoft-float will disable generation of these instructions in GCC.
I knew Huacai have out-of-tree memcpy optimization and Xuerui have RAID5 optimiztion with these instructions.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
And finally what I stil don't like is the splittering of more #ifdef LOONGSON into common code. I'd prefer a more generic way to enable COPx for in kernel usage. Maybe a more generic config option or a dynamic solution like the one for user land.
Quoted 7 lines
Quoted 1 line
Agreed. some
Kconfigoptions or cpuinfo_mips.options can be helpful.let's see whether this really is needed.
To me it looks like the COP2 exception support for loongson makes thing worse than it helps. How about the patch below ? There is still a gap between starting the kernel and COP2 enabled for which I'm not sure, if we are hitting COP2 instructions.
Quoted 4 lines
Yes, the exception does not really make sense.
What's your opinion Huacai?For in-kernel usage, we still have to enable it in genex.
you shouldn't need any other changes. ST0_CU2 will be set in configure_status() and not touched after that.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Quoted 22 lines · Jiaxun Yang
Quoted 19 lines · Thomas Bogendoerfer
Quoted 9 lines · Jiaxun Yang
Quoted 3 lines
yes there is. Since this COP2 is a total black box to me, it would be really helpfull to get some docs for it or at least some information what it exactly does and how you want to use it in kernel code.
FYI:
Loongson doesn't have any CU2 register. It just reused LWC2 & LDC2 opcode to define some load & store instructions (e.g. 128bit load to two GPRs).I have a collection of these instructions here[1].
Quoted 7 lines
From GS464E (3A2000+), execuating these instruction won't produce COP2 unusable
exception. But older Loongson cores (GS464) will still produce COP2 exception, thus
we should have CU2 enabled in kernel. That would allow us use to these instructions
to optimize kernel.thank you that makes things a little bit clearer.
Quoted 22 lines
Quoted 2 lines
How will this be used in kernel code ? Special assembler routines or by enabling gcc options ?
Via special assembly routines, as -msoft-float will disable generation of these instructions in GCC.
I knew Huacai have out-of-tree memcpy optimization and Xuerui have RAID5 optimiztion with these instructions.
Quoted 12 lines
Quoted 6 lines
Quoted 5 lines
And finally what I stil don't like is the splittering of more #ifdef LOONGSON into common code. I'd prefer a more generic way to enable COPx for in kernel usage. Maybe a more generic config option or a dynamic solution like the one for user land.
Agreed. some
Kconfigoptions or cpuinfo_mips.options can be helpful.let's see whether this really is needed.
To me it looks like the COP2 exception support for loongson makes thing worse than it helps. How about the patch below ? There is still a gap between starting the kernel and COP2 enabled for which I'm not sure, if we are hitting COP2 instructions.
I had a off-list discussion with Huacai and found it's not the case.
Some Loongson CU2 instructions (e.g. GSLQC1) uses FPU registers, and now we're uncoditionally let the thread own FPU in cop2-ex handler when CU2 exception triggered.
However, if we enable CU2 all the time, than the FPU context of these instructions might be lost. (Yes, these instructions won't generate CU1 unusable exception when CU2 is enabled but not CU1, it is likely to be a design fault.)
Thus we still need to enable CU2 with exception for user space, and we can always enable CU2 in kernel since kernel won't be compiled with hard-float. :-)
Thanks.
- Jiaxun
Thomas Bogendoerfer
maintainerQuoted 3 lines · Jiaxun Yang
Thus we still need to enable CU2 with exception for user space, and we can always enable CU2 in
kernel since kernel won't be compiled with hard-float. :-)
I see, how about the patch below
Thomas.
arch/mips/include/asm/mipsregs.h +7 -0
@@ -389,6 +389,13 @@#define ST0_CU3 0x80000000#define ST0_XX 0x80000000/* MIPS IV naming */ +/* in-kernel enabled CUs */ +#ifdef CONFIG_CPU_LOONGSOON64 +#define ST0_KERNEL_CUMASK (ST0_CU0 | ST_CU2) +#else +#define ST0_KERNEL_CUMASK ST0_CU0 +#endif +/* * Bitfields and bit numbers in the coprocessor 0 IntCtl register. (MIPSR2) */
arch/mips/include/asm/stackframe.h +3 -3
@@ -450,7 +450,7 @@*/ .macro CLImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_KERNEL_CUMASK | STATMASK or t0, t1 xori t0, STATMASK mtc0 t0, CP0_STATUS
@@ -463,7 +463,7 @@*/ .macro STImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_KERNEL_CUMASK | STATMASK or t0, t1 xori t0, STATMASK & ~1 mtc0 t0, CP0_STATUS
@@ -477,7 +477,7 @@*/ .macro KMODEmfc0 t0,CP0_STATUS - li t1, ST0_CU0 | (STATMASK & ~1) + li t1, ST0_KERNEL_CUMASK | (STATMASK & ~1)#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )andi t2, t0,ST0_IEP srl t2, 2
arch/mips/kernel/head.S +1 -1
@@ -35,7 +35,7 @@ .macro setup_c0_status set clr .set push mfc0 t0, CP0_STATUS - or t0, ST0_CU0|\set|0x1f|\clr + or t0, ST0_KERNEL_CUMASK|\set|0x1f|\clr xor t0, 0x1f|\clr mtc0 t0, CP0_STATUS .set noreorder
arch/mips/kernel/process.c +1 -1
@@ -68,7 +68,7 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)unsigned long status;/* New thread loses kernel privileges. */ - status = regs->cp0_status & ~(ST0_CU0 |ST0_CU1 |ST0_FR |KU_MASK ); + status = regs->cp0_status & ~(ST0_CU0 |ST0_CU1 |ST0_CU2 |ST0_FR |KU_MASK ); status |=KU_USER ; regs->cp0_status = status;lose_fpu (0 );
arch/mips/kernel/traps.c +1 -1
@@ -2190,7 +2190,7 @@ static void configure_status(void)* flag that some firmware may have left set and the TS bit (for * IP27). Set XX for ISA IV code to work. */ -unsigned int status_set =ST0_CU0 ; +unsigned int status_set =ST0_KERNEL_CUMASK ;#ifdef CONFIG_64BIT status_set |=ST0_FR |ST0_KX |ST0_SX |ST0_UX ;#endif
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Quoted 5 lines · Thomas Bogendoerfer
Quoted 3 lines · Jiaxun Yang
Thus we still need to enable CU2 with exception for user space, and we can always enable CU2 in
kernel since kernel won't be compiled with hard-float. :-)I see, how about the patch below
That looks fine for me.
Is it good with you, Huacai?
Thanks.
- Jiaxun
Quoted 93 lines
Thomas.
arch/mips/include/asm/mipsregs.h +7
-0@@ -389,6 +389,13 @@#define ST0_CU3 0x80000000#define ST0_XX 0x80000000/* MIPS IV naming */ +/* in-kernel enabled CUs */ +#ifdef CONFIG_CPU_LOONGSOON64 +#define ST0_KERNEL_CUMASK (ST0_CU0 | ST_CU2) +#else +#define ST0_KERNEL_CUMASK ST0_CU0 +#endif +/* * Bitfields and bit numbers in the coprocessor 0 IntCtl register. (MIPSR2) */ arch/mips/include/asm/stackframe.h +3
-3@@ -450,7 +450,7 @@*/ .macro CLImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_KERNEL_CUMASK | STATMASK or t0, t1 xori t0, STATMASK mtc0 t0, CP0_STATUS@@ -463,7 +463,7 @@*/ .macro STImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_KERNEL_CUMASK | STATMASK or t0, t1 xori t0, STATMASK & ~1 mtc0 t0, CP0_STATUS@@ -477,7 +477,7 @@*/ .macro KMODEmfc0 t0,CP0_STATUS - li t1, ST0_CU0 | (STATMASK & ~1) + li t1, ST0_KERNEL_CUMASK | (STATMASK & ~1)#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )andi t2, t0,ST0_IEP srl t2, 2arch/mips/kernel/head.S +1
-1@@ -35,7 +35,7 @@ .macro setup_c0_status set clr .set push mfc0 t0, CP0_STATUS - or t0, ST0_CU0|\set|0x1f|\clr + or t0, ST0_KERNEL_CUMASK|\set|0x1f|\clr xor t0, 0x1f|\clr mtc0 t0, CP0_STATUS .set noreorderarch/mips/kernel/process.c +1
-1@@ -68,7 +68,7 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)unsigned long status;/* New thread loses kernel privileges. */ - status = regs->cp0_status & ~(ST0_CU0 |ST0_CU1 |ST0_FR |KU_MASK ); + status = regs->cp0_status & ~(ST0_CU0 |ST0_CU1 |ST0_CU2 |ST0_FR |KU_MASK ); status |=KU_USER ; regs->cp0_status = status;lose_fpu (0 );arch/mips/kernel/traps.c +1
-1@@ -2190,7 +2190,7 @@ static void configure_status(void)* flag that some firmware may have left set and the TS bit (for * IP27). Set XX for ISA IV code to work. */ -unsigned int status_set =ST0_CU0 ; +unsigned int status_set =ST0_KERNEL_CUMASK ;#ifdef CONFIG_64BIT status_set |=ST0_FR |ST0_KX |ST0_SX |ST0_UX ;#endif
Hi, Thomas and Jiaxun,
Quoted 11 lines · Jiaxun Yang
Quoted 5 lines · Thomas Bogendoerfer
Quoted 3 lines · Jiaxun Yang
Thus we still need to enable CU2 with exception for user space, and we can always enable CU2 in
kernel since kernel won't be compiled with hard-float. :-)I see, how about the patch below
That looks fine for me.
Is it good with you, Huacai?
There are two problems:
1, zboot (arch/mips/boot/compressed/head.S) should be considered, because the initial value of Status may or may not contain CU2. 2, r4k_switch.S should set CU2 for the new process, otherwise it cannot use gslq/gssq while it in kernel (Because the new process doesn't contain CU2 inTHERAD_STATUS. Though a process sets CU2 when it enters kernel, but it only sets CU2 in hardware, not in THREAD_STATUS).
Huacai
Quoted 98 lines
Thanks.
- Jiaxun
Quoted 93 lines
Thomas.
arch/mips/include/asm/mipsregs.h +7
-0@@ -389,6 +389,13 @@#define ST0_CU3 0x80000000#define ST0_XX 0x80000000/* MIPS IV naming */ +/* in-kernel enabled CUs */ +#ifdef CONFIG_CPU_LOONGSOON64 +#define ST0_KERNEL_CUMASK (ST0_CU0 | ST_CU2) +#else +#define ST0_KERNEL_CUMASK ST0_CU0 +#endif +/* * Bitfields and bit numbers in the coprocessor 0 IntCtl register. (MIPSR2) */ arch/mips/include/asm/stackframe.h +3
-3@@ -450,7 +450,7 @@*/ .macro CLImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_KERNEL_CUMASK | STATMASK or t0, t1 xori t0, STATMASK mtc0 t0, CP0_STATUS@@ -463,7 +463,7 @@*/ .macro STImfc0 t0,CP0_STATUS - li t1, ST0_CU0 | STATMASK + li t1, ST0_KERNEL_CUMASK | STATMASK or t0, t1 xori t0, STATMASK & ~1 mtc0 t0, CP0_STATUS@@ -477,7 +477,7 @@*/ .macro KMODEmfc0 t0,CP0_STATUS - li t1, ST0_CU0 | (STATMASK & ~1) + li t1, ST0_KERNEL_CUMASK | (STATMASK & ~1)#if defined(CONFIG_CPU_R3000 ) || defined(CONFIG_CPU_TX39XX )andi t2, t0,ST0_IEP srl t2, 2arch/mips/kernel/head.S +1
-1@@ -35,7 +35,7 @@ .macro setup_c0_status set clr .set push mfc0 t0, CP0_STATUS - or t0, ST0_CU0|\set|0x1f|\clr + or t0, ST0_KERNEL_CUMASK|\set|0x1f|\clr xor t0, 0x1f|\clr mtc0 t0, CP0_STATUS .set noreorderarch/mips/kernel/process.c +1
-1@@ -68,7 +68,7 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)unsigned long status;/* New thread loses kernel privileges. */ - status = regs->cp0_status & ~(ST0_CU0 |ST0_CU1 |ST0_FR |KU_MASK ); + status = regs->cp0_status & ~(ST0_CU0 |ST0_CU1 |ST0_CU2 |ST0_FR |KU_MASK ); status |=KU_USER ; regs->cp0_status = status;lose_fpu (0 );arch/mips/kernel/traps.c +1
-1@@ -2190,7 +2190,7 @@ static void configure_status(void)* flag that some firmware may have left set and the TS bit (for * IP27). Set XX for ISA IV code to work. */ -unsigned int status_set =ST0_CU0 ; +unsigned int status_set =ST0_KERNEL_CUMASK ;#ifdef CONFIG_64BIT status_set |=ST0_FR |ST0_KX |ST0_SX |ST0_UX ;#endif
Thomas Bogendoerfer
maintainerQuoted 11 lines · Huacai Chen
Hi, Thomas and Jiaxun,
Quoted 8 lines · Jiaxun Yang
Quoted 4 lines · Thomas Bogendoerfer
Quoted 3 lines · Jiaxun Yang
Thus we still need to enable CU2 with exception for user space, and we can always enable CU2 in
kernel since kernel won't be compiled with hard-float. :-)
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
I see, how about the patch below
That looks fine for me.
Is it good with you, Huacai?There are two problems:
1, zboot (arch/mips/boot/compressed/head.S) should be considered, because the initial value of Status may or may not contain CU2.
this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
Quoted 3 lines
2,
r4k_switch.Sshould set CU2 for the new process, otherwise it cannot use gslq/gssq while it in kernel (Because the new process doesn't contain CU2 inTHERAD_STATUS.
which is correct for all user space process, otherwise the whole cop2 exception thing wouldn't work. And if cop2 exception handling has been run it's set in THREAD_STATUS.
Quoted 2 lines
Though a process sets CU2 when it enters kernel, but it only sets CU2 in hardware, not in
THREAD_STATUS).
A kernel thread will get THREAD_STATUS from current running kernel code, at least that's how I read this code:
if (unlikely(p->flags & PF_KTHREAD)) {
/* kernel thread */
unsigned long status = p->thread.cp0_status;
memset(childregs, 0, sizeof(struct pt_regs));
ti->addr_limit = KERNEL_DS;
p->thread.reg16 = usp; /* fn */
p->thread.reg17 = kthread_arg;
p->thread.reg29 = childksp;
p->thread.reg31 = (unsigned long) ret_from_kernel_thread;
#if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
status = (status & ~(ST0_KUP | ST0_IEP | ST0_IEC)) |
((status & (ST0_KUC | ST0_IEC)) << 2);
#else
status |= ST0_EXL;
#endif
childregs->cp0_status = status;
return 0;
}If there is still something missing, I want to find the root cause and not paper over it in r4k_switch.S and IMHO break COP2 handling for loongsoon completely.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Hi, Thomas,
Quoted 17 lines · Thomas Bogendoerfer
Quoted 15 lines · Huacai Chen
Hi, Thomas and Jiaxun,
Quoted 11 lines · Jiaxun Yang
Quoted 5 lines · Thomas Bogendoerfer
Quoted 3 lines · Jiaxun Yang
Thus we still need to enable CU2 with exception for user space, and we can always enable CU2 in
kernel since kernel won't be compiled with hard-float. :-)I see, how about the patch below
That looks fine for me.
Is it good with you, Huacai?
Quoted 6 lines
Quoted 3 lines
There are two problems:
1, zboot (arch/mips/boot/compressed/head.S) should be considered, because the initial value of Status may or may not contain CU2.this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
gslq/gssq can also be generated by toolchains.
Quoted 9 lines
Quoted 4 lines
2,
r4k_switch.Sshould set CU2 for the new process, otherwise it cannot use gslq/gssq while it in kernel (Because the new process doesn't contain CU2 inTHERAD_STATUS.which is correct for all user space process, otherwise the whole cop2 exception thing wouldn't work. And if cop2 exception handling has been run it's set in
THREAD_STATUS.
THREAD_STATUS means thread_struct.cp0_status, which is the cp0_status when a process runs in kernel-space. KSTK_STATUS (what you have seen in copy_thread_tls() below) means cp0_status in a process's kernel stack, which saves the cp0_status when a process runs in user-space. Whether COP2 exception can work depends on that KSTK_STATUS (but not THREAD_STATUS) should not contain CU2 at the first time. So, whether or not THREAD_STATUS contains CU2, it won't break COP2 handling.
Huacai
Quoted 34 lines
Quoted 2 lines
Though a process sets CU2 when it enters kernel, but it only sets CU2 in hardware, not in
THREAD_STATUS).A kernel thread will get
THREAD_STATUSfrom current running kernel code, at least that's how I read this code:if (unlikely(p->flags & PF_KTHREAD)) { /* kernel thread */ unsigned long status = p->thread.cp0_status; memset(childregs, 0, sizeof(struct pt_regs)); ti->addr_limit = KERNEL_DS; p->thread.reg16 = usp; /* fn */ p->thread.reg17 = kthread_arg; p->thread.reg29 = childksp; p->thread.reg31 = (unsigned long) ret_from_kernel_thread; #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX) status = (status & ~(ST0_KUP | ST0_IEP | ST0_IEC)) | ((status & (ST0_KUC | ST0_IEC)) << 2); #else status |= ST0_EXL; #endif childregs->cp0_status = status; return 0; }If there is still something missing, I want to find the root cause and not paper over it in
r4k_switch.Sand IMHO break COP2 handling for loongsoon completely.Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
Quoted 16 lines · Huacai Chen
Hi, Thomas,
Quoted 12 lines · Thomas Bogendoerfer
Quoted 11 lines · Huacai Chen
Hi, Thomas and Jiaxun,
Quoted 8 lines · Jiaxun Yang
Quoted 5 lines · Thomas Bogendoerfer
Quoted 3 lines · Jiaxun Yang
Thus we still need to enable CU2 with exception for user space, and we can always enable CU2 in
kernel since kernel won't be compiled with hard-float. :-)I see, how about the patch below
Quoted 8 lines
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
That looks fine for me.
Is it good with you, Huacai?There are two problems:
1, zboot (arch/mips/boot/compressed/head.S) should be considered, because the initial value of Status may or may not contain CU2.this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
gslq/gssq can also be generated by toolchains.
To correct myself, GSLQ/GSSQ won't be generated by current upstream GCC with msoft-float but it is possible to happen with Loongson's GCC 4.9/7 fork.
And I think we should care this case as well....
Thanks.
- Jiaxun
Thomas Bogendoerfer
maintainerQuoted 5 lines · Huacai Chen
Quoted 2 lines · Thomas Bogendoerfer
this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
gslq/gssq can also be generated by toolchains.
I don't want to introduce every single CPU optimization bits into such a closed first stage loader. So please use $(filter-out) in arch/mips/boot/compressed/Makefile to disable creation of 16byte load/stores.
Quoted 11 lines
Quoted 4 lines
which is correct for all user space process, otherwise the whole cop2 exception thing wouldn't work. And if cop2 exception handling has been run it's set in
THREAD_STATUS.
THREAD_STATUSmeans thread_struct.cp0_status, which is thecp0_statuswhen a process runs in kernel-space.KSTK_STATUS(what you have seen incopy_thread_tls()below) meanscp0_statusin a process's kernel stack, which saves thecp0_statuswhen a process runs in user-space. Whether COP2 exception can work depends on thatKSTK_STATUS(but notTHREAD_STATUS) should not contain CU2 at the first time. So, whether or notTHREAD_STATUScontains CU2, it won't break COP2 handling.
so why don't we fix the the in-kernel cp0_status instead ?
How about this ?
arch/mips/kernel/process.c +1 -0
@@ -133,6 +133,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp,/* Put the stack after the struct pt_regs. */ childksp = (unsigned long ) childregs; p->thread.cp0_status =read_c0_status () & ~(ST0_CU2 |ST0_CU1 ); + p->thread.cp0_status |=ST0_KERNEL_CUMASK ;if (unlikely (p->flags &PF_KTHREAD )) {/* kernel thread */ unsigned long status = p->thread.cp0_status;
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Hi, Thomas,
Quoted 33 lines · Thomas Bogendoerfer
Quoted 5 lines · Huacai Chen
Quoted 2 lines · Thomas Bogendoerfer
this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
gslq/gssq can also be generated by toolchains.
I don't want to introduce every single CPU optimization bits into such a closed first stage loader. So please use $(filter-out) in
arch/mips/boot/compressed/Makefileto disable creation of 16byte load/stores.Quoted 11 lines
Quoted 4 lines
which is correct for all user space process, otherwise the whole cop2 exception thing wouldn't work. And if cop2 exception handling has been run it's set in
THREAD_STATUS.
THREAD_STATUSmeans thread_struct.cp0_status, which is thecp0_statuswhen a process runs in kernel-space.KSTK_STATUS(what you have seen incopy_thread_tls()below) meanscp0_statusin a process's kernel stack, which saves thecp0_statuswhen a process runs in user-space. Whether COP2 exception can work depends on thatKSTK_STATUS(but notTHREAD_STATUS) should not contain CU2 at the first time. So, whether or notTHREAD_STATUScontains CU2, it won't break COP2 handling.so why don't we fix the the in-kernel
cp0_statusinstead ?How about this ?
arch/mips/kernel/process.c +0
-0
arch/mips/kernel/process.c int copy_thread_tls(unsigned long clone_flags, unsigned long usp, · line 139
Quoted 7 lines
arch/mips/kernel/process.c +1
-0@@ -133,6 +133,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp,/* Put the stack after the struct pt_regs. */ childksp = (unsigned long ) childregs; p->thread.cp0_status =read_c0_status () & ~(ST0_CU2 |ST0_CU1 ); + p->thread.cp0_status |=ST0_KERNEL_CUMASK ;if (unlikely (p->flags &PF_KTHREAD )) {/* kernel thread */ unsigned long status = p->thread.cp0_status;
This seems a good idea, I will send a new version.
Huacai
Quoted 6 lines
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
Thomas Bogendoerfer
maintainerQuoted 32 lines · Huacai Chen
Hi, Thomas,
Quoted 28 lines · Thomas Bogendoerfer
Quoted 5 lines · Huacai Chen
Quoted 2 lines · Thomas Bogendoerfer
this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
gslq/gssq can also be generated by toolchains.
I don't want to introduce every single CPU optimization bits into such a closed first stage loader. So please use $(filter-out) in
arch/mips/boot/compressed/Makefileto disable creation of 16byte load/stores.Quoted 11 lines
Quoted 4 lines
which is correct for all user space process, otherwise the whole cop2 exception thing wouldn't work. And if cop2 exception handling has been run it's set in
THREAD_STATUS.
THREAD_STATUSmeans thread_struct.cp0_status, which is thecp0_statuswhen a process runs in kernel-space.KSTK_STATUS(what you have seen incopy_thread_tls()below) meanscp0_statusin a process's kernel stack, which saves thecp0_statuswhen a process runs in user-space. Whether COP2 exception can work depends on thatKSTK_STATUS(but notTHREAD_STATUS) should not contain CU2 at the first time. So, whether or notTHREAD_STATUScontains CU2, it won't break COP2 handling.so why don't we fix the the in-kernel
cp0_statusinstead ?How about this ?
Quoted 13 lines
arch/mips/kernel/process.c int copy_thread_tls(unsigned long clone_flags, unsigned long usp, · line 139
Quoted 12 lines
arch/mips/kernel/process.c +1
-0@@ -133,6 +133,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp,/* Put the stack after the struct pt_regs. */ childksp = (unsigned long ) childregs; p->thread.cp0_status =read_c0_status () & ~(ST0_CU2 |ST0_CU1 ); + p->thread.cp0_status |=ST0_KERNEL_CUMASK ;if (unlikely (p->flags &PF_KTHREAD )) {/* kernel thread */ unsigned long status = p->thread.cp0_status;This seems a good idea, I will send a new version.
IMHO it migt be even better to just use
p->thread.cp0_status = read_c0_status();
without masking. We are in kernel, so we took care of whatever CU1/CU2 handling had to be done at kernel entry. So keeping the current cp0 status for the new thread looks more sane to me.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Hi, Thomas,
Quoted 48 lines · Thomas Bogendoerfer
Quoted 32 lines · Huacai Chen
Hi, Thomas,
Quoted 28 lines · Thomas Bogendoerfer
Quoted 5 lines · Huacai Chen
Quoted 2 lines · Thomas Bogendoerfer
this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
gslq/gssq can also be generated by toolchains.
I don't want to introduce every single CPU optimization bits into such a closed first stage loader. So please use $(filter-out) in
arch/mips/boot/compressed/Makefileto disable creation of 16byte load/stores.Quoted 11 lines
Quoted 4 lines
which is correct for all user space process, otherwise the whole cop2 exception thing wouldn't work. And if cop2 exception handling has been run it's set in
THREAD_STATUS.
THREAD_STATUSmeans thread_struct.cp0_status, which is thecp0_statuswhen a process runs in kernel-space.KSTK_STATUS(what you have seen incopy_thread_tls()below) meanscp0_statusin a process's kernel stack, which saves thecp0_statuswhen a process runs in user-space. Whether COP2 exception can work depends on thatKSTK_STATUS(but notTHREAD_STATUS) should not contain CU2 at the first time. So, whether or notTHREAD_STATUScontains CU2, it won't break COP2 handling.so why don't we fix the the in-kernel
cp0_statusinstead ?How about this ?
Quoted 13 lines
arch/mips/kernel/process.c int copy_thread_tls(unsigned long clone_flags, unsigned long usp, · line 139
Quoted 12 lines
arch/mips/kernel/process.c +1
-0@@ -133,6 +133,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp,/* Put the stack after the struct pt_regs. */ childksp = (unsigned long ) childregs; p->thread.cp0_status =read_c0_status () & ~(ST0_CU2 |ST0_CU1 ); + p->thread.cp0_status |=ST0_KERNEL_CUMASK ;if (unlikely (p->flags &PF_KTHREAD )) {/* kernel thread */ unsigned long status = p->thread.cp0_status;This seems a good idea, I will send a new version.
Quoted 7 lines
IMHO it migt be even better to just use
p->thread.cp0_status=read_c0_status();without masking. We are in kernel, so we took care of whatever CU1/CU2 handling had to be done at kernel entry. So keeping the current cp0 status for the new thread looks more sane to me.
I think this may cause FPU be enabled in kernel by mistake.
Quoted 6 lines
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
Thomas Bogendoerfer
maintainerQuoted 52 lines · Huacai Chen
Hi, Thomas,
Quoted 48 lines · Thomas Bogendoerfer
Quoted 45 lines · Huacai Chen
Hi, Thomas,
Quoted 33 lines · Thomas Bogendoerfer
Quoted 5 lines · Huacai Chen
Quoted 2 lines · Thomas Bogendoerfer
this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
gslq/gssq can also be generated by toolchains.
I don't want to introduce every single CPU optimization bits into such a closed first stage loader. So please use $(filter-out) in
arch/mips/boot/compressed/Makefileto disable creation of 16byte load/stores.Quoted 11 lines
Quoted 4 lines
which is correct for all user space process, otherwise the whole cop2 exception thing wouldn't work. And if cop2 exception handling has been run it's set in
THREAD_STATUS.
THREAD_STATUSmeans thread_struct.cp0_status, which is thecp0_statuswhen a process runs in kernel-space.KSTK_STATUS(what you have seen incopy_thread_tls()below) meanscp0_statusin a process's kernel stack, which saves thecp0_statuswhen a process runs in user-space. Whether COP2 exception can work depends on thatKSTK_STATUS(but notTHREAD_STATUS) should not contain CU2 at the first time. So, whether or notTHREAD_STATUScontains CU2, it won't break COP2 handling.so why don't we fix the the in-kernel
cp0_statusinstead ?How about this ?
arch/mips/kernel/process.c +0
-0arch/mips/kernel/process.c int copy_thread_tls(unsigned long clone_flags, unsigned long usp, · line 139
Quoted 7 lines
arch/mips/kernel/process.c +1
-0@@ -133,6 +133,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp,/* Put the stack after the struct pt_regs. */ childksp = (unsigned long ) childregs; p->thread.cp0_status =read_c0_status () & ~(ST0_CU2 |ST0_CU1 ); + p->thread.cp0_status |=ST0_KERNEL_CUMASK ;if (unlikely (p->flags &PF_KTHREAD )) {/* kernel thread */ unsigned long status = p->thread.cp0_status;This seems a good idea, I will send a new version.
Quoted 8 lines
Quoted 7 lines
IMHO it migt be even better to just use
p->thread.cp0_status=read_c0_status();without masking. We are in kernel, so we took care of whatever CU1/CU2 handling had to be done at kernel entry. So keeping the current cp0 status for the new thread looks more sane to me.
I think this may cause FPU be enabled in kernel by mistake.
if it is enabled at that point, it was already enabled in kernel.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Hi, Thomas,
Quoted 56 lines · Thomas Bogendoerfer
Quoted 54 lines · Huacai Chen
Hi, Thomas,
Quoted 50 lines · Thomas Bogendoerfer
Quoted 32 lines · Huacai Chen
Hi, Thomas,
Quoted 28 lines · Thomas Bogendoerfer
Quoted 5 lines · Huacai Chen
Quoted 2 lines · Thomas Bogendoerfer
this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
gslq/gssq can also be generated by toolchains.
I don't want to introduce every single CPU optimization bits into such a closed first stage loader. So please use $(filter-out) in
arch/mips/boot/compressed/Makefileto disable creation of 16byte load/stores.Quoted 11 lines
Quoted 4 lines
which is correct for all user space process, otherwise the whole cop2 exception thing wouldn't work. And if cop2 exception handling has been run it's set in
THREAD_STATUS.
THREAD_STATUSmeans thread_struct.cp0_status, which is thecp0_statuswhen a process runs in kernel-space.KSTK_STATUS(what you have seen incopy_thread_tls()below) meanscp0_statusin a process's kernel stack, which saves thecp0_statuswhen a process runs in user-space. Whether COP2 exception can work depends on thatKSTK_STATUS(but notTHREAD_STATUS) should not contain CU2 at the first time. So, whether or notTHREAD_STATUScontains CU2, it won't break COP2 handling.so why don't we fix the the in-kernel
cp0_statusinstead ?How about this ?
Quoted 13 lines
arch/mips/kernel/process.c int copy_thread_tls(unsigned long clone_flags, unsigned long usp, · line 139
Quoted 12 lines
arch/mips/kernel/process.c +1
-0@@ -133,6 +133,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp,/* Put the stack after the struct pt_regs. */ childksp = (unsigned long ) childregs; p->thread.cp0_status =read_c0_status () & ~(ST0_CU2 |ST0_CU1 ); + p->thread.cp0_status |=ST0_KERNEL_CUMASK ;if (unlikely (p->flags &PF_KTHREAD )) {/* kernel thread */ unsigned long status = p->thread.cp0_status;This seems a good idea, I will send a new version.
IMHO it migt be even better to just use
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
p->thread.cp0_status=read_c0_status();without masking. We are in kernel, so we took care of whatever CU1/CU2 handling had to be done at kernel entry. So keeping the current cp0 status for the new thread looks more sane to me.
I think this may cause FPU be enabled in kernel by mistake.
if it is enabled at that point, it was already enabled in kernel.
In kernel FPU may be enabled temporarily, and it seems a preemptible kernel may enable FPU for a new process (maybe I'm wrong, this is a bit complex).
Huacai
Quoted 6 lines
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
Thomas Bogendoerfer
maintainerQuoted 8 lines · Huacai Chen
Hi, Thomas,
Quoted 1 line · Thomas Bogendoerfer
if it is enabled at that point, it was already enabled in kernel.
In kernel FPU may be enabled temporarily, and it seems a preemptible kernel may enable FPU for a new process (maybe I'm wrong, this is a bit complex).
no you are completly right. We need to clear CU1 in this place otherwise a orphan cpu warning will trigger. It's enabled, if the current thread owns it, but the newly created thread doesn't.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Hi, Thomas,
Quoted 33 lines · Thomas Bogendoerfer
Quoted 5 lines · Huacai Chen
Quoted 2 lines · Thomas Bogendoerfer
this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
gslq/gssq can also be generated by toolchains.
I don't want to introduce every single CPU optimization bits into such a closed first stage loader. So please use $(filter-out) in
arch/mips/boot/compressed/Makefileto disable creation of 16byte load/stores.Quoted 11 lines
Quoted 4 lines
which is correct for all user space process, otherwise the whole cop2 exception thing wouldn't work. And if cop2 exception handling has been run it's set in
THREAD_STATUS.
THREAD_STATUSmeans thread_struct.cp0_status, which is thecp0_statuswhen a process runs in kernel-space.KSTK_STATUS(what you have seen incopy_thread_tls()below) meanscp0_statusin a process's kernel stack, which saves thecp0_statuswhen a process runs in user-space. Whether COP2 exception can work depends on thatKSTK_STATUS(but notTHREAD_STATUS) should not contain CU2 at the first time. So, whether or notTHREAD_STATUScontains CU2, it won't break COP2 handling.so why don't we fix the the in-kernel
cp0_statusinstead ?How about this ?
arch/mips/kernel/process.c +0
-0
arch/mips/kernel/process.c int copy_thread_tls(unsigned long clone_flags, unsigned long usp, · line 139
Quoted 7 lines
arch/mips/kernel/process.c +1
-0@@ -133,6 +133,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp,/* Put the stack after the struct pt_regs. */ childksp = (unsigned long ) childregs; p->thread.cp0_status =read_c0_status () & ~(ST0_CU2 |ST0_CU1 ); + p->thread.cp0_status |=ST0_KERNEL_CUMASK ;if (unlikely (p->flags &PF_KTHREAD )) {/* kernel thread */ unsigned long status = p->thread.cp0_status;
I tried this way but it doesn't work, the reason is that the resume routine in r4k_switch.S save the current hardware status into THREAD_STATUS, but CU2 in hardware is cleared in its caller (i.e., switch_to). However, I will send V5 to use ST0_KERNEL_CUMASK in all possible places to avoid #ifdefs.
Huacai
Quoted 6 lines
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
Thomas Bogendoerfer
maintainerQuoted 32 lines · Huacai Chen
Hi, Thomas,
Quoted 28 lines · Thomas Bogendoerfer
Quoted 5 lines · Huacai Chen
Quoted 2 lines · Thomas Bogendoerfer
this comes with it's own memcpy/memset and stuff, I don't see a reason why COP2 needs to be enabled there,
gslq/gssq can also be generated by toolchains.
I don't want to introduce every single CPU optimization bits into such a closed first stage loader. So please use $(filter-out) in
arch/mips/boot/compressed/Makefileto disable creation of 16byte load/stores.Quoted 11 lines
Quoted 4 lines
which is correct for all user space process, otherwise the whole cop2 exception thing wouldn't work. And if cop2 exception handling has been run it's set in
THREAD_STATUS.
THREAD_STATUSmeans thread_struct.cp0_status, which is thecp0_statuswhen a process runs in kernel-space.KSTK_STATUS(what you have seen incopy_thread_tls()below) meanscp0_statusin a process's kernel stack, which saves thecp0_statuswhen a process runs in user-space. Whether COP2 exception can work depends on thatKSTK_STATUS(but notTHREAD_STATUS) should not contain CU2 at the first time. So, whether or notTHREAD_STATUScontains CU2, it won't break COP2 handling.so why don't we fix the the in-kernel
cp0_statusinstead ?How about this ?
Quoted 16 lines
arch/mips/kernel/process.c int copy_thread_tls(unsigned long clone_flags, unsigned long usp, · line 139
Quoted 12 lines
arch/mips/kernel/process.c +1
-0@@ -133,6 +133,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp,/* Put the stack after the struct pt_regs. */ childksp = (unsigned long ) childregs; p->thread.cp0_status =read_c0_status () & ~(ST0_CU2 |ST0_CU1 ); + p->thread.cp0_status |=ST0_KERNEL_CUMASK ;if (unlikely (p->flags &PF_KTHREAD )) {/* kernel thread */ unsigned long status = p->thread.cp0_status;I tried this way but it doesn't work, the reason is that the resume routine in
r4k_switch.Ssave the current hardware status intoTHREAD_STATUS, but CU2 in hardware is cleared in its caller (i.e.,switch_to).
so let's fix it there:
arch/mips/include/asm/switch_to.h +3 -1
@@ -117,6 +117,8 @@ do { \__restore_dsp (next); \ } \if (cop2_present) { \ +u32 status =read_c0_status (); \ + \set_c0_status (ST0_CU2 ); \if ((KSTK_STATUS (prev) &ST0_CU2 )) { \if (cop2_lazy_restore) \
@@ -127,7 +129,7 @@ do { \ !cop2_lazy_restore) { \cop2_restore (next); \ } \ -clear_c0_status (ST0_CU2 ); \ +write_c0_status (status); \ } \__clear_r5_hw_ll_bit (); \__clear_software_ll_bit (); \
BTW. if we come up to a final solution, this change should be a seperate patch. And the change in process.c probably, too.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]