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>

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 56d207405dbd1cbc6bc88bc810ca6890c3ee923c..b48b3f6e632d46d55e95dfc44cd0f5e8279dbe0a 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -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_total_mcast_qp_attach = attr->max_total_mcast_qp_attach;
        resp->max_ah                    = attr->max_ah;
-       resp->max_map_per_fmr           = attr->max_map_per_fmr;
        resp->max_srq                   = attr->max_srq;
        resp->max_srq_wr                = attr->max_srq_wr;
        resp->max_srq_sge               = attr->max_srq_sge;

diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c
index 43ddced15951b71c98ace2d87365832250b2bd78..30865635b449913bb755681c3bd1cb3be13dd930 100644 (file)
--- a/drivers/infiniband/hw/hfi1/verbs.c
+++ b/drivers/infiniband/hw/hfi1/verbs.c
@@ -1361,7 +1361,6 @@ static void hfi1_fill_device_attr(struct hfi1_devdata *dd)
        rdi->dparms.props.max_cq = hfi1_max_cqs;
        rdi->dparms.props.max_ah = hfi1_max_ahs;
        rdi->dparms.props.max_cqe = hfi1_max_cqes;
-       rdi->dparms.props.max_map_per_fmr = 32767;
        rdi->dparms.props.max_pd = hfi1_max_pds;
        rdi->dparms.props.max_qp_rd_atom = HFI1_MAX_RDMA_ATOMIC;
        rdi->dparms.props.max_qp_init_rd_atom = 255;

diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
index 1b6fb13809619dd5679e03eef793f7a891deaf66..19af29a48c55938f9c9f8a3d087a646ec74a9e57 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
@@ -83,7 +83,6 @@ static int i40iw_query_device(struct ib_device *ibdev,
        props->max_qp_rd_atom = I40IW_MAX_IRD_SIZE;
        props->max_qp_init_rd_atom = props->max_qp_rd_atom;
        props->atomic_cap = IB_ATOMIC_NONE;
-       props->max_map_per_fmr = 1;
        props->max_fast_reg_page_list_len = I40IW_MAX_PAGES_PER_FMR;
        return 0;
 }

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 49a1aff727159c5bc78ea5f30bc308b57657abd3..343a8b8361e78e478ac7eef4ae8ccffc0d815898 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -999,7 +999,6 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
        props->max_mcast_qp_attach = MLX5_CAP_GEN(mdev, max_qp_mcg);
        props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
                                           props->max_mcast_grp;
-       props->max_map_per_fmr = INT_MAX; /* no limit in ConnectIB */
        props->max_ah = INT_MAX;
        props->hca_core_clock = MLX5_CAP_GEN(mdev, device_frequency_khz);
        props->timestamp_mask = 0x7FFFFFFFFFFFFFFFULL;

diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index de2124a8ee2be617b239393fe86d4bbe05813452..9fa2f9164a47b62dbe89ffaf2fd01e9c475802e6 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -118,16 +118,6 @@ static int mthca_query_device(struct ib_device *ibdev, struct ib_device_attr *pr
        props->max_mcast_qp_attach = MTHCA_QP_PER_MGM;
        props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
                                           props->max_mcast_grp;
-       /*
-        * If Sinai memory key optimization is being used, then only
-        * the 8-bit key portion will change.  For other HCAs, the
-        * unused index bits will also be used for FMR remapping.
-        */
-       if (mdev->mthca_flags & MTHCA_FLAG_SINAI_OPT)
-               props->max_map_per_fmr = 255;
-       else
-               props->max_map_per_fmr =
-                       (1 << (32 - ilog2(mdev->limits.num_mpts))) - 1;
 
        err = 0;
  out:

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 890e3fd41d2199725e6a75d787f14744ecd2d607..d11c74390a1242c332ca4120e227f8855d595a75 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -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_pd = dev->attr.max_pd;
        attr->atomic_cap = 0;
-       attr->max_map_per_fmr = 0;
        attr->max_qp_rd_atom =
            min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);
        attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp;

diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index ca88006eaa667cf9cc4dc8297e95c05e055a4f0a..9b9e802663674ca9fb48d41c93450e90b3798f94 100644 (file)
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -145,7 +145,6 @@ int qedr_query_device(struct ib_device *ibdev,
        attr->max_mw = qattr->max_mw;
        attr->max_pd = qattr->max_pd;
        attr->atomic_cap = dev->atomic_cap;
-       attr->max_map_per_fmr = 16;
        attr->max_qp_init_rd_atom =
            1 << (fls(qattr->max_qp_req_rd_atomic_resc) - 1);
        attr->max_qp_rd_atom =

diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index 7508abb6a0fa1eb1919d4bc51c5e47b0db23759f..7acf9ba5358a417b493b5ad3515d29efcda7202d 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -1460,7 +1460,6 @@ static void qib_fill_device_attr(struct qib_devdata *dd)
        rdi->dparms.props.max_cq = ib_qib_max_cqs;
        rdi->dparms.props.max_cqe = ib_qib_max_cqes;
        rdi->dparms.props.max_ah = ib_qib_max_ahs;
-       rdi->dparms.props.max_map_per_fmr = 32767;
        rdi->dparms.props.max_qp_rd_atom = QIB_MAX_RDMA_ATOMIC;
        rdi->dparms.props.max_qp_init_rd_atom = 255;
        rdi->dparms.props.max_srq = ib_qib_max_srqs;

diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
index 71f82339446c29db28ade7401fa40fad7a1e3800..b8a77ce11590863a806436a41695aef4edb6dde2 100644 (file)
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
@@ -322,7 +322,6 @@ int usnic_ib_query_device(struct ib_device *ibdev,
        props->max_mcast_grp = 0;
        props->max_mcast_qp_attach = 0;
        props->max_total_mcast_qp_attach = 0;
-       props->max_map_per_fmr = 0;
        /* Owned by Userspace
         * max_qp_wr, max_sge, max_sge_rd, max_cqe */
        mutex_unlock(&us_ibdev->usdev_lock);

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index c4708b3243f9c3f8c4d88d5f672eb9cb936a2fb1..033e7044f29c35b9fdee21c75614807d354e4bb4 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -430,7 +430,6 @@ struct ib_device_attr {
        int                     max_mcast_qp_attach;
        int                     max_total_mcast_qp_attach;
        int                     max_ah;
-       int                     max_map_per_fmr;
        int                     max_srq;
        int                     max_srq_wr;
        int                     max_srq_sge;