From patchwork Tue Oct 3 06:24:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 147671 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1899573vqb; Mon, 2 Oct 2023 23:57:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4kKc4XR5zg88WT8M8oXXxzdOOq+m43j1lZZ9DtlXzLRUg3N5Nj1g5vbUxzcrzWwbMRqJy X-Received: by 2002:a17:90a:17af:b0:273:ec96:b6f9 with SMTP id q44-20020a17090a17af00b00273ec96b6f9mr11626129pja.25.1696316275921; Mon, 02 Oct 2023 23:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696316275; cv=none; d=google.com; s=arc-20160816; b=U+3Hwo0rq33FVRey2HMVuz30H0uy9jmLNYsEuu0SNbcxbUXvdpfdK+8QB/aJf2hD/Z Hc80VNSAv4OqGAiYk3oBL/FKIeMe9iYsoSxB1OkiPn/12fmIDL4Lik49hQ4D7fQpGGoB 3tDhnyzLHYuECnWAkzwWe2vJuk79JlGOLn3RMVvdCRsCKgEiCXmnqI7T10SAohrksQ5e UUkxP929+nGO5xgPO4ZiLHh3TJ5oKuxGV6zfYJ/vVtgy+moVNHOQ6tAaDk0KnL2WWh+B 05O2Un7iTzjqUmY7Pzw/l5MPi2jePQU1cCOprHdEXmYmkuISgvlxuEq/AHLMwuK0Uhxo kR8Q== 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=Paz4+Poj80QCVs/w6AUolDqLAoKvSj+1Z87mXjXjNtc=; fh=Tb1p8S3iOxe/kX/WSNC3xEJzSVgGJ5DaxSrKb+pzH+4=; b=OIoIsQdf5JaC/5RVQWDU/S8uJXwpE/g83Wn1+wWdv1fZSn/Q8TDW7M1Vv9KkE/bNs+ ZPpDTQJK7kVVs7gxxD5ryHkCJv5wPdu4glz5xKyKXR2HiKoYZHlovgfJ14ofXrgXtazu 5aNxqX/bkrZsHqewxnJvNo0D4gMkCes/95qDZn0Bu8h/5hKiz9nE0IFSSIrUrf1Ltqii Vp4xKLQPf0m4VcBrDVCJluXSazVuW6nBNdofRB6GmT5FCvSE9VBSwoi7gKFp7S7yp48P 7mJsyxsitv2sfRtLzhyS5gHD4sTdCm0jHt+VFrvT9PwNW8zzEoNnhVCSc3zTZtg0RTNS sBIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Ep1BTMOm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id z10-20020a17090a7b8a00b00252d84b7af0si745091pjc.181.2023.10.02.23.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 23:57:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Ep1BTMOm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 0FB82812AD2C; Mon, 2 Oct 2023 23:57:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239520AbjJCG5q (ORCPT + 18 others); Tue, 3 Oct 2023 02:57:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239509AbjJCG5b (ORCPT ); Tue, 3 Oct 2023 02:57:31 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2199826A9; Mon, 2 Oct 2023 23:55:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696316143; x=1727852143; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oFGFV3scnrY39BI9CJIqIFWq/3/jto+rXVMWI3BCfMo=; b=Ep1BTMOmPDsNquD9btzsbfVqvwtPmIMqBcY+AWmMbPyyjzUIICy0WMo8 k9yguuMIvsoUmm9rj35WPjg2f8a1GSIs59wQFavj/YV0OIw0FhfL+6te8 rRkT3kJz1LvmiW5w5diIyt5o5/2mBX6QP7Zm/SrDOlijRQ3Hqd+/68f1s XuJZehawgRnEpNajABgP6KHInN8ONTlDK8bKrLQXKyM9cmoOpHvpUPzcA Fyv/pOlLzqBfvG737Lxo3sK12LNLb1EiXhvy5o4euMDDkm80rUs9nTkIE eYaky5e0LyCnQJcObUFEq9aA3nKYxAFKspOH79123Sa0B1/sj97RwSNyf g==; X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="367858279" X-IronPort-AV: E=Sophos;i="6.03,196,1694761200"; d="scan'208";a="367858279" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 23:54:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="1081900998" X-IronPort-AV: E=Sophos;i="6.03,196,1694761200"; d="scan'208";a="1081900998" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga005.fm.intel.com with ESMTP; 02 Oct 2023 23:54:49 -0700 From: Xin Li To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, luto@kernel.org, pbonzini@redhat.com, seanjc@google.com, peterz@infradead.org, jgross@suse.com, ravi.v.shankar@intel.com, mhiramat@kernel.org, andrew.cooper3@citrix.com, jiangshanlai@gmail.com, nik.borisov@suse.com Subject: [PATCH v12 30/37] x86/fred: Let ret_from_fork_asm() jmp to asm_fred_exit_user when FRED is enabled Date: Mon, 2 Oct 2023 23:24:51 -0700 Message-Id: <20231003062458.23552-31-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003062458.23552-1-xin3.li@intel.com> References: <20231003062458.23552-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 02 Oct 2023 23:57:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778716535473952566 X-GMAIL-MSGID: 1778716535473952566 From: "H. Peter Anvin (Intel)" Let ret_from_fork_asm() jmp to asm_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 | 6 ++++++ arch/x86/entry/entry_64_fred.S | 1 + 2 files changed, 7 insertions(+) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index aa4214703091..7f408deef00f 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -309,7 +309,13 @@ SYM_CODE_START(ret_from_fork_asm) * and unwind should work normally. */ UNWIND_HINT_REGS + +#ifdef CONFIG_X86_FRED + ALTERNATIVE "jmp swapgs_restore_regs_and_return_to_usermode", \ + "jmp asm_fred_exit_user", X86_FEATURE_FRED +#else jmp swapgs_restore_regs_and_return_to_usermode +#endif SYM_CODE_END(ret_from_fork_asm) .popsection diff --git a/arch/x86/entry/entry_64_fred.S b/arch/x86/entry/entry_64_fred.S index 37a1dd5e8ace..5781c3411b44 100644 --- a/arch/x86/entry/entry_64_fred.S +++ b/arch/x86/entry/entry_64_fred.S @@ -32,6 +32,7 @@ SYM_CODE_START_NOALIGN(asm_fred_entrypoint_user) FRED_ENTER call fred_entry_from_user +SYM_INNER_LABEL(asm_fred_exit_user, SYM_L_GLOBAL) FRED_EXIT ERETU SYM_CODE_END(asm_fred_entrypoint_user)