From nobody Fri Apr 04 20:58:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZTrYr3mSlz5sQ52; Fri, 04 Apr 2025 20:58:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTrYr32zZz47JN; Fri, 04 Apr 2025 20:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743800336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rlBf15QUcPrEOyiFr1bAbey50pdLf7HgVjG1iTnJ2/4=; b=oS9wWOh3D6+ckpaphVuohqHlnhwPxGqeJY1EVrLn8sp4kptL7zwfUhj6tm+pivWHPgfRw/ VAFD+A8wH8cJTZ0WNWLrkkkMZXkkgHceZMbTCC7d0H9vVVGjgmi1dpZUi1fHG0Ada8+CBA czvmm4nFiPPNeeUxxhq1YBEL2ccZVQA+7sFY5qtZ9f94VnNqcGzDlB0Z+4eSVJnheeJH+Y dal/FDfTB0n/zRIlXHckEdyX7GMXUM6+bqMzTfNo5z0jGix0I6E3vHFNfSQjDbcRGwXkDG CrxLLwhuoQdCTNeAF6E2o3Rb8W0FafnNk6oRfFf/11RiOXHyuutMGEBVh0ToQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743800336; a=rsa-sha256; cv=none; b=GswIVF5FlRuOHu/O1/8HVByEdsLxJqScpVuNS2lgqzs9k/KFC3Jx4vNXpZBrziUgy3QQrL 9rKA1xEggziuIXYnb4vMezKKXOgsw3ocYWnj/nNAJjYzudhFFsNYHYCwNLf1FzPCXdVcbN gr4/i1eUXZJGoAYHIFZAIWJk+nJp+CVa50CNee8wfbs8VHEGpVCzIfVrQe4Iq6XaWZB2wy XnPH4QMOCf/sK9RK6/sH0TDjZXv2LIn29lHcYOO+QovGL2jydBPbB2KQYQYJZXqYZ8glIC uZbzJVyxVLT4Muio0C0xqSSyROfddVAPnmaN2Vz8qKstBW3lYonjZQwfkm3wow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743800336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rlBf15QUcPrEOyiFr1bAbey50pdLf7HgVjG1iTnJ2/4=; b=RfgA7PJ6lxO/eXgXlDzoqW+IyEy8pzoCgGIotjE5Mb2mU5KQIaizW3KDb1FBOCAQBBwJah /vmT5Plvis0cGx5TydIMTqaz2r53MO5yCszHVbBEW2mNrfJJzeuHnpG78rhhmqRqgKpYz5 lVkTGbnV+mGVKEMMz6LID0oQ8tEtW9XU0WK+QCf9fo0Ub14td/FS6dIoEZ+HFiglt8migL ECatt+9+Md5C6SUsiBL2/bh9p37O87jo6EEZP+bPycX06HFOKOMECCqJXe11lG75zCVC0J o8GTD54OKiARJDmF4FuKuH2g9vq2v/vrHB/OvrYE5sEWo5PNag4IUU6gYglnRw== 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 4ZTrYr2G1xz12Cv; Fri, 04 Apr 2025 20:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 534Kwur9083484; Fri, 4 Apr 2025 20:58:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 534KwuRX083481; Fri, 4 Apr 2025 20:58:56 GMT (envelope-from git) Date: Fri, 4 Apr 2025 20:58:56 GMT Message-Id: <202504042058.534KwuRX083481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Kubaj Subject: git: 1962f9631187 - stable/14 - zfs: enable FPU on powerpc* List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1962f96311878e5413f6e70e0925f08c1d2f9db8 Auto-Submitted: auto-generated The branch stable/14 has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=1962f96311878e5413f6e70e0925f08c1d2f9db8 commit 1962f96311878e5413f6e70e0925f08c1d2f9db8 Author: Piotr Kubaj AuthorDate: 2025-03-27 16:32:59 +0000 Commit: Piotr Kubaj CommitDate: 2025-04-04 20:57:57 +0000 zfs: enable FPU on powerpc* Differential Revision: https://reviews.freebsd.org/D49538 (cherry picked from commit 5b02365ac656e1cccf293ec1c57a8eb6c5cd51e2) --- sys/conf/files.powerpc | 13 +++++++++++-- .../openzfs/include/os/freebsd/spl/sys/simd_powerpc.h | 17 ++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 6d44d9114e25..ddce4b917890 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -17,8 +17,17 @@ contrib/openzfs/module/icp/asm-ppc64/blake3/b3_ppc64le_sse41.S optional zfs comp # zfs sha2 hash support contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-p8.S optional zfs compile-with "${ZFS_S}" contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-p8.S optional zfs compile-with "${ZFS_S}" -contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-ppc.S optional zfs compile-with "${ZFS_S}" -contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-ppc.S optional zfs compile-with "${ZFS_S}" +zfs-sha256-ppc.o optional zfs \ + dependency "$S/contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-ppc.S" \ + compile-with "${CC} -c ${ZFS_ASM_CFLAGS} -o ${.TARGET} ${WERROR} $S/contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-ppc.S" \ + no-implicit-rule \ + clean "zfs-sha256-ppc.o" + +zfs-sha512-ppc.o optional zfs \ + dependency "$S/contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-ppc.S" \ + compile-with "${CC} -c ${ZFS_ASM_CFLAGS} -o ${.TARGET} ${WERROR} $S/contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-ppc.S" \ + no-implicit-rule \ + clean "zfs-sha512-ppc.o" cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs powerpc | dtrace powerpc | zfs powerpcspe | dtrace powerpcspe compile-with "${ZFS_C}" cddl/dev/dtrace/powerpc/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}" diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h index 2fd806e1a0b5..6d8503196050 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h @@ -43,18 +43,25 @@ #ifndef _FREEBSD_SIMD_POWERPC_H #define _FREEBSD_SIMD_POWERPC_H +#include + #include #include #include #include +#include -/* FreeBSD doesn't support floating point on powerpc kernel yet */ -#define kfpu_allowed() 0 - +#define kfpu_allowed() 1 #define kfpu_initialize(tsk) do {} while (0) -#define kfpu_begin() do {} while (0) -#define kfpu_end() do {} while (0) +#define kfpu_begin() { \ + if (__predict_false(!is_fpu_kern_thread(0))) \ + fpu_kern_enter(PCPU_GET(curthread), NULL, FPU_KERN_NOCTX);\ +} +#define kfpu_end() { \ + if (__predict_false(PCPU_GET(curpcb)->pcb_flags & PCB_KERN_FPU_NOSAVE))\ + fpu_kern_leave(PCPU_GET(curthread), NULL); \ +} #define kfpu_init() (0) #define kfpu_fini() do {} while (0)