From 59815cee668d89665b42c8ddd8be373a681ff4cb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 10 Feb 2014 11:45:12 -0800 Subject: [PATCH] 3.13-stable patches added patches: iscsi-target-fix-connection-reset-hang-with-percpu_ida_alloc.patch --- ...ion-reset-hang-with-percpu_ida_alloc.patch | 70 +++++++++++++++++++ queue-3.13/series | 1 + 2 files changed, 71 insertions(+) create mode 100644 queue-3.13/iscsi-target-fix-connection-reset-hang-with-percpu_ida_alloc.patch diff --git a/queue-3.13/iscsi-target-fix-connection-reset-hang-with-percpu_ida_alloc.patch b/queue-3.13/iscsi-target-fix-connection-reset-hang-with-percpu_ida_alloc.patch new file mode 100644 index 00000000000..bb1afdc526f --- /dev/null +++ b/queue-3.13/iscsi-target-fix-connection-reset-hang-with-percpu_ida_alloc.patch @@ -0,0 +1,70 @@ +From 555b270e25b0279b98083518a85f4b1da144a181 Mon Sep 17 00:00:00 2001 +From: Nicholas Bellinger +Date: Mon, 20 Jan 2014 03:36:24 +0000 +Subject: iscsi-target: Fix connection reset hang with percpu_ida_alloc + +From: Nicholas Bellinger + +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 +Cc: Kent Overstreet +Signed-off-by: Nicholas Bellinger +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/target/iscsi/iscsi_target_util.c | 2 +- + lib/percpu_ida.c | 9 +++++++-- + 2 files changed, 8 insertions(+), 3 deletions(-) + +--- a/drivers/target/iscsi/iscsi_target_util.c ++++ b/drivers/target/iscsi/iscsi_target_util.c +@@ -156,7 +156,7 @@ struct iscsi_cmd *iscsit_allocate_cmd(st + { + struct iscsi_cmd *cmd; + struct se_session *se_sess = conn->sess->se_sess; +- int size, tag, state = (gfp_mask & __GFP_WAIT) ? TASK_UNINTERRUPTIBLE : ++ int size, tag, state = (gfp_mask & __GFP_WAIT) ? TASK_INTERRUPTIBLE : + TASK_RUNNING; + + tag = percpu_ida_alloc(&se_sess->sess_tag_pool, state); +--- a/lib/percpu_ida.c ++++ b/lib/percpu_ida.c +@@ -138,14 +138,14 @@ static inline unsigned alloc_local_tag(s + * 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) + { +@@ -195,6 +195,11 @@ int percpu_ida_alloc(struct percpu_ida * + if (tag >= 0 || state == TASK_RUNNING) + break; + ++ if (signal_pending_state(state, current)) { ++ tag = -ERESTARTSYS; ++ break; ++ } ++ + schedule(); + + local_irq_save(flags); diff --git a/queue-3.13/series b/queue-3.13/series index 9262e680def..58ee0dd2311 100644 --- a/queue-3.13/series +++ b/queue-3.13/series @@ -60,5 +60,6 @@ drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch drm-radeon-dpm-disable-mclk-switching-on-desktop-rv770.patch radeon-pm-guard-access-to-rdev-pm.power_state-array.patch percpu_ida-make-percpu_ida_alloc-callers-accept-task-state-bitmask.patch +iscsi-target-fix-connection-reset-hang-with-percpu_ida_alloc.patch numa-add-a-sysctl-for-numa_balancing.patch mm-numa-initialise-numa-balancing-after-jump-label-initialisation.patch -- 2.47.2