compat-rdma/linux-next-pending: Adding changes to enable the use

of the tos field for iwarp providers

Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>

diff --git a/linux-next-pending/0009-core-iw-cm-tos.patch b/linux-next-pending/0009-core-iw-cm-tos.patch
new file mode 100644 (file)
index 0000000..5167334
--- /dev/null
+++ b/linux-next-pending/0009-core-iw-cm-tos.patch
@@ -0,0 +1,46 @@
+From: Steve Wise <swise@opengridcomputing.com>
+
+rdma-cma/iw_cm: Export tos field to iwarp providers
+
+Signed-off-by: Steve Wise <swise@opengridcomputing.com>
+Signed-off-by: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
+---
+ drivers/infiniband/core/cma.c |    2 ++
+ include/rdma/iw_cm.h          |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
+index d570030..beda319 100644
+--- a/drivers/infiniband/core/cma.c
++++ b/drivers/infiniband/core/cma.c
+@@ -1593,6 +1593,7 @@ static int cma_iw_listen(struct rdma_id_private *id_priv, int backlog)
+       if (IS_ERR(id))
+               return PTR_ERR(id);
+ 
++      id->tos = id_priv->tos;
+       id_priv->cm_id.iw = id;
+ 
+       memcpy(&id_priv->cm_id.iw->local_addr, cma_src_addr(id_priv),
+@@ -2840,6 +2841,7 @@ static int cma_connect_iw(struct rdma_id_private *id_priv,
+       if (IS_ERR(cm_id))
+               return PTR_ERR(cm_id);
+ 
++      cm_id->tos = id_priv->tos;
+       id_priv->cm_id.iw = cm_id;
+ 
+       memcpy(&cm_id->local_addr, cma_src_addr(id_priv),
+diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
+index 1017e0b..036bd27 100644
+--- a/include/rdma/iw_cm.h
++++ b/include/rdma/iw_cm.h
+@@ -91,6 +91,7 @@ struct iw_cm_id {
+       /* Used by provider to add and remove refs on IW cm_id */
+       void (*add_ref)(struct iw_cm_id *);
+       void (*rem_ref)(struct iw_cm_id *);
++      u8  tos;
+ };
+ 
+ struct iw_cm_conn_param {
+-- 
+1.7.1
+

diff --git a/linux-next-pending/0010-rdma-nes-tos.patch b/linux-next-pending/0010-rdma-nes-tos.patch
new file mode 100644 (file)
index 0000000..ab94504
--- /dev/null
+++ b/linux-next-pending/0010-rdma-nes-tos.patch
@@ -0,0 +1,73 @@
+From: Faisal Latif <Faisal.Latif@intel.com>
+
+RDMA/nes: Enable the use of the tos field in the nes driver
+
+Signed-off-by: Faisal Latif <Faisal.Latif@intel.com>
+Signed-off-by: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
+---
+ drivers/infiniband/hw/nes/nes_cm.c |    7 +++++++
+ drivers/infiniband/hw/nes/nes_cm.h |    2 ++
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
+index 6f09a72..adeea3f 100644
+--- a/drivers/infiniband/hw/nes/nes_cm.c
++++ b/drivers/infiniband/hw/nes/nes_cm.c
+@@ -1586,6 +1586,8 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
+                 &cm_node->loc_addr, cm_node->loc_port,
+                 &cm_node->rem_addr, cm_node->rem_port);
+       cm_node->listener = listener;
++      if (listener)
++              cm_node->tos = listener->tos;
+       cm_node->netdev = nesvnic->netdev;
+       cm_node->cm_id = cm_info->cm_id;
+       memcpy(cm_node->loc_mac, nesvnic->netdev->dev_addr, ETH_ALEN);
+@@ -2907,6 +2909,9 @@ static int nes_cm_init_tsa_conn(struct nes_qp *nesqp, struct nes_cm_node *cm_nod
+ 
+       nesqp->nesqp_context->misc2 |= cpu_to_le32(64 << NES_QPCONTEXT_MISC2_TTL_SHIFT);
+ 
++      nesqp->nesqp_context->misc2 |= cpu_to_le32(
++              cm_node->tos << NES_QPCONTEXT_MISC2_TOS_SHIFT);
++
+       nesqp->nesqp_context->mss |= cpu_to_le32(((u32)cm_node->tcp_cntxt.mss) << 16);
+ 
+       nesqp->nesqp_context->tcp_state_flow_label |= cpu_to_le32(
+@@ -3581,6 +3586,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+               cm_node->ord_size = 1;
+ 
+       cm_node->apbvt_set = apbvt_set;
++      cm_node->tos = cm_id->tos;
+       nesqp->cm_node = cm_node;
+       cm_node->nesqp = nesqp;
+       nes_add_ref(&nesqp->ibqp);
+@@ -3635,6 +3641,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
+       }
+ 
+       cm_id->provider_data = cm_node;
++      cm_node->tos = cm_id->tos;
+ 
+       if (!cm_node->reused_node) {
+               if (nes_create_mapinfo(&cm_info))
+diff --git a/drivers/infiniband/hw/nes/nes_cm.h b/drivers/infiniband/hw/nes/nes_cm.h
+index f522cf6..32a6420 100644
+--- a/drivers/infiniband/hw/nes/nes_cm.h
++++ b/drivers/infiniband/hw/nes/nes_cm.h
+@@ -303,6 +303,7 @@ struct nes_cm_listener {
+       int                        backlog;
+       enum nes_cm_listener_state listener_state;
+       u32                        reused_node;
++      u8                         tos;
+ };
+ 
+ /* per connection node and node state information */
+@@ -352,6 +353,7 @@ struct nes_cm_node {
+       struct list_head        reset_entry;
+       struct nes_qp           *nesqp;
+       atomic_t                passive_state;
++      u8                      tos;
+ };
+ 
+ /* structure for client or CM to fill when making CM api calls. */
+-- 
+1.7.1
+