[PATCH] arm64/cpuinfo: Move HWCAP name arrays alongside their bit definitions

From: Anshuman Khandual
Date: Thu May 07 2020 - 05:57:33 EST

Next message: Masami Hiramatsu: "[RFC PATCH 0/3] kprobes: Support nested kprobes"
Previous message: Takashi Iwai: "Re: KASAN: use-after-free Write in snd_rawmidi_kernel_write1"
Next in thread: Mark Rutland: "Re: [PATCH] arm64/cpuinfo: Move HWCAP name arrays alongside their bit definitions"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

All HWCAP name arrays (i.e hwcap_str, compat_hwcap_str, compat_hwcap2_str)
that are scanned for /proc/cpuinfo output are detached from their bit fild
definitions making it difficult to corelate. This is also bit problematic
because during /proc/cpuinfo dump these arrays get traversed sequentially
assuming that they reflect and match HWCAP bit sequence, to test various
features for a given CPU.

This moves all HWCAP name arrays near their bit definitions. But first it
defines all missing COMPAT_HWCAP_XXX that are present in the name string.
Also defines all COMPAT_KERNEL_HWCAP macros to be used for the HWCAP name
string indexing.

Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Will Deacon <will@xxxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxx>
Cc: Ard Biesheuvel <ardb@xxxxxxxxxx>
Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Suzuki K Poulose <suzuki.poulose@xxxxxxx>
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx

Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx>
---
In longer term we might want to generate these HWCAP macros with scripting,
and this is a step in that direction. This applies on 5.7-rc4.

arch/arm64/include/asm/hwcap.h | 132 +++++++++++++++++++++++++++++++++
arch/arm64/kernel/cpuinfo.c | 90 ----------------------
2 files changed, 132 insertions(+), 90 deletions(-)

diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h
index 0f00265248b5..cb99b5f75e5d 100644
--- a/arch/arm64/include/asm/hwcap.h
+++ b/arch/arm64/include/asm/hwcap.h
@@ -8,18 +8,27 @@
#include <uapi/asm/hwcap.h>
#include <asm/cpufeature.h>

+#define COMPAT_HWCAP_SWP (1 << 0)
#define COMPAT_HWCAP_HALF (1 << 1)
#define COMPAT_HWCAP_THUMB (1 << 2)
+#define COMPAT_HWCAP_26BIT (1 << 3)
#define COMPAT_HWCAP_FAST_MULT (1 << 4)
+#define COMPAT_HWCAP_FPA (1 << 5)
#define COMPAT_HWCAP_VFP (1 << 6)
#define COMPAT_HWCAP_EDSP (1 << 7)
+#define COMPAT_HWCAP_JAVA (1 << 8)
+#define COMPAT_HWCAP_IWMMXT (1 << 9)
+#define COMPAT_HWCAP_CRUNCH (1 << 10)
+#define COMPAT_HWCAP_THUMBEE (1 << 11)
#define COMPAT_HWCAP_NEON (1 << 12)
#define COMPAT_HWCAP_VFPv3 (1 << 13)
+#define COMPAT_HWCAP_VFPV3D16 (1 << 14)
#define COMPAT_HWCAP_TLS (1 << 15)
#define COMPAT_HWCAP_VFPv4 (1 << 16)
#define COMPAT_HWCAP_IDIVA (1 << 17)
#define COMPAT_HWCAP_IDIVT (1 << 18)
#define COMPAT_HWCAP_IDIV (COMPAT_HWCAP_IDIVA|COMPAT_HWCAP_IDIVT)
+#define COMPAT_HWCAP_VFPD32 (1 << 19)
#define COMPAT_HWCAP_LPAE (1 << 20)
#define COMPAT_HWCAP_EVTSTRM (1 << 21)

@@ -95,6 +104,129 @@
#define KERNEL_HWCAP_DGH __khwcap2_feature(DGH)
#define KERNEL_HWCAP_RNG __khwcap2_feature(RNG)

