The following changes since commit 99d6b11b5b44d7dd64f4cb1973184e40a4a174f8:

Merge tag 'pull-target-arm-20220922' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2022-09-26 13:38:26 -0400)

for you to fetch changes up to bf769f742c3624952f125b303878a77ea870c156:

virtio: del net client if net_init_tap_one failed (2022-09-27 15:14:37 +0800)

Ding Hui (1):

e1000e: set RX desc status with DD flag in a separate operation

Eugenio Pérez (6):

vdpa: Make VhostVDPAState cvq_cmd_in_buffer control ack type

vdpa: extract vhost_vdpa_net_load_mac from vhost_vdpa_net_load

vdpa: Add vhost_vdpa_net_load_mq

vdpa: validate MQ CVQ commands

virtio-net: Update virtio-net curr_queue_pairs in vdpa backends

vdpa: Allow MQ feature in SVQ

lu zhipeng (1):

virtio: del net client if net_init_tap_one failed

hw/net/e1000e_core.c | 53 ++++++++++++++++++++++-

hw/net/virtio-net.c | 17 +++-----

net/tap.c | 18 +++++---

net/vhost-vdpa.c | 119 +++++++++++++++++++++++++++++++++++++--------------

4 files changed, 157 insertions(+), 50 deletions(-)

Ding Hui (1):

e1000e: set RX desc status with DD flag in a separate operation

Eugenio Pérez (6):

vdpa: Make VhostVDPAState cvq_cmd_in_buffer control ack type

vdpa: extract vhost_vdpa_net_load_mac from vhost_vdpa_net_load

vdpa: Add vhost_vdpa_net_load_mq

vdpa: validate MQ CVQ commands

virtio-net: Update virtio-net curr_queue_pairs in vdpa backends

vdpa: Allow MQ feature in SVQ

lu zhipeng (1):

virtio: del net client if net_init_tap_one failed

hw/net/e1000e_core.c | 53 ++++++++++++++++++++++-

hw/net/virtio-net.c | 17 +++-----

net/tap.c | 18 +++++---

net/vhost-vdpa.c | 119 +++++++++++++++++++++++++++++++++++++--------------

4 files changed, 157 insertions(+), 50 deletions(-)

--

2.7.4

From: Ding Hui <dinghui@sangfor.com.cn>

Like commit 034d00d48581 ("e1000: set RX descriptor status in

a separate operation"), there is also same issue in e1000e, which

would cause lost packets or stop sending packets to VM with DPDK.

Do similar fix in e1000e.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/402

Signed-off-by: Ding Hui <dinghui@sangfor.com.cn>

hw/net/e1000e_core.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-

1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/e1000e_core.c

+++ b/hw/net/e1000e_core.c

@@ -XXX,XX +XXX,XX @@ struct NetRxPkt *pkt, const E1000E_RSSInfo *rss_info,

}

}

+static inline void

+e1000e_pci_dma_write_rx_desc(E1000ECore *core, dma_addr_t addr,

+ uint8_t *desc, dma_addr_t len)

