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 9AF6FC61DA3 for ; Fri, 24 Feb 2023 07:29:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229717AbjBXH3X (ORCPT ); Fri, 24 Feb 2023 02:29:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230017AbjBXH2u (ORCPT ); Fri, 24 Feb 2023 02:28:50 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4AEE41B49; Thu, 23 Feb 2023 23:28:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677223690; x=1708759690; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oIslRe08H8aZv4yPi7UmQwmu1nBnCnh8gvufNu5UIkE=; b=ioL6zEeLUgNHwIbzG/7Q1cyJRmVekZaycrnjU79LMMHcMgP4UhULuTX3 bMU9K3aojGkvzWmP/AA5FUHq2o5geVs8kIDOoaYFUx8EmB9T82+Huy2nN e9yuTYp7FyTPtuURcwX7LYYEvXkheqNb84Q8So2+LFSnUO1mzkIfhaONZ h+bRlvZJ+s9EAG0zn+qryOVM+qyO4yklvq6SYb4UVhzE2k3lh1YYax5ML EUf2XdMsSullLQUKzC2UlSs7mVl90AzTBlCDHC/yGnpTtCQ8ikf8gtl9s dpOJyGIL2VYRMVSkjrwTFoZCQ1QORjpTQvtucECiQaCtJuA+j5fFCS4Hg A==; X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="334836119" X-IronPort-AV: E=Sophos;i="5.97,324,1669104000"; d="scan'208";a="334836119" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 23:27:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="815639265" X-IronPort-AV: E=Sophos;i="5.97,324,1669104000"; d="scan'208";a="815639265" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga001.fm.intel.com with ESMTP; 23 Feb 2023 23:27:24 -0800 From: Xin Li To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, peterz@infradead.org, andrew.cooper3@citrix.com, seanjc@google.com, pbonzini@redhat.com, ravi.v.shankar@intel.com Subject: [RFC PATCH v3 24/32] x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled Date: Thu, 23 Feb 2023 23:01:37 -0800 Message-Id: <20230224070145.3572-25-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224070145.3572-1-xin3.li@intel.com> References: <20230224070145.3572-1-xin3.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "H. Peter Anvin (Intel)" Let ret_from_fork() jmp to fred_exit_user when FRED is enabled, otherwise the existing IDT code is chosen. Signed-off-by: H. Peter Anvin (Intel) Signed-off-by: Xin Li --- arch/x86/entry/entry_64.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 7ecd2aeeeffc..7ffd20578b8c 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -299,7 +299,12 @@ SYM_CODE_START_NOALIGN(ret_from_fork) UNWIND_HINT_REGS movq %rsp, %rdi call syscall_exit_to_user_mode /* returns with IRQs disabled */ +#ifdef CONFIG_X86_FRED + ALTERNATIVE "jmp swapgs_restore_regs_and_return_to_usermode", \ + "jmp fred_exit_user", X86_FEATURE_FRED +#else jmp swapgs_restore_regs_and_return_to_usermode +#endif 1: /* kernel thread */ -- 2.34.1