From patchwork Tue Apr 4 10:26:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 79030 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2955281vqo; Tue, 4 Apr 2023 04:37:44 -0700 (PDT) X-Google-Smtp-Source: AKy350ZNmbVkyDk/LzrdZV8XiQzv4z3ylXjI+LwVwENvk0/iL0KYWhIWrx85nfpikvVRpcKTapAo X-Received: by 2002:a17:906:b04f:b0:92e:d6e6:f3ad with SMTP id bj15-20020a170906b04f00b0092ed6e6f3admr1810477ejb.6.1680608264398; Tue, 04 Apr 2023 04:37:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680608264; cv=none; d=google.com; s=arc-20160816; b=gIsImxO7fcPDL05tR99FnIlAt+kUEH7LjwSCwcoUzFHa8avn+w/WA8EizWA4ysdA88 pAuOrf/nXDEil2GgxAG+aGt6OP3XN5zDwmfKjsO3LQs5Gu1ylCbIg1N13TChPLRk8o3G 7HEBk6r7CVQC0wp7BiDvMhtU6S5yNJyrV6232TvXSwLLRkIIQ0oIEZdgJnpV6+Qq8Y8/ 2c2J+heJRcEgE7Gj/EoXOaki92ko00ZPZ6XiyI45xLQ9sjICJJK2xRpkcO7xiZ5vLOkr TtZZHhmgTIZLgoNwz5kN591nQ6MraRIhWruJ9PBeXFRGk6WeAYzMJZf2M9XqkRPPCKIT CKIg== 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=U2QCfG+xfQAM8mOk2DzHH17zlqz/tdCxZFDwe+G4j+mUFfG/Q7be8PXWdppCvkM1x4 KHqn1RPD4GSmGpdkT/iOOfV+q4SQ8W312BcUgdxteajgHr6zF6WIdlcwUz4ZGeK9bNke 9JBuc15YIy9KG/yZJIJfMOmJXzS9vQNzO2JpnCeocuadkCtYP3aSiK1tOvUQvM+TwyRH 0dviQjuASIONlGugdLCXrCWWCtCJULgAU2Yf27WWC/aQsM1T5ifeQCsN76/zYM6bJ8vq wFRyWB3ekEXDzYRKx4xldSSSPByhTyKv+G+gj0kZi8qqD4x48HFYGPzECVo0Gk3l1SKp Hzbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="G4DV/Jj2"; 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 n13-20020a170906088d00b00946fa87bed8si1211817eje.800.2023.04.04.04.37.20; Tue, 04 Apr 2023 04:37:44 -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="G4DV/Jj2"; 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 S234649AbjDDKyj (ORCPT + 99 others); Tue, 4 Apr 2023 06:54:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234763AbjDDKxs (ORCPT ); Tue, 4 Apr 2023 06:53:48 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BDE24225; Tue, 4 Apr 2023 03:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680605593; x=1712141593; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QmoU6lab7p0QYpuYROKRU1bljKMMFBm03a1BVvi5hdc=; b=G4DV/Jj2tbNz/4upFcG3eRoA+/PI7HhZHXQfqMf2ZT52d22DZclWCHyV QNRP6n+g2jMVuqoq4e1WqkaedTwf17mW2fR7YCf3n1iWcWqzPbmzW4LRe EHANSb8h7H3rU79xVVGn1uvjL9cC4fK0lAjE6Q7tLYGXXexCstq8sMLeS dKlQhfC4YTGwkDINv6hHMHkIqrxrlGJVA8nRUQE3qWdvl7xmSZlePuOuK J6EG2lqyNx4LDjAvLtq9m8hobrw+HWAUX/nhG+fO+bwkxEjdffpmVy8+s ERuOjMCt1IHnuvfStTp6uzwDZF71VpUbh3pCBrXNKsuWcv5l/qD6cuxtf g==; X-IronPort-AV: E=McAfee;i="6600,9927,10669"; a="330734032" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="330734032" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2023 03:53:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10669"; a="775597811" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="775597811" Received: from unknown (HELO fred..) ([172.25.112.68]) by FMSMGA003.fm.intel.com with ESMTP; 04 Apr 2023 03:53:02 -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 v7 11/33] x86/fred: if CONFIG_X86_FRED is disabled, disable FRED support Date: Tue, 4 Apr 2023 03:26:54 -0700 Message-Id: <20230404102716.1795-12-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230404102716.1795-1-xin3.li@intel.com> References: <20230404102716.1795-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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?1762245491278618475?= X-GMAIL-MSGID: =?utf-8?q?1762245491278618475?= 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