From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
bpf@vger.kernel.org
Subject: [PATCH v2 05/12] virito: queue_reset: pci: move the per queue irq logic from vp_del_vqs to vp_del_vq
Date: Thu, 20 Jan 2022 14:42:56 +0800 [thread overview]
Message-ID: <20220120064303.106639-6-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20220120064303.106639-1-xuanzhuo@linux.alibaba.com>
Move irq's processing logic into vp_del_vq(), so that this function can
handle a vq's del operation independently.
In the subsequent patches that supports queue reset, I have the
need to delete a vq separately.
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
drivers/virtio/virtio_pci_common.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index fdbde1db5ec5..cb1eec0a6bf3 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -248,6 +248,17 @@ static void vp_del_vq(struct virtqueue *vq)
struct virtio_pci_vq_info *info = vp_dev->vqs[vq->index];
unsigned long flags;
+ if (vp_dev->per_vq_vectors) {
+ int v = vp_dev->vqs[vq->index]->msix_vector;
+
+ if (v != VIRTIO_MSI_NO_VECTOR) {
+ int irq = pci_irq_vector(vp_dev->pci_dev, v);
+
+ irq_set_affinity_hint(irq, NULL);
+ free_irq(irq, vq);
+ }
+ }
+
spin_lock_irqsave(&vp_dev->lock, flags);
list_del(&info->node);
spin_unlock_irqrestore(&vp_dev->lock, flags);
@@ -263,19 +274,9 @@ void vp_del_vqs(struct virtio_device *vdev)
struct virtqueue *vq, *n;
int i;
- list_for_each_entry_safe(vq, n, &vdev->vqs, list) {
- if (vp_dev->per_vq_vectors) {
- int v = vp_dev->vqs[vq->index]->msix_vector;
-
- if (v != VIRTIO_MSI_NO_VECTOR) {
- int irq = pci_irq_vector(vp_dev->pci_dev, v);
-
- irq_set_affinity_hint(irq, NULL);
- free_irq(irq, vq);
- }
- }
+ list_for_each_entry_safe(vq, n, &vdev->vqs, list)
vp_del_vq(vq);
- }
+
vp_dev->per_vq_vectors = false;
if (vp_dev->intx_enabled) {
--
2.31.0
next prev parent reply other threads:[~2022-01-20 6:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-20 6:42 [PATCH v2 00/12] virtio pci support VIRTIO_F_RING_RESET Xuan Zhuo
2022-01-20 6:42 ` [PATCH v2 01/12] virtio: pci: struct virtio_pci_common_cfg add queue_notify_data Xuan Zhuo
2022-01-20 6:42 ` [PATCH v2 02/12] virtio: queue_reset: add VIRTIO_F_RING_RESET Xuan Zhuo
2022-01-20 6:42 ` [PATCH v2 03/12] virtio: queue_reset: struct virtio_config_ops add callbacks for queue_reset Xuan Zhuo
2022-01-20 6:42 ` [PATCH v2 04/12] virtio: queue_reset: pci: update struct virtio_pci_common_cfg and option functions Xuan Zhuo
2022-01-20 6:42 ` Xuan Zhuo [this message]
2022-01-20 6:42 ` [PATCH v2 06/12] virtio: queue_reset: pci: add independent function to enable msix vq Xuan Zhuo
2022-01-20 6:42 ` [PATCH v2 07/12] virtio: queue_reset: pci: support VIRTIO_F_RING_RESET Xuan Zhuo
2022-01-20 10:55 ` Michael S. Tsirkin
[not found] ` <1642679180.4063296-1-xuanzhuo@linux.alibaba.com>
2022-01-20 15:03 ` Michael S. Tsirkin
[not found] ` <1642731779.2471316-1-xuanzhuo@linux.alibaba.com>
2022-01-21 10:22 ` Michael S. Tsirkin
2022-01-21 10:22 ` Michael S. Tsirkin
[not found] ` <1642760793.1188169-1-xuanzhuo@linux.alibaba.com>
2022-01-21 13:19 ` Michael S. Tsirkin
[not found] ` <1642774171.933696-1-xuanzhuo@linux.alibaba.com>
2022-01-21 15:28 ` Michael S. Tsirkin
[not found] ` <1642779265.2774203-1-xuanzhuo@linux.alibaba.com>
2022-01-21 15:45 ` Michael S. Tsirkin
2022-01-20 6:42 ` [PATCH v2 08/12] virtio: queue_reset: add helper Xuan Zhuo
2022-01-20 6:43 ` [PATCH v2 09/12] virtio_net: virtnet_tx_timeout() fix style Xuan Zhuo
2022-01-20 6:43 ` [PATCH v2 10/12] virtio_net: virtnet_tx_timeout() stop ref sq->vq Xuan Zhuo
2022-01-20 6:43 ` [PATCH v2 11/12] virtio_net: split free_unused_bufs() Xuan Zhuo
2022-01-20 6:43 ` [PATCH v2 12/12] virtio-net: support pair disable/enable Xuan Zhuo
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=20220120064303.106639-6-xuanzhuo@linux.alibaba.com \
--to=xuanzhuo@linux.alibaba.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hawk@kernel.org \
--cc=jasowang@redhat.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=mst@redhat.com \
--cc=netdev@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).