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

RDMA: Remove 'max_fmr'

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

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

Jason Gunthorpe 649392bf 3a578152

+1 -17
-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_fmr = attr->max_fmr; 360 359 resp->max_map_per_fmr = attr->max_map_per_fmr; 361 360 resp->max_srq = attr->max_srq; 362 361 resp->max_srq_wr = attr->max_srq_wr;
-1
drivers/infiniband/hw/ocrdma/ocrdma.h
··· 98 98 u64 max_mr_size; 99 99 u32 max_num_mr_pbl; 100 100 int max_mw; 101 - int max_fmr; 102 101 int max_map_per_fmr; 103 102 int max_pages_per_frmr; 104 103 u16 max_ord_per_qp;
-1
drivers/infiniband/hw/ocrdma/ocrdma_hw.c
··· 1190 1190 attr->max_mr = rsp->max_mr; 1191 1191 attr->max_mr_size = ((u64)rsp->max_mr_size_hi << 32) | 1192 1192 rsp->max_mr_size_lo; 1193 - attr->max_fmr = 0; 1194 1193 attr->max_pages_per_frmr = rsp->max_pages_per_frmr; 1195 1194 attr->max_num_mr_pbl = rsp->max_num_mr_pbl; 1196 1195 attr->max_cqe = rsp->max_cq_cqes_per_cq &
-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_fmr = 0; 103 102 attr->max_map_per_fmr = 0; 104 103 attr->max_qp_rd_atom = 105 104 min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);
-1
drivers/infiniband/hw/qedr/main.c
··· 632 632 attr->max_mr_size = qed_attr->max_mr_size; 633 633 attr->max_cqe = min_t(u64, qed_attr->max_cqe, QEDR_MAX_CQES); 634 634 attr->max_mw = qed_attr->max_mw; 635 - attr->max_fmr = qed_attr->max_fmr; 636 635 attr->max_mr_mw_fmr_pbl = qed_attr->max_mr_mw_fmr_pbl; 637 636 attr->max_mr_mw_fmr_size = qed_attr->max_mr_mw_fmr_size; 638 637 attr->max_pd = qed_attr->max_pd;
-1
drivers/infiniband/hw/qedr/qedr.h
··· 103 103 u64 max_mr_size; 104 104 u32 max_cqe; 105 105 u32 max_mw; 106 - u32 max_fmr; 107 106 u32 max_mr_mw_fmr_pbl; 108 107 u64 max_mr_mw_fmr_size; 109 108 u32 max_pd;
-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_fmr = qattr->max_fmr; 149 148 attr->max_map_per_fmr = 16; 150 149 attr->max_qp_init_rd_atom = 151 150 1 << (fls(qattr->max_qp_req_rd_atomic_resc) - 1);
-1
drivers/infiniband/sw/rdmavt/mr.c
··· 97 97 RCU_INIT_POINTER(rdi->lkey_table.table[i], NULL); 98 98 99 99 rdi->dparms.props.max_mr = rdi->lkey_table.max; 100 - rdi->dparms.props.max_fmr = rdi->lkey_table.max; 101 100 return 0; 102 101 } 103 102
-2
drivers/infiniband/sw/siw/siw.h
··· 30 30 #define SIW_MAX_MR (SIW_MAX_QP * 10) 31 31 #define SIW_MAX_PD SIW_MAX_QP 32 32 #define SIW_MAX_MW 0 /* to be set if MW's are supported */ 33 - #define SIW_MAX_FMR SIW_MAX_MR 34 33 #define SIW_MAX_SRQ SIW_MAX_QP 35 34 #define SIW_MAX_SRQ_WR (SIW_MAX_QP_WR * 10) 36 35 #define SIW_MAX_CONTEXT SIW_MAX_PD ··· 58 59 int max_mr; 59 60 int max_pd; 60 61 int max_mw; 61 - int max_fmr; 62 62 int max_srq; 63 63 int max_srq_wr; 64 64 int max_srq_sge;
-1
drivers/infiniband/sw/siw/siw_main.c
··· 413 413 sdev->attrs.max_mr = SIW_MAX_MR; 414 414 sdev->attrs.max_pd = SIW_MAX_PD; 415 415 sdev->attrs.max_mw = SIW_MAX_MW; 416 - sdev->attrs.max_fmr = SIW_MAX_FMR; 417 416 sdev->attrs.max_srq = SIW_MAX_SRQ; 418 417 sdev->attrs.max_srq_wr = SIW_MAX_SRQ_WR; 419 418 sdev->attrs.max_srq_sge = SIW_MAX_SGE;
-1
drivers/infiniband/sw/siw/siw_verbs.c
··· 136 136 attr->max_cq = sdev->attrs.max_cq; 137 137 attr->max_cqe = sdev->attrs.max_cqe; 138 138 attr->max_fast_reg_page_list_len = SIW_MAX_SGE_PBL; 139 - attr->max_fmr = sdev->attrs.max_fmr; 140 139 attr->max_mr = sdev->attrs.max_mr; 141 140 attr->max_mw = sdev->attrs.max_mw; 142 141 attr->max_mr_size = ~0ull;
-1
drivers/net/ethernet/qlogic/qed/qed_rdma.c
··· 499 499 dev->max_cqe = QED_RDMA_MAX_CQE_16_BIT; 500 500 501 501 dev->max_mw = 0; 502 - dev->max_fmr = QED_RDMA_MAX_FMR; 503 502 dev->max_mr_mw_fmr_pbl = (PAGE_SIZE / 8) * (PAGE_SIZE / 8); 504 503 dev->max_mr_mw_fmr_size = dev->max_mr_mw_fmr_pbl * PAGE_SIZE; 505 504 dev->max_pkey = QED_RDMA_MAX_P_KEY;
-1
drivers/net/ethernet/qlogic/qed/qed_rdma.h
··· 45 45 #include "qed_iwarp.h" 46 46 #include "qed_roce.h" 47 47 48 - #define QED_RDMA_MAX_FMR (RDMA_MAX_TIDS) 49 48 #define QED_RDMA_MAX_P_KEY (1) 50 49 #define QED_RDMA_MAX_WQE (0x7FFF) 51 50 #define QED_RDMA_MAX_SRQ_WQE_ELEM (0x7FFF)
-1
include/linux/qed/qed_rdma_if.h
··· 91 91 u64 max_mr_size; 92 92 u32 max_cqe; 93 93 u32 max_mw; 94 - u32 max_fmr; 95 94 u32 max_mr_mw_fmr_pbl; 96 95 u64 max_mr_mw_fmr_size; 97 96 u32 max_pd;
-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_fmr; 434 433 int max_map_per_fmr; 435 434 int max_srq; 436 435 int max_srq_wr;
+1 -1
net/rds/ib.c
··· 217 217 } 218 218 219 219 rdsdebug("RDS/IB: max_mr = %d, max_wrs = %d, max_sge = %d, max_1m_mrs = %d, max_8k_mrs = %d\n", 220 - device->attrs.max_fmr, rds_ibdev->max_wrs, rds_ibdev->max_sge, 220 + device->attrs.max_mr, rds_ibdev->max_wrs, rds_ibdev->max_sge, 221 221 rds_ibdev->max_1m_mrs, rds_ibdev->max_8k_mrs); 222 222 223 223 pr_info("RDS/IB: %s: added\n", device->name);