Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

RDMA: Remove 'max_map_per_fmr'

Now that FMR support is gone, this attribute can be deleted from all
places.

Link: https://lore.kernel.org/r/13-v3-f58e6669d5d3+2cf-fmr_removal_jgg@mellanox.com
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

-19
-1
drivers/infiniband/core/uverbs_cmd.c
··· 356 356 resp->max_mcast_qp_attach = attr->max_mcast_qp_attach; 357 357 resp->max_total_mcast_qp_attach = attr->max_total_mcast_qp_attach; 358 358 resp->max_ah = attr->max_ah; 359 - resp->max_map_per_fmr = attr->max_map_per_fmr; 360 359 resp->max_srq = attr->max_srq; 361 360 resp->max_srq_wr = attr->max_srq_wr; 362 361 resp->max_srq_sge = attr->max_srq_sge;
-1
drivers/infiniband/hw/hfi1/verbs.c
··· 1361 1361 rdi->dparms.props.max_cq = hfi1_max_cqs; 1362 1362 rdi->dparms.props.max_ah = hfi1_max_ahs; 1363 1363 rdi->dparms.props.max_cqe = hfi1_max_cqes; 1364 - rdi->dparms.props.max_map_per_fmr = 32767; 1365 1364 rdi->dparms.props.max_pd = hfi1_max_pds; 1366 1365 rdi->dparms.props.max_qp_rd_atom = HFI1_MAX_RDMA_ATOMIC; 1367 1366 rdi->dparms.props.max_qp_init_rd_atom = 255;
-1
drivers/infiniband/hw/i40iw/i40iw_verbs.c
··· 83 83 props->max_qp_rd_atom = I40IW_MAX_IRD_SIZE; 84 84 props->max_qp_init_rd_atom = props->max_qp_rd_atom; 85 85 props->atomic_cap = IB_ATOMIC_NONE; 86 - props->max_map_per_fmr = 1; 87 86 props->max_fast_reg_page_list_len = I40IW_MAX_PAGES_PER_FMR; 88 87 return 0; 89 88 }
-1
drivers/infiniband/hw/mlx5/main.c
··· 999 999 props->max_mcast_qp_attach = MLX5_CAP_GEN(mdev, max_qp_mcg); 1000 1000 props->max_total_mcast_qp_attach = props->max_mcast_qp_attach * 1001 1001 props->max_mcast_grp; 1002 - props->max_map_per_fmr = INT_MAX; /* no limit in ConnectIB */ 1003 1002 props->max_ah = INT_MAX; 1004 1003 props->hca_core_clock = MLX5_CAP_GEN(mdev, device_frequency_khz); 1005 1004 props->timestamp_mask = 0x7FFFFFFFFFFFFFFFULL;
-10
drivers/infiniband/hw/mthca/mthca_provider.c
··· 118 118 props->max_mcast_qp_attach = MTHCA_QP_PER_MGM; 119 119 props->max_total_mcast_qp_attach = props->max_mcast_qp_attach * 120 120 props->max_mcast_grp; 121 - /* 122 - * If Sinai memory key optimization is being used, then only 123 - * the 8-bit key portion will change. For other HCAs, the 124 - * unused index bits will also be used for FMR remapping. 125 - */ 126 - if (mdev->mthca_flags & MTHCA_FLAG_SINAI_OPT) 127 - props->max_map_per_fmr = 255; 128 - else 129 - props->max_map_per_fmr = 130 - (1 << (32 - ilog2(mdev->limits.num_mpts))) - 1; 131 121 132 122 err = 0; 133 123 out:
-1
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
··· 99 99 attr->max_mw = dev->attr.max_mw; 100 100 attr->max_pd = dev->attr.max_pd; 101 101 attr->atomic_cap = 0; 102 - attr->max_map_per_fmr = 0; 103 102 attr->max_qp_rd_atom = 104 103 min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp); 105 104 attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp;
-1
drivers/infiniband/hw/qedr/verbs.c
··· 145 145 attr->max_mw = qattr->max_mw; 146 146 attr->max_pd = qattr->max_pd; 147 147 attr->atomic_cap = dev->atomic_cap; 148 - attr->max_map_per_fmr = 16; 149 148 attr->max_qp_init_rd_atom = 150 149 1 << (fls(qattr->max_qp_req_rd_atomic_resc) - 1); 151 150 attr->max_qp_rd_atom =
-1
drivers/infiniband/hw/qib/qib_verbs.c
··· 1460 1460 rdi->dparms.props.max_cq = ib_qib_max_cqs; 1461 1461 rdi->dparms.props.max_cqe = ib_qib_max_cqes; 1462 1462 rdi->dparms.props.max_ah = ib_qib_max_ahs; 1463 - rdi->dparms.props.max_map_per_fmr = 32767; 1464 1463 rdi->dparms.props.max_qp_rd_atom = QIB_MAX_RDMA_ATOMIC; 1465 1464 rdi->dparms.props.max_qp_init_rd_atom = 255; 1466 1465 rdi->dparms.props.max_srq = ib_qib_max_srqs;
-1
drivers/infiniband/hw/usnic/usnic_ib_verbs.c
··· 322 322 props->max_mcast_grp = 0; 323 323 props->max_mcast_qp_attach = 0; 324 324 props->max_total_mcast_qp_attach = 0; 325 - props->max_map_per_fmr = 0; 326 325 /* Owned by Userspace 327 326 * max_qp_wr, max_sge, max_sge_rd, max_cqe */ 328 327 mutex_unlock(&us_ibdev->usdev_lock);
-1
include/rdma/ib_verbs.h
··· 430 430 int max_mcast_qp_attach; 431 431 int max_total_mcast_qp_attach; 432 432 int max_ah; 433 - int max_map_per_fmr; 434 433 int max_srq; 435 434 int max_srq_wr; 436 435 int max_srq_sge;