[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 58/66] vdpa: Use iovec for vhost_vdpa_net_load_cmd()
From: |
Michael S. Tsirkin |
Subject: |
[PULL 58/66] vdpa: Use iovec for vhost_vdpa_net_load_cmd() |
Date: |
Mon, 10 Jul 2023 19:05:12 -0400 |
From: Hawkins Jiawei <yin31149@gmail.com>
According to VirtIO standard, "The driver MUST follow
the VIRTIO_NET_CTRL_MAC_TABLE_SET command by a le32 number,
followed by that number of non-multicast MAC addresses,
followed by another le32 number, followed by that number
of multicast addresses."
Considering that these data is not stored in contiguous memory,
this patch refactors vhost_vdpa_net_load_cmd() to accept
scattered data, eliminating the need for an addtional data copy or
packing the data into s->cvq_cmd_out_buffer outside of
vhost_vdpa_net_load_cmd().
Signed-off-by: Hawkins Jiawei <yin31149@gmail.com>
Message-Id:
<3482cc50eebd13db4140b8b5dec9d0cc25b20b1b.1688743107.git.yin31149@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
net/vhost-vdpa.c | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 5542b47a8f..e192217a96 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -626,29 +626,38 @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s,
size_t out_len,
}
static ssize_t vhost_vdpa_net_load_cmd(VhostVDPAState *s, uint8_t class,
- uint8_t cmd, const void *data,
- size_t data_size)
+ uint8_t cmd, const struct iovec
*data_sg,
+ size_t data_num)
{
const struct virtio_net_ctrl_hdr ctrl = {
.class = class,
.cmd = cmd,
};
+ size_t data_size = iov_size(data_sg, data_num);
assert(data_size < vhost_vdpa_net_cvq_cmd_page_len() - sizeof(ctrl));
+ /* pack the CVQ command header */
memcpy(s->cvq_cmd_out_buffer, &ctrl, sizeof(ctrl));
- memcpy(s->cvq_cmd_out_buffer + sizeof(ctrl), data, data_size);
- return vhost_vdpa_net_cvq_add(s, sizeof(ctrl) + data_size,
+ /* pack the CVQ command command-specific-data */
+ iov_to_buf(data_sg, data_num, 0,
+ s->cvq_cmd_out_buffer + sizeof(ctrl), data_size);
+
+ return vhost_vdpa_net_cvq_add(s, data_size + sizeof(ctrl),
sizeof(virtio_net_ctrl_ack));
}
static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n)
{
if (virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_MAC_ADDR)) {
+ const struct iovec data = {
+ .iov_base = (void *)n->mac,
+ .iov_len = sizeof(n->mac),
+ };
ssize_t dev_written = vhost_vdpa_net_load_cmd(s, VIRTIO_NET_CTRL_MAC,
VIRTIO_NET_CTRL_MAC_ADDR_SET,
- n->mac, sizeof(n->mac));
+ &data, 1);
if (unlikely(dev_written < 0)) {
return dev_written;
}
@@ -671,9 +680,13 @@ static int vhost_vdpa_net_load_mq(VhostVDPAState *s,
}
mq.virtqueue_pairs = cpu_to_le16(n->curr_queue_pairs);
+ const struct iovec data = {
+ .iov_base = &mq,
+ .iov_len = sizeof(mq),
+ };
dev_written = vhost_vdpa_net_load_cmd(s, VIRTIO_NET_CTRL_MQ,
- VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, &mq,
- sizeof(mq));
+ VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET,
+ &data, 1);
if (unlikely(dev_written < 0)) {
return dev_written;
}
@@ -712,9 +725,13 @@ static int vhost_vdpa_net_load_offloads(VhostVDPAState *s,
}
offloads = cpu_to_le64(n->curr_guest_offloads);
+ const struct iovec data = {
+ .iov_base = &offloads,
+ .iov_len = sizeof(offloads),
+ };
dev_written = vhost_vdpa_net_load_cmd(s, VIRTIO_NET_CTRL_GUEST_OFFLOADS,
VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET,
- &offloads, sizeof(offloads));
+ &data, 1);
if (unlikely(dev_written < 0)) {
return dev_written;
}
--
MST
- Re: [PULL 46/66] virtio-iommu: Fix 64kB host page size VFIO device assignment, (continued)
[PULL 59/66] vdpa: Restore MAC address filtering state, Michael S. Tsirkin, 2023/07/10
[PULL 57/66] pcie: Specify 0 for ARI next function numbers, Michael S. Tsirkin, 2023/07/10
[PULL 54/66] include/hw/virtio: add kerneldoc for virtio_init, Michael S. Tsirkin, 2023/07/10
[PULL 45/66] hw/pci: warn when PCIe device is plugged into non-zero slot of downstream port, Michael S. Tsirkin, 2023/07/10
[PULL 55/66] include/hw/virtio: document some more usage of notifiers, Michael S. Tsirkin, 2023/07/10
[PULL 60/66] vdpa: Restore packet receive filtering state relative with _F_CTRL_RX feature, Michael S. Tsirkin, 2023/07/10
[PULL 58/66] vdpa: Use iovec for vhost_vdpa_net_load_cmd(),
Michael S. Tsirkin <=
[PULL 62/66] vdpa: Accessing CVQ header through its structure, Michael S. Tsirkin, 2023/07/10
[PULL 56/66] pcie: Use common ARI next function number, Michael S. Tsirkin, 2023/07/10
[PULL 61/66] vhost: Fix false positive out-of-bounds, Michael S. Tsirkin, 2023/07/10
[PULL 63/66] vdpa: Avoid forwarding large CVQ command failures, Michael S. Tsirkin, 2023/07/10
[PULL 64/66] vdpa: Allow VIRTIO_NET_F_CTRL_RX in SVQ, Michael S. Tsirkin, 2023/07/10
[PULL 65/66] vdpa: Restore packet receive filtering state relative with _F_CTRL_RX_EXTRA feature, Michael S. Tsirkin, 2023/07/10
[PULL 66/66] vdpa: Allow VIRTIO_NET_F_CTRL_RX_EXTRA in SVQ, Michael S. Tsirkin, 2023/07/10
Re: [PULL 00/66] pc,pci,virtio: cleanups, fixes, features, Richard Henderson, 2023/07/11