IB/cma: Resolve AF_IB UDP support

Message ID	AMSPR05MB4552E08900C6BCAC4FC106CA9C40@AMSPR05MB455.eurprd05.prod.outlook.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-rdma-owner@kernel.org> From: Matthew Finlay <Matt@Mellanox.com> To: Doug Ledford <dledford@redhat.com>, "Hefty, Sean (sean.hefty@intel.com)" <sean.hefty@intel.com> CC: "linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org> Subject: [PATCH] IB/cma: Resolve AF_IB UDP support Thread-Topic: [PATCH] IB/cma: Resolve AF_IB UDP support Thread-Index: AdCRuAjhwDqGHulgR5GKTstlJ44EjQ== Date: Mon, 18 May 2015 22:14:03 +0000 Message-ID: <AMSPR05MB4552E08900C6BCAC4FC106CA9C40@AMSPR05MB455.eurprd05.prod.outlook.com> Accept-Language: en-US Content-Language: en-US received-spf: None (protection.outlook.com: Mellanox.com does not designate permitted sender hosts) Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk

Message ID

AMSPR05MB4552E08900C6BCAC4FC106CA9C40@AMSPR05MB455.eurprd05.prod.outlook.com (mailing list archive)

State

Superseded

Headers

From: Matthew Finlay <Matt@Mellanox.com>
To: Doug Ledford <dledford@redhat.com>,
	"Hefty, Sean (sean.hefty@intel.com)" <sean.hefty@intel.com>
CC: "linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>
Subject: [PATCH] IB/cma: Resolve AF_IB UDP support
Thread-Topic: [PATCH] IB/cma: Resolve AF_IB UDP support
Thread-Index: AdCRuAjhwDqGHulgR5GKTstlJ44EjQ==
Date: Mon, 18 May 2015 22:14:03 +0000
Message-ID: <AMSPR05MB4552E08900C6BCAC4FC106CA9C40@AMSPR05MB455.eurprd05.prod.outlook.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: Mellanox.com does not designate
	permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-originalarrivaltime: 18 May 2015 22:14:03.4951
	(UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR05MB453
Sender: linux-rdma-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-rdma.vger.kernel.org>
X-Mailing-List: linux-rdma@vger.kernel.org
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 
	T_RP_MATCHES_RCVD,
	UNPARSEABLE_RELAY autolearn=ham version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Commit Message

Matthew Finlay May 18, 2015, 10:14 p.m. UTC

Support for using UD and AF_IB is currently broken.  The IB_CM_SIDR_REQ_RECEIVED
message is not handled properly in cma_save_net_info() and we end up falling
into code that will try and process the request as ipv4/ipv6, which will end
up failing.

The resolution is to add a check for the SIDR_REQ and call cma_save_ib_info()
with a NULL path record.  Change cma_save_ib_info() to copy the src sib info 
from the listen_id when the path record is NULL.

Reported-by: Hari Shankar <Hari.Shankar@netapp.com>
Signed-off-by: Matt Finlay <matt@mellanox.com>
---
drivers/infiniband/core/cma.c | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)



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

Comments

Hefty, Sean May 19, 2015, 12:24 a.m. UTC | #1

The patch format went wonky.

