[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v3 07/85] virtio-ccw: Handle extra notification data
From: |
Michael S. Tsirkin |
Subject: |
[PULL v3 07/85] virtio-ccw: Handle extra notification data |
Date: |
Wed, 3 Jul 2024 18:44:42 -0400 |
From: Jonah Palmer <jonah.palmer@oracle.com>
Add support to virtio-ccw devices for handling the extra data sent from
the driver to the device when the VIRTIO_F_NOTIFICATION_DATA transport
feature has been negotiated.
The extra data that's passed to the virtio-ccw device when this feature
is enabled varies depending on the device's virtqueue layout.
That data passed to the virtio-ccw device is in the same format as the
data passed to virtio-pci devices.
Signed-off-by: Jonah Palmer <jonah.palmer@oracle.com>
Message-Id: <20240315165557.26942-5-jonah.palmer@oracle.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/s390x/s390-virtio-ccw.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index cd063f8b64..8cd912f20e 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -126,9 +126,11 @@ static void subsystem_reset(void)
static int virtio_ccw_hcall_notify(const uint64_t *args)
{
uint64_t subch_id = args[0];
- uint64_t queue = args[1];
+ uint64_t data = args[1];
SubchDev *sch;
+ VirtIODevice *vdev;
int cssid, ssid, schid, m;
+ uint16_t vq_idx = data;
if (ioinst_disassemble_sch_ident(subch_id, &m, &cssid, &ssid, &schid)) {
return -EINVAL;
@@ -137,12 +139,19 @@ static int virtio_ccw_hcall_notify(const uint64_t *args)
if (!sch || !css_subch_visible(sch)) {
return -EINVAL;
}
- if (queue >= VIRTIO_QUEUE_MAX) {
+
+ vdev = virtio_ccw_get_vdev(sch);
+ if (vq_idx >= VIRTIO_QUEUE_MAX || !virtio_queue_get_num(vdev, vq_idx)) {
return -EINVAL;
}
- virtio_queue_notify(virtio_ccw_get_vdev(sch), queue);
- return 0;
+ if (virtio_vdev_has_feature(vdev, VIRTIO_F_NOTIFICATION_DATA)) {
+ virtio_queue_set_shadow_avail_idx(virtio_get_queue(vdev, vq_idx),
+ (data >> 16) & 0xFFFF);
+ }
+
+ virtio_queue_notify(vdev, vq_idx);
+ return 0;
}
static int virtio_ccw_hcall_early_printk(const uint64_t *args)
--
MST
- [PULL v3 00/85] virtio: features,fixes, Michael S. Tsirkin, 2024/07/03
- [PULL v3 01/85] vhost: dirty log should be per backend type, Michael S. Tsirkin, 2024/07/03
- [PULL v3 02/85] vhost: Perform memory section dirty scans once per iteration, Michael S. Tsirkin, 2024/07/03
- [PULL v3 03/85] vhost-vdpa: check vhost_vdpa_set_vring_ready() return value, Michael S. Tsirkin, 2024/07/03
- [PULL v3 04/85] virtio/virtio-pci: Handle extra notification data, Michael S. Tsirkin, 2024/07/03
- [PULL v3 05/85] virtio: Prevent creation of device using notification-data with ioeventfd, Michael S. Tsirkin, 2024/07/03
- [PULL v3 06/85] virtio-mmio: Handle extra notification data, Michael S. Tsirkin, 2024/07/03
- [PULL v3 08/85] vhost/vhost-user: Add VIRTIO_F_NOTIFICATION_DATA to vhost feature bits, Michael S. Tsirkin, 2024/07/03
- [PULL v3 09/85] Fix vhost user assertion when sending more than one fd, Michael S. Tsirkin, 2024/07/03
- [PULL v3 10/85] vhost-vsock: add VIRTIO_F_RING_PACKED to feature_bits, Michael S. Tsirkin, 2024/07/03
- [PULL v3 07/85] virtio-ccw: Handle extra notification data,
Michael S. Tsirkin <=
- [PULL v3 11/85] hw/virtio: Fix obtain the buffer id from the last descriptor, Michael S. Tsirkin, 2024/07/03
- [PULL v3 13/85] vhost-user-gpu: fix import of DMABUF, Michael S. Tsirkin, 2024/07/03
- [PULL v3 12/85] virtio-pci: only reset pm state during resetting, Michael S. Tsirkin, 2024/07/03
- [PULL v3 14/85] Revert "vhost-user: fix lost reconnect", Michael S. Tsirkin, 2024/07/03
- [PULL v3 15/85] vhost-user: fix lost reconnect again, Michael S. Tsirkin, 2024/07/03
- [PULL v3 18/85] hw/cxl/cxl-mailbox-utils: Add dc_event_log_size field to output payload of identify memory device command, Michael S. Tsirkin, 2024/07/03
- [PULL v3 16/85] hw/cxl/mailbox: change CCI cmd set structure to be a member, not a reference, Michael S. Tsirkin, 2024/07/03
- [PULL v3 19/85] hw/cxl/cxl-mailbox-utils: Add dynamic capacity region representative and mailbox command support, Michael S. Tsirkin, 2024/07/03
- [PULL v3 17/85] hw/cxl/mailbox: interface to add CCI commands to an existing CCI, Michael S. Tsirkin, 2024/07/03
- [PULL v3 20/85] include/hw/cxl/cxl_device: Rename mem_size as static_mem_size for type3 memory devices, Michael S. Tsirkin, 2024/07/03