From nobody Tue Apr 18 21:34:23 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 4Q1HHk4LS5z45j8b for ; Tue, 18 Apr 2023 21:34:26 +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 4Q1HHk0qPDz3KKF for ; Tue, 18 Apr 2023 21:34:26 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f53.google.com with SMTP id l31-20020a05600c1d1f00b003f1718d89b2so546011wms.0 for ; Tue, 18 Apr 2023 14:34:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681853664; x=1684445664; 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=m6lAgvOzX5265iXA1GkGN2dvdnie4vGhZIHARtwVTEs=; b=aGK7pLz8Smeoq9+NDmGK9ahP3sPs+0xL+FXJPUP0FAoGBx3vyXLRAjdsxMoAjYIVs3 1+8uTCY78Iv4DDhiLEnE821YHoMmnQ5QcXSCiNoU0cBMmufWbA58QoK3wLRzZrSG8e5v c/NWvsl0tJ9REL41bP3HVix5ojxMjhWMhr7n+x5PNCYzkNVrMtEMgyBeic8yCLhtpEQ8 XY+ibcqVsxWfUif29MK/RAOsK2rMWyKzYOo+C7vbu095zvtLTv99fOjOISY3DZQkZXIT kbBcutrQ0814Y5tgB8V18yzMd57C0V01guOE7dp6jNeTghLiMTiQne5PerrH4tDa/N+T /RYg== X-Gm-Message-State: AAQBX9eNpyh5Vezl/ldcy9BEK4iGPH+UbWY0DZtQBb+F+Hsex3mtbKsH ogH0I232/cDdJ/aoTiff2cM7Ig== X-Google-Smtp-Source: AKy350aM70ECwDSU+v3kx+A5Da0EMi2gGpbaCU6h0f1ZQI1aT5Qf/w2yJpGJCbKp0Wsk3MvneOAOQA== X-Received: by 2002:a05:600c:378b:b0:3f1:7aff:e14a with SMTP id o11-20020a05600c378b00b003f17affe14amr2121273wmr.39.1681853664549; Tue, 18 Apr 2023 14:34:24 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id k14-20020a5d66ce000000b002f103ca90cdsm14099326wrw.101.2023.04.18.14.34.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Apr 2023 14:34:24 -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: <202304182131.33ILVSoG020217@gitrepo.freebsd.org> Date: Tue, 18 Apr 2023 22:34:23 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" 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: 4Q1HHk0qPDz3KKF 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 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. 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. Jess > b3_aarch64_sse2.o: b3_aarch64_sse2.S > ${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \ > -o ${.TARGET}