RDMA/rds: Remove FMR support for memory registration
Use FRWR method for memory registration by default and remove the ancient and unsafe FMR method. Link: https://lore.kernel.org/r/3-v3-f58e6669d5d3+2cf-fmr_removal_jgg@mellanox.com Signed-off-by: Max Gurtovoy <maxg@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:

committed by
Jason Gunthorpe

parent
f273ad4f8d
commit
07549ee21c
20
net/rds/ib.c
20
net/rds/ib.c
@@ -130,13 +130,16 @@ void rds_ib_dev_put(struct rds_ib_device *rds_ibdev)
|
||||
static int rds_ib_add_one(struct ib_device *device)
|
||||
{
|
||||
struct rds_ib_device *rds_ibdev;
|
||||
bool has_fr, has_fmr;
|
||||
int ret;
|
||||
|
||||
/* Only handle IB (no iWARP) devices */
|
||||
if (device->node_type != RDMA_NODE_IB_CA)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
/* Device must support FRWR */
|
||||
if (!(device->attrs.device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
rds_ibdev = kzalloc_node(sizeof(struct rds_ib_device), GFP_KERNEL,
|
||||
ibdev_to_node(device));
|
||||
if (!rds_ibdev)
|
||||
@@ -152,11 +155,6 @@ static int rds_ib_add_one(struct ib_device *device)
|
||||
rds_ibdev->max_wrs = device->attrs.max_qp_wr;
|
||||
rds_ibdev->max_sge = min(device->attrs.max_send_sge, RDS_IB_MAX_SGE);
|
||||
|
||||
has_fr = (device->attrs.device_cap_flags &
|
||||
IB_DEVICE_MEM_MGT_EXTENSIONS);
|
||||
has_fmr = (device->ops.alloc_fmr && device->ops.dealloc_fmr &&
|
||||
device->ops.map_phys_fmr && device->ops.unmap_fmr);
|
||||
rds_ibdev->use_fastreg = (has_fr && !has_fmr);
|
||||
rds_ibdev->odp_capable =
|
||||
!!(device->attrs.device_cap_flags &
|
||||
IB_DEVICE_ON_DEMAND_PAGING) &&
|
||||
@@ -165,7 +163,6 @@ static int rds_ib_add_one(struct ib_device *device)
|
||||
!!(device->attrs.odp_caps.per_transport_caps.rc_odp_caps &
|
||||
IB_ODP_SUPPORT_READ);
|
||||
|
||||
rds_ibdev->fmr_max_remaps = device->attrs.max_map_per_fmr?: 32;
|
||||
rds_ibdev->max_1m_mrs = device->attrs.max_mr ?
|
||||
min_t(unsigned int, (device->attrs.max_mr / 2),
|
||||
rds_ib_mr_1m_pool_size) : rds_ib_mr_1m_pool_size;
|
||||
@@ -219,14 +216,11 @@ static int rds_ib_add_one(struct ib_device *device)
|
||||
goto put_dev;
|
||||
}
|
||||
|
||||
rdsdebug("RDS/IB: max_mr = %d, max_wrs = %d, max_sge = %d, fmr_max_remaps = %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,
|
||||
rds_ibdev->fmr_max_remaps, 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: %s supported and preferred\n",
|
||||
device->name,
|
||||
rds_ibdev->use_fastreg ? "FRMR" : "FMR");
|
||||
pr_info("RDS/IB: %s: added\n", device->name);
|
||||
|
||||
down_write(&rds_ib_devices_lock);
|
||||
list_add_tail_rcu(&rds_ibdev->list, &rds_ib_devices);
|
||||
|
Reference in New Issue
Block a user