Skip to content

Commit

Permalink
netdev-native-tnl: Refactor tunnel checksum offloading.
Browse files Browse the repository at this point in the history 
All required informations is already tracked with l3_ofs, l4_ofs,
inner_l3_ofs and inner_l4_ofs in dp_packet.
Remove specifics about DPDK l[2-4]_len from generic OVS code.

DPDK specific netdev-dpdk code can then compute required mbuf specifics
incrementally:
- outer_l2_len and outer_l3_len are needed for tunneling (and below
  features),
- l2_len is needed for IP checksum (and below features),
- l3_len is needed for L4 checksum (and below features),
- l4_len and tso_segsz are only needed when doing TSO,

Signed-off-by: David Marchand <[email protected]>
  • Loading branch information
@david-marchand
david-marchand committed Apr 18, 2024
1 parent 0414af0 commit 73e608c
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 114 deletions.
37 changes: 0 additions & 37 deletions lib/dp-packet.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,25 +604,6 @@ dp_packet_get_nd_payload(const struct dp_packet *b)
}

#ifdef DPDK_NETDEV
static inline void
dp_packet_set_l2_len(struct dp_packet *b, size_t l2_len)
{
b->mbuf.l2_len = l2_len;
}

static inline void
dp_packet_set_l3_len(struct dp_packet *b, size_t l3_len)
{
b->mbuf.l3_len = l3_len;
}

static inline void
dp_packet_set_l4_len(struct dp_packet *b, size_t l4_len)
{
b->mbuf.l4_len = l4_len;
}


static inline uint64_t *
dp_packet_ol_flags_ptr(const struct dp_packet *b)
{
Expand All @@ -642,24 +623,6 @@ dp_packet_flow_mark_ptr(const struct dp_packet *b)
}

#else
static inline void
dp_packet_set_l2_len(struct dp_packet *b OVS_UNUSED, size_t l2_len OVS_UNUSED)
{
/* There is no implementation. */
}

static inline void
dp_packet_set_l3_len(struct dp_packet *b OVS_UNUSED, size_t l3_len OVS_UNUSED)
{
/* There is no implementation. */
}

static inline void
dp_packet_set_l4_len(struct dp_packet *b OVS_UNUSED, size_t l4_len OVS_UNUSED)
{
/* There is no implementation. */
}

