Skip to contentSkip to conversation

PPC: Add generic FPU api similar to x86

RFC In review Anson Jacob 4 participants 9 messages Jul 21, 2021 – Jul 25, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v2 cover PPC: Add generic FPU api similar to x86

This is an attempt to have generic FPU enable/disable calls similar to x86.
So that we can simplify gpu/drm/amd/display/dc/os_types.h

Also adds FPU correctness logic seen in x86.

v2:
- Added asm/fpu/api.h powerpc variant with kernel_fpu_begin/end() and kernel_fpu_enabled() declarations
- Updated kernel_fpu_enabled as EXPORT_SYMBOL_GPL
- Got rid of macro switch for PPC in dc/os_types.h as header file with same name as x86 is added by previous patch in the series

Anson Jacob (2):
ppc/fpu: Add generic FPU api similar to x86
drm/amd/display: Use PPC FPU functions

 arch/powerpc/include/asm/fpu/api.h        |  18 +++
 arch/powerpc/include/asm/switch_to.h      |  25 +----
 arch/powerpc/kernel/process.c             | 130 ++++++++++++++++++++++
 drivers/gpu/drm/amd/display/dc/os_types.h |  29 -----
 4 files changed, 151 insertions(+), 51 deletions(-)
 create mode 100644 arch/powerpc/include/asm/fpu/api.h
Signature · 6 lines
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#1 lore raw

RFC v2 1/2 ppc/fpu: Add generic FPU api similar to x86

- Add kernel_fpu_begin & kernel_fpu_end API as x86
- Add logic similar to x86 to ensure fpu begin/end call correctness
- Add kernel_fpu_enabled to know if FPU is enabled

v2:
- Added asm/fpu/api.h powerpc variant with kernel_fpu_begin/end() and kernel_fpu_enabled() declarations
- Updated kernel_fpu_enabled as EXPORT_SYMBOL_GPL

CC Christoph Hellwig <[email protected]>
CC Rodrigo Siqueira <[email protected]>
CC Harry Wentland <[email protected]>
CC Christian König <[email protected]>
---
 arch/powerpc/include/asm/fpu/api.h   |  18 ++++
 arch/powerpc/include/asm/switch_to.h |  25 +-----
 arch/powerpc/kernel/process.c        | 130 +++++++++++++++++++++++++++
 3 files changed, 151 insertions(+), 22 deletions(-)
 create mode 100644 arch/powerpc/include/asm/fpu/api.h
arch/powerpc/include/asm/fpu/api.h new file +18 -0
new file mode 100644
index 000000000000..57308cdc65c9
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef _ASM_POWERPC_FPU_API_H
+#define _ASM_POWERPC_FPU_API_H
+
+/*
+ * Use kernel_fpu_begin/end() if you intend to use FPU in kernel context. It
+ * disables preemption so be careful if you intend to use it for long periods
+ * of time.
+ * TODO: If you intend to use the FPU in irq/softirq you need to check first with
+ * irq_fpu_usable() if it is possible.
+ */
+
+extern bool kernel_fpu_enabled(void);
+extern void kernel_fpu_begin(void);
+extern void kernel_fpu_end(void);
+
+#endif /* _ASM_POWERPC_FPU_API_H */
arch/powerpc/include/asm/switch_to.h +3 -22
index 9d1fbd8be1c7..a9a919279f48 100644
@@ -41,10 +41,7 @@ extern void enable_kernel_fp(void);
 extern void flush_fp_to_thread(struct task_struct *);
 extern void giveup_fpu(struct task_struct *);
 extern void save_fpu(struct task_struct *);
-static inline void disable_kernel_fp(void)
-{
-	msr_check_and_clear(MSR_FP);
-}
+extern void disable_kernel_fp(void);
 #else
 static inline void save_fpu(struct task_struct *t) { }
 static inline void flush_fp_to_thread(struct task_struct *t) { }
@@ -55,10 +52,7 @@ extern void enable_kernel_altivec(void);
 extern void flush_altivec_to_thread(struct task_struct *);
 extern void giveup_altivec(struct task_struct *);
 extern void save_altivec(struct task_struct *);
