Skip to contentSkip to conversation

arm64: kvm, smccc: Fix vendor uuid

PATCH Applied Jack Thomson 5 participants 7 messages Jul 21, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: kvm, smccc: Fix vendor uuid

From: Jack Thomson <[email protected]>

Commit 13423063c7cb ("arm64: kvm, smccc: Introduce and use API for getting hypervisor UUID") replaced the explicit register constants with the UUID_INIT macro. However, there is an endian issue, meaning the UUID generated and used in the handshake didn't match UUID prior to the commit.

The change in UUID causes the SMCCC vendor handshake to fail with older guest kernels, meaning devices such as PTP were not available in the guest.

This patch updates the parameters to the macro to generate a UUID which matches the previous value, and re-establish backwards compatibility with older guest kernels.

Fixes 13423063c7cb ("arm64: kvm, smccc: Introduce and use API for getting hypervisor UUID")

getting hypervisor UUID")

---
 include/linux/arm-smccc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/arm-smccc.h +1 -1
index 784ebe4607a4..50b47eba7d01 100644
@@ -113,7 +113,7 @@
 
 /* KVM UID value: 28b46fb6-2ec5-11e9-a9ca-4b564d003a74 */
 #define ARM_SMCCC_VENDOR_HYP_UID_KVM UUID_INIT(\
-	0xb66fb428, 0xc52e, 0xe911, \
+	0x28b46fb6, 0x2ec5, 0x11e9, \
 	0xa9, 0xca, 0x4b, 0x56, \
 	0x4d, 0x00, 0x3a, 0x74)
 

base-commit: 89be9a83ccf1f88522317ce02f854f30d6115c41

Signature · 1 line
2.43.0
maintainer Reviewed-by Tested-by on v1 1/1
#1 lore raw

[+Will]

Quoted 30 lines · Jack Thomson

From: Jack Thomson <[email protected]>

Commit 13423063c7cb ("arm64: kvm, smccc: Introduce and use API for getting hypervisor UUID") replaced the explicit register constants with the UUID_INIT macro. However, there is an endian issue, meaning the UUID generated and used in the handshake didn't match UUID prior to the commit.

The change in UUID causes the SMCCC vendor handshake to fail with older guest kernels, meaning devices such as PTP were not available in the guest.

This patch updates the parameters to the macro to generate a UUID which matches the previous value, and re-establish backwards compatibility with older guest kernels.

Fixes 13423063c7cb ("arm64: kvm, smccc: Introduce and use API for getting hypervisor UUID")

getting hypervisor UUID")

---
 include/linux/arm-smccc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/arm-smccc.h +0 -0
index 784ebe4607a4..50b47eba7d01 100644

include/linux/arm-smccc.h line 119

Quoted 8 lines
include/linux/arm-smccc.h +1 -1
@@ -113,7 +113,7 @@
 
 /* KVM UID value: 28b46fb6-2ec5-11e9-a9ca-4b564d003a74 */
 #define ARM_SMCCC_VENDOR_HYP_UID_KVM UUID_INIT(\
-	0xb66fb428, 0xc52e, 0xe911, \
+	0x28b46fb6, 0x2ec5, 0x11e9, \
 	0xa9, 0xca, 0x4b, 0x56, \
 	0x4d, 0x00, 0x3a, 0x74)
 

Irk. This is remarkably embarrassing, and needs to be addressed ASAP, before 6.16 ships. FWIW, I've just posted a quickly whipped selftest that shows the problem[1].

Will, is there a chance you can pick this up and ferry it to Linus? If you do, please add:

Thanks,

	M.

[1] https://lore.kernel.org/r/[email protected]

Signature · 1 line
Without deviation from the norm, progress is not possible.
#2 lore raw
Quoted 47 lines · Marc Zyngier

[+Will]

Quoted 30 lines · Jack Thomson

From: Jack Thomson <[email protected]>

Commit 13423063c7cb ("arm64: kvm, smccc: Introduce and use API for getting hypervisor UUID") replaced the explicit register constants with the UUID_INIT macro. However, there is an endian issue, meaning the UUID generated and used in the handshake didn't match UUID prior to the commit.

The change in UUID causes the SMCCC vendor handshake to fail with older guest kernels, meaning devices such as PTP were not available in the guest.

This patch updates the parameters to the macro to generate a UUID which matches the previous value, and re-establish backwards compatibility with older guest kernels.

Fixes 13423063c7cb ("arm64: kvm, smccc: Introduce and use API for getting hypervisor UUID")

getting hypervisor UUID")

---
 include/linux/arm-smccc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/arm-smccc.h +0 -0
index 784ebe4607a4..50b47eba7d01 100644

include/linux/arm-smccc.h line 119

