Received-SPF: pass (google.com: domain of linux-kernel+bounces-156747-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 24 Apr 2024 11:47:45 +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-gallows-resilient-c46a69705a0c@spud>
References: <20240327160520.791322-1-samuel.holland@sifive.com>
 <20240327160520.791322-5-samuel.holland@sifive.com>
 <20240424-cranial-punch-27b38726d3f7@spud>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="URBwmoCtPsB1XCmP"
Content-Disposition: inline
In-Reply-To: <20240424-cranial-punch-27b38726d3f7@spud>


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

On Wed, Apr 24, 2024 at 11:44:17AM +0100, Conor Dooley wrote:
> 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 i=
n 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;
> >  }
>=20
> Weren't these actively wrong before, if a non-ultimate
> __patch_insn_set() failed we'd just ignore the error?

nvm, failure to read on my part..

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

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

iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCZijjUQAKCRB4tDGHoIJi
0jnJAQCZwXvp86ggmW7AzqfFnAHTSRh+t/KIM9IcxGmWgbhAcAEAj4HjXN/D/hkC
9nYTOHV+Z6/tFGPZAWLP52FWBbJNXgo=
=qkLZ
-----END PGP SIGNATURE-----

--URBwmoCtPsB1XCmP--