diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-05-14 09:52:25 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-05-14 09:52:25 +0100 |
commit | 830c460dc6f83acfe7e42ff4dd02304815a11b4f (patch) | |
tree | f422e1680fb0743209dd18b773125b7115051b5b /xen/arch/x86/sysctl.c | |
parent | dec6a3857f635824e02708b5c79535d971d90047 (diff) | |
download | xen-830c460dc6f83acfe7e42ff4dd02304815a11b4f.tar.gz xen-830c460dc6f83acfe7e42ff4dd02304815a11b4f.tar.bz2 xen-830c460dc6f83acfe7e42ff4dd02304815a11b4f.zip |
Fix XEN_SYSCTL_physinfo to handle NUMA info properly.
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/sysctl.c')
-rw-r--r-- | xen/arch/x86/sysctl.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 13f177a7fa..2fc125d4b9 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -40,6 +40,7 @@ long arch_do_sysctl( case XEN_SYSCTL_physinfo: { uint32_t i, max_array_ent; + XEN_GUEST_HANDLE_64(uint32) cpu_to_node_arr; xen_sysctl_physinfo_t *pi = &sysctl->u.physinfo; @@ -47,7 +48,11 @@ long arch_do_sysctl( if ( ret ) break; + max_array_ent = pi->max_cpu_id; + cpu_to_node_arr = pi->cpu_to_node; + memset(pi, 0, sizeof(*pi)); + pi->cpu_to_node = cpu_to_node_arr; pi->threads_per_core = cpus_weight(cpu_sibling_map[0]); pi->cores_per_socket = @@ -64,22 +69,26 @@ long arch_do_sysctl( if ( iommu_enabled ) pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm_directio; - max_array_ent = pi->max_cpu_id; pi->max_cpu_id = last_cpu(cpu_online_map); max_array_ent = min_t(uint32_t, max_array_ent, pi->max_cpu_id); - ret = -EFAULT; - if ( !guest_handle_is_null(pi->cpu_to_node) ) + ret = 0; + + if ( !guest_handle_is_null(cpu_to_node_arr) ) { for ( i = 0; i <= max_array_ent; i++ ) { uint32_t node = cpu_online(i) ? cpu_to_node(i) : ~0u; - if ( copy_to_guest_offset(pi->cpu_to_node, i, &node, 1) ) + if ( copy_to_guest_offset(cpu_to_node_arr, i, &node, 1) ) + { + ret = -EFAULT; break; + } } } - ret = copy_to_guest(u_sysctl, sysctl, 1) ? -EFAULT : 0; + if ( copy_to_guest(u_sysctl, sysctl, 1) ) + ret = -EFAULT; } break; |