Quoted 8 lines
include/linux/arm-smccc.h +1 -1
@@ -113,7 +113,7 @@
 
 /* KVM UID value: 28b46fb6-2ec5-11e9-a9ca-4b564d003a74 */
 #define ARM_SMCCC_VENDOR_HYP_UID_KVM UUID_INIT(\
-	0xb66fb428, 0xc52e, 0xe911, \
+	0x28b46fb6, 0x2ec5, 0x11e9, \
 	0xa9, 0xca, 0x4b, 0x56, \
 	0x4d, 0x00, 0x3a, 0x74)
 

Irk. This is remarkably embarrassing, and needs to be addressed ASAP, before 6.16 ships. FWIW, I've just posted a quickly whipped selftest that shows the problem[1].

Quoted 5 lines

Will, is there a chance you can pick this up and ferry it to Linus? If you do, please add:

Sure, I'll grab it. Thanks!

Will

#3 lore raw
Quoted 1 line · Will Deacon

On Mon, Jul 21, 2025 at 04:59:36PM +0100, Marc Zyngier wrote:

[...]

Quoted 5 lines
Quoted 5 lines

Irk. This is remarkably embarrassing, and needs to be addressed ASAP, before 6.16 ships. FWIW, I've just posted a quickly whipped selftest that shows the problem[1].

Quoted 8 lines
Quoted 5 lines

Will, is there a chance you can pick this up and ferry it to Linus? If you do, please add:

Sure, I'll grab it. Thanks!

I'm sorry for that, apologies for screwing things up :( Very much appreciate the fix and the test. I clearly missed testing backward compat. with the old kernels.

Quoted 1 line

Will

Signature · 2 lines
Thank you,
Roman
Reviewed-by on v1 1/1
#4 lore raw
In reply to Jack Thomson

(I can't see this original patch in my mailbox, got only Marc's response)

Quoted 8 lines · Jack Thomson

From: Jack Thomson <[email protected]>

Commit 13423063c7cb ("arm64: kvm, smccc: Introduce and use API for getting hypervisor UUID") replaced the explicit register constants with the UUID_INIT macro. However, there is an endian issue, meaning the UUID generated and used in the handshake didn't match UUID prior to the commit.

Quoted 8 lines

The change in UUID causes the SMCCC vendor handshake to fail with older guest kernels, meaning devices such as PTP were not available in the guest.

This patch updates the parameters to the macro to generate a UUID which matches the previous value, and re-establish backwards compatibility with older guest kernels.

Nice catch. This is result of classic confusion with UUID and GUID especially coming from Microsoft who tend to use GUID more.

This also makes me wonder if the initialisation in arch/arm64/hyperv/mshyperv.c is also wrong or may be that's correct only MS guys can confirm as I couldn't find the UUID string for that.

Signature · 2 lines
Regards,
Sudeep
#5 lore raw
Quoted 20 lines · Sudeep Holla

(I can't see this original patch in my mailbox, got only Marc's response)

Quoted 8 lines · Jack Thomson

From: Jack Thomson <[email protected]>

Commit 13423063c7cb ("arm64: kvm, smccc: Introduce and use API for getting hypervisor UUID") replaced the explicit register constants with the UUID_INIT macro. However, there is an endian issue, meaning the UUID generated and used in the handshake didn't match UUID prior to the commit.

Quoted 8 lines

The change in UUID causes the SMCCC vendor handshake to fail with older guest kernels, meaning devices such as PTP were not available in the guest.

This patch updates the parameters to the macro to generate a UUID which matches the previous value, and re-establish backwards compatibility with older guest kernels.

Quoted 8 lines

Nice catch. This is result of classic confusion with UUID and GUID especially coming from Microsoft who tend to use GUID more.

This also makes me wonder if the initialisation in arch/arm64/hyperv/mshyperv.c is also wrong or may be that's correct only MS guys can confirm as I couldn't find the UUID string for that.

MUCH appreciated!! Apologies for that miss in testing of the older kernels. I'll check on our side and will fix what needs fixing.

Quoted 1 line
Signature · 2 lines
Thank you,
Roman
Applied
#6 lore raw
In reply to Jack Thomson
Quoted 11 lines · Jack Thomson

Commit 13423063c7cb ("arm64: kvm, smccc: Introduce and use API for getting hypervisor UUID") replaced the explicit register constants with the UUID_INIT macro. However, there is an endian issue, meaning the UUID generated and used in the handshake didn't match UUID prior to the commit.

The change in UUID causes the SMCCC vendor handshake to fail with older guest kernels, meaning devices such as PTP were not available in the guest.

[...]

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64: kvm, smccc: Fix vendor uuid

      https://git.kernel.org/arm64/c/ab1612211532

There was a stray "getting hypervisor UUID")" line in the original commit message after the Fixes: tag, so I dropped that bit.

Cheers,

Signature · 5 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev