File valgrind.xen-3.1-handle-IOCTL_GNTDEV_GET_OFFSET... of Package valgrind

Overview Repositories Revisions Requests Users Attributes Meta

File valgrind.xen-3.1-handle-IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR.patch of Package valgrind

From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 16 Nov 2018 17:21:00 +0100
Subject: xen-3.1: handle IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR

bz#390553
---
 coregrind/m_syswrap/syswrap-linux.c | 14 ++++++++++++++
 include/vki/vki-linux.h             |  9 +++++++++
 2 files changed, 23 insertions(+)

--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -8489,24 +8489,31 @@ PRE(sys_ioctl)
       break;
    case VKI_XEN_IOCTL_GNTDEV_UNMAP_GRANT_REF: {
       struct vki_xen_ioctl_gntdev_map_grant_ref *args =
          (struct vki_xen_ioctl_gntdev_map_grant_ref*)(Addr)(ARG3);
       PRE_MEM_READ("VKI_XEN_IOCTL_GNTDEV_map_grant_ref(index)",
                   (Addr)&args->index, sizeof(args->index));
       PRE_MEM_READ("VKI_XEN_IOCTL_GNTDEV_map_grant_ref(count)",
                   (Addr)&args->count, sizeof(args->count));
       PRE_MEM_READ("VKI_XEN_IOCTL_GNTDEV_map_grant_ref(pad)",
                   (Addr)&args->pad, sizeof(args->pad));
       }
       break;
+   case VKI_XEN_IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR: {
+      struct vki_xen_ioctl_gntdev_get_offset_for_vaddr *args =
+         (struct vki_xen_ioctl_gntdev_get_offset_for_vaddr*)(Addr)(ARG3);
+      PRE_MEM_READ("VKI_XEN_IOCTL_GNTDEV_map_grant_ref(vaddr)",
+                  (Addr)&args->vaddr, sizeof(args->vaddr));
+      }
+      break;
 #endif
 
    /* Lustre */
    case VKI_OBD_IOC_FID2PATH: {
       struct vki_getinfo_fid2path *gf =
          (struct vki_getinfo_fid2path *)(Addr)ARG3;
       PRE_MEM_READ("VKI_OBD_IOC_FID2PATH(args)", ARG3, sizeof(struct vki_getinfo_fid2path));
       PRE_FIELD_WRITE("VKI_OBD_IOC_FID2PATH(args).gf_recno", gf->gf_recno);
       PRE_FIELD_WRITE("VKI_OBD_IOC_FID2PATH(args).gf_linkno", gf->gf_linkno);
       PRE_MEM_WRITE("VKI_OBD_IOC_FID2PATH(args)", (Addr)gf->gf_path, gf->gf_pathlen);
       break;
    }
@@ -11104,24 +11111,31 @@ POST(sys_ioctl)
    case VKI_XEN_IOCTL_EVTCHN_RESET:
       /* No output */
       break;
    case VKI_XEN_IOCTL_GNTDEV_MAP_GRANT_REF: {
        struct vki_xen_ioctl_gntdev_map_grant_ref *args =
             (struct vki_xen_ioctl_gntdev_map_grant_ref*)(Addr)(ARG3);
        POST_FIELD_WRITE(args->index);
       }
       break;
    case VKI_XEN_IOCTL_GNTDEV_UNMAP_GRANT_REF:
       /* No output */
       break;
+   case VKI_XEN_IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR: {
+      struct vki_xen_ioctl_gntdev_get_offset_for_vaddr *args =
+         (struct vki_xen_ioctl_gntdev_get_offset_for_vaddr*)(Addr)(ARG3);
+      POST_FIELD_WRITE(args->count);
+      POST_FIELD_WRITE(args->offset);
+      }
+      break;
 #endif
 
    /* Lustre */
    case VKI_OBD_IOC_FID2PATH: {
        struct vki_getinfo_fid2path *args = (void *)(Addr)(ARG3);
        POST_FIELD_WRITE(args->gf_recno);
        POST_FIELD_WRITE(args->gf_linkno);
        POST_MEM_WRITE((Addr)args->gf_path, VG_(strlen)(args->gf_path)+1);
        break;
       }
 
    case VKI_LL_IOC_PATH2FID:
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -3517,24 +3517,33 @@ struct vki_xen_ioctl_gntdev_map_grant_ref {
    __vki_u64 index;
    struct vki_xen_ioctl_gntdev_grant_ref refs[1];
 };
 
 #define VKI_XEN_IOCTL_GNTDEV_UNMAP_GRANT_REF			\
 	_VKI_IOC(_VKI_IOC_NONE, 'G', 1, sizeof(struct vki_xen_ioctl_gntdev_unmap_grant_ref))
 struct vki_xen_ioctl_gntdev_unmap_grant_ref {
    __vki_u64 index;
    vki_u32 count;
    vki_u32 pad;
 };
 
+#define VKI_XEN_IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR			\
+	_VKI_IOC(_VKI_IOC_NONE, 'G', 2, sizeof(struct vki_xen_ioctl_gntdev_get_offset_for_vaddr))
+struct vki_xen_ioctl_gntdev_get_offset_for_vaddr {
+   __vki_u64 vaddr;
+   __vki_u64 offset;
+   vki_u32 count;
+   vki_u32 pad;
+};
+
 //----------------------------------------------------------------------
 // From linux-3.4.0/include/linux/fs.h
 //----------------------------------------------------------------------
 
 struct vki_file_handle {
    __vki_u32 handle_bytes;
    int handle_type;
    /* file identifier */
    unsigned char f_handle[0];
 };
 
 //----------------------------------------------------------------------

Places

File valgrind.xen-3.1-handle-IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR.patch of Package valgrind

Places