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

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

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

Pull rdma fixes frfom Jason Gunthorpe:
 "Not much so far. We have the usual batch of bugs and two fixes to code
  merged this cycle:

   - Restore valgrind support for the ioctl verbs interface merged this
     window, and fix a missed error code on an error path from that
     conversion

   - A user reported crash on obsolete mthca hardware

   - pvrdma was using the wrong command opcode toward the hypervisor

   - NULL pointer crash regression when dumping rdma-cm over netlink

   - Be conservative about exposing the global rkey"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/uverbs: Mark ioctl responses with UVERBS_ATTR_F_VALID_OUTPUT
  RDMA/mthca: Clear QP objects during their allocation
  RDMA/vmw_pvrdma: Return the correct opcode when creating WR
  RDMA/cma: Add cm_id restrack resource based on kernel or user cm_id type
  RDMA/nldev: Don't expose unsafe global rkey to regular user
  RDMA/uverbs: Fix post send success return value in case of error
parents 1092a94f d6f4a21f

drivers/infiniband/core/cma.c

+4 −1
Original line number Diff line number Diff line
@@ -494,7 +494,10 @@ static void _cma_attach_to_dev(struct rdma_id_private *id_priv, 
	id_priv->id.route.addr.dev_addr.transport =

		rdma_node_get_transport(cma_dev->device->node_type);

	list_add_tail(&id_priv->list, &cma_dev->id_list);

	if (id_priv->res.kern_name)

		rdma_restrack_kadd(&id_priv->res);

	else

		rdma_restrack_uadd(&id_priv->res);

}



static void cma_attach_to_dev(struct rdma_id_private *id_priv,

drivers/infiniband/core/nldev.c

+0 −4
Original line number Diff line number Diff line
@@ -584,10 +584,6 @@ static int fill_res_pd_entry(struct sk_buff *msg, struct netlink_callback *cb, 
	if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_RES_USECNT,

			      atomic_read(&pd->usecnt), RDMA_NLDEV_ATTR_PAD))

		goto err;

	if ((pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY) &&

	    nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY,

			pd->unsafe_global_rkey))

		goto err;



	if (fill_res_name_pid(msg, res))

		goto err;

drivers/infiniband/core/rdma_core.h

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,8 @@ int uverbs_finalize_object(struct ib_uobject *uobj, 
			   enum uverbs_obj_access access,

			   bool commit);



int uverbs_output_written(const struct uverbs_attr_bundle *bundle, size_t idx);



void setup_ufile_idr_uobject(struct ib_uverbs_file *ufile);

void release_ufile_idr_uobject(struct ib_uverbs_file *ufile);

drivers/infiniband/core/uverbs_cmd.c

+10 −1
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ static int uverbs_response(struct uverbs_attr_bundle *attrs, const void *resp, 
{

	int ret;



	if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CORE_OUT))

		return uverbs_copy_to_struct_or_zero(

			attrs, UVERBS_ATTR_CORE_OUT, resp, resp_len);



	if (copy_to_user(attrs->ucore.outbuf, resp,

			 min(attrs->ucore.outlen, resp_len)))

		return -EFAULT;
@@ -1181,6 +1185,9 @@ static int ib_uverbs_poll_cq(struct uverbs_attr_bundle *attrs) 
		goto out_put;

	}



	if (uverbs_attr_is_valid(attrs, UVERBS_ATTR_CORE_OUT))

		ret = uverbs_output_written(attrs, UVERBS_ATTR_CORE_OUT);



	ret = 0;



out_put:
@@ -2012,8 +2019,10 @@ static int ib_uverbs_post_send(struct uverbs_attr_bundle *attrs) 
		return -ENOMEM;



	qp = uobj_get_obj_read(qp, UVERBS_OBJECT_QP, cmd.qp_handle, attrs);

	if (!qp)

	if (!qp) {

		ret = -EINVAL;

		goto out;

	}



	is_ud = qp->qp_type == IB_QPT_UD;

	sg_ind = 0;

drivers/infiniband/core/uverbs_ioctl.c

