linux-kernel - Re: [PATCH 4.14 027/119] MIPS: elf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Tue, 29 Oct 2019 18:50:38 +0800
From:   Jiaxun Yang <jiaxun.yang@...goat.com>
To:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        linux-kernel@...r.kernel.org
Cc:     stable@...r.kernel.org, Meng Zhuo <mengzhuo1203@...il.com>,
        linux-mips@...r.kernel.org, Paul Burton <paul.burton@...s.com>,
        Sasha Levin <sashal@...nel.org>
Subject: Re: [PATCH 4.14 027/119] MIPS: elf_hwcap: Export userspace ASEs


在 2019/10/28 上午5:00, Greg Kroah-Hartman 写道:
> From: Jiaxun Yang <jiaxun.yang@...goat.com>
>
> [ Upstream commit 38dffe1e4dde1d3174fdce09d67370412843ebb5 ]
>
> A Golang developer reported MIPS hwcap isn't reflecting instructions
> that the processor actually supported so programs can't apply optimized
> code at runtime.
>
> Thus we export the ASEs that can be used in userspace programs.
>
> Reported-by: Meng Zhuo <mengzhuo1203@...il.com>
> Signed-off-by: Jiaxun Yang <jiaxun.yang@...goat.com>
> Cc: linux-mips@...r.kernel.org
> Cc: Paul Burton <paul.burton@...s.com>
> Cc: <stable@...r.kernel.org> # 4.14+
> Signed-off-by: Paul Burton <paul.burton@...s.com>
> Signed-off-by: Sasha Levin <sashal@...nel.org>
> ---
>   arch/mips/include/uapi/asm/hwcap.h | 11 ++++++++++
>   arch/mips/kernel/cpu-probe.c       | 33 ++++++++++++++++++++++++++++++
>   2 files changed, 44 insertions(+)
>
> diff --git a/arch/mips/include/uapi/asm/hwcap.h b/arch/mips/include/uapi/asm/hwcap.h
> index 600ad8fd68356..2475294c3d185 100644
> --- a/arch/mips/include/uapi/asm/hwcap.h
> +++ b/arch/mips/include/uapi/asm/hwcap.h
> @@ -5,5 +5,16 @@
>   /* HWCAP flags */
>   #define HWCAP_MIPS_R6		(1 << 0)
>   #define HWCAP_MIPS_MSA		(1 << 1)
> +#define HWCAP_MIPS_MIPS16	(1 << 3)
> +#define HWCAP_MIPS_MDMX     (1 << 4)
> +#define HWCAP_MIPS_MIPS3D   (1 << 5)
> +#define HWCAP_MIPS_SMARTMIPS (1 << 6)
> +#define HWCAP_MIPS_DSP      (1 << 7)
> +#define HWCAP_MIPS_DSP2     (1 << 8)
> +#define HWCAP_MIPS_DSP3     (1 << 9)
> +#define HWCAP_MIPS_MIPS16E2 (1 << 10)
> +#define HWCAP_LOONGSON_MMI  (1 << 11)
> +#define HWCAP_LOONGSON_EXT  (1 << 12)
> +#define HWCAP_LOONGSON_EXT2 (1 << 13)
>   
>   #endif /* _UAPI_ASM_HWCAP_H */
> diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
> index 3007ae1bb616a..c38cd62879f4e 100644
> --- a/arch/mips/kernel/cpu-probe.c
> +++ b/arch/mips/kernel/cpu-probe.c
> @@ -2080,6 +2080,39 @@ void cpu_probe(void)
>   		elf_hwcap |= HWCAP_MIPS_MSA;
>   	}
>   
> +	if (cpu_has_mips16)
> +		elf_hwcap |= HWCAP_MIPS_MIPS16;
> +
> +	if (cpu_has_mdmx)
> +		elf_hwcap |= HWCAP_MIPS_MDMX;
> +
> +	if (cpu_has_mips3d)
> +		elf_hwcap |= HWCAP_MIPS_MIPS3D;
> +
> +	if (cpu_has_smartmips)
> +		elf_hwcap |= HWCAP_MIPS_SMARTMIPS;
> +
> +	if (cpu_has_dsp)
> +		elf_hwcap |= HWCAP_MIPS_DSP;
> +
> +	if (cpu_has_dsp2)
> +		elf_hwcap |= HWCAP_MIPS_DSP2;
> +
> +	if (cpu_has_dsp3)
> +		elf_hwcap |= HWCAP_MIPS_DSP3;
> +
> +	if (cpu_has_loongson_mmi)
> +		elf_hwcap |= HWCAP_LOONGSON_MMI;
> +
> +	if (cpu_has_loongson_mmi)
> +		elf_hwcap |= HWCAP_LOONGSON_CAM;

