mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct and paravirtualize them

To allow easy paravirtualization of P_Key and GID table sizes, keep
paravirtualized sizes in mlx4_dev->caps, but save the actual physical
sizes from FW in struct: mlx4_dev->phys_cap.

In addition, in SR-IOV mode, do the following:

1. Reduce reported P_Key table size by 1.
   This is done to reserve the highest P_Key index for internal use,
   for declaring an invalid P_Key in P_Key paravirtualization.
   We require a P_Key index which always contain an invalid P_Key
   value for this purpose (i.e., one which cannot be modified by
   the subnet manager).  The way to do this is to reduce the
   P_Key table size reported to the subnet manager by 1, so that
   it will not attempt to access the P_Key at index #127.

2. Paravirtualize the GID table size to 1. Thus, each guest sees
   only a single GID (at its paravirtualized index 0).

In addition, since we are paravirtualizing the GID table size to 1, we
add paravirtualization of the master GID event here (i.e., we do not
do ib_dispatch_event() for the GUID change event on the master, since
its (only) GUID never changes).

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>

1 files changed, 28 insertions, 4 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 58544b72bacb..5df3ac40a490 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -215,6 +215,10 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         for (i = 1; i <= dev->caps.num_ports; ++i) {
                 dev->caps.vl_cap[i]         = dev_cap->max_vl[i];
                 dev->caps.ib_mtu_cap[i]     = dev_cap->ib_mtu[i];
+                dev->phys_caps.gid_phys_table_len[i]  = dev_cap->max_gids[i];
+                dev->phys_caps.pkey_phys_table_len[i] = dev_cap->max_pkeys[i];
+                /* set gid and pkey table operating lengths by default
+                 * to non-sriov values */
                 dev->caps.gid_table_len[i]  = dev_cap->max_gids[i];
                 dev->caps.pkey_table_len[i] = dev_cap->max_pkeys[i];
                 dev->caps.port_width_cap[i] = dev_cap->max_port_width[i];
@@ -498,8 +502,13 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
                 return -ENODEV;
         }
 
-        for (i = 1; i <= dev->caps.num_ports; ++i)
+        for (i = 1; i <= dev->caps.num_ports; ++i) {
                 dev->caps.port_mask[i] = dev->caps.port_type[i];
+                if (mlx4_get_slave_pkey_gid_tbl_len(dev, i,
+                                                    &dev->caps.gid_table_len[i],
+                                                    &dev->caps.pkey_table_len[i]))
+                        return -ENODEV;
+        }
 
         if (dev->caps.uar_page_size * (dev->caps.num_uars -
                                        dev->caps.reserved_uars) >
@@ -536,7 +545,7 @@ int mlx4_change_port_types(struct mlx4_dev *dev,
                 for (port = 1; port <= dev->caps.num_ports; port++) {
                         mlx4_CLOSE_PORT(dev, port);
                         dev->caps.port_type[port] = port_types[port - 1];
-                        err = mlx4_SET_PORT(dev, port);
+                        err = mlx4_SET_PORT(dev, port, -1);
                         if (err) {
                                 mlx4_err(dev, "Failed to set port %d, "
                                               "aborting\n", port);
@@ -722,7 +731,7 @@ static ssize_t set_port_ib_mtu(struct device *dev,
         mlx4_unregister_device(mdev);
         for (port = 1; port <= mdev->caps.num_ports; port++) {
                 mlx4_CLOSE_PORT(mdev, port);
-                err = mlx4_SET_PORT(mdev, port);
+                err = mlx4_SET_PORT(mdev, port, -1);
                 if (err) {
                         mlx4_err(mdev, "Failed to set port %d, "
                                       "aborting\n", port);
@@ -1173,6 +1182,17 @@ err:
         return -EIO;
 }
 
+static void mlx4_parav_master_pf_caps(struct mlx4_dev *dev)
+{
+        int i;
+
+        for (i = 1; i <= dev->caps.num_ports; i++) {
+                dev->caps.gid_table_len[i] = 1;
+                dev->caps.pkey_table_len[i] =
+                        dev->phys_caps.pkey_phys_table_len[i] - 1;
+        }
+}
+
 static int mlx4_init_hca(struct mlx4_dev *dev)
 {
         struct mlx4_priv          *priv = mlx4_priv(dev);
@@ -1212,6 +1232,9 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
                         goto err_stop_fw;
                 }
 
+                if (mlx4_is_master(dev))
+                        mlx4_parav_master_pf_caps(dev);
+
                 profile = default_profile;
 
                 icm_size = mlx4_make_profile(dev, &profile, &dev_cap,
@@ -1500,7 +1523,8 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
                         else
                                 dev->caps.port_ib_mtu[port] = IB_MTU_4096;
 
-                        err = mlx4_SET_PORT(dev, port);
+                        err = mlx4_SET_PORT(dev, port, mlx4_is_master(dev) ?
+                                            dev->caps.pkey_table_len[port] : -1);
                         if (err) {
                                 mlx4_err(dev, "Failed to set port %d, aborting\n",
                                         port);