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(-)

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>

It was returned as error before. Instead of it, simply update the

corresponding field so qemu can send it in the migration data.

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

Acked-by: Si-Wei Liu <si-wei.liu@oracle.com>

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

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

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

--- a/hw/net/virtio-net.c

+++ b/hw/net/virtio-net.c

@@ -XXX,XX +XXX,XX @@ static int virtio_net_handle_mq(VirtIONet *n, uint8_t cmd,

return VIRTIO_NET_ERR;

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

Finally enable SVQ with MQ feature.

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

net/vhost-vdpa.c | 1 +

1 file changed, 1 insertion(+)

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 @@ static const uint64_t vdpa_svq_device_features =

BIT_ULL(VIRTIO_NET_F_MRG_RXBUF) |

BIT_ULL(VIRTIO_NET_F_STATUS) |

BIT_ULL(VIRTIO_NET_F_CTRL_VQ) |

+ BIT_ULL(VIRTIO_NET_F_MQ) |

BIT_ULL(VIRTIO_F_ANY_LAYOUT) |

BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR) |

BIT_ULL(VIRTIO_NET_F_RSC_EXT) |

From: lu zhipeng <luzhipeng@cestc.cn>

If the net tap initializes successful, but failed during

network card hot-plugging, the net-tap will remains,

so cleanup.

Signed-off-by: lu zhipeng <luzhipeng@cestc.cn>

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

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

@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,

tap_set_sndbuf(s->fd, tap, &err);

if (err) {

error_propagate(errp, err);

- return;

+ goto failed;

}

if (tap->has_fd || tap->has_fds) {

@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,

} else {

warn_report_err(err);

}

- return;

+ goto failed;

}

if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) {

error_setg_errno(errp, errno, "%s: Can't use file descriptor %d",

name, fd);

- return;

+ goto failed;

}

} else {

vhostfd = open("/dev/vhost-net", O_RDWR);

@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,

warn_report("tap: open vhost char device failed: %s",

strerror(errno));

}

- return;

+ goto failed;

}

if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) {

error_setg_errno(errp, errno, "Failed to set FD nonblocking");

- return;

+ goto failed;

}

options.opaque = (void *)(uintptr_t)vhostfd;

@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,

} else {

warn_report(VHOST_NET_INIT_FAILED);

}

- return;

+ goto failed;

} else if (vhostfdname) {

error_setg(errp, "vhostfd(s)= is not valid without vhost");

+ goto failed;

}

+

+ return;

+

+failed:

+ qemu_del_net_client(&s->nc);

}

static int get_fds(char *str, char *fds[], int max)