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

Commit f9d1b5a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma updates from Doug Ledford:

 - a large cleanup of how device capabilities are checked for various
   features

 - additional cleanups in the MAD processing

 - update to the srp driver

 - creation and use of centralized log message helpers

 - add const to a number of args to calls and clean up call chain

 - add support for extended cq create verb

 - add support for timestamps on cq completion

 - add support for processing OPA MAD packets

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (92 commits)
  IB/mad: Add final OPA MAD processing
  IB/mad: Add partial Intel OPA MAD support
  IB/mad: Add partial Intel OPA MAD support
  IB/core: Add OPA MAD core capability flag
  IB/mad: Add support for additional MAD info to/from drivers
  IB/mad: Convert allocations from kmem_cache to kzalloc
  IB/core: Add ability for drivers to report an alternate MAD size.
  IB/mad: Support alternate Base Versions when creating MADs
  IB/mad: Create a generic helper for DR forwarding checks
  IB/mad: Create a generic helper for DR SMP Recv processing
  IB/mad: Create a generic helper for DR SMP Send processing
  IB/mad: Split IB SMI handling from MAD Recv handler
  IB/mad cleanup: Generalize processing of MAD data
  IB/mad cleanup: Clean up function params -- find_mad_agent
  IB/mlx4: Add support for CQ time-stamping
  IB/mlx4: Add mmap call to map the hardware clock
  IB/core: Pass hardware specific data in query_device
  IB/core: Add timestamp_mask and hca_core_clock to query_device
  IB/core: Extend ib_uverbs_create_cq
  IB/core: Add CQ creation time-stamping flag
  ...
parents 2ad7b44f 8e4349d1

drivers/infiniband/core/addr.c

+2 −2
Original line number Diff line number Diff line
@@ -457,8 +457,8 @@ static void resolve_cb(int status, struct sockaddr *src_addr, 
	complete(&((struct resolve_cb_context *)context)->comp);

}



int rdma_addr_find_dmac_by_grh(union ib_gid *sgid, union ib_gid *dgid, u8 *dmac,

			       u16 *vlan_id)

int rdma_addr_find_dmac_by_grh(const union ib_gid *sgid, const union ib_gid *dgid,

			       u8 *dmac, u16 *vlan_id)

