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

Commit 089117e1 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma'... 

Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus
parents 68602120 f747c34a d90f9b35 6634961c 240a9207 d1e09ebf 7fac3301

drivers/infiniband/core/addr.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr) 
		dev_put(dev);

		break;



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

	case AF_INET6:

		rcu_read_lock();

		for_each_netdev_rcu(&init_net, dev) {
@@ -243,7 +243,7 @@ static int addr4_resolve(struct sockaddr_in *src_in, 
	return ret;

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

static int addr6_resolve(struct sockaddr_in6 *src_in,

			 struct sockaddr_in6 *dst_in,

			 struct rdma_dev_addr *addr)

drivers/infiniband/core/cm.c

+10 −6
Original line number Diff line number Diff line
@@ -3848,24 +3848,28 @@ static int __init ib_cm_init(void) 
	INIT_LIST_HEAD(&cm.timewait_list);



	ret = class_register(&cm_class);

	if (ret)

		return -ENOMEM;

	if (ret) {

		ret = -ENOMEM;

		goto error1;

	}



	cm.wq = create_workqueue("ib_cm");

	if (!cm.wq) {

		ret = -ENOMEM;

		goto error1;

		goto error2;

	}



	ret = ib_register_client(&cm_client);

	if (ret)

		goto error2;

		goto error3;



	return 0;

error2:

error3:

	destroy_workqueue(cm.wq);

error1:

error2:

	class_unregister(&cm_class);

error1:

	idr_destroy(&cm.local_id_table);

	return ret;

}

drivers/infiniband/core/cm_msgs.h

+0 −12
Original line number Diff line number Diff line
@@ -44,18 +44,6 @@ 


#define IB_CM_CLASS_VERSION	2 /* IB specification 1.2 */



#define CM_REQ_ATTR_ID		cpu_to_be16(0x0010)

#define CM_MRA_ATTR_ID		cpu_to_be16(0x0011)

#define CM_REJ_ATTR_ID		cpu_to_be16(0x0012)

#define CM_REP_ATTR_ID		cpu_to_be16(0x0013)

#define CM_RTU_ATTR_ID		cpu_to_be16(0x0014)

#define CM_DREQ_ATTR_ID		cpu_to_be16(0x0015)

#define CM_DREP_ATTR_ID		cpu_to_be16(0x0016)

#define CM_SIDR_REQ_ATTR_ID	cpu_to_be16(0x0017)

#define CM_SIDR_REP_ATTR_ID	cpu_to_be16(0x0018)

#define CM_LAP_ATTR_ID		cpu_to_be16(0x0019)

#define CM_APR_ATTR_ID		cpu_to_be16(0x001A)



enum cm_msg_sequence {

	CM_MSG_SEQUENCE_REQ,

	CM_MSG_SEQUENCE_LAP,

drivers/infiniband/core/cma.c

+1 −1
Original line number Diff line number Diff line
@@ -2311,7 +2311,7 @@ static int cma_get_port(struct rdma_id_private *id_priv) 
static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,

			       struct sockaddr *addr)

{

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

	struct sockaddr_in6 *sin6;



	if (addr->sa_family != AF_INET6)

drivers/infiniband/core/sa_query.c

+133 −0
Original line number Diff line number Diff line
@@ -94,6 +94,12 @@ struct ib_sa_path_query { 
	struct ib_sa_query sa_query;

};



struct ib_sa_guidinfo_query {

	void (*callback)(int, struct ib_sa_guidinfo_rec *, void *);

	void *context;

	struct ib_sa_query sa_query;

};



struct ib_sa_mcmember_query {

	void (*callback)(int, struct ib_sa_mcmember_rec *, void *);

	void *context;
@@ -347,6 +353,34 @@ static const struct ib_field service_rec_table[] = { 
	  .size_bits    = 2*64 },

};



#define GUIDINFO_REC_FIELD(field) \

	.struct_offset_bytes = offsetof(struct ib_sa_guidinfo_rec, field),	\

	.struct_size_bytes   = sizeof((struct ib_sa_guidinfo_rec *) 0)->field,	\

	.field_name          = "sa_guidinfo_rec:" #field



static const struct ib_field guidinfo_rec_table[] = {

	{ GUIDINFO_REC_FIELD(lid),

	  .offset_words = 0,

	  .offset_bits  = 0,

	  .size_bits    = 16 },

	{ GUIDINFO_REC_FIELD(block_num),

	  .offset_words = 0,

	  .offset_bits  = 16,

	  .size_bits    = 8 },

	{ GUIDINFO_REC_FIELD(res1),

	  .offset_words = 0,

	  .offset_bits  = 24,

	  .size_bits    = 8 },

	{ GUIDINFO_REC_FIELD(res2),

	  .offset_words = 1,

	  .offset_bits  = 0,

	  .size_bits    = 32 },

	{ GUIDINFO_REC_FIELD(guid_info_list),

	  .offset_words = 2,

	  .offset_bits  = 0,

	  .size_bits    = 512 },

};



static void free_sm_ah(struct kref *kref)

{

	struct ib_sa_sm_ah *sm_ah = container_of(kref, struct ib_sa_sm_ah, ref);
@@ -945,6 +979,105 @@ int ib_sa_mcmember_rec_query(struct ib_sa_client *client, 
	return ret;

}



/* Support GuidInfoRecord */

static void ib_sa_guidinfo_rec_callback(struct ib_sa_query *sa_query,

					int status,

					struct ib_sa_mad *mad)

{

	struct ib_sa_guidinfo_query *query =

		container_of(sa_query, struct ib_sa_guidinfo_query, sa_query);



	if (mad) {

		struct ib_sa_guidinfo_rec rec;



		ib_unpack(guidinfo_rec_table, ARRAY_SIZE(guidinfo_rec_table),

			  mad->data, &rec);

		query->callback(status, &rec, query->context);

	} else

		query->callback(status, NULL, query->context);

}



static void ib_sa_guidinfo_rec_release(struct ib_sa_query *sa_query)

{

	kfree(container_of(sa_query, struct ib_sa_guidinfo_query, sa_query));

}



int ib_sa_guid_info_rec_query(struct ib_sa_client *client,

			      struct ib_device *device, u8 port_num,

			      struct ib_sa_guidinfo_rec *rec,

			      ib_sa_comp_mask comp_mask, u8 method,

			      int timeout_ms, gfp_t gfp_mask,

			      void (*callback)(int status,

					       struct ib_sa_guidinfo_rec *resp,

					       void *context),

			      void *context,

			      struct ib_sa_query **sa_query)

{

	struct ib_sa_guidinfo_query *query;

	struct ib_sa_device *sa_dev = ib_get_client_data(device, &sa_client);

	struct ib_sa_port *port;

	struct ib_mad_agent *agent;

	struct ib_sa_mad *mad;

	int ret;



	if (!sa_dev)

		return -ENODEV;



	if (method != IB_MGMT_METHOD_GET &&

	    method != IB_MGMT_METHOD_SET &&

	    method != IB_SA_METHOD_DELETE) {

		return -EINVAL;

	}



	port  = &sa_dev->port[port_num - sa_dev->start_port];

	agent = port->agent;



	query = kmalloc(sizeof *query, gfp_mask);

	if (!query)

		return -ENOMEM;



	query->sa_query.port = port;

	ret = alloc_mad(&query->sa_query, gfp_mask);

	if (ret)

		goto err1;



	ib_sa_client_get(client);

	query->sa_query.client = client;

	query->callback        = callback;

	query->context         = context;



	mad = query->sa_query.mad_buf->mad;

	init_mad(mad, agent);



	query->sa_query.callback = callback ? ib_sa_guidinfo_rec_callback : NULL;

	query->sa_query.release  = ib_sa_guidinfo_rec_release;



	mad->mad_hdr.method	 = method;

	mad->mad_hdr.attr_id	 = cpu_to_be16(IB_SA_ATTR_GUID_INFO_REC);

	mad->sa_hdr.comp_mask	 = comp_mask;



	ib_pack(guidinfo_rec_table, ARRAY_SIZE(guidinfo_rec_table), rec,

		mad->data);



	*sa_query = &query->sa_query;



	ret = send_mad(&query->sa_query, timeout_ms, gfp_mask);

	if (ret < 0)

		goto err2;



	return ret;



err2:

	*sa_query = NULL;

	ib_sa_client_put(query->sa_query.client);

	free_mad(&query->sa_query);



err1:

	kfree(query);

	return ret;

}

EXPORT_SYMBOL(ib_sa_guid_info_rec_query);



static void send_handler(struct ib_mad_agent *agent,

			 struct ib_mad_send_wc *mad_send_wc)

{