From patchwork Tue Mar 7 02:39:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 65247 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2216821wrd; Mon, 6 Mar 2023 19:28:31 -0800 (PST) X-Google-Smtp-Source: AK7set8b+vm8csKQPtSfqSOHCn9dz7g8Tbq2Au1v0Tv1AtPWohxj0+g8a7aCFRokn7QE0o0w5Zpo X-Received: by 2002:a05:6a21:78a6:b0:cc:5f27:d003 with SMTP id bf38-20020a056a2178a600b000cc5f27d003mr13977577pzc.56.1678159710812; Mon, 06 Mar 2023 19:28:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678159710; cv=none; d=google.com; s=arc-20160816; b=fB/xAXRGrjrsCb7Z1H+wTvndBocnGRAL5ratp3SAdd3TQvIUrrIaYs8zNkEUEM/8fD 9F0dTZNJvkLDsEDq37Ys/CciUAKWO19Ef5hYOZ+eDigC+3w7I1SHTOiyUR/oJosqfhbM jRu7Zx4vrDM3SCLrXrrnhcC5ISOPlDCOUcg80yDRNlcZ3Pmfemtx3GXqOMz5BuW6Oy3O sQR5h6FFjxrsY2RI3RUtWMs5qJfNTtYBdJXea7i2y8ATkVvAWXctLL73ud+ZNXXd4Whp Y/3SsnZi9+weCgqspXJA1aBpJZrWoprHv31/YE15LXdUhOyZJ23hfRhXz2EW9Hp+vmp0 IDLA== 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=KIufXiS22ukm4bYjosPpn6jOKXWPfemJH11Ed6G9b7k=; b=ZvTbhKIZ5jQaL8wJSdf+VWJN3IoAsLj/CGrzv0L81mgUWZPDvfu4EwlV+5NcYx5Zo5 TXYJqqktse5VZj/IIFZo0AfVyFlm97h2eUV/SPlV5hKy1eJTZQz8saHofUXPMVhz6V9U Mrex+IgkaNL3ZzgmWBvtMCF3MwBTHukPKEa/MgjrIecEXQuby22fWvFvdf8DOsykA8f3 lQfLbR7FXq2TXOcuRvhK16Ywb6E8fg0TFaSxV2ttxJ4Fhn1Jy5DS9BZ30Q6ikp8ljzNw yToCu1hfyFKFEotBD0BqC78dDt0a+CAzVguxOO+E8KGeo3BZo8vRXQDSOiAw7zTs0bgb Al3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GmqWHNKL; 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 b11-20020a65668b000000b004f0131105e9si10553346pgw.855.2023.03.06.19.28.17; Mon, 06 Mar 2023 19:28:30 -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=GmqWHNKL; 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 S229976AbjCGDHQ (ORCPT + 99 others); Mon, 6 Mar 2023 22:07:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230218AbjCGDGV (ORCPT ); Mon, 6 Mar 2023 22:06:21 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D49A82A84; Mon, 6 Mar 2023 19:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678158334; x=1709694334; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O9acOeCuSr/+wKyZ7069qEc1yb3O4hIxP1jgg1zr2lE=; b=GmqWHNKLZCnl8n9dJ8whxKWiwyrlea29lsKKANeuE74uLUfg2/moOLPu UPfwF7p78hKHqYDr0xVgXzijgJd7aALsTubGf6caY0VF62xhZX5Db7EGf J8j5aCJovKYrQmmCtbryN2jE48l+knc5nglqx2R8Af2cpw5OQQUiVEkEC 2/qkzeg0CEW3q7OuUI3bsTxIzXcjyTPYO9ddH2HCNnXeQqGB7F08MKBIz 1tScaeqGnny3cia+2tvF3W4BxTFuk7Qse0QKx98NKJK03WoQDLE+YXXhO q1VfWGGtVhrgQBJHSI6gZoHrDZlGZEvkTU0+dYfifhJlvPflTrzl+LyQf w==; X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="338072536" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="338072536" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 19:05:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="676409881" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="676409881" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga002.jf.intel.com with ESMTP; 06 Mar 2023 19:05:19 -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: [PATCH v5 24/34] x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled Date: Mon, 6 Mar 2023 18:39:36 -0800 Message-Id: <20230307023946.14516-25-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307023946.14516-1-xin3.li@intel.com> References: <20230307023946.14516-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, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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?1759677997152007275?= X-GMAIL-MSGID: =?utf-8?q?1759677997152007275?= 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) Tested-by: Shan Kang 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 eccc3431e515..5b595a9b2ffb 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 */