From patchwork Fri Feb 24 07:01:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 61168 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp757784wrd; Thu, 23 Feb 2023 23:33:44 -0800 (PST) X-Google-Smtp-Source: AK7set/55aGFGHtR9vtWc8BdbL2sT3DstxsW05eE8b85d0uWsVI41uVHw6Ev7hpPhBI6FGcseQjr X-Received: by 2002:a17:907:a04f:b0:88b:23bb:e61f with SMTP id gz15-20020a170907a04f00b0088b23bbe61fmr21183978ejc.25.1677224024483; Thu, 23 Feb 2023 23:33:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677224024; cv=none; d=google.com; s=arc-20160816; b=bHDJ3zKAsPWrxcY/RrGiRRgXDU1CWtcZ4hs067P9BdUWBvXlrvpZmiaatE78pW0oBF P5RwouWxyicV8eFAUuASGocMmcMAkqEagIzIJXS1d7h4o9O0wVLODsK2A58Bw6SBN9XE 0epS166MAhDVKYYbzeL1KvpWG4op8yfg4T+2lHjPBuo6ZgKGHrzDAuigPGpCuvMQkj0B ZaXpGJ3/XY75PTWOzd1IbK6MQn08OTKoS0C4L0o7EJUnStxLKG+0NyS5xzl+psNpCb+/ q0yQSE01e5JHLTJgBenIYftWl5uyOpMtN02cbKRwxO4akEasxO7CmXkEkne0QMCl8Raw uvUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qSIIJnBx9qkRAnEqmEIId/cj4hgRQ/MIvMmKlYYLEpE=; b=sNX6uqtazQfU83+wDUzL+X8Y4sXpZkJ2Ok2JslFuE4+IEw2j0agJUE/xyG0FOzdPbX 5LW0HCeSQ6WMH7GNJIVdjigtH64dM2qow5Q1I6WBEpwzx1xbJvr7IIfKPAJtHMJY+J3/ waC7s6+FRVV6KN15GNCNQn7VXH84S1a7HSSpH1cC8dCOpen09X53SWTY1yYVNI3pv7Fv bXwzHpNdgX9J7Jqo/Q7x/PJyfmgpyYAQ0/w8W03xsrS1wXAHVanhML8aO1lt5veXiLYM A91Y9BAZNACxqpVTXYhpqclstx4Zm9d2pmfhKC57DQkV3tvOJDyvqoDHikiYPRccVB8c U6zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ioL6zEeL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v9-20020a17090610c900b008c03e7b183dsi24316581ejv.264.2023.02.23.23.33.21; Thu, 23 Feb 2023 23:33:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ioL6zEeL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230083AbjBXH3W (ORCPT + 99 others); Fri, 24 Feb 2023 02:29:22 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758696858618019225?= X-GMAIL-MSGID: =?utf-8?q?1758696858618019225?= 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 */