Skip to contentSkip to conversation

FAILED: patch "[PATCH] IB/cma: Fix RDMA port validation for iWarp" failed to apply to 4.4-stable tree

PATCH [email protected] 2 participants 3 messages Mar 1, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 649367735ee5dedb128d9fac0b86ba7e0fe7ae3b Mon Sep 17 00:00:00 2001

From: Matan Barak <[email protected]>
Date: Thu, 7 Jan 2016 11:19:29 +0200
Subject: [PATCH] IB/cma: Fix RDMA port validation for iWarp

cma_validate_port wrongly assumed that Ethernet devices are RoCE devices and thus their ndev should be matched in the GID table. This broke the iWarp support. Fixing that matching the ndev only if we work on a RoCE port.

Cc <[email protected]> # 4.4.x-
Fixes abae1b71dd37 ('IB/cma: cma_validate_port should verify the port

and netdevice')

drivers/infiniband/core/cma.c +1 -1
index 559ee3d27b4a..a811594b0b59 100644
@@ -551,7 +551,7 @@ static inline int cma_validate_port(struct ib_device *device, u8 port,
 	if ((dev_type != ARPHRD_INFINIBAND) && rdma_protocol_ib(device, port))
 		return ret;
 
-	if (dev_type == ARPHRD_ETHER) {
+	if (dev_type == ARPHRD_ETHER && rdma_protocol_roce(device, port)) {
 		ndev = dev_get_by_index(&init_net, bound_if_index);
 		if (ndev && ndev->flags & IFF_LOOPBACK) {
 			pr_info("detected loopback device\n");
#1 lore raw
Quoted 8 lines

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

Hey Greg, I just posted the backport. Not sure if I did the comment correctly...

Thanks,

Steve.

author maintainer
#2 lore raw
Quoted 11 lines · Steve Wise
Quoted 8 lines

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

Hey Greg, I just posted the backport. Not sure if I did the comment correctly...

It was wonderful, thanks.

greg k-h