strip color bit from rb tree pointers for linuxkpi

[dougm]

Summary

The linuxkpi code accesses left/right rb tree pointers without using RB_LEFT or RB_RIGHT, so they aren't stripping off the color bit encoded there. Strip off that bit for linuxkpi.

head/sys/compat/linuxkpi/common/include/linux/rbtree.h

  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 #ifndef _VIRTIO_BLK_H
 #define _VIRTIO_BLK_H
 
+#define VTBLK_BSIZE     512
+
 /* Feature bits */
-#define VIRTIO_BLK_F_BARRIER    0x0001  /* Does host support barriers? */
-#define VIRTIO_BLK_F_SIZE_MAX   0x0002  /* Indicates maximum segment size */
-#define VIRTIO_BLK_F_SEG_MAX    0x0004  /* Indicates maximum # of segments */
-#define VIRTIO_BLK_F_GEOMETRY   0x0010  /* Legacy geometry available  */
-#define VIRTIO_BLK_F_RO         0x0020  /* Disk is read-only */
-#define VIRTIO_BLK_F_BLK_SIZE   0x0040  /* Block size of disk is available*/
-#define VIRTIO_BLK_F_SCSI       0x0080  /* Supports scsi command passthru */
-#define VIRTIO_BLK_F_WCE        0x0200  /* Writeback mode enabled after reset */
-#define VIRTIO_BLK_F_TOPOLOGY   0x0400  /* Topology information is available */
-#define VIRTIO_BLK_F_CONFIG_WCE 0x0800  /* Writeback mode available in config */
+
+#define VIRTIO_BLK_F_BARRIER            0x0001  /* Does host support barriers? */
+#define VIRTIO_BLK_F_SIZE_MAX           0x0002  /* Indicates maximum segment size */
+#define VIRTIO_BLK_F_SEG_MAX            0x0004  /* Indicates maximum # of segments */
+#define VIRTIO_BLK_F_GEOMETRY           0x0010  /* Legacy geometry available  */
+#define VIRTIO_BLK_F_RO                 0x0020  /* Disk is read-only */
+#define VIRTIO_BLK_F_BLK_SIZE           0x0040  /* Block size of disk is available*/
+#define VIRTIO_BLK_F_SCSI               0x0080  /* Supports scsi command passthru */
+#define VIRTIO_BLK_F_FLUSH              0x0200  /* Flush command supported */
+#define VIRTIO_BLK_F_WCE                0x0200  /* Legacy alias for FLUSH */
+#define VIRTIO_BLK_F_TOPOLOGY           0x0400  /* Topology information is available */
+#define VIRTIO_BLK_F_CONFIG_WCE         0x0800  /* Writeback mode available in config */
+#define VIRTIO_BLK_F_MQ                 0x1000  /* Support more than one vq */
+#define VIRTIO_BLK_F_DISCARD            0x2000  /* Trim blocks */
+#define VIRTIO_BLK_F_WRITE_ZEROES       0x4000  /* Write zeros */
 
