IB/ipath: fix spinlock recursion bug
The local loopback path for RC can lock the rkey table lock without blocking interrupts. The receive interrupt path can then call ipath_rkey_ok() and deadlock. Remove the redundant lock. Signed-off-by: Bryan O'Sullivan <bos@pathscale.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Родитель
1faadface9
Коммит
ebac3800e5
|
@ -136,9 +136,7 @@ int ipath_lkey_ok(struct ipath_lkey_table *rkt, struct ipath_sge *isge,
|
||||||
ret = 1;
|
ret = 1;
|
||||||
goto bail;
|
goto bail;
|
||||||
}
|
}
|
||||||
spin_lock(&rkt->lock);
|
|
||||||
mr = rkt->table[(sge->lkey >> (32 - ib_ipath_lkey_table_size))];
|
mr = rkt->table[(sge->lkey >> (32 - ib_ipath_lkey_table_size))];
|
||||||
spin_unlock(&rkt->lock);
|
|
||||||
if (unlikely(mr == NULL || mr->lkey != sge->lkey)) {
|
if (unlikely(mr == NULL || mr->lkey != sge->lkey)) {
|
||||||
ret = 0;
|
ret = 0;
|
||||||
goto bail;
|
goto bail;
|
||||||
|
@ -184,8 +182,6 @@ bail:
|
||||||
* @acc: access flags
|
* @acc: access flags
|
||||||
*
|
*
|
||||||
* Return 1 if successful, otherwise 0.
|
* Return 1 if successful, otherwise 0.
|
||||||
*
|
|
||||||
* The QP r_rq.lock should be held.
|
|
||||||
*/
|
*/
|
||||||
int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss,
|
int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss,
|
||||||
u32 len, u64 vaddr, u32 rkey, int acc)
|
u32 len, u64 vaddr, u32 rkey, int acc)
|
||||||
|
@ -196,9 +192,7 @@ int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss,
|
||||||
size_t off;
|
size_t off;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
spin_lock(&rkt->lock);
|
|
||||||
mr = rkt->table[(rkey >> (32 - ib_ipath_lkey_table_size))];
|
mr = rkt->table[(rkey >> (32 - ib_ipath_lkey_table_size))];
|
||||||
spin_unlock(&rkt->lock);
|
|
||||||
if (unlikely(mr == NULL || mr->lkey != rkey)) {
|
if (unlikely(mr == NULL || mr->lkey != rkey)) {
|
||||||
ret = 0;
|
ret = 0;
|
||||||
goto bail;
|
goto bail;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче