From patchwork Mon Apr 10 08:14:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 81420 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1761396vqo; Mon, 10 Apr 2023 01:55:00 -0700 (PDT) X-Google-Smtp-Source: AKy350ayKYVk5RxmygHjyRwGyWVY+oRF4uU6qludia1TjR9RxYGxgP/haQDUaNnqsf05Aom9dY2v X-Received: by 2002:a17:902:db04:b0:1a2:75cc:654c with SMTP id m4-20020a170902db0400b001a275cc654cmr11623244plx.16.1681116900376; Mon, 10 Apr 2023 01:55:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681116900; cv=none; d=google.com; s=arc-20160816; b=JAzpqyin73J7rSyNqgAUo2paX+vrIuyt1BPYom/Xd0X4ZL7hFE8e7MKVcHtm8mG86W xdSk33us8NJT/5DBg875UOjWXNlmZ+v7DK9OgARVIm9kFeKhsM5VkNTOvb4SB/Rady+M EqZsukAxFpzkYH5ARVPc2SFEw9em8mb1M6fJ50Szd3c41fl/uKOyak3cmDa3QmOk8Hga HK70kwUwzvXKzPGSZwM0iAMgJYXPYwdVmudqfpyB+T55S3fk3arBkXYWGd9w3DoMuvrO X3ZTMF3FA3BkpCDX5igenl9U6gepN3ZgLyECt7fhiOkyLVuZEXLcTWF6imbaThe28T1b tXlA== 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=vxjy11Tsv/mgkUj27ibhp2UA7uqHHL7WLXhaKKIvcCY=; b=tOHID37VpgX0oMZzJ7czPHTRqhbc5XRgQB9Z0EaU/wdRERl1Rf7PAoDTVOKFK1/cf1 TW9dPANonk8Ic9GJFoG0jmvS6kc+k6biR0gnMeWQ5d4uF8h9SCrkwo9ROVpI630zumk4 HlZpXmmwPWm9GhqaqxlFbK/2Jgk6n0ZXldHRqfAMwDsUREUEwIXjJZQCQqe/l0pRDTEm 4gkhOJ+sEFhp0L4zbPeDxcWSVz2/8inJYvzpuflZBFcfTyNr/PK1ppD6IZqejGWttDAS dCC0SBITkdmWvLjeRbdZX7zA3a+6tHUTlUFe9mSTZ67s0kLVdQRMlLato1z8S33KNbv8 CRxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TrwyM4CI; 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 t1-20020a170902e84100b001a27af16626si11073634plg.569.2023.04.10.01.54.47; Mon, 10 Apr 2023 01:55:00 -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=TrwyM4CI; 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 S229797AbjDJImd (ORCPT + 99 others); Mon, 10 Apr 2023 04:42:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229862AbjDJIlq (ORCPT ); Mon, 10 Apr 2023 04:41:46 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 492284EED; Mon, 10 Apr 2023 01:41:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681116072; x=1712652072; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YTgEgmA3f1uzY8PacyZ6XmpZcGIgDW5/dB0vDrivilc=; b=TrwyM4CIrx3XOO2IddBL3Ylj0WriQKR5rwbSAhvdtu4vECZpTogOZZzo UpF+93hn+amsJf/n+GwOeqYQqsLXiHg6Ku4hvYgL/Hjaae/H+O2qUxVNW COFIhv8TQIAL/dDzcs+f+Vc0ho4TzsexxZTXEPgwqxnhD1Yxl0FYVhcjT bWaxNrY34rzMBs7zytKV+NUCWwgztpIxF+Zm6AYXL976tOQFv2bDBl5q8 mIVnvoYL2fNRGejoC3lDHs49ALi3sIOzvMuAwFjkdNdCp5QvkMnzT3bmq tgKgaKRFkS6XseWUcZ670qEk3cAeBQcb21lXfXzay1A64eFVXvoX7Ef/j Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="342078140" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="342078140" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2023 01:41:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="799436342" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="799436342" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga002.fm.intel.com with ESMTP; 10 Apr 2023 01:41:07 -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 v8 25/33] x86/fred: no ESPFIX needed when FRED is enabled Date: Mon, 10 Apr 2023 01:14:30 -0700 Message-Id: <20230410081438.1750-26-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410081438.1750-1-xin3.li@intel.com> References: <20230410081438.1750-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?1762778835108029045?= X-GMAIL-MSGID: =?utf-8?q?1762778835108029045?= From: "H. Peter Anvin (Intel)" Because FRED always restores the full value of %rsp, ESPFIX is no longer needed when it's enabled. Signed-off-by: H. Peter Anvin (Intel) Tested-by: Shan Kang Signed-off-by: Xin Li --- arch/x86/kernel/espfix_64.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c index 16f9814c9be0..48d133a54f45 100644 --- a/arch/x86/kernel/espfix_64.c +++ b/arch/x86/kernel/espfix_64.c @@ -106,6 +106,10 @@ void __init init_espfix_bsp(void) pgd_t *pgd; p4d_t *p4d; + /* FRED systems don't need ESPFIX */ + if (cpu_feature_enabled(X86_FEATURE_FRED)) + return; + /* Install the espfix pud into the kernel page directory */ pgd = &init_top_pgt[pgd_index(ESPFIX_BASE_ADDR)]; p4d = p4d_alloc(&init_mm, pgd, ESPFIX_BASE_ADDR); @@ -129,6 +133,10 @@ void init_espfix_ap(int cpu) void *stack_page; pteval_t ptemask; + /* FRED systems don't need ESPFIX */ + if (cpu_feature_enabled(X86_FEATURE_FRED)) + return; + /* We only have to do this once... */ if (likely(per_cpu(espfix_stack, cpu))) return; /* Already initialized */