From patchwork Mon Apr 10 08:14:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 81421 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1761394vqo; Mon, 10 Apr 2023 01:55:00 -0700 (PDT) X-Google-Smtp-Source: AKy350Y9JcOezyZcwa1V1WyBy6RDR2EAHocbK346aycUIK0gxU5U7ZcLVJ5h/ra/Gnm2qq9PNCBQ X-Received: by 2002:a17:903:2347:b0:1a6:413c:4a54 with SMTP id c7-20020a170903234700b001a6413c4a54mr2784152plh.1.1681116900377; 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=gB7CmcJmEe68XSiO7+XKEMB721o07xytZP56kgEKy+EFduxzU6eEsji6l4iH84jvta rnk1VOhs6K2W5odCqq4SBw7c5stXxwPgA2cMoN/2Oy1Vns1s2EDk/8AqNSkRRQxbVWit HIsnsZAVOqFJl54mojJqvJWqq/6HVnH4HBP/ajxQoN/pcU+RekEqLq4rScVWqYgKq3Rd Tyrqh9s3M3cLxTOvU6uUDEvIYXVfwQuHuFvOTjr9kSmMRgy9VcIRAcMOYSSMRyiMnpmW ZTdnpPyUJiA0L6jbqIkMFRANJRCCOIMdFeTejFmgSuFD13dvo/Sr2Eb6I4EdIzBbjYEm CHtA== 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=UNRomGZrJ3xieh7lf30jl8hFXPb8gU2nVpw4p5i9r5Y=; b=rI3NOpjNjPoyk/lOSYzpytlKzHUMGTNs3X3C6o0Dd5gskS7d2CL+hzjlvcTHgCyGsc IW3jwBSR/Pa9hjvbnfuBpUfvabKvvriS1l9BxZiNCPUgfazjc+opC/cboMsA9xXTM7iW Nx8AH9HWIQSBu0tSFT//ibI2//1QnT7BHIXtCbl2hxekxBtJ6XJsanSBlvQwd4lirvie U0gHzkgESI1zi1Q7LGTt7wdP2E9y82fwq3BnyQ8yv8qVlhtDrI8Xr8TXgAT9b9YCcCcS 9eDlN+vxkfjXzHBSIC58NeOGGnggPjwNPNsGbRX7qx9hVKTcc2M3KTTlJ36E14beUHjC /Dew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AcjU1wCh; 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 w1-20020a170902e88100b001a1a5dd3505si11324409plg.393.2023.04.10.01.54.48; 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=AcjU1wCh; 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 S229780AbjDJIlr (ORCPT + 99 others); Mon, 10 Apr 2023 04:41:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229709AbjDJIlH (ORCPT ); Mon, 10 Apr 2023 04:41:07 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD60F49E1; Mon, 10 Apr 2023 01:41:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681116066; x=1712652066; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QmoU6lab7p0QYpuYROKRU1bljKMMFBm03a1BVvi5hdc=; b=AcjU1wChmapp1rD8UuelJhSI2ZPljWbDAzcBRXKrpfaRp8uf+HZItOzn zW0gHrkP+5K3VpQqbPV1lyp0qle74Y9JGiiGjc+SE1aNLJZ8oapCHWgMU APbxDmcEMMKm1AhsLpkcGZs3EYkE1amDN/cLtuWQVb9j2PJC3T+sELpd/ eqN+V6BkijU3aNtuhDJe0dJalFxaS/e4BO9p6BFVZbkjj1miF1rpYg2sX aNYHynx3OZcKygykJB1LC3WAtOzoWqimSeTPkAGAYxqfEBe32S5UuS3Wv w27UMrkrm802jsbpc83YvhEBYcTprY+RrBlmSUdt79NfdLTHPbx/G1e4e A==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="342077977" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="342077977" 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:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="799436275" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="799436275" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga002.fm.intel.com with ESMTP; 10 Apr 2023 01:41:03 -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 11/33] x86/fred: if CONFIG_X86_FRED is disabled, disable FRED support Date: Mon, 10 Apr 2023 01:14:16 -0700 Message-Id: <20230410081438.1750-12-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?1762778834911435737?= X-GMAIL-MSGID: =?utf-8?q?1762778834911435737?= 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 --- 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 5dfa4fb76f4b..56838de9cb23 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -99,6 +99,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 */ @@ -115,7 +121,7 @@ #define DISABLED_MASK10 0 #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING) -#define DISABLED_MASK12 0 +#define DISABLED_MASK12 (DISABLE_FRED) #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 5dfa4fb76f4b..56838de9cb23 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -99,6 +99,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 */ @@ -115,7 +121,7 @@ #define DISABLED_MASK10 0 #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING) -#define DISABLED_MASK12 0 +#define DISABLED_MASK12 (DISABLE_FRED) #define DISABLED_MASK13 0 #define DISABLED_MASK14 0 #define DISABLED_MASK15 0