提交 db5a7a65 编写于 作者: R Roland Dreier

mlx4_core: Scale size of MTT table with system RAM

The current driver defaults to 1M MTT segments, where each segment holds
8 MTT entries.  This limits the total memory registered to 8M * PAGE_SIZE
which is 32GB with 4K pages.  Since systems that have much more memory
are pretty common now (at least among systems with InfiniBand hardware),
this limit ends up getting hit in practice quite a bit.

Handle this by having the driver allocate at least enough MTT entries to
cover 2 * totalram pages.
Signed-off-by: NRoland Dreier <roland@purestorage.com>
上级 096335b3
...@@ -403,7 +403,7 @@ struct mlx4_profile { ...@@ -403,7 +403,7 @@ struct mlx4_profile {
int num_cq; int num_cq;
int num_mcg; int num_mcg;
int num_mpt; int num_mpt;
int num_mtt; unsigned num_mtt;
}; };
struct mlx4_fw { struct mlx4_fw {
......
...@@ -83,12 +83,31 @@ u64 mlx4_make_profile(struct mlx4_dev *dev, ...@@ -83,12 +83,31 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
u64 total_size = 0; u64 total_size = 0;
struct mlx4_resource *profile; struct mlx4_resource *profile;
struct mlx4_resource tmp; struct mlx4_resource tmp;
struct sysinfo si;
int i, j; int i, j;
profile = kcalloc(MLX4_RES_NUM, sizeof(*profile), GFP_KERNEL); profile = kcalloc(MLX4_RES_NUM, sizeof(*profile), GFP_KERNEL);
if (!profile) if (!profile)
return -ENOMEM; return -ENOMEM;
/*
* We want to scale the number of MTTs with the size of the
* system memory, since it makes sense to register a lot of
* memory on a system with a lot of memory. As a heuristic,
* make sure we have enough MTTs to cover twice the system
* memory (with PAGE_SIZE entries).
*
* This number has to be a power of two and fit into 32 bits
* due to device limitations, so cap this at 2^31 as well.
* That limits us to 8TB of memory registration per HCA with
* 4KB pages, which is probably OK for the next few months.
*/
si_meminfo(&si);
request->num_mtt =
roundup_pow_of_two(max_t(unsigned, request->num_mtt,
min(1UL << 31,
si.totalram >> (log_mtts_per_seg - 1))));
profile[MLX4_RES_QP].size = dev_cap->qpc_entry_sz; profile[MLX4_RES_QP].size = dev_cap->qpc_entry_sz;
profile[MLX4_RES_RDMARC].size = dev_cap->rdmarc_entry_sz; profile[MLX4_RES_RDMARC].size = dev_cap->rdmarc_entry_sz;
profile[MLX4_RES_ALTC].size = dev_cap->altc_entry_sz; profile[MLX4_RES_ALTC].size = dev_cap->altc_entry_sz;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册