git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From foo@baz Thu Oct 19 15:15:46 CEST 2017
   2 From: Majd Dibbiny <majd@mellanox.com>
   3 Date: Thu, 23 Feb 2017 12:02:43 +0200
   4 Subject: net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs
   5
   6 From: Majd Dibbiny <majd@mellanox.com>
   7
   8
   9 [ Upstream commit 95f1ba9a24af9769f6e20dfe9a77c863f253f311 ]
  10
  11 In the VF driver, module parameter mlx4_log_num_mgm_entry_size was
  12 mistakenly overwritten -- and in a manner which overrode the
  13 device-managed flow steering option encoded in the parameter.
  14
  15 log_num_mgm_entry_size is a global module parameter which
  16 affects all ConnectX-3 PFs installed on that host.
  17 If a VF changes log_num_mgm_entry_size, this will affect all PFs
  18 which are probed subsequent to the change (by disabling DMFS for
  19 those PFs).
  20
  21 Fixes: 3c439b5586e9 ("mlx4_core: Allow choosing flow steering mode")
  22 Signed-off-by: Majd Dibbiny <majd@mellanox.com>
  23 Reviewed-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
  24 Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
  25 Signed-off-by: David S. Miller <davem@davemloft.net>
  26 Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
  27 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  28 ---
  29  drivers/net/ethernet/mellanox/mlx4/main.c |    2 --
  30  1 file changed, 2 deletions(-)
  31
  32 --- a/drivers/net/ethernet/mellanox/mlx4/main.c
  33 +++ b/drivers/net/ethernet/mellanox/mlx4/main.c
  34 @@ -791,8 +791,6 @@ static int mlx4_slave_cap(struct mlx4_de
  35                 return -ENOSYS;
  36         }
  37
  38 -       mlx4_log_num_mgm_entry_size = hca_param.log_mc_entry_sz;
  39 -
  40         dev->caps.hca_core_clock = hca_param.hca_core_clock;
  41
  42         memset(&dev_cap, 0, sizeof(dev_cap));