From nobody Sun Apr 28 19:54:39 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0781FC76196 for ; Fri, 24 Mar 2023 19:50:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231902AbjCXTuv (ORCPT ); Fri, 24 Mar 2023 15:50:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231802AbjCXTut (ORCPT ); Fri, 24 Mar 2023 15:50:49 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D5631B543 for ; Fri, 24 Mar 2023 12:50:38 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id y15so3609830lfa.7 for ; Fri, 24 Mar 2023 12:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; t=1679687436; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2Yw8aFsO52nF+rCwkiyobvl69eUncIFVtLSBaTu9azE=; b=j6jff6epBcmgpWZzr6Mt4fo1JsP01f32arVrxjAkaSC5wFGzaZyAdq2zMj7mb/PTdh 0OzYz9mESkbBxCpeuK39NQJTQI+dhTUDSv+8GC/8lLDOxF1+Jg5Ef7gbjlwjJQssNkZ4 s8Z8OM1IC1AJv+yrkTyviHWcDBDADHX1czDoDx2Wn3QdQZXptwIqe6mzmvhibgvSvsOd g0XtmqMsoGc/N7Bi3bGtaZ8WSHMq79vDh6/U6MVgA4pUeIXfu2TI1SIg3+GqEF/WIIl0 Qyul0WtoCGDrbnBp+grjJ0yXNO9ra71E2CxyFvxLOMbGdOWbzOj6lLaQpOEMbaiv3Gea DGJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679687436; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2Yw8aFsO52nF+rCwkiyobvl69eUncIFVtLSBaTu9azE=; b=jSUCzK4+tlpiVsbaIrA9frLQXcbPqfWKAW9ffvDk2AjN56DhETuZPvg1/g+CjTd+nY BYVqJrB0s7UPUwi5WXfRKymggGLvUIXC2UBatNqbR9Zn3fTtOhW18RxPyn8qjdELEWpl SpjlCPedhxo4TA5ibBvDTqqNTgbaicb8C1p43w9JMiEXcNS3hGiOmw3D37f84koisVh8 Eo+dMvSGVgf7EngZSonjaHEyafdL+ew9eo98+50iQjsyagvePETI/SaTiAr1rrQRaczf HFpsa3XZnyS1x52uRvD2VVxRT5xA3jj+AUBv4j5q2XDlKvLlwryR/4cQ/XDdFo4IMNZn /Brw== X-Gm-Message-State: AAQBX9eal+l3cQ1CkDwsgNTmV3ifTm+D2D78kfYAXu95NLpAPrNdJ1KB y/QlGgkFTUKkmeEtrZHFb13ywg== X-Google-Smtp-Source: AKy350bUox4jMX8WDd8OT9XknY5+QOLfcn69cZ0KHubEUzso4Fj26uq9efyRVcRKrDtp9MOWavheWA== X-Received: by 2002:ac2:4c13:0:b0:4e9:2c0e:c39d with SMTP id t19-20020ac24c13000000b004e92c0ec39dmr879285lfq.41.1679687436084; Fri, 24 Mar 2023 12:50:36 -0700 (PDT) Received: from vp-pc.. (109-252-122-203.nat.spd-mgts.ru. [109.252.122.203]) by smtp.gmail.com with ESMTPSA id 15-20020ac2484f000000b004eaf6d7228bsm1136021lfy.110.2023.03.24.12.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 12:50:35 -0700 (PDT) From: Viktor Prutyanov To: mst@redhat.com, jasowang@redhat.com Cc: cohuck@redhat.com, pasic@linux.ibm.com, farman@linux.ibm.com, linux-s390@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, yan@daynix.com, viktor@daynix.com Subject: [PATCH v6] virtio: add VIRTIO_F_NOTIFICATION_DATA feature support Date: Fri, 24 Mar 2023 22:50:29 +0300 Message-Id: <20230324195029.2410503-1-viktor@daynix.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" According to VirtIO spec v1.2, VIRTIO_F_NOTIFICATION_DATA feature indicates that the driver passes extra data along with the queue notifications. In a split queue case, the extra data is 16-bit available index. In a packed queue case, the extra data is 1-bit wrap counter and 15-bit available index. Add support for this feature for MMIO, channel I/O and modern PCI transports. Signed-off-by: Viktor Prutyanov Acked-by: Jason Wang Reviewed-by: Xuan Zhuo --- v6: use VRING_PACKED_EVENT_F_WRAP_CTR v5: replace ternary operator with if-else v4: remove VP_NOTIFY macro and legacy PCI support, add virtio_ccw_kvm_notify_with_data to virtio_ccw v3: support feature in virtio_ccw, remove VM_NOTIFY, use avail_idx_shadow, remove byte swap, rename to vring_notification_data v2: reject the feature in virtio_ccw, replace __le32 with u32 Tested with disabled VIRTIO_F_NOTIFICATION_DATA on qemu-system-s390x (virtio-blk-ccw), qemu-system-riscv64 (virtio-blk-device, virtio-rng-device), qemu-system-x86_64 (virtio-blk-pci, virtio-net-pci) to make sure nothing is broken. Tested with enabled VIRTIO_F_NOTIFICATION_DATA on 64-bit RISC-V Linux and my hardware implementation of virtio-rng with MMIO. drivers/s390/virtio/virtio_ccw.c | 22 +++++++++++++++++++--- drivers/virtio/virtio_mmio.c | 18 +++++++++++++++++- drivers/virtio/virtio_pci_modern.c | 17 ++++++++++++++++- drivers/virtio/virtio_ring.c | 19 +++++++++++++++++++ include/linux/virtio_ring.h | 2 ++ include/uapi/linux/virtio_config.h | 6 ++++++ 6 files changed, 79 insertions(+), 5 deletions(-) diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_= ccw.c index 954fc31b4bc7..02922768b129 100644 --- a/drivers/s390/virtio/virtio_ccw.c +++ b/drivers/s390/virtio/virtio_ccw.c @@ -391,7 +391,7 @@ static void virtio_ccw_drop_indicator(struct virtio_ccw= _device *vcdev, ccw_device_dma_free(vcdev->cdev, thinint_area, sizeof(*thinint_area)); } =20 -static bool virtio_ccw_kvm_notify(struct virtqueue *vq) +static inline bool virtio_ccw_do_kvm_notify(struct virtqueue *vq, u32 data) { struct virtio_ccw_vq_info *info =3D vq->priv; struct virtio_ccw_device *vcdev; @@ -402,12 +402,22 @@ static bool virtio_ccw_kvm_notify(struct virtqueue *v= q) BUILD_BUG_ON(sizeof(struct subchannel_id) !=3D sizeof(unsigned int)); info->cookie =3D kvm_hypercall3(KVM_S390_VIRTIO_CCW_NOTIFY, *((unsigned int *)&schid), - vq->index, info->cookie); + data, info->cookie); if (info->cookie < 0) return false; return true; } =20 +static bool virtio_ccw_kvm_notify(struct virtqueue *vq) +{ + return virtio_ccw_do_kvm_notify(vq, vq->index); +} + +static bool virtio_ccw_kvm_notify_with_data(struct virtqueue *vq) +{ + return virtio_ccw_do_kvm_notify(vq, vring_notification_data(vq)); +} + static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, struct ccw1 *ccw, int index) { @@ -495,6 +505,7 @@ static struct virtqueue *virtio_ccw_setup_vq(struct vir= tio_device *vdev, struct ccw1 *ccw) { struct virtio_ccw_device *vcdev =3D to_vc_device(vdev); + bool (*notify)(struct virtqueue *vq); int err; struct virtqueue *vq =3D NULL; struct virtio_ccw_vq_info *info; @@ -502,6 +513,11 @@ static struct virtqueue *virtio_ccw_setup_vq(struct vi= rtio_device *vdev, unsigned long flags; bool may_reduce; =20 + if (__virtio_test_bit(vdev, VIRTIO_F_NOTIFICATION_DATA)) + notify =3D virtio_ccw_kvm_notify_with_data; + else + notify =3D virtio_ccw_kvm_notify; + /* Allocate queue. */ info =3D kzalloc(sizeof(struct virtio_ccw_vq_info), GFP_KERNEL); if (!info) { @@ -524,7 +540,7 @@ static struct virtqueue *virtio_ccw_setup_vq(struct vir= tio_device *vdev, may_reduce =3D vcdev->revision > 0; vq =3D vring_create_virtqueue(i, info->num, KVM_VIRTIO_CCW_RING_ALIGN, vdev, true, may_reduce, ctx, - virtio_ccw_kvm_notify, callback, name); + notify, callback, name); =20 if (!vq) { /* For now, we fail if we can't get the requested size. */ diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 3ff746e3f24a..dd4424c14233 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -285,6 +285,16 @@ static bool vm_notify(struct virtqueue *vq) return true; } =20 +static bool vm_notify_with_data(struct virtqueue *vq) +{ + struct virtio_mmio_device *vm_dev =3D to_virtio_mmio_device(vq->vdev); + u32 data =3D vring_notification_data(vq); + + writel(data, vm_dev->base + VIRTIO_MMIO_QUEUE_NOTIFY); + + return true; +} + /* Notify all virtqueues on an interrupt. */ static irqreturn_t vm_interrupt(int irq, void *opaque) { @@ -363,12 +373,18 @@ static struct virtqueue *vm_setup_vq(struct virtio_de= vice *vdev, unsigned int in const char *name, bool ctx) { struct virtio_mmio_device *vm_dev =3D to_virtio_mmio_device(vdev); + bool (*notify)(struct virtqueue *vq); struct virtio_mmio_vq_info *info; struct virtqueue *vq; unsigned long flags; unsigned int num; int err; =20 + if (__virtio_test_bit(vdev, VIRTIO_F_NOTIFICATION_DATA)) + notify =3D vm_notify_with_data; + else + notify =3D vm_notify; + if (!name) return NULL; =20 @@ -397,7 +413,7 @@ static struct virtqueue *vm_setup_vq(struct virtio_devi= ce *vdev, unsigned int in =20 /* Create the vring */ vq =3D vring_create_virtqueue(index, num, VIRTIO_MMIO_VRING_ALIGN, vdev, - true, true, ctx, vm_notify, callback, name); + true, true, ctx, notify, callback, name); if (!vq) { err =3D -ENOMEM; goto error_new_virtqueue; diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci= _modern.c index 9e496e288cfa..05deba5153bd 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -288,6 +288,15 @@ static u16 vp_config_vector(struct virtio_pci_device *= vp_dev, u16 vector) return vp_modern_config_vector(&vp_dev->mdev, vector); } =20 +static bool vp_notify_with_data(struct virtqueue *vq) +{ + u32 data =3D vring_notification_data(vq); + + iowrite32(data, (void __iomem *)vq->priv); + + return true; +} + static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev, struct virtio_pci_vq_info *info, unsigned int index, @@ -298,10 +307,16 @@ static struct virtqueue *setup_vq(struct virtio_pci_d= evice *vp_dev, { =20 struct virtio_pci_modern_device *mdev =3D &vp_dev->mdev; + bool (*notify)(struct virtqueue *vq); struct virtqueue *vq; u16 num; int err; =20 + if (__virtio_test_bit(&vp_dev->vdev, VIRTIO_F_NOTIFICATION_DATA)) + notify =3D vp_notify_with_data; + else + notify =3D vp_notify; + if (index >=3D vp_modern_get_num_queues(mdev)) return ERR_PTR(-EINVAL); =20 @@ -321,7 +336,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_dev= ice *vp_dev, vq =3D vring_create_virtqueue(index, num, SMP_CACHE_BYTES, &vp_dev->vdev, true, true, ctx, - vp_notify, callback, name); + notify, callback, name); if (!vq) return ERR_PTR(-ENOMEM); =20 diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 4c3bb0ddeb9b..f9c6604352b4 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -2752,6 +2752,23 @@ void vring_del_virtqueue(struct virtqueue *_vq) } EXPORT_SYMBOL_GPL(vring_del_virtqueue); =20 +u32 vring_notification_data(struct virtqueue *_vq) +{ + struct vring_virtqueue *vq =3D to_vvq(_vq); + u16 next; + + if (vq->packed_ring) + next =3D (vq->packed.next_avail_idx & + ~(-(1 << VRING_PACKED_EVENT_F_WRAP_CTR))) | + vq->packed.avail_wrap_counter << + VRING_PACKED_EVENT_F_WRAP_CTR; + else + next =3D vq->split.avail_idx_shadow; + + return next << 16 | _vq->index; +} +EXPORT_SYMBOL_GPL(vring_notification_data); + /* Manipulates transport-specific feature bits. */ void vring_transport_features(struct virtio_device *vdev) { @@ -2771,6 +2788,8 @@ void vring_transport_features(struct virtio_device *v= dev) break; case VIRTIO_F_ORDER_PLATFORM: break; + case VIRTIO_F_NOTIFICATION_DATA: + break; default: /* We don't understand this bit. */ __virtio_clear_bit(vdev, i); diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h index 8b95b69ef694..2550c9170f4f 100644 --- a/include/linux/virtio_ring.h +++ b/include/linux/virtio_ring.h @@ -117,4 +117,6 @@ void vring_del_virtqueue(struct virtqueue *vq); void vring_transport_features(struct virtio_device *vdev); =20 irqreturn_t vring_interrupt(int irq, void *_vq); + +u32 vring_notification_data(struct virtqueue *_vq); #endif /* _LINUX_VIRTIO_RING_H */ diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio= _config.h index 3c05162bc988..2c712c654165 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -99,6 +99,12 @@ */ #define VIRTIO_F_SR_IOV 37 =20 +/* + * This feature indicates that the driver passes extra data (besides + * identifying the virtqueue) in its device notifications. + */ +#define VIRTIO_F_NOTIFICATION_DATA 38 + /* * This feature indicates that the driver can reset a queue individually. */ --=20 2.35.1