From mboxrd@z Thu Jan 1 00:00:00 1970 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 1190FC433EF for ; Wed, 9 Mar 2022 07:57:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230401AbiCIH5q (ORCPT ); Wed, 9 Mar 2022 02:57:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231133AbiCIH4c (ORCPT ); Wed, 9 Mar 2022 02:56:32 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6DA11662E0; Tue, 8 Mar 2022 23:55:11 -0800 (PST) Date: Wed, 09 Mar 2022 07:55:09 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646812510; 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=hOOZettrM7qo2EvZiboOkeTG/FzBFe6hyzhZk+16j3c=; b=FmEifVFjz6E/wECOp2yupaPLiLfKYuqQo/fHZPgTivJhPsduDVIKb9MhSMUgRhdM2usmqk 9hHOjPTdjBhfVP+I7xRyekwKn51UGYSh7/9rcgfNg3q1G2hPlBDYjbHBvLanLv0jRhVEXc U6vn0UIk1XSzey37wNzv1UnyiEDbM/Gs6xakRq7gWDrguiRP/5H8fMRKn8zQmXfgP+Qo6B CBbQB7KEPYKuOVF1y2q5X3S37NbZHZBcTTpiPsMIGJMK9dKmg0pRQczaZ/2IGLBXcOCMen aMWRAGbD6xphJAG55PIhJFwdvsalZ86drWTTReHbDV/u+trL1Pq0m0o8P0ebAA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646812510; 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=hOOZettrM7qo2EvZiboOkeTG/FzBFe6hyzhZk+16j3c=; b=w6xXyUhTvzJPFQ/SEo30R2dPL7xriRzMEHcmz+t1KH6tGpNtioIbzF3A0+TTG4y7VU3Khy 44w0QYwR9zgN36AQ== 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/core] x86/entry: Cleanup PARAVIRT Cc: Andrew Cooper , "Peter Zijlstra (Intel)" , Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220308154317.756014488@infradead.org> References: <20220308154317.756014488@infradead.org> MIME-Version: 1.0 Message-ID: <164681250937.16921.8248134753945308273.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: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/core branch of tip: Commit-ID: 41c8dc098c627da1cba3b3dc471cba506414a7dd Gitweb: https://git.kernel.org/tip/41c8dc098c627da1cba3b3dc471cba506414a7dd Author: Peter Zijlstra AuthorDate: Tue, 08 Mar 2022 16:30:21 +01:00 Committer: Peter Zijlstra CommitterDate: Tue, 08 Mar 2022 23:53:29 +01:00 x86/entry: Cleanup PARAVIRT Since commit 5c8f6a2e316e ("x86/xen: Add xenpv_restore_regs_and_return_to_usermode()") Xen will no longer reach this code and we can do away with the paravirt SWAPGS/INTERRUPT_RETURN. Suggested-by: Andrew Cooper Signed-off-by: Peter Zijlstra (Intel) Acked-by: Josh Poimboeuf Link: https://lore.kernel.org/r/20220308154317.756014488@infradead.org --- arch/x86/entry/entry_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 466df3e..22e4e9a 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -608,8 +608,8 @@ SYM_INNER_LABEL(swapgs_restore_regs_and_return_to_usermode, SYM_L_GLOBAL) /* Restore RDI. */ popq %rdi - SWAPGS - INTERRUPT_RETURN + swapgs + jmp native_iret SYM_INNER_LABEL(restore_regs_and_return_to_kernel, SYM_L_GLOBAL)