Skip to content

Commit 4d12c04

Browse files
committed
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/[email protected] Reviewed-by: Max Gurtovoy <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]>
1 parent 649392b commit 4d12c04

File tree

10 files changed

+0
-19
lines changed

10 files changed

+0
-19
lines changed

drivers/infiniband/core/uverbs_cmd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ static void copy_query_dev_fields(struct ib_ucontext *ucontext,
356356
resp->max_mcast_qp_attach = attr->max_mcast_qp_attach;
357357
resp->max_total_mcast_qp_attach = attr->max_total_mcast_qp_attach;
358358
resp->max_ah = attr->max_ah;
359-
resp->max_map_per_fmr = attr->max_map_per_fmr;
360359
resp->max_srq = attr->max_srq;
361360
resp->max_srq_wr = attr->max_srq_wr;
362361
resp->max_srq_sge = attr->max_srq_sge;

drivers/infiniband/hw/hfi1/verbs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1361,7 +1361,6 @@ static void hfi1_fill_device_attr(struct hfi1_devdata *dd)
13611361
rdi->dparms.props.max_cq = hfi1_max_cqs;
13621362
rdi->dparms.props.max_ah = hfi1_max_ahs;
13631363
rdi->dparms.props.max_cqe = hfi1_max_cqes;
1364-
rdi->dparms.props.max_map_per_fmr = 32767;
13651364
rdi->dparms.props.max_pd = hfi1_max_pds;
13661365
rdi->dparms.props.max_qp_rd_atom = HFI1_MAX_RDMA_ATOMIC;
13671366
rdi->dparms.props.max_qp_init_rd_atom = 255;

drivers/infiniband/hw/i40iw/i40iw_verbs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ static int i40iw_query_device(struct ib_device *ibdev,
8383
props->max_qp_rd_atom = I40IW_MAX_IRD_SIZE;
8484
props->max_qp_init_rd_atom = props->max_qp_rd_atom;
8585
props->atomic_cap = IB_ATOMIC_NONE;
86-
props->max_map_per_fmr = 1;
8786
props->max_fast_reg_page_list_len = I40IW_MAX_PAGES_PER_FMR;
8887
return 0;
8988
}

drivers/infiniband/hw/mlx5/main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,6 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
999999
props->max_mcast_qp_attach = MLX5_CAP_GEN(mdev, max_qp_mcg);
10001000
props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
10011001
props->max_mcast_grp;
1002-
props->max_map_per_fmr = INT_MAX; /* no limit in ConnectIB */
10031002
props->max_ah = INT_MAX;
10041003
props->hca_core_clock = MLX5_CAP_GEN(mdev, device_frequency_khz);
10051004
props->timestamp_mask = 0x7FFFFFFFFFFFFFFFULL;

drivers/infiniband/hw/mthca/mthca_provider.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,6 @@ static int mthca_query_device(struct ib_device *ibdev, struct ib_device_attr *pr
118118
props->max_mcast_qp_attach = MTHCA_QP_PER_MGM;
119119
props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
120120
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;
131121

132122
err = 0;
133123
out:

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr,
9999
attr->max_mw = dev->attr.max_mw;
100100
attr->max_pd = dev->attr.max_pd;
101101
attr->atomic_cap = 0;
102-
attr->max_map_per_fmr = 0;
103102
attr->max_qp_rd_atom =
104103
min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);
105104
attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp;

drivers/infiniband/hw/qedr/verbs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ int qedr_query_device(struct ib_device *ibdev,
145145
attr->max_mw = qattr->max_mw;
146146
attr->max_pd = qattr->max_pd;
147147
attr->atomic_cap = dev->atomic_cap;
148-
attr->max_map_per_fmr = 16;
149148
attr->max_qp_init_rd_atom =
150149
1 << (fls(qattr->max_qp_req_rd_atomic_resc) - 1);
151150
attr->max_qp_rd_atom =

drivers/infiniband/hw/qib/qib_verbs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1460,7 +1460,6 @@ static void qib_fill_device_attr(struct qib_devdata *dd)
14601460
rdi->dparms.props.max_cq = ib_qib_max_cqs;
14611461
rdi->dparms.props.max_cqe = ib_qib_max_cqes;
14621462
rdi->dparms.props.max_ah = ib_qib_max_ahs;
1463-
rdi->dparms.props.max_map_per_fmr = 32767;
14641463
rdi->dparms.props.max_qp_rd_atom = QIB_MAX_RDMA_ATOMIC;
14651464
rdi->dparms.props.max_qp_init_rd_atom = 255;
14661465
rdi->dparms.props.max_srq = ib_qib_max_srqs;

drivers/infiniband/hw/usnic/usnic_ib_verbs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,6 @@ int usnic_ib_query_device(struct ib_device *ibdev,
322322
props->max_mcast_grp = 0;
323323
props->max_mcast_qp_attach = 0;
324324
props->max_total_mcast_qp_attach = 0;
325-
props->max_map_per_fmr = 0;
326325
/* Owned by Userspace
327326
* max_qp_wr, max_sge, max_sge_rd, max_cqe */
328327
mutex_unlock(&us_ibdev->usdev_lock);

include/rdma/ib_verbs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,6 @@ struct ib_device_attr {
430430
int max_mcast_qp_attach;
431431
int max_total_mcast_qp_attach;
432432
int max_ah;
433-
int max_map_per_fmr;
434433
int max_srq;
435434
int max_srq_wr;
436435
int max_srq_sge;

0 commit comments

Comments
 (0)