From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Junxiao Bi <junxiao.bi@oracle.com>,
Joseph Qi <joseph.qi@huawei.com>, Mark Fasheh <mfasheh@suse.com>,
Joel Becker <jlbec@evilplan.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 3.14 01/51] ocfs2: dlm: fix race between purge and get lock resource
Date: Fri, 15 May 2015 16:10:03 -0700 [thread overview]
Message-ID: <20150515230950.687069703@linuxfoundation.org> (raw)
In-Reply-To: <20150515230950.640453239@linuxfoundation.org>
3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxiao Bi <junxiao.bi@oracle.com>
commit b1432a2a35565f538586774a03bf277c27fc267d upstream.
There is a race window in dlm_get_lock_resource(), which may return a
lock resource which has been purged. This will cause the process to
hang forever in dlmlock() as the ast msg can't be handled due to its
lock resource not existing.
dlm_get_lock_resource {
...
spin_lock(&dlm->spinlock);
tmpres = __dlm_lookup_lockres_full(dlm, lockid, namelen, hash);
if (tmpres) {
spin_unlock(&dlm->spinlock);
>>>>>>>> race window, dlm_run_purge_list() may run and purge
the lock resource
spin_lock(&tmpres->spinlock);
...
spin_unlock(&tmpres->spinlock);
}
}
Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/ocfs2/dlm/dlmmaster.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -726,6 +726,19 @@ lookup:
if (tmpres) {
spin_unlock(&dlm->spinlock);
spin_lock(&tmpres->spinlock);
+
+ /*
+ * Right after dlm spinlock was released, dlm_thread could have
+ * purged the lockres. Check if lockres got unhashed. If so
+ * start over.
+ */
+ if (hlist_unhashed(&tmpres->hash_node)) {
+ spin_unlock(&tmpres->spinlock);
+ dlm_lockres_put(tmpres);
+ tmpres = NULL;
+ goto lookup;
+ }
+
/* Wait on the thread that is mastering the resource */
if (tmpres->owner == DLM_LOCK_RES_OWNER_UNKNOWN) {
__dlm_wait_on_lockres(tmpres);
next prev parent reply other threads:[~2015-05-15 23:10 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-15 23:10 [PATCH 3.14 00/51] 3.14.43-stable review Greg Kroah-Hartman
2015-05-15 23:10 ` Greg Kroah-Hartman [this message]
2015-05-15 23:10 ` [PATCH 3.14 02/51] nilfs2: fix sanity check of btree level in nilfs_btree_root_broken() Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 03/51] RDMA/CMA: Canonize IPv4 on IPV6 sockets properly Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 04/51] gpio: unregister gpiochip device before removing it Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 05/51] gpio: sysfs: fix memory leaks and device hotplug Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 06/51] mnt: Fix fs_fully_visible to verify the root directory is visible Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 07/51] mm/memory-failure: call shake_page() when error hits thp tail page Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 08/51] writeback: use |1 instead of +1 to protect against div by zero Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 09/51] mm: soft-offline: fix num_poisoned_pages counting on concurrent events Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 10/51] xen/events: Clear cpu_evtchn_mask before resuming Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 11/51] xen/console: Update console event channel on resume Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 12/51] xen/events: Set irq_info->evtchn before binding the channel to CPU in __startup_pirq() Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 13/51] Revert "dm crypt: fix deadlock when async crypto algorithm returns -EBUSY" Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 14/51] ARM: dts: imx25: Add #pwm-cells to pwm4 Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 15/51] ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 16/51] ARM: dts: imx23-olinuxino: Fix dr_mode of usb0 Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 17/51] ARM: dts: imx23-olinuxino: Fix polarity of LED GPIO Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 18/51] ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 19/51] ARM: net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K intruction Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 20/51] ARM: ux500: Move GPIO regulator for SD-card into board DTSs Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 21/51] ARM: ux500: Enable GPIO regulator for SD-card for HREF boards Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 22/51] ARM: ux500: Enable GPIO regulator for SD-card for snowball Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 23/51] drm/i915: Add missing MacBook Pro models with dual channel LVDS Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 27/51] pinctrl: Dont just pretend to protect pinctrl_maps, do it for real Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 28/51] mmc: card: Dont access RPMB partitions for normal read/write Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 29/51] mmc: core: add missing pm event in mmc_pm_notify to fix hib restore Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 30/51] mmc: sh_mmcif: Fix timeout value for command request Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 31/51] sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND) Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 32/51] ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 33/51] ACPICA: Utilities: Cleanup to enforce ACPI_PHYSADDR_TO_PTR()/ACPI_PTR_TO_PHYSADDR() Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 34/51] ACPICA: Utilities: Cleanup to convert physical address printing formats Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 35/51] ACPICA: Utilities: Cleanup to remove useless ACPI_PRINTF/FORMAT_xxx helpers Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 36/51] deal with deadlock in d_walk() Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 37/51] arm64: KVM: force cache clean on page fault when caches are off Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 38/51] arm64: KVM: allows discrimination of AArch32 sysreg access Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 39/51] arm64: KVM: trap VM system registers until MMU and caches are ON Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 40/51] ARM: KVM: introduce kvm_p*d_addr_end Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 41/51] arm64: KVM: flush VM pages before letting the guest enable caches Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 42/51] ARM: KVM: force cache clean on page fault when caches are off Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 43/51] ARM: KVM: fix handling of trapped 64bit coprocessor accesses Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 44/51] ARM: KVM: fix ordering of " Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 45/51] ARM: KVM: introduce per-vcpu HYP Configuration Register Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 46/51] ARM: KVM: add world-switch for AMAIR{0,1} Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 47/51] ARM: KVM: trap VM system registers until MMU and caches are ON Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 48/51] KVM: arm/arm64: vgic: fix GICD_ICFGR register accesses Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 49/51] KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 50/51] arm64: kvm: use inner-shareable barriers for inner-shareable maintenance Greg Kroah-Hartman
2015-05-15 23:10 ` [PATCH 3.14 51/51] kvm: arm64: vgic: fix hyp panic with 64k pages on juno platform Greg Kroah-Hartman
2015-05-16 3:15 ` [PATCH 3.14 00/51] 3.14.43-stable review Shuah Khan
2015-05-16 3:15 ` Guenter Roeck
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=20150515230950.687069703@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=jlbec@evilplan.org \
--cc=joseph.qi@huawei.com \
--cc=junxiao.bi@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mfasheh@suse.com \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).