From patchwork Fri Jan 6 08:55:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 40025 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp728403wrt; Fri, 6 Jan 2023 01:22:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXsFmaKIqQ/4bKcCF+6JjX5OJLnaCX2827OHArZC0f369qmNa4QmzR155pefn/+txW8FGbo9 X-Received: by 2002:a17:907:d50e:b0:7b1:316c:38f5 with SMTP id wb14-20020a170907d50e00b007b1316c38f5mr48573971ejc.30.1672996975481; Fri, 06 Jan 2023 01:22:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672996975; cv=none; d=google.com; s=arc-20160816; b=I9CeNleIA9c+e+Y4ZLz0YJbavmUo+azcOeLeR3FXTAT9nVDOMHTOXuXJQR75CY96fs RXlI5EBpNSuFFuS8aJm+y24y23wcJfCWZs6AgAF4NzuWrl2068FCvry5XEjd/Yu2uMXd yyePpaBnddTHpLgojC1wu8NMj5s5nTeiUdE3YD8+W95C5X02JprV8PBZotUrXOfiiNvn XegHmuR7dpQ3YN1ns8k8JLSiIWeZzXp48j4DWp9jALvStaVxC47cNlO3KgPt92suIrj8 PAQ53QRPHlMCExc3l8W5M0ylRrbVUdUmbRJU03u2LA8N77Qu+nTTl4lcwxMXnRSaDK5a MsOQ== 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=JYJ4S+Kkh3sC+3B74n0P3zYk2xHbyw6FPlhMJ4yp/Us=; b=EevSu1QXx27I3c0kVqS+snApKykCNQHgFQzAes0QclkMJFWM+OoqxIrUDr9oq6FZJN ZSwD58VcIRmtpzIOsjJ4bakPcEPWgCjaQX8iSYwkFP83nDTJP8gDTf8WUbASMam4fb+H WR03j/ER1fkL9Dz9NQvEKqXqIdywXf2QieAq38ozqGPluAhGYoZL/btLKw8NaOqL2xyP 4HZqRQEwEIh1FGKUm3MU4uH9WizKKCARzz4LETYrdhYCWHxRRivtn6TuqXYppo5ej5hc 4VrBUthu86Exs0o4aDJV6j97PWZhskFr5Z9r/y9TizVd6iX8Soz80wKwNucrnyMWqSXJ 2gAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Jksop8Dp; 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 go33-20020a1709070da100b007f38bd15f5csi995757ejc.582.2023.01.06.01.22.28; Fri, 06 Jan 2023 01:22:55 -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=Jksop8Dp; 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 S233219AbjAFJVS (ORCPT + 99 others); Fri, 6 Jan 2023 04:21:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232992AbjAFJUT (ORCPT ); Fri, 6 Jan 2023 04:20:19 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08C846B5F0; Fri, 6 Jan 2023 01:20:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672996819; x=1704532819; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fxruyRHpnh5K7ebWUalaOrQmsWiBP+Qwng9F8EjMSTU=; b=Jksop8Dp5MDEBNDNXTGoZTGYpYXP3RFsrvG7yqbKDPY7fQdmoURUe1iD 04UeH4KDcC/riSfxiHOSMaLDWkaCrepqp7/TaVtF1b5FtV6MR8esuQCmt dvAjSu/CCPSCyHx6KN+eKN9QwHFvngumMYnpIhN6YAZnl6pwJuvJnZ69L KmKcrdNkoeHv9aprURodvaD/+m86jl+SvH4/Xunl4RRup5CtBkIqB1HIs l59HYM0wN4pPuMa1NokPcapHBs69eNvX4EO7R4uHz9rPREr9qWcM8/Em7 w96Y5fDc5HNdBlkPkgLSIekuQJAsPKuoG9rEskDc0RndisfnjC9TMzOAh A==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="322511467" X-IronPort-AV: E=Sophos;i="5.96,304,1665471600"; d="scan'208";a="322511467" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2023 01:20:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="719139377" X-IronPort-AV: E=Sophos;i="5.96,304,1665471600"; d="scan'208";a="719139377" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga008.fm.intel.com with ESMTP; 06 Jan 2023 01:20:13 -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 v2 11/32] x86/fred: if CONFIG_X86_FRED is disabled, disable FRED support Date: Fri, 6 Jan 2023 00:55:56 -0800 Message-Id: <20230106085617.17248-12-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230106085617.17248-1-xin3.li@intel.com> References: <20230106085617.17248-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1754264476700133388?= X-GMAIL-MSGID: =?utf-8?q?1754264476700133388?= 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) 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 33d2cd04d254..3a2d0ad63332 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -87,6 +87,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 */ @@ -102,7 +108,7 @@ #define DISABLED_MASK9 (DISABLE_SGX) #define DISABLED_MASK10 0 #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET) -#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 33d2cd04d254..3a2d0ad63332 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -87,6 +87,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 */ @@ -102,7 +108,7 @@ #define DISABLED_MASK9 (DISABLE_SGX) #define DISABLED_MASK10 0 #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET) -#define DISABLED_MASK12 0 +#define DISABLED_MASK12 (DISABLE_FRED) #define DISABLED_MASK13 0 #define DISABLED_MASK14 0 #define DISABLED_MASK15 0