From nobody Thu Apr 9 03:11:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68D46C4332F for ; Wed, 2 Nov 2022 09:14:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231565AbiKBJOq (ORCPT ); Wed, 2 Nov 2022 05:14:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231296AbiKBJNY (ORCPT ); Wed, 2 Nov 2022 05:13:24 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6518828E39; Wed, 2 Nov 2022 02:12:53 -0700 (PDT) Date: Wed, 02 Nov 2022 09:12:50 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667380371; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AgG2rCPrFDpdI0zoUhNhjwOMLIi1Qe1fHdpR+YdJups=; b=DLUlnRCTrBa9nAnm0jAFQRRIr3o/7PCF9s8KKJ4JFJXZ+CpSOImEEE4Ue0fM9aYOJNB/Ow 2RA7ohT3pGDM6B9G4+pQHQwckTAAu9ofcvTjEtiMkB/NP9tYc1DdrvEwrMiJfhJOCyzJdO 9Hp9egyCt603axJBad5gHuAOKOdEIffCgbh58oHLQLYyVarcyD53gLzqoD0ncraY/8LCHW A9a2vi/jTUQ58RdAPi7jJhzlDxblXlYZZLoVZ8MgNP7qnLbnHjR8zCSek1JAIdijy6SC1T CBo0V4rBrjBtv1dSXW74WPuUvxGtscM2Y8tCgmyiFm9M3YgQX1JYRSVapS+McA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667380371; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AgG2rCPrFDpdI0zoUhNhjwOMLIi1Qe1fHdpR+YdJups=; b=FIeOMfaqgkiLMoklR2qrh4uRWeedrCiXnF/LR3DLsGx4dPNGhSotu0a0Pqcms/3Wsj7xgv tRRdOo1d2xOb0bBA== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] x86/ftrace: Remove SYSTEM_BOOTING exceptions Cc: "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221025201057.945960823@infradead.org> References: <20221025201057.945960823@infradead.org> MIME-Version: 1.0 Message-ID: <166738037045.7716.16513980408909497030.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/mm branch of tip: Commit-ID: 52a56f20bb7c34ed4b48466ad2d443165fad942f Gitweb: https://git.kernel.org/tip/52a56f20bb7c34ed4b48466ad2d443165= fad942f Author: Peter Zijlstra AuthorDate: Tue, 25 Oct 2022 21:39:47 +02:00 Committer: Peter Zijlstra CommitterDate: Tue, 01 Nov 2022 13:43:58 +01:00 x86/ftrace: Remove SYSTEM_BOOTING exceptions Now that text_poke is available before ftrace, remove the SYSTEM_BOOTING exceptions. Specifically, this cures a W+X case during boot. Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221025201057.945960823@infradead.org --- arch/x86/kernel/alternative.c | 10 ---------- arch/x86/kernel/ftrace.c | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 5cadcea..e240351 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -1681,11 +1681,6 @@ void __ref text_poke_queue(void *addr, const void *o= pcode, size_t len, const voi { struct text_poke_loc *tp; =20 - if (unlikely(system_state =3D=3D SYSTEM_BOOTING)) { - text_poke_early(addr, opcode, len); - return; - } - text_poke_flush(addr); =20 tp =3D &tp_vec[tp_vec_nr++]; @@ -1707,11 +1702,6 @@ void __ref text_poke_bp(void *addr, const void *opco= de, size_t len, const void * { struct text_poke_loc tp; =20 - if (unlikely(system_state =3D=3D SYSTEM_BOOTING)) { - text_poke_early(addr, opcode, len); - return; - } - text_poke_loc_init(&tp, addr, opcode, len, emulate); text_poke_bp_batch(&tp, 1); } diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index bd16500..43628b8 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -415,8 +415,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int = *tramp_size) =20 set_vm_flush_reset_perms(trampoline); =20 - if (likely(system_state !=3D SYSTEM_BOOTING)) - set_memory_ro((unsigned long)trampoline, npages); + set_memory_ro((unsigned long)trampoline, npages); set_memory_x((unsigned long)trampoline, npages); return (unsigned long)trampoline; fail: