From: Dave Hansen <dave@sr71.net>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, Dave Hansen <dave@sr71.net>, dave.hansen@linux.intel.com
Subject: [PATCH 2/3] x86, cpufeatures: make sure DISABLED/REQUIRED macros are updated
Date: Wed, 29 Jun 2016 13:01:08 -0700 [thread overview]
Message-ID: <20160629200108.92466F6F@viggo.jf.intel.com> (raw)
In-Reply-To: <20160629200107.8D3C9A31@viggo.jf.intel.com>
From: Dave Hansen <dave.hansen@linux.intel.com>
x86 has two macros which allow us to evaluate some CPUID-based
features at compile time:
REQUIRED_MASK_BIT_SET()
DISABLED_MASK_BIT_SET()
They're both defined by having the compiler check the bit
argument against some constant masks of features.
But, when adding new CPUID leaves, we need to check new words
for these macros. So make sure that those macros and the
REQUIRED_MASK* and DISABLED_MASK* get updated when necessary.
This looks kinda silly to have an open-coded value ("18" in
this case) open-coded in 5 places in the code. But, we really do
need 5 places updated when NCAPINTS gets bumped, so now we just
force the issue.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
---
b/arch/x86/include/asm/cpufeature.h | 8 ++++++--
b/arch/x86/include/asm/disabled-features.h | 1 +
b/arch/x86/include/asm/required-features.h | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff -puN arch/x86/include/asm/cpufeature.h~x86-make-sure-macros-are-updated arch/x86/include/asm/cpufeature.h
--- a/arch/x86/include/asm/cpufeature.h~x86-make-sure-macros-are-updated 2016-06-29 12:59:58.212523211 -0700
+++ b/arch/x86/include/asm/cpufeature.h 2016-06-29 12:59:58.219523528 -0700
@@ -67,7 +67,9 @@ extern const char * const x86_bug_flags[
(((bit)>>5)==14 && (1UL<<((bit)&31) & REQUIRED_MASK14)) || \
(((bit)>>5)==15 && (1UL<<((bit)&31) & REQUIRED_MASK15)) || \
(((bit)>>5)==16 && (1UL<<((bit)&31) & REQUIRED_MASK16)) || \
- (((bit)>>5)==17 && (1UL<<((bit)&31) & REQUIRED_MASK17)))
+ (((bit)>>5)==17 && (1UL<<((bit)&31) & REQUIRED_MASK17)) || \
+ REQUIRED_MASK_CHECK || \
+ BUILD_BUG_ON_ZERO(NCAPINTS != 18))
#define DISABLED_MASK_BIT_SET(bit) \
( (((bit)>>5)==0 && (1UL<<((bit)&31) & DISABLED_MASK0 )) || \
@@ -87,7 +89,9 @@ extern const char * const x86_bug_flags[
(((bit)>>5)==14 && (1UL<<((bit)&31) & DISABLED_MASK14)) || \
(((bit)>>5)==15 && (1UL<<((bit)&31) & DISABLED_MASK15)) || \
(((bit)>>5)==16 && (1UL<<((bit)&31) & DISABLED_MASK16)) || \
- (((bit)>>5)==17 && (1UL<<((bit)&31) & DISABLED_MASK17)))
+ (((bit)>>5)==17 && (1UL<<((bit)&31) & DISABLED_MASK17)) || \
+ DISABLED_MASK_CHECK || \
+ BUILD_BUG_ON_ZERO(NCAPINTS != 18))
#define cpu_has(c, bit) \
(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
diff -puN arch/x86/include/asm/disabled-features.h~x86-make-sure-macros-are-updated arch/x86/include/asm/disabled-features.h
--- a/arch/x86/include/asm/disabled-features.h~x86-make-sure-macros-are-updated 2016-06-29 12:59:58.214523302 -0700
+++ b/arch/x86/include/asm/disabled-features.h 2016-06-29 12:59:58.219523528 -0700
@@ -57,5 +57,6 @@
#define DISABLED_MASK15 0
#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE)
#define DISABLED_MASK17 0
+#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)
#endif /* _ASM_X86_DISABLED_FEATURES_H */
diff -puN arch/x86/include/asm/required-features.h~x86-make-sure-macros-are-updated arch/x86/include/asm/required-features.h
--- a/arch/x86/include/asm/required-features.h~x86-make-sure-macros-are-updated 2016-06-29 12:59:58.215523347 -0700
+++ b/arch/x86/include/asm/required-features.h 2016-06-29 12:59:58.219523528 -0700
@@ -100,5 +100,6 @@
#define REQUIRED_MASK15 0
#define REQUIRED_MASK16 0
#define REQUIRED_MASK17 0
+#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)
#endif /* _ASM_X86_REQUIRED_FEATURES_H */
_
next prev parent reply other threads:[~2016-06-29 20:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-29 20:01 [PATCH 1/3] x86, cpufeatures: update cpufeaure macros Dave Hansen
2016-06-29 20:01 ` Dave Hansen [this message]
2016-06-30 21:34 ` [tip:x86/cpu] x86/cpufeature: Make sure DISABLED/REQUIRED macros are updated tip-bot for Dave Hansen
2016-06-29 20:01 ` [PATCH 3/3] x86, cpufeatures: add helper macro for mask check macros Dave Hansen
2016-06-30 21:35 ` [tip:x86/cpu] x86/cpufeature: Add " tip-bot for Dave Hansen
2016-06-30 21:34 ` [tip:x86/cpu] x86/cpufeature: Update cpufeaure macros tip-bot for Dave Hansen
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=20160629200108.92466F6F@viggo.jf.intel.com \
--to=dave@sr71.net \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--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
Powered by JetHome