mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Luis Henriques <luis.henriques@canonical.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	kernel-team@lists.ubuntu.com
Cc: Jeff Moyer <jmoyer@redhat.com>, Jens Axboe <axboe@kernel.dk>,
	Luis Henriques <luis.henriques@canonical.com>
Subject: [PATCH 3.5 18/90] block: fix race between request completion and timeout handling
Date: Thu,  5 Dec 2013 17:35:00 +0000	[thread overview]
Message-ID: <1386264972-5399-19-git-send-email-luis.henriques@canonical.com> (raw)
In-Reply-To: <1386264972-5399-1-git-send-email-luis.henriques@canonical.com>

3.5.7.27 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jeff Moyer <jmoyer@redhat.com>

commit 4912aa6c11e6a5d910264deedbec2075c6f1bb73 upstream.

crocode i2c_i801 i2c_core iTCO_wdt iTCO_vendor_support shpchp ioatdma dca be2net sg ses enclosure ext4 mbcache jbd2 sd_mod crc_t10dif ahci megaraid_sas(U) dm_mirror dm_region_hash dm_log dm_mod [last unloaded: scsi_wait_scan]

Pid: 491, comm: scsi_eh_0 Tainted: G        W  ----------------   2.6.32-220.13.1.el6.x86_64 #1 IBM  -[8722PAX]-/00D1461
RIP: 0010:[<ffffffff8124e424>]  [<ffffffff8124e424>] blk_requeue_request+0x94/0xa0
RSP: 0018:ffff881057eefd60  EFLAGS: 00010012
RAX: ffff881d99e3e8a8 RBX: ffff881d99e3e780 RCX: ffff881d99e3e8a8
RDX: ffff881d99e3e8a8 RSI: ffff881d99e3e780 RDI: ffff881d99e3e780
RBP: ffff881057eefd80 R08: ffff881057eefe90 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000000 R12: ffff881057f92338
R13: 0000000000000000 R14: ffff881057f92338 R15: ffff883058188000
FS:  0000000000000000(0000) GS:ffff880040200000(0000) knlGS:0000000000000000
CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 00000000006d3ec0 CR3: 000000302cd7d000 CR4: 00000000000406b0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process scsi_eh_0 (pid: 491, threadinfo ffff881057eee000, task ffff881057e29540)
Stack:
 0000000000001057 0000000000000286 ffff8810275efdc0 ffff881057f16000
<0> ffff881057eefdd0 ffffffff81362323 ffff881057eefe20 ffffffff8135f393
<0> ffff881057e29af8 ffff8810275efdc0 ffff881057eefe78 ffff881057eefe90
Call Trace:
 [<ffffffff81362323>] __scsi_queue_insert+0xa3/0x150
 [<ffffffff8135f393>] ? scsi_eh_ready_devs+0x5e3/0x850
 [<ffffffff81362a23>] scsi_queue_insert+0x13/0x20
 [<ffffffff8135e4d4>] scsi_eh_flush_done_q+0x104/0x160
 [<ffffffff8135fb6b>] scsi_error_handler+0x35b/0x660
 [<ffffffff8135f810>] ? scsi_error_handler+0x0/0x660
 [<ffffffff810908c6>] kthread+0x96/0xa0
 [<ffffffff8100c14a>] child_rip+0xa/0x20
 [<ffffffff81090830>] ? kthread+0x0/0xa0
 [<ffffffff8100c140>] ? child_rip+0x0/0x20
Code: 00 00 eb d1 4c 8b 2d 3c 8f 97 00 4d 85 ed 74 bf 49 8b 45 00 49 83 c5 08 48 89 de 4c 89 e7 ff d0 49 8b 45 00 48 85 c0 75 eb eb a4 <0f> 0b eb fe 0f 1f 84 00 00 00 00 00 55 48 89 e5 0f 1f 44 00 00
RIP  [<ffffffff8124e424>] blk_requeue_request+0x94/0xa0
 RSP <ffff881057eefd60>

The RIP is this line:
        BUG_ON(blk_queued_rq(rq));

After digging through the code, I think there may be a race between the
request completion and the timer handler running.

A timer is started for each request put on the device's queue (see
blk_start_request->blk_add_timer).  If the request does not complete
before the timer expires, the timer handler (blk_rq_timed_out_timer)
will mark the request complete atomically:

static inline int blk_mark_rq_complete(struct request *rq)
{
        return test_and_set_bit(REQ_ATOM_COMPLETE, &rq->atomic_flags);
}

and then call blk_rq_timed_out.  The latter function will call
scsi_times_out, which will return one of BLK_EH_HANDLED,
BLK_EH_RESET_TIMER or BLK_EH_NOT_HANDLED.  If BLK_EH_RESET_TIMER is
returned, blk_clear_rq_complete is called, and blk_add_timer is again
called to simply wait longer for the request to complete.

