Commit 449fc488 authored by Matan Barak's avatar Matan Barak Committed by David S. Miller
Browse files

net/mlx4: Adapt code for N-Port VF 



Adds support for N-Port VFs, this includes:
1. Adding support in the wrapped FW command
	In wrapped commands, we need to verify and convert
	the slave's port into the real physical port.
	Furthermore, when sending the response back to the slave,
	a reverse conversion should be made.
2. Adjusting sqpn for QP1 para-virtualization
	The slave assumes that sqpn is used for QP1 communication.
	If the slave is assigned to a port != (first port), we need
	to adjust the sqpn that will direct its QP1 packets into the
	correct endpoint.
3. Adjusting gid[5] to modify the port for raw ethernet
	In B0 steering, gid[5] contains the port. It needs
	to be adjusted into the physical port.
4. Adjusting number of ports in the query / ports caps in the FW commands
	When a slave queries the hardware, it needs to view only
	the physical ports it's assigned to.
5. Adjusting the sched_qp according to the port number
	The QP port is encoded in the sched_qp, thus in modify_qp we need
	to encode the correct port in sched_qp.

Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f74462ac

drivers/infiniband/hw/mlx4/mad.c

+15 −14
Original line number Diff line number Diff line
@@ -1245,21 +1245,9 @@ out: 


static int get_slave_base_gid_ix(struct mlx4_ib_dev *dev, int slave, int port)

{

	int gids;

	int vfs;



	if (rdma_port_get_link_layer(&dev->ib_dev, port) == IB_LINK_LAYER_INFINIBAND)

		return slave;



	gids = MLX4_ROCE_MAX_GIDS - MLX4_ROCE_PF_GIDS;

	vfs = dev->dev->num_vfs;



	if (slave == 0)

		return 0;

	if (slave <= gids % vfs)

		return MLX4_ROCE_PF_GIDS + ((gids / vfs) + 1) * (slave - 1);



	return MLX4_ROCE_PF_GIDS + (gids % vfs) + ((gids / vfs) * (slave - 1));

	return mlx4_get_base_gid_ix(dev->dev, slave, port);

}



