From: Max Gurtovoy <mgurtovoy@nvidia.com>
To: <mst@redhat.com>, <kvm@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>,
<jasowang@redhat.com>
Cc: <oren@nvidia.com>, <nitzanc@nvidia.com>,
Max Gurtovoy <mgurtovoy@nvidia.com>
Subject: [PATCH 3/3] virtio_pci: add module param for reset_timeout
Date: Wed, 7 Apr 2021 12:09:24 +0000 [thread overview]
Message-ID: <20210407120924.133294-3-mgurtovoy@nvidia.com> (raw)
In-Reply-To: <20210407120924.133294-1-mgurtovoy@nvidia.com>
Enable the user to set the time for waiting for successful reset by the
virtio controller. Set the default to 180 seconds.
Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
---
drivers/virtio/virtio_pci_common.c | 5 +++++
drivers/virtio/virtio_pci_common.h | 2 ++
drivers/virtio/virtio_pci_modern.c | 3 ++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index 222d630c41fc..3a4c57839ed8 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -24,6 +24,11 @@ MODULE_PARM_DESC(force_legacy,
"Force legacy mode for transitional virtio 1 devices");
#endif
+unsigned int reset_timeout = 180;
+module_param_named(reset_timeout, reset_timeout, uint, 0644);
+MODULE_PARM_DESC(reset_timeout,
+ "timeout in seconds for reset virtio device operation");
+
/* wait for pending irq handlers */
void vp_synchronize_vectors(struct virtio_device *vdev)
{
diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h
index beec047a8f8d..4760cdf74961 100644
--- a/drivers/virtio/virtio_pci_common.h
+++ b/drivers/virtio/virtio_pci_common.h
@@ -29,6 +29,8 @@
#include <linux/highmem.h>
#include <linux/spinlock.h>
+extern unsigned int reset_timeout;
+
struct virtio_pci_vq_info {
/* the actual virtqueue */
struct virtqueue *vq;
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index dcee616e8d21..811fc1719d8c 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -162,7 +162,8 @@ static int vp_reset(struct virtio_device *vdev)
{
struct virtio_pci_device *vp_dev = to_vp_device(vdev);
struct virtio_pci_modern_device *mdev = &vp_dev->mdev;
- unsigned long timeout = jiffies + msecs_to_jiffies(180000);
+ unsigned long timeout = jiffies +
+ msecs_to_jiffies(reset_timeout * 1000);
/* 0 status means a reset. */
vp_modern_set_status(mdev, 0);
--
2.25.4
next prev parent reply other threads:[~2021-04-07 12:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 12:09 [PATCH 1/3] virtio: update reset callback to return status Max Gurtovoy
2021-04-07 12:09 ` [PATCH 2/3] virito_pci: add timeout to reset device operation Max Gurtovoy
2021-04-07 13:45 ` Michael S. Tsirkin
2021-04-07 13:45 ` Michael S. Tsirkin
2021-04-07 14:06 ` Max Gurtovoy
2021-04-07 12:09 ` Max Gurtovoy [this message]
2021-04-07 13:44 ` [PATCH 1/3] virtio: update reset callback to return status Cornelia Huck
2021-04-07 13:44 ` Cornelia Huck
2021-04-07 14:35 ` Max Gurtovoy
2021-04-07 17:51 ` kernel test robot
2021-04-07 17:51 ` kernel test robot
2021-04-07 17:51 ` kernel test robot
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=20210407120924.133294-3-mgurtovoy@nvidia.com \
--to=mgurtovoy@nvidia.com \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=nitzanc@nvidia.com \
--cc=oren@nvidia.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.