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>
This commit is contained in:
Родитель
3a578152a9
Коммит
649392bf75
|
@ -356,7 +356,6 @@ static void copy_query_dev_fields(struct ib_ucontext *ucontext,
|
||||||
resp->max_mcast_qp_attach = attr->max_mcast_qp_attach;
|
resp->max_mcast_qp_attach = attr->max_mcast_qp_attach;
|
||||||
resp->max_total_mcast_qp_attach = attr->max_total_mcast_qp_attach;
|
resp->max_total_mcast_qp_attach = attr->max_total_mcast_qp_attach;
|
||||||
resp->max_ah = attr->max_ah;
|
resp->max_ah = attr->max_ah;
|
||||||
resp->max_fmr = attr->max_fmr;
|
|
||||||
resp->max_map_per_fmr = attr->max_map_per_fmr;
|
resp->max_map_per_fmr = attr->max_map_per_fmr;
|
||||||
resp->max_srq = attr->max_srq;
|
resp->max_srq = attr->max_srq;
|
||||||
resp->max_srq_wr = attr->max_srq_wr;
|
resp->max_srq_wr = attr->max_srq_wr;
|
||||||
|
|
|
@ -98,7 +98,6 @@ struct ocrdma_dev_attr {
|
||||||
u64 max_mr_size;
|
u64 max_mr_size;
|
||||||
u32 max_num_mr_pbl;
|
u32 max_num_mr_pbl;
|
||||||
int max_mw;
|
int max_mw;
|
||||||
int max_fmr;
|
|
||||||
int max_map_per_fmr;
|
int max_map_per_fmr;
|
||||||
int max_pages_per_frmr;
|
int max_pages_per_frmr;
|
||||||
u16 max_ord_per_qp;
|
u16 max_ord_per_qp;
|
||||||
|
|
|
@ -1190,7 +1190,6 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev,
|
||||||
attr->max_mr = rsp->max_mr;
|
attr->max_mr = rsp->max_mr;
|
||||||
attr->max_mr_size = ((u64)rsp->max_mr_size_hi << 32) |
|
attr->max_mr_size = ((u64)rsp->max_mr_size_hi << 32) |
|
||||||
rsp->max_mr_size_lo;
|
rsp->max_mr_size_lo;
|
||||||
attr->max_fmr = 0;
|
|
||||||
attr->max_pages_per_frmr = rsp->max_pages_per_frmr;
|
attr->max_pages_per_frmr = rsp->max_pages_per_frmr;
|
||||||
attr->max_num_mr_pbl = rsp->max_num_mr_pbl;
|
attr->max_num_mr_pbl = rsp->max_num_mr_pbl;
|
||||||
attr->max_cqe = rsp->max_cq_cqes_per_cq &
|
attr->max_cqe = rsp->max_cq_cqes_per_cq &
|
||||||
|
|
|
@ -99,7 +99,6 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr,
|
||||||
attr->max_mw = dev->attr.max_mw;
|
attr->max_mw = dev->attr.max_mw;
|
||||||
attr->max_pd = dev->attr.max_pd;
|
attr->max_pd = dev->attr.max_pd;
|
||||||
attr->atomic_cap = 0;
|
attr->atomic_cap = 0;
|
||||||
attr->max_fmr = 0;
|
|
||||||
attr->max_map_per_fmr = 0;
|
attr->max_map_per_fmr = 0;
|
||||||
attr->max_qp_rd_atom =
|
attr->max_qp_rd_atom =
|
||||||
min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);
|
min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);
|
||||||
|
|
|
@ -632,7 +632,6 @@ static int qedr_set_device_attr(struct qedr_dev *dev)
|
||||||
attr->max_mr_size = qed_attr->max_mr_size;
|
attr->max_mr_size = qed_attr->max_mr_size;
|
||||||
attr->max_cqe = min_t(u64, qed_attr->max_cqe, QEDR_MAX_CQES);
|
attr->max_cqe = min_t(u64, qed_attr->max_cqe, QEDR_MAX_CQES);
|
||||||
attr->max_mw = qed_attr->max_mw;
|
attr->max_mw = qed_attr->max_mw;
|
||||||
attr->max_fmr = qed_attr->max_fmr;
|
|
||||||
attr->max_mr_mw_fmr_pbl = qed_attr->max_mr_mw_fmr_pbl;
|
attr->max_mr_mw_fmr_pbl = qed_attr->max_mr_mw_fmr_pbl;
|
||||||
attr->max_mr_mw_fmr_size = qed_attr->max_mr_mw_fmr_size;
|
attr->max_mr_mw_fmr_size = qed_attr->max_mr_mw_fmr_size;
|
||||||
attr->max_pd = qed_attr->max_pd;
|
attr->max_pd = qed_attr->max_pd;
|
||||||
|
|
|
@ -103,7 +103,6 @@ struct qedr_device_attr {
|
||||||
u64 max_mr_size;
|
u64 max_mr_size;
|
||||||
u32 max_cqe;
|
u32 max_cqe;
|
||||||
u32 max_mw;
|
u32 max_mw;
|
||||||
u32 max_fmr;
|
|
||||||
u32 max_mr_mw_fmr_pbl;
|
u32 max_mr_mw_fmr_pbl;
|
||||||
u64 max_mr_mw_fmr_size;
|
u64 max_mr_mw_fmr_size;
|
||||||
u32 max_pd;
|
u32 max_pd;
|
||||||
|
|
|
@ -145,7 +145,6 @@ int qedr_query_device(struct ib_device *ibdev,
|
||||||
attr->max_mw = qattr->max_mw;
|
attr->max_mw = qattr->max_mw;
|
||||||
attr->max_pd = qattr->max_pd;
|
attr->max_pd = qattr->max_pd;
|
||||||
attr->atomic_cap = dev->atomic_cap;
|
attr->atomic_cap = dev->atomic_cap;
|
||||||
attr->max_fmr = qattr->max_fmr;
|
|
||||||
attr->max_map_per_fmr = 16;
|
attr->max_map_per_fmr = 16;
|
||||||
attr->max_qp_init_rd_atom =
|
attr->max_qp_init_rd_atom =
|
||||||
1 << (fls(qattr->max_qp_req_rd_atomic_resc) - 1);
|
1 << (fls(qattr->max_qp_req_rd_atomic_resc) - 1);
|
||||||
|
|
|
@ -97,7 +97,6 @@ int rvt_driver_mr_init(struct rvt_dev_info *rdi)
|
||||||
RCU_INIT_POINTER(rdi->lkey_table.table[i], NULL);
|
RCU_INIT_POINTER(rdi->lkey_table.table[i], NULL);
|
||||||
|
|
||||||
rdi->dparms.props.max_mr = rdi->lkey_table.max;
|
rdi->dparms.props.max_mr = rdi->lkey_table.max;
|
||||||
rdi->dparms.props.max_fmr = rdi->lkey_table.max;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#define SIW_MAX_MR (SIW_MAX_QP * 10)
|
#define SIW_MAX_MR (SIW_MAX_QP * 10)
|
||||||
#define SIW_MAX_PD SIW_MAX_QP
|
#define SIW_MAX_PD SIW_MAX_QP
|
||||||
#define SIW_MAX_MW 0 /* to be set if MW's are supported */
|
#define SIW_MAX_MW 0 /* to be set if MW's are supported */
|
||||||
#define SIW_MAX_FMR SIW_MAX_MR
|
|
||||||
#define SIW_MAX_SRQ SIW_MAX_QP
|
#define SIW_MAX_SRQ SIW_MAX_QP
|
||||||
#define SIW_MAX_SRQ_WR (SIW_MAX_QP_WR * 10)
|
#define SIW_MAX_SRQ_WR (SIW_MAX_QP_WR * 10)
|
||||||
#define SIW_MAX_CONTEXT SIW_MAX_PD
|
#define SIW_MAX_CONTEXT SIW_MAX_PD
|
||||||
|
@ -59,7 +58,6 @@ struct siw_dev_cap {
|
||||||
int max_mr;
|
int max_mr;
|
||||||
int max_pd;
|
int max_pd;
|
||||||
int max_mw;
|
int max_mw;
|
||||||
int max_fmr;
|
|
||||||
int max_srq;
|
int max_srq;
|
||||||
int max_srq_wr;
|
int max_srq_wr;
|
||||||
int max_srq_sge;
|
int max_srq_sge;
|
||||||
|
|
|
@ -413,7 +413,6 @@ static struct siw_device *siw_device_create(struct net_device *netdev)
|
||||||
sdev->attrs.max_mr = SIW_MAX_MR;
|
sdev->attrs.max_mr = SIW_MAX_MR;
|
||||||
sdev->attrs.max_pd = SIW_MAX_PD;
|
sdev->attrs.max_pd = SIW_MAX_PD;
|
||||||
sdev->attrs.max_mw = SIW_MAX_MW;
|
sdev->attrs.max_mw = SIW_MAX_MW;
|
||||||
sdev->attrs.max_fmr = SIW_MAX_FMR;
|
|
||||||
sdev->attrs.max_srq = SIW_MAX_SRQ;
|
sdev->attrs.max_srq = SIW_MAX_SRQ;
|
||||||
sdev->attrs.max_srq_wr = SIW_MAX_SRQ_WR;
|
sdev->attrs.max_srq_wr = SIW_MAX_SRQ_WR;
|
||||||
sdev->attrs.max_srq_sge = SIW_MAX_SGE;
|
sdev->attrs.max_srq_sge = SIW_MAX_SGE;
|
||||||
|
|
|
@ -136,7 +136,6 @@ int siw_query_device(struct ib_device *base_dev, struct ib_device_attr *attr,
|
||||||
attr->max_cq = sdev->attrs.max_cq;
|
attr->max_cq = sdev->attrs.max_cq;
|
||||||
attr->max_cqe = sdev->attrs.max_cqe;
|
attr->max_cqe = sdev->attrs.max_cqe;
|
||||||
attr->max_fast_reg_page_list_len = SIW_MAX_SGE_PBL;
|
attr->max_fast_reg_page_list_len = SIW_MAX_SGE_PBL;
|
||||||
attr->max_fmr = sdev->attrs.max_fmr;
|
|
||||||
attr->max_mr = sdev->attrs.max_mr;
|
attr->max_mr = sdev->attrs.max_mr;
|
||||||
attr->max_mw = sdev->attrs.max_mw;
|
attr->max_mw = sdev->attrs.max_mw;
|
||||||
attr->max_mr_size = ~0ull;
|
attr->max_mr_size = ~0ull;
|
||||||
|
|
|
@ -499,7 +499,6 @@ static void qed_rdma_init_devinfo(struct qed_hwfn *p_hwfn,
|
||||||
dev->max_cqe = QED_RDMA_MAX_CQE_16_BIT;
|
dev->max_cqe = QED_RDMA_MAX_CQE_16_BIT;
|
||||||
|
|
||||||
dev->max_mw = 0;
|
dev->max_mw = 0;
|
||||||
dev->max_fmr = QED_RDMA_MAX_FMR;
|
|
||||||
dev->max_mr_mw_fmr_pbl = (PAGE_SIZE / 8) * (PAGE_SIZE / 8);
|
dev->max_mr_mw_fmr_pbl = (PAGE_SIZE / 8) * (PAGE_SIZE / 8);
|
||||||
dev->max_mr_mw_fmr_size = dev->max_mr_mw_fmr_pbl * PAGE_SIZE;
|
dev->max_mr_mw_fmr_size = dev->max_mr_mw_fmr_pbl * PAGE_SIZE;
|
||||||
dev->max_pkey = QED_RDMA_MAX_P_KEY;
|
dev->max_pkey = QED_RDMA_MAX_P_KEY;
|
||||||
|
|
|
@ -45,7 +45,6 @@
|
||||||
#include "qed_iwarp.h"
|
#include "qed_iwarp.h"
|
||||||
#include "qed_roce.h"
|
#include "qed_roce.h"
|
||||||
|
|
||||||
#define QED_RDMA_MAX_FMR (RDMA_MAX_TIDS)
|
|
||||||
#define QED_RDMA_MAX_P_KEY (1)
|
#define QED_RDMA_MAX_P_KEY (1)
|
||||||
#define QED_RDMA_MAX_WQE (0x7FFF)
|
#define QED_RDMA_MAX_WQE (0x7FFF)
|
||||||
#define QED_RDMA_MAX_SRQ_WQE_ELEM (0x7FFF)
|
#define QED_RDMA_MAX_SRQ_WQE_ELEM (0x7FFF)
|
||||||
|
|
|
@ -91,7 +91,6 @@ struct qed_rdma_device {
|
||||||
u64 max_mr_size;
|
u64 max_mr_size;
|
||||||
u32 max_cqe;
|
u32 max_cqe;
|
||||||
u32 max_mw;
|
u32 max_mw;
|
||||||
u32 max_fmr;
|
|
||||||
u32 max_mr_mw_fmr_pbl;
|
u32 max_mr_mw_fmr_pbl;
|
||||||
u64 max_mr_mw_fmr_size;
|
u64 max_mr_mw_fmr_size;
|
||||||
u32 max_pd;
|
u32 max_pd;
|
||||||
|
|
|
@ -430,7 +430,6 @@ struct ib_device_attr {
|
||||||
int max_mcast_qp_attach;
|
int max_mcast_qp_attach;
|
||||||
int max_total_mcast_qp_attach;
|
int max_total_mcast_qp_attach;
|
||||||
int max_ah;
|
int max_ah;
|
||||||
int max_fmr;
|
|
||||||
int max_map_per_fmr;
|
int max_map_per_fmr;
|
||||||
int max_srq;
|
int max_srq;
|
||||||
int max_srq_wr;
|
int max_srq_wr;
|
||||||
|
|
|
@ -217,7 +217,7 @@ static int rds_ib_add_one(struct ib_device *device)
|
||||||
}
|
}
|
||||||
|
|
||||||
rdsdebug("RDS/IB: max_mr = %d, max_wrs = %d, max_sge = %d, max_1m_mrs = %d, max_8k_mrs = %d\n",
|
rdsdebug("RDS/IB: max_mr = %d, max_wrs = %d, max_sge = %d, max_1m_mrs = %d, max_8k_mrs = %d\n",
|
||||||
device->attrs.max_fmr, rds_ibdev->max_wrs, rds_ibdev->max_sge,
|
device->attrs.max_mr, rds_ibdev->max_wrs, rds_ibdev->max_sge,
|
||||||
rds_ibdev->max_1m_mrs, rds_ibdev->max_8k_mrs);
|
rds_ibdev->max_1m_mrs, rds_ibdev->max_8k_mrs);
|
||||||
|
|
||||||
pr_info("RDS/IB: %s: added\n", device->name);
|
pr_info("RDS/IB: %s: added\n", device->name);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче