[PATCH 0/6] Valgrind: More hypercalls

[PATCH 0/6] Valgrind: More hypercalls

[Andrew Cooper]

With these patches, valgrind can now instrument xen-4.4 based toolstacks, and
qemu-traditional looking after an HVM domain.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>

[PATCH 1/6] Fix P{RE,OST}_XEN_HVMOP_{READ,WRITE}

[Andrew Cooper]

_type should be a type, not a string

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
---
 coregrind/m_syswrap/syswrap-xen.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/coregrind/m_syswrap/syswrap-xen.c b/coregrind/m_syswrap/syswrap-xen.c
index 02205da..9b2c71d 100644
--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -784,7 +784,7 @@ PRE(hvm_op)
                 (Addr)&((_type*)arg)->_field,           \
                 sizeof(((_type*)arg)->_field))
 #define PRE_XEN_HVMOP_READ(_hvm_op, _field)                             \
-   __PRE_XEN_HVMOP_READ(_hvm_op, "xen_hvm_" # _hvm_op "_t", _field)
+   __PRE_XEN_HVMOP_READ(_hvm_op, vki_xen_hvm_ ## _hvm_op ## _t, _field)
 
    switch (op) {
    case VKI_XEN_HVMOP_set_param:
@@ -1324,7 +1324,7 @@ POST(hvm_op)
       POST_MEM_WRITE((Addr)&((_type*)arg)->_field,      \
                      sizeof(((_type*)arg)->_field))
 #define POST_XEN_HVMOP_WRITE(_hvm_op, _field) \
-      __PRE_XEN_HVMOP_READ(_hvm_op, "xen_hvm_" # _hvm_op "_t", _field)
+      __PRE_XEN_HVMOP_READ(_hvm_op, vki_xen_hvm_ ## _hvm_op ## _t, _field)
 
    switch (op) {
    case VKI_XEN_HVMOP_set_param:
-- 
1.7.10.4

[PATCH 2/6] syswrap: XEN_DOMCTL_settimeoffset

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
---
 coregrind/m_syswrap/syswrap-xen.c |    4 ++++
 include/vki/vki-xen-domctl.h      |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/coregrind/m_syswrap/syswrap-xen.c b/coregrind/m_syswrap/syswrap-xen.c
index 9b2c71d..1940665 100644
--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -637,6 +637,10 @@ PRE(domctl)
       PRE_XEN_DOMCTL_READ(hypercall_init, gmfn);
       break;
 
+   case VKI_XEN_DOMCTL_settimeoffset:
+       PRE_XEN_DOMCTL_READ(settimeoffset, time_offset_seconds);
+       break;
+
    case VKI_XEN_DOMCTL_getvcpuinfo:
       PRE_XEN_DOMCTL_READ(getvcpuinfo, vcpu);
       break;
diff --git a/include/vki/vki-xen-domctl.h b/include/vki/vki-xen-domctl.h
index 2d07f41..df97bb3 100644
--- a/include/vki/vki-xen-domctl.h
+++ b/include/vki/vki-xen-domctl.h
@@ -264,6 +264,10 @@ struct vki_xen_domctl_hypercall_init {
     vki_xen_uint64_aligned_t  gmfn;           /* GMFN to be initialised */
 };
 
+struct vki_xen_domctl_settimeoffset {
+    vki_int32_t time_offset_seconds;
+};
+
 struct vki_xen_domctl_cpuid {
   vki_uint32_t input[2];
   vki_uint32_t eax;
@@ -337,7 +341,7 @@ struct vki_xen_domctl {
         //struct vki_xen_domctl_ioport_permission ioport_permission;
         struct vki_xen_domctl_hypercall_init    hypercall_init;
         //struct vki_xen_domctl_arch_setup        arch_setup;
-        //struct vki_xen_domctl_settimeoffset     settimeoffset;
+        struct vki_xen_domctl_settimeoffset     settimeoffset;
         //struct vki_xen_domctl_disable_migrate   disable_migrate;
         struct vki_xen_domctl_tsc_info          tsc_info;
         //struct vki_xen_domctl_real_mode_area    real_mode_area;
-- 
1.7.10.4

[PATCH 3/6] syswrap: XEN_DOMCTL_cacheflush

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
---
 coregrind/m_syswrap/syswrap-xen.c |    6 ++++++
 include/vki/vki-xen-domctl.h      |    7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/coregrind/m_syswrap/syswrap-xen.c b/coregrind/m_syswrap/syswrap-xen.c
index 1940665..a53fbf2 100644
--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -767,6 +767,11 @@ PRE(domctl)
       PRE_XEN_DOMCTL_READ(set_max_evtchn, max_port);
       break;
 
+   case VKI_XEN_DOMCTL_cacheflush:
+      PRE_XEN_DOMCTL_READ(cacheflush, start_pfn);
+      PRE_XEN_DOMCTL_READ(cacheflush, nr_pfns);
+      break;
+
    default:
       bad_subop(tid, layout, arrghs, status, flags,
                 "__HYPERVISOR_domctl", domctl->cmd);
@@ -1158,6 +1163,7 @@ POST(domctl){
    case VKI_XEN_DOMCTL_unpausedomain:
    case VKI_XEN_DOMCTL_sethvmcontext:
    case VKI_XEN_DOMCTL_set_max_evtchn:
+   case VKI_XEN_DOMCTL_cacheflush:
       /* No output fields */
       break;
 
diff --git a/include/vki/vki-xen-domctl.h b/include/vki/vki-xen-domctl.h
index df97bb3..2f55ce0 100644
--- a/include/vki/vki-xen-domctl.h
+++ b/include/vki/vki-xen-domctl.h
@@ -85,6 +85,7 @@
 #define VKI_XEN_DOMCTL_setnodeaffinity               68
 #define VKI_XEN_DOMCTL_getnodeaffinity               69
 #define VKI_XEN_DOMCTL_set_max_evtchn                70
+#define VKI_XEN_DOMCTL_cacheflush                    71
 #define VKI_XEN_DOMCTL_gdbsx_guestmemio            1000
 #define VKI_XEN_DOMCTL_gdbsx_pausevcpu             1001
 #define VKI_XEN_DOMCTL_gdbsx_unpausevcpu           1002
@@ -313,6 +314,11 @@ struct vki_xen_domctl_set_max_evtchn {
     vki_uint32_t max_port;
 };
 
+struct vki_xen_domctl_cacheflush {
+    /* IN: page range to flush. */
+    vki_xen_pfn_t start_pfn, nr_pfns;
+};
+
 struct vki_xen_domctl {
     vki_uint32_t cmd;
     vki_uint32_t interface_version; /* XEN_DOMCTL_INTERFACE_VERSION */
@@ -371,6 +377,7 @@ struct vki_xen_domctl {
         struct vki_xen_domctl_set_max_evtchn    set_max_evtchn;
         //struct vki_xen_domctl_gdbsx_memio       gdbsx_guest_memio;
         //struct vki_xen_domctl_set_broken_page_p2m set_broken_page_p2m;
+        struct vki_xen_domctl_cacheflush        cacheflush;
         //struct vki_xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu;
         //struct vki_xen_domctl_gdbsx_domstatus   gdbsx_domstatus;
         vki_uint8_t                         pad[128];
-- 
1.7.10.4

[PATCH 4/6] syswrap: XEN_HVMOP_set_isa_irq_level

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
---
 coregrind/m_syswrap/syswrap-xen.c |    7 +++++++
 include/vki/vki-xen-hvm.h         |    8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/coregrind/m_syswrap/syswrap-xen.c b/coregrind/m_syswrap/syswrap-xen.c
index a53fbf2..cd4f6f5 100644
--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -807,6 +807,12 @@ PRE(hvm_op)
       __PRE_XEN_HVMOP_READ(get_param, struct vki_xen_hvm_param, index);
       break;
 
+   case VKI_XEN_HVMOP_set_isa_irq_level:
+       PRE_XEN_HVMOP_READ(set_isa_irq_level, domid);
+       PRE_XEN_HVMOP_READ(set_isa_irq_level, isa_irq);
+       PRE_XEN_HVMOP_READ(set_isa_irq_level, level);
+       break;
+
    default:
       bad_subop(tid, layout, arrghs, status, flags,
                 "__HYPERVISOR_hvm_op", op);
@@ -1338,6 +1344,7 @@ POST(hvm_op)
 
    switch (op) {
    case VKI_XEN_HVMOP_set_param:
+   case VKI_XEN_HVMOP_set_isa_irq_level:
       /* No output paramters */
       break;
 
diff --git a/include/vki/vki-xen-hvm.h b/include/vki/vki-xen-hvm.h
index a64d4f3..be7f236 100644
--- a/include/vki/vki-xen-hvm.h
+++ b/include/vki/vki-xen-hvm.h
@@ -10,6 +10,14 @@ struct vki_xen_hvm_param {
     vki_uint64_t value;    /* IN/OUT */
 };
 
+#define VKI_XEN_HVMOP_set_isa_irq_level 3
+struct vki_xen_hvm_set_isa_irq_level {
+    vki_xen_domid_t  domid;
+    vki_uint8_t  isa_irq;
+    vki_uint8_t  level;
+};
+typedef struct vki_xen_hvm_set_isa_irq_level vki_xen_hvm_set_isa_irq_level_t;
+
 #endif // __VKI_XEN_HVM_H
 
 /*--------------------------------------------------------------------*/
-- 
1.7.10.4

[PATCH 5/6] syswrap: XEN_HVMOP_set_pci_link_route

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
---
 coregrind/m_syswrap/syswrap-xen.c |    7 +++++++
 include/vki/vki-xen-hvm.h         |    8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/coregrind/m_syswrap/syswrap-xen.c b/coregrind/m_syswrap/syswrap-xen.c
index cd4f6f5..07329ba 100644
--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -813,6 +813,12 @@ PRE(hvm_op)
        PRE_XEN_HVMOP_READ(set_isa_irq_level, level);
        break;
 
+   case VKI_XEN_HVMOP_set_pci_link_route:
+       PRE_XEN_HVMOP_READ(set_pci_link_route, domid);
+       PRE_XEN_HVMOP_READ(set_pci_link_route, link);
+       PRE_XEN_HVMOP_READ(set_pci_link_route, isa_irq);
+       break;
+
    default:
       bad_subop(tid, layout, arrghs, status, flags,
                 "__HYPERVISOR_hvm_op", op);
@@ -1345,6 +1351,7 @@ POST(hvm_op)
    switch (op) {
    case VKI_XEN_HVMOP_set_param:
    case VKI_XEN_HVMOP_set_isa_irq_level:
+   case VKI_XEN_HVMOP_set_pci_link_route:
       /* No output paramters */
       break;
 
diff --git a/include/vki/vki-xen-hvm.h b/include/vki/vki-xen-hvm.h
index be7f236..8659eb8 100644
--- a/include/vki/vki-xen-hvm.h
+++ b/include/vki/vki-xen-hvm.h
@@ -18,6 +18,14 @@ struct vki_xen_hvm_set_isa_irq_level {
 };
 typedef struct vki_xen_hvm_set_isa_irq_level vki_xen_hvm_set_isa_irq_level_t;
 
+#define VKI_XEN_HVMOP_set_pci_link_route 4
+struct vki_xen_hvm_set_pci_link_route {
+    vki_xen_domid_t  domid;
+    vki_uint8_t  link;
+    vki_uint8_t  isa_irq;
+};
+typedef struct vki_xen_hvm_set_pci_link_route vki_xen_hvm_set_pci_link_route_t;
+
 #endif // __VKI_XEN_HVM_H
 
 /*--------------------------------------------------------------------*/
-- 
1.7.10.4

[PATCH 6/6] syswrap: XEN_HVMOP_set_mem_type

[Andrew Cooper]

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
---
 coregrind/m_syswrap/syswrap-xen.c |    8 ++++++++
 include/vki/vki-xen-hvm.h         |    9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/coregrind/m_syswrap/syswrap-xen.c b/coregrind/m_syswrap/syswrap-xen.c
index 07329ba..be8fe86 100644
--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -819,6 +819,13 @@ PRE(hvm_op)
        PRE_XEN_HVMOP_READ(set_pci_link_route, isa_irq);
        break;
 
+   case VKI_XEN_HVMOP_set_mem_type:
+       PRE_XEN_HVMOP_READ(set_mem_type, domid);
+       PRE_XEN_HVMOP_READ(set_mem_type, hvmmem_type);
+       PRE_XEN_HVMOP_READ(set_mem_type, nr);
+       PRE_XEN_HVMOP_READ(set_mem_type, first_pfn);
+       break;
+
    default:
       bad_subop(tid, layout, arrghs, status, flags,
                 "__HYPERVISOR_hvm_op", op);
@@ -1352,6 +1359,7 @@ POST(hvm_op)
    case VKI_XEN_HVMOP_set_param:
    case VKI_XEN_HVMOP_set_isa_irq_level:
    case VKI_XEN_HVMOP_set_pci_link_route:
+   case VKI_XEN_HVMOP_set_mem_type:
       /* No output paramters */
       break;
 
diff --git a/include/vki/vki-xen-hvm.h b/include/vki/vki-xen-hvm.h
index 8659eb8..19ccbeb 100644
--- a/include/vki/vki-xen-hvm.h
+++ b/include/vki/vki-xen-hvm.h
@@ -26,6 +26,15 @@ struct vki_xen_hvm_set_pci_link_route {
 };
 typedef struct vki_xen_hvm_set_pci_link_route vki_xen_hvm_set_pci_link_route_t;
 
+#define VKI_XEN_HVMOP_set_mem_type 8
+struct vki_xen_hvm_set_mem_type {
+    vki_xen_domid_t  domid;
+    vki_uint16_t hvmmem_type;
+    vki_uint32_t nr;
+    vki_xen_uint64_aligned_t first_pfn;
+};
+typedef struct vki_xen_hvm_set_mem_type vki_xen_hvm_set_mem_type_t;
+
 #endif // __VKI_XEN_HVM_H
 
 /*--------------------------------------------------------------------*/
-- 
1.7.10.4

Re: [PATCH 0/6] Valgrind: More hypercalls

[Ian Campbell]

On Mon, 2014-03-03 at 14:53 +0000, Andrew Cooper wrote:
> With these patches, valgrind can now instrument xen-4.4 based toolstacks, and
> qemu-traditional looking after an HVM domain.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>

These look good to me. Valgrind trunk doesn't build for me right now but
once it does I'll build test and attach to an upstream bugzilla etc.

Ian.

[PATCH 7/7] syswrap: XEN_DOMCTL_resumedomain

[Andrew Cooper]

No input or output parameters

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
 coregrind/m_syswrap/syswrap-xen.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/coregrind/m_syswrap/syswrap-xen.c b/coregrind/m_syswrap/syswrap-xen.c
index be8fe86..ae7ff49 100644
--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -592,6 +592,7 @@ PRE(domctl)
    case VKI_XEN_DOMCTL_gettscinfo:
    case VKI_XEN_DOMCTL_getdomaininfo:
    case VKI_XEN_DOMCTL_unpausedomain:
+   case VKI_XEN_DOMCTL_resumedomain:
       /* No input fields. */
       break;
 
@@ -1183,6 +1184,7 @@ POST(domctl){
    case VKI_XEN_DOMCTL_sethvmcontext:
    case VKI_XEN_DOMCTL_set_max_evtchn:
    case VKI_XEN_DOMCTL_cacheflush:
+   case VKI_XEN_DOMCTL_resumedomain:
       /* No output fields */
       break;
 
-- 
1.7.10.4

Re: [PATCH 0/6] Valgrind: More hypercalls

[Ian Campbell]

On Mon, 2014-03-03 at 14:53 +0000, Andrew Cooper wrote:
> With these patches, valgrind can now instrument xen-4.4 based toolstacks, and
> qemu-traditional looking after an HVM domain.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>

Thanks. I have attached 6+1 patches to
https://bugs.kde.org/show_bug.cgi?id=332276

Ian.

Re: [PATCH 0/6] Valgrind: More hypercalls

[Ian Campbell]

On Tue, 2014-03-18 at 10:53 +0000, Ian Campbell wrote:
> On Mon, 2014-03-03 at 14:53 +0000, Andrew Cooper wrote:
> > With these patches, valgrind can now instrument xen-4.4 based toolstacks, and
> > qemu-traditional looking after an HVM domain.
> > 
> > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> > CC: Ian Campbell <Ian.Campbell@citrix.com>
> 
> Thanks. I have attached 6+1 patches to
> https://bugs.kde.org/show_bug.cgi?id=332276

Patches have been applied to valgrind trunk.

Thanks,
Ian.