-static inline void disable_kernel_altivec(void)
-{
-	msr_check_and_clear(MSR_VEC);
-}
+extern void disable_kernel_altivec(void);
 #else
 static inline void save_altivec(struct task_struct *t) { }
 static inline void __giveup_altivec(struct task_struct *t) { }
@@ -67,20 +61,7 @@ static inline void __giveup_altivec(struct task_struct *t) { }
 #ifdef CONFIG_VSX
 extern void enable_kernel_vsx(void);
 extern void flush_vsx_to_thread(struct task_struct *);
-static inline void disable_kernel_vsx(void)
-{
-	msr_check_and_clear(MSR_FP|MSR_VEC|MSR_VSX);
-}
-#else
-static inline void enable_kernel_vsx(void)
-{
-	BUILD_BUG();
-}
-
-static inline void disable_kernel_vsx(void)
-{
-	BUILD_BUG();
-}
+extern void disable_kernel_vsx(void);
 #endif
 
 #ifdef CONFIG_SPE
arch/powerpc/kernel/process.c +130 -0

178 lines not on this page · raw message

Signature · 6 lines
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#2 lore raw

Re: [RFC v2 1/2] ppc/fpu: Add generic FPU api similar to x86

arch/powerpc/include/asm/fpu/api.h line 11

