From patchwork Mon Dec 21 03:50:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yang_y_yi X-Patchwork-Id: 85579 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 53BDEA09FE; Mon, 21 Dec 2020 04:53:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9AA4FCCBD; Mon, 21 Dec 2020 04:51:11 +0100 (CET) Received: from mail-m972.mail.163.com (mail-m972.mail.163.com [123.126.97.2]) by dpdk.org (Postfix) with ESMTP id C4828CB79 for ; Mon, 21 Dec 2020 04:50:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=bdVff lUwCCNrhnEecWCnpE8Ekzxs6cOSGsFKghPNiWY=; b=VtZ7zWzxi6Zj44IQwhfHr DUUiQzfAaQMuDR0iEpbl0XBlE04cxW/GwX2zvr50m28d6go3SFUFoLg/Q1t2UP/I LaIiv90i0WWs9y3mzY7xf1r5zM384fSUNrQvcUNIbLyeCe5bhHBCSe9ZwUJNcX7F SsoU5tIp9NLGxO1nZzH+ro= Received: from yangyi0100.home.langchao.com (unknown [111.207.123.53]) by smtp2 (Coremail) with SMTP id GtxpCgD3vb6cG+BfUOf7Fw--.755S9; Mon, 21 Dec 2020 11:50:55 +0800 (CST) From: yang_y_yi@163.com To: dev@dpdk.org Cc: jiayu.hu@intel.com, konstantin.ananyev@intel.com, thomas@monjalon.net, yangyi01@inspur.com, yang_y_yi@163.com Date: Mon, 21 Dec 2020 11:50:51 +0800 Message-Id: <20201221035052.128292-8-yang_y_yi@163.com> X-Mailer: git-send-email 2.19.2.windows.1 In-Reply-To: <20201221035052.128292-1-yang_y_yi@163.com> References: <20201221035052.128292-1-yang_y_yi@163.com> MIME-Version: 1.0 X-CM-TRANSID: GtxpCgD3vb6cG+BfUOf7Fw--.755S9 X-Coremail-Antispam: 1Uf129KBjvAXoWftFW7Kw1kCrW5ZrW8Jr43KFg_yoW5ZF4rXo WxXan09rykur1Yyr40yr1xuryjgw48KrnrCrs0gw4fW3Z2yrWUG393Ww43Aa17X3yavF9Y 9w1xWa17XF42yrZ7n29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUO89MUUUUU X-Originating-IP: [111.207.123.53] X-CM-SenderInfo: 51dqwsp1b1xqqrwthudrp/1tbiEAACi18YEc33VAAAsh Subject: [dpdk-dev] [PATCH v1 7/8] gro: support IPv6 VXLAN UDP/IPv4 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Yi Yang IPv6 VXLAN UDP/IPv4 GRO can help improve UDP/IPv4 performance in IPv6 VXLAN use case. With this enabled in DPDK, OVS DPDK can leverage it to improve VM-to-VM UDP/IPv4 performance, it will merge small adjacent IPv6 VXLAN UDP/IPv4 fragments to a big IPv6 VXLAN UDP/IPv4 packet immediate after they are received from a physical NIC. It is very helpful in OVS DPDK VXLAN use case. Signed-off-by: Yi Yang --- .../prog_guide/generic_receive_offload_lib.rst | 3 +- doc/guides/rel_notes/release_21_02.rst | 5 + lib/librte_gro/gro_vxlan6_udp4.c | 559 +++++++++++++++++++++ lib/librte_gro/gro_vxlan6_udp4.h | 148 ++++++ lib/librte_gro/meson.build | 2 +- lib/librte_gro/rte_gro.c | 84 +++- lib/librte_gro/rte_gro.h | 3 + 7 files changed, 794 insertions(+), 10 deletions(-) create mode 100644 lib/librte_gro/gro_vxlan6_udp4.c create mode 100644 lib/librte_gro/gro_vxlan6_udp4.h diff --git a/doc/guides/prog_guide/generic_receive_offload_lib.rst b/doc/guides/prog_guide/generic_receive_offload_lib.rst index 906e85f..8f48809 100644 --- a/doc/guides/prog_guide/generic_receive_offload_lib.rst +++ b/doc/guides/prog_guide/generic_receive_offload_lib.rst @@ -33,7 +33,8 @@ fragmentation is possible (i.e., DF==0). Additionally, it complies RFC Currently, the GRO library provides GRO supports for TCP/IPv4, UDP/IPv4, UDP/IPv6, and TCP/IPv6 packets as well as VxLAN packets which contain an outer IPv4 header and an inner TCP/IPv4, UDP/IPv4, TCP/IPv6 or UDP/IPv6 -packet or an outer IPv6 header and an inner TCP/IPv4 or TCP/IPv6 packet. +packet or an outer IPv6 header and an inner TCP/IPv4, UDP/IPv4 or TCP/IPv6 +packet. Two Sets of API --------------- diff --git a/doc/guides/rel_notes/release_21_02.rst b/doc/guides/rel_notes/release_21_02.rst index 4758cea..5e3d10b 100644 --- a/doc/guides/rel_notes/release_21_02.rst +++ b/doc/guides/rel_notes/release_21_02.rst @@ -85,6 +85,11 @@ New Features Added UDP/IPv6 GRO support for IPv4 VXLAN packets, this enabled UDP/IPv6 GRO support for IPv4 VXLAN use case. +* **Added UDP/IPv4 GRO support for IPv6 VXLAN packets.** + + Added UDP/IPv4 GRO support for IPv6 VXLAN packets, this enabled UDP/IPv4 + GRO support for IPv6 VXLAN use case. + Removed Items ------------- diff --git a/lib/librte_gro/gro_vxlan6_udp4.c b/lib/librte_gro/gro_vxlan6_udp4.c new file mode 100644 index 0000000..c9e7af4 --- /dev/null +++ b/lib/librte_gro/gro_vxlan6_udp4.c @@ -0,0 +1,559 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2021 Inspur Corporation + */ + +#include +#include +#include +#include +#include +#include + +#include "gro_vxlan6_udp4.h" + +void * +gro_vxlan6_udp4_tbl_create(uint16_t socket_id, + uint16_t max_flow_num, + uint16_t max_item_per_flow) +{ + struct gro_vxlan6_udp4_tbl *tbl; + size_t size; + uint32_t entries_num, i; + + entries_num = max_flow_num * max_item_per_flow; + entries_num = RTE_MIN(entries_num, GRO_VXLAN6_UDP4_TBL_MAX_ITEM_NUM); + + if (entries_num == 0) + return NULL; + + tbl = rte_zmalloc_socket(__func__, + sizeof(struct gro_vxlan6_udp4_tbl), + RTE_CACHE_LINE_SIZE, + socket_id); + if (tbl == NULL) + return NULL; + + size = sizeof(struct gro_vxlan6_udp4_item) * entries_num; + tbl->items = rte_zmalloc_socket(__func__, + size, + RTE_CACHE_LINE_SIZE, + socket_id); + if (tbl->items == NULL) { + rte_free(tbl); + return NULL; + } + tbl->max_item_num = entries_num; + + size = sizeof(struct gro_vxlan6_udp4_flow) * entries_num; + tbl->flows = rte_zmalloc_socket(__func__, + size, + RTE_CACHE_LINE_SIZE, + socket_id); + if (tbl->flows == NULL) { + rte_free(tbl->items); + rte_free(tbl); + return NULL; + } + + for (i = 0; i < entries_num; i++) + tbl->flows[i].start_index = INVALID_ARRAY_INDEX; + tbl->max_flow_num = entries_num; + + return tbl; +} + +void +gro_vxlan6_udp4_tbl_destroy(void *tbl) +{ + struct gro_vxlan6_udp4_tbl *vxlan6_tbl = tbl; + + if (vxlan6_tbl) { + rte_free(vxlan6_tbl->items); + rte_free(vxlan6_tbl->flows); + } + rte_free(vxlan6_tbl); +} + +static inline uint32_t +find_an_empty_item(struct gro_vxlan6_udp4_tbl *tbl) +{ + uint32_t max_item_num = tbl->max_item_num, i; + + for (i = 0; i < max_item_num; i++) + if (tbl->items[i].inner_item.firstseg == NULL) + return i; + return INVALID_ARRAY_INDEX; +} + +static inline uint32_t +find_an_empty_flow(struct gro_vxlan6_udp4_tbl *tbl) +{ + uint32_t max_flow_num = tbl->max_flow_num, i; + + for (i = 0; i < max_flow_num; i++) + if (tbl->flows[i].start_index == INVALID_ARRAY_INDEX) + return i; + return INVALID_ARRAY_INDEX; +} + +static inline uint32_t +insert_new_item(struct gro_vxlan6_udp4_tbl *tbl, + struct rte_mbuf *pkt, + uint64_t start_time, + uint32_t prev_idx, + uint16_t frag_offset, + uint8_t is_last_frag) +{ + uint32_t item_idx; + + item_idx = find_an_empty_item(tbl); + if (unlikely(item_idx == INVALID_ARRAY_INDEX)) + return INVALID_ARRAY_INDEX; + + tbl->items[item_idx].inner_item.firstseg = pkt; + tbl->items[item_idx].inner_item.lastseg = rte_pktmbuf_lastseg(pkt); + tbl->items[item_idx].inner_item.start_time = start_time; + tbl->items[item_idx].inner_item.next_pkt_idx = INVALID_ARRAY_INDEX; + tbl->items[item_idx].inner_item.frag_offset = frag_offset; + tbl->items[item_idx].inner_item.is_last_frag = is_last_frag; + tbl->items[item_idx].inner_item.nb_merged = 1; + tbl->item_num++; + + /* If the previous packet exists, chain the new one with it. */ + if (prev_idx != INVALID_ARRAY_INDEX) { + tbl->items[item_idx].inner_item.next_pkt_idx = + tbl->items[prev_idx].inner_item.next_pkt_idx; + tbl->items[prev_idx].inner_item.next_pkt_idx = item_idx; + } + + return item_idx; +} + +static inline uint32_t +delete_item(struct gro_vxlan6_udp4_tbl *tbl, + uint32_t item_idx, + uint32_t prev_item_idx) +{ + uint32_t next_idx = tbl->items[item_idx].inner_item.next_pkt_idx; + + /* NULL indicates an empty item. */ + tbl->items[item_idx].inner_item.firstseg = NULL; + tbl->item_num--; + if (prev_item_idx != INVALID_ARRAY_INDEX) + tbl->items[prev_item_idx].inner_item.next_pkt_idx = next_idx; + + return next_idx; +} + +/* Copy IPv6 addr */ +static inline void gro_ipv6_addr_copy(const uint8_t *ipv6_from, + uint8_t *ipv6_to) +{ + const uint64_t *from_words = (const uint64_t *)ipv6_from; + uint64_t *to_words = (uint64_t *)ipv6_to; + + to_words[0] = from_words[0]; + to_words[1] = from_words[1]; +} + +static inline int rte_is_same_ipv6_addr(const uint8_t *ipv6_a1, + const uint8_t *ipv6_a2) +{ + const uint64_t *w1 = (const uint64_t *)ipv6_a1; + const uint64_t *w2 = (const uint64_t *)ipv6_a2; + + return ((w1[0] ^ w2[0]) | (w1[1] ^ w2[1])) == 0; +} + +static inline uint32_t +insert_new_flow(struct gro_vxlan6_udp4_tbl *tbl, + struct vxlan6_udp4_flow_key *src, + uint32_t item_idx) +{ + struct vxlan6_udp4_flow_key *dst; + uint32_t flow_idx; + + flow_idx = find_an_empty_flow(tbl); + if (unlikely(flow_idx == INVALID_ARRAY_INDEX)) + return INVALID_ARRAY_INDEX; + + dst = &(tbl->flows[flow_idx].key); + + rte_ether_addr_copy(&(src->inner_key.eth_saddr), + &(dst->inner_key.eth_saddr)); + rte_ether_addr_copy(&(src->inner_key.eth_daddr), + &(dst->inner_key.eth_daddr)); + dst->inner_key.ip_src_addr = src->inner_key.ip_src_addr; + dst->inner_key.ip_dst_addr = src->inner_key.ip_dst_addr; + dst->inner_key.ip_id = src->inner_key.ip_id; + + dst->vxlan_hdr.vx_flags = src->vxlan_hdr.vx_flags; + dst->vxlan_hdr.vx_vni = src->vxlan_hdr.vx_vni; + rte_ether_addr_copy(&(src->outer_eth_saddr), &(dst->outer_eth_saddr)); + rte_ether_addr_copy(&(src->outer_eth_daddr), &(dst->outer_eth_daddr)); + gro_ipv6_addr_copy(src->outer_ip_saddr, dst->outer_ip_saddr); + gro_ipv6_addr_copy(src->outer_ip_daddr, dst->outer_ip_daddr); + dst->outer_src_port = src->outer_src_port; + dst->outer_dst_port = src->outer_dst_port; + + tbl->flows[flow_idx].start_index = item_idx; + tbl->flow_num++; + + return flow_idx; +} + +static inline int +is_same_vxlan6_udp4_flow(struct vxlan6_udp4_flow_key k1, + struct vxlan6_udp4_flow_key k2) +{ + /* For VxLAN packet, outer udp src port is calculated from + * inner packet RSS hash, udp src port of the first UDP + * fragment is different from one of other UDP fragments + * even if they are same flow, so we have to skip outer udp + * src port comparison here. + */ + return (rte_is_same_ether_addr(&k1.outer_eth_saddr, + &k2.outer_eth_saddr) && + rte_is_same_ether_addr(&k1.outer_eth_daddr, + &k2.outer_eth_daddr) && + rte_is_same_ipv6_addr(k1.outer_ip_saddr, + k2.outer_ip_saddr) && + rte_is_same_ipv6_addr(k1.outer_ip_daddr, + k2.outer_ip_daddr) && + (k1.outer_dst_port == k2.outer_dst_port) && + (k1.vxlan_hdr.vx_flags == k2.vxlan_hdr.vx_flags) && + (k1.vxlan_hdr.vx_vni == k2.vxlan_hdr.vx_vni) && + is_same_udp4_flow(k1.inner_key, k2.inner_key)); +} + +static inline int +udp_check_vxlan6_neighbor(struct gro_vxlan6_udp4_item *item, + uint16_t frag_offset, + uint16_t ip_dl) +{ + struct rte_mbuf *pkt = item->inner_item.firstseg; + int cmp; + uint16_t l2_offset; + int ret = 0; + + l2_offset = pkt->outer_l2_len + pkt->outer_l3_len; + cmp = udp4_check_neighbor(&item->inner_item, frag_offset, + ip_dl, l2_offset); + if (cmp > 0) + /* Append the new packet. */ + ret = 1; + else if (cmp < 0) + /* Prepend the new packet. */ + ret = -1; + + return ret; +} + +static inline int +merge_two_vxlan6_udp4_packets(struct gro_vxlan6_udp4_item *item, + struct rte_mbuf *pkt, + int cmp, + uint16_t frag_offset, + uint8_t is_last_frag) +{ + if (merge_two_udp4_packets(&item->inner_item, pkt, cmp, frag_offset, + is_last_frag, + pkt->outer_l2_len + pkt->outer_l3_len)) { + return 1; + } + + return 0; +} + +static inline void +update_vxlan6_header(struct gro_vxlan6_udp4_item *item) +{ + struct rte_ipv6_hdr *ipv6_hdr; + struct rte_ipv4_hdr *ipv4_hdr; + struct rte_udp_hdr *udp_hdr; + struct rte_mbuf *pkt = item->inner_item.firstseg; + uint16_t len; + uint16_t frag_offset; + + /* Update the outer IPv6 header. */ + len = pkt->pkt_len - pkt->outer_l2_len; + ipv6_hdr = (struct rte_ipv6_hdr *)(rte_pktmbuf_mtod(pkt, char *) + + pkt->outer_l2_len); + ipv6_hdr->payload_len = rte_cpu_to_be_16(len - pkt->outer_l3_len); + + /* Update the outer UDP header. */ + len -= pkt->outer_l3_len; + udp_hdr = (struct rte_udp_hdr *)((char *)ipv6_hdr + pkt->outer_l3_len); + udp_hdr->dgram_len = rte_cpu_to_be_16(len); + + /* Update the inner IPv4 header. */ + len -= pkt->l2_len; + ipv4_hdr = (struct rte_ipv4_hdr *)((char *)udp_hdr + pkt->l2_len); + ipv4_hdr->total_length = rte_cpu_to_be_16(len); + + /* Clear MF bit if it is last fragment */ + if (item->inner_item.is_last_frag) { + frag_offset = rte_be_to_cpu_16(ipv4_hdr->fragment_offset); + ipv4_hdr->fragment_offset = + rte_cpu_to_be_16(frag_offset & ~RTE_IPV4_HDR_MF_FLAG); + } +} + +int32_t +gro_vxlan6_udp4_reassemble(struct rte_mbuf *pkt, + struct gro_vxlan6_udp4_tbl *tbl, + uint64_t start_time) +{ + struct rte_ether_hdr *outer_eth_hdr, *eth_hdr; + struct rte_ipv6_hdr *outer_ipv6_hdr; + struct rte_ipv4_hdr *ipv4_hdr; + struct rte_udp_hdr *udp_hdr; + struct rte_vxlan_hdr *vxlan_hdr; + uint16_t frag_offset; + uint8_t is_last_frag; + int16_t ip_dl; + uint16_t ip_id; + + struct vxlan6_udp4_flow_key key; + uint32_t cur_idx, prev_idx, item_idx; + uint32_t i, max_flow_num, remaining_flow_num; + int cmp; + uint16_t hdr_len; + uint8_t find; + + outer_eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + outer_ipv6_hdr = (struct rte_ipv6_hdr *)((char *)outer_eth_hdr + + pkt->outer_l2_len); + + udp_hdr = (struct rte_udp_hdr *)((char *)outer_ipv6_hdr + + pkt->outer_l3_len); + vxlan_hdr = (struct rte_vxlan_hdr *)((char *)udp_hdr + + sizeof(struct rte_udp_hdr)); + eth_hdr = (struct rte_ether_hdr *)((char *)vxlan_hdr + + sizeof(struct rte_vxlan_hdr)); + /* l2_len = outer udp hdr len + vxlan hdr len + inner l2 len */ + ipv4_hdr = (struct rte_ipv4_hdr *)((char *)udp_hdr + pkt->l2_len); + + /* + * Don't process the packet which has non-fragment inner IP. + */ + if (!is_ipv4_fragment(ipv4_hdr)) + return -1; + + hdr_len = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len + + pkt->l3_len; + /* + * Don't process the packet whose payload length is less than or + * equal to 0. + */ + if (pkt->pkt_len <= hdr_len) + return -1; + ip_dl = pkt->pkt_len - hdr_len; + + ip_id = rte_be_to_cpu_16(ipv4_hdr->packet_id); + frag_offset = rte_be_to_cpu_16(ipv4_hdr->fragment_offset); + is_last_frag = ((frag_offset & RTE_IPV4_HDR_MF_FLAG) == 0) ? 1 : 0; + frag_offset = (uint16_t)(frag_offset & RTE_IPV4_HDR_OFFSET_MASK) << 3; + + rte_ether_addr_copy(&(eth_hdr->s_addr), &(key.inner_key.eth_saddr)); + rte_ether_addr_copy(&(eth_hdr->d_addr), &(key.inner_key.eth_daddr)); + key.inner_key.ip_src_addr = ipv4_hdr->src_addr; + key.inner_key.ip_dst_addr = ipv4_hdr->dst_addr; + key.inner_key.ip_id = ip_id; + + key.vxlan_hdr.vx_flags = vxlan_hdr->vx_flags; + key.vxlan_hdr.vx_vni = vxlan_hdr->vx_vni; + rte_ether_addr_copy(&(outer_eth_hdr->s_addr), &(key.outer_eth_saddr)); + rte_ether_addr_copy(&(outer_eth_hdr->d_addr), &(key.outer_eth_daddr)); + gro_ipv6_addr_copy(outer_ipv6_hdr->src_addr, key.outer_ip_saddr); + gro_ipv6_addr_copy(outer_ipv6_hdr->dst_addr, key.outer_ip_daddr); + key.outer_src_port = udp_hdr->src_port; + key.outer_dst_port = udp_hdr->dst_port; + + /* Search for a matched flow. */ + max_flow_num = tbl->max_flow_num; + remaining_flow_num = tbl->flow_num; + find = 0; + for (i = 0; i < max_flow_num && remaining_flow_num; i++) { + if (tbl->flows[i].start_index != INVALID_ARRAY_INDEX) { + if (is_same_vxlan6_udp4_flow(tbl->flows[i].key, key)) { + find = 1; + break; + } + remaining_flow_num--; + } + } + + /* + * Can't find a matched flow. Insert a new flow and store the + * packet into the flow. + */ + if (find == 0) { + item_idx = insert_new_item(tbl, pkt, start_time, + INVALID_ARRAY_INDEX, frag_offset, + is_last_frag); + if (item_idx == INVALID_ARRAY_INDEX) + return -1; + if (insert_new_flow(tbl, &key, item_idx) == + INVALID_ARRAY_INDEX) { + /* + * Fail to insert a new flow, so + * delete the inserted packet. + */ + delete_item(tbl, item_idx, INVALID_ARRAY_INDEX); + return -1; + } + return 0; + } + + /* Check all packets in the flow and try to find a neighbor. */ + cur_idx = tbl->flows[i].start_index; + prev_idx = cur_idx; + do { + cmp = udp_check_vxlan6_neighbor(&(tbl->items[cur_idx]), + frag_offset, ip_dl); + if (cmp) { + if (merge_two_vxlan6_udp4_packets( + &(tbl->items[cur_idx]), + pkt, cmp, frag_offset, + is_last_frag)) { + return 1; + } + /* + * Can't merge two packets, as the packet + * length will be greater than the max value. + * Insert the packet into the flow. + */ + if (insert_new_item(tbl, pkt, start_time, prev_idx, + frag_offset, is_last_frag) + == INVALID_ARRAY_INDEX) + return -1; + return 0; + } + + /* Ensure inserted items are ordered by frag_offset */ + if (frag_offset + < tbl->items[cur_idx].inner_item.frag_offset) { + break; + } + + prev_idx = cur_idx; + cur_idx = tbl->items[cur_idx].inner_item.next_pkt_idx; + } while (cur_idx != INVALID_ARRAY_INDEX); + + /* Can't find neighbor. Insert the packet into the flow. */ + if (cur_idx == tbl->flows[i].start_index) { + /* Insert it before the first packet of the flow */ + item_idx = insert_new_item(tbl, pkt, start_time, + INVALID_ARRAY_INDEX, frag_offset, + is_last_frag); + if (item_idx == INVALID_ARRAY_INDEX) + return -1; + tbl->items[item_idx].inner_item.next_pkt_idx = cur_idx; + tbl->flows[i].start_index = item_idx; + } else { + if (insert_new_item(tbl, pkt, start_time, prev_idx, + frag_offset, is_last_frag) + == INVALID_ARRAY_INDEX) + return -1; + } + + return 0; +} + +static int +gro_vxlan6_udp4_merge_items(struct gro_vxlan6_udp4_tbl *tbl, + uint32_t start_idx) +{ + uint16_t frag_offset; + uint8_t is_last_frag; + int16_t ip_dl; + struct rte_mbuf *pkt; + int cmp; + uint32_t item_idx; + uint16_t hdr_len; + + item_idx = tbl->items[start_idx].inner_item.next_pkt_idx; + while (item_idx != INVALID_ARRAY_INDEX) { + pkt = tbl->items[item_idx].inner_item.firstseg; + hdr_len = pkt->outer_l2_len + pkt->outer_l3_len + pkt->l2_len + + pkt->l3_len; + ip_dl = pkt->pkt_len - hdr_len; + frag_offset = tbl->items[item_idx].inner_item.frag_offset; + is_last_frag = tbl->items[item_idx].inner_item.is_last_frag; + cmp = udp_check_vxlan6_neighbor(&(tbl->items[start_idx]), + frag_offset, ip_dl); + if (cmp) { + if (merge_two_vxlan6_udp4_packets( + &(tbl->items[start_idx]), + pkt, cmp, frag_offset, + is_last_frag)) { + item_idx = delete_item(tbl, item_idx, + INVALID_ARRAY_INDEX); + tbl->items[start_idx].inner_item.next_pkt_idx + = item_idx; + } else { + return 0; + } + } else { + return 0; + } + } + + return 0; +} + +uint16_t +gro_vxlan6_udp4_tbl_timeout_flush(struct gro_vxlan6_udp4_tbl *tbl, + uint64_t flush_timestamp, + struct rte_mbuf **out, + uint16_t nb_out) +{ + uint16_t k = 0; + uint32_t i, j; + uint32_t max_flow_num = tbl->max_flow_num; + + for (i = 0; i < max_flow_num; i++) { + if (unlikely(tbl->flow_num == 0)) + return k; + + j = tbl->flows[i].start_index; + while (j != INVALID_ARRAY_INDEX) { + if (tbl->items[j].inner_item.start_time <= + flush_timestamp) { + gro_vxlan6_udp4_merge_items(tbl, j); + out[k++] = tbl->items[j].inner_item.firstseg; + if (tbl->items[j].inner_item.nb_merged > 1) + update_vxlan6_header(&(tbl->items[j])); + /* + * Delete the item and get the next packet + * index. + */ + j = delete_item(tbl, j, INVALID_ARRAY_INDEX); + tbl->flows[i].start_index = j; + if (j == INVALID_ARRAY_INDEX) + tbl->flow_num--; + + if (unlikely(k == nb_out)) + return k; + } else + /* + * The left packets in the flow won't be + * timeout. Go to check other flows. + */ + break; + } + } + return k; +} + +uint32_t +gro_vxlan6_udp4_tbl_pkt_count(void *tbl) +{ + struct gro_vxlan6_udp4_tbl *gro_tbl = tbl; + + if (gro_tbl) + return gro_tbl->item_num; + + return 0; +} diff --git a/lib/librte_gro/gro_vxlan6_udp4.h b/lib/librte_gro/gro_vxlan6_udp4.h new file mode 100644 index 0000000..14dc2b6 --- /dev/null +++ b/lib/librte_gro/gro_vxlan6_udp4.h @@ -0,0 +1,148 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2021 Inspur Corporation + */ + +#ifndef _GRO_VXLAN6_UDP4_H_ +#define _GRO_VXLAN6_UDP4_H_ + +#include "gro_udp4.h" + +#define GRO_VXLAN6_UDP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL) + +/* Header fields representing a IPv6 VxLAN flow */ +struct vxlan6_udp4_flow_key { + struct udp4_flow_key inner_key; + struct rte_vxlan_hdr vxlan_hdr; + + struct rte_ether_addr outer_eth_saddr; + struct rte_ether_addr outer_eth_daddr; + + uint8_t outer_ip_saddr[16]; + uint8_t outer_ip_daddr[16]; + + /* Outer UDP ports */ + uint16_t outer_src_port; + uint16_t outer_dst_port; + +}; + +struct gro_vxlan6_udp4_flow { + struct vxlan6_udp4_flow_key key; + /* + * The index of the first packet in the flow. INVALID_ARRAY_INDEX + * indicates an empty flow. + */ + uint32_t start_index; +}; + +struct gro_vxlan6_udp4_item { + struct gro_udp4_item inner_item; +}; + +/* + * IPv6 VxLAN (with an outer IPv6 header and an inner UDP/IPv4 packet) + * reassembly table structure + */ +struct gro_vxlan6_udp4_tbl { + /* item array */ + struct gro_vxlan6_udp4_item *items; + /* flow array */ + struct gro_vxlan6_udp4_flow *flows; + /* current item number */ + uint32_t item_num; + /* current flow number */ + uint32_t flow_num; + /* the maximum item number */ + uint32_t max_item_num; + /* the maximum flow number */ + uint32_t max_flow_num; +}; + +/** + * This function creates a IPv6 VxLAN reassembly table for IPv6 VxLAN packets + * which have an outer IPv6 header and an inner UDP/IPv4 packet. + * + * @param socket_id + * Socket index for allocating the table + * @param max_flow_num + * The maximum number of flows in the table + * @param max_item_per_flow + * The maximum number of packets per flow + * + * @return + * - Return the table pointer on success. + * - Return NULL on failure. + */ +void *gro_vxlan6_udp4_tbl_create(uint16_t socket_id, + uint16_t max_flow_num, + uint16_t max_item_per_flow); + +/** + * This function destroys a IPv6 VxLAN reassembly table. + * + * @param tbl + * Pointer pointing to the IPv6 VxLAN reassembly table + */ +void gro_vxlan6_udp4_tbl_destroy(void *tbl); + +/** + * This function merges a IPv6 VxLAN packet which has an outer IPv6 header and + * an inner UDP/IPv4 packet. It does not process the packet which does not + * have payload. + * + * This function does not check if the packet has correct checksums and + * does not re-calculate checksums for the merged packet. It returns the + * packet if there is no available space in the table. + * + * @param pkt + * Packet to reassemble + * @param tbl + * Pointer pointing to the IPv6 VxLAN reassembly table + * @start_time + * The time when the packet is inserted into the table + * + * @return + * - Return a positive value if the packet is merged. + * - Return zero if the packet isn't merged but stored in the table. + * - Return a negative value for invalid parameters or no available + * space in the table. + */ +int32_t gro_vxlan6_udp4_reassemble(struct rte_mbuf *pkt, + struct gro_vxlan6_udp4_tbl *tbl, + uint64_t start_time); + +/** + * This function flushes timeout packets in the IPv6 VxLAN reassembly table, + * and without updating checksums. + * + * @param tbl + * Pointer pointing to a IPv6 VxLAN GRO table + * @param flush_timestamp + * This function flushes packets which are inserted into the table + * before or at the flush_timestamp. + * @param out + * Pointer array used to keep flushed packets + * @param nb_out + * The element number in 'out'. It also determines the maximum number of + * packets that can be flushed finally. + * + * @return + * The number of flushed packets + */ +uint16_t gro_vxlan6_udp4_tbl_timeout_flush(struct gro_vxlan6_udp4_tbl *tbl, + uint64_t flush_timestamp, + struct rte_mbuf **out, + uint16_t nb_out); + +/** + * This function returns the number of the packets in a IPv6 VxLAN + * reassembly table. + * + * @param tbl + * Pointer pointing to the IPv6 VxLAN reassembly table + * + * @return + * The number of packets in the table + */ +uint32_t gro_vxlan6_udp4_tbl_pkt_count(void *tbl); +#endif diff --git a/lib/librte_gro/meson.build b/lib/librte_gro/meson.build index 14b6b64..e23197d 100644 --- a/lib/librte_gro/meson.build +++ b/lib/librte_gro/meson.build @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -sources = files('rte_gro.c', 'gro_tcp4.c', 'gro_udp4.c', 'gro_vxlan_tcp4.c', 'gro_vxlan_udp4.c', 'gro_tcp6.c', 'gro_vxlan_tcp6.c', 'gro_vxlan6_tcp4.c', 'gro_vxlan6_tcp6.c', 'gro_udp6.c', 'gro_vxlan_udp6.c') +sources = files('rte_gro.c', 'gro_tcp4.c', 'gro_udp4.c', 'gro_vxlan_tcp4.c', 'gro_vxlan_udp4.c', 'gro_tcp6.c', 'gro_vxlan_tcp6.c', 'gro_vxlan6_tcp4.c', 'gro_vxlan6_tcp6.c', 'gro_udp6.c', 'gro_vxlan_udp6.c', 'gro_vxlan6_udp4.c') headers = files('rte_gro.h') deps += ['ethdev'] diff --git a/lib/librte_gro/rte_gro.c b/lib/librte_gro/rte_gro.c index 3bb7ea1..021a49e 100644 --- a/lib/librte_gro/rte_gro.c +++ b/lib/librte_gro/rte_gro.c @@ -14,6 +14,7 @@ #include "gro_udp6.h" #include "gro_vxlan6_tcp4.h" #include "gro_vxlan6_tcp6.h" +#include "gro_vxlan6_udp4.h" #include "gro_vxlan_tcp4.h" #include "gro_vxlan_tcp6.h" #include "gro_vxlan_udp4.h" @@ -31,7 +32,7 @@ gro_tcp6_tbl_create, gro_vxlan_tcp6_tbl_create, gro_vxlan6_tcp4_tbl_create, gro_vxlan6_tcp6_tbl_create, gro_udp6_tbl_create, gro_vxlan_udp6_tbl_create, - NULL}; + gro_vxlan6_udp4_tbl_create, NULL}; static gro_tbl_destroy_fn tbl_destroy_fn[RTE_GRO_TYPE_MAX_NUM] = { gro_tcp4_tbl_destroy, gro_vxlan_tcp4_tbl_destroy, gro_udp4_tbl_destroy, gro_vxlan_udp4_tbl_destroy, @@ -39,7 +40,7 @@ gro_vxlan6_tcp4_tbl_destroy, gro_vxlan6_tcp6_tbl_destroy, gro_udp6_tbl_destroy, gro_vxlan_udp6_tbl_destroy, - NULL}; + gro_vxlan6_udp4_tbl_destroy, NULL}; static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { gro_tcp4_tbl_pkt_count, gro_vxlan_tcp4_tbl_pkt_count, gro_udp4_tbl_pkt_count, gro_vxlan_udp4_tbl_pkt_count, @@ -47,7 +48,7 @@ gro_vxlan6_tcp4_tbl_pkt_count, gro_vxlan6_tcp6_tbl_pkt_count, gro_udp6_tbl_pkt_count, gro_vxlan_udp6_tbl_pkt_count, - NULL}; + gro_vxlan6_udp4_tbl_pkt_count, NULL}; #define IS_IPV4_TCP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ ((ptype & RTE_PTYPE_L4_TCP) == RTE_PTYPE_L4_TCP) && \ @@ -143,6 +144,19 @@ ((ptype & RTE_PTYPE_INNER_L3_MASK) == \ RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN))) +#define IS_IPV6_VXLAN_UDP4_PKT(ptype) (RTE_ETH_IS_IPV6_HDR(ptype) && \ + ((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \ + ((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \ + RTE_PTYPE_TUNNEL_VXLAN) && \ + ((ptype & RTE_PTYPE_INNER_L4_UDP) == \ + RTE_PTYPE_INNER_L4_UDP) && \ + (((ptype & RTE_PTYPE_INNER_L3_MASK) == \ + RTE_PTYPE_INNER_L3_IPV4) || \ + ((ptype & RTE_PTYPE_INNER_L3_MASK) == \ + RTE_PTYPE_INNER_L3_IPV4_EXT) || \ + ((ptype & RTE_PTYPE_INNER_L3_MASK) == \ + RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN))) + /* * GRO context structure. It keeps the table structures, which are * used to merge packets, for different GRO types. Before using @@ -279,6 +293,13 @@ struct gro_ctx { struct gro_vxlan_udp6_item vxlan_udp6_items[RTE_GRO_MAX_BURST_ITEM_NUM] = {{{0}, 0, 0} }; + /* Allocate a reassembly table for IPv6 VXLAN UDP/IPv4 GRO */ + struct gro_vxlan6_udp4_tbl vxlan6_udp4_tbl; + struct gro_vxlan6_udp4_flow + vxlan6_udp4_flows[RTE_GRO_MAX_BURST_ITEM_NUM]; + struct gro_vxlan6_udp4_item + vxlan6_udp4_items[RTE_GRO_MAX_BURST_ITEM_NUM] = {{{0}} }; + struct rte_mbuf *unprocess_pkts[nb_pkts]; uint32_t item_num; int32_t ret; @@ -286,7 +307,8 @@ struct gro_ctx { uint8_t do_tcp4_gro = 0, do_vxlan_tcp_gro = 0, do_udp4_gro = 0, do_vxlan_udp_gro = 0, do_tcp6_gro = 0, do_vxlan_tcp6_gro = 0, do_vxlan6_tcp4_gro = 0, do_vxlan6_tcp6_gro = 0, - do_udp6_gro = 0, do_vxlan_udp6_gro = 0; + do_udp6_gro = 0, do_vxlan_udp6_gro = 0, + do_vxlan6_udp4_gro = 0; if (unlikely((param->gro_types & (RTE_GRO_IPV4_VXLAN_TCP_IPV4 | RTE_GRO_TCP_IPV4 | @@ -297,7 +319,8 @@ struct gro_ctx { RTE_GRO_IPV6_VXLAN_TCP_IPV4 | RTE_GRO_IPV6_VXLAN_TCP_IPV6 | RTE_GRO_UDP_IPV6 | - RTE_GRO_IPV4_VXLAN_UDP_IPV6)) == 0)) + RTE_GRO_IPV4_VXLAN_UDP_IPV6 | + RTE_GRO_IPV6_VXLAN_UDP_IPV4)) == 0)) return nb_pkts; /* Get the maximum number of packets */ @@ -435,6 +458,19 @@ struct gro_ctx { do_vxlan_udp6_gro = 1; } + if (param->gro_types & RTE_GRO_IPV6_VXLAN_UDP_IPV4) { + for (i = 0; i < item_num; i++) + vxlan6_udp4_flows[i].start_index = INVALID_ARRAY_INDEX; + + vxlan6_udp4_tbl.flows = vxlan6_udp4_flows; + vxlan6_udp4_tbl.items = vxlan6_udp4_items; + vxlan6_udp4_tbl.flow_num = 0; + vxlan6_udp4_tbl.item_num = 0; + vxlan6_udp4_tbl.max_flow_num = item_num; + vxlan6_udp4_tbl.max_item_num = item_num; + do_vxlan6_udp4_gro = 1; + } + for (i = 0; i < nb_pkts; i++) { /* * The timestamp is ignored, since all packets @@ -526,6 +562,15 @@ struct gro_ctx { nb_after_gro--; else if (ret < 0) unprocess_pkts[unprocess_num++] = pkts[i]; + } else if (IS_IPV6_VXLAN_UDP4_PKT(pkts[i]->packet_type) && + do_vxlan6_udp4_gro) { + ret = gro_vxlan6_udp4_reassemble(pkts[i], + &vxlan6_udp4_tbl, 0); + if (ret > 0) + /* Merge successfully */ + nb_after_gro--; + else if (ret < 0) + unprocess_pkts[unprocess_num++] = pkts[i]; } else unprocess_pkts[unprocess_num++] = pkts[i]; } @@ -585,6 +630,12 @@ struct gro_ctx { 0, &pkts[i], nb_pkts - i); } + if (do_vxlan6_udp4_gro) { + i += gro_vxlan6_udp4_tbl_timeout_flush(&vxlan6_udp4_tbl, + 0, &pkts[i], nb_pkts - i); + + } + /* Copy unprocessed packets */ if (unprocess_num > 0) { memcpy(&pkts[i], unprocess_pkts, @@ -606,12 +657,13 @@ struct gro_ctx { struct gro_ctx *gro_ctx = ctx; void *tcp_tbl, *udp_tbl, *vxlan_tcp_tbl, *vxlan_udp_tbl, *tcp6_tbl, *vxlan_tcp6_tbl, *vxlan6_tcp4_tbl, *vxlan6_tcp6_tbl, - *udp6_tbl, *vxlan_udp6_tbl; + *udp6_tbl, *vxlan_udp6_tbl, *vxlan6_udp4_tbl; uint64_t current_time; uint16_t i, unprocess_num = 0; uint8_t do_tcp4_gro, do_vxlan_tcp_gro, do_udp4_gro, do_vxlan_udp_gro, do_tcp6_gro, do_vxlan_tcp6_gro, do_vxlan6_tcp4_gro, - do_vxlan6_tcp6_gro, do_udp6_gro, do_vxlan_udp6_gro; + do_vxlan6_tcp6_gro, do_udp6_gro, do_vxlan_udp6_gro, + do_vxlan6_udp4_gro; if (unlikely((gro_ctx->gro_types & (RTE_GRO_IPV4_VXLAN_TCP_IPV4 | RTE_GRO_TCP_IPV4 | @@ -622,7 +674,8 @@ struct gro_ctx { RTE_GRO_IPV6_VXLAN_TCP_IPV4 | RTE_GRO_IPV6_VXLAN_TCP_IPV6 | RTE_GRO_UDP_IPV6 | - RTE_GRO_IPV4_VXLAN_UDP_IPV6)) == 0)) + RTE_GRO_IPV4_VXLAN_UDP_IPV6 | + RTE_GRO_IPV6_VXLAN_UDP_IPV4)) == 0)) return nb_pkts; tcp_tbl = gro_ctx->tbls[RTE_GRO_TCP_IPV4_INDEX]; @@ -635,6 +688,7 @@ struct gro_ctx { vxlan6_tcp6_tbl = gro_ctx->tbls[RTE_GRO_IPV6_VXLAN_TCP_IPV6_INDEX]; udp6_tbl = gro_ctx->tbls[RTE_GRO_UDP_IPV6_INDEX]; vxlan_udp6_tbl = gro_ctx->tbls[RTE_GRO_IPV4_VXLAN_UDP_IPV6_INDEX]; + vxlan6_udp4_tbl = gro_ctx->tbls[RTE_GRO_IPV6_VXLAN_UDP_IPV4_INDEX]; do_tcp4_gro = (gro_ctx->gro_types & RTE_GRO_TCP_IPV4) == RTE_GRO_TCP_IPV4; @@ -656,6 +710,8 @@ struct gro_ctx { RTE_GRO_UDP_IPV6; do_vxlan_udp6_gro = (gro_ctx->gro_types & RTE_GRO_IPV4_VXLAN_UDP_IPV6) == RTE_GRO_IPV4_VXLAN_UDP_IPV6; + do_vxlan6_udp4_gro = (gro_ctx->gro_types & RTE_GRO_IPV6_VXLAN_UDP_IPV4) + == RTE_GRO_IPV6_VXLAN_UDP_IPV4; current_time = rte_rdtsc(); @@ -710,6 +766,11 @@ struct gro_ctx { if (gro_vxlan_udp6_reassemble(pkts[i], vxlan_udp6_tbl, current_time) < 0) unprocess_pkts[unprocess_num++] = pkts[i]; + } else if (IS_IPV6_VXLAN_UDP4_PKT(pkts[i]->packet_type) && + do_vxlan6_udp4_gro) { + if (gro_vxlan6_udp4_reassemble(pkts[i], vxlan6_udp4_tbl, + current_time) < 0) + unprocess_pkts[unprocess_num++] = pkts[i]; } else unprocess_pkts[unprocess_num++] = pkts[i]; } @@ -808,6 +869,13 @@ struct gro_ctx { num += gro_vxlan_udp6_tbl_timeout_flush(gro_ctx->tbls[ RTE_GRO_IPV4_VXLAN_UDP_IPV6_INDEX], flush_timestamp, &out[num], left_nb_out); + left_nb_out = max_nb_out - num; + } + + if ((gro_types & RTE_GRO_IPV6_VXLAN_UDP_IPV4) && left_nb_out > 0) { + num += gro_vxlan6_udp4_tbl_timeout_flush(gro_ctx->tbls[ + RTE_GRO_IPV6_VXLAN_UDP_IPV4_INDEX], + flush_timestamp, &out[num], left_nb_out); } return num; diff --git a/lib/librte_gro/rte_gro.h b/lib/librte_gro/rte_gro.h index 1824ce3..ddcded6 100644 --- a/lib/librte_gro/rte_gro.h +++ b/lib/librte_gro/rte_gro.h @@ -56,6 +56,9 @@ #define RTE_GRO_IPV4_VXLAN_UDP_IPV6_INDEX 9 #define RTE_GRO_IPV4_VXLAN_UDP_IPV6 (1ULL << RTE_GRO_IPV4_VXLAN_UDP_IPV6_INDEX) /**< IPv4 VxLAN UDP/IPv6 GRO flag. */ +#define RTE_GRO_IPV6_VXLAN_UDP_IPV4_INDEX 10 +#define RTE_GRO_IPV6_VXLAN_UDP_IPV4 (1ULL << RTE_GRO_IPV6_VXLAN_UDP_IPV4_INDEX) +/**< IPv6 VxLAN UDP/IPv4 GRO flag. */ /** * Structure used to create GRO context objects or used to pass