Now, if the request happens to complete while this is going on, what
happens?  Given that we know the completion handler will bail if it
finds the REQ_ATOM_COMPLETE bit set, we need to focus on the completion
handler running after that bit is cleared.  So, from the above
paragraph, after the call to blk_clear_rq_complete.  If the completion
sets REQ_ATOM_COMPLETE before the BUG_ON in blk_add_timer, we go boom
there (I haven't seen this in the cores).  Next, if we get the
completion before the call to list_add_tail, then the timer will
eventually fire for an old req, which may either be freed or reallocated
(there is evidence that this might be the case).  Finally, if the
completion comes in *after* the addition to the timeout list, I think
it's harmless.  The request will be removed from the timeout list,
req_atom_complete will be set, and all will be well.

This will only actually explain the coredumps *IF* the request
structure was freed, reallocated *and* queued before the error handler
thread had a chance to process it.  That is possible, but it may make
sense to keep digging for another race.  I think that if this is what
was happening, we would see other instances of this problem showing up
as null pointer or garbage pointer dereferences, for example when the
request structure was not re-used.  It looks like we actually do run
into that situation in other reports.

This patch moves the BUG_ON(test_bit(REQ_ATOM_COMPLETE,
&req->atomic_flags)); from blk_add_timer to the only caller that could
trip over it (blk_start_request).  It then inverts the calls to
blk_clear_rq_complete and blk_add_timer in blk_rq_timed_out to address
the race.  I've boot tested this patch, but nothing more.

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Acked-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 block/blk-core.c    | 1 +
 block/blk-timeout.c | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index e17ce4b..cb3b3a7 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2144,6 +2144,7 @@ void blk_start_request(struct request *req)
 	if (unlikely(blk_bidi_rq(req)))
 		req->next_rq->resid_len = blk_rq_bytes(req->next_rq);
 
+	BUG_ON(test_bit(REQ_ATOM_COMPLETE, &req->atomic_flags));
 	blk_add_timer(req);
 }
 EXPORT_SYMBOL(blk_start_request);
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 6e4744c..5a6296e 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -90,8 +90,8 @@ static void blk_rq_timed_out(struct request *req)
 		__blk_complete_request(req);
 		break;
 	case BLK_EH_RESET_TIMER:
-		blk_clear_rq_complete(req);
 		blk_add_timer(req);
