Commit 0b81e4f7 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Roland Dreier

IB/ipath: put a limit on the number of QPs that can be created

Signed-off-by: default avatarBryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent ca4ce383
...@@ -833,9 +833,21 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, ...@@ -833,9 +833,21 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,
} }
} }
spin_lock(&dev->n_qps_lock);
if (dev->n_qps_allocated == ib_ipath_max_qps) {
spin_unlock(&dev->n_qps_lock);
ret = ERR_PTR(-ENOMEM);
goto bail_ip;
}
dev->n_qps_allocated++;
spin_unlock(&dev->n_qps_lock);
ret = &qp->ibqp; ret = &qp->ibqp;
goto bail; goto bail;
bail_ip:
kfree(qp->ip);
bail_rwq: bail_rwq:
vfree(qp->r_rq.wq); vfree(qp->r_rq.wq);
bail_qp: bail_qp:
...@@ -864,6 +876,9 @@ int ipath_destroy_qp(struct ib_qp *ibqp) ...@@ -864,6 +876,9 @@ int ipath_destroy_qp(struct ib_qp *ibqp)
spin_lock_irqsave(&qp->s_lock, flags); spin_lock_irqsave(&qp->s_lock, flags);
qp->state = IB_QPS_ERR; qp->state = IB_QPS_ERR;
spin_unlock_irqrestore(&qp->s_lock, flags); spin_unlock_irqrestore(&qp->s_lock, flags);
spin_lock(&dev->n_qps_lock);
dev->n_qps_allocated--;
spin_unlock(&dev->n_qps_lock);
/* Stop the sending tasklet. */ /* Stop the sending tasklet. */
tasklet_kill(&qp->s_task); tasklet_kill(&qp->s_task);
......
...@@ -73,6 +73,10 @@ module_param_named(max_qp_wrs, ib_ipath_max_qp_wrs, uint, ...@@ -73,6 +73,10 @@ module_param_named(max_qp_wrs, ib_ipath_max_qp_wrs, uint,
S_IWUSR | S_IRUGO); S_IWUSR | S_IRUGO);
MODULE_PARM_DESC(max_qp_wrs, "Maximum number of QP WRs to support"); MODULE_PARM_DESC(max_qp_wrs, "Maximum number of QP WRs to support");
unsigned int ib_ipath_max_qps = 16384;
module_param_named(max_qps, ib_ipath_max_qps, uint, S_IWUSR | S_IRUGO);
MODULE_PARM_DESC(max_qps, "Maximum number of QPs to support");
unsigned int ib_ipath_max_sges = 0x60; unsigned int ib_ipath_max_sges = 0x60;
module_param_named(max_sges, ib_ipath_max_sges, uint, S_IWUSR | S_IRUGO); module_param_named(max_sges, ib_ipath_max_sges, uint, S_IWUSR | S_IRUGO);
MODULE_PARM_DESC(max_sges, "Maximum number of SGEs to support"); MODULE_PARM_DESC(max_sges, "Maximum number of SGEs to support");
...@@ -958,7 +962,7 @@ static int ipath_query_device(struct ib_device *ibdev, ...@@ -958,7 +962,7 @@ static int ipath_query_device(struct ib_device *ibdev,
props->sys_image_guid = dev->sys_image_guid; props->sys_image_guid = dev->sys_image_guid;
props->max_mr_size = ~0ull; props->max_mr_size = ~0ull;
props->max_qp = dev->qp_table.max; props->max_qp = ib_ipath_max_qps;
props->max_qp_wr = ib_ipath_max_qp_wrs; props->max_qp_wr = ib_ipath_max_qp_wrs;
props->max_sge = ib_ipath_max_sges; props->max_sge = ib_ipath_max_sges;
props->max_cq = ib_ipath_max_cqs; props->max_cq = ib_ipath_max_cqs;
...@@ -1420,6 +1424,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd) ...@@ -1420,6 +1424,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
spin_lock_init(&idev->n_pds_lock); spin_lock_init(&idev->n_pds_lock);
spin_lock_init(&idev->n_ahs_lock); spin_lock_init(&idev->n_ahs_lock);
spin_lock_init(&idev->n_cqs_lock); spin_lock_init(&idev->n_cqs_lock);
spin_lock_init(&idev->n_qps_lock);
spin_lock_init(&idev->n_srqs_lock); spin_lock_init(&idev->n_srqs_lock);
spin_lock_init(&idev->n_mcast_grps_lock); spin_lock_init(&idev->n_mcast_grps_lock);
......
...@@ -482,6 +482,8 @@ struct ipath_ibdev { ...@@ -482,6 +482,8 @@ struct ipath_ibdev {
spinlock_t n_ahs_lock; spinlock_t n_ahs_lock;
u32 n_cqs_allocated; /* number of CQs allocated for device */ u32 n_cqs_allocated; /* number of CQs allocated for device */
spinlock_t n_cqs_lock; spinlock_t n_cqs_lock;
u32 n_qps_allocated; /* number of QPs allocated for device */
spinlock_t n_qps_lock;
u32 n_srqs_allocated; /* number of SRQs allocated for device */ u32 n_srqs_allocated; /* number of SRQs allocated for device */
spinlock_t n_srqs_lock; spinlock_t n_srqs_lock;
u32 n_mcast_grps_allocated; /* number of mcast groups allocated */ u32 n_mcast_grps_allocated; /* number of mcast groups allocated */
...@@ -792,6 +794,8 @@ extern unsigned int ib_ipath_max_cqs; ...@@ -792,6 +794,8 @@ extern unsigned int ib_ipath_max_cqs;
extern unsigned int ib_ipath_max_qp_wrs; extern unsigned int ib_ipath_max_qp_wrs;
extern unsigned int ib_ipath_max_qps;
extern unsigned int ib_ipath_max_sges; extern unsigned int ib_ipath_max_sges;
extern unsigned int ib_ipath_max_mcast_grps; extern unsigned int ib_ipath_max_mcast_grps;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment