diff mbox series

[ovs-dev,v6,3/3] netdev-dummy: Add support and test for tso.

Message ID 20240117142124.241050-3-mkp@redhat.com
State Accepted
Commit 0edfe05e4256f83b7a622a40b248883222f8b134
Delegated to: Ilya Maximets
Headers show
Series [ovs-dev,v6,1/3] dp-packet: Set checksum flags during software TSO. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test fail github build: failed
ovsrobot/intel-ovs-compilation fail test: fail

Commit Message

Mike Pattrick Jan. 17, 2024, 2:21 p.m. UTC 
Test that netdev-dummy is able to send and receive segment offloaded
packets.

Signed-off-by: Mike Pattrick <mkp@redhat.com>
---
v2: Fix clang build error: mutex needed to access netdev_dummy members
v3: Remove use of tcpdump, hexdump, and otherwise clean up test
v4: Wrapped long lines in test
v5:
 - Implemented Ilya's suggestion to generate null runs
 - Added IPv6 test
---
 lib/netdev-dummy.c   | 30 +++++++++++++++++-
 tests/dpif-netdev.at | 75 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 1 deletion(-)

Comments

Simon Horman Jan. 17, 2024, 6:46 p.m. UTC | #1 
On Wed, Jan 17, 2024 at 09:21:24AM -0500, Mike Pattrick wrote:
> Test that netdev-dummy is able to send and receive segment offloaded
> packets.
> 
> Signed-off-by: Mike Pattrick <mkp@redhat.com>
> ---
> v2: Fix clang build error: mutex needed to access netdev_dummy members
> v3: Remove use of tcpdump, hexdump, and otherwise clean up test
> v4: Wrapped long lines in test
> v5:
>  - Implemented Ilya's suggestion to generate null runs
>  - Added IPv6 test

Recheck-request: github-robot
Simon Horman Jan. 17, 2024, 7:46 p.m. UTC | #2 
On Wed, Jan 17, 2024 at 06:46:06PM +0000, Simon Horman wrote:
> On Wed, Jan 17, 2024 at 09:21:24AM -0500, Mike Pattrick wrote:
> > Test that netdev-dummy is able to send and receive segment offloaded
> > packets.
> > 
> > Signed-off-by: Mike Pattrick <mkp@redhat.com>
> > ---
> > v2: Fix clang build error: mutex needed to access netdev_dummy members
> > v3: Remove use of tcpdump, hexdump, and otherwise clean up test
> > v4: Wrapped long lines in test
> > v5:
> >  - Implemented Ilya's suggestion to generate null runs
> >  - Added IPv6 test
> 
> Recheck-request: github-robot

Recheck executed a 2nd run of the jobs, which was successful.

https://github.com/ovsrobot/ovs/actions/runs/7558933840
Simon Horman Jan. 17, 2024, 7:46 p.m. UTC | #3 
On Wed, Jan 17, 2024 at 09:21:24AM -0500, Mike Pattrick wrote:
> Test that netdev-dummy is able to send and receive segment offloaded
> packets.
> 
> Signed-off-by: Mike Pattrick <mkp@redhat.com>

Acked-by: Simon Horman <horms@ovn.org>
Ilya Maximets Jan. 17, 2024, 10:07 p.m. UTC | #4 
On 1/17/24 20:46, Simon Horman wrote:
> On Wed, Jan 17, 2024 at 09:21:24AM -0500, Mike Pattrick wrote:
>> Test that netdev-dummy is able to send and receive segment offloaded
>> packets.
>>
>> Signed-off-by: Mike Pattrick <mkp@redhat.com>
> 
> Acked-by: Simon Horman <horms@ovn.org>

Thanks, Mike and Simon!   I applied the set now.

Best regards, Ilya Maximets.
diff mbox series

Patch

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 8c6e6d448..d6ef865aa 100644
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -44,6 +44,7 @@ 
 #include "unaligned.h"
 #include "timeval.h"
 #include "unixctl.h"
+#include "userspace-tso.h"
 #include "reconnect.h"
 
 VLOG_DEFINE_THIS_MODULE(netdev_dummy);
@@ -152,6 +153,8 @@  struct netdev_dummy {
     bool ol_ip_csum OVS_GUARDED;
     /* Flag RX packet with good csum. */
     bool ol_ip_csum_set_good OVS_GUARDED;
+    /* Set the segment size for netdev TSO support. */
+    int ol_tso_segsz OVS_GUARDED;
 };
 
 /* Max 'recv_queue_len' in struct netdev_dummy. */
@@ -806,6 +809,10 @@  netdev_dummy_get_config(const struct netdev *dev, struct smap *args)
         smap_add_format(args, "ol_ip_csum_set_good", "%s", "true");
     }
 
+    if (netdev->ol_tso_segsz && userspace_tso_enabled()) {
+        smap_add_format(args, "ol_tso_segsz", "%d", netdev->ol_tso_segsz);
+    }
+
     /* 'dummy-pmd' specific config. */
     if (!netdev_is_pmd(dev)) {
         goto exit;
@@ -937,6 +944,14 @@  netdev_dummy_set_config(struct netdev *netdev_, const struct smap *args,
         netdev_->ol_flags |= NETDEV_TX_OFFLOAD_IPV4_CKSUM;
     }
 
+    if (userspace_tso_enabled()) {
+        netdev->ol_tso_segsz = smap_get_int(args, "ol_tso_segsz", 0);
+        if (netdev->ol_tso_segsz) {
+            netdev_->ol_flags |= (NETDEV_TX_OFFLOAD_TCP_TSO
+                                  | NETDEV_TX_OFFLOAD_TCP_CKSUM);
+        }
+    }
+
     netdev_change_seq_changed(netdev_);
 
     /* 'dummy-pmd' specific config. */
@@ -1119,6 +1134,13 @@  netdev_dummy_rxq_recv(struct netdev_rxq *rxq_, struct dp_packet_batch *batch,
         /* The netdev hardware sets the flag when the packet has good csum. */
         dp_packet_ol_set_ip_csum_good(packet);
     }
+
+    if (userspace_tso_enabled() && netdev->ol_tso_segsz) {
+        dp_packet_set_tso_segsz(packet, netdev->ol_tso_segsz);
+        dp_packet_hwol_set_tcp_seg(packet);
+        dp_packet_hwol_set_csum_tcp(packet);
+    }
+
     ovs_mutex_unlock(&netdev->mutex);
 
     dp_packet_batch_init_packet(batch, packet);
@@ -1174,6 +1196,12 @@  netdev_dummy_send(struct netdev *netdev, int qid,
     DP_PACKET_BATCH_FOR_EACH(i, packet, batch) {
         const void *buffer = dp_packet_data(packet);
         size_t size = dp_packet_size(packet);
+        bool is_tso;
+
+        ovs_mutex_lock(&dev->mutex);
+        is_tso = userspace_tso_enabled() && dev->ol_tso_segsz &&
+                 dp_packet_hwol_is_tso(packet);
+        ovs_mutex_unlock(&dev->mutex);
 
         if (!dp_packet_is_eth(packet)) {
             error = EPFNOSUPPORT;
@@ -1194,7 +1222,7 @@  netdev_dummy_send(struct netdev *netdev, int qid,
             if (eth->eth_type == htons(ETH_TYPE_VLAN)) {
                 max_size += VLAN_HEADER_LEN;
             }
-            if (size > max_size) {
+            if (size > max_size && !is_tso) {
                 error = EMSGSIZE;
                 break;
             }
diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at
index c9474af0a..de78cc895 100644
--- a/tests/dpif-netdev.at
+++ b/tests/dpif-netdev.at
@@ -810,6 +810,81 @@  AT_CHECK_UNQUOTED([tail -n 1 p2.pcap.txt], [0], [${good_expected}
 OVS_VSWITCHD_STOP
 AT_CLEANUP
 
+AT_SETUP([userspace offload - tso])
+OVS_VSWITCHD_START(
+  [set Open_vSwitch . other_config:userspace-tso-enable=true -- \
+   add-br br1 -- set bridge br1 datapath-type=dummy -- \
+   add-port br1 p1 -- \
+       set Interface p1 type=dummy -- \
+   add-port br1 p2 -- \
+       set Interface p2 type=dummy])
+
+dnl Simple passthrough rule.
+AT_CHECK([ovs-ofctl add-flow br1 in_port=p1,actions=output:p2])
+
+flow_s="in_port(1),eth(src=8a:bf:7e:2f:05:84,dst=0a:8f:39:4f:e0:73),eth_type(0x0800), \
+        ipv4(src=192.168.123.2,dst=192.168.123.1,proto=6,tos=1,ttl=64,frag=no), \
+        tcp(src=54392,dst=5201),tcp_flags(ack)"
+
+flow_s_v6="in_port(1),eth(src=8a:bf:7e:2f:05:84,dst=0a:8f:39:4f:e0:73),eth_type(0x86dd), \
+           ipv6(src=2001:cafe::88,dst=2001:cafe::92,proto=6), \
+           tcp(src=54392,dst=5201),tcp_flags(ack)"
+
+dnl Send from tso to no-tso.
+AT_CHECK([ovs-vsctl set Interface p2 options:tx_pcap=p2.pcap -- \
+                    set Interface p1 options:ol_ip_csum=true -- \
+                    set Interface p1 options:ol_ip_csum_set_good=false -- \
+                    set Interface p1 options:ol_tso_segsz=500])
+
+AT_CHECK([ovs-appctl netdev-dummy/receive p1 "${flow_s}" --len 2054])
+AT_CHECK([ovs-appctl netdev-dummy/receive p1 "${flow_s_v6}" --len 2074])
+
+dnl Send from tso to tso.
+AT_CHECK([ovs-vsctl set Interface p2 options:ol_ip_csum=true -- \
+                    set Interface p2 options:ol_ip_csum_set_good=false -- \
+                    set Interface p2 options:ol_tso_segsz=500])
+
+AT_CHECK([ovs-appctl netdev-dummy/receive p1 "${flow_s}" --len 2054])
+AT_CHECK([ovs-appctl netdev-dummy/receive p1 "${flow_s_v6}" --len 2074])
+
+dnl Check that first we have:
+dnl  - 4x IPv4 500 byte payloads
+dnl  - 4x IPv6 500 byte payloads
+dnl  - one IPv4 2000 byte payload, and
+dnl  - one IPv6 2000 byte payload
+zero500=$(printf '0%.0s' $(seq 1000))
+AT_CHECK_UNQUOTED([ovs-pcap p2.pcap], [0], [dnl
+[0a8f394fe0738abf7e2f058408004501021c0000000040060187c0a87b02c0a87b01]dnl
+[d47814510000000000000000501000004dc20000${zero500}]
+[0a8f394fe0738abf7e2f058408004501021c0001000040060186c0a87b02c0a87b01]dnl
+[d4781451000001f400000000501000004bce0000${zero500}]
+[0a8f394fe0738abf7e2f058408004501021c0002000040060185c0a87b02c0a87b01]dnl
+[d4781451000003e8000000005010000049da0000${zero500}]
+[0a8f394fe0738abf7e2f058408004501021c0003000040060184c0a87b02c0a87b01]dnl
+[d4781451000005dc000000005010000047e60000${zero500}]
+[0a8f394fe0738abf7e2f058486dd60000000020806002001cafe0000000000000000000000]dnl
+[882001cafe000000000000000000000092d4781451000000000000000050100000edfd0000]dnl
+[${zero500}]
+[0a8f394fe0738abf7e2f058486dd60000000020806002001cafe0000000000000000000000]dnl
+[882001cafe000000000000000000000092d4781451000001f40000000050100000ec090000]dnl
+[${zero500}]
+[0a8f394fe0738abf7e2f058486dd60000000020806002001cafe0000000000000000000000]dnl
+[882001cafe000000000000000000000092d4781451000003e80000000050100000ea150000]dnl
+[${zero500}]
+[0a8f394fe0738abf7e2f058486dd60000000020806002001cafe0000000000000000000000]dnl
+[882001cafe000000000000000000000092d4781451000005dc0000000050100000e8210000]dnl
+[${zero500}]
+[0a8f394fe0738abf7e2f05840800450107f8000000004006fbaac0a87b02c0a87b01]dnl
+[d478145100000000000000005010000047e60000${zero500}${zero500}${zero500}${zero500}]
+[0a8f394fe0738abf7e2f058486dd6000000007e406002001cafe0000000000000000000000]dnl
+[882001cafe000000000000000000000092d4781451000000000000000050100000e8210000]dnl
+[${zero500}${zero500}${zero500}${zero500}]
+])
+
+
+OVS_VSWITCHD_STOP
+AT_CLEANUP
+
 AT_SETUP([dpif-netdev - revalidators handle dp modification fail correctly])
 OVS_VSWITCHD_START(
   [add-port br0 p1 \