+		blk_clear_rq_complete(req);
 		break;
 	case BLK_EH_NOT_HANDLED:
 		/*
@@ -173,7 +173,6 @@ void blk_add_timer(struct request *req)
 		return;
 
 	BUG_ON(!list_empty(&req->timeout_list));
-	BUG_ON(test_bit(REQ_ATOM_COMPLETE, &req->atomic_flags));
 
 	/*
 	 * Some LLDs, like scsi, peek at the timeout to prevent a
-- 
1.8.3.2


  parent reply	other threads:[~2013-12-05 17:36 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-05 17:34 [3.5.y.z extended stable] Linux 3.5.7.27 stable review Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 01/90] ACPICA: Interpreter: Fix Store() when implicit conversion is not possible Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 02/90] ACPICA: DeRefOf operator: Update to fully resolve FieldUnit and BufferField refs Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 03/90] ACPICA: Return error if DerefOf resolves to a null package element Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 04/90] ACPICA: Fix for a Store->ArgX when ArgX contains a reference to a field Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 05/90] aacraid: prevent invalid pointer dereference Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 06/90] libertas: potential oops in debugfs Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 07/90] ARM: sa11x0/assabet: ensure CS2 is configured appropriately Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 08/90] dm: allocate buffer for messages with small number of arguments using GFP_NOIO Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 09/90] ext4: avoid bh leak in retry path of ext4_expand_extra_isize_ea() Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 10/90] drm/radeon/si: fix define for MC_SEQ_TRAIN_WAKEUP_CNTL Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 11/90] drm/ttm: Handle in-memory region copies Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 12/90] drm/ttm: Fix ttm_bo_move_memcpy Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 13/90] drm/ttm: Fix memory type compatibility check Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 14/90] PM / hibernate: Avoid overflow in hibernate_preallocate_memory() Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 15/90] mtd: nand: hack ONFI for non-power-of-2 dimensions Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 16/90] mtd: map: fixed bug in 64-bit systems Luis Henriques
2013-12-05 17:34 ` [PATCH 3.5 17/90] mtd: m25p80: fix allocation size Luis Henriques
2013-12-05 17:35 ` Luis Henriques [this message]
2013-12-05 17:35 ` [PATCH 3.5 19/90] blk-core: Fix memory corruption if blkcg_init_queue fails Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 20/90] loop: fix crash if blk_alloc_queue fails Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 21/90] block: fix a probe argument to blk_register_region Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 22/90] block: properly stack underlying max_segment_size to DM device Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 23/90] xen/blkback: fix reference counting Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 24/90] loop: fix crash when using unassigned loop device Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 25/90] SUNRPC: Fix a data corruption issue when retransmitting RPC calls Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 26/90] mtd: gpmi: fix kernel BUG due to racing DMA operations Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 27/90] ALSA: msnd: Avoid duplicated driver name Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 28/90] x86/microcode/amd: Tone down printk(), don't treat a missing firmware file as an error Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 29/90] SUNRPC: Avoid deep recursion in rpc_release_client Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 30/90] ALSA: hda - Don't clear the power state at snd_hda_codec_reset() Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 31/90] ASoC: blackfin: Fix missing break Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 32/90] drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 33/90] ASoC: fsl: imx-pcm-fiq: omit fiq counter to avoid harm in unbalanced situations Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 34/90] ALSA: pcsp: Fix the order of input device unregistration Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 35/90] ASoC: wm8962: Turn on regcache_cache_only before disabling regulator Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 36/90] ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 37/90] hwmon: (lm90) Fix max6696 alarm handling Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 38/90] ASoC: cs42l52: Correct MIC CTL mask Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 39/90] ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 40/90] setfacl removes part of ACL when setting POSIX ACLs to Samba Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 41/90] IB/ipath: Convert ipath_user_sdma_pin_pages() to use get_user_pages_fast() Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 42/90] rtlwifi: rtl8192se: Fix wrong assignment Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 43/90] rtlwifi: Fix endian error in extracting packet type Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 44/90] rtlwifi: rtl8192se: Fix incorrect signal strength for unassociated AP Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 45/90] rtlwifi: rtl8192cu: " Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 46/90] rtlwifi: rtl8192de: " Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 47/90] mwifiex: correct packet length for packets from SDIO interface Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 48/90] prism54: set netdev type to "wlan" Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 49/90] selinux: correct locking in selinux_netlbl_socket_connect) Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 50/90] Revert "ima: policy for RAMFS" Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 51/90] audit: printk USER_AVC messages when audit isn't enabled Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 52/90] audit: fix info leak in AUDIT_GET requests Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 53/90] audit: use nlmsg_len() to get message payload length Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 54/90] target: Fix delayed Task Aborted Status (TAS) handling bug Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 55/90] md: fix calculation of stacking limits on level change Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 56/90] drm/i915: flush cursors harder Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 57/90] rtlwifi: rtl8192cu: Fix more pointer arithmetic errors Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 58/90] radeon: workaround pinning failure on low ram gpu Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 59/90] drm/radeon: add semaphore trace point Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 60/90] nfsd: split up nfsd_setattr Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 61/90] nfsd: make sure to balance get/put_write_access Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 62/90] nfsd4: fix xdr decoding of large non-write compounds Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 63/90] avr32: setup crt for early panic() Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 64/90] avr32: fix out-of-range jump in large kernels Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 65/90] PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove() Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 66/90] powerpc/pseries: Duplicate dtl entries sometimes sent to userspace Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 67/90] powerpc/signals: Mark VSX not saved with small contexts Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 68/90] iscsi-target: fix extract_param to handle buffer length corner case Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 69/90] iscsi-target: chap auth shouldn't match username with trailing garbage Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 70/90] configfs: fix race between dentry put and lookup Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 71/90] KVM: perform an invalid memslot step for gpa base change Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 72/90] KVM: Fix iommu map/unmap to handle memory slot moves Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 73/90] ARM: i.MX6q: fix the wrong parent of can_root clock Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 74/90] crypto: s390 - Fix aes-cbc IV corruption Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 75/90] iio:accel:kxsd9 fix missing mutex unlock Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 76/90] PCI: Define macro for Marvell vendor ID Luis Henriques
2013-12-05 17:35 ` [PATCH 3.5 77/90] ahci: add Marvell 9230 to the AHCI PCI device list Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 78/90] powerpc/signals: Improved mark VSX not saved with small contexts fix Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 79/90] staging: zsmalloc: Ensure handle is never 0 on success Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 80/90] ALSA: hda/realtek - Add support of ALC231 codec Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 81/90] ALSA: hda/realtek - Set pcbeep amp for ALC668 Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 82/90] tracing: Allow events to have NULL strings Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 83/90] Staging: tidspbridge: disable driver Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 84/90] cpuset: Fix memory allocator deadlock Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 85/90] staging: vt6656: [BUG] Fix for TX USB resets from vendors driver Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 86/90] exec/ptrace: fix get_dumpable() incorrect tests Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 87/90] SUNRPC: don't map EKEYEXPIRED to EACCES in call_refreshresult Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 88/90] ftrace: Fix function graph with loading of modules Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 89/90] Input: i8042 - add PNP modaliases Luis Henriques
2013-12-05 17:36 ` [PATCH 3.5 90/90] misc: atmel_pwm: add deferred-probing support Luis Henriques

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386264972-5399-19-git-send-email-luis.henriques@canonical.com \
    --to=luis.henriques@canonical.com \
    --cc=axboe@kernel.dk \
    --cc=jmoyer@redhat.com \
    --cc=kernel-team@lists.ubuntu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®