Hi:

Sorry, there is a typo causing build failure.

Should be:

---
  arch/mips/include/uapi/asm/hwcap.h | 11 ++++++++++
  arch/mips/kernel/cpu-probe.c       | 33 ++++++++++++++++++++++++++++++
  2 files changed, 44 insertions(+)

diff --git a/arch/mips/include/uapi/asm/hwcap.h b/arch/mips/include/uapi/asm/hwcap.h
index a2aba4b059e6..1ade1daa4921 100644
--- a/arch/mips/include/uapi/asm/hwcap.h
+++ b/arch/mips/include/uapi/asm/hwcap.h
@@ -6,5 +6,16 @@
  #define HWCAP_MIPS_R6		(1 << 0)
  #define HWCAP_MIPS_MSA		(1 << 1)
  #define HWCAP_MIPS_CRC32	(1 << 2)
+#define HWCAP_MIPS_MIPS16	(1 << 3)
+#define HWCAP_MIPS_MDMX     (1 << 4)
+#define HWCAP_MIPS_MIPS3D   (1 << 5)
+#define HWCAP_MIPS_SMARTMIPS (1 << 6)
+#define HWCAP_MIPS_DSP      (1 << 7)
+#define HWCAP_MIPS_DSP2     (1 << 8)
+#define HWCAP_MIPS_DSP3     (1 << 9)
+#define HWCAP_MIPS_MIPS16E2 (1 << 10)
+#define HWCAP_LOONGSON_MMI  (1 << 11)
+#define HWCAP_LOONGSON_EXT  (1 << 12)
+#define HWCAP_LOONGSON_EXT2 (1 << 13)
  
  #endif /* _UAPI_ASM_HWCAP_H */
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index c2eb392597bf..f521cbf934e7 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -2180,6 +2180,39 @@ void cpu_probe(void)
  		elf_hwcap |= HWCAP_MIPS_MSA;
  	}
  
+	if (cpu_has_mips16)
+		elf_hwcap |= HWCAP_MIPS_MIPS16;
+
+	if (cpu_has_mdmx)
+		elf_hwcap |= HWCAP_MIPS_MDMX;
+
+	if (cpu_has_mips3d)
+		elf_hwcap |= HWCAP_MIPS_MIPS3D;
+
+	if (cpu_has_smartmips)
+		elf_hwcap |= HWCAP_MIPS_SMARTMIPS;
+
+	if (cpu_has_dsp)
+		elf_hwcap |= HWCAP_MIPS_DSP;
+
+	if (cpu_has_dsp2)
+		elf_hwcap |= HWCAP_MIPS_DSP2;
+
+	if (cpu_has_dsp3)
+		elf_hwcap |= HWCAP_MIPS_DSP3;
+
+	if (cpu_has_mips16e2)
+		elf_hwcap |= HWCAP_MIPS_MIPS16E2;
+
+	if (cpu_has_loongson_mmi)
+		elf_hwcap |= HWCAP_LOONGSON_MMI;
+
+	if (cpu_has_loongson_ext)
+		elf_hwcap |= HWCAP_LOONGSON_EXT;
+
+	if (cpu_has_loongson_ext2)
+		elf_hwcap |= HWCAP_LOONGSON_EXT2;
+
  	if (cpu_has_vz)
  		cpu_probe_vz(c);
  
-- 2.23.0