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

Commit 1c29146d authored by Ido Shamay's avatar Ido Shamay Committed by David S. Miller
Browse files

net/mlx4: Add mlx4_SET_VPORT_QOS implementation 



Add the SET_VPORT_QOS device command, which is ntended for virtual
granular QoS configuration per VF in SRIOV mode. The SET_VPORT_QOS
command sets and queries QoS parameters of a VPort. Each priority
allowed for a VPort is assigned with a share of the BW, and a BW
limitation. QoS parameters can be modified at any time, but must be
initialized before any QP is associated with the VPort.

Signed-off-by: default avatarIdo Shamay <idos@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e95bb99

drivers/net/ethernet/mellanox/mlx4/cmd.c

+9 −0
Original line number Diff line number Diff line
@@ -1463,6 +1463,15 @@ static struct mlx4_cmd_info cmd_info[] = { 
		.verify = NULL,

		.wrapper = mlx4_CMD_EPERM_wrapper,

	},

	{

		.opcode = MLX4_CMD_SET_VPORT_QOS,

		.has_inbox = false,

		.has_outbox = true,

		.out_is_imm = false,

		.encode_slave_id = false,

		.verify = NULL,

		.wrapper = mlx4_CMD_EPERM_wrapper,

	},

	{

		.opcode = MLX4_CMD_CONF_SPECIAL_QP,

		.has_inbox = false,

drivers/net/ethernet/mellanox/mlx4/fw_qos.c

+89 −0
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ enum { 
	MLX4_ALLOCATE_VPP_QUERY		= 0x1

};



enum {

	/* set vport qos opcode modifiers */

	MLX4_SET_VPORT_QOS_SET		= 0x0,

	MLX4_SET_VPORT_QOS_QUERY	= 0x1

};



struct mlx4_set_port_prio2tc_context {

	u8 prio2tc[4];

};
@@ -63,6 +69,19 @@ struct mlx4_alloc_vpp_param { 
	__be32 vpp_p_up[MLX4_NUM_UP];

};



struct mlx4_prio_qos_param {

	__be32 bw_share;

	__be32 max_avg_bw;

	__be32 reserved;

	__be32 enable;

	__be32 reserved1[4];

};



struct mlx4_set_vport_context {

	__be32 reserved[8];

	struct mlx4_prio_qos_param qos_p_up[MLX4_NUM_UP];

};



int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc)

{

	struct mlx4_cmd_mailbox *mailbox;
@@ -198,3 +217,73 @@ int mlx4_ALLOCATE_VPP_set(struct mlx4_dev *dev, u8 port, u8 *vpp_p_up) 
	return err;

}

EXPORT_SYMBOL(mlx4_ALLOCATE_VPP_set);



int mlx4_SET_VPORT_QOS_get(struct mlx4_dev *dev, u8 port, u8 vport,

			   struct mlx4_vport_qos_param *out_param)

{

	int i;

	int err;

	struct mlx4_cmd_mailbox *mailbox;

	struct mlx4_set_vport_context *ctx;



	mailbox = mlx4_alloc_cmd_mailbox(dev);

	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);



	ctx = mailbox->buf;



	err = mlx4_cmd_box(dev, 0, mailbox->dma, (vport << 8) | port,

			   MLX4_SET_VPORT_QOS_QUERY,

			   MLX4_CMD_SET_VPORT_QOS,

			   MLX4_CMD_TIME_CLASS_A,

			   MLX4_CMD_NATIVE);

	if (err)

		goto out;



	for (i = 0; i < MLX4_NUM_UP; i++) {

		out_param[i].bw_share = be32_to_cpu(ctx->qos_p_up[i].bw_share);

		out_param[i].max_avg_bw =

			be32_to_cpu(ctx->qos_p_up[i].max_avg_bw);

		out_param[i].enable =

			!!(be32_to_cpu(ctx->qos_p_up[i].enable) & 31);

	}



out:

	mlx4_free_cmd_mailbox(dev, mailbox);



	return err;

}

