IB/iser: Add support for iser CM REQ additional info

Annex A12 of the IBTA spec defines additional information that needs
to be provided through the CM exchange relating to usage of ZBVA (Zero
Based VAs) and Send With Invalidate over an iSER connection.

Currently, the initiator sets both to not supported, but does provide
the header so that existing iSER targets can be patched to start
looking on the private data carried by the CM.

This is a preparation step to enable iSER with HW drivers for which
FMRs are not supported, such as mlx4 VF instances or new HW devices
which might support only FRWR (Fast Registration Work-Requests) along
the details of the IB_DEVICE_MEM_MGT_EXTENSIONS device capability.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

2 files changed, 16 insertions, 0 deletions

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 1a570886cc03..06f578cde75b 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -140,6 +140,15 @@ struct iser_hdr {
         __be64  read_va;
 } __attribute__((packed));
 
+
+#define ISER_ZBVA_NOT_SUPPORTED         0x80
+#define ISER_SEND_W_INV_NOT_SUPPORTED   0x40
+
+struct iser_cm_hdr {
+        u8      flags;
+        u8      rsvd[3];
+} __packed;
+
 /* Constant PDU lengths calculations */
 #define ISER_HEADERS_LEN  (sizeof(struct iser_hdr) + sizeof(struct iscsi_hdr))
 
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 13838ad3ce76..5278916c3103 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -499,6 +499,7 @@ static int iser_route_handler(struct rdma_cm_id *cma_id)
 {
         struct rdma_conn_param conn_param;
         int    ret;
+        struct iser_cm_hdr req_hdr;
 
         ret = iser_create_ib_conn_res((struct iser_conn *)cma_id->context);
         if (ret)
@@ -510,6 +511,12 @@ static int iser_route_handler(struct rdma_cm_id *cma_id)
         conn_param.retry_count         = 7;
         conn_param.rnr_retry_count     = 6;
 
+        memset(&req_hdr, 0, sizeof(req_hdr));
+        req_hdr.flags = (ISER_ZBVA_NOT_SUPPORTED |
+                        ISER_SEND_W_INV_NOT_SUPPORTED);
+        conn_param.private_data         = (void *)&req_hdr;
+        conn_param.private_data_len     = sizeof(struct iser_cm_hdr);
+
         ret = rdma_connect(cma_id, &conn_param);
         if (ret) {
                 iser_err("failure connecting: %d\n", ret);