From nobody Tue Dec 12 17:14:47 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 4SqQGg4wcnz54C0t; Tue, 12 Dec 2023 17:15:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SqQGg42Msz3HHK; Tue, 12 Dec 2023 17:15:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702401307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=InhrZwUPnMQur0CHnDeFFa6lcRSkJMAwpvMom7J9m4g=; b=R+N67oB2YCD61l41K7zzz9+bjrA4vXCjnMimeGzdgc9hFbDDFqUgopb3i+HBFaIONa3IHJ QLs9dxeEU0oKW9vqj1d7PM6snF0T1HMYB/B2SJdzrVm1tA3LGksEMDFuNsQcSj0rKnjHEd 9nJO8+cUtcDM/st8b3vKCo0fddvWqUk8UUDMcAjzOT7yvIAipGNgGsxg897wuLgpAzByt/ glCnlsh08ORhcS+n9a/Hz3OuKTkW/uPt8CRPg+DxNr2mrskfGUKviIUPpNfrvxoJoJNv1W JsjQCfoUERxThgHDTUrdTE6M0XJoAKI3/MKBsGv0bnBtYl1bYkgPFrZoSCJGjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702401307; a=rsa-sha256; cv=none; b=OAXXSDlMso8b0LRL1xKrtgNymn7fO1c4AX07wEftP6WRqUx6RFfWdBAxb32JqyV2iOY+sO X68bc7gq6Px1qaMThhueLOOp+xodwjNLniNdxJS+Z7fkCJM3jJGN2zVa1CxOH4hb5t0Eaj pS6XCxtffShghID8/sOdcNDhFogiGbWiwxklpdqhaN8ykaGd1TIX+jEldSgsD73dUyNY/G jppxsKoARDlLqRtJtK5q1KUTuDSzjnqWu/HRJjeyxXjreGiximZORQk8dUQ4CqB9dE/Yc9 XnsiTIM+KVRhCqnZH7RhSK2+P1dRzGn18+kfShf8R/vc/d5/oDhTHxs3RIdzbQ== 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=1702401307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=InhrZwUPnMQur0CHnDeFFa6lcRSkJMAwpvMom7J9m4g=; b=ra4X4rwZr7zfPj5RTcKzsu/B9X7AkOmlxiuSKl0QlmA/43VzyTWUhFaCYCXaMPePHgQbhN XCYBBa7NhIT/ZhT875BhValyv8OwpuMP4QhMthk9/8jVUQO28aOAokgA4NJRvJViGNXFTm uIln74PYscjWRHRjats7O1ZJaMDsVesmb02yzgojzAQCH5bd0S/3/fsl4/Y+DblukbF8Qq B1a6zOny4d33qXSRbBus2peDUERPQw6KQLSaBtfuOYpgu8Q3hFWNL0jW6sKo8H9/WSRYie hkGVoEyzsr0DuTRPSTuctuDYu/orO/AvFb8cAJqJOwAsDO5JqLCdcrqm05YNkw== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (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 (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SqQGg2Nhtzs72; Tue, 12 Dec 2023 17:15:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.wg.andric.com [10.69.1.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 27A6C3849E; Tue, 12 Dec 2023 18:15:06 +0100 (CET) Content-Type: multipart/signed; boundary="Apple-Mail=_54F359DF-2321-45A5-A23F-3405194A80EB"; protocol="application/pgp-signature"; micalg=pgp-sha1 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 \(3731.700.6\)) Subject: Re: git: fb17dfa0c83c - main - libicp: unbreak for armv6 after recent OpenZFS import From: Dimitry Andric In-Reply-To: <098c85ab-4210-455c-a3b9-773bf0ce87b7@FreeBSD.org> Date: Tue, 12 Dec 2023 18:14:47 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <202312082310.3B8NA5cI026712@gitrepo.freebsd.org> <098c85ab-4210-455c-a3b9-773bf0ce87b7@FreeBSD.org> To: John Baldwin X-Mailer: Apple Mail (2.3731.700.6) --Apple-Mail=_54F359DF-2321-45A5-A23F-3405194A80EB Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 12 Dec 2023, at 17:01, John Baldwin wrote: >=20 > On 12/8/23 3:10 PM, Dimitry Andric wrote: >> The branch main has been updated by dim: >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dfb17dfa0c83cc213400fe7e1ed7a3925= 3a4fcefa >> commit fb17dfa0c83cc213400fe7e1ed7a39253a4fcefa >> Author: Dimitry Andric >> AuthorDate: 2023-12-08 23:09:36 +0000 >> Commit: Dimitry Andric >> CommitDate: 2023-12-08 23:09:50 +0000 >> libicp: unbreak for armv6 after recent OpenZFS import >> The following upstream commit: >> 727497ccdfcc module/icp/asm-arm/sha2: enable non-SIMD asm kernels = on armv5/6 >> does indeed enable sha2 asm for earlier arm CPUs, but since = libicp's >> Makefile was not updated, this leads to: >> ld: error: undefined reference due to = --no-allow-shlib-undefined: zfs_sha256_block_armv7 >> Fix it by compiling sha256-armv7.S and sha512-armv7.S for = armv6 too. >> Fixes: 3494f7c019fc >> --- >> cddl/lib/libicp/Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile >> index 2d9bb3c67cb4..085818f2371a 100644 >> --- a/cddl/lib/libicp/Makefile >> +++ b/cddl/lib/libicp/Makefile >> @@ -21,7 +21,7 @@ ASM_SOURCES_AS =3D \ >> asm-x86_64/blake3/blake3_sse41.S >> CFLAGS+=3D -D__amd64 -D_SYS_STACK_H -UHAVE_AES >> -.elif ${MACHINE_ARCH} =3D=3D "armv7" >> +.elif ${MACHINE_ARCH} =3D=3D "armv6" || ${MACHINE_ARCH} =3D=3D = "armv7" >=20 > Since this applies to all 32-bit arm flavors, should this be using > ${MACHINE_CPUARCH} =3D=3D "arm" instead? You may be right; if I read https://github.com/openzfs/zfs/commit/727497ccdfcc correctly: > module/icp/asm-arm/sha2: enable non-SIMD asm kernels on armv5/6 > My merged pull request #15557 fixes compilation of sha2 kernels on arm > v5/6. However, the compiler guards only allows sha256/512_armv7_impl = to > be used when __ARM_ARCH > 6. This patch enables these ASM kernels on = all > arm architectures. Some compiler guards are adjusted accordingly to > avoid the unnecessary compilation of SIMD (e.g., neon, armv8ce) = kernels > on old architectures. > > Reviewed-by: Brian Behlendorf > Signed-off-by: Shengqi Chen > Closes #15623 It's talking about "all arm architectures", but I'm not sure if this means all arm architectures supported by OpenZFS, or in general. I would assume the latter. -Dimitry --Apple-Mail=_54F359DF-2321-45A5-A23F-3405194A80EB Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCZXiVBwAKCRCwXqMKLiCW o2d+AJ41TMrVnxeOArpfC5oU1at8GEZchACgqdeibOgIK7/0EJ0GjAh+3K6nvMA= =kEcF -----END PGP SIGNATURE----- --Apple-Mail=_54F359DF-2321-45A5-A23F-3405194A80EB--