From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
syzbot+831661966588c802aae9@syzkaller.appspotmail.com,
Bart Van Assche <bvanassche@acm.org>,
Leon Romanovsky <leonro@nvidia.com>,
Jason Gunthorpe <jgg@nvidia.com>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.9 15/29] RDMA/ib_srp: Fix a deadlock
Date: Mon, 28 Feb 2022 18:23:42 +0100 [thread overview]
Message-ID: <20220228172143.382581693@linuxfoundation.org> (raw)
In-Reply-To: <20220228172141.744228435@linuxfoundation.org>
From: Bart Van Assche <bvanassche@acm.org>
[ Upstream commit 081bdc9fe05bb23248f5effb6f811da3da4b8252 ]
Remove the flush_workqueue(system_long_wq) call since flushing
system_long_wq is deadlock-prone and since that call is redundant with a
preceding cancel_work_sync()
Link: https://lore.kernel.org/r/20220215210511.28303-3-bvanassche@acm.org
Fixes: ef6c49d87c34 ("IB/srp: Eliminate state SRP_TARGET_DEAD")
Reported-by: syzbot+831661966588c802aae9@syzkaller.appspotmail.com
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/infiniband/ulp/srp/ib_srp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index af68be201c299..67b993f4ec91a 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -3646,9 +3646,11 @@ static void srp_remove_one(struct ib_device *device, void *client_data)
spin_unlock(&host->target_lock);
/*
- * Wait for tl_err and target port removal tasks.
+ * srp_queue_remove_work() queues a call to
+ * srp_remove_target(). The latter function cancels
+ * target->tl_err_work so waiting for the remove works to
+ * finish is sufficient.
*/
- flush_workqueue(system_long_wq);
flush_workqueue(srp_remove_wq);
kfree(host);
--
2.34.1
next prev parent reply other threads:[~2022-02-28 17:26 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 17:23 [PATCH 4.9 00/29] 4.9.304-rc1 review Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 01/29] mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 02/29] vhost/vsock: dont check owner in vhost_vsock_stop() while releasing Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 03/29] parisc/unaligned: Fix fldd and fstd unaligned handlers on 32-bit kernel Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 04/29] parisc/unaligned: Fix ldw() and stw() unalignment handlers Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 05/29] sr9700: sanity check for packet length Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 06/29] USB: zaurus: support another broken Zaurus Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 07/29] serial: 8250: fix error handling in of_platform_serial_probe() Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 08/29] serial: 8250: of: Fix mapped region size when using reg-offset property Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 09/29] net: __pskb_pull_tail() & pskb_carve_frag_list() drop_monitor friends Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 10/29] gso: do not skip outer ip header in case of ipip and net_failover Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 11/29] openvswitch: Fix setting ipv6 fields causing hw csum failure Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 12/29] drm/edid: Always set RGB444 Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 13/29] net/mlx5e: Fix wrong return value on ioctl EEPROM query failure Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 14/29] configfs: fix a race in configfs_{,un}register_subsystem() Greg Kroah-Hartman
2022-02-28 17:23 ` Greg Kroah-Hartman [this message]
2022-02-28 17:23 ` [PATCH 4.9 16/29] iio: adc: men_z188_adc: Fix a resource leak in an error handling path Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 17/29] ata: pata_hpt37x: disable primary channel on HPT371 Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 18/29] Revert "USB: serial: ch341: add new Product ID for CH341A" Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 19/29] usb: gadget: rndis: add spinlock for rndis response list Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 20/29] USB: gadget: validate endpoint index for xilinx udc Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 21/29] tracefs: Set the group ownership in apply_options() not parse_options() Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 22/29] USB: serial: option: add support for DW5829e Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 23/29] USB: serial: option: add Telit LE910R1 compositions Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 24/29] usb: dwc3: gadget: Let the interrupt handler disable bottom halves Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 25/29] xhci: Prevent futile URB re-submissions due to incorrect return value Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 26/29] tty: n_gsm: fix encoding of control signal octet bit DV Greg Kroah-Hartman
2022-03-02 21:01 ` Pavel Machek
2022-02-28 17:23 ` [PATCH 4.9 27/29] tty: n_gsm: fix proper link termination after failed open Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 28/29] memblock: use kfree() to release kmalloced memblock regions Greg Kroah-Hartman
2022-02-28 17:23 ` [PATCH 4.9 29/29] fget: clarify and improve __fget_files() implementation Greg Kroah-Hartman
2022-02-28 21:24 ` [PATCH 4.9 00/29] 4.9.304-rc1 review Florian Fainelli
2022-02-28 21:43 ` Shuah Khan
2022-03-01 17:06 ` Naresh Kamboju
2022-03-01 19:09 ` Guenter Roeck
2022-03-01 19:35 ` Slade Watkins
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=20220228172143.382581693@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=bvanassche@acm.org \
--cc=jgg@nvidia.com \
--cc=leonro@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=syzbot+831661966588c802aae9@syzkaller.appspotmail.com \
/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