From nobody Fri Dec 19 01:00:02 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 668382040A7; Tue, 25 Mar 2025 07:36:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742888171; cv=none; b=rXnpBy9xJy+QZCUwCMaxsjco8sg+nup2/kMpOOSGznyfqC3cyxm0mOGuQdx0UaKIhuHv+M2PmGS96COa86cHFs+4aLC6EZWRc1See7ynun1T0Fy5c2MrEeVEHRuO0T7+BRoE93WcSndNKDJnjN3i1dxgzrdMJf5LLgyG9mhSWME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742888171; c=relaxed/simple; bh=sL+SIfje2Dzbdog7VczuCEGLsUpCBpaexSjQZL2P2b0=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=UWIOjKAmHUJjzADsX27+XQApqOM7WfUpTtNN2d+u3MoQ7RZdzwhsvJD131/T/KiZ0CzlFaaiS2BBdS5fdmg6ivDyksfX1O6Zet3piTnH2JDbWXom0nfLTTvakLbEXGGLAu+4+b7jMsjq8aOr+DF8XTEgmRkqZF9j6muGt4bey1U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=hCYVRy9F; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=VwHu2X9G; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="hCYVRy9F"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="VwHu2X9G" Date: Tue, 25 Mar 2025 07:36:07 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1742888168; 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=QJUCa6CcnIxSM/iXSM+hE5nxTfmFG9dHgRtsO0gVSPc=; b=hCYVRy9F8aUKAG3VjFhUBTtiVIPROWyQwQv3fWd70vyGuXbrWLiE4HzG3ljJyo6IUnHVyX fncoh2kSfZzzy/MF7wjHXrMR9u9UnS4i4ryR9ZEQp03Fp6AsPrkU5+YQqhrEy8XysTet7O 4aTHVtmhovLAvf2znAyExR9J0RzMg3e2KY9X5nt4xU7XVj7QQ+k5Rh9xLBPu0Ll4xA2S0v LxSDlCy21845GFxUmM7e5oZMaUKDMnQ1S6X55cnufjYudJC5QMBQAQ+BM1gTVVVnxDcNcD MQY2pGY8X/b8jSeAaQXAGA0w7Eji2l4Y1GsFhbwQyXyHsvMjw+G9ViKVHRiGCw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1742888168; 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=QJUCa6CcnIxSM/iXSM+hE5nxTfmFG9dHgRtsO0gVSPc=; b=VwHu2X9Gcm4ceAKjSV3asBvp9c7mIw+509/q6kEQI1QNimLgnaKAR7Urff2AyT45VSElnf oHmWU+KVR64bqnAg== From: "tip-bot2 for Pawan Gupta" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/speculation: Remove the extra #ifdef around CALL_NOSPEC Cc: Pawan Gupta , Ingo Molnar , Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250320-call-nospec-extra-ifdef-v1-1-d9b084d24820@linux.intel.com> References: <20250320-call-nospec-extra-ifdef-v1-1-d9b084d24820@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174288816788.14745.10398589976376988106.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/urgent branch of tip: Commit-ID: c8c81458863ab686cda4fe1e603fccaae0f12460 Gitweb: https://git.kernel.org/tip/c8c81458863ab686cda4fe1e603fccaae= 0f12460 Author: Pawan Gupta AuthorDate: Thu, 20 Mar 2025 11:13:15 -07:00 Committer: Ingo Molnar CommitterDate: Sat, 22 Mar 2025 08:41:47 +01:00 x86/speculation: Remove the extra #ifdef around CALL_NOSPEC Commit: 010c4a461c1d ("x86/speculation: Simplify and make CALL_NOSPEC consistent") added an #ifdef CONFIG_MITIGATION_RETPOLINE around the CALL_NOSPEC definiti= on. This is not required as this code is already under a larger #ifdef. Remove the extra #ifdef, no functional change. vmlinux size remains same before and after this change: CONFIG_MITIGATION_RETPOLINE=3Dy: text data bss dec hex filename 25434752 7342290 2301212 35078254 217406e vmlinux.before 25434752 7342290 2301212 35078254 217406e vmlinux.after # CONFIG_MITIGATION_RETPOLINE is not set: text data bss dec hex filename 22943094 6214994 1550152 30708240 1d49210 vmlinux.before 22943094 6214994 1550152 30708240 1d49210 vmlinux.after Signed-off-by: Pawan Gupta Signed-off-by: Ingo Molnar Reviewed-by: Josh Poimboeuf Link: https://lore.kernel.org/r/20250320-call-nospec-extra-ifdef-v1-1-d9b08= 4d24820@linux.intel.com --- arch/x86/include/asm/nospec-branch.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/no= spec-branch.h index 804b66a..29ea8fb 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -435,12 +435,8 @@ static inline void call_depth_return_thunk(void) {} * Inline asm uses the %V modifier which is only in newer GCC * which is ensured when CONFIG_MITIGATION_RETPOLINE is defined. */ -#ifdef CONFIG_MITIGATION_RETPOLINE #define CALL_NOSPEC __CS_PREFIX("%V[thunk_target]") \ "call __x86_indirect_thunk_%V[thunk_target]\n" -#else -#define CALL_NOSPEC "call *%[thunk_target]\n" -#endif =20 # define THUNK_TARGET(addr) [thunk_target] "r" (addr)