diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2014-01-19 22:36:24 -0500 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2014-01-25 01:58:52 -0500 |
commit | 555b270e25b0279b98083518a85f4b1da144a181 (patch) | |
tree | 01cb1c9e3c65deb02c41ed45fa9ad69902274e2c /lib/percpu_ida.c | |
parent | 6f6b5d1ec56acdeab0503d2b823f6f88a0af493e (diff) |
iscsi-target: Fix connection reset hang with percpu_ida_alloc
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>
Cc: <stable@vger.kernel.org> #3.12+
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'lib/percpu_ida.c')
-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 58b671484ac2..7be235f1a70b 100644 --- a/lib/percpu_ida.c +++ b/lib/percpu_ida.c | |||
@@ -138,14 +138,14 @@ static inline unsigned alloc_local_tag(struct percpu_ida_cpu *tags) | |||
138 | * tag_pool_init()), or otherwise -ENOSPC on allocation failure. | 138 | * tag_pool_init()), or otherwise -ENOSPC on allocation failure. |
139 | * | 139 | * |
140 | * Safe to be called from interrupt context (assuming it isn't passed | 140 | * Safe to be called from interrupt context (assuming it isn't passed |
141 | * TASK_UNINTERRUPTIBLE, of course). | 141 | * TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, of course). |
142 | * | 142 | * |
143 | * @gfp indicates whether or not to wait until a free id is available (it's not | 143 | * @gfp indicates whether or not to wait until a free id is available (it's not |
144 | * used for internal memory allocations); thus if passed __GFP_WAIT we may sleep | 144 | * used for internal memory allocations); thus if passed __GFP_WAIT we may sleep |
145 | * however long it takes until another thread frees an id (same semantics as a | 145 | * however long it takes until another thread frees an id (same semantics as a |
146 | * mempool). | 146 | * mempool). |
147 | * | 147 | * |
148 | * Will not fail if passed TASK_UNINTERRUPTIBLE. | 148 | * Will not fail if passed TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE. |
149 | */ | 149 | */ |
150 | int percpu_ida_alloc(struct percpu_ida *pool, int state) | 150 | int percpu_ida_alloc(struct percpu_ida *pool, int state) |
151 | { | 151 | { |
@@ -195,6 +195,11 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state) | |||
195 | if (tag >= 0 || state == TASK_RUNNING) | 195 | if (tag >= 0 || state == TASK_RUNNING) |
196 | break; | 196 | break; |
197 | 197 | ||
198 | if (signal_pending_state(state, current)) { | ||
199 | tag = -ERESTARTSYS; | ||
200 | break; | ||
201 | } | ||
202 | |||
198 | schedule(); | 203 | schedule(); |
199 | 204 | ||
200 | local_irq_save(flags); | 205 | local_irq_save(flags); |