From patchwork Tue Dec 20 06:36:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 34938 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2813931wrn; Mon, 19 Dec 2022 23:04:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXuDifP7HB0WvgUJlACD4w0yvVZK3mYEN7AQ1ivBPb7uvBk2JWJmQMTiUBzltkZmcF15fNBw X-Received: by 2002:a05:6a20:d39b:b0:a4:491d:d589 with SMTP id iq27-20020a056a20d39b00b000a4491dd589mr15624630pzb.4.1671519887458; Mon, 19 Dec 2022 23:04:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671519887; cv=none; d=google.com; s=arc-20160816; b=bEY30BGrwTH3YMkeZ5vhkBoLtrIaB77gkRHUhe1LACKeFhmrTpuF0Jt3iiP9ERoWf/ UT5pTiZfpu28zW8vHBjDO2ROnJ/jR8WnHr3TYwYusmf3ra655vVaS6zzgdhJXdm8l11z +HJmo7hGSS5IqrQDq7c/xU3/GEMxwatuCG9PjaCto2ouNnP0IxnwbfH+o/aiK4RrlIdi HQWdADZ+cTmTmofHFZofx0ChbUBE8zek/Ylwu93DY8G9z5ECV8ZUPdkDwPAtVqc8EG2t imke/QT3nOSaj3bYD/CM+Gbc4caw5xJZXTx2JBvUnVVTaoobwVlz9QcthXpXx6K7ZiRI KYBw== 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=U6CoVc75ooJSa5QkY40G+eTAR016f1+xF4jkVM1CCfM=; b=iscetxFSRdVRU7/N1sCgxzh/zILgoV2ADpEWHmM/oznhtRidtJvuBYZ7vaeh0YIasq SjO8IHvuWGwjZe753zDu11VsA+5hCSQPXvoGnK8i9POVtDaboAKThxmGkGn/DPqN1umh ALHexndaT83CpEaHsE6E7Ip53MoXvxodpRwDt/T7pzHH0iUepG3onzbqZC58YHAf6BZa +f5B0RxMSa1ZfiZpICSj7FEgIMwTo+MzhjlfSksugD4AkTrvWMyIfV5HH49ubzpKukeC 1dbCUlsS5dErIhchWaTwRmS9y6JwxclMjnKK+W7vVYbhaBiox0fnxxzPRkE0MjTSysAN hTNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lxSZZffo; 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 v2-20020a632f02000000b0047949c9c08bsi13124608pgv.111.2022.12.19.23.04.34; Mon, 19 Dec 2022 23:04:47 -0800 (PST) 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=lxSZZffo; 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 S233678AbiLTHEA (ORCPT + 99 others); Tue, 20 Dec 2022 02:04:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233293AbiLTHBo (ORCPT ); Tue, 20 Dec 2022 02:01:44 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1B1B15FFB; Mon, 19 Dec 2022 23:01:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671519700; x=1703055700; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JKAIJtKpEV0pDtyUyzmPScPoDyIj7KB0n/KR4J5yOTE=; b=lxSZZffo6R2IVG4O66/yYyCQDH/75enSFundJ+3UDvT3CGtyDDogOvYO zNPFQE96TlkBVEN0xdWuV/zA9dS/kqzS3NPeSLAzhvEGm279K6fJlL6qI i5GF6fS+3UCiGEOVN2iG2YA+ZTRatjZQJwfqpJLh3VqUc9/TVdhbdGpwj ditvax7jv5oWk8b+7KXshFgF8I2O3A3Q0rqMz4+/4rxR1WsAFH4LluMr/ ekhfinBM2KUM/aX5qtCGv41Ikg5fCJ8/knfsPe3rQmvYbOraVZxRtYR44 GCN+PloMttvehJWkpc/WhKO+S1ESphp7LiQbs3ydXhVZuYDAOoAwVpoem Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="302972137" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="302972137" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 23:01:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="644326537" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="644326537" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga007.jf.intel.com with ESMTP; 19 Dec 2022 23:01:18 -0800 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 Subject: [RFC PATCH 26/32] x86/fred: no ESPFIX needed when FRED is enabled Date: Mon, 19 Dec 2022 22:36:52 -0800 Message-Id: <20221220063658.19271-27-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221220063658.19271-1-xin3.li@intel.com> References: <20221220063658.19271-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,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752715637741630206?= X-GMAIL-MSGID: =?utf-8?q?1752715637741630206?= 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) 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 9417d5aa7305..b594fcc0a4b7 100644 --- a/arch/x86/kernel/espfix_64.c +++ b/arch/x86/kernel/espfix_64.c @@ -116,6 +116,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); @@ -139,6 +143,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 */