+{

+ PCIDevice *dev = core->owner;

+ if (e1000e_rx_use_legacy_descriptor(core)) {

+ struct e1000_rx_desc *d = (struct e1000_rx_desc *) desc;

+ size_t offset = offsetof(struct e1000_rx_desc, status);

+ uint8_t status = d->status;

+ d->status &= ~E1000_RXD_STAT_DD;

+ pci_dma_write(dev, addr, desc, len);

+ if (status & E1000_RXD_STAT_DD) {

+ d->status = status;

+ pci_dma_write(dev, addr + offset, &status, sizeof(status));

+ }

+ } else {

+ if (core->mac[RCTL] & E1000_RCTL_DTYP_PS) {

+ union e1000_rx_desc_packet_split *d =

+ (union e1000_rx_desc_packet_split *) desc;

+ size_t offset = offsetof(union e1000_rx_desc_packet_split,

+ wb.middle.status_error);

+ uint32_t status = d->wb.middle.status_error;

+ d->wb.middle.status_error &= ~E1000_RXD_STAT_DD;

+ pci_dma_write(dev, addr, desc, len);

+ if (status & E1000_RXD_STAT_DD) {

+ d->wb.middle.status_error = status;

+ pci_dma_write(dev, addr + offset, &status, sizeof(status));

+ }

+ } else {

+ union e1000_rx_desc_extended *d =

+ (union e1000_rx_desc_extended *) desc;

+ size_t offset = offsetof(union e1000_rx_desc_extended,

+ wb.upper.status_error);

+ uint32_t status = d->wb.upper.status_error;

+ d->wb.upper.status_error &= ~E1000_RXD_STAT_DD;

+ pci_dma_write(dev, addr, desc, len);

+ if (status & E1000_RXD_STAT_DD) {

+ d->wb.upper.status_error = status;

+ pci_dma_write(dev, addr + offset, &status, sizeof(status));

+ }

+ }

typedef struct e1000e_ba_state_st {

uint16_t written[MAX_PS_BUFFERS];

uint8_t cur_idx;

@@ -XXX,XX +XXX,XX @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt,

e1000e_write_rx_descr(core, desc, is_last ? core->rx_pkt : NULL,

rss_info, do_ps ? ps_hdr_len : 0, &bastate.written);

- pci_dma_write(d, base, &desc, core->rx_desc_len);

+ e1000e_pci_dma_write_rx_desc(core, base, desc, core->rx_desc_len);

e1000e_ring_advance(core, rxi,

core->rx_desc_len / E1000_MIN_RX_DESC_LEN);

From: Eugenio Pérez <eperezma@redhat.com>

This allows to simplify the code. Rename to status while we're at it.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

net/vhost-vdpa.c | 23 ++++++++++++-----------

1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c

--- a/net/vhost-vdpa.c

+++ b/net/vhost-vdpa.c

@@ -XXX,XX +XXX,XX @@ typedef struct VhostVDPAState {

VHostNetState *vhost_net;

/* Control commands shadow buffers */

- void *cvq_cmd_out_buffer, *cvq_cmd_in_buffer;

+ void *cvq_cmd_out_buffer;

+ virtio_net_ctrl_ack *status;

bool started;

} VhostVDPAState;

@@ -XXX,XX +XXX,XX @@ static void vhost_vdpa_cleanup(NetClientState *nc)

struct vhost_dev *dev = &s->vhost_net->dev;

qemu_vfree(s->cvq_cmd_out_buffer);

- qemu_vfree(s->cvq_cmd_in_buffer);

+ qemu_vfree(s->status);

if (dev->vq_index + dev->nvqs == dev->vq_index_end) {

g_clear_pointer(&s->vhost_vdpa.iova_tree, vhost_iova_tree_delete);

}

@@ -XXX,XX +XXX,XX @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)

return r;

}

- r = vhost_vdpa_cvq_map_buf(&s->vhost_vdpa, s->cvq_cmd_in_buffer,

+ r = vhost_vdpa_cvq_map_buf(&s->vhost_vdpa, s->status,

vhost_vdpa_net_cvq_cmd_page_len(), true);

if (unlikely(r < 0)) {

vhost_vdpa_cvq_unmap_buf(&s->vhost_vdpa, s->cvq_cmd_out_buffer);

@@ -XXX,XX +XXX,XX @@ static void vhost_vdpa_net_cvq_stop(NetClientState *nc)

if (s->vhost_vdpa.shadow_vqs_enabled) {

vhost_vdpa_cvq_unmap_buf(&s->vhost_vdpa, s->cvq_cmd_out_buffer);

- vhost_vdpa_cvq_unmap_buf(&s->vhost_vdpa, s->cvq_cmd_in_buffer);

+ vhost_vdpa_cvq_unmap_buf(&s->vhost_vdpa, s->status);

}

}

@@ -XXX,XX +XXX,XX @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s, size_t out_len,

.iov_len = out_len,

};

const struct iovec in = {

- .iov_base = s->cvq_cmd_in_buffer,

+ .iov_base = s->status,

.iov_len = sizeof(virtio_net_ctrl_ack),

};

VhostShadowVirtqueue *svq = g_ptr_array_index(s->vhost_vdpa.shadow_vqs, 0);

@@ -XXX,XX +XXX,XX @@ static int vhost_vdpa_net_load(NetClientState *nc)

return dev_written;

}

- return *((virtio_net_ctrl_ack *)s->cvq_cmd_in_buffer) != VIRTIO_NET_OK;

+ return *s->status != VIRTIO_NET_OK;

}

return 0;

@@ -XXX,XX +XXX,XX @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadowVirtqueue *svq,

goto out;

}

- memcpy(&status, s->cvq_cmd_in_buffer, sizeof(status));

- if (status != VIRTIO_NET_OK) {

+ if (*s->status != VIRTIO_NET_OK) {

return VIRTIO_NET_ERR;

}

@@ -XXX,XX +XXX,XX @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,

s->cvq_cmd_out_buffer = qemu_memalign(qemu_real_host_page_size(),

vhost_vdpa_net_cvq_cmd_page_len());

memset(s->cvq_cmd_out_buffer, 0, vhost_vdpa_net_cvq_cmd_page_len());

- s->cvq_cmd_in_buffer = qemu_memalign(qemu_real_host_page_size(),

- vhost_vdpa_net_cvq_cmd_page_len());

- memset(s->cvq_cmd_in_buffer, 0, vhost_vdpa_net_cvq_cmd_page_len());

+ s->status = qemu_memalign(qemu_real_host_page_size(),

+ vhost_vdpa_net_cvq_cmd_page_len());

+ memset(s->status, 0, vhost_vdpa_net_cvq_cmd_page_len());

s->vhost_vdpa.shadow_vq_ops = &vhost_vdpa_net_svq_ops;

s->vhost_vdpa.shadow_vq_ops_opaque = s;

From: Eugenio Pérez <eperezma@redhat.com>

Since there may be many commands we need to issue to load the NIC

state, let's split them in individual functions

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

net/vhost-vdpa.c | 62 ++++++++++++++++++++++++++++++++++++--------------------

1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c

index XXXXXXX..XXXXXXX 100644

--- a/net/vhost-vdpa.c

+++ b/net/vhost-vdpa.c

@@ -XXX,XX +XXX,XX @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s, size_t out_len,

return vhost_svq_poll(svq);

}

+static ssize_t vhost_vdpa_net_load_cmd(VhostVDPAState *s, uint8_t class,

+ uint8_t cmd, const void *data,

+ size_t data_size)

+{

+ const struct virtio_net_ctrl_hdr ctrl = {

+ .class = class,

+ .cmd = cmd,

+ };

+ assert(data_size < vhost_vdpa_net_cvq_cmd_page_len() - sizeof(ctrl));

+ 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,

+ sizeof(virtio_net_ctrl_ack));

+static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n)

+ uint64_t features = n->parent_obj.guest_features;

+ if (features & BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR)) {

+ 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));

+ if (unlikely(dev_written < 0)) {

+ return dev_written;