Quoted 7 lines
arch/powerpc/include/asm/fpu/api.h new file +7 -0
+
+/*
+ * Use kernel_fpu_begin/end() if you intend to use FPU in kernel context. It
+ * disables preemption so be careful if you intend to use it for long periods
+ * of time.
+ * TODO: If you intend to use the FPU in irq/softirq you need to check first with
+ * irq_fpu_usable() if it is possible.

Please avoid the overly lone lines comments.

arch/powerpc/include/asm/fpu/api.h line 16

Quoted 3 lines
arch/powerpc/include/asm/fpu/api.h new file +3 -0
+extern bool kernel_fpu_enabled(void);
+extern void kernel_fpu_begin(void);
+extern void kernel_fpu_end(void);

No need for the externs.

Quoted 3 lines

+/*
+ * Track whether the kernel is using the FPU state
+ * currently.

This all fits on a single line.

arch/powerpc/kernel/process.c void flush_spe_to_thread(struct task_struct *tsk) · line 463

Quoted 9 lines
arch/powerpc/kernel/process.c +9 -0
+static bool fpu_support(void)
+{
+	if (cpu_has_feature(CPU_FTR_VSX_COMP)) {
+		return true;
+	} else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) {
+		return true;
+	} else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) {
+		return true;
+	}

No need for the braces, or else after a return. In fact this could be simplified down to:

	return cpu_has_feature(CPU_FTR_VSX_COMP) ||
		cpu_has_feature(CPU_FTR_ALTIVEC_COMP) ||
		cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE));
Quoted 12 lines
arch/powerpc/kernel/process.c +12 -0
+	preempt_disable();
+
+#ifdef CONFIG_VSX
+	if (cpu_has_feature(CPU_FTR_VSX_COMP)) {
+		enable_kernel_vsx();
+		return;
+	}
+#endif
+
+#ifdef CONFIG_ALTIVEC
+	if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) {
+		enable_kernel_altivec();

arch/powerpc/kernel/process.c void flush_spe_to_thread(struct task_struct *tsk) · line 502

Quoted 10 lines
arch/powerpc/kernel/process.c +10 -0
+		return;
+	}
+#endif
+
+#ifdef CONFIG_PPC_FPU
+	if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) {
+		enable_kernel_fp();
+		return;
+	}
+#endif

All the features are defined away if not supported (and we already rely on that in fpu_support()). So this could become:

	if (cpu_has_feature(CPU_FTR_VSX_COMP))
		enable_kernel_vsx();
	else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP))
		enable_kernel_altivec();
	else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE))
		enable_kernel_fp();

Same for the disable path.

#3 lore raw

Re: [RFC v2 1/2] ppc/fpu: Add generic FPU api similar to x86

In reply to Anson Jacob
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch]

Hi Anson,

[FYI, it's a private test report for your RFC patch.]
[auto build test ERROR on powerpc/next]
[also build test ERROR on linus/master v5.14-rc2 next-20210723] [cannot apply to paulus-powerpc/kvm-ppc-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Anson-Jacob/PPC-Add-generic-FPU-api-similar-to-x86/20210721-125053
base:   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next
config: powerpc-allnoconfig (attached as .config)
compiler: powerpc-linux-gcc (GCC) 10.3.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/d179ebec25f39a1595f42c8f9d7e4ec600ac7e04
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Anson-Jacob/PPC-Add-generic-FPU-api-similar-to-x86/20210721-125053 git checkout d179ebec25f39a1595f42c8f9d7e4ec600ac7e04
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-10.3.0 make.cross ARCH=powerpc

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> arch/powerpc/kernel/process.c:468:6: error: no previous prototype for 'kernel_fpu_enabled' [-Werror=missing-prototypes]
     468 | bool kernel_fpu_enabled(void)
         |      ^~~~~~~~~~~~~~~~~~
>> arch/powerpc/kernel/process.c:474:6: error: no previous prototype for 'kernel_fpu_begin' [-Werror=missing-prototypes]
     474 | void kernel_fpu_begin(void)
         |      ^~~~~~~~~~~~~~~~
>> arch/powerpc/kernel/process.c:506:6: error: no previous prototype for 'kernel_fpu_end' [-Werror=missing-prototypes]
     506 | void kernel_fpu_end(void)
         |      ^~~~~~~~~~~~~~

cc1: all warnings being treated as errors

vim +/kernel_fpu_enabled +468 arch/powerpc/kernel/process.c

467

 > 468	bool kernel_fpu_enabled(void)
   469	{
   470		return this_cpu_read(in_kernel_fpu);
   471	}
   472	EXPORT_SYMBOL_GPL(kernel_fpu_enabled);
   473	
 > 474	void kernel_fpu_begin(void)
   475	{
   476		if (!fpu_support()) {
   477			WARN_ON_ONCE(1);
   478			return;
   479		}
   480	
   481		preempt_disable();
   482	
   483	#ifdef CONFIG_VSX
   484		if (cpu_has_feature(CPU_FTR_VSX_COMP)) {
   485			enable_kernel_vsx();
   486			return;
   487		}
   488	#endif
   489	
   490	#ifdef CONFIG_ALTIVEC
   491		if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) {
   492			enable_kernel_altivec();
   493			return;
   494		}
   495	#endif
   496	
   497	#ifdef CONFIG_PPC_FPU
   498		if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) {
   499			enable_kernel_fp();
   500			return;
   501		}
   502	#endif
   503	}
   504	EXPORT_SYMBOL_GPL(kernel_fpu_begin);
   505	
 > 506	void kernel_fpu_end(void)

507 {
508 if (!fpu_support()) {
509 WARN_ON_ONCE(1);
510 return;
511 }
512

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#4 lore raw

Re: [RFC v2 1/2] ppc/fpu: Add generic FPU api similar to x86

In reply to Anson Jacob
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch]

Hi Anson,

[FYI, it's a private test report for your RFC patch.]
[auto build test WARNING on powerpc/next]
[also build test WARNING on linus/master v5.14-rc2 next-20210723] [cannot apply to paulus-powerpc/kvm-ppc-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Anson-Jacob/PPC-Add-generic-FPU-api-similar-to-x86/20210721-125053
base:   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next
config: powerpc-allyesconfig (attached as .config)
compiler: powerpc-linux-gcc (GCC) 10.3.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/d179ebec25f39a1595f42c8f9d7e4ec600ac7e04
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Anson-Jacob/PPC-Add-generic-FPU-api-similar-to-x86/20210721-125053 git checkout d179ebec25f39a1595f42c8f9d7e4ec600ac7e04
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-10.3.0 make.cross ARCH=powerpc

If you fix the issue, kindly add following tag as appropriate

All warnings (new ones prefixed by >>):

>> arch/powerpc/kernel/process.c:468:6: warning: no previous prototype for 'kernel_fpu_enabled' [-Wmissing-prototypes]
     468 | bool kernel_fpu_enabled(void)
         |      ^~~~~~~~~~~~~~~~~~
>> arch/powerpc/kernel/process.c:474:6: warning: no previous prototype for 'kernel_fpu_begin' [-Wmissing-prototypes]
     474 | void kernel_fpu_begin(void)
         |      ^~~~~~~~~~~~~~~~
>> arch/powerpc/kernel/process.c:506:6: warning: no previous prototype for 'kernel_fpu_end' [-Wmissing-prototypes]
     506 | void kernel_fpu_end(void)
         |      ^~~~~~~~~~~~~~

vim +/kernel_fpu_enabled +468 arch/powerpc/kernel/process.c

467

 > 468	bool kernel_fpu_enabled(void)
   469	{
   470		return this_cpu_read(in_kernel_fpu);
   471	}
   472	EXPORT_SYMBOL_GPL(kernel_fpu_enabled);
   473	
 > 474	void kernel_fpu_begin(void)
   475	{
   476		if (!fpu_support()) {
   477			WARN_ON_ONCE(1);
   478			return;
   479		}
   480	
   481		preempt_disable();
   482	
   483	#ifdef CONFIG_VSX
   484		if (cpu_has_feature(CPU_FTR_VSX_COMP)) {
   485			enable_kernel_vsx();
   486			return;
   487		}
   488	#endif
   489	
   490	#ifdef CONFIG_ALTIVEC
   491		if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) {
   492			enable_kernel_altivec();
   493			return;
   494		}
   495	#endif
   496	
   497	#ifdef CONFIG_PPC_FPU
   498		if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) {
   499			enable_kernel_fp();
   500			return;
   501		}
   502	#endif
   503	}
   504	EXPORT_SYMBOL_GPL(kernel_fpu_begin);
   505	
 > 506	void kernel_fpu_end(void)

507 {
508 if (!fpu_support()) {
509 WARN_ON_ONCE(1);
510 return;
511 }
512

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#5 lore raw

RFC v2 2/2 drm/amd/display: Use PPC FPU functions

In reply to Anson Jacob

Use kernel_fpu_begin & kernel_fpu_end for PPC

Depends on "ppc/fpu: Add generic FPU api similar to x86"

v2:
- Got rid of macro switch for PPC as header file with same name as x86 is added by previous patch in the series

CC Christoph Hellwig <[email protected]>
CC Rodrigo Siqueira <[email protected]>
CC Harry Wentland <[email protected]>
CC Christian König <[email protected]>
---
 drivers/gpu/drm/amd/display/dc/os_types.h | 29 -----------------------
 1 file changed, 29 deletions(-)
drivers/gpu/drm/amd/display/dc/os_types.h +0 -29
index 126c2f3a4dd3..47ef434f93d8 100644
@@ -51,38 +51,9 @@
 #define dm_error(fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__)
 
 #if defined(CONFIG_DRM_AMD_DC_DCN)
-#if defined(CONFIG_X86)
 #include <asm/fpu/api.h>
 #define DC_FP_START() kernel_fpu_begin()
 #define DC_FP_END() kernel_fpu_end()
-#elif defined(CONFIG_PPC64)
-#include <asm/switch_to.h>
-#include <asm/cputable.h>
-#define DC_FP_START() { \
-	if (cpu_has_feature(CPU_FTR_VSX_COMP)) { \
-		preempt_disable(); \
-		enable_kernel_vsx(); \
-	} else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) { \
-		preempt_disable(); \
-		enable_kernel_altivec(); \
-	} else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) { \
-		preempt_disable(); \
-		enable_kernel_fp(); \
-	} \
-}
-#define DC_FP_END() { \
-	if (cpu_has_feature(CPU_FTR_VSX_COMP)) { \
-		disable_kernel_vsx(); \
-		preempt_enable(); \
-	} else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) { \
-		disable_kernel_altivec(); \
-		preempt_enable(); \
-	} else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) { \
-		disable_kernel_fp(); \
-		preempt_enable(); \
-	} \
-}
-#endif
 #endif
 
 /*
Signature · 6 lines
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
maintainer
#6 lore raw

Re: [RFC v2 2/2] drm/amd/display: Use PPC FPU functions

Am 21.07.21 um 06:48 schrieb Anson Jacob:

Quoted 8 lines

Use kernel_fpu_begin & kernel_fpu_end for PPC

Depends on "ppc/fpu: Add generic FPU api similar to x86"

v2:
- Got rid of macro switch for PPC as header file with same name as x86 is added by previous patch in the series

Quoted 5 lines
CC Christoph Hellwig <[email protected]>
CC Rodrigo Siqueira <[email protected]>
CC Harry Wentland <[email protected]>
CC Christian König <[email protected]>

Looks good in general, but question is what about other architectures like ARM?

Regards,
Christian.

Quoted 37 lines
---
  drivers/gpu/drm/amd/display/dc/os_types.h | 29 -----------------------
  1 file changed, 29 deletions(-)
drivers/gpu/drm/amd/display/dc/os_types.h +0 -22
index 126c2f3a4dd3..47ef434f93d8 100644
@@ -51,38 +51,9 @@
  #define dm_error(fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__)
 
  #if defined(CONFIG_DRM_AMD_DC_DCN)
-#if defined(CONFIG_X86)
  #include <asm/fpu/api.h>
  #define DC_FP_START() kernel_fpu_begin()
  #define DC_FP_END() kernel_fpu_end()
-#elif defined(CONFIG_PPC64)
-#include <asm/switch_to.h>
-#include <asm/cputable.h>
-#define DC_FP_START() { \
-	if (cpu_has_feature(CPU_FTR_VSX_COMP)) { \
-		preempt_disable(); \
-		enable_kernel_vsx(); \
-	} else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) { \
-		preempt_disable(); \
-		enable_kernel_altivec(); \
-	} else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) { \
-		preempt_disable(); \
-		enable_kernel_fp(); \
-	} \
-}
-#define DC_FP_END() { \
-	if (cpu_has_feature(CPU_FTR_VSX_COMP)) { \
-		disable_kernel_vsx(); \
-		preempt_enable(); \
-	} else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) { \
-		disable_kernel_altivec(); \

drivers/gpu/drm/amd/display/dc/os_types.h line 59

Quoted 10 lines
drivers/gpu/drm/amd/display/dc/os_types.h +0 -7
-		preempt_enable(); \
-	} else if (!cpu_has_feature(CPU_FTR_FPU_UNAVAILABLE)) { \
-		disable_kernel_fp(); \
-		preempt_enable(); \
-	} \
-}
-#endif
  #endif
 
  /*

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#7 lore raw

Re: [RFC v2 2/2] drm/amd/display: Use PPC FPU functions

Quoted 2 lines · Christian K??nig

Looks good in general, but question is what about other architectures like ARM?

DRM_AMD_DC_DCN currently requires X86 || PPC64.

Maybe a good think would be to add a new KERNEL_FPU_API Kconfig symbol, selected by x86 and powerpc (I think ppc32 should be fine too now) so that we get these arch dependencies out of the driver.

maintainer
#8 lore raw

Re: [RFC v2 2/2] drm/amd/display: Use PPC FPU functions

Am 21.07.21 um 08:51 schrieb Christoph Hellwig:

Quoted 4 lines · Christian K??nig
Quoted 2 lines

Looks good in general, but question is what about other architectures like ARM?

DRM_AMD_DC_DCN currently requires X86 || PPC64.

And exactly that's the problem I'm noting here. At least officially AMD claims that we support ARM and some very brave still use the hardware together with MIPS as well.

Quoted 3 lines

Maybe a good think would be to add a new KERNEL_FPU_API Kconfig symbol, selected by x86 and powerpc (I think ppc32 should be fine too now) so that we get these arch dependencies out of the driver.

Good idea.

Christian.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx