From nobody Tue Apr 18 22:52:09 2023 X-Original-To: dev-commits-src-all@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 4Q1K1T3w3Wz45p6j for ; Tue, 18 Apr 2023 22:52:13 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q1K1T1KVmz3NpL for ; Tue, 18 Apr 2023 22:52:13 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f53.google.com with SMTP id eo4-20020a05600c82c400b003f05a99a841so572984wmb.3 for ; Tue, 18 Apr 2023 15:52:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681858331; x=1684450331; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gCqE6VVTTG3SN1hQYBlut/Oz9k5iaNfKiQp/K8YgVQg=; b=l+nULWLSQx2mFpPwB31fdqGzts+CY5hLDq8nkhW1MgTGg8Jq7yhmaEMTAZrsZoE7+j 9ri2Hw1b+FlAobSO3b0esae5E3yzuAz9CASomuTCW842nt3vX6MOj0D0l4MhDRN0grvt +dWbLVqg8vZNeX2ni9nhI9o1QLCLhItquwPEfrqZNZzLndr3LSptEYcr2ueG4JipMwbR DenmMlHYi+ObdP+fVgkyUqV0dy7U40kBeIdJ36dgjpAUWs6AC+ZGJDi7IXRYXd+CX4QF CEDvKH2QrwrYJomdvAqKHrtEAg+lzLQ3Y7QwcYMsVptluiaBwrvIfE8JifTXSpSoj5OL VJVA== X-Gm-Message-State: AAQBX9cz8HgW0av/M1Q/ScL9EJNUdXZRFAbBzJQw1cNgJ/2znc9tNKNU Da94N2Do/dFgRbATyo+oUXPPjAZfTQcSwp/Jbo9PPg== X-Google-Smtp-Source: AKy350b9wu0iw+5IH3oxa1IW5CTcl5TpmSu5q6Ur/8Y0VbeKNAOPSpQSdRESO7Y+9WyXUvSfMNSLTg== X-Received: by 2002:a1c:cc1a:0:b0:3ef:6b97:f0c3 with SMTP id h26-20020a1ccc1a000000b003ef6b97f0c3mr15980962wmb.15.1681858330926; Tue, 18 Apr 2023 15:52:10 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id z14-20020adff1ce000000b002f28de9f73bsm14086585wro.55.2023.04.18.15.52.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Apr 2023 15:52:10 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: git: 238271f4a66b - main - stand: Add a snarky note about the upstream ZFS situation From: Jessica Clarke In-Reply-To: Date: Tue, 18 Apr 2023 23:52:09 +0100 Cc: Warner Losh , src-committers , "" , "" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202304182131.33ILVSoG020217@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Rspamd-Queue-Id: 4Q1K1T1KVmz3NpL X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 18 Apr 2023, at 23:49, Warner Losh wrote: >=20 >=20 >=20 > On Tue, Apr 18, 2023, 3:34 PM Jessica Clarke = wrote: >> On 18 Apr 2023, at 22:31, Warner Losh wrote: >> >=20 >> > The branch main has been updated by imp: >> >=20 >> > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D238271f4a66bd06b8b9a232a82f3ee08= 82e4cbb9 >> >=20 >> > commit 238271f4a66bd06b8b9a232a82f3ee0882e4cbb9 >> > Author: Warner Losh >> > AuthorDate: 2023-04-18 21:29:45 +0000 >> > Commit: Warner Losh >> > CommitDate: 2023-04-18 21:31:17 +0000 >> >=20 >> > stand: Add a snarky note about the upstream ZFS situation >> >=20 >> > 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. >> >=20 >> > Sponsored by: Netflix >> > --- >> > stand/libsa/zfs/Makefile.inc | 4 ++++ >> > 1 file changed, 4 insertions(+) >> >=20 >> > 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+=3D zstd_common.c >> > ZSTD_SRC+=3D zstd_ddict.c zstd_decompress.c = zstd_decompress_block.c >> > ZSTD_SRC+=3D zstd_double_fast.c zstd_fast.c zstd_lazy.c = zstd_ldm.c >> >=20 >> > +# This is completely bogus: We should be able to omit this code = completely. >> > .if ${MACHINE_ARCH} =3D=3D "aarch64" >> > ZFS_SRC_AS =3D b3_aarch64_sse2.S b3_aarch64_sse41.S >> > .endif >> > @@ -90,10 +91,13 @@ CFLAGS.skein_block.c+=3D -DSKEIN_LOOP=3D111 >> >=20 >> > # 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+=3D -I${OZFS}/module/icp/algs/blake3 = -I${OZFS}/module/icp/include >> >=20 >> > CWARNFLAGS.zfs.c+=3D ${NO_WDANGLING_POINTER} >> >=20 >> > +# 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. >>=20 >> This one isn=E2=80=99t bogus? The file is deliberately using NEON so = needs >> access to floating-point registers, which LLVM (mostly) enforces for >> the assembler, unlike GNU as. >=20 > No. It's bogus because we should not be using it at all. The generic = implementation is fast enough for the boot loader and we have a blanket = policy against using extra register sets. The change wasn't discussed = before hand and what's really needed are upstream changes to be able to = omit it entirely. Oh I see, I misunderstood the point the comment was making. Thanks, Jess > > b3_aarch64_sse2.o: b3_aarch64_sse2.S > > ${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \ > > -o ${.TARGET}