> -----Original Message-----
> From: Matthew Finlay [mailto:Matt@Mellanox.com]
> Sent: Monday, May 18, 2015 3:14 PM
> To: Doug Ledford; Hefty, Sean
> Cc: linux-rdma@vger.kernel.org
> Subject: [PATCH] IB/cma: Resolve AF_IB UDP support
> 
> Support for using UD and AF_IB is currently broken.  The
> IB_CM_SIDR_REQ_RECEIVED
> message is not handled properly in cma_save_net_info() and we end up
> falling
> into code that will try and process the request as ipv4/ipv6, which will
> end
> up failing.
> 
> The resolution is to add a check for the SIDR_REQ and call
> cma_save_ib_info()
> with a NULL path record.  Change cma_save_ib_info() to copy the src sib
> info
> from the listen_id when the path record is NULL.
> 
> Reported-by: Hari Shankar <Hari.Shankar@netapp.com>
> Signed-off-by: Matt Finlay <matt@mellanox.com>
> ---
> drivers/infiniband/core/cma.c | 32 +++++++++++++++++++++-----------
> 1 file changed, 21 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
> index 06441a4..38ffe09 100644
> --- a/drivers/infiniband/core/cma.c
> +++ b/drivers/infiniband/core/cma.c
> @@ -845,18 +845,26 @@ static void cma_save_ib_info(struct rdma_cm_id *id,
> struct rdma_cm_id *listen_id
>  listen_ib = (struct sockaddr_ib *) &listen_id->route.addr.src_addr;
>  ib = (struct sockaddr_ib *) &id->route.addr.src_addr;
>  ib->sib_family = listen_ib->sib_family;
> -ib->sib_pkey = path->pkey;
> -ib->sib_flowinfo = path->flow_label;
> -memcpy(&ib->sib_addr, &path->sgid, 16);
> +if (path) {
> +ib->sib_pkey = path->pkey;
> +ib->sib_flowinfo = path->flow_label;
> +memcpy(&ib->sib_addr, &path->sgid, 16);
> +} else {
> +ib->sib_pkey = listen_ib->sib_pkey;
> +ib->sib_flowinfo = listen_ib->sib_flowinfo;
> +ib->sib_addr = listen_ib->sib_addr;
> +}
>  ib->sib_sid = listen_ib->sib_sid;
>  ib->sib_sid_mask = cpu_to_be64(0xffffffffffffffffULL);
>  ib->sib_scope_id = listen_ib->sib_scope_id;
> 
> -ib = (struct sockaddr_ib *) &id->route.addr.dst_addr;
> -ib->sib_family = listen_ib->sib_family;
> -ib->sib_pkey = path->pkey;
> -ib->sib_flowinfo = path->flow_label;
> -memcpy(&ib->sib_addr, &path->dgid, 16);
> +if (path) {
> +ib = (struct sockaddr_ib *) &id->route.addr.dst_addr;
> +ib->sib_family = listen_ib->sib_family;
> +ib->sib_pkey = path->pkey;
> +ib->sib_flowinfo = path->flow_label;
> +memcpy(&ib->sib_addr, &path->dgid, 16);
> +}
>  }
> 
>  static __be16 ss_get_port(const struct sockaddr_storage *ss)
> @@ -905,9 +913,11 @@ static int cma_save_net_info(struct rdma_cm_id *id,
> struct rdma_cm_id *listen_id
>  {
>  struct cma_hdr *hdr;
> 
> -if ((listen_id->route.addr.src_addr.ss_family == AF_IB) &&
> -    (ib_event->event == IB_CM_REQ_RECEIVED)) {
> -cma_save_ib_info(id, listen_id, ib_event->param.req_rcvd.primary_path);
> +if (listen_id->route.addr.src_addr.ss_family == AF_IB) {
> +if (ib_event->event == IB_CM_REQ_RECEIVED)
> +cma_save_ib_info(id, listen_id, ib_event->param.req_rcvd.primary_path);
> +else if (ib_event->event == IB_CM_SIDR_REQ_RECEIVED)
> +cma_save_ib_info(id, listen_id, NULL);
>  return 0;
>  }
> 
> 
> 

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

Matthew Finlay May 19, 2015, 1:18 a.m. UTC | #2

>The patch format went wonky.


Sorry, I thought I had all of the kinks worked out.  Ill resolve and
resubmit.

Thanks,
-matt

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 06441a4..38ffe09 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -845,18 +845,26 @@  static void cma_save_ib_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id
 	listen_ib = (struct sockaddr_ib *) &listen_id->route.addr.src_addr;
 	ib = (struct sockaddr_ib *) &id->route.addr.src_addr;
 	ib->sib_family = listen_ib->sib_family;
-	ib->sib_pkey = path->pkey;
-	ib->sib_flowinfo = path->flow_label;
-	memcpy(&ib->sib_addr, &path->sgid, 16);
+	if (path) {
+		ib->sib_pkey = path->pkey;
+		ib->sib_flowinfo = path->flow_label;
+		memcpy(&ib->sib_addr, &path->sgid, 16);
+	} else {
+		ib->sib_pkey = listen_ib->sib_pkey;
+		ib->sib_flowinfo = listen_ib->sib_flowinfo;
+		ib->sib_addr = listen_ib->sib_addr;
+	}
 	ib->sib_sid = listen_ib->sib_sid;
 	ib->sib_sid_mask = cpu_to_be64(0xffffffffffffffffULL);
 	ib->sib_scope_id = listen_ib->sib_scope_id;
 
-	ib = (struct sockaddr_ib *) &id->route.addr.dst_addr;
-	ib->sib_family = listen_ib->sib_family;
-	ib->sib_pkey = path->pkey;
-	ib->sib_flowinfo = path->flow_label;
-	memcpy(&ib->sib_addr, &path->dgid, 16);
+	if (path) {
+		ib = (struct sockaddr_ib *) &id->route.addr.dst_addr;
+		ib->sib_family = listen_ib->sib_family;
+		ib->sib_pkey = path->pkey;
+		ib->sib_flowinfo = path->flow_label;
+		memcpy(&ib->sib_addr, &path->dgid, 16);
+	}
 }
 
 static __be16 ss_get_port(const struct sockaddr_storage *ss)
@@ -905,9 +913,11 @@  static int cma_save_net_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id
 {
 	struct cma_hdr *hdr;
 
-	if ((listen_id->route.addr.src_addr.ss_family == AF_IB) &&
-	    (ib_event->event == IB_CM_REQ_RECEIVED)) {
-		cma_save_ib_info(id, listen_id, ib_event->param.req_rcvd.primary_path);
+	if (listen_id->route.addr.src_addr.ss_family == AF_IB) {
+		if (ib_event->event == IB_CM_REQ_RECEIVED)
+			cma_save_ib_info(id, listen_id, ib_event->param.req_rcvd.primary_path);
+		else if (ib_event->event == IB_CM_SIDR_REQ_RECEIVED)
+			cma_save_ib_info(id, listen_id, NULL);
 		return 0;
 	}

IB/cma: Resolve AF_IB UDP support

Commit Message

Comments

Patch