mlx5: DR, Support new sizes for pre-allocated fixed matcher tables

Add larger size options(4096K, 8192K and 16384K) to dr_icm_chunk_size. This sizes will only be used for pre-allocated fixed matcher tables when the user will send a hint for the number of rules to be used. These new sizes will not impact on regular rehash and keep current limitations for max rehashed size. Signed-off-by: Hamdan Igbaria <[email protected]> Signed-off-by: Alex Vesker <[email protected]> Signed-off-by: Yishai Hadas <[email protected]>
linux-rdma · Jul 19, 2023 · 22edb2c · 22edb2c
1 parent 4f1b01a
commit 22edb2c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/providers/mlx5/dr_domain.c b/providers/mlx5/dr_domain.c
@@ -435,6 +435,7 @@ static int dr_domain_check_icm_memory_caps(struct mlx5dv_dr_domain *dmn)
  max_req_chunks_log = max_req_bytes_log - DR_STE_LOG_SIZE;
  dmn->info.max_log_sw_icm_sz =
  min_t(uint32_t, DR_CHUNK_SIZE_1024K, max_req_chunks_log);
+ dmn->info.max_log_sw_icm_rehash_sz = dmn->info.max_log_sw_icm_sz;
 
  if (dmn->info.caps.sw_format_ver >= MLX5_HW_CONNECTX_6DX) {
  if (dmn->info.caps.log_modify_pattern_icm_size < DR_CHUNK_SIZE_4K +

diff --git a/providers/mlx5/dr_rule.c b/providers/mlx5/dr_rule.c
@@ -569,7 +569,8 @@ static struct dr_ste_htbl *dr_rule_rehash(struct mlx5dv_dr_rule *rule,
  enum dr_icm_chunk_size new_size;
 
  new_size = dr_icm_next_higher_chunk(cur_htbl->chunk_size);
- new_size = min_t(uint32_t, new_size, dmn->info.max_log_sw_icm_sz);
+ new_size = min_t(uint32_t, new_size,
+ dmn->info.max_log_sw_icm_rehash_sz);
 
  if (new_size == cur_htbl->chunk_size)
  return NULL; /* Skip rehash, we already at the max size */

diff --git a/providers/mlx5/mlx5dv_dr.h b/providers/mlx5/mlx5dv_dr.h
@@ -88,6 +88,9 @@ enum dr_icm_chunk_size {
  DR_CHUNK_SIZE_512K,
  DR_CHUNK_SIZE_1024K,
  DR_CHUNK_SIZE_2048K,
+ DR_CHUNK_SIZE_4096K,
+ DR_CHUNK_SIZE_8192K,
+ DR_CHUNK_SIZE_16384K,
  DR_CHUNK_SIZE_MAX,
 };
 
@@ -1039,7 +1042,8 @@ struct dr_domain_info {
  uint32_t max_log_sw_icm_sz;
  uint32_t max_log_action_icm_sz;
  uint32_t max_log_modify_hdr_pattern_icm_sz;
- uint32_t max_send_size;
+ uint32_t max_log_sw_icm_rehash_sz;
+ uint32_t max_send_size;
  struct dr_domain_rx_tx rx;
  struct dr_domain_rx_tx tx;
  struct ibv_device_attr_ex attr;