diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2014-01-20 03:36:24 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-13 13:50:19 -0800 |
| commit | dedd6ba4c2e82766b65efbc4681647f1b8107e2e (patch) | |
| tree | 5286eb9127731c7d488736b3b01b484666d9515a /lib | |
| parent | 8cf2461787d8870b637f04c3c1cc9e7b2c3ade7d (diff) | |
iscsi-target: Fix connection reset hang with percpu_ida_alloc
commit 555b270e25b0279b98083518a85f4b1da144a181 upstream.
This patch addresses a bug where connection reset would hang
indefinately once percpu_ida_alloc() was starved for tags, due
to the fact that it always assumed uninterruptible sleep mode.
So now make percpu_ida_alloc() check for signal_pending_state() for
making interruptible sleep optional, and convert iscsit_allocate_cmd()
to set TASK_INTERRUPTIBLE for GFP_KERNEL, or TASK_RUNNING for
GFP_ATOMIC.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Kent Overstreet <kmo@daterainc.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/percpu_ida.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/percpu_ida.c b/lib/percpu_ida.c index 6f6a92d5075b..fd7d6d3d88a1 100644 --- a/lib/percpu_ida.c +++ b/lib/percpu_ida.c @@ -148,14 +148,14 @@ static inline unsigned alloc_local_tag(struct percpu_ida *pool, * tag_pool_init()), or otherwise -ENOSPC on allocation failure. * * Safe to be called from interrupt context (assuming it isn't passed - * TASK_UNINTERRUPTIBLE, of course). + * TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, of course). * * @gfp indicates whether or not to wait until a free id is available (it's not * used for internal memory allocations); thus if passed __GFP_WAIT we may sleep * however long it takes until another thread frees an id (same semantics as a * mempool). * - * Will not fail if passed TASK_UNINTERRUPTIBLE. + * Will not fail if passed TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE. */ int percpu_ida_alloc(struct percpu_ida *pool, int state) { @@ -205,6 +205,11 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state) if (tag >= 0 || state == TASK_RUNNING) break; + if (signal_pending_state(state, current)) { + tag = -ERESTARTSYS; + break; + } + schedule(); local_irq_save(flags); |