Received-SPF: pass (google.com: domain of linux-kernel+bounces-156745-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Wed, 24 Apr 2024 11:44:17 +0100
From: Conor Dooley <conor@kernel.org>
To: Samuel Holland <samuel.holland@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>,
	=?iso-8859-1?Q?Bj=F6rn_T=F6pel?= <bjorn@rivosinc.com>,
	linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 4/7] riscv: Simplify text patching loops
Message-ID: <20240424-cranial-punch-27b38726d3f7@spud>
References: <20240327160520.791322-1-samuel.holland@sifive.com>
 <20240327160520.791322-5-samuel.holland@sifive.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="McmlA8K/qaTnrTZf"
Content-Disposition: inline
In-Reply-To: <20240327160520.791322-5-samuel.holland@sifive.com>


--McmlA8K/qaTnrTZf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Mar 27, 2024 at 09:04:43AM -0700, Samuel Holland wrote:
> This reduces the number of variables and makes the code easier to parse.
>=20
> Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
> ---
>=20
> Changes in v2:
>  - Further simplify patch_insn_set()/patch_insn_write() loop conditions
>  - Use min() instead of min_t() since both sides are unsigned long
>=20
>  arch/riscv/kernel/patch.c | 37 +++++++++++++++++++++----------------
>  1 file changed, 21 insertions(+), 16 deletions(-)
>=20
> diff --git a/arch/riscv/kernel/patch.c b/arch/riscv/kernel/patch.c
> index 9a1bce1adf5a..0d1700d1934c 100644
> --- a/arch/riscv/kernel/patch.c
> +++ b/arch/riscv/kernel/patch.c
> @@ -155,22 +155,24 @@ NOKPROBE_SYMBOL(__patch_insn_write);
> =20
>  static int patch_insn_set(void *addr, u8 c, size_t len)
>  {
> -	size_t patched =3D 0;
>  	size_t size;
> -	int ret =3D 0;
> =20
>  	/*
>  	 * __patch_insn_set() can only work on 2 pages at a time so call it in a
>  	 * loop with len <=3D 2 * PAGE_SIZE.
>  	 */
> -	while (patched < len && !ret) {
> -		size =3D min_t(size_t, PAGE_SIZE * 2 - offset_in_page(addr + patched),=
 len - patched);
> -		ret =3D __patch_insn_set(addr + patched, c, size);
> -
> -		patched +=3D size;
>  	}
> =20
> -	return ret;
>  }

Weren't these actively wrong before, if a non-ultimate
__patch_insn_set() failed we'd just ignore the error?

Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

Thanks,
Conor.

--McmlA8K/qaTnrTZf
Content-Type: application/pgp-signature; name="signature.asc"

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

iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCZijigAAKCRB4tDGHoIJi
0q57AP0UAhx5QNtAbU133ScLNzELZcym+MIXcLM8EZQCAH/skQEA2EtGNG7wt3yz
kRcpFCV6rRc3Ypqb47F4ogt+DiOoCA8=
=FbM0
-----END PGP SIGNATURE-----

--McmlA8K/qaTnrTZf--