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

Commit 4cd7c947 authored by Ira Weiny's avatar Ira Weiny Committed by Doug Ledford
Browse files

IB/mad: Add support for additional MAD info to/from drivers 



In order to support alternate sized MADs (and variable sized MADs on OPA
devices) add in/out MAD size parameters to the process_mad core call.

In addition, add an out_mad_pkey_index to communicate the pkey index the driver
wishes the MAD stack to use when sending OPA MAD responses.

The out MAD size and the out MAD PKey index are required by the MAD
stack to generate responses on OPA devices.

Furthermore, the in and out MAD parameters are made generic by specifying them
as ib_mad_hdr rather than ib_mad.

Drivers are modified as needed and are protected by BUG_ON flags if the MAD
sizes passed to them is incorrect.

Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent c9082e51

drivers/infiniband/core/mad.c

+12 −5
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, 
	struct ib_wc mad_wc;

	struct ib_send_wr *send_wr = &mad_send_wr->send_wr;

	size_t mad_size = port_mad_size(mad_agent_priv->qp_info->port_priv);

	u16 out_mad_pkey_index = 0;



	if (device->node_type == RDMA_NODE_IB_SWITCH &&

	    smp->mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)
@@ -811,8 +812,9 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, 


	/* No GRH for DR SMP */

	ret = device->process_mad(device, 0, port_num, &mad_wc, NULL,

				  (const struct ib_mad *)smp,

				  (struct ib_mad *)mad_priv->mad);

				  (const struct ib_mad_hdr *)smp, mad_size,

				  (struct ib_mad_hdr *)mad_priv->mad,

				  &mad_size, &out_mad_pkey_index);

	switch (ret)

	{

	case IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_REPLY:
@@ -2030,6 +2032,8 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv, 
	struct ib_mad_agent_private *mad_agent;

	int port_num;

	int ret = IB_MAD_RESULT_SUCCESS;

	size_t mad_size;

	u16 resp_mad_pkey_index = 0;



	mad_list = (struct ib_mad_list_head *)(unsigned long)wc->wr_id;

	qp_info = mad_list->mad_queue->qp_info;
@@ -2057,7 +2061,8 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv, 
	if (!validate_mad((const struct ib_mad_hdr *)recv->mad, qp_info->qp->qp_num))

		goto out;



	response = alloc_mad_private(recv->mad_size, GFP_ATOMIC);

	mad_size = recv->mad_size;

	response = alloc_mad_private(mad_size, GFP_KERNEL);

	if (!response) {

		dev_err(&port_priv->device->dev,

			"ib_mad_recv_done_handler no memory for response buffer\n");
@@ -2082,8 +2087,10 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv, 
		ret = port_priv->device->process_mad(port_priv->device, 0,

						     port_priv->port_num,

						     wc, &recv->grh,

						     (const struct ib_mad *)recv->mad,

						     (struct ib_mad *)response->mad);

						     (const struct ib_mad_hdr *)recv->mad,

						     recv->mad_size,

						     (struct ib_mad_hdr *)response->mad,

						     &mad_size, &resp_mad_pkey_index);

		if (ret & IB_MAD_RESULT_SUCCESS) {

			if (ret & IB_MAD_RESULT_CONSUMED)

				goto out;

drivers/infiniband/core/sysfs.c

+6 −1
Original line number Diff line number Diff line
@@ -326,6 +326,8 @@ static ssize_t show_pma_counter(struct ib_port *p, struct port_attribute *attr, 
	int width  = (tab_attr->index >> 16) & 0xff;

	struct ib_mad *in_mad  = NULL;

	struct ib_mad *out_mad = NULL;

	size_t mad_size = sizeof(*out_mad);

	u16 out_mad_pkey_index = 0;

	ssize_t ret;



	if (!p->ibdev->process_mad)
@@ -347,7 +349,10 @@ static ssize_t show_pma_counter(struct ib_port *p, struct port_attribute *attr, 
	in_mad->data[41] = p->port_num;	/* PortSelect field */



	if ((p->ibdev->process_mad(p->ibdev, IB_MAD_IGNORE_MKEY,

		 p->port_num, NULL, NULL, in_mad, out_mad) &

		 p->port_num, NULL, NULL,

		 (const struct ib_mad_hdr *)in_mad, mad_size,

		 (struct ib_mad_hdr *)out_mad, &mad_size,

		 &out_mad_pkey_index) &

	     (IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_REPLY)) !=

	    (IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_REPLY)) {

		ret = -EINVAL;

drivers/infiniband/hw/amso1100/c2_provider.c

+5 −1
Original line number Diff line number Diff line
@@ -592,7 +592,11 @@ static int c2_process_mad(struct ib_device *ibdev, 
			  u8 port_num,

			  const struct ib_wc *in_wc,

			  const struct ib_grh *in_grh,

			  const struct ib_mad *in_mad, struct ib_mad *out_mad)

			  const struct ib_mad_hdr *in_mad,

			  size_t in_mad_size,

			  struct ib_mad_hdr *out_mad,

			  size_t *out_mad_size,

			  u16 *out_mad_pkey_index)

{

	pr_debug("%s:%u\n", __func__, __LINE__);

	return -ENOSYS;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+5 −1
Original line number Diff line number Diff line
@@ -87,7 +87,11 @@ static int iwch_process_mad(struct ib_device *ibdev, 
			    u8 port_num,

			    const struct ib_wc *in_wc,

			    const struct ib_grh *in_grh,

			    const struct ib_mad *in_mad, struct ib_mad *out_mad)

			    const struct ib_mad_hdr *in_mad,

			    size_t in_mad_size,

			    struct ib_mad_hdr *out_mad,

			    size_t *out_mad_size,

			    u16 *out_mad_pkey_index)

{

	return -ENOSYS;

}

drivers/infiniband/hw/cxgb4/provider.c

+5 −2
Original line number Diff line number Diff line
@@ -82,8 +82,11 @@ static int c4iw_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
static int c4iw_process_mad(struct ib_device *ibdev, int mad_flags,

			    u8 port_num, const struct ib_wc *in_wc,

			    const struct ib_grh *in_grh,

			    const struct ib_mad *in_mad,

			    struct ib_mad *out_mad)

			    const struct ib_mad_hdr *in_mad,

			    size_t in_mad_size,

			    struct ib_mad_hdr *out_mad,

			    size_t *out_mad_size,

			    u16 *out_mad_pkey_index)

{

	return -ENOSYS;

}