From nobody Fri Mar 28 16:19:59 2025 X-Original-To: dev-commits-src-main@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 4ZPQjD0xt2z5s4GM; Fri, 28 Mar 2025 16:20:00 +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 4ZPQjD0C5Dz3XdB; Fri, 28 Mar 2025 16:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743178800; 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=Fy2sfkfw5uLu4f8kgv1DqMY6E/nmjkULjWeYxgxkiHI=; b=vVelfcsgKNv5ugqT0tOY+RAex7LVdrqzx2bowVHxSxRW8op1ZPnDJFtyTMWiXN2oRn3Fim YZpeuhl1J46ueUp++OQKgypi4sCCA9XfBZb+wc6p/DXDLW8x7VRQZG9//kVgImcyKdir+H ADzZRt670p6BmgBx2/93vFQyjho+ZwEguI9bdWnGTw7XZH1Zku3PwtdxWNpCnZtiuTbgUr ayiC9uT7sDJh4NE8WjOht38jhO8rBjpcZG0Y/mMLVc1sC4f+EKF/MiZ6Md852OthaQtCtl dRuQgm49bJ2sElaWfukk+Q+mJOyGljgQ+qjQ6dYvzbZ5xefRAgpx/KTo27p7VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743178800; a=rsa-sha256; cv=none; b=aVJFrNMG9/d7O6w80vOTFn1t3+owISxHBZgeMi0WGImKxn0TMrRLaaIPHNlgGkovwibccC g1mXIP+mvkj38YVw3kSVtP+BXtYxuTrriONYFK9FFEooZ2sp64wtyMSK46PRuncK78CbIH u3iXwziGaf4eScrxFcNxNOiOLqHDBHTHUW6HRFv/vL559RNXrSqJPQPgxmbhGZ1JbXJteQ BvtmbkBz2rjDcM/mvdcyU73wUYSJJLesTixxOxEDgLiNuehX1hT0abIt0U9YbmqpepvUqr QRpV7tRXQMO/YQtZztSMgKDTrRmKnY5O+3cpG/3G/lSqwQMPeWHIackwxre2iw== 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=1743178800; 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=Fy2sfkfw5uLu4f8kgv1DqMY6E/nmjkULjWeYxgxkiHI=; b=a/jbkyDRPubOFIPlbb3PkyXkCGW48CFSnLsME2vIJeh8XUCN5iBCKWPWF1ySVvX9ttgmlQ XCr8/sjcP0oqxGkOUpUf7Me/5zwcEHf2Bdwr4ZtUT1aaz3Y1HIwGgwumOilc6gNozuhmzk KFQB4sUz6CqKv0mr82qplCOhURKRh8zgqK0cv1YA2wPDxFKpzQ6JsmxN35819T/TCSZE8/ e59zWU8JnXJavtMpjAOwuCiFfC84zuhutQlA/bUIeA7NGnEsveVeMFNlncYnjl/8QWDauv w7z3Zw85pc6cKRerSbeA8T6yi5V/JKIz+fSanOnSOnsV/sIM5UBcSH032Qvr+Q== 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 4ZPQjC6rbtzqwZ; Fri, 28 Mar 2025 16:19:59 +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 52SGJx3D005664; Fri, 28 Mar 2025 16:19:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52SGJxak005661; Fri, 28 Mar 2025 16:19:59 GMT (envelope-from git) Date: Fri, 28 Mar 2025 16:19:59 GMT Message-Id: <202503281619.52SGJxak005661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 5b02365ac656 - main - zfs: enable FPU on powerpc* List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5b02365ac656e1cccf293ec1c57a8eb6c5cd51e2 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=5b02365ac656e1cccf293ec1c57a8eb6c5cd51e2 commit 5b02365ac656e1cccf293ec1c57a8eb6c5cd51e2 Author: Piotr Kubaj AuthorDate: 2025-03-27 16:32:59 +0000 Commit: Piotr Kubaj CommitDate: 2025-03-28 16:19:29 +0000 zfs: enable FPU on powerpc* Summary: MFC after: 1 week Test Plan: make kernel and boot with ZFS on / Reviewers: #powerpc Subscribers: imp, delphij Differential Revision: https://reviews.freebsd.org/D49538 --- sys/conf/files.powerpc | 13 +++++++++++-- .../openzfs/include/os/freebsd/spl/sys/simd_powerpc.h | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 314931ed0939..d2c3aa260cd9 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" # openssl ppc common files crypto/openssl/ossl_ppc.c optional ossl powerpc64 | ossl powerpc64le 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 7e7abd992ee3..48b90ecc9cc2 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 @@ -44,16 +44,25 @@ #ifndef _FREEBSD_SIMD_POWERPC_H #define _FREEBSD_SIMD_POWERPC_H +#include + #include #include #include #include +#include -#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)