From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Sasha Levin <sashal@kernel.org>,
amit@kernel.org, gregkh@linuxfoundation.org,
virtualization@lists.linux-foundation.org
Subject: [PATCH AUTOSEL 5.10 05/12] virtio_console: break out of buf poll on remove
Date: Wed, 16 Mar 2022 10:16:29 -0400 [thread overview]
Message-ID: <20220316141636.248324-5-sashal@kernel.org> (raw)
In-Reply-To: <20220316141636.248324-1-sashal@kernel.org>
From: "Michael S. Tsirkin" <mst@redhat.com>
[ Upstream commit 0e7174b9d5877130fec41fb4a16e0c2ee4958d44 ]
A common pattern for device reset is currently:
vdev->config->reset(vdev);
.. cleanup ..
reset prevents new interrupts from arriving and waits for interrupt
handlers to finish.
However if - as is common - the handler queues a work request which is
flushed during the cleanup stage, we have code adding buffers / trying
to get buffers while device is reset. Not good.
This was reproduced by running
modprobe virtio_console
modprobe -r virtio_console
in a loop.
Fix this up by calling virtio_break_device + flush before reset.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1786239
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/char/virtio_console.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 673522874cec..3dd4deb60adb 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1959,6 +1959,13 @@ static void virtcons_remove(struct virtio_device *vdev)
list_del(&portdev->list);
spin_unlock_irq(&pdrvdata_lock);
+ /* Device is going away, exit any polling for buffers */
+ virtio_break_device(vdev);
+ if (use_multiport(portdev))
+ flush_work(&portdev->control_work);
+ else
+ flush_work(&portdev->config_work);
+
/* Disable interrupts for vqs */
vdev->config->reset(vdev);
/* Finish up work that's lined up */
--
2.34.1
next prev parent reply other threads:[~2022-03-16 14:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-16 14:16 [PATCH AUTOSEL 5.10 01/12] arm64: dts: qcom: c630: disable crypto due to serror Sasha Levin
2022-03-16 14:16 ` [PATCH AUTOSEL 5.10 02/12] HID: logitech-dj: add new lightspeed receiver id Sasha Levin
2022-03-16 14:16 ` [PATCH AUTOSEL 5.10 03/12] xfrm: fix tunnel model fragmentation behavior Sasha Levin
2022-03-16 14:16 ` [PATCH AUTOSEL 5.10 04/12] ARM: mstar: Select HAVE_ARM_ARCH_TIMER Sasha Levin
2022-03-16 14:16 ` Sasha Levin [this message]
2022-03-16 14:16 ` [PATCH AUTOSEL 5.10 06/12] vdpa/mlx5: should verify CTRL_VQ feature exists for MQ Sasha Levin
2022-03-16 14:16 ` [PATCH AUTOSEL 5.10 07/12] Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0" Sasha Levin
2022-03-16 14:16 ` [PATCH AUTOSEL 5.10 08/12] tools/virtio: fix virtio_test execution Sasha Levin
2022-03-16 14:16 ` [PATCH AUTOSEL 5.10 09/12] ethernet: sun: Free the coherent when failing in probing Sasha Levin
2022-03-16 14:16 ` [PATCH AUTOSEL 5.10 10/12] gpio: Revert regression in sysfs-gpio (gpiolib.c) Sasha Levin
2022-03-16 16:06 ` Linus Walleij
2022-03-16 16:40 ` Sasha Levin
2022-03-16 23:41 ` Linus Walleij
2022-03-16 14:16 ` [PATCH AUTOSEL 5.10 11/12] spi: Fix invalid sgs value Sasha Levin
2022-03-16 14:16 ` [PATCH AUTOSEL 5.10 12/12] net:mcf8390: Use platform_get_irq() to get the interrupt Sasha Levin
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=20220316141636.248324-5-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=amit@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=stable@vger.kernel.org \
--cc=virtualization@lists.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).