Bug 410556 - add support for BLKIO{MIN,OPT} and BLKALIGNOFF ioctls.

Patch from Nick Black <dankamongmen@gmail.com>.

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index fd958e4884264ba3469895911480a6d5142362ed..20132f5ac88481b4cfc6e38683dfb24365768006 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -7282,6 +7282,15 @@ PRE(sys_ioctl)
    case VKI_BLKPBSZGET:
       PRE_MEM_WRITE( "ioctl(BLKPBSZGET)", ARG3, sizeof(int));
       break;
+   case VKI_BLKIOMIN:
+      PRE_MEM_WRITE( "ioctl(BLKIOMIN)", ARG3, sizeof(vki_uint));
+      break;
+   case VKI_BLKIOOPT:
+      PRE_MEM_WRITE( "ioctl(BLKIOOPT)", ARG3, sizeof(vki_uint));
+      break;
+   case VKI_BLKALIGNOFF:
+      PRE_MEM_WRITE( "ioctl(BLKALIGNOFF)", ARG3, sizeof(int));
+      break;
    case VKI_BLKDISCARDZEROES:
       PRE_MEM_WRITE( "ioctl(BLKDISCARDZEROES)", ARG3, sizeof(vki_uint));
       break;
@@ -10212,6 +10221,15 @@ POST(sys_ioctl)
    case VKI_BLKPBSZGET:
       POST_MEM_WRITE(ARG3, sizeof(int));
       break;
+   case VKI_BLKIOMIN:
+      POST_MEM_WRITE(ARG3, sizeof(vki_uint));
+      break;
+   case VKI_BLKIOOPT:
+      POST_MEM_WRITE(ARG3, sizeof(vki_uint));
+      break;
+   case VKI_BLKALIGNOFF:
+      POST_MEM_WRITE(ARG3, sizeof(int));
+      break;
    case VKI_BLKDISCARDZEROES:
       POST_MEM_WRITE(ARG3, sizeof(vki_uint));
       break;

diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h
index 99127eb43a1f65e0ffc9aee0578ff8dcdea2e215..dd9b20fa2fa45db7def635de03d96377dd6227a5 100644 (file)
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -1825,7 +1825,7 @@ struct vki_ppdev_frob_struct {
 #define VKI_PPSETFLAGS _VKI_IOW(VKI_PP_IOCTL, 0x9b, int)
 
 //----------------------------------------------------------------------
-// From linux-3.16/include/uapi/linux/fs.h
+// From linux-5.2.5/include/uapi/linux/fs.h
 //----------------------------------------------------------------------
 
 #define VKI_BLKROSET   _VKI_IO(0x12,93)        /* set device read-only (0 = read-write) */
@@ -1844,6 +1844,9 @@ struct vki_ppdev_frob_struct {
 #define VKI_BLKBSZSET  _VKI_IOW(0x12,113,vki_size_t)
 #define VKI_BLKGETSIZE64 _VKI_IOR(0x12,114,vki_size_t) /* return device size in bytes (u64 *arg) */
 #define VKI_BLKDISCARD _VKI_IO(0x12,119)
+#define VKI_BLKIOMIN _VKI_IO(0x12,120)
+#define VKI_BLKIOOPT _VKI_IO(0x12,121)
+#define VKI_BLKALIGNOFF _VKI_IO(0x12,122)
 #define VKI_BLKPBSZGET _VKI_IO(0x12,123)
 #define VKI_BLKDISCARDZEROES _VKI_IO(0x12,124)
 #define VKI_BLKZEROOUT _VKI_IO(0x12,127)