Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edaa7a55 authored by Sean Hefty's avatar Sean Hefty Committed by Roland Dreier
Browse files

RDMA/ucma: Add ability to query GID addresses 



Part of address resolution is mapping IP addresses to IB GIDs.  With
the changes to support querying larger addresses and more path records,
also provide a way to query IB GIDs after resolution completes.

Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent cf53936f

drivers/infiniband/core/ucma.c

+50 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <rdma/rdma_cm.h>

#include <rdma/rdma_cm.h>

#include <rdma/rdma_cm_ib.h>

#include <rdma/rdma_cm_ib.h>

#include <rdma/ib_addr.h>

#include <rdma/ib_addr.h>

#include <rdma/ib.h>





MODULE_AUTHOR("Sean Hefty");

MODULE_AUTHOR("Sean Hefty");

MODULE_DESCRIPTION("RDMA Userspace Connection Manager Access");

MODULE_DESCRIPTION("RDMA Userspace Connection Manager Access");
@@ -782,6 +783,52 @@ static ssize_t ucma_query_path(struct ucma_context *ctx, 
	return ret;

	return ret;

}

}





static ssize_t ucma_query_gid(struct ucma_context *ctx,

			      void __user *response, int out_len)

{

	struct rdma_ucm_query_addr_resp resp;

	struct sockaddr_ib *addr;

	int ret = 0;



	if (out_len < sizeof(resp))

		return -ENOSPC;



	memset(&resp, 0, sizeof resp);



	ucma_query_device_addr(ctx->cm_id, &resp);



	addr = (struct sockaddr_ib *) &resp.src_addr;

	resp.src_size = sizeof(*addr);

	if (ctx->cm_id->route.addr.src_addr.ss_family == AF_IB) {

		memcpy(addr, &ctx->cm_id->route.addr.src_addr, resp.src_size);

	} else {

		addr->sib_family = AF_IB;

		addr->sib_pkey = (__force __be16) resp.pkey;

		rdma_addr_get_sgid(&ctx->cm_id->route.addr.dev_addr,

				   (union ib_gid *) &addr->sib_addr);

		addr->sib_sid = rdma_get_service_id(ctx->cm_id, (struct sockaddr *)

						    &ctx->cm_id->route.addr.src_addr);

	}



	addr = (struct sockaddr_ib *) &resp.dst_addr;

	resp.dst_size = sizeof(*addr);

	if (ctx->cm_id->route.addr.dst_addr.ss_family == AF_IB) {

		memcpy(addr, &ctx->cm_id->route.addr.dst_addr, resp.dst_size);

	} else {

		addr->sib_family = AF_IB;

		addr->sib_pkey = (__force __be16) resp.pkey;

		rdma_addr_get_dgid(&ctx->cm_id->route.addr.dev_addr,

				   (union ib_gid *) &addr->sib_addr);

		addr->sib_sid = rdma_get_service_id(ctx->cm_id, (struct sockaddr *)

						    &ctx->cm_id->route.addr.dst_addr);

	}



	if (copy_to_user(response, &resp, sizeof(resp)))

		ret = -EFAULT;



	return ret;

}



static ssize_t ucma_query(struct ucma_file *file,

static ssize_t ucma_query(struct ucma_file *file,

			  const char __user *inbuf,

			  const char __user *inbuf,

			  int in_len, int out_len)

			  int in_len, int out_len)
@@ -806,6 +853,9 @@ static ssize_t ucma_query(struct ucma_file *file, 
	case RDMA_USER_CM_QUERY_PATH:

	case RDMA_USER_CM_QUERY_PATH:

		ret = ucma_query_path(ctx, response, out_len);

		ret = ucma_query_path(ctx, response, out_len);

		break;

		break;

	case RDMA_USER_CM_QUERY_GID:

		ret = ucma_query_gid(ctx, response, out_len);

		break;

	default:

	default:

		ret = -ENOSYS;

		ret = -ENOSYS;

		break;

		break;

include/uapi/rdma/rdma_user_cm.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -116,7 +116,8 @@ struct rdma_ucm_resolve_route { 




enum {

enum {

	RDMA_USER_CM_QUERY_ADDR,

	RDMA_USER_CM_QUERY_ADDR,

	RDMA_USER_CM_QUERY_PATH

	RDMA_USER_CM_QUERY_PATH,

	RDMA_USER_CM_QUERY_GID

};

};





struct rdma_ucm_query {

struct rdma_ucm_query {