File valgrind.xen-4.11-handle-all-versioned-sysctl-o... of Package valgrind

Overview Repositories Revisions Requests Users Attributes Meta

File valgrind.xen-4.11-handle-all-versioned-sysctl-ops.patch of Package valgrind (Revision 77ffa8e9772548053b3497682e0fdaf9)

Currently displaying revision 77ffa8e9772548053b3497682e0fdaf9 , Show latest

From: Olaf Hering <olaf@aepfle.de>
Date: Sun, 25 Nov 2018 01:36:00 +0100
Subject: xen-4.11: handle all versioned sysctl ops

When support for a new sysctl version is added, all versioned ops must be adjusted.

bz#390553
---
 coregrind/m_syswrap/syswrap-xen.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -709,29 +709,29 @@ PRE(sysctl) {
       case 0x00000009:
 	 PRE_XEN_SYSCTL_READ(getdomaininfolist_00000009, first_domain);
 	 PRE_XEN_SYSCTL_READ(getdomaininfolist_00000009, max_domains);
 	 PRE_XEN_SYSCTL_READ(getdomaininfolist_00000009, buffer);
 	 break;
       case 0x0000000a:
       case 0x0000000b:
       case 0x0000000c:
       case 0x0000000d:
       case 0x0000000e:
       case 0x0000000f:
       case 0x00000010:
+      case 0x00000011:
 	 PRE_XEN_SYSCTL_READ(getdomaininfolist_0000000a, first_domain);
 	 PRE_XEN_SYSCTL_READ(getdomaininfolist_0000000a, max_domains);
 	 PRE_XEN_SYSCTL_READ(getdomaininfolist_0000000a, buffer);
 	 break;
-      case 0x00000011:
       case 0x00000012:
      PRE_XEN_SYSCTL_READ(getdomaininfolist_00000010, first_domain);
      PRE_XEN_SYSCTL_READ(getdomaininfolist_00000010, max_domains);
      PRE_XEN_SYSCTL_READ(getdomaininfolist_00000010, buffer);
 	 break;
       default:
           VG_(dmsg)("WARNING: XEN_SYSCTL_getdomaininfolist for sysctl version "
                     "%"PRIx32" not implemented yet\n",
                     sysctl->interface_version);
           SET_STATUS_Failure(VKI_EINVAL);
           return;
       }
@@ -787,75 +787,79 @@ PRE(sysctl) {
       case 0x0000000a:
       case 0x0000000b:
          PRE_XEN_SYSCTL_READ(topologyinfo, max_cpu_index);
          PRE_XEN_SYSCTL_READ(topologyinfo, cpu_to_core);
          PRE_XEN_SYSCTL_READ(topologyinfo, cpu_to_socket);
          PRE_XEN_SYSCTL_READ(topologyinfo, cpu_to_node);
          break;
       case 0x0000000c:
       case 0x0000000d:
       case 0x0000000e:
       case 0x0000000f:
       case 0x00000010:
+      case 0x00000011:
          PRE_XEN_SYSCTL_READ(cputopoinfo_0000000c, num_cpus);
          PRE_XEN_SYSCTL_READ(cputopoinfo_0000000c, cputopo);
          break;
       }
       break;
 
    case VKI_XEN_SYSCTL_numainfo:
       switch (sysctl->interface_version)
       {
       case 0x00000008:
       case 0x00000009:
       case 0x0000000a:
       case 0x0000000b:
          PRE_XEN_SYSCTL_READ(numainfo_00000008, max_node_index);
          PRE_XEN_SYSCTL_READ(numainfo_00000008, node_to_memsize);
          PRE_XEN_SYSCTL_READ(numainfo_00000008, node_to_memfree);
          PRE_XEN_SYSCTL_READ(numainfo_00000008, node_to_node_distance);
          break;
       case 0x0000000c:
       case 0x0000000d:
       case 0x0000000e:
       case 0x0000000f:
       case 0x00000010:
+      case 0x00000011:
          PRE_XEN_SYSCTL_READ(numainfo_0000000c, num_nodes);
          PRE_XEN_SYSCTL_READ(numainfo_0000000c, meminfo);
          PRE_XEN_SYSCTL_READ(numainfo_0000000c, distance);
          break;
       }
       break;
 
    case VKI_XEN_SYSCTL_pcitopoinfo:
       switch (sysctl->interface_version)
       {
       case 0x0000000c:
       case 0x0000000d:
       case 0x0000000e:
       case 0x0000000f:
       case 0x00000010:
+      case 0x00000011:
          PRE_XEN_SYSCTL_READ(pcitopoinfo_0000000c, num_devs);
          PRE_XEN_SYSCTL_READ(pcitopoinfo_0000000c, devs);
          break;
       }
       break;
 
    case VKI_XEN_SYSCTL_get_cpu_featureset:
       switch (sysctl->interface_version)
       {
       case 0x0000000d:
       case 0x0000000e:
       case 0x0000000f:
       case 0x00000010:
+      case 0x00000011:
          PRE_XEN_SYSCTL_READ(cpu_featureset_0000000d, index);
          PRE_XEN_SYSCTL_READ(cpu_featureset_0000000d, nr_features);
          break;
       }
       break;
 
    default:
       bad_subop(tid, layout, arrghs, status, flags,
                 "__HYPERVISOR_sysctl", sysctl->cmd);
       break;
    }
 #undef PRE_XEN_SYSCTL_READ
