1 files changed, 27 insertions, 17 deletions

diff --git a/include/uapi/linux/target_core_user.h b/include/uapi/linux/target_core_user.h
index b483d1909d3e..b67f99d3c520 100644
--- a/include/uapi/linux/target_core_user.h
+++ b/include/uapi/linux/target_core_user.h
@@ -6,7 +6,7 @@
 #include <linux/types.h>
 #include <linux/uio.h>
 
-#define TCMU_VERSION "1.0"
+#define TCMU_VERSION "2.0"
 
 /*
  * Ring Design
@@ -39,9 +39,13 @@
  * should process the next packet the same way, and so on.
  */
 
-#define TCMU_MAILBOX_VERSION 1
+#define TCMU_MAILBOX_VERSION 2
 #define ALIGN_SIZE 64 /* Should be enough for most CPUs */
 
+/* See https://gcc.gnu.org/onlinedocs/cpp/Stringification.html */
+#define xstr(s) str(s)
+#define str(s) #s
+
 struct tcmu_mailbox {
         __u16 version;
         __u16 flags;
@@ -64,31 +68,36 @@ enum tcmu_opcode {
  * Only a few opcodes, and length is 8-byte aligned, so use low bits for opcode.
  */
 struct tcmu_cmd_entry_hdr {
-                __u32 len_op;
+        __u32 len_op;
+        __u16 cmd_id;
+        __u8 kflags;
+#define TCMU_UFLAG_UNKNOWN_OP 0x1
+        __u8 uflags;
+
 } __packed;
 
 #define TCMU_OP_MASK 0x7
 
-static inline enum tcmu_opcode tcmu_hdr_get_op(struct tcmu_cmd_entry_hdr *hdr)
+static inline enum tcmu_opcode tcmu_hdr_get_op(__u32 len_op)
 {
-        return hdr->len_op & TCMU_OP_MASK;
+        return len_op & TCMU_OP_MASK;
 }
 
-static inline void tcmu_hdr_set_op(struct tcmu_cmd_entry_hdr *hdr, enum tcmu_opcode op)
+static inline void tcmu_hdr_set_op(__u32 *len_op, enum tcmu_opcode op)
 {
-        hdr->len_op &= ~TCMU_OP_MASK;
-        hdr->len_op |= (op & TCMU_OP_MASK);
+        *len_op &= ~TCMU_OP_MASK;
+        *len_op |= (op & TCMU_OP_MASK);
 }
 
-static inline __u32 tcmu_hdr_get_len(struct tcmu_cmd_entry_hdr *hdr)
+static inline __u32 tcmu_hdr_get_len(__u32 len_op)
 {
-        return hdr->len_op & ~TCMU_OP_MASK;
+        return len_op & ~TCMU_OP_MASK;
 }
 
-static inline void tcmu_hdr_set_len(struct tcmu_cmd_entry_hdr *hdr, __u32 len)
+static inline void tcmu_hdr_set_len(__u32 *len_op, __u32 len)
 {
-        hdr->len_op &= TCMU_OP_MASK;
-        hdr->len_op |= len;
+        *len_op &= TCMU_OP_MASK;
+        *len_op |= len;
 }
 
 /* Currently the same as SCSI_SENSE_BUFFERSIZE */
@@ -97,13 +106,14 @@ static inline void tcmu_hdr_set_len(struct tcmu_cmd_entry_hdr *hdr, __u32 len)
 struct tcmu_cmd_entry {
         struct tcmu_cmd_entry_hdr hdr;
 
-        uint16_t cmd_id;
-        uint16_t __pad1;
-
         union {
                 struct {
+                        uint32_t iov_cnt;
+                        uint32_t iov_bidi_cnt;
+                        uint32_t iov_dif_cnt;
                         uint64_t cdb_off;
-                        uint64_t iov_cnt;
+                        uint64_t __pad1;
+                        uint64_t __pad2;
                         struct iovec iov[0];
                 } req;
                 struct {