Received-SPF: pass (google.com: domain of linux-kernel+bounces-30592-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Thu, 18 Jan 2024 22:05:44 +0000
From: Conor Dooley <conor@kernel.org>
To: Charlie Jenkins <charlie@rivosinc.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	Albert Ou <aou@eecs.berkeley.edu>, linux-riscv@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] riscv: lib: Support csum on GCC <11
Message-ID: <20240118-museum-ample-11d649f95de8@spud>
References: <20240118-csum_remove_output_operands_asm_goto-v1-1-47c672bb9d4b@rivosinc.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="pl1prUg+ekIn2nNV"
Content-Disposition: inline
In-Reply-To: <20240118-csum_remove_output_operands_asm_goto-v1-1-47c672bb9d4b@rivosinc.com>


--pl1prUg+ekIn2nNV
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Jan 18, 2024 at 01:53:59PM -0800, Charlie Jenkins wrote:
> The OutputOperands field for asm goto statements is only supported
> starting from GCC 11. Split the asm goto to remove the use of this
> feature.
>=20
> Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
> Fixes: a04c192eabfb ("riscv: Add checksum library")
> ---
> The OutputOperands field for asm goto statements is only supported
> starting from GCC 11. Split the asm goto to remove the use of this
> feature.

Maybe this is a super naive question, but is it possible to just not
use the custom csum code for gcc older than 11?

> ---
>  arch/riscv/lib/csum.c | 42 ++++++++++++++++++++++++++++++------------
>  1 file changed, 30 insertions(+), 12 deletions(-)
>=20
> diff --git a/arch/riscv/lib/csum.c b/arch/riscv/lib/csum.c
> index 06ce8e7250d9..23be289f52b6 100644
> --- a/arch/riscv/lib/csum.c
> +++ b/arch/riscv/lib/csum.c
> @@ -177,22 +177,35 @@ do_csum_with_alignment(const unsigned char *buff, i=
nt len)
>  				  : no_zbb);
> =20
>  #ifdef CONFIG_32BIT
> -		asm_volatile_goto(".option push			\n\
> +		/*
> +		 * OutputOperands in asm goto is not supported until GCC 11, so
> +		 * this asm has to be split to be compatible.
> +		 */
> +		asm (".option push				\n\
>  		.option arch,+zbb				\n\
>  			rori	%[fold_temp], %[csum], 16	\n\
>  			andi	%[offset], %[offset], 1		\n\
>  			add	%[csum], %[fold_temp], %[csum]	\n\
> -			beq	%[offset], zero, %l[end]	\n\
> -			rev8	%[csum], %[csum]		\n\
>  		.option pop"
>  			: [csum] "+r" (csum), [fold_temp] "=3D&r" (fold_temp)
> -			: [offset] "r" (offset)
> -			:
> -			: end);
> +			: [offset] "r" (offset));
> +
> +		if (offset =3D=3D 0)
> +			goto end;
> +
> +		asm (".option push				\n\
> +		.option arch, +zbb				\n\
> +			rev8	%[csum], %[csum]		\n\
> +		.option pop"
> +			: [csum] "+r" (csum));
> =20
>  		return (unsigned short)csum;
>  #else /* !CONFIG_32BIT */
> -		asm_volatile_goto(".option push			\n\
> +		/*
> +		 * OutputOperands in asm goto is not supported until GCC 11, so
> +		 * this asm has to be split to be compatible.
> +		 */
> +		asm (".option push				\n\
>  		.option arch,+zbb				\n\
>  			rori	%[fold_temp], %[csum], 32	\n\
>  			add	%[csum], %[fold_temp], %[csum]	\n\
> @@ -200,13 +213,18 @@ do_csum_with_alignment(const unsigned char *buff, i=
nt len)
>  			roriw	%[fold_temp], %[csum], 16	\n\
>  			addw	%[csum], %[fold_temp], %[csum]	\n\
>  			andi	%[offset], %[offset], 1		\n\
> -			beq	%[offset], zero, %l[end]	\n\
> -			rev8	%[csum], %[csum]		\n\
>  		.option pop"
>  			: [csum] "+r" (csum), [fold_temp] "=3D&r" (fold_temp)
> -			: [offset] "r" (offset)
> -			:
> -			: end);
> +			: [offset] "r" (offset));
> +
> +		if (offset =3D=3D 0)
> +			goto end;
> +
> +		asm (".option push				\n\
> +		.option arch, +zbb				\n\
> +			rev8	%[csum], %[csum]		\n\
> +		.option pop"
> +			: [csum] "+r" (csum));
> =20
>  		return (csum << 16) >> 48;
>  #endif /* !CONFIG_32BIT */
>=20
> ---
> base-commit: 080c4324fa5e81ff3780206a138223abfb57a68e
> change-id: 20240118-csum_remove_output_operands_asm_goto-49922c141ce7
> --=20
> - Charlie
>=20
>=20

--pl1prUg+ekIn2nNV
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCZamguAAKCRB4tDGHoIJi
0piAAP43AO2qeJIkMIMNCYDRVUHlOx4Fd4fKJBeaGX7Pc1EjlQD+Klh3LfS4rMLi
BXwU/T016C4F2KPCyItXgiwTbGy4SwU=
=Yi8l
-----END PGP SIGNATURE-----

--pl1prUg+ekIn2nNV--