Received-SPF: pass (google.com: domain of linux-kernel+bounces-126337-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Borislav Petkov <bp@alien8.de>
To: X86 ML <x86@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 3/4] x86/alternatives: Optimize optimize_nops()
Date: Sun, 31 Mar 2024 20:00:41 +0200
Message-ID: <20240331180042.13933-4-bp@alien8.de>
In-Reply-To: <20240331180042.13933-1-bp@alien8.de>
References: <20240331180042.13933-1-bp@alien8.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

From: "Borislav Petkov (AMD)" <bp@alien8.de>

Return early if NOPs have already been optimized.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
---
 arch/x86/kernel/alternative.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.=
c
index 4b3378c71518..67dd7c371d28 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -233,6 +233,10 @@ static void noinline optimize_nops(const u8 * const =
instr, u8 *buf, size_t len)
 		if (insn_is_nop(&insn)) {
 			int nop =3D i;
=20
+			/* Has the NOP already been optimized? */
+			if (i + insn.length =3D=3D len)
+				return;
+
 			next =3D skip_nops(buf, next, len);
=20
 			add_nop(buf + nop, next - nop);
--=20
2.43.0