-#define VIRTIO_BLK_ID_BYTES     20      /* ID string length */
+#define VIRTIO_BLK_ID_BYTES             20      /* ID string length */
 
 struct virtio_blk_config {
         /* The capacity (in 512-byte sectors). */
         uint64_t capacity;
         /* The maximum segment size (if VIRTIO_BLK_F_SIZE_MAX) */
         uint32_t size_max;
         /* The maximum number of segments (if VIRTIO_BLK_F_SEG_MAX) */
         uint32_t seg_max;
         /* Geometry of the device (if VIRTIO_BLK_F_GEOMETRY) */
         struct virtio_blk_geometry {
                 uint16_t cylinders;
                 uint8_t heads;
                 uint8_t sectors;
         } geometry;
 
         /* Block size of device (if VIRTIO_BLK_F_BLK_SIZE) */
         uint32_t blk_size;
 
         /* Topology of the device (if VIRTIO_BLK_F_TOPOLOGY) */
         struct virtio_blk_topology {
+                /* Exponent for physical block per logical block. */
                 uint8_t physical_block_exp;
+                /* Alignment offset in logical blocks. */
                 uint8_t alignment_offset;
+                /* Minimum I/O size without performance penalty in logical
+                 * blocks. */
                 uint16_t min_io_size;
+                /* Optimal sustained I/O size in logical blocks. */
                 uint32_t opt_io_size;
         } topology;
 
         /* Writeback mode (if VIRTIO_BLK_F_CONFIG_WCE) */
-        uint8_t writeback;
-
+        uint8_t wce;
+        uint8_t unused;
+        /* Number of vqs, only available when VIRTIO_BLK_F_MQ is set */
+        uint16_t num_queues;
+        uint32_t max_discard_sectors;
+        uint32_t max_discard_seg;
+        uint32_t discard_sector_alignment;
+        uint32_t max_write_zeroes_sectors;
+        uint32_t max_write_zeroes_seg;
+        uint8_t write_zeroes_may_unmap;
+        uint8_t unused1[3];
 } __packed;
 
 /*
  * Command types
  *
  * Usage is a bit tricky as some bits are used as flags and some are not.
  *
  * Rules:
  *   VIRTIO_BLK_T_OUT may be combined with VIRTIO_BLK_T_SCSI_CMD or
  *   VIRTIO_BLK_T_BARRIER.  VIRTIO_BLK_T_FLUSH is a command of its own
  *   and may not be combined with any of the other flags.
  */
 
 /* These two define direction. */
-#define VIRTIO_BLK_T_IN         0
-#define VIRTIO_BLK_T_OUT        1
+#define VIRTIO_BLK_T_IN                 0
+#define VIRTIO_BLK_T_OUT                1
 
 /* This bit says it's a scsi command, not an actual read or write. */
-#define VIRTIO_BLK_T_SCSI_CMD   2
+#define VIRTIO_BLK_T_SCSI_CMD           2
+#define VIRTIO_BLK_T_SCSI_CMD_OUT       3
 
 /* Cache flush command */
-#define VIRTIO_BLK_T_FLUSH      4
+#define VIRTIO_BLK_T_FLUSH              4
+#define VIRTIO_BLK_T_FLUSH_OUT          5
 
 /* Get device ID command */
-#define VIRTIO_BLK_T_GET_ID     8
+#define VIRTIO_BLK_T_GET_ID             8
 
+/* Discard command */
+#define VIRTIO_BLK_T_DISCARD            11
+
+/* Write zeros command */
+#define VIRTIO_BLK_T_WRITE_ZEROES       13
+
 /* Barrier before this op. */
-#define VIRTIO_BLK_T_BARRIER    0x80000000
+#define VIRTIO_BLK_T_BARRIER            0x80000000
 
 /* ID string length */
-#define VIRTIO_BLK_ID_BYTES     20
+#define VIRTIO_BLK_ID_BYTES             20
 
+/* Unmap this range (only valid for write zeroes command) */
+#define VIRTIO_BLK_WRITE_ZEROES_FLAG_UNMAP      0x00000001
+
 /* This is the first element of the read scatter-gather list. */
 struct virtio_blk_outhdr {
         /* VIRTIO_BLK_T* */
         uint32_t type;
         /* io priority. */
         uint32_t ioprio;
         /* Sector (ie. 512 byte offset) */
         uint64_t sector;
+};
+
+struct virtio_blk_discard_write_zeroes {
+        uint64_t sector;
+        uint32_t num_sectors;
+        struct {
+                uint32_t unmap:1;
+                uint32_t reserved:31;
+        } flags;
 };
 
 struct virtio_scsi_inhdr {
         uint32_t errors;
         uint32_t data_len;
         uint32_t sense_len;
         uint32_t residual;
 };
 
 /* And this is the final byte of the write scatter-gather list. */
 #define VIRTIO_BLK_S_OK         0
 #define VIRTIO_BLK_S_IOERR      1
 #define VIRTIO_BLK_S_UNSUPP     2
 
 #endif /* _VIRTIO_BLK_H */