@@ -2252,30 +2256,30 @@ POST(sysctl)
 	 POST_XEN_SYSCTL_WRITE(getdomaininfolist_00000009, num_domains);
 	 POST_MEM_WRITE((Addr)sysctl->u.getdomaininfolist_00000009.buffer.p,
 			sizeof(*sysctl->u.getdomaininfolist_00000009.buffer.p)
 			* sysctl->u.getdomaininfolist_00000009.num_domains);
 	 break;
       case 0x0000000a:
       case 0x0000000b:
       case 0x0000000c:
       case 0x0000000d:
       case 0x0000000e:
       case 0x0000000f:
       case 0x00000010:
+      case 0x00000011:
 	 POST_XEN_SYSCTL_WRITE(getdomaininfolist_0000000a, num_domains);
 	 POST_MEM_WRITE((Addr)sysctl->u.getdomaininfolist_0000000a.buffer.p,
 			sizeof(*sysctl->u.getdomaininfolist_0000000a.buffer.p)
 			* sysctl->u.getdomaininfolist_0000000a.num_domains);
 	 break;
-      case 0x00000011:
       case 0x00000012:
 	 POST_XEN_SYSCTL_WRITE(getdomaininfolist_00000010, num_domains);
 	 POST_MEM_WRITE((Addr)sysctl->u.getdomaininfolist_00000010.buffer.p,
 			sizeof(*sysctl->u.getdomaininfolist_00000010.buffer.p)
 			* sysctl->u.getdomaininfolist_00000010.num_domains);
 	 break;
       }
       break;
 
    case VKI_XEN_SYSCTL_sched_id:
        POST_XEN_SYSCTL_WRITE(sched_id, sched_id);
        break;
@@ -2366,24 +2370,25 @@ POST(sysctl)
          if (sysctl->u.topologyinfo.cpu_to_socket.p)
             POST_MEM_WRITE((Addr)sysctl->u.topologyinfo.cpu_to_socket.p,
                            sizeof(uint32_t) * sysctl->u.topologyinfo.max_cpu_index);
          if (sysctl->u.topologyinfo.cpu_to_node.p)
             POST_MEM_WRITE((Addr)sysctl->u.topologyinfo.cpu_to_node.p,
                            sizeof(uint32_t) * sysctl->u.topologyinfo.max_cpu_index);
          break;
       case 0x0000000c:
       case 0x0000000d:
       case 0x0000000e:
       case 0x0000000f:
       case 0x00000010:
+      case 0x00000011:
          POST_XEN_SYSCTL_WRITE(cputopoinfo_0000000c, num_cpus);
          if (sysctl->u.cputopoinfo_0000000c.cputopo.p)
             POST_MEM_WRITE((Addr)sysctl->u.cputopoinfo_0000000c.cputopo.p,
                            sizeof(vki_xen_sysctl_cputopo_0000000c_t) * sysctl->u.cputopoinfo_0000000c.num_cpus);
          break;
       }
       break;
 
    case VKI_XEN_SYSCTL_numainfo:
       switch (sysctl->interface_version)
       {
       case 0x00000008:
@@ -2395,56 +2400,59 @@ POST(sysctl)
                         sizeof(uint64_t) * sysctl->u.numainfo_00000008.max_node_index);
          POST_MEM_WRITE((Addr)sysctl->u.numainfo_00000008.node_to_memfree.p,
                         sizeof(uint64_t) * sysctl->u.numainfo_00000008.max_node_index);
          POST_MEM_WRITE((Addr)sysctl->u.numainfo_00000008.node_to_node_distance.p,
                         sizeof(uint32_t) *
                         (sysctl->u.numainfo_00000008.max_node_index * sysctl->u.numainfo_00000008.max_node_index));
          break;
       case 0x0000000c:
       case 0x0000000d:
       case 0x0000000e:
       case 0x0000000f:
       case 0x00000010:
+      case 0x00000011:
          POST_XEN_SYSCTL_WRITE(numainfo_0000000c, num_nodes);
          POST_MEM_WRITE((Addr)sysctl->u.numainfo_0000000c.meminfo.p,
                         sizeof(uint64_t) * sysctl->u.numainfo_0000000c.num_nodes);
          POST_MEM_WRITE((Addr)sysctl->u.numainfo_0000000c.distance.p,
                         sizeof(uint32_t) *
 			(sysctl->u.numainfo_0000000c.num_nodes * sysctl->u.numainfo_0000000c.num_nodes));
          break;
       }
       break;
 
    case VKI_XEN_SYSCTL_pcitopoinfo:
       switch (sysctl->interface_version)
       {
       case 0x0000000c:
       case 0x0000000d:
       case 0x0000000e:
       case 0x0000000f:
       case 0x00000010:
+      case 0x00000011:
          POST_XEN_SYSCTL_WRITE(pcitopoinfo_0000000c, num_devs);
          POST_MEM_WRITE((Addr)sysctl->u.pcitopoinfo_0000000c.nodes.p,
                         sizeof(uint32_t) *  sysctl->u.pcitopoinfo_0000000c.num_devs);
          break;
       }
       break;
 
    case VKI_XEN_SYSCTL_get_cpu_featureset:
       switch (sysctl->interface_version)
       {
       case 0x0000000d:
       case 0x0000000e:
       case 0x0000000f:
       case 0x00000010:
+      case 0x00000011:
          POST_XEN_SYSCTL_WRITE(cpu_featureset_0000000d, nr_features);
          POST_MEM_WRITE((Addr)sysctl->u.cpu_featureset_0000000d.features.p,
                         sizeof(uint32_t) *  sysctl->u.cpu_featureset_0000000d.nr_features);
          break;
       }
       break;
 
    /* No outputs */
    case VKI_XEN_SYSCTL_debug_keys:
        break;
    }
 #undef POST_XEN_SYSCTL_WRITE

Places

File valgrind.xen-4.11-handle-all-versioned-sysctl-ops.patch of Package valgrind (Revision 77ffa8e9772548053b3497682e0fdaf9)

Places