x86: Avoid divide by 0 in amd_smn_init()
Subsystems (3)
PATCH 1/1 x86: Avoid divide by 0 in amd_smn_init()
Xen synthesizes the CPU topology, so the num_nodes and num_roots values may be surprising for amd_smn_init(). Specifically:
roots_per_node = num_roots / num_nodes;
may results in roots_per_node == 0 which leads to divide by zero in
count % roots_per_node
As an example, I have a system with a Xen PVH dom0 that reports:
Found 1 AMD root devices
Found 2 AMD nodes
Ensure roots_per_node is at least 1 to avoid the divide by zero errors. num_nodes are allocated for amd_roots, so roots_per_node = 1 will populate all the entries.
Also add a pr_debug() for the number of nodes.
---
This is an alternative to
https://lore.kernel.org/xen-devel/[email protected]/
but it leaves smn available for dom0.
--- arch/x86/kernel/amd_node.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kernel/amd_node.c +3 -0
@@ -282,11 +282,14 @@ static int __init amd_smn_init(void)return -ENODEV ; num_nodes =amd_num_nodes (); +pr_debug ("Found %d AMD nodes\n" , num_nodes); amd_roots =kzalloc_objs (*amd_roots, num_nodes);if (!amd_roots)return -ENOMEM ; roots_per_node = num_roots / num_nodes; +if (roots_per_node ==0 ) + roots_per_node =1 ; count =0 ; node =0 ;
Signature · 1 line
2.34.1
Borislav Petkov
maintainerQuoted 17 lines · Jason Andryuk
Xen synthesizes the CPU topology, so the
num_nodesandnum_rootsvalues may be surprising foramd_smn_init(). Specifically:roots_per_node = num_roots / num_nodes;may results in
roots_per_node== 0 which leads to divide by zero incount %
roots_per_nodeAs an example, I have a system with a Xen PVH dom0 that reports:
Found 1 AMD root devices
Found 2 AMD nodesEnsure
roots_per_nodeis at least 1 to avoid the divide by zero errors.num_nodesare allocated foramd_roots, soroots_per_node= 1 will populate all the entries.
Quoted 8 lines
Also add a
pr_debug()for the number of nodes.Signed-off-by Jason Andryuk <[email protected]>---
This is an alternative to
https://lore.kernel.org/xen-devel/[email protected]/
but it leaves smn available for dom0.
Does this alternative work too?
https://lore.kernel.org/r/20260605230949.GBaiNXPZ2ztjVL7DBg@fat_crate.local
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 27 lines · Borislav Petkov
Quoted 17 lines · Jason Andryuk
Xen synthesizes the CPU topology, so the
num_nodesandnum_rootsvalues may be surprising foramd_smn_init(). Specifically:roots_per_node = num_roots / num_nodes;may results in
roots_per_node== 0 which leads to divide by zero incount %
roots_per_nodeAs an example, I have a system with a Xen PVH dom0 that reports:
Found 1 AMD root devices
Found 2 AMD nodesEnsure
roots_per_nodeis at least 1 to avoid the divide by zero errors.num_nodesare allocated foramd_roots, soroots_per_node= 1 will populate all the entries.Quoted 8 lines
Also add a
pr_debug()for the number of nodes.Signed-off-by Jason Andryuk <[email protected]>---
This is an alternative to
https://lore.kernel.org/xen-devel/[email protected]/
but it leaves smn available for dom0.
Quoted 3 lines
Does this alternative work too?
https://lore.kernel.org/r/20260605230949.GBaiNXPZ2ztjVL7DBg@fat_crate.local
It boots as dom0, but smn is disabled.
Yours:
$ journalctl -b | grep -e amd-pmf -e ypervisor Hypervisor detected: Xen HVM amd-pmf AMDI0107:00: error -EINVAL: error in reading from 0x13b102e8 amd-pmf AMDI0107:00: probe with driver amd-pmf failed with error -22
Mine:
$ journalctl -b -2 | grep -e amd-pmf -e ypervisor Hypervisor detected: Xen HVM amd-pmf AMDI0107:00: No Smart PC policy present amd-pmf AMDI0107:00: registered PMF device successfully
amd-pmc also fails with yours.
dom0 is the privileged hardware domain and sees the physical PCI devices. get_next_root() is looking for AMD or Hygon vendor ids, and dom0 will find those. A regular domain (domU) would see QEMU's emulated pci host bridges, which will be Intel.
I have wip s0ix support with Xen where dom0 issues the amd-pmc calls to enter s0ix. I'm not sure of all the uses of SMN, but with Xen dom0/hardware domain running most drivers, I think it should be available.
Regards,
Jason
Borislav Petkov
maintainer+ Andy
Quoted 3 lines · Jason Andryuk
I have wip s0ix support with Xen where dom0 issues the amd-pmc calls to enter s0ix. I'm not sure of all the uses of SMN, but with Xen dom0/hardware domain running most drivers, I think it should be available.
Well, how should we make it available if dom0 doesn't really allow us to enumerate PCI roots and thus count AMD nodes?
Andy, see upthread.
What would you suggest we do here on dom0? We're trying to enumerate AMD nodes but dom0 is doing something special wrt topology and PCI roots - see get_next_root() in amd_node.c.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 9 lines · Borislav Petkov
+ Andy
Quoted 3 lines · Jason Andryuk
I have wip s0ix support with Xen where dom0 issues the amd-pmc calls to enter s0ix. I'm not sure of all the uses of SMN, but with Xen dom0/hardware domain running most drivers, I think it should be available.
Well, how should we make it available if dom0 doesn't really allow us to enumerate PCI roots and thus count AMD nodes?
dom0 enumerates the physical PCI roots. It's just the dom0 vCPUs and topology are synthetic.
Quoted 8 lines
Andy, see upthread.
What would you suggest we do here on dom0? We're trying to enumerate AMD nodes but dom0 is doing something special wrt topology and PCI roots - see
get_next_root()inamd_node.c.Thx.
I think this is the issue:
The "root" device search was introduced to support SMN access for Zen systems. This device represents a PCIe root complex. It is not the same as the "CPU/node" devices found at slots 0x18-0x1F.
We don't want dom0 to access the "CPU/node" devices. It's the "root" device SMN access I am trying to retain. Many amd_smn_read/write calls have hardcoded node 0, like for amd-pmc.
Regards,
Jason
Borislav Petkov
maintainerQuoted 5 lines · Jason Andryuk
I think this is the issue:
The "root" device search was introduced to support SMN access for Zen systems. This device represents a PCIe root complex. It is not the same as the "CPU/node" devices found at slots 0x18-0x1F.
What is that? AI output?
Quoted 2 lines
We don't want dom0 to access the "CPU/node" devices. It's the "root" device SMN access I am trying to retain.
I know what you're trying to do - you want to use SMN accesses on dom0. And I'm trying to figure out a stable detection method on Xen which is future proof.
Quoted 1 line
Many amd_smn_read/write calls have hardcoded node 0, like for amd-pmc.
Maybe.
Whatever it is, it needs to be a long-term solution and properly vetted by Xen folks so that we don't do crazy hacks for Xen's sake everytime.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 8 lines · Borislav Petkov
Quoted 5 lines · Jason Andryuk
I think this is the issue:
The "root" device search was introduced to support SMN access for Zen systems. This device represents a PCIe root complex. It is not the same as the "CPU/node" devices found at slots 0x18-0x1F.
What is that? AI output?
It's from the commit message of 40a5f6ffdfc8f8ed0d8c535dfa3733b31c66a88c
Quoted 7 lines
Quoted 2 lines
We don't want dom0 to access the "CPU/node" devices. It's the "root" device SMN access I am trying to retain.
I know what you're trying to do - you want to use SMN accesses on dom0. And I'm trying to figure out a stable detection method on Xen which is future proof.
Quoted 6 lines
Quoted 1 line
Many amd_smn_read/write calls have hardcoded node 0, like for amd-pmc.
Maybe.
Whatever it is, it needs to be a long-term solution and properly vetted by Xen folks so that we don't do crazy hacks for Xen's sake everytime.
Sure.
I think Ingo's suggestion to re-add the check will at least get systems booting again. Then when Xen SMN accesses is sorted out, that can be changed as necessary.
Regards,
Jason
Borislav Petkov
maintainerQuoted 3 lines · Jason Andryuk
I think Ingo's suggestion to re-add the check will at least get systems booting again. Then when Xen SMN accesses is sorted out, that can be changed as necessary.
You could do something like the totally untested thing (I'm hoping dom0 sets X86_FEATURE_XENPV):
...
roots_per_node = num_roots / num_nodes;
if (!roots_per_node) {
if (!cpu_feature_enabled(X86_FEATURE_XENPV))
pr_err(FW_BUG "Error detecting roots per node.");
roots_per_node = 1;
}until we sort it out and as a stable fix perhaps...
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 13 lines · Jason Andryuk
Xen synthesizes the CPU topology, so the
num_nodesandnum_rootsvalues may be surprising foramd_smn_init(). Specifically:roots_per_node = num_roots / num_nodes;may results in
roots_per_node== 0 which leads to divide by zero incount %
roots_per_nodeAs an example, I have a system with a Xen PVH dom0 that reports:
Found 1 AMD root devices
Found 2 AMD nodes
Quoted 5 lines
Ensure
roots_per_nodeis at least 1 to avoid the divide by zero errors.num_nodesare allocated foramd_roots, soroots_per_node= 1 will populate all the entries.Also add a
pr_debug()for the number of nodes.
So arguably this Xen PHV dom0 PCI configuration is bogus, because it violates the roots % nodes rule, right?
Why should we not go back to something similar to the pre-40a5f6ffdfc8 state of things, which warned about such bogus configs in the syslog, so that it could be seen and fixed:
- /*
- * There should be _exactly_ N roots for each DF/SMN - * interface. - */
- if (!roots_per_misc || (root_count % roots_per_misc)) {
- pr_info("Unsupported AMD DF/PCI configuration found\n");
- return -ENODEV;
- }
Instead of your patch which just silently works around the borkage and issues a pr_debug() that nobody reads?
AFAICS the following fix:
0a4b61d9c2e4 ("x86/amd_node: Fix AMD root device caching")
Never restored that sanity check & warning about such firmware bogosity.
Thanks,
Ingo
Borislav Petkov
maintainerQuoted 1 line · Ingo Molnar
Why should we not go back to something similar to the pre-40a5f6ffdfc8
Because this code obviously cannot run in a guest. See my other reply.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette