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

Commit 59bfc59a authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'for-rc' into rdma.git for-next 

From git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git



This is required to resolve dependencies of the next series of RDMA
patches.

The code motion conflicts in drivers/infiniband/core/cache.c were
resolved.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parents ed7a01fd dd9a4034

drivers/infiniband/core/cache.c

+33 −33
Original line number Diff line number Diff line
@@ -335,6 +335,38 @@ static int add_roce_gid(struct ib_gid_table_entry *entry) 
	return 0;

}



/**

 * del_gid - Delete GID table entry

 *

 * @ib_dev:	IB device whose GID entry to be deleted

 * @port:	Port number of the IB device

 * @table:	GID table of the IB device for a port

 * @ix:		GID entry index to delete

 *

 */

static void del_gid(struct ib_device *ib_dev, u8 port,

		    struct ib_gid_table *table, int ix)

{

	struct ib_gid_table_entry *entry;



	lockdep_assert_held(&table->lock);



	dev_dbg(&ib_dev->dev, "%s port=%d index=%d gid %pI6\n", __func__, port,

		ix, table->data_vec[ix]->attr.gid.raw);



	write_lock_irq(&table->rwlock);

	entry = table->data_vec[ix];

	entry->state = GID_TABLE_ENTRY_PENDING_DEL;

	/*

	 * For non RoCE protocol, GID entry slot is ready to use.

	 */

	if (!rdma_protocol_roce(ib_dev, port))

		table->data_vec[ix] = NULL;

	write_unlock_irq(&table->rwlock);



	put_gid_entry_locked(entry);

}



/**

 * add_modify_gid - Add or modify GID table entry

 *
@@ -356,7 +388,7 @@ static int add_modify_gid(struct ib_gid_table *table, 
	 * this index.

	 */

	if (is_gid_entry_valid(table->data_vec[attr->index]))

		put_gid_entry(table->data_vec[attr->index]);

		del_gid(attr->device, attr->port_num, table, attr->index);



	/*

	 * Some HCA's report multiple GID entries with only one valid GID, and
@@ -384,38 +416,6 @@ static int add_modify_gid(struct ib_gid_table *table, 
	return ret;

}



/**

 * del_gid - Delete GID table entry

 *

 * @ib_dev:	IB device whose GID entry to be deleted

 * @port:	Port number of the IB device

 * @table:	GID table of the IB device for a port

 * @ix:		GID entry index to delete

 *

 */

static void del_gid(struct ib_device *ib_dev, u8 port,

		    struct ib_gid_table *table, int ix)

{

	struct ib_gid_table_entry *entry;



	lockdep_assert_held(&table->lock);



	dev_dbg(&ib_dev->dev, "%s port=%d index=%d gid %pI6\n", __func__, port,

		ix, table->data_vec[ix]->attr.gid.raw);



	write_lock_irq(&table->rwlock);

	entry = table->data_vec[ix];

	entry->state = GID_TABLE_ENTRY_PENDING_DEL;

	/*

	 * For non RoCE protocol, GID entry slot is ready to use.

	 */

	if (!rdma_protocol_roce(ib_dev, port))

		table->data_vec[ix] = NULL;

	write_unlock_irq(&table->rwlock);



	put_gid_entry_locked(entry);

}



/* rwlock should be read locked, or lock should be held */

static int find_gid(struct ib_gid_table *table, const union ib_gid *gid,

		    const struct ib_gid_attr *val, bool default_gid,

drivers/infiniband/core/cma.c

+7 −5
Original line number Diff line number Diff line
@@ -816,6 +816,7 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv) 
	dgid = (union ib_gid *) &addr->sib_addr;

	pkey = ntohs(addr->sib_pkey);



	mutex_lock(&lock);

	list_for_each_entry(cur_dev, &dev_list, list) {

		for (p = 1; p <= cur_dev->device->phys_port_cnt; ++p) {

			if (!rdma_cap_af_ib(cur_dev->device, p))
@@ -842,18 +843,19 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv) 
					cma_dev = cur_dev;

					sgid = gid;

					id_priv->id.port_num = p;

					goto found;

				}

			}

		}

	}



	if (!cma_dev)

	mutex_unlock(&lock);

	return -ENODEV;



found:

	cma_attach_to_dev(id_priv, cma_dev);

	mutex_unlock(&lock);

	addr = (struct sockaddr_ib *)cma_src_addr(id_priv);

	memcpy(&addr->sib_addr, &sgid, sizeof sgid);

	memcpy(&addr->sib_addr, &sgid, sizeof(sgid));

	cma_translate_ib(addr, &id_priv->id.route.addr.dev_addr);

	return 0;

}

