ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gso: add vxlan tunnel support

Browse Source 
Type: feature

Change-Id: I85f6ec77187a4983c66c5e22fd39fbb2cef82902
Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>
This commit is contained in:
Mohsin Kazmi
2020-04-17 16:50:56 +00:00
committed by Andrew Yourtchenko
parent 6440b7a602
commit 0b04209eda
11 changed files with 933 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -237,7 +237,7 @@ VNET GSO
I: gso
M: Andrew Yourtchenko <ayourtch@gmail.com>
M: Mohsin Kazmi <sykazmi@cisco.com>
F: src/vnet/interface_output.c
F: src/vnet/gso/
Plugin - MAP
I: map

1
src/vnet/CMakeLists.txt
View File

@ -1004,6 +1004,7 @@ list(APPEND VNET_SOURCES
)
list(APPEND VNET_HEADERS
gso/hdr_offset_parser.h
gso/gso.h
)

18
src/vnet/devices/virtio/device.c
View File

@ -23,7 +23,7 @@
#include <vlib/unix/unix.h>
#include <vnet/vnet.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/gso/gso.h>
#include <vnet/gso/hdr_offset_parser.h>
#include <vnet/ip/ip4_packet.h>
#include <vnet/ip/ip6_packet.h>
#include <vnet/tcp/tcp_packet.h>
@ -173,7 +173,8 @@ set_checksum_offsets (vlib_buffer_t * b, struct virtio_net_hdr_v1 *hdr)
if (b->flags & VNET_BUFFER_F_IS_IP4)
{
ip4_header_t *ip4;
gso_header_offset_t gho = vnet_gso_header_offset_parser (b, 0);
generic_header_offset_t gho = { 0 };
vnet_generic_header_offset_parser (b, &gho);
hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
hdr->csum_start = gho.l4_hdr_offset; // 0x22;
if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
@ -196,7 +197,8 @@ set_checksum_offsets (vlib_buffer_t * b, struct virtio_net_hdr_v1 *hdr)
}
else if (b->flags & VNET_BUFFER_F_IS_IP6)
{
gso_header_offset_t gho = vnet_gso_header_offset_parser (b, 1);
generic_header_offset_t gho = { 0 };
vnet_generic_header_offset_parser (b, &gho);
hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
hdr->csum_start = gho.l4_hdr_offset; // 0x36;
if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
@ -216,10 +218,11 @@ set_gso_offsets (vlib_buffer_t * b, struct virtio_net_hdr_v1 *hdr)
if (b->flags & VNET_BUFFER_F_IS_IP4)
{
ip4_header_t *ip4;
gso_header_offset_t gho = vnet_gso_header_offset_parser (b, 0);
generic_header_offset_t gho = { 0 };
vnet_generic_header_offset_parser (b, &gho);
hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
hdr->gso_size = vnet_buffer2 (b)->gso_size;
hdr->hdr_len = gho.l4_hdr_offset + gho.l4_hdr_sz;
hdr->hdr_len = gho.hdr_sz;
hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
hdr->csum_start = gho.l4_hdr_offset; // 0x22;
hdr->csum_offset = STRUCT_OFFSET_OF (tcp_header_t, checksum);
@ -234,10 +237,11 @@ set_gso_offsets (vlib_buffer_t * b, struct virtio_net_hdr_v1 *hdr)
}
else if (b->flags & VNET_BUFFER_F_IS_IP6)
{
gso_header_offset_t gho = vnet_gso_header_offset_parser (b, 1);
generic_header_offset_t gho = { 0 };
vnet_generic_header_offset_parser (b, &gho);
hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
hdr->gso_size = vnet_buffer2 (b)->gso_size;
hdr->hdr_len = gho.l4_hdr_offset + gho.l4_hdr_sz;
hdr->hdr_len = gho.hdr_sz;
hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
hdr->csum_start = gho.l4_hdr_offset; // 0x36;
hdr->csum_offset = STRUCT_OFFSET_OF (tcp_header_t, checksum);

6
src/vnet/devices/virtio/vhost_user_output.c
View File

@ -44,7 +44,7 @@
#include <vnet/devices/virtio/vhost_user.h>
#include <vnet/devices/virtio/vhost_user_inline.h>
#include <vnet/gso/gso.h>
#include <vnet/gso/hdr_offset_parser.h>
/*
* On the transmit side, we keep processing the buffers from vlib in the while
* loop and prepare the copy order to be executed later. However, the static
@ -236,8 +236,8 @@ static_always_inline void
vhost_user_handle_tx_offload (vhost_user_intf_t * vui, vlib_buffer_t * b,
virtio_net_hdr_t * hdr)
{
gso_header_offset_t gho =
vnet_gso_header_offset_parser (b, b->flags & VNET_BUFFER_F_IS_IP6);
generic_header_offset_t gho = { 0 };
vnet_generic_header_offset_parser (b, &gho);
if (b->flags & VNET_BUFFER_F_OFFLOAD_IP_CKSUM)
{
ip4_header_t *ip4;

3
src/vnet/gso/FEATURE.yaml
View File

@ -4,9 +4,10 @@ maintainer: ayourtch@gmail.com sykazmi@cisco.com
features:
- Basic GSO support
- GSO for VLAN tagged packets
- GSO for VXLAN tunnel
- Provide inline function to get header offsets
description: "Generic Segmentation Offload"
missing:
- Tunnels i.e. VXLAN
- Thorough Testing, IPIP, GRE, Geneve, IPSec
state: experimental
properties: [API, CLI]

1
src/vnet/gso/gso.c
View File

@ -16,6 +16,7 @@
#include <vlib/vlib.h>
#include <vnet/vnet.h>
#include <vppinfra/error.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/feature/feature.h>
#include <vnet/l2/l2_in_out_feat_arc.h>
#include <vnet/gso/gso.h>

93
src/vnet/gso/gso.h
View File

@ -16,23 +16,8 @@
#ifndef included_gso_h
#define included_gso_h
#include <vnet/ethernet/ethernet.h>
#include <vnet/ip/ip4_packet.h>
#include <vnet/ip/ip6_packet.h>
#include <vnet/udp/udp_packet.h>
#include <vnet/vnet.h>
typedef struct
{
i16 l2_hdr_offset;
i16 l3_hdr_offset;
i16 l4_hdr_offset;
u16 l4_hdr_sz;
i16 outer_l2_hdr_offset;
i16 outer_l3_hdr_offset;
i16 outer_l4_hdr_offset;
} gso_header_offset_t;
typedef struct
{
vlib_main_t *vlib_main;
@ -44,84 +29,6 @@ extern gso_main_t gso_main;
int vnet_sw_interface_gso_enable_disable (u32 sw_if_index, u8 enable);
static_always_inline gso_header_offset_t
vnet_gso_header_offset_parser (vlib_buffer_t * b0, int is_ip6)
{
gso_header_offset_t gho = { 0 };
u8 l4_proto = 0;
u8 l4_hdr_sz = 0;
if (PREDICT_TRUE ((b0->flags & (VNET_BUFFER_F_L2_HDR_OFFSET_VALID |
VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
VNET_BUFFER_F_L4_HDR_OFFSET_VALID)) ==
(VNET_BUFFER_F_L2_HDR_OFFSET_VALID |
VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
VNET_BUFFER_F_L4_HDR_OFFSET_VALID)))
{
gho.l2_hdr_offset = vnet_buffer (b0)->l2_hdr_offset;
gho.l3_hdr_offset = vnet_buffer (b0)->l3_hdr_offset;
gho.l4_hdr_offset = vnet_buffer (b0)->l4_hdr_offset;
gho.l4_hdr_sz = vnet_buffer2 (b0)->gso_l4_hdr_sz;
return gho;
}
ethernet_header_t *eh = (ethernet_header_t *) vlib_buffer_get_current (b0);
u16 ethertype = clib_net_to_host_u16 (eh->type);
u16 l2hdr_sz = sizeof (ethernet_header_t);
if (ethernet_frame_is_tagged (ethertype))
{
ethernet_vlan_header_t *vlan = (ethernet_vlan_header_t *) (eh + 1);
ethertype = clib_net_to_host_u16 (vlan->type);
l2hdr_sz += sizeof (*vlan);
if (ethertype == ETHERNET_TYPE_VLAN)
{
vlan++;
ethertype = clib_net_to_host_u16 (vlan->type);
l2hdr_sz += sizeof (*vlan);
}
}
gho.l2_hdr_offset = b0->current_data;
gho.l3_hdr_offset = l2hdr_sz;
if (PREDICT_TRUE (is_ip6 == 0))
{
ip4_header_t *ip4 =
(ip4_header_t *) (vlib_buffer_get_current (b0) + l2hdr_sz);
gho.l4_hdr_offset = l2hdr_sz + ip4_header_bytes (ip4);
l4_proto = ip4->protocol;
}
else if (PREDICT_TRUE (is_ip6))
{
ip6_header_t *ip6 =
(ip6_header_t *) (vlib_buffer_get_current (b0) + l2hdr_sz);
/* FIXME IPv6 EH traversal */
gho.l4_hdr_offset = l2hdr_sz + sizeof (ip6_header_t);
l4_proto = ip6->protocol;
}
if (l4_proto == IP_PROTOCOL_TCP)
{
tcp_header_t *tcp = (tcp_header_t *) (vlib_buffer_get_current (b0) +
gho.l4_hdr_offset);
l4_hdr_sz = tcp_header_bytes (tcp);
}
else if (l4_proto == IP_PROTOCOL_UDP)
{
udp_header_t *udp = (udp_header_t *) (vlib_buffer_get_current (b0) +
gho.l4_hdr_offset);
l4_hdr_sz = sizeof (*udp);
}
if (b0->flags & (VNET_BUFFER_F_IS_IP4 | VNET_BUFFER_F_IS_IP6))
{
gho.l4_hdr_sz = l4_hdr_sz;
}
return gho;
}
#endif /* included_gso_h */
/*

408
src/vnet/gso/hdr_offset_parser.h Normal file
View File

File diff suppressed because it is too large Load Diff

224
src/vnet/gso/node.c
View File

File diff suppressed because it is too large Load Diff

95
src/vnet/interface_output.h
View File

@ -41,7 +41,44 @@
#define __INTERFACE_INLINES_H__
#include <vnet/vnet.h>
#include <vnet/gso/gso.h>
#include <vnet/gso/hdr_offset_parser.h>
static_always_inline void
vnet_calc_ip4_checksums (vlib_main_t * vm, vlib_buffer_t * b,
ip4_header_t * ip4, tcp_header_t * th,
udp_header_t * uh)
{
if (b->flags & VNET_BUFFER_F_OFFLOAD_IP_CKSUM)
ip4->checksum = ip4_header_checksum (ip4);
if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
{
th->checksum = 0;
th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
}
if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
{
uh->checksum = 0;
uh->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
}
}
static_always_inline void
vnet_calc_ip6_checksums (vlib_main_t * vm, vlib_buffer_t * b,
ip6_header_t * ip6, tcp_header_t * th,
udp_header_t * uh)
{
int bogus;
if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
{
th->checksum = 0;
th->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
}
if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
{
uh->checksum = 0;
uh->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
}
}
static_always_inline void
vnet_calc_checksums_inline (vlib_main_t * vm, vlib_buffer_t * b,
@ -52,59 +89,51 @@ vnet_calc_checksums_inline (vlib_main_t * vm, vlib_buffer_t * b,
tcp_header_t *th;
udp_header_t *uh;
ASSERT (!(is_ip4 && is_ip6));
if (with_gso)
{
gso_header_offset_t gho;
gho = vnet_gso_header_offset_parser (b, is_ip6);
generic_header_offset_t gho = { 0 };
vnet_generic_header_offset_parser (b, &gho);
ASSERT (gho.gho_flags ^ (GHO_F_IP4 | GHO_F_IP6));
vnet_get_inner_header (b, &gho);
ip4 = (ip4_header_t *)
(vlib_buffer_get_current (b) + gho.l3_hdr_offset);
ip6 = (ip6_header_t *)
(vlib_buffer_get_current (b) + gho.l3_hdr_offset);
th = (tcp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset);
uh = (udp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset);
if (gho.gho_flags & GHO_F_IP4)
{
vnet_calc_ip4_checksums (vm, b, ip4, th, uh);
}
else if (gho.gho_flags & GHO_F_IP6)
{
vnet_calc_ip6_checksums (vm, b, ip6, th, uh);
}
vnet_get_outer_header (b, &gho);
}
else
{
ASSERT (!(is_ip4 && is_ip6));
ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
ip6 = (ip6_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
th = (tcp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
uh = (udp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
}
if (is_ip4)
{
if (b->flags & VNET_BUFFER_F_OFFLOAD_IP_CKSUM)
ip4->checksum = ip4_header_checksum (ip4);
if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
if (is_ip4)
{
th->checksum = 0;
th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
vnet_calc_ip4_checksums (vm, b, ip4, th, uh);
}
if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
if (is_ip6)
{
uh->checksum = 0;
uh->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
vnet_calc_ip6_checksums (vm, b, ip6, th, uh);
}
}
if (is_ip6)
{
int bogus;
if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
{
th->checksum = 0;
th->checksum =
ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
}
if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
{
uh->checksum = 0;
uh->checksum =
ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
}
}
b->flags &= ~VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
b->flags &= ~VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
b->flags &= ~VNET_BUFFER_F_OFFLOAD_IP_CKSUM;

300
test/test_gso.py
View File

File diff suppressed because it is too large Load Diff