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

Commit 73f5a82b authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

RDMA/mad: Reduce MAD scope to mlx5_ib only 



Management Datagram Interface (MAD) is applicable
only when physical port is Infiniband. It makes MAD
command logic to be completely unrelated to eth/core
parts of mlx5.

Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Acked-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 1c7fc5cb

drivers/infiniband/hw/mlx5/cmd.c

+37 −0
Original line number Diff line number Diff line
@@ -345,3 +345,40 @@ int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id, 
				       counter_set_id);

	return err;

}



int mlx5_cmd_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,

		     u16 opmod, u8 port)

{

	int outlen = MLX5_ST_SZ_BYTES(mad_ifc_out);

	int inlen = MLX5_ST_SZ_BYTES(mad_ifc_in);

	int err = -ENOMEM;

	void *data;

	void *resp;

	u32 *out;

	u32 *in;



	in = kzalloc(inlen, GFP_KERNEL);

	out = kzalloc(outlen, GFP_KERNEL);

	if (!in || !out)

		goto out;



	MLX5_SET(mad_ifc_in, in, opcode, MLX5_CMD_OP_MAD_IFC);

	MLX5_SET(mad_ifc_in, in, op_mod, opmod);

	MLX5_SET(mad_ifc_in, in, port, port);



	data = MLX5_ADDR_OF(mad_ifc_in, in, mad);

	memcpy(data, inb, MLX5_FLD_SZ_BYTES(mad_ifc_in, mad));



	err = mlx5_cmd_exec(dev, in, inlen, out, outlen);

	if (err)

		goto out;



	resp = MLX5_ADDR_OF(mad_ifc_out, out, response_mad_packet);

	memcpy(outb, resp,

	       MLX5_FLD_SZ_BYTES(mad_ifc_out, response_mad_packet));



out:

	kfree(out);

	kfree(in);

	return err;

}

drivers/infiniband/hw/mlx5/cmd.h

+2 −0
Original line number Diff line number Diff line
@@ -63,4 +63,6 @@ int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid); 
int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid);

int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id,

			     u16 uid);

int mlx5_cmd_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,

		     u16 opmod, u8 port);

#endif /* MLX5_IB_CMD_H */

drivers/infiniband/hw/mlx5/mad.c

+7 −4
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <rdma/ib_smi.h>

#include <rdma/ib_pma.h>

#include "mlx5_ib.h"

#include "cmd.h"



enum {

	MLX5_IB_VENDOR_CLASS1 = 0x9,
@@ -51,9 +52,10 @@ static bool can_do_mad_ifc(struct mlx5_ib_dev *dev, u8 port_num, 
	return dev->mdev->port_caps[port_num - 1].has_smi;

}



int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey,

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

		 const void *in_mad, void *response_mad)

static int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey,

			int ignore_bkey, u8 port, const struct ib_wc *in_wc,

			const struct ib_grh *in_grh, const void *in_mad,

			void *response_mad)

{

	u8 op_modifier = 0;
@@ -68,7 +70,8 @@ int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey, 
	if (ignore_bkey || !in_wc)

		op_modifier |= 0x2;



	return mlx5_core_mad_ifc(dev->mdev, in_mad, response_mad, op_modifier, port);

	return mlx5_cmd_mad_ifc(dev->mdev, in_mad, response_mad, op_modifier,

				port);

}



static int process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,

drivers/infiniband/hw/mlx5/mlx5_ib.h

+0 −3
Original line number Diff line number Diff line
@@ -1038,9 +1038,6 @@ void mlx5_ib_db_unmap_user(struct mlx5_ib_ucontext *context, struct mlx5_db *db) 
void __mlx5_ib_cq_clean(struct mlx5_ib_cq *cq, u32 qpn, struct mlx5_ib_srq *srq);

void mlx5_ib_cq_clean(struct mlx5_ib_cq *cq, u32 qpn, struct mlx5_ib_srq *srq);

void mlx5_ib_free_srq_wqe(struct mlx5_ib_srq *srq, int wqe_index);

int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey,

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

		 const void *in_mad, void *response_mad);

struct ib_ah *mlx5_ib_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr,

				u32 flags, struct ib_udata *udata);

int mlx5_ib_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr);

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj-$(CONFIG_MLX5_CORE) += mlx5_core.o 
#

mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \

		health.o mcg.o cq.o alloc.o qp.o port.o mr.o pd.o \

		mad.o transobj.o vport.o sriov.o fs_cmd.o fs_core.o \

		transobj.o vport.o sriov.o fs_cmd.o fs_core.o \

		fs_counters.o rl.o lag.o dev.o events.o wq.o lib/gid.o \

		lib/devcom.o diag/fs_tracepoint.o diag/fw_tracer.o