From patchwork Mon Mar 27 07:58:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 75295 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1358939vqo; Mon, 27 Mar 2023 01:42:14 -0700 (PDT) X-Google-Smtp-Source: AK7set9AjemoTWksbcPijrMrmmBiFjLqZgLJbYsoLlp2SlKJAh1MaKiCfxYEazMVP6a0umvBBdrQ X-Received: by 2002:a05:6a20:1321:b0:d4:fd7e:c8b0 with SMTP id g33-20020a056a20132100b000d4fd7ec8b0mr9144625pzh.7.1679906533944; Mon, 27 Mar 2023 01:42:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679906533; cv=none; d=google.com; s=arc-20160816; b=M6H/M+fHfvKt+RrTCMC1YwR7r5D1rt8ujDZs+M4Vqx8upfI7DfWluJ4YfWxoHgchV2 jphugma2BntPP7J5b5qKTTG44tPXoXA2J90aE1Z6D9Bxg4WRwI9TAQl4z59CLrA4/m4b x/bVpZlJ4dynbYvoJKksOqMhhTdXN1vudgG3MJu1JpCoPH+u8jgM7C4ecWuhBt7v2QV6 YHKvpyF5buv/Ci4HAUo6YqOs3bmsg9Eh1e3SNjBBLxF/GsGw2Zkvqgsy/+b2p1EiY13v 71vnIF+PTk5UtZzKmy8lzNQt8Y34+66wQA0/pJarGS9RwHLIYEQ3CIdKmaQyJqnEXti4 aVkA== 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=VqFaSH7mHYZ6+g4W4kJ4CQY7pSCeMdXesJDt2Io3fbErILfIjIVjk7nmBoGNL2D+4f /tbfLDToDhgRc6nbnP5WbPSQ+xrzxpY2CYXXdmUQr9e7fpobKiCAEGriOVa0xQcSD9rr VTJqeXoddpghk1yJ1SLuhgYS+FOhYVj1fx/QMJ0+4heb1YEocvW5ggEC4Hzu0uy9oRsO lohFn48cVlTbssMYl5ZgM3X61M2wZvZ7vLKrZgKqMbaOQJbUSn6VLSRlO6ZMPMiYEBIE 7HZDhdX+waKmBLJTV0DBk50mrdakG4L5QUi0fQZkKBJT9WRvERaQv9y7VWwtCUfDU18r /nLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="JDudpN/w"; 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 v135-20020a63618d000000b00512bd71d713si12603281pgb.102.2023.03.27.01.42.00; Mon, 27 Mar 2023 01:42:13 -0700 (PDT) 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="JDudpN/w"; 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 S233331AbjC0I0S (ORCPT + 99 others); Mon, 27 Mar 2023 04:26:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233143AbjC0IY5 (ORCPT ); Mon, 27 Mar 2023 04:24:57 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEF5A49F5; Mon, 27 Mar 2023 01:24:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679905480; x=1711441480; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O9acOeCuSr/+wKyZ7069qEc1yb3O4hIxP1jgg1zr2lE=; b=JDudpN/wLOK1gz2rJGiwhSLnC2/pgicIip9UV6MViOd4+IsGn3yJI/Yy EQbf4fUheKh8tDW0XYbTzJ6ItpVMTIwkMoYqm/jIof8pylc8EOHPX7Blj 6d1O1J8IgzwgmUprz1nbcVK8kpH1zKAzER1YTdaPNHMG9/+eihnSgd2zx jAJIzy1aNB2YmGCH4P8vJz+KYJsTBAbqdUvWNODEwB1tstzWYgIqYq0ww 3oGyouVBmLfLETSBgkzjxnOoQZPuSa5MwX15TyXlre1tfrnREF3z9VpTK O736mw9goo7yXW1BiV0Oh07wtIJS50cA49D0JX5j9GHo+6vgKg0KZkFAq g==; X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="338930328" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="338930328" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2023 01:24:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="713787118" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="713787118" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga008.jf.intel.com with ESMTP; 27 Mar 2023 01:24:38 -0700 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, jiangshanlai@gmail.com, shan.kang@intel.com Subject: [PATCH v6 23/33] x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled Date: Mon, 27 Mar 2023 00:58:28 -0700 Message-Id: <20230327075838.5403-24-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327075838.5403-1-xin3.li@intel.com> References: <20230327075838.5403-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=unavailable 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?1761509674159152510?= X-GMAIL-MSGID: =?utf-8?q?1761509674159152510?= 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 */