From: Maxim Levitsky <mlevitsk@redhat.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
Ingo Molnar <mingo@redhat.com>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Tony Luck <tony.luck@intel.com>,
Paolo Bonzini <pbonzini@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Tim Chen <tim.c.chen@linux.intel.com>,
Borislav Petkov <bp@alien8.de>,
"David S. Miller" <davem@davemloft.net>,
Dave Hansen <dave.hansen@linux.intel.com>,
"Chang S. Bae" <chang.seok.bae@intel.com>,
Jane Malalane <jane.malalane@citrix.com>,
Kees Cook <keescook@chromium.org>,
Kan Liang <kan.liang@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Maxim Levitsky <mlevitsk@redhat.com>,
x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)),
Herbert Xu <herbert@gondor.apana.org.au>,
Jiri Olsa <jolsa@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
linux-perf-users@vger.kernel.org,
linux-crypto@vger.kernel.org (open list:CRYPTO API)
Subject: [PATCH v2 2/5] x86/cpuid: refactor setup_clear_cpu_cap()/clear_cpu_cap()
Date: Mon, 18 Jul 2022 17:11:20 +0300 [thread overview]
Message-ID: <20220718141123.136106-3-mlevitsk@redhat.com> (raw)
In-Reply-To: <20220718141123.136106-1-mlevitsk@redhat.com>
Currently setup_clear_cpu_cap passes NULL 'struct cpuinfo_x86*'
to clear_cpu_cap to indicate that capability should be cleared from boot_cpu_data.
Later that is used in clear_feature to do recursive call to
clear_cpu_cap together with clearing the feature bit from 'cpu_caps_cleared'
Remove that code and just call the do_clear_cpu_cap on boot_cpu_data directly
from the setup_clear_cpu_cap.
The only functional change this introduces is that now calling clear_cpu_cap
explicitly on boot_cpu_data also sets the bits in cpu_caps_cleared,
which is the only thing that makes sense anyway.
All callers of both functions were checked for this and fixed.
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
---
arch/x86/kernel/cpu/cpuid-deps.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/arch/x86/kernel/cpu/cpuid-deps.c b/arch/x86/kernel/cpu/cpuid-deps.c
index c881bcafba7d70..d6777d07ba3302 100644
--- a/arch/x86/kernel/cpu/cpuid-deps.c
+++ b/arch/x86/kernel/cpu/cpuid-deps.c
@@ -88,18 +88,16 @@ static inline void clear_feature(struct cpuinfo_x86 *c, unsigned int feature)
* rest of the cpufeature code uses atomics as well, so keep it for
* consistency. Cleanup all of it separately.
*/
- if (!c) {
- clear_cpu_cap(&boot_cpu_data, feature);
+ clear_bit(feature, (unsigned long *)c->x86_capability);
+
+ if (c == &boot_cpu_data)
set_bit(feature, (unsigned long *)cpu_caps_cleared);
- } else {
- clear_bit(feature, (unsigned long *)c->x86_capability);
- }
}
/* Take the capabilities and the BUG bits into account */
#define MAX_FEATURE_BITS ((NCAPINTS + NBUGINTS) * sizeof(u32) * 8)
-static void do_clear_cpu_cap(struct cpuinfo_x86 *c, unsigned int feature)
+void clear_cpu_cap(struct cpuinfo_x86 *c, unsigned int feature)
{
DECLARE_BITMAP(disable, MAX_FEATURE_BITS);
const struct cpuid_dep *d;
@@ -129,12 +127,7 @@ static void do_clear_cpu_cap(struct cpuinfo_x86 *c, unsigned int feature)
} while (changed);
}
-void clear_cpu_cap(struct cpuinfo_x86 *c, unsigned int feature)
-{
- do_clear_cpu_cap(c, feature);
-}
-
void setup_clear_cpu_cap(unsigned int feature)
{
- do_clear_cpu_cap(NULL, feature);
+ clear_cpu_cap(&boot_cpu_data, feature);
}
--
2.34.3
next prev parent reply other threads:[~2022-07-18 14:11 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-18 14:11 [PATCH v2 0/5] x86: cpuid: improve support for broken CPUID configurations Maxim Levitsky
2022-07-18 14:11 ` [PATCH v2 1/5] perf/x86/intel/lbr: use setup_clear_cpu_cap instead of clear_cpu_cap Maxim Levitsky
2022-09-19 14:31 ` Borislav Petkov
2022-09-20 8:20 ` Maxim Levitsky
2022-09-26 13:12 ` Borislav Petkov
2022-09-28 10:49 ` Maxim Levitsky
2022-10-20 8:59 ` Borislav Petkov
2022-10-20 9:05 ` Herbert Xu
2022-10-20 10:21 ` Maxim Levitsky
2022-10-20 11:13 ` Borislav Petkov
2022-10-22 21:08 ` H. Peter Anvin
2022-11-02 13:40 ` Paolo Bonzini
2022-11-02 14:27 ` Elliott, Robert (Servers)
2022-11-02 16:23 ` H. Peter Anvin
2022-11-02 18:19 ` H. Peter Anvin
2022-11-02 19:14 ` Elliott, Robert (Servers)
2022-11-03 13:26 ` Paolo Bonzini
2022-11-03 13:30 ` Paolo Bonzini
2022-07-18 14:11 ` Maxim Levitsky [this message]
2022-10-21 16:19 ` [PATCH v2 2/5] x86/cpuid: refactor setup_clear_cpu_cap()/clear_cpu_cap() Borislav Petkov
2022-11-07 19:10 ` Borislav Petkov
2022-11-07 21:57 ` Borislav Petkov
2022-07-18 14:11 ` [PATCH v2 3/5] x86/cpuid: move filter_cpuid_features to cpuid-deps.c Maxim Levitsky
2022-07-18 14:11 ` [PATCH v2 4/5] x86/cpuid: remove 'warn' parameter from filter_cpuid_features Maxim Levitsky
2022-07-18 14:11 ` [PATCH v2 5/5] x86/cpuid: check for dependencies violations in CPUID and attempt to fix them Maxim Levitsky
2022-07-28 7:30 ` [PATCH v2 0/5] x86: cpuid: improve support for broken CPUID configurations Maxim Levitsky
2022-08-01 16:05 ` Maxim Levitsky
2022-08-01 16:31 ` Dave Hansen
2022-08-01 16:41 ` Maxim Levitsky
2022-09-19 13:43 ` Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220718141123.136106-3-mlevitsk@redhat.com \
--to=mlevitsk@redhat.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=bp@alien8.de \
--cc=chang.seok.bae@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=hpa@zytor.com \
--cc=jane.malalane@citrix.com \
--cc=jolsa@kernel.org \
--cc=jpoimboe@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=keescook@chromium.org \
--cc=kvm@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tim.c.chen@linux.intel.com \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).