Attachment 290088 Details for Bug 426324 – Patch to unconditionally try to get NUMA info

[patch] Patch to unconditionally try to get NUMA info

libvirt-0.3.3-numa-compat.patch (text/plain), 2.79 KB, created by Daniel Berrangé on 2007-12-20 01:35:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2007-12-20 01:35:05 UTC

Size: 2.79 KB

patch

obsolete

>diff -rup libvirt-0.3.3.orig/src/xend_internal.c libvirt-0.3.3.new/src/xend_internal.c
>--- libvirt-0.3.3.orig/src/xend_internal.c	2007-12-19 17:18:19.000000000 -0500
>+++ libvirt-0.3.3.new/src/xend_internal.c	2007-12-19 17:50:28.000000000 -0500
>@@ -1897,6 +1897,20 @@ sexpr_to_xend_node_info(struct sexpr *ro
>     info->sockets = sexpr_int(root, "node/sockets_per_node");
>     info->cores = sexpr_int(root, "node/cores_per_socket");
>     info->threads = sexpr_int(root, "node/threads_per_core");
>+    /* Xen 3.2.0 replaces sockets_per_node with 'nr_cpus'.
>+     * Old Xen calculated sockets_per_node using its internal
>+     * nr_cpus / (nodes*cores*threads), so fake it ourselves
>+     * in the same way
>+     */
>+    if (info->sockets == 0) {
>+        int nr_cpus = sexpr_int(root, "node/nr_cpus");
>+        info->sockets = nr_cpus / (info->nodes * info->cores * info->threads);
>+        /* Should already be fine, but for sanity make
>+         * sure we have at least one socket
>+         */
>+        if (info->sockets == 0)
>+            info->sockets = 1;
>+    }
>     return (0);
> }
> 
>@@ -1919,9 +1933,15 @@ sexpr_to_xend_topology_xml(virConnectPtr
> 
>     nodeToCpu = sexpr_node(root, "node/node_to_cpu");
>     if (nodeToCpu == NULL) {
>+        /* RHEL5 compat - this is not fatal - it simply
>+         *  means we're on a HV without the backport
>+         */
>+#if 0
>         virXendError(conn, VIR_ERR_INTERNAL_ERROR,
>                      _("failed to parse topology information"));
>         goto error;
>+#endif
>+        return 0;
>     }
> 
>     numCells = sexpr_int(root, "node/nr_nodes");
>diff -rup libvirt-0.3.3.orig/src/xen_internal.c libvirt-0.3.3.new/src/xen_internal.c
>--- libvirt-0.3.3.orig/src/xen_internal.c	2007-12-19 17:18:19.000000000 -0500
>+++ libvirt-0.3.3.new/src/xen_internal.c	2007-12-19 17:43:46.000000000 -0500
>@@ -2326,7 +2326,10 @@ xenHypervisorMakeCapabilitiesXML(virConn
>   </host>\n", -1);
>     if (r == -1) goto vir_buffer_failed;
> 
>-    if (sys_interface_version >= 4) {
>+    /* RHEL5 ABI backported numa info so relax
>+     * this check to be '3' instead of '4'
>+     */
>+    if (sys_interface_version >= 3) {
>         topology = xenDaemonNodeGetTopology(conn, xml);
>         if (topology != 0)
>             goto topology_failed;
>@@ -2943,11 +2946,18 @@ xenHypervisorNodeGetCellsFreeMemory(virC
>     /*
>      * Support only sys_interface_version >=4
>      */
>+#if 0
>+    /*
>+     * RHEL5.2 ABI backported NUMA free cell hypercall so
>+     * no need to reject this. Just try it - it may work
>+     * if on new enough RHEL kernel
>+     */
>     if (sys_interface_version < 4) {
>         virXenErrorFunc (conn, VIR_ERR_XEN_CALL, __FUNCTION__,
>                         "unsupported in sys interface < 4", 0);
>         return -1;
>     }
>+#endif
> 
>     priv = (xenUnifiedPrivatePtr) conn->privateData;
>     if (priv->handle < 0) {

Actions: View | Diff

Attachments on bug 426324: 290088