[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/10] net: Use 'struct iovec' in qemu_send_packet_async_with_fla
From: |
Bin Meng |
Subject: |
[PATCH 01/10] net: Use 'struct iovec' in qemu_send_packet_async_with_flags() |
Date: |
Wed, 10 Mar 2021 18:11:48 +0800 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Directly use iovec structure in qemu_send_packet_async_with_flags()
by inlining filter_receive() and using qemu_net_queue_send_iov()
instead of qemu_net_queue_send().
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210303191205.1656980-2-philmd@redhat.com>
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
net/net.c | 33 ++++++++++++---------------------
1 file changed, 12 insertions(+), 21 deletions(-)
diff --git a/net/net.c b/net/net.c
index 32d71c1172..bb1d455005 100644
--- a/net/net.c
+++ b/net/net.c
@@ -582,22 +582,6 @@ static ssize_t filter_receive_iov(NetClientState *nc,
return ret;
}
-static ssize_t filter_receive(NetClientState *nc,
- NetFilterDirection direction,
- NetClientState *sender,
- unsigned flags,
- const uint8_t *data,
- size_t size,
- NetPacketSent *sent_cb)
-{
- struct iovec iov = {
- .iov_base = (void *)data,
- .iov_len = size
- };
-
- return filter_receive_iov(nc, direction, sender, flags, &iov, 1, sent_cb);
-}
-
void qemu_purge_queued_packets(NetClientState *nc)
{
if (!nc->peer) {
@@ -639,6 +623,13 @@ static ssize_t
qemu_send_packet_async_with_flags(NetClientState *sender,
{
NetQueue *queue;
int ret;
+ int iovcnt = 1;
+ struct iovec iov[] = {
+ [0] = {
+ .iov_base = (void *)buf,
+ .iov_len = size,
+ },
+ };
#ifdef DEBUG_NET
printf("qemu_send_packet_async:\n");
@@ -650,21 +641,21 @@ static ssize_t
qemu_send_packet_async_with_flags(NetClientState *sender,
}
/* Let filters handle the packet first */
- ret = filter_receive(sender, NET_FILTER_DIRECTION_TX,
- sender, flags, buf, size, sent_cb);
+ ret = filter_receive_iov(sender, NET_FILTER_DIRECTION_TX,
+ sender, flags, iov, iovcnt, sent_cb);
if (ret) {
return ret;
}
- ret = filter_receive(sender->peer, NET_FILTER_DIRECTION_RX,
- sender, flags, buf, size, sent_cb);
+ ret = filter_receive_iov(sender->peer, NET_FILTER_DIRECTION_RX,
+ sender, flags, iov, iovcnt, sent_cb);
if (ret) {
return ret;
}
queue = sender->peer->incoming_queue;
- return qemu_net_queue_send(queue, sender, flags, buf, size, sent_cb);
+ return qemu_net_queue_send_iov(queue, sender, flags, iov, iovcnt, sent_cb);
}
ssize_t qemu_send_packet_async(NetClientState *sender,
--
2.17.1
- [PATCH 00/10] net: Pad short frames for network backends, Bin Meng, 2021/03/10
- [PATCH 01/10] net: Use 'struct iovec' in qemu_send_packet_async_with_flags(),
Bin Meng <=
- [PATCH 02/10] net: Pad short frames to minimum size before send, Bin Meng, 2021/03/10
- [PATCH 03/10] hw/net: e1000: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/10
- [PATCH 04/10] hw/net: vmxnet3: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/10
- [PATCH 05/10] hw/net: i82596: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/10
- [PATCH 06/10] hw/net: ne2000: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/10
- [PATCH 07/10] hw/net: pcnet: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/10
- [PATCH 08/10] hw/net: rtl8139: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/10
- [PATCH 09/10] hw/net: sungem: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/10
- [PATCH 10/10] hw/net: sunhme: Remove the logic of padding short frames in the receive path, Bin Meng, 2021/03/10