static void fill_in_real_sgid_index(struct mlx4_ib_dev *dev, int slave, int port,
@@ -1281,6 +1269,7 @@ static void mlx4_ib_multiplex_mad(struct mlx4_ib_demux_pv_ctx *ctx, struct ib_wc 
	struct ib_ah_attr ah_attr;

	u8 *slave_id;

	int slave;

	int port;



	/* Get slave that sent this packet */

	if (wc->src_qp < dev->dev->phys_caps.base_proxy_sqpn ||
@@ -1360,6 +1349,10 @@ static void mlx4_ib_multiplex_mad(struct mlx4_ib_demux_pv_ctx *ctx, struct ib_wc 
	if (ah_attr.ah_flags & IB_AH_GRH)

		fill_in_real_sgid_index(dev, slave, ctx->port, &ah_attr);



	port = mlx4_slave_convert_port(dev->dev, slave, ah_attr.port_num);

	if (port < 0)

		return;

	ah_attr.port_num = port;

	memcpy(ah_attr.dmac, tunnel->hdr.mac, 6);

	ah_attr.vlan_id = be16_to_cpu(tunnel->hdr.vlan);

	/* if slave have default vlan use it */
@@ -1949,7 +1942,15 @@ static int mlx4_ib_alloc_demux_ctx(struct mlx4_ib_dev *dev, 
	ctx->port = port;

	ctx->ib_dev = &dev->ib_dev;



	for (i = 0; i < dev->dev->caps.sqp_demux; i++) {

	for (i = 0;

	     i < min(dev->dev->caps.sqp_demux, (u16)(dev->dev->num_vfs + 1));

	     i++) {

		struct mlx4_active_ports actv_ports =

			mlx4_get_active_ports(dev->dev, i);



		if (!test_bit(port - 1, actv_ports.ports))

			continue;



		ret = alloc_pv_object(dev, i, port, &ctx->tun[i]);

		if (ret) {

			ret = -ENOMEM;

drivers/infiniband/hw/mlx4/main.c

+11 −4
Original line number Diff line number Diff line
@@ -2323,17 +2323,24 @@ static void do_slave_init(struct mlx4_ib_dev *ibdev, int slave, int do_init) 
	struct mlx4_dev *dev = ibdev->dev;

	int i;

	unsigned long flags;

	struct mlx4_active_ports actv_ports;

	unsigned int ports;

	unsigned int first_port;



	if (!mlx4_is_master(dev))

		return;



	dm = kcalloc(dev->caps.num_ports, sizeof *dm, GFP_ATOMIC);

	actv_ports = mlx4_get_active_ports(dev, slave);

	ports = bitmap_weight(actv_ports.ports, dev->caps.num_ports);

	first_port = find_first_bit(actv_ports.ports, dev->caps.num_ports);



	dm = kcalloc(ports, sizeof(*dm), GFP_ATOMIC);

	if (!dm) {

		pr_err("failed to allocate memory for tunneling qp update\n");

		goto out;

	}



	for (i = 0; i < dev->caps.num_ports; i++) {

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

		dm[i] = kmalloc(sizeof (struct mlx4_ib_demux_work), GFP_ATOMIC);

		if (!dm[i]) {

			pr_err("failed to allocate memory for tunneling qp update work struct\n");
@@ -2345,9 +2352,9 @@ static void do_slave_init(struct mlx4_ib_dev *ibdev, int slave, int do_init) 
		}

	}

	/* initialize or tear down tunnel QPs for the slave */

	for (i = 0; i < dev->caps.num_ports; i++) {

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

		INIT_WORK(&dm[i]->work, mlx4_ib_tunnels_update_work);

		dm[i]->port = i + 1;

		dm[i]->port = first_port + i + 1;

		dm[i]->slave = slave;

		dm[i]->do_init = do_init;

		dm[i]->dev = ibdev;

drivers/infiniband/hw/mlx4/sysfs.c

+5 −0
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ static int register_one_pkey_tree(struct mlx4_ib_dev *dev, int slave) 
	int port;

	struct kobject *p, *t;

	struct mlx4_port *mport;

	struct mlx4_active_ports actv_ports;



	get_name(dev, name, slave, sizeof name);
@@ -649,7 +650,11 @@ static int register_one_pkey_tree(struct mlx4_ib_dev *dev, int slave) 
		goto err_ports;

	}



	actv_ports = mlx4_get_active_ports(dev->dev, slave);



	for (port = 1; port <= dev->dev->caps.num_ports; ++port) {

		if (!test_bit(port - 1, actv_ports.ports))

			continue;

		err = add_port(dev, port, slave);

		if (err)

			goto err_add;

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

+20 −3
Original line number Diff line number Diff line
@@ -1643,8 +1643,16 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave) 
	int port, err;

	struct mlx4_vport_state *vp_admin;

	struct mlx4_vport_oper_state *vp_oper;



	for (port = 1; port <= MLX4_MAX_PORTS; port++) {

	struct mlx4_active_ports actv_ports = mlx4_get_active_ports(

			&priv->dev, slave);

	int min_port = find_first_bit(actv_ports.ports,

				      priv->dev.caps.num_ports) + 1;

	int max_port = min_port - 1 +

		bitmap_weight(actv_ports.ports, priv->dev.caps.num_ports);



	for (port = min_port; port <= max_port; port++) {

		if (!test_bit(port - 1, actv_ports.ports))

			continue;

		vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];

		vp_admin = &priv->mfunc.master.vf_admin[slave].vport[port];

		vp_oper->state = *vp_admin;
@@ -1685,8 +1693,17 @@ static void mlx4_master_deactivate_admin_state(struct mlx4_priv *priv, int slave 
{

	int port;

	struct mlx4_vport_oper_state *vp_oper;

	struct mlx4_active_ports actv_ports = mlx4_get_active_ports(

			&priv->dev, slave);

	int min_port = find_first_bit(actv_ports.ports,

				      priv->dev.caps.num_ports) + 1;

	int max_port = min_port - 1 +

		bitmap_weight(actv_ports.ports, priv->dev.caps.num_ports);



	for (port = 1; port <= MLX4_MAX_PORTS; port++) {



	for (port = min_port; port <= max_port; port++) {

		if (!test_bit(port - 1, actv_ports.ports))

			continue;

		vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];

		if (NO_INDX != vp_oper->vlan_idx) {

			__mlx4_unregister_vlan(&priv->dev,

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

+38 −10
Original line number Diff line number Diff line
@@ -271,7 +271,10 @@ enum slave_port_state mlx4_get_slave_port_state(struct mlx4_dev *dev, int slave, 
{

	struct mlx4_priv *priv = mlx4_priv(dev);

	struct mlx4_slave_state *s_state = priv->mfunc.master.slave_state;

	if (slave >= dev->num_slaves || port > MLX4_MAX_PORTS) {

	struct mlx4_active_ports actv_ports = mlx4_get_active_ports(dev, slave);



	if (slave >= dev->num_slaves || port > dev->caps.num_ports ||

	    port <= 0 || !test_bit(port - 1, actv_ports.ports)) {

		pr_err("%s: Error: asking for slave:%d, port:%d\n",

		       __func__, slave, port);

		return SLAVE_PORT_DOWN;
@@ -285,8 +288,10 @@ static int mlx4_set_slave_port_state(struct mlx4_dev *dev, int slave, u8 port, 
{

	struct mlx4_priv *priv = mlx4_priv(dev);

	struct mlx4_slave_state *s_state = priv->mfunc.master.slave_state;

	struct mlx4_active_ports actv_ports = mlx4_get_active_ports(dev, slave);



	if (slave >= dev->num_slaves || port > MLX4_MAX_PORTS || port == 0) {

	if (slave >= dev->num_slaves || port > dev->caps.num_ports ||

	    port <= 0 || !test_bit(port - 1, actv_ports.ports)) {

		pr_err("%s: Error: asking for slave:%d, port:%d\n",

		       __func__, slave, port);

		return -1;
@@ -300,9 +305,13 @@ static void set_all_slave_state(struct mlx4_dev *dev, u8 port, int event) 
{

	int i;

	enum slave_port_gen_event gen_event;

	struct mlx4_slaves_pport slaves_pport = mlx4_phys_to_slaves_pport(dev,

									  port);



	for (i = 0; i < dev->num_slaves; i++)

		set_and_calc_slave_port_state(dev, i, port, event, &gen_event);

	for (i = 0; i < dev->num_vfs + 1; i++)

		if (test_bit(i, slaves_pport.slaves))

			set_and_calc_slave_port_state(dev, i, port,

						      event, &gen_event);

}

/**************************************************************************

	The function get as input the new event to that port,
@@ -321,12 +330,14 @@ int set_and_calc_slave_port_state(struct mlx4_dev *dev, int slave, 
	struct mlx4_slave_state *ctx = NULL;

	unsigned long flags;

	int ret = -1;

	struct mlx4_active_ports actv_ports = mlx4_get_active_ports(dev, slave);

	enum slave_port_state cur_state =

		mlx4_get_slave_port_state(dev, slave, port);



	*gen_event = SLAVE_PORT_GEN_EVENT_NONE;



	if (slave >= dev->num_slaves || port > MLX4_MAX_PORTS || port == 0) {

	if (slave >= dev->num_slaves || port > dev->caps.num_ports ||

	    port <= 0 || !test_bit(port - 1, actv_ports.ports)) {

		pr_err("%s: Error: asking for slave:%d, port:%d\n",

		       __func__, slave, port);

		return ret;
@@ -542,15 +553,19 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) 
				       be64_to_cpu(eqe->event.cmd.out_param));

			break;



		case MLX4_EVENT_TYPE_PORT_CHANGE:

		case MLX4_EVENT_TYPE_PORT_CHANGE: {

			struct mlx4_slaves_pport slaves_port;

			port = be32_to_cpu(eqe->event.port_change.port) >> 28;

			slaves_port = mlx4_phys_to_slaves_pport(dev, port);

			if (eqe->subtype == MLX4_PORT_CHANGE_SUBTYPE_DOWN) {

				mlx4_dispatch_event(dev, MLX4_DEV_EVENT_PORT_DOWN,

						    port);

				mlx4_priv(dev)->sense.do_sense_port[port] = 1;

				if (!mlx4_is_master(dev))

					break;

				for (i = 0; i < dev->num_slaves; i++) {

				for (i = 0; i < dev->num_vfs + 1; i++) {

					if (!test_bit(i, slaves_port.slaves))

						continue;

					if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH) {

						if (i == mlx4_master_func_num(dev))

							continue;
@@ -558,8 +573,13 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) 
							 " to slave: %d, port:%d\n",

							 __func__, i, port);

						s_info = &priv->mfunc.master.vf_oper[slave].vport[port].state;

						if (IFLA_VF_LINK_STATE_AUTO == s_info->link_state)

						if (IFLA_VF_LINK_STATE_AUTO == s_info->link_state) {

							eqe->event.port_change.port =

								cpu_to_be32(

								(be32_to_cpu(eqe->event.port_change.port) & 0xFFFFFFF)

								| (mlx4_phys_to_slave_port(dev, i, port) << 28));

							mlx4_slave_event(dev, i, eqe);

						}

					} else {  /* IB port */

						set_and_calc_slave_port_state(dev, i, port,

									      MLX4_PORT_STATE_DEV_EVENT_PORT_DOWN,
@@ -580,13 +600,20 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) 
				if (!mlx4_is_master(dev))

					break;

				if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)

					for (i = 0; i < dev->num_slaves; i++) {

					for (i = 0; i < dev->num_vfs + 1; i++) {

						if (!test_bit(i, slaves_port.slaves))

							continue;

						if (i == mlx4_master_func_num(dev))

							continue;

						s_info = &priv->mfunc.master.vf_oper[slave].vport[port].state;

						if (IFLA_VF_LINK_STATE_AUTO == s_info->link_state)

						if (IFLA_VF_LINK_STATE_AUTO == s_info->link_state) {

							eqe->event.port_change.port =

								cpu_to_be32(

								(be32_to_cpu(eqe->event.port_change.port) & 0xFFFFFFF)

								| (mlx4_phys_to_slave_port(dev, i, port) << 28));

							mlx4_slave_event(dev, i, eqe);

						}

					}

				else /* IB port */

					/* port-up event will be sent to a slave when the

					 * slave's alias-guid is set. This is done in alias_GUID.c
@@ -594,6 +621,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) 
					set_all_slave_state(dev, port, MLX4_DEV_EVENT_PORT_UP);

			}

			break;

		}



		case MLX4_EVENT_TYPE_CQ_ERROR:

			mlx4_warn(dev, "CQ %s on CQN %06x\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE