diff options
| author | Jack Morgenstein <jackm@dev.mellanox.co.il> | 2015-02-02 15:18:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-02 19:38:04 -0800 |
| commit | 5a2e87b16875f9b83b7e9494cf1fce8e17dc764a (patch) | |
| tree | 2c2efb6be3aa538a17a5d7e701fcb5a005c399ed /drivers/net/ethernet/mellanox | |
| parent | c101cff9010083a8796353a75673fd100b077b79 (diff) | |
| download | linux-stable-5a2e87b16875f9b83b7e9494cf1fce8e17dc764a.tar.gz linux-stable-5a2e87b16875f9b83b7e9494cf1fce8e17dc764a.tar.bz2 linux-stable-5a2e87b16875f9b83b7e9494cf1fce8e17dc764a.zip | |
net/mlx4_core: Fix kernel Oops (mem corruption) when working with more than 80 VFs
Commit de966c592802 (net/mlx4_core: Support more than 64 VFs) was meant to
allow up to 126 VFs. However, due to leaving MLX4_MFUNC_MAX too low, using
more than 80 VFs resulted in memory corruptions (and Oopses) when more than
80 VFs were requested. In addition, the number of slaves was left too high.
This commit fixes these issues.
Fixes: de966c592802 ("net/mlx4_core: Support more than 64 VFs")
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h index bdd4eea2247c..210691c89b6c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h @@ -235,7 +235,8 @@ do { \ extern int mlx4_log_num_mgm_entry_size; extern int log_mtts_per_seg; -#define MLX4_MAX_NUM_SLAVES (MLX4_MAX_NUM_PF + MLX4_MAX_NUM_VF) +#define MLX4_MAX_NUM_SLAVES (min(MLX4_MAX_NUM_PF + MLX4_MAX_NUM_VF, \ + MLX4_MFUNC_MAX)) #define ALL_SLAVES 0xff struct mlx4_bitmap { |