Commit e26e7b88 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA: Change MAD processing function to remove extra casting and parameter 

All users of process_mad() converts input pointers from ib_mad_hdr to be
ib_mad, update the function declaration to use ib_mad directly.

Also remove not used input MAD size parameter.

Link: https://lore.kernel.org/r/20191029062745.7932-17-leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Tested-By: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 333ee7e2

drivers/infiniband/core/mad.c

+6 −6
Original line number Diff line number Diff line
@@ -913,9 +913,9 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, 


	/* No GRH for DR SMP */

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

				      (const struct ib_mad_hdr *)smp, mad_size,

				      (struct ib_mad_hdr *)mad_priv->mad,

				      &mad_size, &out_mad_pkey_index);

				      (const struct ib_mad *)smp,

				      (struct ib_mad *)mad_priv->mad, &mad_size,

				      &out_mad_pkey_index);

	switch (ret)

	{

	case IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_REPLY:
@@ -2321,9 +2321,9 @@ static void ib_mad_recv_done(struct ib_cq *cq, struct ib_wc *wc) 
	if (port_priv->device->ops.process_mad) {

		ret = port_priv->device->ops.process_mad(

			port_priv->device, 0, port_priv->port_num, wc,

			&recv->grh, (const struct ib_mad_hdr *)recv->mad,

			recv->mad_size, (struct ib_mad_hdr *)response->mad,

			&mad_size, &resp_mad_pkey_index);

			&recv->grh, (const struct ib_mad *)recv->mad,

			(struct ib_mad *)response->mad, &mad_size,

			&resp_mad_pkey_index);



		if (opa)

			wc->pkey_index = resp_mad_pkey_index;

drivers/infiniband/core/sysfs.c

+2 −4
Original line number Diff line number Diff line
@@ -497,10 +497,8 @@ static int get_perf_mad(struct ib_device *dev, int port_num, __be16 attr, 
	if (attr != IB_PMA_CLASS_PORT_INFO)

		in_mad->data[41] = port_num;	/* PortSelect field */



	if ((dev->ops.process_mad(dev, IB_MAD_IGNORE_MKEY,

				  port_num, NULL, NULL,

				  (const struct ib_mad_hdr *)in_mad, mad_size,

				  (struct ib_mad_hdr *)out_mad, &mad_size,

	if ((dev->ops.process_mad(dev, IB_MAD_IGNORE_MKEY, port_num, NULL, NULL,

				  in_mad, out_mad, &mad_size,

				  &out_mad_pkey_index) &

	     (IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_REPLY)) !=

	    (IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_REPLY)) {

drivers/infiniband/hw/hfi1/mad.c

+5 −8
Original line number Diff line number Diff line
@@ -4915,11 +4915,10 @@ static int hfi1_process_ib_mad(struct ib_device *ibdev, int mad_flags, u8 port, 
 */

int hfi1_process_mad(struct ib_device *ibdev, int mad_flags, u8 port,

		     const struct ib_wc *in_wc, const struct ib_grh *in_grh,

		     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)

		     const struct ib_mad *in_mad, struct ib_mad *out_mad,

		     size_t *out_mad_size, u16 *out_mad_pkey_index)

{

	switch (in_mad->base_version) {

	switch (in_mad->mad_hdr.base_version) {

	case OPA_MGMT_BASE_VERSION:

		return hfi1_process_opa_mad(ibdev, mad_flags, port,

					    in_wc, in_grh,
@@ -4928,10 +4927,8 @@ int hfi1_process_mad(struct ib_device *ibdev, int mad_flags, u8 port, 
					    out_mad_size,

					    out_mad_pkey_index);

	case IB_MGMT_BASE_VERSION:

		return hfi1_process_ib_mad(ibdev, mad_flags, port,

					  in_wc, in_grh,

					  (const struct ib_mad *)in_mad,

					  (struct ib_mad *)out_mad);

		return hfi1_process_ib_mad(ibdev, mad_flags, port, in_wc,

					   in_grh, in_mad, out_mad);

	default:

		break;

	}

drivers/infiniband/hw/hfi1/verbs.h

+2 −3
Original line number Diff line number Diff line
@@ -330,9 +330,8 @@ void hfi1_sys_guid_chg(struct hfi1_ibport *ibp); 
void hfi1_node_desc_chg(struct hfi1_ibport *ibp);

int hfi1_process_mad(struct ib_device *ibdev, int mad_flags, u8 port,

		     const struct ib_wc *in_wc, const struct ib_grh *in_grh,

		     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);

		     const struct ib_mad *in_mad, struct ib_mad *out_mad,

		     size_t *out_mad_size, u16 *out_mad_pkey_index);



/*

 * The PSN_MASK and PSN_SHIFT allow for

drivers/infiniband/hw/mlx4/mad.c

+11 −14
Original line number Diff line number Diff line
@@ -983,13 +983,10 @@ static int iboe_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 


int mlx4_ib_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_hdr *in, size_t in_mad_size,

			struct ib_mad_hdr *out, size_t *out_mad_size,

			u16 *out_mad_pkey_index)

			const struct ib_mad *in, struct ib_mad *out,

			size_t *out_mad_size, u16 *out_mad_pkey_index)

{

	struct mlx4_ib_dev *dev = to_mdev(ibdev);

	const struct ib_mad *in_mad = (const struct ib_mad *)in;

	struct ib_mad *out_mad = (struct ib_mad *)out;

	enum rdma_link_layer link = rdma_port_get_link_layer(ibdev, port_num);



	/* iboe_process_mad() which uses the HCA flow-counters to implement IB PMA
@@ -997,20 +994,20 @@ int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
	 */

	if (link == IB_LINK_LAYER_INFINIBAND) {

		if (mlx4_is_slave(dev->dev) &&

		    (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT &&

		     (in_mad->mad_hdr.attr_id == IB_PMA_PORT_COUNTERS ||

		      in_mad->mad_hdr.attr_id == IB_PMA_PORT_COUNTERS_EXT ||

		      in_mad->mad_hdr.attr_id == IB_PMA_CLASS_PORT_INFO)))

			return iboe_process_mad(ibdev, mad_flags, port_num, in_wc,

						in_grh, in_mad, out_mad);

		    (in->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT &&

		     (in->mad_hdr.attr_id == IB_PMA_PORT_COUNTERS ||

		      in->mad_hdr.attr_id == IB_PMA_PORT_COUNTERS_EXT ||

		      in->mad_hdr.attr_id == IB_PMA_CLASS_PORT_INFO)))

			return iboe_process_mad(ibdev, mad_flags, port_num,

						in_wc, in_grh, in, out);



		return ib_process_mad(ibdev, mad_flags, port_num, in_wc,

				      in_grh, in_mad, out_mad);

		return ib_process_mad(ibdev, mad_flags, port_num, in_wc, in_grh,

				      in, out);

	}



	if (link == IB_LINK_LAYER_ETHERNET)

		return iboe_process_mad(ibdev, mad_flags, port_num, in_wc,

					in_grh, in_mad, out_mad);

					in_grh, in, out);



	return -EINVAL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE