All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Dmitry Fleytman" <dmitry.fleytman@gmail.com>,
	"Jason Wang" <jasowang@redhat.com>,
	"Bin Meng" <bin.meng@windriver.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Bin Meng" <bmeng.cn@gmail.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [RFC PATCH v3 01/10] net: Use 'struct iovec' in qemu_send_packet_async_with_flags()
Date: Wed,  3 Mar 2021 20:11:56 +0100	[thread overview]
Message-ID: <20210303191205.1656980-2-philmd@redhat.com> (raw)
In-Reply-To: <20210303191205.1656980-1-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>
---
 net/net.c | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/net/net.c b/net/net.c
index fb7b7dcc252..159e4d0ec25 100644
--- a/net/net.c
+++ b/net/net.c
@@ -581,22 +581,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) {
@@ -638,6 +622,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");
@@ -649,21 +640,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.26.2



  reply	other threads:[~2021-03-03 19:14 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-03 19:11 [RFC PATCH v3 00/10] net: Handle short frames for SLiRP/TAP interfaces Philippe Mathieu-Daudé
2021-03-03 19:11 ` Philippe Mathieu-Daudé [this message]
2021-03-03 19:11 ` [RFC PATCH v3 02/10] net: Pad short frames to minimum size before send from SLiRP/TAP Philippe Mathieu-Daudé
2021-03-08  3:48   ` Jason Wang
2021-03-08  4:12     ` Bin Meng
2021-03-08 10:22     ` Peter Maydell
2021-03-09  8:23       ` Jason Wang
2021-03-09  8:35         ` Bin Meng
2021-03-09  8:57           ` Jason Wang
2021-03-09  9:00             ` Bin Meng
2021-03-09  9:01               ` Bin Meng
2021-03-09 10:13                 ` Peter Maydell
2021-03-09 10:17                   ` Bin Meng
2021-03-09 12:30                   ` Yan Vugenfirer
2021-03-09 12:33                     ` Bin Meng
2021-03-12  6:25                     ` Jason Wang
2021-03-11  3:01                   ` Jason Wang
2021-03-11  3:12                     ` Bin Meng
2021-03-11  3:33                       ` Jason Wang
2021-03-11  7:35                         ` Bin Meng
2021-03-11  9:43                     ` Peter Maydell
2021-03-11  9:58                       ` Bin Meng
2021-03-11 10:22                         ` Peter Maydell
2021-03-11 10:27                           ` Bin Meng
2021-03-12  6:22                             ` Jason Wang
2021-03-12  6:28                               ` Bin Meng
2021-03-12  6:50                                 ` Jason Wang
2021-03-12  6:53                                   ` Bin Meng
2021-03-12  7:02                                     ` Jason Wang
2021-03-03 19:11 ` [RFC PATCH v3 03/10] hw/net: e1000: Remove the logic of padding short frames in the receive path Philippe Mathieu-Daudé
2021-03-03 19:11 ` [RFC PATCH v3 04/10] hw/net: vmxnet3: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` [RFC PATCH v3 05/10] hw/net: i82596: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` [RFC PATCH v3 06/10] hw/net: ne2000: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` [RFC PATCH v3 07/10] hw/net: pcnet: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` [RFC PATCH v3 08/10] hw/net: rtl8139: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` [RFC PATCH v3 09/10] hw/net: sungem: " Philippe Mathieu-Daudé
2021-03-03 19:12 ` [RFC PATCH v3 10/10] hw/net: sunhme: " Philippe Mathieu-Daudé
2021-03-08  1:51 ` [RFC PATCH v3 00/10] net: Handle short frames for SLiRP/TAP interfaces Bin Meng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210303191205.1656980-2-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=bin.meng@windriver.com \
    --cc=bmeng.cn@gmail.com \
    --cc=dmitry.fleytman@gmail.com \
    --cc=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.