From patchwork Tue Oct 3 06:24: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: 147657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1899143vqb; Mon, 2 Oct 2023 23:56:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyT9WhCVpd0Ne7/NrF0TGMUaDlRosIATSNusFRvv8pVFK/TB8892X+Chdk1OBIWfiMRg4N X-Received: by 2002:a9d:4006:0:b0:6c6:50fb:cd0b with SMTP id m6-20020a9d4006000000b006c650fbcd0bmr7587070ote.6.1696316204056; Mon, 02 Oct 2023 23:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696316204; cv=none; d=google.com; s=arc-20160816; b=fr8RBENFhKb2gz3w2d90AmRNnGcdAAzHH0LvoClNj7FidYtv1QRqXRuJrSoymi6oWt L49WvJLJf33oJ61jIhdEvScKPlrvv5tTe46DjvmX8lPlOaHkp+ySkSgNBfgSt+DuWGPg yhhxF3g/L/eqaqxtX34OKi19A/546xlEH4LyaWWn2y9uh3/p0ysZt8S3CSBt4vtYqDOJ fY1UgvS6R03bJcP2/wqht1eqTE4zJglH1xXGESlIIs6/RwPrTyKocJ5K3ZG/W0C4mvOw 97vVVG98rwyQwhwuSgqYrfGtWwTlfibJCGRxvdWVTLOp4ZVNnTsJGih9PPACw+yoUIc7 VC8Q== 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=XeJwpr9tQC+gKBydBAWHltVsv05Ksn3BrsZLK1lp1P8=; fh=Tb1p8S3iOxe/kX/WSNC3xEJzSVgGJ5DaxSrKb+pzH+4=; b=qnceSpsK9UNdT++iiRX8fOKm+/s8rnAH7TocldmaGBtxCjQvepNnUXYef9AIooGbzD kROe2FzfsL0wR2qPTH29YlM6ABAT18e/5a+hPE+p29GNm+jSBAqCtpclsmZ4SlHJtX8W zbxaDPUo6mpbvSqdSAuHrjFqfWUTZx2bQ2NrsA7nEtlztFyqGJ9A60Qw+GJjsttEU3A4 LSWn5Iq0x7Q0STtPLgh6mfAZUODeT8Bu3wSF6D6+d4gZrCSZWMTOzVtdpyRGCtOvUoK4 C19GGWuameiRJU1xnpJlgX4w6sTQb7sJHIW63sFQqWZ7MsN6fSRyIGHOR5MddyCmtOMs 2EGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EAFkT0UK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id l65-20020a639144000000b00578acf1e8a4si821472pge.573.2023.10.02.23.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 23:56:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EAFkT0UK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 769F5812AD07; Mon, 2 Oct 2023 23:55:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239432AbjJCGzu (ORCPT + 18 others); Tue, 3 Oct 2023 02:55:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231140AbjJCGyp (ORCPT ); Tue, 3 Oct 2023 02:54:45 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D634CAD; Mon, 2 Oct 2023 23:54: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=1696316080; x=1727852080; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CcGvpPsp9yPYBKGgtw+pwzSruaWdmcjQipAacX3tyYo=; b=EAFkT0UKoflFr+of1b8fKClDC2Tgb82DsxObPOi2muItg/G2EngsV5Lu oU3VZ5hTZly6aT5bAD0DDZ4nVhRDFOJJR3Da1yOdKiV0ruKotbXOWLxEa kIY4Ec2/4hEe35mnDGjUkh+idE32V1kwgK6gtjCGhUXXV8A4yi7mZa0yz pTrDLjVfScFgRe3TsXGk8vDWaEIQ+ZyGmP+yBfgy2ttkpPJV6OkZkiYbp 3mcVry5mbrriHzSXa9tEPuw1Vz/qBueb3rNfKjvy84V3Flv8jehd2oXB8 27BVx1ZnaBeWfE9enDaQhqXgqpP490d27qCMfeMxvSC7MrY0aat5SqwIb A==; X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="367858003" X-IronPort-AV: E=Sophos;i="6.03,196,1694761200"; d="scan'208";a="367858003" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 23:54:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="1081900922" X-IronPort-AV: E=Sophos;i="6.03,196,1694761200"; d="scan'208";a="1081900922" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga005.fm.intel.com with ESMTP; 02 Oct 2023 23:54:38 -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 v12 09/37] x86/fred: Disable FRED support if CONFIG_X86_FRED is disabled Date: Mon, 2 Oct 2023 23:24:30 -0700 Message-Id: <20231003062458.23552-10-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003062458.23552-1-xin3.li@intel.com> References: <20231003062458.23552-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, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 02 Oct 2023 23:55:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778716459565120081 X-GMAIL-MSGID: 1778716459565120081 From: "H. Peter Anvin (Intel)" Add CONFIG_X86_FRED to to make cpu_feature_enabled() work correctly with FRED. Originally-by: Megha Dey Signed-off-by: H. Peter Anvin (Intel) Tested-by: Shan Kang Signed-off-by: Xin Li --- Changes since v10: * FRED feature is defined in cpuid word 12, not 13 (Nikolay Borisov). --- arch/x86/include/asm/disabled-features.h | 8 +++++++- tools/arch/x86/include/asm/disabled-features.h | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h index 702d93fdd10e..f40b29d3abad 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -117,6 +117,12 @@ #define DISABLE_IBT (1 << (X86_FEATURE_IBT & 31)) #endif +#ifdef CONFIG_X86_FRED +# define DISABLE_FRED 0 +#else +# define DISABLE_FRED (1 << (X86_FEATURE_FRED & 31)) +#endif + /* * Make sure to add features to the correct mask */ @@ -133,7 +139,7 @@ #define DISABLED_MASK10 0 #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING|DISABLE_USER_SHSTK) -#define DISABLED_MASK12 (DISABLE_LAM) +#define DISABLED_MASK12 (DISABLE_FRED|DISABLE_LAM) #define DISABLED_MASK13 0 #define DISABLED_MASK14 0 #define DISABLED_MASK15 0 diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index fafe9be7a6f4..0b47ab1930a3 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -105,6 +105,12 @@ # define DISABLE_TDX_GUEST (1 << (X86_FEATURE_TDX_GUEST & 31)) #endif +#ifdef CONFIG_X86_FRED +# define DISABLE_FRED 0 +#else +# define DISABLE_FRED (1 << (X86_FEATURE_FRED & 31)) +#endif + /* * Make sure to add features to the correct mask */ @@ -121,7 +127,7 @@ #define DISABLED_MASK10 0 #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING) -#define DISABLED_MASK12 (DISABLE_LAM) +#define DISABLED_MASK12 (DISABLE_FRED|DISABLE_LAM) #define DISABLED_MASK13 0 #define DISABLED_MASK14 0 #define DISABLED_MASK15 0