From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D3C4C433B4 for ; Fri, 9 Apr 2021 07:03:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 978C261105 for ; Fri, 9 Apr 2021 07:03:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 978C261105 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUlBJ-00045I-I3 for qemu-devel@archiver.kernel.org; Fri, 09 Apr 2021 03:03:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUl5a-0000PZ-80 for qemu-devel@nongnu.org; Fri, 09 Apr 2021 02:57:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42321) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUl5V-00052K-G2 for qemu-devel@nongnu.org; Fri, 09 Apr 2021 02:57:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617951471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q2a7mbV/VycplSLQlbSiST2SfT0TgB9nN0Lv7zgR1S0=; b=SVBPaeuYIm3GFGOXjlGVigd4JQ/6SPjqzi9knfq38uUhhVN6FIpKlnGj3KQ97xjt789z7w ELTc6XaYZiVzAzeBf8ZzfDbvVew2GIxMwL+3YxETV/8iEZ0jt5rjVV3ewPaeQLqjYPCrP7 AGadMFuUH8NM+Qh8y/sIdhVTU1Fb7Bg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-501-o0Co_O6kOY--cWXcK2J6vw-1; Fri, 09 Apr 2021 02:57:49 -0400 X-MC-Unique: o0Co_O6kOY--cWXcK2J6vw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E2F2F1883520 for ; Fri, 9 Apr 2021 06:57:48 +0000 (UTC) Received: from wangxiaodeMacBook-Air.local (ovpn-13-155.pek2.redhat.com [10.72.13.155]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6B4B690F2; Fri, 9 Apr 2021 06:57:42 +0000 (UTC) Subject: Re: [PATCH v5 1/6] virtio: introduce new type in interrupt process To: Cindy Lu , mst@redhat.com, qemu-devel@nongnu.org References: <20210408093824.14985-1-lulu@redhat.com> <20210408093824.14985-2-lulu@redhat.com> From: Jason Wang Message-ID: <60d05532-8528-a5ee-777c-7afac1fc5c00@redhat.com> Date: Fri, 9 Apr 2021 14:57:41 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <20210408093824.14985-2-lulu@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=gbk; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_CHARSET_FARAWAY=2.45, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" ÔÚ 2021/4/8 ÏÂÎç5:38, Cindy Lu дµÀ: > To support config interrupt we need to add > a new type of interrupt process. So we introduce > the vector type > enum virtio_vector_type { >         VIRTIO_VQ_VECTOR, >         VIRTIO_CONFIG_VECTOR, >         VIRTIO_VECTOR_UNKNOWN, >     }; >     I see some tranditiaonl chinese characters here. Plaese correctly congirue your locale. So consider we use int for queue_index, can we simply use -1 as a hint for the config interrupt then there's no need for this extra enum? > Now the bus which support configure interrupt is > virtio-mmio and vritio-pci. For other drivers, the function will > only check if the interrupt type is the VIRTIO_CONFIG_VQ. If not > the function will fail. > > Signed-off-by: Cindy Lu > --- > hw/display/vhost-user-gpu.c | 14 +++++--- > hw/net/virtio-net.c | 15 +++++--- > hw/s390x/virtio-ccw.c | 6 ++-- > hw/virtio/vhost-user-fs.c | 12 ++++--- > hw/virtio/vhost-vsock-common.c | 12 ++++--- > hw/virtio/virtio-crypto.c | 13 ++++--- > hw/virtio/virtio-mmio.c | 2 +- > hw/virtio/virtio-pci.c | 66 ++++++++++++++++++++-------------- > include/hw/virtio/virtio.h | 9 +++-- > 9 files changed, 95 insertions(+), 54 deletions(-) > > diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c > index 51f1747c4a..959ad115b6 100644 > --- a/hw/display/vhost-user-gpu.c > +++ b/hw/display/vhost-user-gpu.c > @@ -487,18 +487,24 @@ vhost_user_gpu_set_status(VirtIODevice *vdev, uint8_t val) > } > > static bool > -vhost_user_gpu_guest_notifier_pending(VirtIODevice *vdev, int idx) > +vhost_user_gpu_guest_notifier_pending(VirtIODevice *vdev, int idx, > + int type) > { > VhostUserGPU *g = VHOST_USER_GPU(vdev); > - > + if (type != VIRTIO_VQ_VECTOR) { > + return false; > + } > return vhost_virtqueue_pending(&g->vhost->dev, idx); > } > > static void > -vhost_user_gpu_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask) > +vhost_user_gpu_guest_notifier_mask(VirtIODevice *vdev, int idx, bool mask, > + int type) > { > VhostUserGPU *g = VHOST_USER_GPU(vdev); > - > + if (type != VIRTIO_VQ_VECTOR) { > + return; > + } > vhost_virtqueue_mask(&g->vhost->dev, vdev, idx, mask); > } > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index 9179013ac4..00d95e6615 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -3055,22 +3055,27 @@ static NetClientInfo net_virtio_info = { > .announce = virtio_net_announce, > }; > > -static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx) > +static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx, > + int type) > { > VirtIONet *n = VIRTIO_NET(vdev); > NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx)); > assert(n->vhost_started); > - return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx); > + if (type == VIRTIO_VQ_VECTOR) { > + return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx); > + } > + return false; > } > > static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx, > - bool mask) > + bool mask, int type) > { > VirtIONet *n = VIRTIO_NET(vdev); > NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx)); > assert(n->vhost_started); > - vhost_net_virtqueue_mask(get_vhost_net(nc->peer), > - vdev, idx, mask); > + if (type == VIRTIO_VQ_VECTOR) { > + vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask); > + } > } > > static void virtio_net_set_config_size(VirtIONet *n, uint64_t host_features) > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index 4582e94ae7..234f749548 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -1003,16 +1003,16 @@ static int virtio_ccw_set_guest_notifier(VirtioCcwDevice *dev, int n, > * need to manually trigger any guest masking callbacks here. > */ > if (k->guest_notifier_mask && vdev->use_guest_notifier_mask) { > - k->guest_notifier_mask(vdev, n, false); > + k->guest_notifier_mask(vdev, n, false, VIRTIO_VQ_VECTOR); > } > /* get lost events and re-inject */ > if (k->guest_notifier_pending && > - k->guest_notifier_pending(vdev, n)) { > + k->guest_notifier_pending(vdev, n, VIRTIO_VQ_VECTOR)) { > event_notifier_set(notifier); > } > } else { > if (k->guest_notifier_mask && vdev->use_guest_notifier_mask) { > - k->guest_notifier_mask(vdev, n, true); > + k->guest_notifier_mask(vdev, n, true, VIRTIO_VQ_VECTOR); > } > if (with_irqfd) { > virtio_ccw_remove_irqfd(dev, n); > diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c > index 1bc5d03a00..22358767f1 100644 > --- a/hw/virtio/vhost-user-fs.c > +++ b/hw/virtio/vhost-user-fs.c > @@ -143,17 +143,21 @@ static void vuf_handle_output(VirtIODevice *vdev, VirtQueue *vq) > } > > static void vuf_guest_notifier_mask(VirtIODevice *vdev, int idx, > - bool mask) > + bool mask, int type) > { > VHostUserFS *fs = VHOST_USER_FS(vdev); > - > + if (type != VIRTIO_VQ_VECTOR) { > + return; > + } > vhost_virtqueue_mask(&fs->vhost_dev, vdev, idx, mask); > } > > -static bool vuf_guest_notifier_pending(VirtIODevice *vdev, int idx) > +static bool vuf_guest_notifier_pending(VirtIODevice *vdev, int idx, int type) > { > VHostUserFS *fs = VHOST_USER_FS(vdev); > - > + if (type != VIRTIO_VQ_VECTOR) { > + return false; > + } > return vhost_virtqueue_pending(&fs->vhost_dev, idx); > } > > diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c > index 5b2ebf3496..92c133c54c 100644 > --- a/hw/virtio/vhost-vsock-common.c > +++ b/hw/virtio/vhost-vsock-common.c > @@ -97,18 +97,22 @@ static void vhost_vsock_common_handle_output(VirtIODevice *vdev, VirtQueue *vq) > } > > static void vhost_vsock_common_guest_notifier_mask(VirtIODevice *vdev, int idx, > - bool mask) > + bool mask, int type) > { > VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev); > - > + if (type != VIRTIO_VQ_VECTOR) { > + return; > + } > vhost_virtqueue_mask(&vvc->vhost_dev, vdev, idx, mask); > } > > static bool vhost_vsock_common_guest_notifier_pending(VirtIODevice *vdev, > - int idx) > + int idx, int type) > { > VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev); > - > + if (type != VIRTIO_VQ_VECTOR) { > + return false; > + } > return vhost_virtqueue_pending(&vvc->vhost_dev, idx); > } > > diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c > index 54f9bbb789..ab7958465c 100644 > --- a/hw/virtio/virtio-crypto.c > +++ b/hw/virtio/virtio-crypto.c > @@ -941,23 +941,28 @@ static void virtio_crypto_set_status(VirtIODevice *vdev, uint8_t status) > } > > static void virtio_crypto_guest_notifier_mask(VirtIODevice *vdev, int idx, > - bool mask) > + bool mask, int type) > { > VirtIOCrypto *vcrypto = VIRTIO_CRYPTO(vdev); > int queue = virtio_crypto_vq2q(idx); > > assert(vcrypto->vhost_started); > - > + if (type != VIRTIO_VQ_VECTOR) { > + return; > + } > cryptodev_vhost_virtqueue_mask(vdev, queue, idx, mask); > } > > -static bool virtio_crypto_guest_notifier_pending(VirtIODevice *vdev, int idx) > +static bool virtio_crypto_guest_notifier_pending(VirtIODevice *vdev, int idx, > + int type) > { > VirtIOCrypto *vcrypto = VIRTIO_CRYPTO(vdev); > int queue = virtio_crypto_vq2q(idx); > > assert(vcrypto->vhost_started); > - > + if (type != VIRTIO_VQ_VECTOR) { > + return false; > + } > return cryptodev_vhost_virtqueue_pending(vdev, queue, idx); > } > > diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c > index e1b5c3b81e..1aa1aaeca4 100644 > --- a/hw/virtio/virtio-mmio.c > +++ b/hw/virtio/virtio-mmio.c > @@ -627,7 +627,7 @@ static int virtio_mmio_set_guest_notifier(DeviceState *d, int n, bool assign, > } > > if (vdc->guest_notifier_mask && vdev->use_guest_notifier_mask) { > - vdc->guest_notifier_mask(vdev, n, !assign); > + vdc->guest_notifier_mask(vdev, n, !assign, VIRTIO_VQ_VECTOR); > } > > return 0; > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 36524a5728..481f6e7505 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -691,23 +691,17 @@ static void kvm_virtio_pci_vq_vector_release(VirtIOPCIProxy *proxy, > } > > static int kvm_virtio_pci_irqfd_use(VirtIOPCIProxy *proxy, > - unsigned int queue_no, > + EventNotifier *n, > unsigned int vector) All the changes of switching to use EventNotifier should be done as a separate patch. Thanks > { > VirtIOIRQFD *irqfd = &proxy->vector_irqfd[vector]; > - VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); > - VirtQueue *vq = virtio_get_queue(vdev, queue_no); > - EventNotifier *n = virtio_queue_get_guest_notifier(vq); > return kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, NULL, irqfd->virq); > } > > static void kvm_virtio_pci_irqfd_release(VirtIOPCIProxy *proxy, > - unsigned int queue_no, > + EventNotifier *n , > unsigned int vector) > { > - VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); > - VirtQueue *vq = virtio_get_queue(vdev, queue_no); > - EventNotifier *n = virtio_queue_get_guest_notifier(vq); > VirtIOIRQFD *irqfd = &proxy->vector_irqfd[vector]; > int ret; > > @@ -722,7 +716,8 @@ static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs) > VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); > unsigned int vector; > int ret, queue_no; > - > + VirtQueue *vq; > + EventNotifier *n; > for (queue_no = 0; queue_no < nvqs; queue_no++) { > if (!virtio_queue_get_num(vdev, queue_no)) { > break; > @@ -739,7 +734,9 @@ static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *proxy, int nvqs) > * Otherwise, delay until unmasked in the frontend. > */ > if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) { > - ret = kvm_virtio_pci_irqfd_use(proxy, queue_no, vector); > + vq = virtio_get_queue(vdev, queue_no); > + n = virtio_queue_get_guest_notifier(vq); > + ret = kvm_virtio_pci_irqfd_use(proxy, n, vector); > if (ret < 0) { > kvm_virtio_pci_vq_vector_release(proxy, vector); > goto undo; > @@ -755,7 +752,9 @@ undo: > continue; > } > if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) { > - kvm_virtio_pci_irqfd_release(proxy, queue_no, vector); > + vq = virtio_get_queue(vdev, queue_no); > + n = virtio_queue_get_guest_notifier(vq); > + kvm_virtio_pci_irqfd_release(proxy, n, vector); > } > kvm_virtio_pci_vq_vector_release(proxy, vector); > } > @@ -769,7 +768,8 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs) > unsigned int vector; > int queue_no; > VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); > - > + VirtQueue *vq; > + EventNotifier *n; > for (queue_no = 0; queue_no < nvqs; queue_no++) { > if (!virtio_queue_get_num(vdev, queue_no)) { > break; > @@ -782,7 +782,9 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs) > * Otherwise, it was cleaned when masked in the frontend. > */ > if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) { > - kvm_virtio_pci_irqfd_release(proxy, queue_no, vector); > + vq = virtio_get_queue(vdev, queue_no); > + n = virtio_queue_get_guest_notifier(vq); > + kvm_virtio_pci_irqfd_release(proxy, n, vector); > } > kvm_virtio_pci_vq_vector_release(proxy, vector); > } > @@ -791,12 +793,12 @@ static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs) > static int virtio_pci_vq_vector_unmask(VirtIOPCIProxy *proxy, > unsigned int queue_no, > unsigned int vector, > - MSIMessage msg) > + MSIMessage msg, > + int type, > + EventNotifier *n) > { > VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); > VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); > - VirtQueue *vq = virtio_get_queue(vdev, queue_no); > - EventNotifier *n = virtio_queue_get_guest_notifier(vq); > VirtIOIRQFD *irqfd; > int ret = 0; > > @@ -816,21 +818,23 @@ static int virtio_pci_vq_vector_unmask(VirtIOPCIProxy *proxy, > * Otherwise, set it up now. > */ > if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) { > - k->guest_notifier_mask(vdev, queue_no, false); > + k->guest_notifier_mask(vdev, queue_no, false, type); > /* Test after unmasking to avoid losing events. */ > if (k->guest_notifier_pending && > - k->guest_notifier_pending(vdev, queue_no)) { > + k->guest_notifier_pending(vdev, queue_no, type)) { > event_notifier_set(n); > } > } else { > - ret = kvm_virtio_pci_irqfd_use(proxy, queue_no, vector); > + ret = kvm_virtio_pci_irqfd_use(proxy, n, vector); > } > return ret; > } > > static void virtio_pci_vq_vector_mask(VirtIOPCIProxy *proxy, > unsigned int queue_no, > - unsigned int vector) > + unsigned int vector, > + int type, > + EventNotifier *n) > { > VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); > VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); > @@ -839,9 +843,9 @@ static void virtio_pci_vq_vector_mask(VirtIOPCIProxy *proxy, > * Otherwise, clean it up now. > */ > if (vdev->use_guest_notifier_mask && k->guest_notifier_mask) { > - k->guest_notifier_mask(vdev, queue_no, true); > + k->guest_notifier_mask(vdev, queue_no, true, type); > } else { > - kvm_virtio_pci_irqfd_release(proxy, queue_no, vector); > + kvm_virtio_pci_irqfd_release(proxy, n, vector); > } > } > > @@ -851,6 +855,7 @@ static int virtio_pci_vector_unmask(PCIDevice *dev, unsigned vector, > VirtIOPCIProxy *proxy = container_of(dev, VirtIOPCIProxy, pci_dev); > VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); > VirtQueue *vq = virtio_vector_first_queue(vdev, vector); > + EventNotifier *n; > int ret, index, unmasked = 0; > > while (vq) { > @@ -859,7 +864,9 @@ static int virtio_pci_vector_unmask(PCIDevice *dev, unsigned vector, > break; > } > if (index < proxy->nvqs_with_notifiers) { > - ret = virtio_pci_vq_vector_unmask(proxy, index, vector, msg); > + n = virtio_queue_get_guest_notifier(vq); > + ret = virtio_pci_vq_vector_unmask(proxy, index, vector, msg, > + VIRTIO_VQ_VECTOR, n); > if (ret < 0) { > goto undo; > } > @@ -875,7 +882,9 @@ undo: > while (vq && unmasked >= 0) { > index = virtio_get_queue_index(vq); > if (index < proxy->nvqs_with_notifiers) { > - virtio_pci_vq_vector_mask(proxy, index, vector); > + n = virtio_queue_get_guest_notifier(vq); > + virtio_pci_vq_vector_mask(proxy, index, vector, > + VIRTIO_VQ_VECTOR, n); > --unmasked; > } > vq = virtio_vector_next_queue(vq); > @@ -888,15 +897,18 @@ static void virtio_pci_vector_mask(PCIDevice *dev, unsigned vector) > VirtIOPCIProxy *proxy = container_of(dev, VirtIOPCIProxy, pci_dev); > VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); > VirtQueue *vq = virtio_vector_first_queue(vdev, vector); > + EventNotifier *n; > int index; > > while (vq) { > index = virtio_get_queue_index(vq); > + n = virtio_queue_get_guest_notifier(vq); > if (!virtio_queue_get_num(vdev, index)) { > break; > } > if (index < proxy->nvqs_with_notifiers) { > - virtio_pci_vq_vector_mask(proxy, index, vector); > + virtio_pci_vq_vector_mask(proxy, index, vector, > + VIRTIO_VQ_VECTOR, n); > } > vq = virtio_vector_next_queue(vq); > } > @@ -926,7 +938,7 @@ static void virtio_pci_vector_poll(PCIDevice *dev, > vq = virtio_get_queue(vdev, queue_no); > notifier = virtio_queue_get_guest_notifier(vq); > if (k->guest_notifier_pending) { > - if (k->guest_notifier_pending(vdev, queue_no)) { > + if (k->guest_notifier_pending(vdev, queue_no, VIRTIO_VQ_VECTOR)) { > msix_set_pending(dev, vector); > } > } else if (event_notifier_test_and_clear(notifier)) { > @@ -958,7 +970,7 @@ static int virtio_pci_set_guest_notifier(DeviceState *d, int n, bool assign, > if (!msix_enabled(&proxy->pci_dev) && > vdev->use_guest_notifier_mask && > vdc->guest_notifier_mask) { > - vdc->guest_notifier_mask(vdev, n, !assign); > + vdc->guest_notifier_mask(vdev, n, !assign, VIRTIO_VQ_VECTOR); > } > > return 0; > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > index b7ece7a6a8..5a1940fe70 100644 > --- a/include/hw/virtio/virtio.h > +++ b/include/hw/virtio/virtio.h > @@ -67,6 +67,11 @@ typedef struct VirtQueueElement > > #define VIRTIO_NO_VECTOR 0xffff > > +enum virtio_vector_type { > + VIRTIO_VQ_VECTOR, > + VIRTIO_CONFIG_VECTOR, > + VIRTIO_VECTOR_UNKNOWN, > +}; > #define TYPE_VIRTIO_DEVICE "virtio-device" > OBJECT_DECLARE_TYPE(VirtIODevice, VirtioDeviceClass, VIRTIO_DEVICE) > > @@ -138,13 +143,13 @@ struct VirtioDeviceClass { > * If backend does not support masking, > * must check in frontend instead. > */ > - bool (*guest_notifier_pending)(VirtIODevice *vdev, int n); > + bool (*guest_notifier_pending)(VirtIODevice *vdev, int n, int type); > /* Mask/unmask events from this vq. Any events reported > * while masked will become pending. > * If backend does not support masking, > * must mask in frontend instead. > */ > - void (*guest_notifier_mask)(VirtIODevice *vdev, int n, bool mask); > + void (*guest_notifier_mask)(VirtIODevice *vdev, int n, bool mask, int type); > int (*start_ioeventfd)(VirtIODevice *vdev); > void (*stop_ioeventfd)(VirtIODevice *vdev); > /* Saving and loading of a device; trying to deprecate save/load