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: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 31 insertions, 18 deletions

diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 2c572aed3f6f..fd36ec672632 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -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;
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 2ff428b17088..6cb85467dde7 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -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;
diff --git a/drivers/infiniband/hw/mlx4/sysfs.c b/drivers/infiniband/hw/mlx4/sysfs.c
index db2ea31df832..5a38e43eca65 100644
--- a/drivers/infiniband/hw/mlx4/sysfs.c
+++ b/drivers/infiniband/hw/mlx4/sysfs.c
@@ -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;