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

Commit 147d1da9 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib'... 

Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and 'srp' into for-next
parents 0fb8bcf0 1fc8190d 9a3119e4 98e8be86 f614fc15 59a39ca3 1707cb4a da12c1f6 3453bddb

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8450,7 +8450,7 @@ S: Maintained 
F:	drivers/scsi/sr*



SCSI RDMA PROTOCOL (SRP) INITIATOR

M:	Bart Van Assche <bvanassche@acm.org>

M:	Bart Van Assche <bart.vanassche@sandisk.com>

L:	linux-rdma@vger.kernel.org

S:	Supported

W:	http://www.openfabrics.org

drivers/infiniband/core/umem_odp.c

+2 −1
Original line number Diff line number Diff line
@@ -294,7 +294,8 @@ int ib_umem_odp_get(struct ib_ucontext *context, struct ib_umem *umem) 
	if (likely(ib_umem_start(umem) != ib_umem_end(umem)))

		rbt_ib_umem_insert(&umem->odp_data->interval_tree,

				   &context->umem_tree);

	if (likely(!atomic_read(&context->notifier_count)))

	if (likely(!atomic_read(&context->notifier_count)) ||

	    context->odp_mrs_count == 1)

		umem->odp_data->mn_counters_active = true;

	else

		list_add(&umem->odp_data->no_private_counters,

drivers/infiniband/core/uverbs.h

+1 −0
Original line number Diff line number Diff line
@@ -258,5 +258,6 @@ IB_UVERBS_DECLARE_CMD(close_xrcd); 


IB_UVERBS_DECLARE_EX_CMD(create_flow);

IB_UVERBS_DECLARE_EX_CMD(destroy_flow);

IB_UVERBS_DECLARE_EX_CMD(query_device);



#endif /* UVERBS_H */

drivers/infiniband/core/uverbs_cmd.c

+108 −41
Original line number Diff line number Diff line
@@ -400,6 +400,52 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file, 
	return ret;

}



static void copy_query_dev_fields(struct ib_uverbs_file *file,

				  struct ib_uverbs_query_device_resp *resp,

				  struct ib_device_attr *attr)

{

	resp->fw_ver		= attr->fw_ver;

	resp->node_guid		= file->device->ib_dev->node_guid;

	resp->sys_image_guid	= attr->sys_image_guid;

	resp->max_mr_size	= attr->max_mr_size;

	resp->page_size_cap	= attr->page_size_cap;

	resp->vendor_id		= attr->vendor_id;

	resp->vendor_part_id	= attr->vendor_part_id;

	resp->hw_ver		= attr->hw_ver;

	resp->max_qp		= attr->max_qp;

	resp->max_qp_wr		= attr->max_qp_wr;

	resp->device_cap_flags	= attr->device_cap_flags;

	resp->max_sge		= attr->max_sge;

	resp->max_sge_rd	= attr->max_sge_rd;

	resp->max_cq		= attr->max_cq;

	resp->max_cqe		= attr->max_cqe;

	resp->max_mr		= attr->max_mr;

	resp->max_pd		= attr->max_pd;

	resp->max_qp_rd_atom	= attr->max_qp_rd_atom;

	resp->max_ee_rd_atom	= attr->max_ee_rd_atom;

	resp->max_res_rd_atom	= attr->max_res_rd_atom;

	resp->max_qp_init_rd_atom	= attr->max_qp_init_rd_atom;

	resp->max_ee_init_rd_atom	= attr->max_ee_init_rd_atom;

	resp->atomic_cap		= attr->atomic_cap;

	resp->max_ee			= attr->max_ee;

	resp->max_rdd			= attr->max_rdd;

	resp->max_mw			= attr->max_mw;

	resp->max_raw_ipv6_qp		= attr->max_raw_ipv6_qp;

	resp->max_raw_ethy_qp		= attr->max_raw_ethy_qp;

	resp->max_mcast_grp		= attr->max_mcast_grp;

	resp->max_mcast_qp_attach	= attr->max_mcast_qp_attach;

	resp->max_total_mcast_qp_attach	= attr->max_total_mcast_qp_attach;

	resp->max_ah			= attr->max_ah;

	resp->max_fmr			= attr->max_fmr;

	resp->max_map_per_fmr		= attr->max_map_per_fmr;

	resp->max_srq			= attr->max_srq;

	resp->max_srq_wr		= attr->max_srq_wr;

	resp->max_srq_sge		= attr->max_srq_sge;

	resp->max_pkeys			= attr->max_pkeys;

	resp->local_ca_ack_delay	= attr->local_ca_ack_delay;

	resp->phys_port_cnt		= file->device->ib_dev->phys_port_cnt;

}



ssize_t ib_uverbs_query_device(struct ib_uverbs_file *file,

			       const char __user *buf,

			       int in_len, int out_len)
@@ -420,47 +466,7 @@ ssize_t ib_uverbs_query_device(struct ib_uverbs_file *file, 
		return ret;



	memset(&resp, 0, sizeof resp);



	resp.fw_ver 		       = attr.fw_ver;

	resp.node_guid 		       = file->device->ib_dev->node_guid;

	resp.sys_image_guid 	       = attr.sys_image_guid;

	resp.max_mr_size 	       = attr.max_mr_size;

	resp.page_size_cap 	       = attr.page_size_cap;

	resp.vendor_id 		       = attr.vendor_id;

	resp.vendor_part_id 	       = attr.vendor_part_id;

	resp.hw_ver 		       = attr.hw_ver;

	resp.max_qp 		       = attr.max_qp;

	resp.max_qp_wr 		       = attr.max_qp_wr;

	resp.device_cap_flags 	       = attr.device_cap_flags;

	resp.max_sge 		       = attr.max_sge;

	resp.max_sge_rd 	       = attr.max_sge_rd;

	resp.max_cq 		       = attr.max_cq;

	resp.max_cqe 		       = attr.max_cqe;

	resp.max_mr 		       = attr.max_mr;

	resp.max_pd 		       = attr.max_pd;

	resp.max_qp_rd_atom 	       = attr.max_qp_rd_atom;

	resp.max_ee_rd_atom 	       = attr.max_ee_rd_atom;

	resp.max_res_rd_atom 	       = attr.max_res_rd_atom;

	resp.max_qp_init_rd_atom       = attr.max_qp_init_rd_atom;

	resp.max_ee_init_rd_atom       = attr.max_ee_init_rd_atom;

	resp.atomic_cap 	       = attr.atomic_cap;

	resp.max_ee 		       = attr.max_ee;

	resp.max_rdd 		       = attr.max_rdd;

	resp.max_mw 		       = attr.max_mw;

	resp.max_raw_ipv6_qp 	       = attr.max_raw_ipv6_qp;

	resp.max_raw_ethy_qp 	       = attr.max_raw_ethy_qp;

	resp.max_mcast_grp 	       = attr.max_mcast_grp;

	resp.max_mcast_qp_attach       = attr.max_mcast_qp_attach;

	resp.max_total_mcast_qp_attach = attr.max_total_mcast_qp_attach;

	resp.max_ah 		       = attr.max_ah;

	resp.max_fmr 		       = attr.max_fmr;

	resp.max_map_per_fmr 	       = attr.max_map_per_fmr;

	resp.max_srq 		       = attr.max_srq;

	resp.max_srq_wr 	       = attr.max_srq_wr;

	resp.max_srq_sge 	       = attr.max_srq_sge;

	resp.max_pkeys 		       = attr.max_pkeys;

	resp.local_ca_ack_delay        = attr.local_ca_ack_delay;

	resp.phys_port_cnt	       = file->device->ib_dev->phys_port_cnt;

	copy_query_dev_fields(file, &resp, &attr);



	if (copy_to_user((void __user *) (unsigned long) cmd.response,

			 &resp, sizeof resp))
@@ -3288,3 +3294,64 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file, 


	return ret ? ret : in_len;

}



int ib_uverbs_ex_query_device(struct ib_uverbs_file *file,

			      struct ib_udata *ucore,

			      struct ib_udata *uhw)

{

	struct ib_uverbs_ex_query_device_resp resp;

	struct ib_uverbs_ex_query_device  cmd;

	struct ib_device_attr attr;

	struct ib_device *device;

	int err;



	device = file->device->ib_dev;

	if (ucore->inlen < sizeof(cmd))

		return -EINVAL;



	err = ib_copy_from_udata(&cmd, ucore, sizeof(cmd));

	if (err)

		return err;



	if (cmd.comp_mask)

		return -EINVAL;



	if (cmd.reserved)

		return -EINVAL;



	resp.response_length = offsetof(typeof(resp), odp_caps);



	if (ucore->outlen < resp.response_length)

		return -ENOSPC;



	err = device->query_device(device, &attr);

	if (err)

		return err;



	copy_query_dev_fields(file, &resp.base, &attr);

	resp.comp_mask = 0;



	if (ucore->outlen < resp.response_length + sizeof(resp.odp_caps))

		goto end;



#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING

	resp.odp_caps.general_caps = attr.odp_caps.general_caps;

	resp.odp_caps.per_transport_caps.rc_odp_caps =

		attr.odp_caps.per_transport_caps.rc_odp_caps;

	resp.odp_caps.per_transport_caps.uc_odp_caps =

		attr.odp_caps.per_transport_caps.uc_odp_caps;

	resp.odp_caps.per_transport_caps.ud_odp_caps =

		attr.odp_caps.per_transport_caps.ud_odp_caps;

	resp.odp_caps.reserved = 0;

#else

	memset(&resp.odp_caps, 0, sizeof(resp.odp_caps));

#endif

	resp.response_length += sizeof(resp.odp_caps);



end:

	err = ib_copy_to_udata(ucore, &resp, resp.response_length);

	if (err)

		return err;



	return 0;

}

drivers/infiniband/core/uverbs_main.c

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static int (*uverbs_ex_cmd_table[])(struct ib_uverbs_file *file, 
				    struct ib_udata *uhw) = {

	[IB_USER_VERBS_EX_CMD_CREATE_FLOW]	= ib_uverbs_ex_create_flow,

	[IB_USER_VERBS_EX_CMD_DESTROY_FLOW]	= ib_uverbs_ex_destroy_flow,

	[IB_USER_VERBS_EX_CMD_QUERY_DEVICE]	= ib_uverbs_ex_query_device,

};



static void ib_uverbs_add_one(struct ib_device *device);