From patchwork Mon Mar 27 07:58: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: 75281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1358466vqo; Mon, 27 Mar 2023 01:41:07 -0700 (PDT) X-Google-Smtp-Source: AKy350ZpDP+TeYdZ392sZCOt/O1jGTR4xnxiXFKU7QO8N7Ei8cbG+3xYv6IqQVGp8huIZ+NeQ/xP X-Received: by 2002:a17:902:ea10:b0:19a:a520:b203 with SMTP id s16-20020a170902ea1000b0019aa520b203mr13383093plg.25.1679906467150; Mon, 27 Mar 2023 01:41:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679906467; cv=none; d=google.com; s=arc-20160816; b=tgtaeu0XIuMmxZD1lSuxCHEbKOz2aaFrU3ff8yuRkagNDZhZLSTEog16KK5IzGAirU 4PfPZFMaHVghC2gjfOMjG1dbmIqunXcHNGc+ZslFw/QJ8QWoaNfS8EZsdJ9ROMtwNfnT h2cwD1u2XD4UDyKGRwHuC1VZOIxtpkbV8I2PaUZTrPb7+NYkoNgME2xMXRweKxuPwo8M d55s25yChljV0BFi1tIzy+M1JAWfA5eO8xQ6Bv2f2Z9Sk5fKgdjkUbONka0BTVk5oq6G vSF22y9rs/DgGEAQyPUZ6mE618z+/Oya+cdxJfkKbheNkNcZuI1Iyd1E5MZzrC/ySv+9 1oQg== 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=Y2hNSjf3+y6NWu2jWNgqnl88ESvbkN0zUhXOYfvMnyTdMXtfHTQSwcmdY/aYNFL1Qk QDe7Ok5dMrbIYUTQ7aPokassnAuWfWLnXmBm1JgeBPm09rNpxsYkzUuk08oQgxJ4d6q7 o2pUwPiRvZTiG5Y87YlXF/Gd9HR6FDU6+npkLNxQrXbL7C2l495YgDQ9qY33Rfkahbh2 aMoqKNy5Iya3RZazamO3x26ItIyvyOnxZZHUHLNhIYbT/Z79dElLOp/o275SZHY0+gOs SH+h9yi9qTLY7FYL1h1hk2GhThk4lMJ5aGGF5HFO6byDhh0RP0p56DaIR2nobvHoPu0t shfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=d8AZ8Yoc; 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 kw12-20020a170902f90c00b0019ea9a23140si3627798plb.309.2023.03.27.01.40.54; Mon, 27 Mar 2023 01:41:07 -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=d8AZ8Yoc; 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 S233204AbjC0IZ0 (ORCPT + 99 others); Mon, 27 Mar 2023 04:25:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233027AbjC0IYg (ORCPT ); Mon, 27 Mar 2023 04:24:36 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B0502D53; Mon, 27 Mar 2023 01:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679905475; x=1711441475; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QmoU6lab7p0QYpuYROKRU1bljKMMFBm03a1BVvi5hdc=; b=d8AZ8YocVDtYp1ktyqPG0bWac+jMa47HM4sFfZ+P7cjl8E3OfHyuUsmg n8gdHM+r3vwC/KdZNX2JjC6+rZVUu8ttYi5S+1re07XA00bL1B1jB2i4s L9qN469ZrzNuyaGaVdi+nuVpRbWBs4uthSCAUlicwxDpA8f1kTca071q+ GCD4cyRpSnwa4m2LK3RgApnEXepmqOJ7XFjLXT11+6mYw6y8x0daB+Ens BwY8uhuUlSsZEZV3LT37eMtABytYSNzq41G1uG82N9tn1d1VF17kHkROA JNZTOFkEwF7QVvgrXmCpIPmF9PUsyUs1wKWm3ORklGSJwch5lAm/jCHtG A==; X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="338930194" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="338930194" 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:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="713787068" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="713787068" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga008.jf.intel.com with ESMTP; 27 Mar 2023 01:24:33 -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 11/33] x86/fred: if CONFIG_X86_FRED is disabled, disable FRED support Date: Mon, 27 Mar 2023 00:58:16 -0700 Message-Id: <20230327075838.5403-12-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?1761509603641259578?= X-GMAIL-MSGID: =?utf-8?q?1761509603641259578?= 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