static inline uint32_t *
dp_packet_ol_flags_ptr(const struct dp_packet *b)
{
Expand Down
64 changes: 32 additions & 32 deletions lib/netdev-dpdk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2584,7 +2584,9 @@ static bool
netdev_dpdk_prep_hwol_packet(struct netdev_dpdk *dev, struct rte_mbuf *mbuf)
{
struct dp_packet *pkt = CONTAINER_OF(mbuf, struct dp_packet, mbuf);
struct tcp_header *th;
void *l2;
void *l3;
void *l4;

const uint64_t all_requests = (RTE_MBUF_F_TX_IP_CKSUM |
RTE_MBUF_F_TX_L4_MASK |
Expand Down Expand Up @@ -2612,9 +2614,6 @@ netdev_dpdk_prep_hwol_packet(struct netdev_dpdk *dev, struct rte_mbuf *mbuf)
return true;
}

/* If packet is vxlan or geneve tunnel packet, calculate outer
* l2 len and outer l3 len. Inner l2/l3/l4 len are calculated
* before. */
const uint64_t tunnel_type = mbuf->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK;
if (tunnel_type == RTE_MBUF_F_TX_TUNNEL_GENEVE ||
tunnel_type == RTE_MBUF_F_TX_TUNNEL_VXLAN) {
Expand All @@ -2623,6 +2622,10 @@ netdev_dpdk_prep_hwol_packet(struct netdev_dpdk *dev, struct rte_mbuf *mbuf)
mbuf->outer_l3_len = (char *) dp_packet_l4(pkt) -
(char *) dp_packet_l3(pkt);

l2 = dp_packet_l4(pkt);
l3 = dp_packet_inner_l3(pkt);
l4 = dp_packet_inner_l4(pkt);

/* If neither inner checksums nor TSO is requested, inner marks
* should not be set. */
if (!(mbuf->ol_flags & (RTE_MBUF_F_TX_IP_CKSUM |
Expand All @@ -2638,48 +2641,45 @@ netdev_dpdk_prep_hwol_packet(struct netdev_dpdk *dev, struct rte_mbuf *mbuf)
"Packet with unexpected tunnel type", mbuf);
return false;
} else {
mbuf->l2_len = (char *) dp_packet_l3(pkt) -
(char *) dp_packet_eth(pkt);
mbuf->l3_len = (char *) dp_packet_l4(pkt) -
(char *) dp_packet_l3(pkt);
mbuf->outer_l2_len = 0;
mbuf->outer_l3_len = 0;

l2 = dp_packet_eth(pkt);
l3 = dp_packet_l3(pkt);
l4 = dp_packet_l4(pkt);
}
th = dp_packet_l4(pkt);

if (mbuf->ol_flags & RTE_MBUF_F_TX_TCP_SEG) {
if (!th) {
VLOG_WARN_RL(&rl, "%s: TCP Segmentation without L4 header"
" pkt len: %"PRIu32"", dev->up.name, mbuf->pkt_len);
return false;
}
mbuf->l2_len = (char *) l3 - (char *) l2;

if (!(mbuf->ol_flags & (RTE_MBUF_F_TX_L4_MASK | RTE_MBUF_F_TX_TCP_SEG))) {
return true;
}
if (!l4) {
VLOG_WARN_RL(&rl, "%s: L4 offloading without L4 header"
" pkt len: %"PRIu32"", dev->up.name, mbuf->pkt_len);
return false;
}

if ((mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == RTE_MBUF_F_TX_TCP_CKSUM) {
if (!th) {
VLOG_WARN_RL(&rl, "%s: TCP offloading without L4 header"
" pkt len: %"PRIu32"", dev->up.name, mbuf->pkt_len);
return false;
}
mbuf->l3_len = (char *) l4 - (char *) l3;

if (mbuf->ol_flags & RTE_MBUF_F_TX_TCP_SEG) {
struct tcp_header *th = l4;

mbuf->l4_len = TCP_OFFSET(th->tcp_ctl) * 4;
if (tunnel_type) {
mbuf->tso_segsz = dev->mtu - mbuf->l2_len - mbuf->l3_len -
mbuf->l4_len - mbuf->outer_l3_len;
} else {
mbuf->l4_len = TCP_OFFSET(th->tcp_ctl) * 4;
mbuf->tso_segsz = dev->mtu - mbuf->l3_len - mbuf->l4_len;
}

if (mbuf->ol_flags & RTE_MBUF_F_TX_TCP_SEG) {
int hdr_len = mbuf->l2_len + mbuf->l3_len + mbuf->l4_len;
if (OVS_UNLIKELY((hdr_len +
mbuf->tso_segsz) > dev->max_packet_len)) {
VLOG_WARN_RL(&rl, "%s: Oversized TSO packet. hdr: %"PRIu32", "
"gso: %"PRIu32", max len: %"PRIu32"",
dev->up.name, hdr_len, mbuf->tso_segsz,
dev->max_packet_len);
return false;
}
int hdr_len = mbuf->l2_len + mbuf->l3_len + mbuf->l4_len;
if (OVS_UNLIKELY((hdr_len + mbuf->tso_segsz) > dev->max_packet_len)) {
VLOG_WARN_RL(&rl, "%s: Oversized TSO packet. hdr: %"PRIu32", "
"gso: %"PRIu32", max len: %"PRIu32"",
dev->up.name, hdr_len, mbuf->tso_segsz,
dev->max_packet_len);
return false;
}
}

Expand Down
50 changes: 5 additions & 45 deletions lib/netdev-native-tnl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,35 +240,15 @@ udp_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl,
return udp + 1;
}

/* Calculate inner l2 l3 l4 len as tunnel outer header is not
* encapsulated now. */
static void
tnl_ol_process(struct dp_packet *packet,
const struct ovs_action_push_tnl *data)
{
struct udp_header *udp = NULL;
uint8_t opt_len = 0;
struct eth_header *eth = NULL;
struct ip_header *ip = NULL;
struct genevehdr *gnh = NULL;

/* l2 l3 l4 len refer to inner len, tunnel outer
* header is not encapsulated here. */
if (dp_packet_hwol_l4_mask(packet)) {
ip = dp_packet_l3(packet);

if (ip->ip_proto == IPPROTO_TCP) {
struct tcp_header *th = dp_packet_l4(packet);
dp_packet_set_l4_len(packet, TCP_OFFSET(th->tcp_ctl) * 4);
} else if (ip->ip_proto == IPPROTO_UDP) {
dp_packet_set_l4_len(packet, UDP_HEADER_LEN);
} else if (ip->ip_proto == IPPROTO_SCTP) {
dp_packet_set_l4_len(packet, SCTP_HEADER_LEN);
}

dp_packet_set_l3_len(packet, (char *) dp_packet_l4(packet) -
(char *) dp_packet_l3(packet));

if (data->tnl_type == OVS_VPORT_TYPE_GENEVE ||
data->tnl_type == OVS_VPORT_TYPE_VXLAN) {

Expand All @@ -279,32 +259,12 @@ tnl_ol_process(struct dp_packet *packet,
dp_packet_hwol_set_tx_ipv6(packet);
}
}
}

/* Attention please, tunnel inner l2 len is consist of udp header
* len and tunnel header len and inner l2 len. */
if (data->tnl_type == OVS_VPORT_TYPE_GENEVE) {
eth = (struct eth_header *)(data->header);
ip = (struct ip_header *)(eth + 1);
udp = (struct udp_header *)(ip + 1);
gnh = (struct genevehdr *)(udp + 1);
opt_len = gnh->opt_len * 4;
dp_packet_hwol_set_tunnel_geneve(packet);
dp_packet_set_l2_len(packet, (char *) dp_packet_l3(packet) -
(char *) dp_packet_eth(packet) +
GENEVE_BASE_HLEN + opt_len);
} else if (data->tnl_type == OVS_VPORT_TYPE_VXLAN) {
dp_packet_hwol_set_tunnel_vxlan(packet);
dp_packet_set_l2_len(packet, (char *) dp_packet_l3(packet) -
(char *) dp_packet_eth(packet) +
VXLAN_HLEN);
}
} else {
/* Mark non-l4 packets as tunneled. */
if (data->tnl_type == OVS_VPORT_TYPE_GENEVE) {
dp_packet_hwol_set_tunnel_geneve(packet);
} else if (data->tnl_type == OVS_VPORT_TYPE_VXLAN) {
dp_packet_hwol_set_tunnel_vxlan(packet);
}
if (data->tnl_type == OVS_VPORT_TYPE_GENEVE) {
dp_packet_hwol_set_tunnel_geneve(packet);
} else if (data->tnl_type == OVS_VPORT_TYPE_VXLAN) {
dp_packet_hwol_set_tunnel_vxlan(packet);
}
}

Expand Down

0 comments on commit 73e608c

Please sign in to comment.