diff options
| author | Yishai Hadas | 2012-08-13 10:15:07 +0200 |
|---|---|---|
| committer | Roland Dreier | 2012-08-16 06:05:26 +0200 |
| commit | 3de819e6b642fdd51904f5f4d2716d7466a2f7f5 (patch) | |
| tree | 0f3fd1c557ef4dcb1bb93188c3b585ff4f0b0a44 /drivers/net/ethernet/mellanox/mlx4/icm.h | |
| parent | mlx4_core: Allow large mlx4_buddy bitmaps (diff) | |
| download | kernel-qcow2-linux-3de819e6b642fdd51904f5f4d2716d7466a2f7f5.tar.gz kernel-qcow2-linux-3de819e6b642fdd51904f5f4d2716d7466a2f7f5.tar.xz kernel-qcow2-linux-3de819e6b642fdd51904f5f4d2716d7466a2f7f5.zip | |
mlx4_core: Fix integer overflow issues around MTT table
Fix some issues around int variables used in data structures related
to memory registration.
Handle int overflow in mlx4_init_icm_table by using a u64 intermediate
variable and changing struct mlx4_icm_table num_obj field to be u32.
Change some more fields/variables to use u32 instead of int to prevent
a case where the variable becomes negative when bit 31 is set.
Also subtract log_mtts_per_seg from the exponent when computing
num_mtt, since its added later on in that very same code area.
This and the previous commit fixes some issues which actually prevent
commit db5a7a65c058 ("mlx4_core: Scale size of MTT table with system
RAM") from working. Now, when the number of MTTs is scaled with the
size of the RAM we can map up to 8TB.
Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Jack Morgenstein <jackm@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/icm.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/icm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.h b/drivers/net/ethernet/mellanox/mlx4/icm.h index 19e4efc0b342..a67744f53506 100644 --- a/drivers/net/ethernet/mellanox/mlx4/icm.h +++ b/drivers/net/ethernet/mellanox/mlx4/icm.h @@ -78,7 +78,7 @@ int mlx4_table_get_range(struct mlx4_dev *dev, struct mlx4_icm_table *table, void mlx4_table_put_range(struct mlx4_dev *dev, struct mlx4_icm_table *table, int start, int end); int mlx4_init_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table, - u64 virt, int obj_size, int nobj, int reserved, + u64 virt, int obj_size, u32 nobj, int reserved, int use_lowmem, int use_coherent); void mlx4_cleanup_icm_table(struct mlx4_dev *dev, struct mlx4_icm_table *table); void *mlx4_table_find(struct mlx4_icm_table *table, int obj, dma_addr_t *dma_handle); |