Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp529528ybc; Sat, 16 Nov 2019 04:04:29 -0800 (PST) X-Google-Smtp-Source: APXvYqxHGemcsFwjz/ZPURXJCWj4Lduu/PkmbewC26cAph+towr8+bH/N12BBolQZiB6bh5AHn6a X-Received: by 2002:a17:906:245b:: with SMTP id a27mr9471042ejb.192.1573905869347; Sat, 16 Nov 2019 04:04:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573905869; cv=none; d=google.com; s=arc-20160816; b=jV+cEspCpHTiBxryXsyAY+Wp+nM64aV6axopvuW0i50swlKhglmkMMMXWhUYjHBMSk Hju+bDs4pc/qwB9N5CN8RtTxOssiHJhGeA2TX3pqUjDIs71tsG0vXkdigX4sxVVv2ED1 jT1BlfSytZsZF75TCUjJ2KVTbPoBBZHMqSGnNbQOaIQxC2VlT9xaLmbHvWxugQLUPtZr N9kLPgwoEDPzDiT2Ur5NCJPAdKRJVCoKEkPWyxi4GASTmjpjfkxFdh1BCpl4mFEj0sn8 KFoSh4owpa8jLo9T2hwDG1vL7hbE1KT5WgDghBJgNjb91U8ZlNFk8B6jFvrbFa8PF1J4 KCAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=p3XhHauG4I4rSY1IrFgRH9jnRvv9wVixrU1qc1GQvdQ=; b=fk3JWP2dHH+ANwPGyBD6UC0Y28QtatjpeT1GvJJoHL33gjiNwuvf1XtFoUOT5T3SH+ XVRyGcMCuP5Q/LITtUJARm37E3Xq+35gMeZqc0DmWQKi+CzwpFNaiQJr7yiCSduW8CIv Q8FYHiF3lbEIQV+B4KHttGnL81GeFkgFnrDmP6MqvZ5WxaEeO4unutkuvRB+eTd4t6fN 095lVIPYikzWHJzNzov4dEIav+BJCN7ftUQRh6SyXxZgS4Fs1a2cCN3qTjE8ZusX3kiI ZYTqozH1RJlkkuWEtAYyuvnoUgkbXgRRpvJdtsetru+/PJsHhsZaaBG/oaQ8ONgxeXBa lhAw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b15si7766113ejv.167.2019.11.16.04.04.01; Sat, 16 Nov 2019 04:04:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727486AbfKPMC5 (ORCPT + 99 others); Sat, 16 Nov 2019 07:02:57 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:45318 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726794AbfKPMC5 (ORCPT ); Sat, 16 Nov 2019 07:02:57 -0500 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1iVwmn-0002XY-D8; Sat, 16 Nov 2019 13:02:41 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 05BAA1C1901; Sat, 16 Nov 2019 13:02:41 +0100 (CET) Date: Sat, 16 Nov 2019 12:02:40 -0000 From: "tip-bot2 for Thomas Gleixner" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/asm] x86/entry/64: Remove pointless jump in paranoid_exit Cc: Thomas Gleixner , Sean Christopherson , Alexandre Chartre , "Peter Zijlstra (Intel)" , Ingo Molnar , Borislav Petkov , linux-kernel@vger.kernel.org In-Reply-To: <20191023123117.779277679@linutronix.de> References: <20191023123117.779277679@linutronix.de> MIME-Version: 1.0 Message-ID: <157390576087.12247.6427573829478407454.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/asm branch of tip: Commit-ID: 45c08383141794a7e9b26f35d491b74f33ac469e Gitweb: https://git.kernel.org/tip/45c08383141794a7e9b26f35d491b74f33ac469e Author: Thomas Gleixner AuthorDate: Wed, 23 Oct 2019 14:27:07 +02:00 Committer: Thomas Gleixner CommitterDate: Sat, 16 Nov 2019 12:55:55 +01:00 x86/entry/64: Remove pointless jump in paranoid_exit Jump directly to restore_regs_and_return_to_kernel instead of making a pointless extra jump through .Lparanoid_exit_restore Signed-off-by: Thomas Gleixner Reviewed-by: Sean Christopherson Reviewed-by: Alexandre Chartre Acked-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20191023123117.779277679@linutronix.de --- arch/x86/entry/entry_64.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index d58c012..76942cb 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1273,12 +1273,11 @@ SYM_CODE_START_LOCAL(paranoid_exit) /* Always restore stashed CR3 value (see paranoid_entry) */ RESTORE_CR3 scratch_reg=%rbx save_reg=%r14 SWAPGS_UNSAFE_STACK - jmp .Lparanoid_exit_restore + jmp restore_regs_and_return_to_kernel .Lparanoid_exit_no_swapgs: TRACE_IRQS_IRETQ_DEBUG /* Always restore stashed CR3 value (see paranoid_entry) */ RESTORE_CR3 scratch_reg=%rbx save_reg=%r14 -.Lparanoid_exit_restore: jmp restore_regs_and_return_to_kernel SYM_CODE_END(paranoid_exit)