+49 −13
Original line number Diff line number Diff line
@@ -144,6 +144,21 @@ static bool uverbs_is_attr_cleared(const struct ib_uverbs_attr *uattr, 
			   0, uattr->len - len);

}



static int uverbs_set_output(const struct uverbs_attr_bundle *bundle,

			     const struct uverbs_attr *attr)

{

	struct bundle_priv *pbundle =

		container_of(bundle, struct bundle_priv, bundle);

	u16 flags;



	flags = pbundle->uattrs[attr->ptr_attr.uattr_idx].flags |

		UVERBS_ATTR_F_VALID_OUTPUT;

	if (put_user(flags,

		     &pbundle->user_attrs[attr->ptr_attr.uattr_idx].flags))

		return -EFAULT;

	return 0;

}



static int uverbs_process_idrs_array(struct bundle_priv *pbundle,

				     const struct uverbs_api_attr *attr_uapi,

				     struct uverbs_objs_arr_attr *attr,
@@ -455,6 +470,19 @@ static int ib_uverbs_run_method(struct bundle_priv *pbundle, 
		ret = handler(&pbundle->bundle);

	}



	/*

	 * Until the drivers are revised to use the bundle directly we have to

	 * assume that the driver wrote to its UHW_OUT and flag userspace

	 * appropriately.

	 */

	if (!ret && pbundle->method_elm->has_udata) {

		const struct uverbs_attr *attr =

			uverbs_attr_get(&pbundle->bundle, UVERBS_ATTR_UHW_OUT);



		if (!IS_ERR(attr))

			ret = uverbs_set_output(&pbundle->bundle, attr);

	}



	/*

	 * EPROTONOSUPPORT is ONLY to be returned if the ioctl framework can

	 * not invoke the method because the request is not supported.  No
@@ -706,10 +734,7 @@ void uverbs_fill_udata(struct uverbs_attr_bundle *bundle, 
int uverbs_copy_to(const struct uverbs_attr_bundle *bundle, size_t idx,

		   const void *from, size_t size)

{

	struct bundle_priv *pbundle =

		container_of(bundle, struct bundle_priv, bundle);

	const struct uverbs_attr *attr = uverbs_attr_get(bundle, idx);

	u16 flags;

	size_t min_size;



	if (IS_ERR(attr))
@@ -719,16 +744,25 @@ int uverbs_copy_to(const struct uverbs_attr_bundle *bundle, size_t idx, 
	if (copy_to_user(u64_to_user_ptr(attr->ptr_attr.data), from, min_size))

		return -EFAULT;



	flags = pbundle->uattrs[attr->ptr_attr.uattr_idx].flags |

		UVERBS_ATTR_F_VALID_OUTPUT;

	if (put_user(flags,

		     &pbundle->user_attrs[attr->ptr_attr.uattr_idx].flags))

		return -EFAULT;



	return 0;

	return uverbs_set_output(bundle, attr);

}

EXPORT_SYMBOL(uverbs_copy_to);





/*

 * This is only used if the caller has directly used copy_to_use to write the

 * data.  It signals to user space that the buffer is filled in.

 */

int uverbs_output_written(const struct uverbs_attr_bundle *bundle, size_t idx)

{

	const struct uverbs_attr *attr = uverbs_attr_get(bundle, idx);



	if (IS_ERR(attr))

		return PTR_ERR(attr);



	return uverbs_set_output(bundle, attr);

}



int _uverbs_get_const(s64 *to, const struct uverbs_attr_bundle *attrs_bundle,

		      size_t idx, s64 lower_bound, u64 upper_bound,

		      s64  *def_val)
@@ -757,8 +791,10 @@ int uverbs_copy_to_struct_or_zero(const struct uverbs_attr_bundle *bundle, 
{

	const struct uverbs_attr *attr = uverbs_attr_get(bundle, idx);



	if (clear_user(u64_to_user_ptr(attr->ptr_attr.data),

		       attr->ptr_attr.len))

	if (size < attr->ptr_attr.len) {

		if (clear_user(u64_to_user_ptr(attr->ptr_attr.data) + size,

			       attr->ptr_attr.len - size))

			return -EFAULT;

	}

	return uverbs_copy_to(bundle, idx, from, size);

}