drivers/infiniband/core/ucma.c

+2 −0
Original line number Diff line number Diff line
@@ -1759,6 +1759,8 @@ static int ucma_close(struct inode *inode, struct file *filp) 
		mutex_lock(&mut);

		if (!ctx->closing) {

			mutex_unlock(&mut);

			ucma_put_ctx(ctx);

			wait_for_completion(&ctx->comp);

			/* rdma_destroy_id ensures that no event handlers are

			 * inflight for that id before releasing it.

			 */

drivers/infiniband/core/uverbs_cmd.c

+45 −23
Original line number Diff line number Diff line
@@ -2020,32 +2020,54 @@ static int modify_qp(struct ib_uverbs_file *file, 


	if ((cmd->base.attr_mask & IB_QP_CUR_STATE &&

	    cmd->base.cur_qp_state > IB_QPS_ERR) ||

	    cmd->base.qp_state > IB_QPS_ERR) {

	    (cmd->base.attr_mask & IB_QP_STATE &&

	    cmd->base.qp_state > IB_QPS_ERR)) {

		ret = -EINVAL;

		goto release_qp;

	}



	if (cmd->base.attr_mask & IB_QP_STATE)

		attr->qp_state = cmd->base.qp_state;

	if (cmd->base.attr_mask & IB_QP_CUR_STATE)

		attr->cur_qp_state = cmd->base.cur_qp_state;

	if (cmd->base.attr_mask & IB_QP_PATH_MTU)

		attr->path_mtu = cmd->base.path_mtu;

	if (cmd->base.attr_mask & IB_QP_PATH_MIG_STATE)

		attr->path_mig_state = cmd->base.path_mig_state;

	if (cmd->base.attr_mask & IB_QP_QKEY)

		attr->qkey = cmd->base.qkey;

	if (cmd->base.attr_mask & IB_QP_RQ_PSN)

		attr->rq_psn = cmd->base.rq_psn;

	if (cmd->base.attr_mask & IB_QP_SQ_PSN)

		attr->sq_psn = cmd->base.sq_psn;

	if (cmd->base.attr_mask & IB_QP_DEST_QPN)

		attr->dest_qp_num = cmd->base.dest_qp_num;

	if (cmd->base.attr_mask & IB_QP_ACCESS_FLAGS)

		attr->qp_access_flags = cmd->base.qp_access_flags;

	if (cmd->base.attr_mask & IB_QP_PKEY_INDEX)

		attr->pkey_index = cmd->base.pkey_index;

	attr->alt_pkey_index	  = cmd->base.alt_pkey_index;

	if (cmd->base.attr_mask & IB_QP_EN_SQD_ASYNC_NOTIFY)

		attr->en_sqd_async_notify = cmd->base.en_sqd_async_notify;

	if (cmd->base.attr_mask & IB_QP_MAX_QP_RD_ATOMIC)

		attr->max_rd_atomic = cmd->base.max_rd_atomic;

	if (cmd->base.attr_mask & IB_QP_MAX_DEST_RD_ATOMIC)

		attr->max_dest_rd_atomic = cmd->base.max_dest_rd_atomic;

	if (cmd->base.attr_mask & IB_QP_MIN_RNR_TIMER)

		attr->min_rnr_timer = cmd->base.min_rnr_timer;

	if (cmd->base.attr_mask & IB_QP_PORT)

		attr->port_num = cmd->base.port_num;

	if (cmd->base.attr_mask & IB_QP_TIMEOUT)

		attr->timeout = cmd->base.timeout;

	if (cmd->base.attr_mask & IB_QP_RETRY_CNT)

		attr->retry_cnt = cmd->base.retry_cnt;

	if (cmd->base.attr_mask & IB_QP_RNR_RETRY)

		attr->rnr_retry = cmd->base.rnr_retry;

	if (cmd->base.attr_mask & IB_QP_ALT_PATH) {

		attr->alt_port_num = cmd->base.alt_port_num;

		attr->alt_timeout = cmd->base.alt_timeout;

		attr->alt_pkey_index = cmd->base.alt_pkey_index;

	}

	if (cmd->base.attr_mask & IB_QP_RATE_LIMIT)

		attr->rate_limit = cmd->rate_limit;



	if (cmd->base.attr_mask & IB_QP_AV)

drivers/infiniband/core/uverbs_main.c

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ static int ib_uverbs_comp_event_close(struct inode *inode, struct file *filp) 
			list_del(&entry->obj_list);

		kfree(entry);

	}

	file->ev_queue.is_closed = 1;

	spin_unlock_irq(&file->ev_queue.lock);



	uverbs_close_fd(filp);