From patchwork Mon Mar 27 07:58: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: 75288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1358643vqo; Mon, 27 Mar 2023 01:41:31 -0700 (PDT) X-Google-Smtp-Source: AKy350bc82RGfZM1op/6T82M95kBdR9Ynfcq9UG3YpcQp30G2tuFUI09pPMkO14gjJCkTKneBj2h X-Received: by 2002:a17:90b:4a02:b0:23f:5247:3334 with SMTP id kk2-20020a17090b4a0200b0023f52473334mr12468907pjb.19.1679906491264; Mon, 27 Mar 2023 01:41:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679906491; cv=none; d=google.com; s=arc-20160816; b=ztGfJCpVWvqHzwSnTXAjsuQFhyL/2XUNblnThT2qtlknvepYOOtyUrNzueArNBWpqg VuNdJf9YmRDIsJNlq6qq9wliba80KW1S6sKd6/JNeS2rsOvG2JjQmmXQ19kRE4M/wegO jdxQVaOwj9cdc7LrcJWuI6qLGW7dCdx2wr1QyuhsheNK7tyc797kwvYQqtBt957aCEbF 4X9qFdRF9JE0C8K7Usa6MDStxl80prNpqBckR/qsZaH8glQ+UK8rAnyikwHlElYfCxn0 0mV3BkiHSET4/tiem1ARmu1G5o7aH40P163pAHqTg/vwtCo1lS4A7BahQoNb1CpxbOH1 M/gQ== 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=eaSV0i9Lb06HtRcfuQUgBuaJBAA0YEPNss6GKl72g2+HbdU+LSwfvFoae6Vg+eI/X5 6wVM8pl+/HnWtfBesGQZF7cQdzl0LPcoBHDih9Z0Mu6e5qk+k+Ur/f/9jrX+2wjmnprI EVOocsT7Fs/mUxhCrAWBxIcpDiaQYTIfGn3KJoH172wHMa0Qn1PGqgEbOkKdRqPxuVth 852BgRnOSx5cmsNJMhUn+2lEbeBo307DWA/YpdBQl+hu4oXURsbXOOc3UJic2/zyCNfA I0qw9PZUGLVrlK1NjtZwCXu2pmSg/QEHiGmquiRN368R92rIPLzWbRhAZh2BXUIRU1V4 gYSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="nMsYT/+D"; 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 s76-20020a632c4f000000b0051324096be5si7527299pgs.47.2023.03.27.01.41.18; Mon, 27 Mar 2023 01:41:31 -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="nMsYT/+D"; 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 S233337AbjC0I0V (ORCPT + 99 others); Mon, 27 Mar 2023 04:26:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233146AbjC0IY5 (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 EBB6B5BAF; 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=1679905481; x=1711441481; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YTgEgmA3f1uzY8PacyZ6XmpZcGIgDW5/dB0vDrivilc=; b=nMsYT/+D516rMU7OdG+zZpqVDvNBVMJL14MLn9WoRIC9GHtR12TK+89U PclzXEfeE7swfjmZofCNYMMqH8fjrFInzf23LcXwbOKivAsdxZ85FwVh4 R8s++5TtT5YUdY97E/H0EMBIQAcOUyOKY8Ak32NQxS1K0vVcu2TuPbBAI AEps6S7LV09c1Rogdbj3DLyOHvDqpc5duXPnqt3BW2z5IMZnst1jom/wu B8mgwGjRrwnIbGp9JocAast4w6tNlfhIkdhOgANo2c1AvyU9ncd2R6qAv y+rgcEatElrZJVNq/8rkBgaJtGTTPUW+D+4B395T9rDm3esFU63mWe0DF Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="338930351" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="338930351" 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:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="713787126" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="713787126" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga008.jf.intel.com with ESMTP; 27 Mar 2023 01:24:39 -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 25/33] x86/fred: no ESPFIX needed when FRED is enabled Date: Mon, 27 Mar 2023 00:58:30 -0700 Message-Id: <20230327075838.5403-26-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?1761509629003104455?= X-GMAIL-MSGID: =?utf-8?q?1761509629003104455?= 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 */