+#ifdef CONFIG_COMPAT
+#define __compat_khwcap_feature(x) const_ilog2(COMPAT_HWCAP_ ## x)
+#define COMPAT_KERNEL_HWCAP_SWP __compat_khwcap_feature(SWP)
+#define COMPAT_KERNEL_HWCAP_HALF __compat_khwcap_feature(HALF)
+#define COMPAT_KERNEL_HWCAP_THUMB __compat_khwcap_feature(THUMB)
+#define COMPAT_KERNEL_HWCAP_26BIT __compat_khwcap_feature(26BIT)
+#define COMPAT_KERNEL_HWCAP_FAST_MULT __compat_khwcap_feature(FAST_MULT)
+#define COMPAT_KERNEL_HWCAP_FPA __compat_khwcap_feature(FPA)
+#define COMPAT_KERNEL_HWCAP_VFP __compat_khwcap_feature(VFP)
+#define COMPAT_KERNEL_HWCAP_EDSP __compat_khwcap_feature(EDSP)
+#define COMPAT_KERNEL_HWCAP_JAVA __compat_khwcap_feature(JAVA)
+#define COMPAT_KERNEL_HWCAP_IWMMXT __compat_khwcap_feature(IWMMXT)
+#define COMPAT_KERNEL_HWCAP_CRUNCH __compat_khwcap_feature(CRUNCH)
+#define COMPAT_KERNEL_HWCAP_THUMBEE __compat_khwcap_feature(THUMBEE)
+#define COMPAT_KERNEL_HWCAP_NEON __compat_khwcap_feature(NEON)
+#define COMPAT_KERNEL_HWCAP_VFPv3 __compat_khwcap_feature(VFPv3)
+#define COMPAT_KERNEL_HWCAP_VFPV3D16 __compat_khwcap_feature(VFPV3D16)
+#define COMPAT_KERNEL_HWCAP_TLS __compat_khwcap_feature(TLS)
+#define COMPAT_KERNEL_HWCAP_VFPv4 __compat_khwcap_feature(VFPv4)
+#define COMPAT_KERNEL_HWCAP_IDIVA __compat_khwcap_feature(IDIVA)
+#define COMPAT_KERNEL_HWCAP_IDIVT __compat_khwcap_feature(IDIVT)
+#define COMPAT_KERNEL_HWCAP_VFPD32 __compat_khwcap_feature(VFPD32)
+#define COMPAT_KERNEL_HWCAP_LPAE __compat_khwcap_feature(LPAE)
+#define COMPAT_KERNEL_HWCAP_EVTSTRM __compat_khwcap_feature(EVTSTRM)
+
+#define __compat_khwcap2_feature(x) const_ilog2(COMPAT_HWCAP2_ ## x)
+#define COMPAT_KERNEL_HWCAP_AES __compat_khwcap2_feature(AES)
+#define COMPAT_KERNEL_HWCAP_PMULL __compat_khwcap2_feature(PMULL)
+#define COMPAT_KERNEL_HWCAP_SHA1 __compat_khwcap2_feature(SHA1)
+#define COMPAT_KERNEL_HWCAP_SHA2 __compat_khwcap2_feature(SHA2)
+#define COMPAT_KERNEL_HWCAP_CRC32 __compat_khwcap2_feature(CRC32)
+#endif /* CONFIG_COMPAT */
+
+static const char *const hwcap_str[] = {
+ [KERNEL_HWCAP_FP] = "fp",
+ [KERNEL_HWCAP_ASIMD] = "asimd",
+ [KERNEL_HWCAP_EVTSTRM] = "evtstrm",
+ [KERNEL_HWCAP_AES] = "aes",
+ [KERNEL_HWCAP_PMULL] = "pmull",
+ [KERNEL_HWCAP_SHA1] = "sha1",
+ [KERNEL_HWCAP_SHA2] = "sha2",
+ [KERNEL_HWCAP_CRC32] = "crc32",
+ [KERNEL_HWCAP_ATOMICS] = "atomics",
+ [KERNEL_HWCAP_FPHP] = "fphp",
+ [KERNEL_HWCAP_ASIMDHP] = "asimdhp",
+ [KERNEL_HWCAP_CPUID] = "cpuid",
+ [KERNEL_HWCAP_ASIMDRDM] = "asimdrdm",
+ [KERNEL_HWCAP_JSCVT] = "jscvt",
+ [KERNEL_HWCAP_FCMA] = "fcma",
+ [KERNEL_HWCAP_LRCPC] = "lrcpc",
+ [KERNEL_HWCAP_DCPOP] = "dcpop",
+ [KERNEL_HWCAP_SHA3] = "sha3",
+ [KERNEL_HWCAP_SM3] = "sm3",
+ [KERNEL_HWCAP_SM4] = "sm4",
+ [KERNEL_HWCAP_ASIMDDP] = "asimddp",
+ [KERNEL_HWCAP_SHA512] = "sha512",
+ [KERNEL_HWCAP_SVE] = "sve",
+ [KERNEL_HWCAP_ASIMDFHM] = "asimdfhm",
+ [KERNEL_HWCAP_DIT] = "dit",
+ [KERNEL_HWCAP_USCAT] = "uscat",
+ [KERNEL_HWCAP_ILRCPC] = "ilrcpc",
+ [KERNEL_HWCAP_FLAGM] = "flagm",
+ [KERNEL_HWCAP_SSBS] = "ssbs",
+ [KERNEL_HWCAP_SB] = "sb",
+ [KERNEL_HWCAP_PACA] = "paca",
+ [KERNEL_HWCAP_PACG] = "pacg",
+ [KERNEL_HWCAP_DCPODP] = "dcpodp",
+ [KERNEL_HWCAP_SVE2] = "sve2",
+ [KERNEL_HWCAP_SVEAES] = "sveaes",
+ [KERNEL_HWCAP_SVEPMULL] = "svepmull",
+ [KERNEL_HWCAP_SVEBITPERM] = "svebitperm",
+ [KERNEL_HWCAP_SVESHA3] = "svesha3",
+ [KERNEL_HWCAP_SVESM4] = "svesm4",
+ [KERNEL_HWCAP_FLAGM2] = "flagm2",
+ [KERNEL_HWCAP_FRINT] = "frint",
+ [KERNEL_HWCAP_SVEI8MM] = "svei8mm",
+ [KERNEL_HWCAP_SVEF32MM] = "svef32mm",
+ [KERNEL_HWCAP_SVEF64MM] = "svef64mm",
+ [KERNEL_HWCAP_SVEBF16] = "svebf16",
+ [KERNEL_HWCAP_I8MM] = "i8mm",
+ [KERNEL_HWCAP_BF16] = "bf16",
+ [KERNEL_HWCAP_DGH] = "dgh",
+ [KERNEL_HWCAP_RNG] = "rng",
+ NULL
+};
+
+#ifdef CONFIG_COMPAT
+static const char *const compat_hwcap_str[] = {
+ [COMPAT_KERNEL_HWCAP_SWP] = "swp",
+ [COMPAT_KERNEL_HWCAP_HALF] = "half",
+ [COMPAT_KERNEL_HWCAP_THUMB] = "thumb",
+ [COMPAT_KERNEL_HWCAP_26BIT] = "26bit",
+ [COMPAT_KERNEL_HWCAP_FAST_MULT] = "fastmult",
+ [COMPAT_KERNEL_HWCAP_FPA] = "fpa",
+ [COMPAT_KERNEL_HWCAP_VFP] = "vfp",
+ [COMPAT_KERNEL_HWCAP_EDSP] = "edsp",
+ [COMPAT_KERNEL_HWCAP_JAVA] = "java",
+ [COMPAT_KERNEL_HWCAP_IWMMXT] = "iwmmxt",
+ [COMPAT_KERNEL_HWCAP_CRUNCH] = "crunch",
+ [COMPAT_KERNEL_HWCAP_THUMBEE] = "thumbee",
+ [COMPAT_KERNEL_HWCAP_NEON] = "neon",
+ [COMPAT_KERNEL_HWCAP_VFPv3] = "vfpv3",
+ [COMPAT_KERNEL_HWCAP_VFPV3D16] = "vfpv3d16",
+ [COMPAT_KERNEL_HWCAP_TLS] = "tls",
+ [COMPAT_KERNEL_HWCAP_VFPv4] = "vfpv4",
+ [COMPAT_KERNEL_HWCAP_IDIVA] = "idiva",
+ [COMPAT_KERNEL_HWCAP_IDIVT] = "idivt",
+ [COMPAT_KERNEL_HWCAP_VFPD32] = "vfpd32",
+ [COMPAT_KERNEL_HWCAP_LPAE] = "lpae",
+ [COMPAT_KERNEL_HWCAP_EVTSTRM] = "evtstrm",
+ NULL
+};
+
+static const char *const compat_hwcap2_str[] = {
+ [COMPAT_KERNEL_HWCAP_AES] = "aes",
+ [COMPAT_KERNEL_HWCAP_PMULL] = "pmull",
+ [COMPAT_KERNEL_HWCAP_SHA1] = "sha1",
+ [COMPAT_KERNEL_HWCAP_SHA2] = "sha2",
+ [COMPAT_KERNEL_HWCAP_CRC32] = "crc32",
+ NULL,
+};
+#endif /* CONFIG_COMPAT */
+
/*
* This yields a mask that user programs can use to figure out what
* instruction set this cpu supports.
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 86136075ae41..f45f8614e8bd 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -42,96 +42,6 @@ static const char *icache_policy_str[] = {

unsigned long __icache_flags;

-static const char *const hwcap_str[] = {
- "fp",
- "asimd",
- "evtstrm",
- "aes",
- "pmull",
- "sha1",
- "sha2",
- "crc32",
- "atomics",
- "fphp",
- "asimdhp",
- "cpuid",
- "asimdrdm",
- "jscvt",
- "fcma",
- "lrcpc",
- "dcpop",
- "sha3",
- "sm3",
- "sm4",
- "asimddp",
- "sha512",
- "sve",
- "asimdfhm",
- "dit",
- "uscat",
- "ilrcpc",
- "flagm",
- "ssbs",
- "sb",
- "paca",
- "pacg",
- "dcpodp",
- "sve2",
- "sveaes",
- "svepmull",
- "svebitperm",
- "svesha3",
- "svesm4",
- "flagm2",
- "frint",
- "svei8mm",
- "svef32mm",
- "svef64mm",
- "svebf16",
- "i8mm",
- "bf16",
- "dgh",
- "rng",
- NULL
-};
-
-#ifdef CONFIG_COMPAT
-static const char *const compat_hwcap_str[] = {
- "swp",
- "half",
- "thumb",
- "26bit",
- "fastmult",
- "fpa",
- "vfp",
- "edsp",
- "java",
- "iwmmxt",
- "crunch",
- "thumbee",
- "neon",
- "vfpv3",
- "vfpv3d16",
- "tls",
- "vfpv4",
- "idiva",
- "idivt",
- "vfpd32",
- "lpae",
- "evtstrm",
- NULL
-};
-
-static const char *const compat_hwcap2_str[] = {
- "aes",
- "pmull",
- "sha1",
- "sha2",
- "crc32",
- NULL
-};
-#endif /* CONFIG_COMPAT */
-
static int c_show(struct seq_file *m, void *v)
{
int i, j;
--
2.20.1

Next message: Masami Hiramatsu: "[RFC PATCH 0/3] kprobes: Support nested kprobes"
Previous message: Takashi Iwai: "Re: KASAN: use-after-free Write in snd_rawmidi_kernel_write1"
Next in thread: Mark Rutland: "Re: [PATCH] arm64/cpuinfo: Move HWCAP name arrays alongside their bit definitions"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]