From patchwork Sat Sep 23 09:42:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 143950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp271825vqu; Sat, 23 Sep 2023 09:39:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBVl07MTCpegWook1/4p6Te5OieI5OvI4sTj4VDggKnyXskaA3d6OTP3RgQs23gS7ROkAt X-Received: by 2002:a17:902:d505:b0:1c5:9f52:6a5b with SMTP id b5-20020a170902d50500b001c59f526a5bmr2338504plg.42.1695487178948; Sat, 23 Sep 2023 09:39:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695487178; cv=none; d=google.com; s=arc-20160816; b=HH7/vpCHtPT5ZqFGuo7cACX7XGZmtEt363ia2pBxfGXfPa1BzPfChhDbfSQACxzeRj iNlqmMK8BegSb5VJuDX2aSaluRnSiDlGvA/NwBPT2rWk7IDpronL0fZXSTaWl6YcUzj+ DJZuBKgdHPRy/gvPWdA/c9WiOOEIHB470qqy7RdQq17qhcU0LdvAg/sd5KmyJwZaWl5F 6b1384YkAugO3DmNVg7ZjQccAx1mTYfDJFvdWxLHHwpft2czAABaWuRLIgkmgYHwCS1x Ua7vOZv6xPXZRHjr8Z2m3+qfSmrUloK2PX7YtSjceH4xWU5V9cnZywvZlczz3Ou6Oh4z SUAw== 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=Jk9BzZ+s0Wxk+JpeTNLpKgIj5v9aJLIJfSZaV+PrIiQ=; fh=Tb1p8S3iOxe/kX/WSNC3xEJzSVgGJ5DaxSrKb+pzH+4=; b=UcIfn3xcfgoZlaFjo1nLNBPN+XtjrtOPBzh5E5dE0ZZVW25YonRImJF9hW/K+zuHfX s6qeNI24jcxQc5D8A/saF65uzjiTzHjMiY/LjAnuLF06M68oJexncck3wj/0KpJbSP0p K4BrnUXXbttpsZXmb1zCwEYY01tX7tOnsyibewbCy/oTXniV3t63NIK3PpuCEbKNLaNK LQ+2sFfAaPLpNP9ikLbknbGvS9AAx3jnkhI8Ev4BRfUSlbHW3o9yKuyWWHYgb9Mu4QVr YhkSANPG62/KmqZxUVmrIvmkgNcixu6wQ52qS+/+2FdocLtWymo7/4ZD5hdnWNDZxbUD iDDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BSoRMQU3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id m13-20020a170902db0d00b001b8c6890612si7214542plx.594.2023.09.23.09.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 09:39:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BSoRMQU3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id 1114D83A018A; Sat, 23 Sep 2023 03:14:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231566AbjIWKNg (ORCPT + 29 others); Sat, 23 Sep 2023 06:13:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231657AbjIWKMV (ORCPT ); Sat, 23 Sep 2023 06:12:21 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E372E42; Sat, 23 Sep 2023 03:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695463915; x=1726999915; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1q9TX+E9M+XAvCy1QsZHulLmmodNJZdOtsrh5PyAo94=; b=BSoRMQU3UDlxsImqiXJoM4K5k+zFH3SpWys/576wd49w8l61JyMxqsbG C0YmByCxgI4hvFIwfb68sDcByyWtz0kXM8eMLXra3nViNrHXlU9wQgwkl UIfN5uG7JGOSofS7lkKIOsl3znipGNUNasDGloS4qKX+hI83E2ftMvH94 8v0Vatc79B09u0Mk0SGzdCXkaItWrLF6G/M9cr22WLeX/eEsEUNTX+SaZ 9Rl8rTRKX4LQkmhNRlYOXRX38QfGwPj8xFy6JsbUCQu408lszOHhRKSd1 060IKVzwcBG7y21YgZ5ETiTKPcexlYHwKfADrDEhs8tmPTjRcMyEcwwXH w==; X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="447492435" X-IronPort-AV: E=Sophos;i="6.03,171,1694761200"; d="scan'208";a="447492435" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2023 03:11:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="813388206" X-IronPort-AV: E=Sophos;i="6.03,171,1694761200"; d="scan'208";a="813388206" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga008.fm.intel.com with ESMTP; 23 Sep 2023 03:11:50 -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 v11 30/37] x86/fred: Let ret_from_fork_asm() jmp to asm_fred_exit_user when FRED is enabled Date: Sat, 23 Sep 2023 02:42:05 -0700 Message-Id: <20230923094212.26520-31-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230923094212.26520-1-xin3.li@intel.com> References: <20230923094212.26520-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email 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 (fry.vger.email [0.0.0.0]); Sat, 23 Sep 2023 03:14:33 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777847164098532140 X-GMAIL-MSGID: 1777847164098532140 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 179e08d34eb6..f7db3a12ccb1 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)