From nobody Tue Apr 18 21:31:28 2023 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 4Q1HDJ3ZHPz45hg9; Tue, 18 Apr 2023 21:31:28 +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 4Q1HDJ2zdbz3F53; Tue, 18 Apr 2023 21:31:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681853488; 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=qnSlTXocrraoeBwivl6Tp0v48sUv8STw9OBtSXNIv5E=; b=g4L1JOTwlgPkAVb5UaGJ56rJ0jE2BlqHw/ek8CDB8r0hxg3sIKtyQ2v+lhNDs0pu8/ue2u Veov9unqbNnc5Bq1t8oLgFLVaAC8VqBCW9+4sZRJRT6kD0hcotmPf+uYu3e2svBcRRYynh 6HzX4DtPRORfYJymL2HFrd0OHcKScsbBSmcOZJdUZhVko89n6sLQqAj8XQnUy4LPZlZuJJ tkRkVyocaqF2zimlX+vwC1NkZ81eRvB88YXJA4ldC3slSj08R5oHgDGt3NbFcg7GyY52Yt GX/1qB77AFL79esvtQD45XvJxrItCD/nLqYN77iHbCDQSi468Aq55YXUtj6rBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681853488; 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=qnSlTXocrraoeBwivl6Tp0v48sUv8STw9OBtSXNIv5E=; b=yEmJXSKG2iIGYbHjTR75SSccMpCwa8PL05/D1od5OlZCz50KL+eDE719ECAaelkawfF69y RWBIW6wZ4pXV54pqVdtK7Sf4n62yqNskS4MW3ffwe08rihB3CnP3vHaH+Xv1Bkz76MiO/H QrpN5nV6Tqjd6qPggpOfyGbdBYAxE4CJgcDVCkLqDifpTtIdpMwvGOpWYOb4XK05dBIRJl iBU/wAxkTZn/ichamxViKMQ2bbTSbP49INTAn9ly3qVUp8oi3pYnXbqC3LZ0gAfwvuRXvB AH+UREHbnbLKHJGKsku1Oypt31vr9rJfTrmi0n7MolS4ZI79hxd3K67KOXmv4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681853488; a=rsa-sha256; cv=none; b=THye3erUzFTBGnh/hoisONdYfgMYvDuO5woMljHQoR4Ig+MYVqCvyPZeP+7YZ6OKDPra0H LMiX7qTu1+Yg/AJJut1DoHPPX/NBWFzGXIZl2gH/DwofUT2VpZebB32mcp9kOdZR1tmM5F NLnBeronaYnsq3nbIz/6NgMt1O6TF2uk045mCwz7Y4Jc3FlJvpNFI2sgdCLhDJcHTT50Dm xCRMtdw6h65QQgjXlxu1pXT6Horr68WqwzMIiUqsturQ0TLNkW2zhFcBipIi3JjKECCqtH WSINY8+gLCLbyUgId68vgPOp9h2aEJ6iCHv+bSF7pTfFPiNz+cxsPgbEShm9rw== 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 4Q1HDJ24PvzSj3; Tue, 18 Apr 2023 21:31:28 +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 33ILVSv4020218; Tue, 18 Apr 2023 21:31:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ILVSoG020217; Tue, 18 Apr 2023 21:31:28 GMT (envelope-from git) Date: Tue, 18 Apr 2023 21:31:28 GMT Message-Id: <202304182131.33ILVSoG020217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 238271f4a66b - main - stand: Add a snarky note about the upstream ZFS situation 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 238271f4a66bd06b8b9a232a82f3ee0882e4cbb9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=238271f4a66bd06b8b9a232a82f3ee0882e4cbb9 commit 238271f4a66bd06b8b9a232a82f3ee0882e4cbb9 Author: Warner Losh AuthorDate: 2023-04-18 21:29:45 +0000 Commit: Warner Losh CommitDate: 2023-04-18 21:31:17 +0000 stand: Add a snarky note about the upstream ZFS situation The latest import of openzfs broke the hacks that we used to omit the special registers being used on arm64. Add snarky note documenting this situation since it's a mess now since the hack was only partially undone, leaving behind a mess. Sponsored by: Netflix --- stand/libsa/zfs/Makefile.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index f4cecdbc3085..7660f4ab7baf 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -19,6 +19,7 @@ ZSTD_SRC+= zstd_common.c ZSTD_SRC+= zstd_ddict.c zstd_decompress.c zstd_decompress_block.c ZSTD_SRC+= zstd_double_fast.c zstd_fast.c zstd_lazy.c zstd_ldm.c +# This is completely bogus: We should be able to omit this code completely. .if ${MACHINE_ARCH} == "aarch64" ZFS_SRC_AS = b3_aarch64_sse2.S b3_aarch64_sse41.S .endif @@ -90,10 +91,13 @@ CFLAGS.skein_block.c+= -DSKEIN_LOOP=111 # To find blake3_impl.c in OpenZFS tree for our somehat ugly blake3_impl_hack.c # that's needed until the necessary tweaks can be upstreamed. +# XXX the last import gutted all this since upstream changes broke this hack. CFLAGS.blake3_impl_hack.c+= -I${OZFS}/module/icp/algs/blake3 -I${OZFS}/module/icp/include CWARNFLAGS.zfs.c+= ${NO_WDANGLING_POINTER} +# Needing to remove the -mgeneral-regs-only is a red flag that this is not quite +# right. But it's needed at the moment due to the muddled upstream. b3_aarch64_sse2.o: b3_aarch64_sse2.S ${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \ -o ${.TARGET}