{

	int ret = 0;

	struct rdma_dev_addr dev_addr;

drivers/infiniband/core/agent.c

+14 −9
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static DEFINE_SPINLOCK(ib_agent_port_list_lock); 
static LIST_HEAD(ib_agent_port_list);



static struct ib_agent_port_private *

__ib_get_agent_port(struct ib_device *device, int port_num)

__ib_get_agent_port(const struct ib_device *device, int port_num)

{

	struct ib_agent_port_private *entry;
@@ -67,7 +67,7 @@ __ib_get_agent_port(struct ib_device *device, int port_num) 
}



static struct ib_agent_port_private *

ib_get_agent_port(struct ib_device *device, int port_num)

ib_get_agent_port(const struct ib_device *device, int port_num)

{

	struct ib_agent_port_private *entry;

	unsigned long flags;
@@ -78,9 +78,9 @@ ib_get_agent_port(struct ib_device *device, int port_num) 
	return entry;

}



void agent_send_response(struct ib_mad *mad, struct ib_grh *grh,

			 struct ib_wc *wc, struct ib_device *device,

			 int port_num, int qpn)

void agent_send_response(const struct ib_mad_hdr *mad_hdr, const struct ib_grh *grh,

			 const struct ib_wc *wc, const struct ib_device *device,

			 int port_num, int qpn, size_t resp_mad_len, bool opa)

{

	struct ib_agent_port_private *port_priv;

	struct ib_mad_agent *agent;
@@ -106,15 +106,20 @@ void agent_send_response(struct ib_mad *mad, struct ib_grh *grh, 
		return;

	}



	if (opa && mad_hdr->base_version != OPA_MGMT_BASE_VERSION)

		resp_mad_len = IB_MGMT_MAD_SIZE;



	send_buf = ib_create_send_mad(agent, wc->src_qp, wc->pkey_index, 0,

				      IB_MGMT_MAD_HDR, IB_MGMT_MAD_DATA,

				      GFP_KERNEL);

				      IB_MGMT_MAD_HDR,

				      resp_mad_len - IB_MGMT_MAD_HDR,

				      GFP_KERNEL,

				      mad_hdr->base_version);

	if (IS_ERR(send_buf)) {

		dev_err(&device->dev, "ib_create_send_mad error\n");

		goto err1;

	}



	memcpy(send_buf->mad, mad, sizeof *mad);

	memcpy(send_buf->mad, mad_hdr, resp_mad_len);

	send_buf->ah = ah;



	if (device->node_type == RDMA_NODE_IB_SWITCH) {
@@ -156,7 +161,7 @@ int ib_agent_port_open(struct ib_device *device, int port_num) 
		goto error1;

	}



	if (rdma_port_get_link_layer(device, port_num) == IB_LINK_LAYER_INFINIBAND) {

	if (rdma_cap_ib_smi(device, port_num)) {

		/* Obtain send only MAD agent for SMI QP */

		port_priv->agent[0] = ib_register_mad_agent(device, port_num,

							    IB_QPT_SMI, NULL, 0,

drivers/infiniband/core/agent.h

+3 −3
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ extern int ib_agent_port_open(struct ib_device *device, int port_num); 


extern int ib_agent_port_close(struct ib_device *device, int port_num);



extern void agent_send_response(struct ib_mad *mad, struct ib_grh *grh,

				struct ib_wc *wc, struct ib_device *device,

				int port_num, int qpn);

extern void agent_send_response(const struct ib_mad_hdr *mad_hdr, const struct ib_grh *grh,

				const struct ib_wc *wc, const struct ib_device *device,

				int port_num, int qpn, size_t resp_mad_len, bool opa);



#endif	/* __AGENT_H_ */

drivers/infiniband/core/cache.c

+29 −40
Original line number Diff line number Diff line
@@ -58,17 +58,6 @@ struct ib_update_work { 
	u8                 port_num;

};



static inline int start_port(struct ib_device *device)

{

	return (device->node_type == RDMA_NODE_IB_SWITCH) ? 0 : 1;

}



static inline int end_port(struct ib_device *device)

{

	return (device->node_type == RDMA_NODE_IB_SWITCH) ?

		0 : device->phys_port_cnt;

}



int ib_get_cached_gid(struct ib_device *device,

		      u8                port_num,

		      int               index,
@@ -78,12 +67,12 @@ int ib_get_cached_gid(struct ib_device *device, 
	unsigned long flags;

	int ret = 0;



	if (port_num < start_port(device) || port_num > end_port(device))

	if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))

		return -EINVAL;



	read_lock_irqsave(&device->cache.lock, flags);



	cache = device->cache.gid_cache[port_num - start_port(device)];

	cache = device->cache.gid_cache[port_num - rdma_start_port(device)];



	if (index < 0 || index >= cache->table_len)

		ret = -EINVAL;
@@ -97,7 +86,7 @@ int ib_get_cached_gid(struct ib_device *device, 
EXPORT_SYMBOL(ib_get_cached_gid);



int ib_find_cached_gid(struct ib_device   *device,

		       union ib_gid	*gid,

		       const union ib_gid *gid,

		       u8                 *port_num,

		       u16                *index)

{
@@ -112,11 +101,11 @@ int ib_find_cached_gid(struct ib_device *device, 


	read_lock_irqsave(&device->cache.lock, flags);



	for (p = 0; p <= end_port(device) - start_port(device); ++p) {

	for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p) {

		cache = device->cache.gid_cache[p];

		for (i = 0; i < cache->table_len; ++i) {

			if (!memcmp(gid, &cache->table[i], sizeof *gid)) {

				*port_num = p + start_port(device);

				*port_num = p + rdma_start_port(device);

				if (index)

					*index = i;

				ret = 0;
@@ -140,12 +129,12 @@ int ib_get_cached_pkey(struct ib_device *device, 
	unsigned long flags;

	int ret = 0;



	if (port_num < start_port(device) || port_num > end_port(device))

	if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))

		return -EINVAL;



	read_lock_irqsave(&device->cache.lock, flags);



	cache = device->cache.pkey_cache[port_num - start_port(device)];

	cache = device->cache.pkey_cache[port_num - rdma_start_port(device)];



	if (index < 0 || index >= cache->table_len)

		ret = -EINVAL;
@@ -169,12 +158,12 @@ int ib_find_cached_pkey(struct ib_device *device, 
	int ret = -ENOENT;

	int partial_ix = -1;



	if (port_num < start_port(device) || port_num > end_port(device))

	if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))

		return -EINVAL;



	read_lock_irqsave(&device->cache.lock, flags);



	cache = device->cache.pkey_cache[port_num - start_port(device)];

	cache = device->cache.pkey_cache[port_num - rdma_start_port(device)];



	*index = -1;
@@ -209,12 +198,12 @@ int ib_find_exact_cached_pkey(struct ib_device *device, 
	int i;

	int ret = -ENOENT;



	if (port_num < start_port(device) || port_num > end_port(device))

	if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))

		return -EINVAL;



	read_lock_irqsave(&device->cache.lock, flags);



	cache = device->cache.pkey_cache[port_num - start_port(device)];

	cache = device->cache.pkey_cache[port_num - rdma_start_port(device)];



	*index = -1;
@@ -238,11 +227,11 @@ int ib_get_cached_lmc(struct ib_device *device, 
	unsigned long flags;

	int ret = 0;



	if (port_num < start_port(device) || port_num > end_port(device))

	if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))

		return -EINVAL;



	read_lock_irqsave(&device->cache.lock, flags);

	*lmc = device->cache.lmc_cache[port_num - start_port(device)];

	*lmc = device->cache.lmc_cache[port_num - rdma_start_port(device)];

	read_unlock_irqrestore(&device->cache.lock, flags);



	return ret;
@@ -303,13 +292,13 @@ static void ib_cache_update(struct ib_device *device, 


	write_lock_irq(&device->cache.lock);



	old_pkey_cache = device->cache.pkey_cache[port - start_port(device)];

	old_gid_cache  = device->cache.gid_cache [port - start_port(device)];

	old_pkey_cache = device->cache.pkey_cache[port - rdma_start_port(device)];

	old_gid_cache  = device->cache.gid_cache [port - rdma_start_port(device)];



	device->cache.pkey_cache[port - start_port(device)] = pkey_cache;

	device->cache.gid_cache [port - start_port(device)] = gid_cache;

	device->cache.pkey_cache[port - rdma_start_port(device)] = pkey_cache;

	device->cache.gid_cache [port - rdma_start_port(device)] = gid_cache;



	device->cache.lmc_cache[port - start_port(device)] = tprops->lmc;

	device->cache.lmc_cache[port - rdma_start_port(device)] = tprops->lmc;



	write_unlock_irq(&device->cache.lock);
@@ -363,14 +352,14 @@ static void ib_cache_setup_one(struct ib_device *device) 


	device->cache.pkey_cache =

		kmalloc(sizeof *device->cache.pkey_cache *

			(end_port(device) - start_port(device) + 1), GFP_KERNEL);

			(rdma_end_port(device) - rdma_start_port(device) + 1), GFP_KERNEL);

	device->cache.gid_cache =

		kmalloc(sizeof *device->cache.gid_cache *

			(end_port(device) - start_port(device) + 1), GFP_KERNEL);

			(rdma_end_port(device) - rdma_start_port(device) + 1), GFP_KERNEL);



	device->cache.lmc_cache = kmalloc(sizeof *device->cache.lmc_cache *

					  (end_port(device) -

					   start_port(device) + 1),

					  (rdma_end_port(device) -

					   rdma_start_port(device) + 1),

					  GFP_KERNEL);



	if (!device->cache.pkey_cache || !device->cache.gid_cache ||
@@ -380,10 +369,10 @@ static void ib_cache_setup_one(struct ib_device *device) 
		goto err;

	}



	for (p = 0; p <= end_port(device) - start_port(device); ++p) {

	for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p) {

		device->cache.pkey_cache[p] = NULL;

		device->cache.gid_cache [p] = NULL;

		ib_cache_update(device, p + start_port(device));

		ib_cache_update(device, p + rdma_start_port(device));

	}



	INIT_IB_EVENT_HANDLER(&device->cache.event_handler,
@@ -394,7 +383,7 @@ static void ib_cache_setup_one(struct ib_device *device) 
	return;



err_cache:

	for (p = 0; p <= end_port(device) - start_port(device); ++p) {

	for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p) {

		kfree(device->cache.pkey_cache[p]);

		kfree(device->cache.gid_cache[p]);

	}
@@ -412,7 +401,7 @@ static void ib_cache_cleanup_one(struct ib_device *device) 
	ib_unregister_event_handler(&device->cache.event_handler);

	flush_workqueue(ib_wq);



	for (p = 0; p <= end_port(device) - start_port(device); ++p) {

	for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p) {

		kfree(device->cache.pkey_cache[p]);

		kfree(device->cache.gid_cache[p]);

	}

drivers/infiniband/core/cm.c

+21 −5
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ static int cm_alloc_msg(struct cm_id_private *cm_id_priv, 
	m = ib_create_send_mad(mad_agent, cm_id_priv->id.remote_cm_qpn,

			       cm_id_priv->av.pkey_index,

			       0, IB_MGMT_MAD_HDR, IB_MGMT_MAD_DATA,

			       GFP_ATOMIC);

			       GFP_ATOMIC,

			       IB_MGMT_BASE_VERSION);

	if (IS_ERR(m)) {

		ib_destroy_ah(ah);

		return PTR_ERR(m);
@@ -297,7 +298,8 @@ static int cm_alloc_response_msg(struct cm_port *port, 


	m = ib_create_send_mad(port->mad_agent, 1, mad_recv_wc->wc->pkey_index,

			       0, IB_MGMT_MAD_HDR, IB_MGMT_MAD_DATA,

			       GFP_ATOMIC);

			       GFP_ATOMIC,

			       IB_MGMT_BASE_VERSION);

	if (IS_ERR(m)) {

		ib_destroy_ah(ah);

		return PTR_ERR(m);
@@ -3759,11 +3761,9 @@ static void cm_add_one(struct ib_device *ib_device) 
	};

	unsigned long flags;

	int ret;

	int count = 0;

	u8 i;



	if (rdma_node_get_transport(ib_device->node_type) != RDMA_TRANSPORT_IB)

		return;



	cm_dev = kzalloc(sizeof(*cm_dev) + sizeof(*port) *

			 ib_device->phys_port_cnt, GFP_KERNEL);

	if (!cm_dev)
@@ -3782,6 +3782,9 @@ static void cm_add_one(struct ib_device *ib_device) 


	set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask);

	for (i = 1; i <= ib_device->phys_port_cnt; i++) {

		if (!rdma_cap_ib_cm(ib_device, i))

			continue;



		port = kzalloc(sizeof *port, GFP_KERNEL);

		if (!port)

			goto error1;
@@ -3808,7 +3811,13 @@ static void cm_add_one(struct ib_device *ib_device) 
		ret = ib_modify_port(ib_device, i, 0, &port_modify);

		if (ret)

			goto error3;



		count++;

	}



	if (!count)

		goto free;



	ib_set_client_data(ib_device, &cm_client, cm_dev);



	write_lock_irqsave(&cm.device_lock, flags);
@@ -3824,11 +3833,15 @@ static void cm_add_one(struct ib_device *ib_device) 
	port_modify.set_port_cap_mask = 0;

	port_modify.clr_port_cap_mask = IB_PORT_CM_SUP;

	while (--i) {

		if (!rdma_cap_ib_cm(ib_device, i))

			continue;



		port = cm_dev->port[i-1];

		ib_modify_port(ib_device, port->port_num, 0, &port_modify);

		ib_unregister_mad_agent(port->mad_agent);

		cm_remove_port_fs(port);

	}

free:

	device_unregister(cm_dev->device);

	kfree(cm_dev);

}
@@ -3852,6 +3865,9 @@ static void cm_remove_one(struct ib_device *ib_device) 
	write_unlock_irqrestore(&cm.device_lock, flags);



	for (i = 1; i <= ib_device->phys_port_cnt; i++) {

		if (!rdma_cap_ib_cm(ib_device, i))

			continue;



		port = cm_dev->port[i-1];

		ib_modify_port(ib_device, port->port_num, 0, &port_modify);

		ib_unregister_mad_agent(port->mad_agent);