From nobody Tue Feb 10 02:43:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617875249; cv=none; d=zohomail.com; s=zohoarc; b=A3mYc0W3+ONJudE0WlDwmITKM7ixzvjZWtsWncRBxYEflvLPoJNcYB7AN/LEHKmAIjJUFKuTCkE8ELifHdsFKX1zHOqUz48AyJsmIlOsGJKNA0qGfi1wKILKTncEjRnUSGFj/hGhKCvvNMVNE+rB4N0IzzMVXmf53ACDDbn2pas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617875249; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3D5QWsXrt8U2q7hGTy+r4bnjPeVicLH5vwZ7t4sdQw4=; b=niMT5cP7OLlFaZrs+uCQ1eKeaNGP57FpEIWkGP4JfALZu2/iknUivoKCjXkJ+i4qpqZqt7AbcZ7++Lps9w/tE7wEc9Mv2EFouB1XQ5TKR+Ld54COavl1M9BLNrtrUfIqhOzdAucb1V4zE5v3zU8tRhTk38DCVNzuUe5jRynfhig= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617875249916727.0196178237337; Thu, 8 Apr 2021 02:47:29 -0700 (PDT) Received: from localhost ([::1]:40008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lURG4-0006Rj-GI for importer@patchew.org; Thu, 08 Apr 2021 05:47:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUR7r-0006wf-8q for qemu-devel@nongnu.org; Thu, 08 Apr 2021 05:38:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUR7p-0004Si-HN for qemu-devel@nongnu.org; Thu, 08 Apr 2021 05:38:59 -0400 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-351-LnEoei9lPOCk_OT3WNkxtw-1; Thu, 08 Apr 2021 05:38:55 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A1EAF1006C87 for ; Thu, 8 Apr 2021 09:38:54 +0000 (UTC) Received: from laptop.redhat.com (ovpn-13-72.pek2.redhat.com [10.72.13.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AA825D9DC; Thu, 8 Apr 2021 09:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617874737; 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=3D5QWsXrt8U2q7hGTy+r4bnjPeVicLH5vwZ7t4sdQw4=; b=FWoTSHrrTAV9NKb3oOvCv889z3U0HephAg7Gu+cBAd+UuRoNVz5kZvIJ6+zx39nymbUHQd CGrT6fY7ZUIedx2EzAZL6ptOmCJ9YqIJ3+9eufaiGV1PNua7rX3pEHs1Xc6vEqyY7i64O4 xzgvcO8b5Uf6QMcifT786vWLwtdqe00= X-MC-Unique: LnEoei9lPOCk_OT3WNkxtw-1 From: Cindy Lu To: lulu@redhat.com, mst@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v5 6/6] virtio-pci: add support for configure interrupt Date: Thu, 8 Apr 2021 17:38:24 +0800 Message-Id: <20210408093824.14985-7-lulu@redhat.com> In-Reply-To: <20210408093824.14985-1-lulu@redhat.com> References: <20210408093824.14985-1-lulu@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lulu@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=lulu@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add support for configure interrupt, use kvm_irqfd_assign and set the gsi to kernel. When the configure notifier was eventfd_signal by host kernel, this will finally inject an msix interrupt to guest Signed-off-by: Cindy Lu --- hw/virtio/virtio-pci.c | 91 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 3 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 481f6e7505..7b02f42c06 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -664,7 +664,6 @@ static uint32_t virtio_read_config(PCIDevice *pci_dev, } =20 static int kvm_virtio_pci_vq_vector_use(VirtIOPCIProxy *proxy, - unsigned int queue_no, unsigned int vector) { VirtIOIRQFD *irqfd =3D &proxy->vector_irqfd[vector]; @@ -726,7 +725,7 @@ static int kvm_virtio_pci_vector_use(VirtIOPCIProxy *pr= oxy, int nvqs) if (vector >=3D msix_nr_vectors_allocated(dev)) { continue; } - ret =3D kvm_virtio_pci_vq_vector_use(proxy, queue_no, vector); + ret =3D kvm_virtio_pci_vq_vector_use(proxy, vector); if (ret < 0) { goto undo; } @@ -760,6 +759,56 @@ undo: } return ret; } +static int kvm_virtio_pci_vector_config_use(VirtIOPCIProxy *proxy) +{ + VirtIODevice *vdev =3D virtio_bus_get_device(&proxy->bus); + unsigned int vector; + int ret; + EventNotifier *n =3D virtio_get_config_notifier(vdev); + vector =3D vdev->config_vector ; + ret =3D kvm_virtio_pci_vq_vector_use(proxy, vector); + if (ret < 0) { + goto undo; + } + ret =3D kvm_virtio_pci_irqfd_use(proxy, n, vector); + if (ret < 0) { + goto undo; + } + return 0; +undo: + kvm_virtio_pci_irqfd_release(proxy, n, vector); + return ret; +} +static void kvm_virtio_pci_vector_config_release(VirtIOPCIProxy *proxy) +{ + PCIDevice *dev =3D &proxy->pci_dev; + VirtIODevice *vdev =3D virtio_bus_get_device(&proxy->bus); + unsigned int vector; + EventNotifier *n =3D virtio_get_config_notifier(vdev); + vector =3D vdev->config_vector ; + if (vector >=3D msix_nr_vectors_allocated(dev)) { + return; + } + kvm_virtio_pci_irqfd_release(proxy, n, vector); + kvm_virtio_pci_vq_vector_release(proxy, vector); +} +static int virtio_pci_set_config_notifier(DeviceState *d, bool assign) +{ + VirtIOPCIProxy *proxy =3D to_virtio_pci_proxy(d); + VirtIODevice *vdev =3D virtio_bus_get_device(&proxy->bus); + EventNotifier *notifier =3D virtio_get_config_notifier(vdev); + int r =3D 0; + if (assign) { + r =3D event_notifier_init(notifier, 0); + virtio_set_config_notifier_fd_handler(vdev, true, true); + kvm_virtio_pci_vector_config_use(proxy); + } else { + virtio_set_config_notifier_fd_handler(vdev, false, true); + kvm_virtio_pci_vector_config_release(proxy); + event_notifier_cleanup(notifier); + } + return r; +} =20 static void kvm_virtio_pci_vector_release(VirtIOPCIProxy *proxy, int nvqs) { @@ -858,6 +907,14 @@ static int virtio_pci_vector_unmask(PCIDevice *dev, un= signed vector, EventNotifier *n; int ret, index, unmasked =3D 0; =20 + if (vdev->use_config_notifier =3D=3D true) { + n =3D virtio_get_config_notifier(vdev); + ret =3D virtio_pci_vq_vector_unmask(proxy, 0, vector, msg, + VIRTIO_CONFIG_VECTOR, n); + if (ret < 0) { + goto config_undo; + } + } while (vq) { index =3D virtio_get_queue_index(vq); if (!virtio_queue_get_num(vdev, index)) { @@ -889,6 +946,10 @@ undo: } vq =3D virtio_vector_next_queue(vq); } + config_undo: + n =3D virtio_get_config_notifier(vdev); + virtio_pci_vq_vector_mask(proxy, 0, vector, + VIRTIO_CONFIG_VECTOR, n); return ret; } =20 @@ -900,6 +961,10 @@ static void virtio_pci_vector_mask(PCIDevice *dev, uns= igned vector) EventNotifier *n; int index; =20 + if (vdev->use_config_notifier =3D=3D true) { + n =3D virtio_get_config_notifier(vdev); + virtio_pci_vq_vector_mask(proxy, 0, vector, VIRTIO_CONFIG_VECTOR, = n); + } while (vq) { index =3D virtio_get_queue_index(vq); n =3D virtio_queue_get_guest_notifier(vq); @@ -945,6 +1010,21 @@ static void virtio_pci_vector_poll(PCIDevice *dev, msix_set_pending(dev, vector); } } + if (vdev->use_config_notifier =3D=3D true) { + vector =3D vdev->config_vector; + notifier =3D virtio_get_config_notifier(vdev); + if (vector < vector_start || vector >=3D vector_end || + !msix_is_masked(dev, vector)) { + return; + } + if (k->guest_notifier_pending) { + if (k->guest_notifier_pending(vdev, 0, VIRTIO_CONFIG_VECTOR))= { + msix_set_pending(dev, vector); + } + } else if (event_notifier_test_and_clear(notifier)) { + msix_set_pending(dev, vector); + } + } } =20 static int virtio_pci_set_guest_notifier(DeviceState *d, int n, bool assig= n, @@ -1032,6 +1112,10 @@ static int virtio_pci_set_guest_notifiers(DeviceStat= e *d, int nvqs, bool assign) goto assign_error; } } + r =3D virtio_pci_set_config_notifier(d, assign); + if (r < 0) { + goto config_error; + } r =3D msix_set_vector_notifiers(&proxy->pci_dev, virtio_pci_vector_unmask, virtio_pci_vector_mask, @@ -1048,7 +1132,8 @@ notifiers_error: assert(assign); kvm_virtio_pci_vector_release(proxy, nvqs); } - + config_error: + kvm_virtio_pci_vector_config_release(proxy); assign_error: /* We get here on assignment failure. Recover by undoing for VQs 0 .. = n. */ assert(assign); --=20 2.21.3