From:   Andreas Dilger <adilger@dilger.ca>
Message-Id: <AE27C93A-528E-49F6-85B5-ACF80413FD04@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_2D885FE3-7A54-4BE1-A4C8-F9DE1284985C";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH 07/38] lib/blkid: remove 32-bit x86 byteswap assembly
Date:   Tue, 24 Jan 2023 11:21:26 -0700
In-Reply-To: <20230121203230.27624-8-ebiggers@kernel.org>
Cc:     linux-ext4@vger.kernel.org
To:     Eric Biggers <ebiggers@kernel.org>, Theodore Ts'o <tytso@mit.edu>
References: <20230121203230.27624-1-ebiggers@kernel.org>
 <20230121203230.27624-8-ebiggers@kernel.org>
Precedence: bulk


--Apple-Mail=_2D885FE3-7A54-4BE1-A4C8-F9DE1284985C
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii

On Jan 21, 2023, at 1:31 PM, Eric Biggers <ebiggers@kernel.org> wrote:
> 
> From: Eric Biggers <ebiggers@google.com>
> 
> libblkid contains 32-bit x86 assembly language implementations of 16-bit
> and 32-bit byteswaps.  However, modern compilers can easily generate the
> bswap instruction automatically from the corresponding C expression.
> And no one ever bothered to add assembly for x86_64 or other
> architectures, anyway.  So let's just remove this outdated code, which
> was maybe useful in the 90s, but is no longer useful.

I'm not sure what Ted thinks about this, but it might be time to remove
the libblkid implementation in e2fsprogs, and instead depend on the
newer version in util-linux?  However, removing it from e2fsprogs
would add an external dependency on util-linux for non-linux platforms,
though AFAIK it should still be possible to build e2fsprogs without it.

That said, I think the current patch looks fine, and you can add:

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

Cheers, Andreas

> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> lib/blkid/probe.h | 43 -------------------------------------------
> 1 file changed, 43 deletions(-)
> 
> diff --git a/lib/blkid/probe.h b/lib/blkid/probe.h
> index dea4081d0..063a5b5c0 100644
> --- a/lib/blkid/probe.h
> +++ b/lib/blkid/probe.h
> @@ -814,46 +814,6 @@ struct exfat_entry_label {
> #define _INLINE_ static inline
> #endif
> 
> -static __u16 blkid_swab16(__u16 val);
> -static __u32 blkid_swab32(__u32 val);
> -static __u64 blkid_swab64(__u64 val);
> -
> -#if ((defined __GNUC__) && \
> -     (defined(__i386__) || defined(__i486__) || defined(__i586__)))
> -
> -#define _BLKID_HAVE_ASM_BITOPS_
> -
> -_INLINE_ __u32 blkid_swab32(__u32 val)
> -{
> -#ifdef EXT2FS_REQUIRE_486
> -	__asm__("bswap %0" : "=r" (val) : "0" (val));
> -#else
> -	__asm__("xchgb %b0,%h0\n\t"	/* swap lower bytes	*/
> -		"rorl $16,%0\n\t"	/* swap words		*/
> -		"xchgb %b0,%h0"		/* swap higher bytes	*/
> -		:"=q" (val)
> -		: "0" (val));
> -#endif
> -	return val;
> -}
> -
> -_INLINE_ __u16 blkid_swab16(__u16 val)
> -{
> -	__asm__("xchgb %b0,%h0"		/* swap bytes		*/ \
> -		: "=q" (val) \
> -		:  "0" (val)); \
> -		return val;
> -}
> -
> -_INLINE_ __u64 blkid_swab64(__u64 val)
> -{
> -	return (blkid_swab32(val >> 32) |
> -		(((__u64) blkid_swab32(val & 0xFFFFFFFFUL)) << 32));
> -}
> -#endif
> -
> -#if !defined(_BLKID_HAVE_ASM_BITOPS_)
> -
> _INLINE_  __u16 blkid_swab16(__u16 val)
> {
> 	return (val >> 8) | (val << 8);
> @@ -870,9 +830,6 @@ _INLINE_ __u64 blkid_swab64(__u64 val)
> 	return (blkid_swab32(val >> 32) |
> 		(((__u64) blkid_swab32(val & 0xFFFFFFFFUL)) << 32));
> }
> -#endif
> -
> -
> 
> #ifdef WORDS_BIGENDIAN
> #define blkid_le16(x) blkid_swab16(x)
> --
> 2.39.0
> 


Cheers, Andreas


--Apple-Mail=_2D885FE3-7A54-4BE1-A4C8-F9DE1284985C
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-----
Comment: GPGTools - http://gpgtools.org

iQIzBAEBCAAdFiEEDb73u6ZejP5ZMprvcqXauRfMH+AFAmPQIacACgkQcqXauRfM
H+BOQQ//dRd42T2H40dIWysnzk++iHYIbit4aq6A2nki5vhVRAb+y6PUv/pMuij4
F+Vz58+1RsOQV7KE2RTrF0Kk/6Mr8TAXw3ZPeZ8+hcRI4+6luCIhFJa3geWpieyF
BKRpfo9SU3nr9DEy1iZfqYZekH9PwIt3LTrwVhVk0WMVouVKAGfJsOSPaTsb/hsm
YKvJw3taRWPrx1IOpRtUSZdc48VwEu41GGAERow46Q9kYYy51On7Wm+apYQB1xD3
jV8R5KNNWm3Yv/0GpSzhfk3Bro4EGdfw8CUUFxhmhfmTlygpBzBHDi6MD67cnaPw
m7qQRhww6FMYAxK+tUm72T2yBoWslEe1MId2U9+En9RNExiGABoSll+/MwaCe4Jv
nNRBBOqnlrvPv6q8Yl/K0rq+/NeKrjF35YaJhzHnBfIMzYQKBsNyrM1Fb/c3Iddb
JU8rX9oT83zAGc05vuhPNurZCSBhyswx72JyVgc63nikwgjtnny6tKnRt/slSa44
W5xZrjbZfm/xsLk/xsMCQhLJ9v1gRUg7bUjipGj/5P4EAJvou87tNUIJR3nn7EVI
85jnCUAboTYnDVq1K1gno/oaSbrpHKeydWK7a+0Z5ID15BEmyGaRBj6vo60tMbXP
KmuDmwl7nPMWubZ5NIAfRz70HjGXGfLE58ElfkCtkjBp4DhQKCg=
=89Ux
-----END PGP SIGNATURE-----

--Apple-Mail=_2D885FE3-7A54-4BE1-A4C8-F9DE1284985C--