From owner-dev-commits-src-main@freebsd.org Sat Jul 31 13:38:36 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5C85065E38C; Sat, 31 Jul 2021 13:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GcQMc2DG8z4XCl; Sat, 31 Jul 2021 13:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3092419A3B; Sat, 31 Jul 2021 13:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16VDcaHj006995; Sat, 31 Jul 2021 13:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16VDcaSh006994; Sat, 31 Jul 2021 13:38:36 GMT (envelope-from git) Date: Sat, 31 Jul 2021 13:38:36 GMT Message-Id: <202107311338.16VDcaSh006994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 469884cf04a9 - main - LinuxKPI: Make FPU sections thread-safe and use the NOCTX flag. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 469884cf04a9b92677c7c83e229ca6b8814f8b0a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jul 2021 13:38:36 -0000 The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=469884cf04a9b92677c7c83e229ca6b8814f8b0a commit 469884cf04a9b92677c7c83e229ca6b8814f8b0a Author: Hans Petter Selasky AuthorDate: 2021-07-31 13:32:52 +0000 Commit: Hans Petter Selasky CommitDate: 2021-07-31 13:36:48 +0000 LinuxKPI: Make FPU sections thread-safe and use the NOCTX flag. Reviewed by: kib Submitted by: greg@unrelenting.technology Differential Revision: https://reviews.freebsd.org/D29921 MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/compat/linuxkpi/common/include/asm/fpu/api.h | 40 ++++------------------ sys/compat/linuxkpi/common/include/linux/sched.h | 3 +- sys/compat/linuxkpi/common/src/linux_fpu.c | 43 ++++++++++++++++++------ sys/conf/files.amd64 | 3 -- sys/conf/files.arm64 | 4 --- sys/conf/files.i386 | 3 -- sys/modules/linuxkpi/Makefile | 3 +- 7 files changed, 43 insertions(+), 56 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/fpu/api.h b/sys/compat/linuxkpi/common/include/asm/fpu/api.h index 035ec3620fdd..9c63b2e972bf 100644 --- a/sys/compat/linuxkpi/common/include/asm/fpu/api.h +++ b/sys/compat/linuxkpi/common/include/asm/fpu/api.h @@ -28,41 +28,13 @@ #ifndef _FPU_API_H_ #define _FPU_API_H_ -#if defined(__aarch64__) || defined(__amd64__) || defined(__i386__) +#define kernel_fpu_begin() \ + lkpi_kernel_fpu_begin() -#include +#define kernel_fpu_end() \ + lkpi_kernel_fpu_end() -extern struct fpu_kern_ctx *__lkpi_fpu_ctx; -extern unsigned int __lkpi_fpu_ctx_level; - -static inline void -kernel_fpu_begin() -{ - if (__lkpi_fpu_ctx_level++ == 0) { - fpu_kern_enter(curthread, __lkpi_fpu_ctx, FPU_KERN_NORMAL); - } -} - -static inline void -kernel_fpu_end() -{ - if (--__lkpi_fpu_ctx_level == 0) { - fpu_kern_leave(curthread, __lkpi_fpu_ctx); - } -} - -#else - -static inline void -kernel_fpu_begin() -{ -} - -static inline void -kernel_fpu_end() -{ -} - -#endif +extern void lkpi_kernel_fpu_begin(void); +extern void lkpi_kernel_fpu_end(void); #endif /* _FPU_API_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h index 937e9f27870c..5954b16f6496 100644 --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -82,7 +82,8 @@ struct task_struct { int bsd_interrupt_value; struct work_struct *work; /* current work struct, if set */ struct task_struct *group_leader; - unsigned rcu_section[TS_RCU_TYPE_MAX]; + unsigned rcu_section[TS_RCU_TYPE_MAX]; + unsigned int fpu_ctx_level; }; #define current ({ \ diff --git a/sys/compat/linuxkpi/common/src/linux_fpu.c b/sys/compat/linuxkpi/common/src/linux_fpu.c index 976e55e68ca1..08f7e075d827 100644 --- a/sys/compat/linuxkpi/common/src/linux_fpu.c +++ b/sys/compat/linuxkpi/common/src/linux_fpu.c @@ -30,21 +30,44 @@ #include #include +#include + +#include + +#if defined(__aarch64__) || defined(__amd64__) || defined(__i386__) + #include -struct fpu_kern_ctx *__lkpi_fpu_ctx; -unsigned int __lkpi_fpu_ctx_level = 0; +/* + * Technically the Linux API isn't supposed to allow nesting sections + * either, but currently used versions of GPU drivers rely on nesting + * working, so we only enter the section on the outermost level. + */ + +void +lkpi_kernel_fpu_begin(void) +{ + if ((current->fpu_ctx_level)++ == 0) + fpu_kern_enter(curthread, NULL, FPU_KERN_NOCTX); +} + +void +lkpi_kernel_fpu_end(void) +{ + if (--(current->fpu_ctx_level) == 0) + fpu_kern_leave(curthread, NULL); +} + +#else -static void -linux_fpu_init(void *arg __unused) +void +lkpi_kernel_fpu_begin(void) { - __lkpi_fpu_ctx = fpu_kern_alloc_ctx(0); } -SYSINIT(linux_fpu, SI_SUB_EVENTHANDLER, SI_ORDER_SECOND, linux_fpu_init, NULL); -static void -linux_fpu_uninit(void *arg __unused) +void +lkpi_kernel_fpu_end(void) { - fpu_kern_free_ctx(__lkpi_fpu_ctx); } -SYSUNINIT(linux_fpu, SI_SUB_EVENTHANDLER, SI_ORDER_SECOND, linux_fpu_uninit, NULL); + +#endif diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 2bc68f6ac9b9..d58cf7927206 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -398,9 +398,6 @@ x86/x86/mptable_pci.c optional mptable pci x86/x86/msi.c optional pci x86/xen/pv.c optional xenhvm -compat/linuxkpi/common/src/linux_fpu.c optional compat_linuxkpi \ - compile-with "${LINUXKPI_C}" - contrib/openzfs/module/zcommon/zfs_fletcher_avx512.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zcommon/zfs_fletcher_intel.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zcommon/zfs_fletcher_sse.c optional zfs compile-with "${ZFS_C}" diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 48ad00e064d5..3bc534073634 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -560,10 +560,6 @@ arm64/rockchip/clk/rk3399_pmucru.c optional fdt soc_rockchip_rk3399 # Xilinx arm/xilinx/uart_dev_cdnc.c optional uart soc_xilinx_zynq -# Linuxkpi -compat/linuxkpi/common/src/linux_fpu.c optional compat_linuxkpi \ - compile-with "${LINUXKPI_C}" - # Cloudabi arm64/cloudabi32/cloudabi32_sysvec.c optional compat_cloudabi32 arm64/cloudabi64/cloudabi64_sysvec.c optional compat_cloudabi64 diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 8083392c53f6..4f5c1c3cc5d4 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -182,6 +182,3 @@ x86/x86/local_apic.c optional apic x86/x86/mptable.c optional apic x86/x86/mptable_pci.c optional apic pci x86/x86/msi.c optional apic pci - -compat/linuxkpi/common/src/linux_fpu.c optional compat_linuxkpi \ - compile-with "${LINUXKPI_C}" diff --git a/sys/modules/linuxkpi/Makefile b/sys/modules/linuxkpi/Makefile index 81aa607f1302..f922a1fc85a2 100644 --- a/sys/modules/linuxkpi/Makefile +++ b/sys/modules/linuxkpi/Makefile @@ -8,6 +8,7 @@ SRCS= linux_compat.c \ linux_dmi.c \ linux_domain.c \ linux_firmware.c \ + linux_fpu.c \ linux_hrtimer.c \ linux_idr.c \ linux_kmod.c \ @@ -29,7 +30,7 @@ SRCS= linux_compat.c \ .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "i386" -SRCS+= opt_acpi.h acpi_if.h linux_acpi.c linux_fpu.c +SRCS+= opt_acpi.h acpi_if.h linux_acpi.c .endif SRCS+= ${LINUXKPI_GENSRCS}