EXPORT_SYMBOL(mlx4_SET_VPORT_QOS_get);



int mlx4_SET_VPORT_QOS_set(struct mlx4_dev *dev, u8 port, u8 vport,

			   struct mlx4_vport_qos_param *in_param)

{

	int i;

	int err;

	struct mlx4_cmd_mailbox *mailbox;

	struct mlx4_set_vport_context *ctx;



	mailbox = mlx4_alloc_cmd_mailbox(dev);

	if (IS_ERR(mailbox))

		return PTR_ERR(mailbox);



	ctx = mailbox->buf;



	for (i = 0; i < MLX4_NUM_UP; i++) {

		ctx->qos_p_up[i].bw_share = cpu_to_be32(in_param[i].bw_share);

		ctx->qos_p_up[i].max_avg_bw =

				cpu_to_be32(in_param[i].max_avg_bw);

		ctx->qos_p_up[i].enable =

				cpu_to_be32(in_param[i].enable << 31);

	}



	err = mlx4_cmd(dev, mailbox->dma, (vport << 8) | port,

		       MLX4_SET_VPORT_QOS_SET,

		       MLX4_CMD_SET_VPORT_QOS,

		       MLX4_CMD_TIME_CLASS_A,

		       MLX4_CMD_NATIVE);



	mlx4_free_cmd_mailbox(dev, mailbox);

	return err;

}

EXPORT_SYMBOL(mlx4_SET_VPORT_QOS_set);

drivers/net/ethernet/mellanox/mlx4/fw_qos.h

+36 −0
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ 
#define MLX4_NUM_UP 8

#define MLX4_NUM_TC 8



struct mlx4_vport_qos_param {

	u32 bw_share;

	u32 max_avg_bw;

	u8 enable;

};



/**

 * mlx4_SET_PORT_PRIO2TC - This routine maps user priorities to traffic

 * classes of a given port and device.
@@ -100,4 +106,34 @@ int mlx4_ALLOCATE_VPP_get(struct mlx4_dev *dev, u8 port, 
 **/

int mlx4_ALLOCATE_VPP_set(struct mlx4_dev *dev, u8 port, u8 *vpp_p_up);



/**

 * mlx4_SET_VPORT_QOS_get - Query QoS proporties of a Vport.

 * Each priority allowed for the Vport is assigned with a share of the BW,

 * and a BW limitation. This commands query the current QoS values.

 *

 * @dev: mlx4_dev.

 * @port: Physical port number.

 * @vport: Vport id.

 * @out_param: Array of mlx4_vport_qos_param that will contain the values.

 *

 * Returns 0 on success or a negative mlx4_core errno code.

 **/

int mlx4_SET_VPORT_QOS_get(struct mlx4_dev *dev, u8 port, u8 vport,

			   struct mlx4_vport_qos_param *out_param);



/**

 * mlx4_SET_VPORT_QOS_set - Set QoS proporties of a Vport.

 * QoS parameters can be modified at any time, but must be initialized

 * before any QP is associated with the VPort.

 *

 * @dev: mlx4_dev.

 * @port: Physical port number.

 * @vport: Vport id.

 * @out_param: Array of mlx4_vport_qos_param which holds the requested values.

 *

 * Returns 0 on success or a negative mlx4_core errno code.

 **/

int mlx4_SET_VPORT_QOS_set(struct mlx4_dev *dev, u8 port, u8 vport,

			   struct mlx4_vport_qos_param *in_param);



#endif /* MLX4_FW_QOS_H */

include/linux/mlx4/cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ enum { 
	MLX4_CMD_SET_ICM_SIZE	 = 0xffd,

	MLX4_CMD_ACCESS_REG	 = 0x3b,

	MLX4_CMD_ALLOCATE_VPP	 = 0x80,

	MLX4_CMD_SET_VPORT_QOS	 = 0x81,



	/*master notify fw on finish for slave's flr*/

	MLX4_CMD_INFORM_FLR_DONE = 0x5b,