Skip to contentSkip to conversation

IB/core: Map iWarp AH type to undefined in rdma_ah_find_type

PATCH Applied Dennis Dalessandro 2 participants 2 messages Feb 1, 2018 1 message not in the archive InfiniBand

lore
Share & tools
lore

Dennis Dalessandro

author
#0 lore raw

PATCH 1/1 IB/core: Map iWarp AH type to undefined in rdma_ah_find_type

From: Don Hiatt <[email protected]>

iWarp devices do not support the creation of address handles so return AH_ATTR_TYPE_UNDEFINED for all iWarp devices.

While we are here reduce the size of port_num to u8 and add a comment.

Fixes 44c58487d51a ("IB/core: Define 'ib' and 'roce' rdma_ah_attr types")
Reported-by Parav Pandit <parav-VPRAkNaXOzVWk0Htik3J/[email protected]>
CC Sean Hefty <[email protected]>
Reviewed-by Ira Weiny <[email protected]>
Reviewed-by Shiraz Saleem <[email protected]>
Signed-off-by Don Hiatt <[email protected]>
Signed-off-by Dennis Dalessandro <[email protected]>

---
Changes since v1: Add Shiraz RB tag, move undefined to be 0 not 3

---
 include/rdma/ib_verbs.h |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
include/rdma/ib_verbs.h +14 -6
index 5263c86..73b2387 100644
@@ -874,6 +874,7 @@ struct ib_mr_status {
 __attribute_const__ enum ib_rate mult_to_ib_rate(int mult);
 
 enum rdma_ah_attr_type {
+	RDMA_AH_ATTR_TYPE_UNDEFINED,
 	RDMA_AH_ATTR_TYPE_IB,
 	RDMA_AH_ATTR_TYPE_ROCE,
 	RDMA_AH_ATTR_TYPE_OPA,

@@ -3810,17 +3811,24 @@ static inline void rdma_ah_set_grh(struct rdma_ah_attr *attr,
 	grh->traffic_class = traffic_class;
 }
 
-/*Get AH type */
+/**
+ * rdma_ah_find_type - Return address handle type.
+ *
+ * @dev: Device to be checked
+ * @port_num: Port number
+ */
 static inline enum rdma_ah_attr_type rdma_ah_find_type(struct ib_device *dev,
-						       u32 port_num)
+						       u8 port_num)
 {
 	if (rdma_protocol_roce(dev, port_num))
 		return RDMA_AH_ATTR_TYPE_ROCE;
-	else if ((rdma_protocol_ib(dev, port_num)) &&
-		 (rdma_cap_opa_ah(dev, port_num)))
-		return RDMA_AH_ATTR_TYPE_OPA;
-	else
+	if (rdma_protocol_ib(dev, port_num)) {
+		if (rdma_cap_opa_ah(dev, port_num))
+			return RDMA_AH_ATTR_TYPE_OPA;
 		return RDMA_AH_ATTR_TYPE_IB;
+	}
+
+	return RDMA_AH_ATTR_TYPE_UNDEFINED;
 }
 
 /**

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20180201185700.9503.25176.stgit-9QXIwq+3FY+1XWohqUldA0EOCMrvLtNR@public.gmane.org

Applied
#2 lore raw
Quoted 8 lines · Dennis Dalessandro

From: Don Hiatt <[email protected]>

iWarp devices do not support the creation of address handles so return AH_ATTR_TYPE_UNDEFINED for all iWarp devices.

While we are here reduce the size of port_num to u8 and add a comment.

Quoted 7 lines
Fixes 44c58487d51a ("IB/core: Define 'ib' and 'roce' rdma_ah_attr types")
Reported-by Parav Pandit <parav-VPRAkNaXOzVWk0Htik3J/[email protected]>
CC Sean Hefty <[email protected]>
Reviewed-by Ira Weiny <[email protected]>
Reviewed-by Shiraz Saleem <[email protected]>
Signed-off-by Don Hiatt <[email protected]>
Signed-off-by Dennis Dalessandro <[email protected]>

Applied to for-next

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html