* [PATCH v2 0/2] sparc64: Read qemu,hwcap-list on sun4u
@ 2026-11-18 11:55 Stian Halseth
2026-11-18 11:55 ` [PATCH v2 1/2] sparc64: Stop the hwcap-list parser at an unterminated entry Stian Halseth
2026-11-18 11:55 ` [PATCH v2 2/2] sparc64: Read qemu,hwcap-list from the OF cpu node on sun4u Stian Halseth
0 siblings, 2 replies; 3+ messages in thread
From: Stian Halseth @ 2026-11-18 11:55 UTC (permalink / raw)
To: sparclinux
Cc: Andreas Larsson, David S . Miller, Eric Biggers,
Mark Cave-Ayland, linux-kernel, Stian Halseth
QEMU's default sparc64 machine is sun4u. With -cpu ...,+crypto it
emulates the SPARC crypto opcodes and passes the hwcap-list to
OpenBIOS. OpenBIOS puts the list on the cpu node as qemu,hwcap-list.
Patch 2 reads it there. The crypto KUnit tests then run the sparc64
code under QEMU.
Patch 1 is new. Sashiko found that the hwcap-list parser reads past an
entry that has no NUL. The machine description parser has the same
bug, so patch 1 fixes it before patch 2 moves the code.
On sun4u, the ecb-, cbc- and ctr-aes-sparc64 glue loses its round keys
in skcipher_walk_done(). Under QEMU with +crypto, their self-tests
fail. No real sun4u CPU has the crypto opcodes. Eric's series moves
these modes into lib/crypto and fixes it:
https://lore.kernel.org/linux-crypto/20261118041033.50014-1-ebiggers@kernel.org/
It is planned for 7.5 via libcrypto-next.
The QEMU side is in master for 11.2, commit a1eb9a1720 ("hw/sparc64:
Pass hwcap-list to OpenBIOS via fw_cfg"). The OpenBIOS side is on the
OpenBIOS list:
https://mail.coreboot.org/archives/list/openbios@openbios.org/thread/3XVXVLHWT2T63IYWR67WPOHFSJGLP3NP/
Until QEMU ships an OpenBIOS with it, nvramrc can set the property:
NV='" /SUNW,UltraSPARC-IIi" find-device " vis" encode-string " vis2" encode-string encode+ " vis3" encode-string encode+ " aes" encode-string encode+ " sha1" encode-string encode+ " sha256" encode-string encode+ " sha512" encode-string encode+ " crc32c" encode-string encode+ " qemu,hwcap-list" property device-end'
./tools/testing/kunit/kunit.py run --arch=sparc64 \
--kunitconfig=lib/crypto/.kunitconfig \
--kunitconfig=lib/crc/.kunitconfig \
--qemu_args='-cpu TI-UltraSparc-IIi,+vis3,+crypto' \
--qemu_args='-prom-env use-nvramrc?=true' \
--qemu_args="-prom-env 'nvramrc=$NV'"
Changes in v2:
- New patch 1: stop the parser at an entry without a NUL (Sashiko).
- Patch 2: Eric's Tested-by. No other change.
- Dropped the lib/crypto question from the notes. Eric's series
answers it.
v1: https://lore.kernel.org/all/20261117112914.2300417-1-stian@itx.no/
Stian Halseth (2):
sparc64: Stop the hwcap-list parser at an unterminated entry
sparc64: Read qemu,hwcap-list from the OF cpu node on sun4u
arch/sparc/kernel/setup_64.c | 68 ++++++++++++++++++++++++++----------
1 file changed, 50 insertions(+), 18 deletions(-)
base-commit: 666539eecdf4db623f5e3c3e55cf9f2dfad24aa4
--
2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 1/2] sparc64: Stop the hwcap-list parser at an unterminated entry
2026-11-18 11:55 [PATCH v2 0/2] sparc64: Read qemu,hwcap-list on sun4u Stian Halseth
@ 2026-11-18 11:55 ` Stian Halseth
2026-11-18 11:55 ` [PATCH v2 2/2] sparc64: Read qemu,hwcap-list from the OF cpu node on sun4u Stian Halseth
1 sibling, 0 replies; 3+ messages in thread
From: Stian Halseth @ 2026-11-18 11:55 UTC (permalink / raw)
To: sparclinux
Cc: Andreas Larsson, David S . Miller, Eric Biggers,
Mark Cave-Ayland, linux-kernel, Stian Halseth
mdesc_cpu_hwcap_list() walks the hwcap-list strings with strlen() and
strcmp(). If the last entry has no NUL within the property, both read
past its end. len then goes negative, and while (len) does not stop.
Measure each entry with strnlen() first, and stop at one that does not
fit, as of_property_read_string_helper() does.
Signed-off-by: Stian Halseth <stian@itx.no>
---
arch/sparc/kernel/setup_64.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 63615f5c99b47..96de9fe84cd44 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -489,6 +489,10 @@ static unsigned long __init mdesc_cpu_hwcap_list(void)
while (len) {
int i, plen;
+ plen = strnlen(prop, len) + 1;
+ if (plen > len)
+ break;
+
for (i = 0; i < ARRAY_SIZE(hwcaps); i++) {
unsigned long bit = 1UL << i;
@@ -502,7 +506,6 @@ static unsigned long __init mdesc_cpu_hwcap_list(void)
caps |= HWCAP_SPARC_CRYPTO;
}
- plen = strlen(prop) + 1;
prop += plen;
len -= plen;
}
--
2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] sparc64: Read qemu,hwcap-list from the OF cpu node on sun4u
2026-11-18 11:55 [PATCH v2 0/2] sparc64: Read qemu,hwcap-list on sun4u Stian Halseth
2026-11-18 11:55 ` [PATCH v2 1/2] sparc64: Stop the hwcap-list parser at an unterminated entry Stian Halseth
@ 2026-11-18 11:55 ` Stian Halseth
1 sibling, 0 replies; 3+ messages in thread
From: Stian Halseth @ 2026-11-18 11:55 UTC (permalink / raw)
To: sparclinux
Cc: Andreas Larsson, David S . Miller, Eric Biggers,
Mark Cave-Ayland, linux-kernel, Stian Halseth
The SPARC crypto opcodes are used only when hwcap-list names them.
Only the sun4v machine description carries a hwcap-list. QEMU's
default sparc64 machine is sun4u and has no machine description. The
kernel then never uses QEMU's crypto instructions, and the crypto
KUnit tests only exercise the generic code.
For CPUs with the crypto feature, QEMU passes a hwcap-list to the
firmware. OpenBIOS puts it on the cpu node as qemu,hwcap-list. Real
sun4u firmware has no such property.
Factor out the hwcap-list parser. When there is no machine
description, read the list from that property.
Signed-off-by: Stian Halseth <stian@itx.no>
Tested-by: Eric Biggers <ebiggers@kernel.org>
---
arch/sparc/kernel/setup_64.c | 63 ++++++++++++++++++++++++++----------
1 file changed, 46 insertions(+), 17 deletions(-)
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 96de9fe84cd44..dde144adec82a 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -32,6 +32,7 @@
#include <linux/module.h>
#include <linux/start_kernel.h>
#include <linux/memblock.h>
+#include <linux/of.h>
#include <uapi/linux/mount.h>
#include <asm/io.h>
@@ -466,25 +467,9 @@ static void __init report_hwcaps(unsigned long caps)
printk(KERN_CONT "]\n");
}
-static unsigned long __init mdesc_cpu_hwcap_list(void)
+static unsigned long __init hwcap_list_caps(const char *prop, int len)
{
- struct mdesc_handle *hp;
unsigned long caps = 0;
- const char *prop;
- int len;
- u64 pn;
-
- hp = mdesc_grab();
- if (!hp)
- return 0;
-
- pn = mdesc_node_by_name(hp, MDESC_NODE_NULL, "cpu");
- if (pn == MDESC_NODE_NULL)
- goto out;
-
- prop = mdesc_get_property(hp, pn, "hwcap-list", &len);
- if (!prop)
- goto out;
while (len) {
int i, plen;
@@ -510,11 +495,53 @@ static unsigned long __init mdesc_cpu_hwcap_list(void)
len -= plen;
}
+ return caps;
+}
+
+static unsigned long __init mdesc_cpu_hwcap_list(void)
+{
+ struct mdesc_handle *hp;
+ unsigned long caps = 0;
+ const char *prop;
+ int len;
+ u64 pn;
+
+ hp = mdesc_grab();
+ if (!hp)
+ return 0;
+
+ pn = mdesc_node_by_name(hp, MDESC_NODE_NULL, "cpu");
+ if (pn == MDESC_NODE_NULL)
+ goto out;
+
+ prop = mdesc_get_property(hp, pn, "hwcap-list", &len);
+ if (prop)
+ caps = hwcap_list_caps(prop, len);
+
out:
mdesc_release(hp);
return caps;
}
+/* sun4u has no machine description; QEMU lists the caps here. */
+static unsigned long __init of_cpu_hwcap_list(void)
+{
+ struct device_node *dp;
+ unsigned long caps = 0;
+ const char *prop;
+ int len;
+
+ dp = of_find_node_by_type(NULL, "cpu");
+ if (!dp)
+ return 0;
+
+ prop = of_get_property(dp, "qemu,hwcap-list", &len);
+ if (prop)
+ caps = hwcap_list_caps(prop, len);
+ of_node_put(dp);
+ return caps;
+}
+
/* This yields a mask that user programs can use to figure out what
* instruction set this cpu supports.
*/
@@ -552,6 +579,8 @@ static void __init init_sparc64_elf_hwcap(void)
cap |= (AV_SPARC_MUL32 | AV_SPARC_DIV32 | AV_SPARC_V8PLUS);
mdesc_caps = mdesc_cpu_hwcap_list();
+ if (!mdesc_caps)
+ mdesc_caps = of_cpu_hwcap_list();
if (!mdesc_caps) {
if (tlb_type == spitfire)
cap |= AV_SPARC_VIS;
--
2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-18 11:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-18 11:55 [PATCH v2 0/2] sparc64: Read qemu,hwcap-list on sun4u Stian Halseth
2026-11-18 11:55 ` [PATCH v2 1/2] sparc64: Stop the hwcap-list parser at an unterminated entry Stian Halseth
2026-11-18 11:55 ` [PATCH v2 2/2] sparc64: Read qemu,hwcap-list from the OF cpu node on sun4u Stian Halseth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®