* [PATCH] vhost_user: remove ASSERT() on iovec number
@ 2025-01-20 13:15 Laurent Vivier
2025-01-20 20:00 ` Stefano Brivio
0 siblings, 1 reply; 2+ messages in thread
From: Laurent Vivier @ 2025-01-20 13:15 UTC (permalink / raw)
To: passt-dev; +Cc: Laurent Vivier
Replace ASSERT() on the number of iovec in the element and on
the first entry length by a debug() message.
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
vu_common.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/vu_common.c b/vu_common.c
index 431fba6be0c0..d34ae6dc1df3 100644
--- a/vu_common.c
+++ b/vu_common.c
@@ -195,8 +195,12 @@ static void vu_handle_tx(struct vu_dev *vdev, int index,
hdrlen);
} else {
/* vnet header can be in a separate iovec */
- ASSERT(elem[count].out_num == 2);
- ASSERT(elem[count].out_sg[0].iov_len == (size_t)hdrlen);
+ if (elem[count].out_num != 2)
+ debug("virtio-net tranmit queue contains more than one buffer ([%d]: %u)",
+ count, elem[count].out_num);
+ if (elem[count].out_sg[0].iov_len != (size_t)hdrlen)
+ debug("virtio-net transmit queue entry not aligned on hdrlen ([%d]: %d != %zu)",
+ count, hdrlen, elem[count].out_sg[0].iov_len);
tap_add_packet(vdev->context,
elem[count].out_sg[1].iov_len,
(char *)elem[count].out_sg[1].iov_base);
--
@@ -195,8 +195,12 @@ static void vu_handle_tx(struct vu_dev *vdev, int index,
hdrlen);
} else {
/* vnet header can be in a separate iovec */
- ASSERT(elem[count].out_num == 2);
- ASSERT(elem[count].out_sg[0].iov_len == (size_t)hdrlen);
+ if (elem[count].out_num != 2)
+ debug("virtio-net tranmit queue contains more than one buffer ([%d]: %u)",
+ count, elem[count].out_num);
+ if (elem[count].out_sg[0].iov_len != (size_t)hdrlen)
+ debug("virtio-net transmit queue entry not aligned on hdrlen ([%d]: %d != %zu)",
+ count, hdrlen, elem[count].out_sg[0].iov_len);
tap_add_packet(vdev->context,
elem[count].out_sg[1].iov_len,
(char *)elem[count].out_sg[1].iov_base);
--
2.47.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] vhost_user: remove ASSERT() on iovec number
2025-01-20 13:15 [PATCH] vhost_user: remove ASSERT() on iovec number Laurent Vivier
@ 2025-01-20 20:00 ` Stefano Brivio
0 siblings, 0 replies; 2+ messages in thread
From: Stefano Brivio @ 2025-01-20 20:00 UTC (permalink / raw)
To: Laurent Vivier; +Cc: passt-dev
On Mon, 20 Jan 2025 14:15:22 +0100
Laurent Vivier <lvivier@redhat.com> wrote:
> Replace ASSERT() on the number of iovec in the element and on
> the first entry length by a debug() message.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
> vu_common.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/vu_common.c b/vu_common.c
> index 431fba6be0c0..d34ae6dc1df3 100644
> --- a/vu_common.c
> +++ b/vu_common.c
> @@ -195,8 +195,12 @@ static void vu_handle_tx(struct vu_dev *vdev, int index,
> hdrlen);
> } else {
> /* vnet header can be in a separate iovec */
> - ASSERT(elem[count].out_num == 2);
> - ASSERT(elem[count].out_sg[0].iov_len == (size_t)hdrlen);
> + if (elem[count].out_num != 2)
> + debug("virtio-net tranmit queue contains more than one buffer ([%d]: %u)",
s/tranmit/transmit/
Applied with this change.
--
Stefano
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-20 20:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-20 13:15 [PATCH] vhost_user: remove ASSERT() on iovec number Laurent Vivier
2025-01-20 20:00 ` Stefano Brivio
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).