| Message ID | 20230731063317.3720-4-xin3.li@intel.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1856445vqg;
Mon, 31 Jul 2023 00:45:08 -0700 (PDT)
X-Google-Smtp-Source:
APBJJlF11PizecJ0ZC3s10SvUKFGGHejl9AaVL3Fd1Q9v90sgBDnwqkHGzUQ1Cn4fMA5feS3iBep
X-Received: by 2002:a17:902:e5cd:b0:1b8:ae12:5628 with SMTP id
u13-20020a170902e5cd00b001b8ae125628mr11444679plf.2.1690789508460;
Mon, 31 Jul 2023 00:45:08 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1690789508; cv=none;
d=google.com; s=arc-20160816;
b=sKk0U7GpXYUkOuD+o6sHbZCU8umzRec7S9r6gvrye4Lbk2zSSKjGNkG4hzVJmNClPZ
qRUcm6dU1L8yqvB/pQJ5b+qqRC2azb1/VFUfpnzrlAy2xEyCR0iC/SbfXGpjqenZdIZ5
xE3Iry0T4yV9/EzQc4Wlj6KMOmsHft9RN3vd6tsBz2QIjonuoTwz0JaZl+y0fwOz1vZ9
uLpLgQskDsq0+DPNtDpXdvHf+UUejOvwVXem+PZxY+pMN+zc/h8sMjMXalmdSrifLNQv
DpUVlvSgaaSytrSHlNS1Gswi9bXwzWJfd1jJwicY0B6bxFSQpiKUHmct5gO0JBZAf2kx
QDpQ==
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=ob5ZjQ9yCNfssY/rhBxPA4G0jsjxaaL+XBSdNqWfxhs=;
fh=runz8kYc7mvoALl4f6YJmLswtUHBUyF5+hFgjyimmLU=;
b=TdCXQIu/oGl3TA16Unsd7fa/EnvXQJjdfTleNZTRLcns3SfA27FUEnf8+3dlNsFtGW
6bXE4N2u0wKaxMgbi7NBW/zx5CF7ofe4l0wiXmvR1e3K1j+SfwqZ33UVoF5wX+Q2kdkm
4/oJZdN5tNj4sHdPKjTF58aFWA9PbPJ703HYDCAdk7xv7NYWihK0EurG2yA3XrmrqxLS
LyoNmWZKXpmKJP0AucqWlI5M1Ta4S9wWB3vPq6Ek0JqnqOyef99y/i0mGe3/za5Q/K9n
9XkBsL8ckG6PictEy+3Dr0J5M/WOGwi2tLfKXNbxGzYHHoN3xZ0D1lpXAWVAaYpxIcyY
+nuQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@intel.com header.s=Intel header.b=ODVAz6KV;
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
ke14-20020a170903340e00b001b89654fa42si6717659plb.476.2023.07.31.00.44.55;
Mon, 31 Jul 2023 00:45:08 -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=ODVAz6KV;
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 S230419AbjGaHCJ (ORCPT <rfc822;maxi.paulin@gmail.com>
+ 99 others); Mon, 31 Jul 2023 03:02:09 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42618 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230350AbjGaHCB (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 31 Jul 2023 03:02:01 -0400
Received: from mgamail.intel.com (unknown [134.134.136.24])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C557D136;
Mon, 31 Jul 2023 00:02:00 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1690786921; x=1722322921;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=ok7xj4KwdkLOXDJ1J3mT1oirCcERqdhXdoxphTKdFWY=;
b=ODVAz6KV9OSUIPjAQ+K3PHDSVgZJRel5UoXfIn9QkRAsDVZwQOqZegT0
P4eE179UfN4lxr6TquDXhUp7wgpz+Xqa+o/qf+RRk2wYlELsrPtBsH/TC
J7aoSnu7aCY3L/N3JPXB718jLLIgwHFoYE+KqT+o6agsLVPHkNbqnd2uZ
clAB+kB+B6oTGDCbYUeMy5msz5YmeSiTOoMn+6YI1WxLHbhrYcXjrmm5v
WIqxCwtWDtVj78TLx21APElZxa13AK5+4nOB3pAxMFiY7GvxMx8xfbiH3
7Edv0oKY7HNx3LzepeeiyclCU225zFOfF3yApDlN/88fGxKd/wgIgzwka
g==;
X-IronPort-AV: E=McAfee;i="6600,9927,10787"; a="371648669"
X-IronPort-AV: E=Sophos;i="6.01,244,1684825200";
d="scan'208";a="371648669"
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
31 Jul 2023 00:01:52 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="6.01,202,1684825200";
d="scan'208";a="871543348"
Received: from unknown (HELO fred..) ([172.25.112.68])
by fmsmga001.fm.intel.com with ESMTP; 31 Jul 2023 00:01:53 -0700
From: Xin Li <xin3.li@intel.com>
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: Jonathan Corbet <corbet@lwn.net>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org,
"H . Peter Anvin" <hpa@zytor.com>,
Andy Lutomirski <luto@kernel.org>,
Oleg Nesterov <oleg@redhat.com>,
Tony Luck <tony.luck@intel.com>,
"K . Y . Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Peter Zijlstra <peterz@infradead.org>,
Juergen Gross <jgross@suse.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>,
Josh Poimboeuf <jpoimboe@kernel.org>,
"Paul E . McKenney" <paulmck@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Randy Dunlap <rdunlap@infradead.org>,
Steven Rostedt <rostedt@goodmis.org>,
Kim Phillips <kim.phillips@amd.com>,
Xin Li <xin3.li@intel.com>,
Hyeonggon Yoo <42.hyeyoo@gmail.com>,
"Liam R . Howlett" <Liam.Howlett@Oracle.com>,
Sebastian Reichel <sebastian.reichel@collabora.com>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
Suren Baghdasaryan <surenb@google.com>,
Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
Jiaxi Chen <jiaxi.chen@linux.intel.com>,
Babu Moger <babu.moger@amd.com>,
Jim Mattson <jmattson@google.com>,
Sandipan Das <sandipan.das@amd.com>,
Lai Jiangshan <jiangshanlai@gmail.com>,
Hans de Goede <hdegoede@redhat.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Daniel Sneddon <daniel.sneddon@linux.intel.com>,
Breno Leitao <leitao@debian.org>,
Nikunj A Dadhania <nikunj@amd.com>,
Brian Gerst <brgerst@gmail.com>,
Sami Tolvanen <samitolvanen@google.com>,
Alexander Potapenko <glider@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Arnd Bergmann <arnd@arndb.de>,
"Eric W . Biederman" <ebiederm@xmission.com>,
Kees Cook <keescook@chromium.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Masahiro Yamada <masahiroy@kernel.org>,
Ze Gao <zegao2021@gmail.com>, Fei Li <fei1.li@intel.com>,
Conghui <conghui.chen@intel.com>,
Ashok Raj <ashok.raj@intel.com>,
"Jason A . Donenfeld" <Jason@zx2c4.com>,
Mark Rutland <mark.rutland@arm.com>,
Jacob Pan <jacob.jun.pan@linux.intel.com>,
Jiapeng Chong <jiapeng.chong@linux.alibaba.com>,
Jane Malalane <jane.malalane@citrix.com>,
David Woodhouse <dwmw@amazon.co.uk>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Yantengsi <siyanteng@loongson.cn>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Sathvika Vasireddy <sv@linux.ibm.com>
Subject: [PATCH v9 03/36] x86/fred: Disable FRED support if CONFIG_X86_FRED is
disabled
Date: Sun, 30 Jul 2023 23:32:44 -0700
Message-Id: <20230731063317.3720-4-xin3.li@intel.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20230731063317.3720-1-xin3.li@intel.com>
References: <20230731063317.3720-1-xin3.li@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1772921299525498476
X-GMAIL-MSGID: 1772921299525498476
|
| Series |
x86: enable FRED for x86-64
|
|
Commit Message
Li, Xin3
July 31, 2023, 6:32 a.m. UTC
From: "H. Peter Anvin (Intel)" <hpa@zytor.com> Add CONFIG_X86_FRED to <asm/disabled-features.h> to make cpu_feature_enabled() work correctly with FRED. Originally-by: Megha Dey <megha.dey@intel.com> Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com> Tested-by: Shan Kang <shan.kang@intel.com> Signed-off-by: Xin Li <xin3.li@intel.com> --- 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 fafe9be7a6f4..85fd67c67ce1 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/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 */ @@ -122,7 +128,7 @@ #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING) #define DISABLED_MASK12 (DISABLE_LAM) -#define DISABLED_MASK13 0 +#define DISABLED_MASK13 (DISABLE_FRED) #define DISABLED_MASK14 0 #define DISABLED_MASK15 0 #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP| \ diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index fafe9be7a6f4..85fd67c67ce1 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 */ @@ -122,7 +128,7 @@ #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING) #define DISABLED_MASK12 (DISABLE_LAM) -#define DISABLED_MASK13 0 +#define DISABLED_MASK13 (DISABLE_FRED) #define DISABLED_MASK14 0 #define DISABLED_MASK15 0 #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP| \