From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4DF4B42B21; Tue, 16 May 2023 11:28:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D7061410EE; Tue, 16 May 2023 11:28:31 +0200 (CEST) Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) by mails.dpdk.org (Postfix) with ESMTP id E1C0540C35 for ; Tue, 16 May 2023 11:28:29 +0200 (CEST) Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-55a00da4e53so239930967b3.0 for ; Tue, 16 May 2023 02:28:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684229309; x=1686821309; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=dHJwVkoR/NFHhsZgug1V4CMqax6Bq3fnQssoeSH5vS4=; b=qs5D7e0Dybvr4OT0HYMa7FOvaUS+JeaOiNXek8fGtGqJ6Y1beQ8rEJVjAIY34Q4BSP 20R3s8jqcM2wpR08DoP7HBXb8FciwFxekyjEE8/bbGBZ3nCUdUYv1gag1VXVxaZYiic8 AyxwzVw44KGTVXTbSufNvlwScTe+k6TUN4LXg2+8AO0uUahaTVht89OyCct/PWG/ts0q GtOukbfVelpmoGuygz3ukOaRIGmYXoTUydrPwBzm7Oz/0Uide4jXzwtcp0fh4E4S6EqZ /dqgkXgRtO023ZNOmaQNgeMNZfIZI7xQ04ILQteS6lTjL/AofXf667sP7es7mzLs1MFB MhaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684229309; x=1686821309; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dHJwVkoR/NFHhsZgug1V4CMqax6Bq3fnQssoeSH5vS4=; b=jKYT2d/HcTqOZ+GA/SJocCG7IaTIYfZAg5Hdykc32wAAx8CtcjKmLndo+CSpX5V4SW ZLWjeEgnjADf0wlerJGvMelCd1Q9eAhG6ubIpiu9S6R6ndX9w5ho9ksjBdPooA1YBPda fIntbECGScPahRGmu93PKNI7qcxSUn8C+X13x37ORIKy+CCkhUQKlkH4hNdobnptwAgQ e0IndbzMQ9KLRio5NYV06ZtEkjaj+/YNZwIjgwaWfjI0kAtqviX3P5NPmVSwuJYCVyVO +vtJwUUig7p7Z/+driIF89nLca4dE1pKkgY8HglJjKkgvBG0rAOzydBxGjDzodSbQWno Qn0A== X-Gm-Message-State: AC+VfDxfMtBTi1LQ1YOVQO3SpD1kiaPSmFDrX4vRHo9ZtAwNyeV3Yd1m 8vvLDY2FrIGqZLQiF2Ze+vjnU/sJzbm5Lt0ebzDo+waVy2Q= X-Google-Smtp-Source: ACHHUZ5LRtu/XZt//eodxTWYCzyQ/8+FHWo3X66Jl0sKVek2/uLsKP/QwV5pGxwQu3eGdxDKa8nv4eF8HC/T6lVed0Y= X-Received: by 2002:a81:8205:0:b0:55a:af7d:8e27 with SMTP id s5-20020a818205000000b0055aaf7d8e27mr34899890ywf.25.1684229308971; Tue, 16 May 2023 02:28:28 -0700 (PDT) MIME-Version: 1.0 References: <20221020180717.47036-1-kumaraparmesh92@gmail.com> <20221020181425.48006-1-kumaraparmesh92@gmail.com> In-Reply-To: From: kumaraparameshwaran rathinavel Date: Tue, 16 May 2023 14:58:17 +0530 Message-ID: Subject: Re: [PATCH v2] gro : ipv6 changes to support GRO for TCP/ipv6 To: "Hu, Jiayu" Cc: "dev@dpdk.org" Content-Type: multipart/alternative; boundary="000000000000ae7e4005fbcc312a" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org --000000000000ae7e4005fbcc312a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, May 12, 2023 at 8:17=E2=80=AFAM Hu, Jiayu wrot= e: > Hi Kumar, > > For TCP/IPv4 and TCP/IPv6, the TCP layer is the same and the difference i= s > the IP layer. So the code used for TCP layer needs to be shared among > gro_tcp6.c > and gro_tcp4.c. But there are too much code duplication in gro_tcp4.c an= d > gro_tcp6.c > in current implementation. > > Sure, will do it. I had followed the same that was similar to what was >> done in gro_tcp4.c and gro_vxlan_tcp4.c. Eventhough the TCP could have b= een >> reused for vxlan, we had code duplication. I assumed that this was bette= r >> in terms of performance etc. > > > For example, struct tcp6_flow_key and struct tcp4_flow_key share most of > fields, except > the IP address type. It's better to have a common TCP flow key structure > in gro_tcp.h. In > gro_tcp4.h and gro_tcp6.h, we implement tcp4 and tcp6 flow key structures > with using the > common structure. > Thanks, > Jiayu > > > -----Original Message----- > > From: Kumara Parameshwaran > > Sent: Friday, October 21, 2022 2:14 AM > > To: Hu, Jiayu > > Cc: dev@dpdk.org; Kumara Parameshwaran > > > > Subject: [PATCH v2] gro : ipv6 changes to support GRO for TCP/ipv6 > > > > From: Kumara Parameshwaran > > > > The patch adds GRO support for TCP/ipv6 packets. This does not include > the > > support for vxlan, udp ipv6 packets. > > > > Signed-off-by: Kumara Parameshwaran > > --- > > v1: > > * Changes to support GRO for TCP/ipv6 packets. This does not > > include > > vxlan changes. > > * The GRO is performed only for ipv6 packets that does not contai= n > > extension headers. > > * The logic for the TCP coalescing remains the same, in ipv6 head= er > > the source address, destination address, flow label, version > fields > > are expected to be the same. > > * Re-organised the code to reuse certain tcp functions for both > ipv4 > > and > > ipv6 flows. > > v2: > > * Fix comments in gro_tcp6.h header file. > > > > lib/gro/gro_tcp.h | 155 ++++++++++++++++ > > lib/gro/gro_tcp4.c | 7 +- > > lib/gro/gro_tcp4.h | 152 +-------------- > > lib/gro/gro_tcp6.c | 387 > > +++++++++++++++++++++++++++++++++++++++ > > lib/gro/gro_tcp6.h | 150 +++++++++++++++ > > lib/gro/gro_vxlan_tcp4.c | 3 +- > > lib/gro/gro_vxlan_tcp4.h | 3 +- > > lib/gro/meson.build | 1 + > > lib/gro/rte_gro.c | 83 +++++++-- > > lib/gro/rte_gro.h | 3 + > > 10 files changed, 774 insertions(+), 170 deletions(-) create mode > 100644 > > lib/gro/gro_tcp.h create mode 100644 lib/gro/gro_tcp6.c create mode > > 100644 lib/gro/gro_tcp6.h > > > > diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h new file mode 100644 > index > > 0000000000..c5d248a022 > > --- /dev/null > > +++ b/lib/gro/gro_tcp.h > > @@ -0,0 +1,155 @@ > > +#ifndef _GRO_TCP_H_ > > +#define _GRO_TCP_H_ > > + > > +#include > > + > > +/* > > + * The max length of a IPv4 packet, which includes the length of the L= 3 > > + * header, the L4 header and the data payload. > > + */ > > +#define MAX_IP_PKT_LENGTH UINT16_MAX > > + > > +/* The maximum TCP header length */ > > +#define MAX_TCP_HLEN 60 > > +#define INVALID_TCP_HDRLEN(len) \ > > + (((len) < sizeof(struct rte_tcp_hdr)) || ((len) > MAX_TCP_HLEN)) > > + > > +struct gro_tcp_item { > > + /* > > + * The first MBUF segment of the packet. If the value > > + * is NULL, it means the item is empty. > > + */ > > + struct rte_mbuf *firstseg; > > + /* The last MBUF segment of the packet */ > > + struct rte_mbuf *lastseg; > > + /* > > + * The time when the first packet is inserted into the table. > > + * This value won't be updated, even if the packet is merged > > + * with other packets. > > + */ > > + uint64_t start_time; > > + /* > > + * next_pkt_idx is used to chain the packets that > > + * are in the same flow but can't be merged together > > + * (e.g. caused by packet reordering). > > + */ > > + uint32_t next_pkt_idx; > > + /* TCP sequence number of the packet */ > > + uint32_t sent_seq; > > + /* IPv4 ID of the packet */ > > + uint16_t ip_id; > > + /* the number of merged packets */ > > + uint16_t nb_merged; > > + /* Indicate if IPv4 ID can be ignored */ > > + uint8_t is_atomic; > > +}; > > + > > +/* > > + * Merge two TCP packets without updating checksums. > > + * If cmp is larger than 0, append the new packet to the > > + * original packet. Otherwise, pre-pend the new packet to > > + * the original packet. > > + */ > > +static inline int > > +merge_two_tcp_packets(struct gro_tcp_item *item, > > + struct rte_mbuf *pkt, > > + int cmp, > > + uint32_t sent_seq, > > + uint16_t ip_id, > > + uint16_t l2_offset) > > +{ > > + struct rte_mbuf *pkt_head, *pkt_tail, *lastseg; > > + uint16_t hdr_len, l2_len; > > + > > + if (cmp > 0) { > > + pkt_head =3D item->firstseg; > > + pkt_tail =3D pkt; > > + } else { > > + pkt_head =3D pkt; > > + pkt_tail =3D item->firstseg; > > + } > > + > > + /* check if the IPv4 packet length is greater than the max value = */ > > + hdr_len =3D l2_offset + pkt_head->l2_len + pkt_head->l3_len + > > + pkt_head->l4_len; > > + l2_len =3D l2_offset > 0 ? pkt_head->outer_l2_len : pkt_head->l2_= len; > > + if (unlikely(pkt_head->pkt_len - l2_len + pkt_tail->pkt_len - > > + hdr_len > MAX_IP_PKT_LENGTH)) > > + return 0; > > + > > + /* remove the packet header for the tail packet */ > > + rte_pktmbuf_adj(pkt_tail, hdr_len); > > + > > + /* chain two packets together */ > > + if (cmp > 0) { > > + item->lastseg->next =3D pkt; > > + item->lastseg =3D rte_pktmbuf_lastseg(pkt); > > + /* update IP ID to the larger value */ > > + item->ip_id =3D ip_id; > > + } else { > > + lastseg =3D rte_pktmbuf_lastseg(pkt); > > + lastseg->next =3D item->firstseg; > > + item->firstseg =3D pkt; > > + /* update sent_seq to the smaller value */ > > + item->sent_seq =3D sent_seq; > > + item->ip_id =3D ip_id; > > + } > > + item->nb_merged++; > > + > > + /* update MBUF metadata for the merged packet */ > > + pkt_head->nb_segs +=3D pkt_tail->nb_segs; > > + pkt_head->pkt_len +=3D pkt_tail->pkt_len; > > + > > + return 1; > > +} > > + > > +/* > > + * Check if two TCP/IPv4 packets are neighbors. > > + */ > > +static inline int > > +check_seq_option(struct gro_tcp_item *item, > > + struct rte_tcp_hdr *tcph, > > + uint32_t sent_seq, > > + uint16_t ip_id, > > + uint16_t tcp_hl, > > + uint16_t tcp_dl, > > + uint16_t l2_offset, > > + uint8_t is_atomic) > > +{ > > + struct rte_mbuf *pkt_orig =3D item->firstseg; > > + char *iph_orig; > > + struct rte_tcp_hdr *tcph_orig; > > + uint16_t len, tcp_hl_orig; > > + > > + iph_orig =3D (char *)(rte_pktmbuf_mtod(pkt_orig, char *) + > > + l2_offset + pkt_orig->l2_len); > > + tcph_orig =3D (struct rte_tcp_hdr *)(iph_orig + pkt_orig->l3_len)= ; > > + tcp_hl_orig =3D pkt_orig->l4_len; > > + > > + /* Check if TCP option fields equal */ > > + len =3D RTE_MAX(tcp_hl, tcp_hl_orig) - sizeof(struct rte_tcp_hdr)= ; > > + if ((tcp_hl !=3D tcp_hl_orig) || ((len > 0) && > > + (memcmp(tcph + 1, tcph_orig + 1, > > + len) !=3D 0))) > > + return 0; > > + > > + /* Don't merge packets whose DF bits are different */ > > + if (unlikely(item->is_atomic ^ is_atomic)) > > + return 0; > > + > > + /* check if the two packets are neighbors */ > > + len =3D pkt_orig->pkt_len - l2_offset - pkt_orig->l2_len - > > + pkt_orig->l3_len - tcp_hl_orig; > > + if ((sent_seq =3D=3D item->sent_seq + len) && (is_atomic || > > + (ip_id =3D=3D item->ip_id + 1))) > > + /* append the new packet */ > > + return 1; > > + else if ((sent_seq + tcp_dl =3D=3D item->sent_seq) && (is_atomic = || > > + (ip_id + item->nb_merged =3D=3D item->ip_= id))) > > + /* pre-pend the new packet */ > > + return -1; > > + > > + return 0; > > +} > > + > > +#endif > > diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c index > > 8f5e800250..eea2a72ecd 100644 > > --- a/lib/gro/gro_tcp4.c > > +++ b/lib/gro/gro_tcp4.c > > @@ -7,6 +7,7 @@ > > #include > > > > #include "gro_tcp4.h" > > +#include "gro_tcp.h" > > > > void * > > gro_tcp4_tbl_create(uint16_t socket_id, @@ -30,7 +31,7 @@ > > gro_tcp4_tbl_create(uint16_t socket_id, > > if (tbl =3D=3D NULL) > > return NULL; > > > > - size =3D sizeof(struct gro_tcp4_item) * entries_num; > > + size =3D sizeof(struct gro_tcp_item) * entries_num; > > tbl->items =3D rte_zmalloc_socket(__func__, > > size, > > RTE_CACHE_LINE_SIZE, > > @@ -177,7 +178,7 @@ insert_new_flow(struct gro_tcp4_tbl *tbl, > > * update the packet length for the flushed packet. > > */ > > static inline void > > -update_header(struct gro_tcp4_item *item) > > +update_header(struct gro_tcp_item *item) > > { > > struct rte_ipv4_hdr *ipv4_hdr; > > struct rte_mbuf *pkt =3D item->firstseg; @@ -302,7 +303,7 @@ > > gro_tcp4_reassemble(struct rte_mbuf *pkt, > > sent_seq, ip_id, pkt->l4_len, tcp_dl, 0, > > is_atomic); > > if (cmp) { > > - if (merge_two_tcp4_packets(&(tbl->items[cur_idx])= , > > + if (merge_two_tcp_packets(&(tbl->items[cur_idx]), > > pkt, cmp, sent_seq, ip_id= , > 0)) > > return 1; > > /* > > diff --git a/lib/gro/gro_tcp4.h b/lib/gro/gro_tcp4.h index > > 212f97a042..634a215b98 100644 > > --- a/lib/gro/gro_tcp4.h > > +++ b/lib/gro/gro_tcp4.h > > @@ -5,22 +5,9 @@ > > #ifndef _GRO_TCP4_H_ > > #define _GRO_TCP4_H_ > > > > -#include > > - > > #define INVALID_ARRAY_INDEX 0xffffffffUL #define > > GRO_TCP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL) > > > > -/* > > - * The max length of a IPv4 packet, which includes the length of the L= 3 > > - * header, the L4 header and the data payload. > > - */ > > -#define MAX_IPV4_PKT_LENGTH UINT16_MAX > > - > > -/* The maximum TCP header length */ > > -#define MAX_TCP_HLEN 60 > > -#define INVALID_TCP_HDRLEN(len) \ > > - (((len) < sizeof(struct rte_tcp_hdr)) || ((len) > MAX_TCP_HLEN)) > > - > > /* Header fields representing a TCP/IPv4 flow */ struct tcp4_flow_key= { > > struct rte_ether_addr eth_saddr; > > @@ -42,42 +29,12 @@ struct gro_tcp4_flow { > > uint32_t start_index; > > }; > > > > -struct gro_tcp4_item { > > - /* > > - * The first MBUF segment of the packet. If the value > > - * is NULL, it means the item is empty. > > - */ > > - struct rte_mbuf *firstseg; > > - /* The last MBUF segment of the packet */ > > - struct rte_mbuf *lastseg; > > - /* > > - * The time when the first packet is inserted into the table. > > - * This value won't be updated, even if the packet is merged > > - * with other packets. > > - */ > > - uint64_t start_time; > > - /* > > - * next_pkt_idx is used to chain the packets that > > - * are in the same flow but can't be merged together > > - * (e.g. caused by packet reordering). > > - */ > > - uint32_t next_pkt_idx; > > - /* TCP sequence number of the packet */ > > - uint32_t sent_seq; > > - /* IPv4 ID of the packet */ > > - uint16_t ip_id; > > - /* the number of merged packets */ > > - uint16_t nb_merged; > > - /* Indicate if IPv4 ID can be ignored */ > > - uint8_t is_atomic; > > -}; > > - > > /* > > * TCP/IPv4 reassembly table structure. > > */ > > struct gro_tcp4_tbl { > > /* item array */ > > - struct gro_tcp4_item *items; > > + struct gro_tcp_item *items; > > /* flow array */ > > struct gro_tcp4_flow *flows; > > /* current item number */ > > @@ -195,111 +152,4 @@ is_same_tcp4_flow(struct tcp4_flow_key k1, struct > > tcp4_flow_key k2) > > (k1.dst_port =3D=3D k2.dst_port)); > > } > > > > -/* > > - * Merge two TCP/IPv4 packets without updating checksums. > > - * If cmp is larger than 0, append the new packet to the > > - * original packet. Otherwise, pre-pend the new packet to > > - * the original packet. > > - */ > > -static inline int > > -merge_two_tcp4_packets(struct gro_tcp4_item *item, > > - struct rte_mbuf *pkt, > > - int cmp, > > - uint32_t sent_seq, > > - uint16_t ip_id, > > - uint16_t l2_offset) > > -{ > > - struct rte_mbuf *pkt_head, *pkt_tail, *lastseg; > > - uint16_t hdr_len, l2_len; > > - > > - if (cmp > 0) { > > - pkt_head =3D item->firstseg; > > - pkt_tail =3D pkt; > > - } else { > > - pkt_head =3D pkt; > > - pkt_tail =3D item->firstseg; > > - } > > - > > - /* check if the IPv4 packet length is greater than the max value = */ > > - hdr_len =3D l2_offset + pkt_head->l2_len + pkt_head->l3_len + > > - pkt_head->l4_len; > > - l2_len =3D l2_offset > 0 ? pkt_head->outer_l2_len : pkt_head->l2_= len; > > - if (unlikely(pkt_head->pkt_len - l2_len + pkt_tail->pkt_len - > > - hdr_len > MAX_IPV4_PKT_LENGTH)) > > - return 0; > > - > > - /* remove the packet header for the tail packet */ > > - rte_pktmbuf_adj(pkt_tail, hdr_len); > > - > > - /* chain two packets together */ > > - if (cmp > 0) { > > - item->lastseg->next =3D pkt; > > - item->lastseg =3D rte_pktmbuf_lastseg(pkt); > > - /* update IP ID to the larger value */ > > - item->ip_id =3D ip_id; > > - } else { > > - lastseg =3D rte_pktmbuf_lastseg(pkt); > > - lastseg->next =3D item->firstseg; > > - item->firstseg =3D pkt; > > - /* update sent_seq to the smaller value */ > > - item->sent_seq =3D sent_seq; > > - item->ip_id =3D ip_id; > > - } > > - item->nb_merged++; > > - > > - /* update MBUF metadata for the merged packet */ > > - pkt_head->nb_segs +=3D pkt_tail->nb_segs; > > - pkt_head->pkt_len +=3D pkt_tail->pkt_len; > > - > > - return 1; > > -} > > - > > -/* > > - * Check if two TCP/IPv4 packets are neighbors. > > - */ > > -static inline int > > -check_seq_option(struct gro_tcp4_item *item, > > - struct rte_tcp_hdr *tcph, > > - uint32_t sent_seq, > > - uint16_t ip_id, > > - uint16_t tcp_hl, > > - uint16_t tcp_dl, > > - uint16_t l2_offset, > > - uint8_t is_atomic) > > -{ > > - struct rte_mbuf *pkt_orig =3D item->firstseg; > > - struct rte_ipv4_hdr *iph_orig; > > - struct rte_tcp_hdr *tcph_orig; > > - uint16_t len, tcp_hl_orig; > > - > > - iph_orig =3D (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkt_orig, c= har > > *) + > > - l2_offset + pkt_orig->l2_len); > > - tcph_orig =3D (struct rte_tcp_hdr *)((char *)iph_orig + pkt_orig- > > >l3_len); > > - tcp_hl_orig =3D pkt_orig->l4_len; > > - > > - /* Check if TCP option fields equal */ > > - len =3D RTE_MAX(tcp_hl, tcp_hl_orig) - sizeof(struct rte_tcp_hdr)= ; > > - if ((tcp_hl !=3D tcp_hl_orig) || ((len > 0) && > > - (memcmp(tcph + 1, tcph_orig + 1, > > - len) !=3D 0))) > > - return 0; > > - > > - /* Don't merge packets whose DF bits are different */ > > - if (unlikely(item->is_atomic ^ is_atomic)) > > - return 0; > > - > > - /* check if the two packets are neighbors */ > > - len =3D pkt_orig->pkt_len - l2_offset - pkt_orig->l2_len - > > - pkt_orig->l3_len - tcp_hl_orig; > > - if ((sent_seq =3D=3D item->sent_seq + len) && (is_atomic || > > - (ip_id =3D=3D item->ip_id + 1))) > > - /* append the new packet */ > > - return 1; > > - else if ((sent_seq + tcp_dl =3D=3D item->sent_seq) && (is_atomic = || > > - (ip_id + item->nb_merged =3D=3D item->ip_= id))) > > - /* pre-pend the new packet */ > > - return -1; > > - > > - return 0; > > -} > > #endif > > diff --git a/lib/gro/gro_tcp6.c b/lib/gro/gro_tcp6.c new file mode 1006= 44 > > index 0000000000..a37d8e2512 > > --- /dev/null > > +++ b/lib/gro/gro_tcp6.c > > @@ -0,0 +1,387 @@ > > +/* SPDX-License-Identifier: BSD-3-Clause > > + * Copyright(c) 2017 Intel Corporation > > + */ > > + > > +#include > > +#include > > +#include > > + > > +#include "gro_tcp6.h" > > +#include "gro_tcp.h" > > + > > +void * > > +gro_tcp6_tbl_create(uint16_t socket_id, > > + uint16_t max_flow_num, > > + uint16_t max_item_per_flow) > > +{ > > + struct gro_tcp6_tbl *tbl; > > + size_t size; > > + uint32_t entries_num, i; > > + > > + entries_num =3D max_flow_num * max_item_per_flow; > > + entries_num =3D RTE_MIN(entries_num, > > GRO_TCP6_TBL_MAX_ITEM_NUM); > > + > > + if (entries_num =3D=3D 0) > > + return NULL; > > + > > + tbl =3D rte_zmalloc_socket(__func__, > > + sizeof(struct gro_tcp6_tbl), > > + RTE_CACHE_LINE_SIZE, > > + socket_id); > > + if (tbl =3D=3D NULL) > > + return NULL; > > + > > + size =3D sizeof(struct gro_tcp_item) * entries_num; > > + tbl->items =3D rte_zmalloc_socket(__func__, > > + size, > > + RTE_CACHE_LINE_SIZE, > > + socket_id); > > + if (tbl->items =3D=3D NULL) { > > + rte_free(tbl); > > + return NULL; > > + } > > + tbl->max_item_num =3D entries_num; > > + > > + size =3D sizeof(struct gro_tcp6_flow) * entries_num; > > + tbl->flows =3D rte_zmalloc_socket(__func__, > > + size, > > + RTE_CACHE_LINE_SIZE, > > + socket_id); > > + if (tbl->flows =3D=3D NULL) { > > + rte_free(tbl->items); > > + rte_free(tbl); > > + return NULL; > > + } > > + /* INVALID_ARRAY_INDEX indicates an empty flow */ > > + for (i =3D 0; i < entries_num; i++) > > + tbl->flows[i].start_index =3D INVALID_ARRAY_INDEX; > > + tbl->max_flow_num =3D entries_num; > > + > > + return tbl; > > +} > > + > > +void > > +gro_tcp6_tbl_destroy(void *tbl) > > +{ > > + struct gro_tcp6_tbl *tcp_tbl =3D tbl; > > + > > + if (tcp_tbl) { > > + rte_free(tcp_tbl->items); > > + rte_free(tcp_tbl->flows); > > + } > > + rte_free(tcp_tbl); > > +} > > + > > +static inline uint32_t > > +find_an_empty_item(struct gro_tcp6_tbl *tbl) { > > + uint32_t i; > > + uint32_t max_item_num =3D tbl->max_item_num; > > + > > + for (i =3D 0; i < max_item_num; i++) > > + if (tbl->items[i].firstseg =3D=3D NULL) > > + return i; > > + return INVALID_ARRAY_INDEX; > > +} > > + > > +static inline uint32_t > > +find_an_empty_flow(struct gro_tcp6_tbl *tbl) { > > + uint32_t i; > > + uint32_t max_flow_num =3D tbl->max_flow_num; > > + > > + for (i =3D 0; i < max_flow_num; i++) > > + if (tbl->flows[i].start_index =3D=3D INVALID_ARRAY_INDEX) > > + return i; > > + return INVALID_ARRAY_INDEX; > > +} > > + > > +static inline uint32_t > > +insert_new_item(struct gro_tcp6_tbl *tbl, > > + struct rte_mbuf *pkt, > > + uint64_t start_time, > > + uint32_t prev_idx, > > + uint32_t sent_seq, > > + uint8_t is_atomic) > > +{ > > + uint32_t item_idx; > > + > > + item_idx =3D find_an_empty_item(tbl); > > + if (item_idx =3D=3D INVALID_ARRAY_INDEX) > > + return INVALID_ARRAY_INDEX; > > + > > + tbl->items[item_idx].firstseg =3D pkt; > > + tbl->items[item_idx].lastseg =3D rte_pktmbuf_lastseg(pkt); > > + tbl->items[item_idx].start_time =3D start_time; > > + tbl->items[item_idx].next_pkt_idx =3D INVALID_ARRAY_INDEX; > > + tbl->items[item_idx].sent_seq =3D sent_seq; > > + tbl->items[item_idx].nb_merged =3D 1; > > + tbl->items[item_idx].is_atomic =3D is_atomic; > > + tbl->item_num++; > > + > > + /* if the previous packet exists, chain them together. */ > > + if (prev_idx !=3D INVALID_ARRAY_INDEX) { > > + tbl->items[item_idx].next_pkt_idx =3D > > + tbl->items[prev_idx].next_pkt_idx; > > + tbl->items[prev_idx].next_pkt_idx =3D item_idx; > > + } > > + > > + return item_idx; > > +} > > + > > +static inline uint32_t > > +delete_item(struct gro_tcp6_tbl *tbl, uint32_t item_idx, > > + uint32_t prev_item_idx) > > +{ > > + uint32_t next_idx =3D tbl->items[item_idx].next_pkt_idx; > > + > > + /* NULL indicates an empty item */ > > + tbl->items[item_idx].firstseg =3D NULL; > > + tbl->item_num--; > > + if (prev_item_idx !=3D INVALID_ARRAY_INDEX) > > + tbl->items[prev_item_idx].next_pkt_idx =3D next_idx; > > + > > + return next_idx; > > +} > > + > > +static inline uint32_t > > +insert_new_flow(struct gro_tcp6_tbl *tbl, > > + struct tcp6_flow_key *src, > > + rte_be32_t vtc_flow, > > + uint32_t item_idx) > > +{ > > + struct tcp6_flow_key *dst; > > + uint32_t flow_idx; > > + > > + flow_idx =3D find_an_empty_flow(tbl); > > + if (unlikely(flow_idx =3D=3D INVALID_ARRAY_INDEX)) > > + return INVALID_ARRAY_INDEX; > > + > > + dst =3D &(tbl->flows[flow_idx].key); > > + > > + rte_ether_addr_copy(&(src->eth_saddr), &(dst->eth_saddr)); > > + rte_ether_addr_copy(&(src->eth_daddr), &(dst->eth_daddr)); > > + memcpy(&dst->src_addr[0], &src->src_addr[0], sizeof(dst- > > >src_addr)); > > + memcpy(&dst->dst_addr[0], &src->dst_addr[0], sizeof(dst- > > >dst_addr)); > > + dst->recv_ack =3D src->recv_ack; > > + dst->src_port =3D src->src_port; > > + dst->dst_port =3D src->dst_port; > > + > > + tbl->flows[flow_idx].start_index =3D item_idx; > > + tbl->flow_num++; > > + tbl->flows->vtc_flow =3D vtc_flow; > > + > > + return flow_idx; > > +} > > + > > +/* > > + * update the packet length for the flushed packet. > > + */ > > +static inline void > > +update_header(struct gro_tcp_item *item) { > > + struct rte_ipv6_hdr *ipv6_hdr; > > + struct rte_mbuf *pkt =3D item->firstseg; > > + > > + ipv6_hdr =3D (struct rte_ipv6_hdr *)(rte_pktmbuf_mtod(pkt, char *= ) + > > + pkt->l2_len); > > + ipv6_hdr->payload_len =3D rte_cpu_to_be_16(pkt->pkt_len - > > + pkt->l2_len - pkt->l3_len); > > +} > > + > > +int32_t > > +gro_tcp6_reassemble(struct rte_mbuf *pkt, > > + struct gro_tcp6_tbl *tbl, > > + uint64_t start_time) > > +{ > > + struct rte_ether_hdr *eth_hdr; > > + struct rte_ipv6_hdr *ipv6_hdr; > > + struct rte_tcp_hdr *tcp_hdr; > > + uint32_t sent_seq; > > + int32_t tcp_dl; > > + uint16_t ip_tlen; > > + struct tcp6_flow_key key; > > + uint32_t cur_idx, prev_idx, item_idx; > > + uint32_t i, max_flow_num, remaining_flow_num; > > + int cmp; > > + uint8_t find; > > + rte_be32_t vtc_flow_diff; > > + > > + /* > > + * Don't process the packet whose TCP header length is greater > > + * than 60 bytes or less than 20 bytes. > > + */ > > + if (unlikely(INVALID_TCP_HDRLEN(pkt->l4_len))) > > + return -1; > > + > > + eth_hdr =3D rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); > > + ipv6_hdr =3D (struct rte_ipv6_hdr *)((char *)eth_hdr + pkt->l2_le= n); > > + tcp_hdr =3D (struct rte_tcp_hdr *)((char *)ipv6_hdr + pkt->l3_len= ); > > + > > + /* > > + * Don't process the packet which has FIN, SYN, RST, PSH, URG, EC= E > > + * or CWR set. > > + */ > > + if (tcp_hdr->tcp_flags !=3D RTE_TCP_ACK_FLAG) > > + return -1; > > + > > + ip_tlen =3D rte_be_to_cpu_16(ipv6_hdr->payload_len); > > + /* > > + * Trim the tail padding bytes. The IPv6 header is fixed to > > + * 40 bytes unlike IPv4 that is variable. The length in the IPv6 > header > > + * contains only length of TCP Header + TCP Payload, whereas IPv4 > > header contains > > + * length of IP Header + TCP Header + TCP Payload > > + */ > > + if (pkt->pkt_len > (uint32_t)(ip_tlen + pkt->l2_len + pkt->l3_len= )) > > + rte_pktmbuf_trim(pkt, pkt->pkt_len - ip_tlen - pkt->l2_le= n > - > > pkt->l3_len); > > + /* > > + * Don't process the packet whose payload length is less than or > > + * equal to 0. > > + */ > > + tcp_dl =3D ip_tlen - pkt->l4_len; > > + if (tcp_dl <=3D 0) > > + return -1; > > + > > + sent_seq =3D rte_be_to_cpu_32(tcp_hdr->sent_seq); > > + > > + rte_ether_addr_copy(&(eth_hdr->src_addr), &(key.eth_saddr)); > > + rte_ether_addr_copy(&(eth_hdr->dst_addr), &(key.eth_daddr)); > > + memcpy(&key.src_addr[0], &ipv6_hdr->src_addr, > > sizeof(key.src_addr)); > > + memcpy(&key.dst_addr[0], &ipv6_hdr->dst_addr, > > sizeof(key.dst_addr)); > > + key.src_port =3D tcp_hdr->src_port; > > + key.dst_port =3D tcp_hdr->dst_port; > > + key.recv_ack =3D tcp_hdr->recv_ack; > > + > > + /* Search for a matched flow. */ > > + max_flow_num =3D tbl->max_flow_num; > > + remaining_flow_num =3D tbl->flow_num; > > + find =3D 0; > > + for (i =3D 0; i < max_flow_num && remaining_flow_num; i++) { > > + if (tbl->flows[i].start_index !=3D INVALID_ARRAY_INDEX) { > > + if (is_same_tcp6_flow(tbl->flows[i].key, key)) { > > + /* > > + * IP version (4) Traffic Class (8) Flow > Label (20) > > + * All fields except Traffic class should > be > > same > > + */ > > + vtc_flow_diff =3D (ipv6_hdr->vtc_flow ^ t= bl- > > >flows->vtc_flow); > > + if (vtc_flow_diff & htonl(0xF00FFFFF)) > > + continue; > > + find =3D 1; > > + break; > > + } > > + remaining_flow_num--; > > + } > > + } > > + > > + /* > > + * Fail to find a matched flow. Insert a new flow and store the > > + * packet into the flow. > > + */ > > + if (find =3D=3D 0) { > > + item_idx =3D insert_new_item(tbl, pkt, start_time, > > + INVALID_ARRAY_INDEX, sent_seq, true); > > + if (item_idx =3D=3D INVALID_ARRAY_INDEX) > > + return -1; > > + if (insert_new_flow(tbl, &key, ipv6_hdr->vtc_flow, > item_idx) > > =3D=3D > > + INVALID_ARRAY_INDEX) { > > + /* > > + * Fail to insert a new flow, so delete the > > + * stored 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 for > > + * the input packet. > > + */ > > + cur_idx =3D tbl->flows[i].start_index; > > + prev_idx =3D cur_idx; > > + do { > > + cmp =3D check_seq_option(&(tbl->items[cur_idx]), tcp_hdr, > > + sent_seq, 0, pkt->l4_len, tcp_dl, 0, > > + true); > > + if (cmp) { > > + if (merge_two_tcp_packets(&(tbl->items[cur_idx]), > > + pkt, cmp, sent_seq, 0, 0)= ) > { > > + return 1; > > + } > > + > > + /* > > + * Fail to merge the two packets, as the packet > > + * length is greater than the max value. Store > > + * the packet into the flow. > > + */ > > + if (insert_new_item(tbl, pkt, start_time, cur_idx= , > > + sent_seq, true) =3D=3D > > + INVALID_ARRAY_INDEX) > > + return -1; > > + return 0; > > + } > > + prev_idx =3D cur_idx; > > + cur_idx =3D tbl->items[cur_idx].next_pkt_idx; > > + } while (cur_idx !=3D INVALID_ARRAY_INDEX); > > + > > + /* Fail to find a neighbor, so store the packet into the flow. */ > > + if (insert_new_item(tbl, pkt, start_time, prev_idx, sent_seq, > > + true) =3D=3D INVALID_ARRAY_INDEX) > > + return -1; > > + > > + return 0; > > +} > > + > > +uint16_t > > +gro_tcp6_tbl_timeout_flush(struct gro_tcp6_tbl *tbl, > > + uint64_t flush_timestamp, > > + struct rte_mbuf **out, > > + uint16_t nb_out) > > +{ > > + uint16_t k =3D 0; > > + uint32_t i, j; > > + uint32_t max_flow_num =3D tbl->max_flow_num; > > + > > + for (i =3D 0; i < max_flow_num; i++) { > > + if (unlikely(tbl->flow_num =3D=3D 0)) > > + return k; > > + > > + j =3D tbl->flows[i].start_index; > > + while (j !=3D INVALID_ARRAY_INDEX) { > > + if (tbl->items[j].start_time <=3D flush_timestamp= ) { > > + out[k++] =3D tbl->items[j].firstseg; > > + if (tbl->items[j].nb_merged > 1) > > + update_header(&(tbl->items[j])); > > + /* > > + * Delete the packet and get the next > > + * packet in the flow. > > + */ > > + j =3D delete_item(tbl, j, > > INVALID_ARRAY_INDEX); > > + tbl->flows[i].start_index =3D j; > > + if (j =3D=3D INVALID_ARRAY_INDEX) > > + tbl->flow_num--; > > + > > + if (unlikely(k =3D=3D nb_out)) > > + return k; > > + } else > > + /* > > + * The left packets in this flow won't be > > + * timeout. Go to check other flows. > > + */ > > + break; > > + } > > + } > > + return k; > > +} > > + > > +uint32_t > > +gro_tcp6_tbl_pkt_count(void *tbl) > > +{ > > + struct gro_tcp6_tbl *gro_tbl =3D tbl; > > + > > + if (gro_tbl) > > + return gro_tbl->item_num; > > + > > + return 0; > > +} > > diff --git a/lib/gro/gro_tcp6.h b/lib/gro/gro_tcp6.h new file mode 1006= 44 > > index 0000000000..91325c0da2 > > --- /dev/null > > +++ b/lib/gro/gro_tcp6.h > > @@ -0,0 +1,150 @@ > > +/* SPDX-License-Identifier: BSD-3-Clause > > + * Copyright(c) 2017 Intel Corporation > > + */ > > + > > +#ifndef _GRO_TCP6_H_ > > +#define _GRO_TCP6_H_ > > + > > +#define INVALID_ARRAY_INDEX 0xffffffffUL #define > > +GRO_TCP6_TBL_MAX_ITEM_NUM (1024UL * 1024UL) > > + > > +/* Header fields representing a TCP/IPv6 flow */ struct tcp6_flow_key = { > > + struct rte_ether_addr eth_saddr; > > + struct rte_ether_addr eth_daddr; > > + uint8_t src_addr[16]; > > + uint8_t dst_addr[16]; > > + > > + uint32_t recv_ack; > > + uint16_t src_port; > > + uint16_t dst_port; > > +}; > > + > > +struct gro_tcp6_flow { > > + struct tcp6_flow_key key; > > + rte_be32_t vtc_flow; > > + /* > > + * The index of the first packet in the flow. > > + * INVALID_ARRAY_INDEX indicates an empty flow. > > + */ > > + uint32_t start_index; > > +}; > > + > > +/* > > + * TCP/IPv6 reassembly table structure. > > + */ > > +struct gro_tcp6_tbl { > > + /* item array */ > > + struct gro_tcp_item *items; > > + /* flow array */ > > + struct gro_tcp6_flow *flows; > > + /* current item number */ > > + uint32_t item_num; > > + /* current flow num */ > > + uint32_t flow_num; > > + /* item array size */ > > + uint32_t max_item_num; > > + /* flow array size */ > > + uint32_t max_flow_num; > > +}; > > + > > +/** > > + * This function creates a TCP/IPv6 reassembly table. > > + * > > + * @param socket_id > > + * Socket index for allocating the TCP/IPv6 reassemble table > > + * @param max_flow_num > > + * The maximum number of flows in the TCP/IPv6 GRO 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_tcp6_tbl_create(uint16_t socket_id, > > + uint16_t max_flow_num, > > + uint16_t max_item_per_flow); > > + > > +/** > > + * This function destroys a TCP/IPv6 reassembly table. > > + * > > + * @param tbl > > + * Pointer pointing to the TCP/IPv6 reassembly table. > > + */ > > +void gro_tcp6_tbl_destroy(void *tbl); > > + > > +/** > > + * This function merges a TCP/IPv6 packet. It doesn't process the > > +packet, > > + * which has SYN, FIN, RST, PSH, CWR, ECE or URG set, or doesn't have > > + * payload. > > + * > > + * This function doesn't check if the packet has correct checksums and > > + * doesn't re-calculate checksums for the merged packet. Additionally, > > + * it assumes the packets are complete (i.e., MF=3D=3D0 && frag_off=3D= =3D0), > > + * when IP fragmentation is possible (i.e., DF=3D=3D0). It returns the > > + * packet, if the packet has invalid parameters (e.g. SYN bit is set) > > + * or there is no available space in the table. > > + * > > + * @param pkt > > + * Packet to reassemble > > + * @param tbl > > + * Pointer pointing to the TCP/IPv6 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_tcp6_reassemble(struct rte_mbuf *pkt, > > + struct gro_tcp6_tbl *tbl, > > + uint64_t start_time); > > + > > +/** > > + * This function flushes timeout packets in a TCP/IPv6 reassembly > > +table, > > + * and without updating checksums. > > + * > > + * @param tbl > > + * TCP/IPv6 reassembly table pointer > > + * @param flush_timestamp > > + * Flush 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_tcp6_tbl_timeout_flush(struct gro_tcp6_tbl *tbl, > > + uint64_t flush_timestamp, > > + struct rte_mbuf **out, > > + uint16_t nb_out); > > + > > +/** > > + * This function returns the number of the packets in a TCP/IPv6 > > + * reassembly table. > > + * > > + * @param tbl > > + * TCP/IPv6 reassembly table pointer > > + * > > + * @return > > + * The number of packets in the table > > + */ > > +uint32_t gro_tcp6_tbl_pkt_count(void *tbl); > > + > > +/* > > + * Check if two TCP/IPv6 packets belong to the same flow. > > + */ > > +static inline int > > +is_same_tcp6_flow(struct tcp6_flow_key k1, struct tcp6_flow_key k2) { > > + return (!memcmp(&k1, &k2, sizeof(struct tcp6_flow_key))); } > > + > > +#endif > > diff --git a/lib/gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c index > > 3be4deb7c7..56b30b8c98 100644 > > --- a/lib/gro/gro_vxlan_tcp4.c > > +++ b/lib/gro/gro_vxlan_tcp4.c > > @@ -7,6 +7,7 @@ > > #include > > #include > > > > +#include "gro_tcp.h" > > #include "gro_vxlan_tcp4.h" > > > > void * > > @@ -248,7 +249,7 @@ merge_two_vxlan_tcp4_packets(struct > > gro_vxlan_tcp4_item *item, > > uint16_t outer_ip_id, > > uint16_t ip_id) > > { > > - if (merge_two_tcp4_packets(&item->inner_item, pkt, cmp, > > sent_seq, > > + if (merge_two_tcp_packets(&item->inner_item, pkt, cmp, sent_seq, > > ip_id, pkt->outer_l2_len + > > pkt->outer_l3_len)) { > > /* Update the outer IPv4 ID to the large value. */ diff > --git > > a/lib/gro/gro_vxlan_tcp4.h b/lib/gro/gro_vxlan_tcp4.h index > > 7832942a68..d68d5fcd5b 100644 > > --- a/lib/gro/gro_vxlan_tcp4.h > > +++ b/lib/gro/gro_vxlan_tcp4.h > > @@ -5,6 +5,7 @@ > > #ifndef _GRO_VXLAN_TCP4_H_ > > #define _GRO_VXLAN_TCP4_H_ > > > > +#include "gro_tcp.h" > > #include "gro_tcp4.h" > > > > #define GRO_VXLAN_TCP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL) @@ - > > 36,7 +37,7 @@ struct gro_vxlan_tcp4_flow { }; > > > > struct gro_vxlan_tcp4_item { > > - struct gro_tcp4_item inner_item; > > + struct gro_tcp_item inner_item; > > /* IPv4 ID in the outer IPv4 header */ > > uint16_t outer_ip_id; > > /* Indicate if outer IPv4 ID can be ignored */ diff --git > > a/lib/gro/meson.build b/lib/gro/meson.build index e4fa2958bd..dbce05220= d > > 100644 > > --- a/lib/gro/meson.build > > +++ b/lib/gro/meson.build > > @@ -4,6 +4,7 @@ > > sources =3D files( > > 'rte_gro.c', > > 'gro_tcp4.c', > > + 'gro_tcp6.c', > > 'gro_udp4.c', > > 'gro_vxlan_tcp4.c', > > 'gro_vxlan_udp4.c', > > diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c index > > e35399fd42..d824eebd93 100644 > > --- a/lib/gro/rte_gro.c > > +++ b/lib/gro/rte_gro.c > > @@ -8,6 +8,7 @@ > > > > #include "rte_gro.h" > > #include "gro_tcp4.h" > > +#include "gro_tcp6.h" > > #include "gro_udp4.h" > > #include "gro_vxlan_tcp4.h" > > #include "gro_vxlan_udp4.h" > > @@ -20,14 +21,16 @@ typedef uint32_t (*gro_tbl_pkt_count_fn)(void *tbl)= ; > > > > static gro_tbl_create_fn tbl_create_fn[RTE_GRO_TYPE_MAX_NUM] =3D { > > gro_tcp4_tbl_create, gro_vxlan_tcp4_tbl_create, > > - gro_udp4_tbl_create, gro_vxlan_udp4_tbl_create, NULL}; > > + gro_udp4_tbl_create, gro_vxlan_udp4_tbl_create, > > gro_tcp6_tbl_create, > > +NULL}; > > static gro_tbl_destroy_fn tbl_destroy_fn[RTE_GRO_TYPE_MAX_NUM] =3D { > > gro_tcp4_tbl_destroy, gro_vxlan_tcp4_tbl_destroy, > > gro_udp4_tbl_destroy, gro_vxlan_udp4_tbl_destroy, > > + gro_tcp6_tbl_destroy, > > NULL}; > > static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] > > =3D { > > gro_tcp4_tbl_pkt_count, > > gro_vxlan_tcp4_tbl_pkt_count, > > gro_udp4_tbl_pkt_count, > > gro_vxlan_udp4_tbl_pkt_count, > > + gro_tcp6_tbl_pkt_count, > > NULL}; > > > > #define IS_IPV4_TCP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ @@ > > -35,6 +38,12 @@ static gro_tbl_pkt_count_fn > > tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] =3D { > > ((ptype & RTE_PTYPE_L4_FRAG) !=3D RTE_PTYPE_L4_FRAG) && > > \ > > (RTE_ETH_IS_TUNNEL_PKT(ptype) =3D=3D 0)) > > > > +/* GRO with extension headers is not supported */ #define > > +IS_IPV6_TCP_PKT(ptype) (RTE_ETH_IS_IPV6_HDR(ptype) && \ > > + ((ptype & RTE_PTYPE_L4_TCP) =3D=3D RTE_PTYPE_L4_TCP) && \ > > + ((ptype & RTE_PTYPE_L4_FRAG) !=3D RTE_PTYPE_L4_FRAG) && > > \ > > + (RTE_ETH_IS_TUNNEL_PKT(ptype) =3D=3D 0)) > > + > > #define IS_IPV4_UDP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ > > ((ptype & RTE_PTYPE_L4_UDP) =3D=3D RTE_PTYPE_L4_UDP) && \ > > (RTE_ETH_IS_TUNNEL_PKT(ptype) =3D=3D 0)) > > @@ -147,7 +156,11 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts, > > /* allocate a reassembly table for TCP/IPv4 GRO */ > > struct gro_tcp4_tbl tcp_tbl; > > struct gro_tcp4_flow > > tcp_flows[RTE_GRO_MAX_BURST_ITEM_NUM]; > > - struct gro_tcp4_item tcp_items[RTE_GRO_MAX_BURST_ITEM_NUM] > > =3D {{0} }; > > + struct gro_tcp_item tcp_items[RTE_GRO_MAX_BURST_ITEM_NUM] > > =3D {{0} }; > > + > > + struct gro_tcp6_tbl tcp6_tbl; > > + struct gro_tcp6_flow > > tcp6_flows[RTE_GRO_MAX_BURST_ITEM_NUM]; > > + struct gro_tcp_item tcp6_items[RTE_GRO_MAX_BURST_ITEM_NUM] > > =3D {{0} }; > > > > /* allocate a reassembly table for UDP/IPv4 GRO */ > > struct gro_udp4_tbl udp_tbl; > > @@ -171,10 +184,10 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts, > > int32_t ret; > > uint16_t i, unprocess_num =3D 0, nb_after_gro =3D nb_pkts; > > uint8_t do_tcp4_gro =3D 0, do_vxlan_tcp_gro =3D 0, do_udp4_gro = =3D 0, > > - do_vxlan_udp_gro =3D 0; > > + do_vxlan_udp_gro =3D 0, do_tcp6_gro =3D 0; > > > > if (unlikely((param->gro_types & (RTE_GRO_IPV4_VXLAN_TCP_IPV4 > > | > > - RTE_GRO_TCP_IPV4 | > > + RTE_GRO_TCP_IPV4 | > > RTE_GRO_TCP_IPV6 | > > RTE_GRO_IPV4_VXLAN_UDP_IPV4 | > > RTE_GRO_UDP_IPV4)) =3D=3D 0)) > > return nb_pkts; > > @@ -236,6 +249,18 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts, > > do_udp4_gro =3D 1; > > } > > > > + if (param->gro_types & RTE_GRO_TCP_IPV6) { > > + for (i =3D 0; i < item_num; i++) > > + tcp6_flows[i].start_index =3D INVALID_ARRAY_INDEX= ; > > + > > + tcp6_tbl.flows =3D tcp6_flows; > > + tcp6_tbl.items =3D tcp6_items; > > + tcp6_tbl.flow_num =3D 0; > > + tcp6_tbl.item_num =3D 0; > > + tcp6_tbl.max_flow_num =3D item_num; > > + tcp6_tbl.max_item_num =3D item_num; > > + do_tcp6_gro =3D 1; > > + } > > > > for (i =3D 0; i < nb_pkts; i++) { > > /* > > @@ -276,6 +301,14 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts, > > nb_after_gro--; > > else if (ret < 0) > > unprocess_pkts[unprocess_num++] =3D pkts[= i]; > > + } else if (IS_IPV6_TCP_PKT(pkts[i]->packet_type) && > > + do_tcp6_gro) { > > + ret =3D gro_tcp6_reassemble(pkts[i], &tcp6_tbl, 0= ); > > + if (ret > 0) > > + /* merge successfully */ > > + nb_after_gro--; > > + else if (ret < 0) > > + unprocess_pkts[unprocess_num++] =3D pkts[= i]; > > } else > > unprocess_pkts[unprocess_num++] =3D pkts[i]; > > } > > @@ -283,9 +316,17 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts, > > if ((nb_after_gro < nb_pkts) > > || (unprocess_num < nb_pkts)) { > > i =3D 0; > > + /* Copy unprocessed packets */ > > + if (unprocess_num > 0) { > > + memcpy(&pkts[i], unprocess_pkts, > > + sizeof(struct rte_mbuf *) * > > + unprocess_num); > > + i =3D unprocess_num; > > + } > > + > > /* Flush all packets from the tables */ > > if (do_vxlan_tcp_gro) { > > - i =3D > > gro_vxlan_tcp4_tbl_timeout_flush(&vxlan_tcp_tbl, > > + i +=3D > > gro_vxlan_tcp4_tbl_timeout_flush(&vxlan_tcp_tbl, > > 0, pkts, nb_pkts); > > } > > > > @@ -304,13 +345,11 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts, > > i +=3D gro_udp4_tbl_timeout_flush(&udp_tbl, 0, > > &pkts[i], nb_pkts - i); > > } > > - /* Copy unprocessed packets */ > > - if (unprocess_num > 0) { > > - memcpy(&pkts[i], unprocess_pkts, > > - sizeof(struct rte_mbuf *) * > > - unprocess_num); > > + > > + if (do_tcp6_gro) { > > + i +=3D gro_tcp6_tbl_timeout_flush(&tcp6_tbl, 0, > > + &pkts[i], nb_pkts - i); > > } > > - nb_after_gro =3D i + unprocess_num; > > } > > > > return nb_after_gro; > > @@ -323,13 +362,13 @@ rte_gro_reassemble(struct rte_mbuf **pkts, { > > struct rte_mbuf *unprocess_pkts[nb_pkts]; > > struct gro_ctx *gro_ctx =3D ctx; > > - void *tcp_tbl, *udp_tbl, *vxlan_tcp_tbl, *vxlan_udp_tbl; > > + void *tcp_tbl, *udp_tbl, *vxlan_tcp_tbl, *vxlan_udp_tbl, *tcp6_tb= l; > > uint64_t current_time; > > uint16_t i, unprocess_num =3D 0; > > - uint8_t do_tcp4_gro, do_vxlan_tcp_gro, do_udp4_gro, > > do_vxlan_udp_gro; > > + uint8_t do_tcp4_gro, do_vxlan_tcp_gro, do_udp4_gro, > > do_vxlan_udp_gro, > > +do_tcp6_gro; > > > > if (unlikely((gro_ctx->gro_types & > > (RTE_GRO_IPV4_VXLAN_TCP_IPV4 | > > - RTE_GRO_TCP_IPV4 | > > + RTE_GRO_TCP_IPV4 | > > RTE_GRO_TCP_IPV6 | > > RTE_GRO_IPV4_VXLAN_UDP_IPV4 | > > RTE_GRO_UDP_IPV4)) =3D=3D 0)) > > return nb_pkts; > > @@ -338,6 +377,7 @@ rte_gro_reassemble(struct rte_mbuf **pkts, > > vxlan_tcp_tbl =3D gro_ctx- > > >tbls[RTE_GRO_IPV4_VXLAN_TCP_IPV4_INDEX]; > > udp_tbl =3D gro_ctx->tbls[RTE_GRO_UDP_IPV4_INDEX]; > > vxlan_udp_tbl =3D gro_ctx- > > >tbls[RTE_GRO_IPV4_VXLAN_UDP_IPV4_INDEX]; > > + tcp6_tbl =3D gro_ctx->tbls[RTE_GRO_TCP_IPV6_INDEX]; > > > > do_tcp4_gro =3D (gro_ctx->gro_types & RTE_GRO_TCP_IPV4) =3D=3D > > RTE_GRO_TCP_IPV4; > > @@ -347,6 +387,7 @@ rte_gro_reassemble(struct rte_mbuf **pkts, > > RTE_GRO_UDP_IPV4; > > do_vxlan_udp_gro =3D (gro_ctx->gro_types & > > RTE_GRO_IPV4_VXLAN_UDP_IPV4) =3D=3D > > RTE_GRO_IPV4_VXLAN_UDP_IPV4; > > + do_tcp6_gro =3D (gro_ctx->gro_types & RTE_GRO_TCP_IPV6) =3D=3D > > +RTE_GRO_TCP_IPV6; > > > > current_time =3D rte_rdtsc(); > > > > @@ -371,6 +412,11 @@ rte_gro_reassemble(struct rte_mbuf **pkts, > > if (gro_udp4_reassemble(pkts[i], udp_tbl, > > current_time) < 0) > > unprocess_pkts[unprocess_num++] =3D pkts[= i]; > > + } else if (IS_IPV6_TCP_PKT(pkts[i]->packet_type) && > > + do_tcp6_gro) { > > + if (gro_tcp6_reassemble(pkts[i], tcp6_tbl, > > + current_time) < 0) > > + unprocess_pkts[unprocess_num++] =3D pkts[= i]; > > } else > > unprocess_pkts[unprocess_num++] =3D pkts[i]; > > } > > @@ -426,6 +472,15 @@ rte_gro_timeout_flush(void *ctx, > > gro_ctx->tbls[RTE_GRO_UDP_IPV4_INDEX], > > flush_timestamp, > > &out[num], left_nb_out); > > + left_nb_out =3D max_nb_out - num; > > + } > > + > > + if ((gro_types & RTE_GRO_TCP_IPV6) && left_nb_out > 0) { > > + num +=3D gro_tcp6_tbl_timeout_flush( > > + gro_ctx->tbls[RTE_GRO_TCP_IPV6_INDEX], > > + flush_timestamp, > > + &out[num], left_nb_out); > > + > > } > > > > return num; > > diff --git a/lib/gro/rte_gro.h b/lib/gro/rte_gro.h index > > 9f9ed4935a..c83dfd9ad1 100644 > > --- a/lib/gro/rte_gro.h > > +++ b/lib/gro/rte_gro.h > > @@ -38,6 +38,9 @@ extern "C" { > > #define RTE_GRO_IPV4_VXLAN_UDP_IPV4_INDEX 3 #define > > RTE_GRO_IPV4_VXLAN_UDP_IPV4 (1ULL << > > RTE_GRO_IPV4_VXLAN_UDP_IPV4_INDEX) > > /**< VxLAN UDP/IPv4 GRO flag. */ > > +#define RTE_GRO_TCP_IPV6_INDEX 4 > > +#define RTE_GRO_TCP_IPV6 (1ULL << RTE_GRO_TCP_IPV6_INDEX) /**< > > TCP/IPv6 > > +GRO flag. */ > > > > /** > > * Structure used to create GRO context objects or used to pass > > -- > > 2.25.1 > > --000000000000ae7e4005fbcc312a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Fri, May 12, 2023 at 8:17=E2=80=AF= AM Hu, Jiayu <jiayu.hu@intel.com> wrote:
Hi= Kumar,

For TCP/IPv4 and TCP/IPv6, the TCP layer is the same and the difference is<= br> the IP layer. So the code used for TCP layer needs to be shared among gro_t= cp6.c
and gro_tcp4.c. But there are=C2=A0 too much code duplication in gro_tcp4.c= and gro_tcp6.c
in current implementation.
Sure, will do it. I had followed the same that was similar to wh= at was done in gro_tcp4.c and gro_vxlan_tcp4.c. Eventhough the TCP could ha= ve been reused for vxlan, we had code duplication. I assumed that this was = better in terms of performance etc.=C2=A0
For example, struct tcp6_flow_key and struct tcp4_flow_key share most of fi= elds, except
the IP address type. It's better to have a common TCP flow key structur= e in gro_tcp.h. In
gro_tcp4.h and gro_tcp6.h, we implement tcp4 and tcp6 flow key structures w= ith using the
common structure.=C2=A0
Thanks,
Jiayu

> -----Original Message-----
> From: Kumara Parameshwaran <kumaraparamesh92@gmail.com>
> Sent: Friday, October 21, 2022 2:14 AM
> To: Hu, Jiayu <jiayu.hu@intel.com>
> Cc: dev@dpdk.org= ; Kumara Parameshwaran
> <ku= maraparamesh92@gmail.com>
> Subject: [PATCH v2] gro : ipv6 changes to support GRO for TCP/ipv6
>
> From: Kumara Parameshwaran <kumaraparamesh92@gmail.com>
>
> The patch adds GRO support for TCP/ipv6 packets. This does not include= the
> support for vxlan, udp ipv6 packets.
>
> Signed-off-by: Kumara Parameshwaran <kumaraparamesh92@gmail.com>
> ---
> v1:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0* Changes to support GRO for TCP/ipv6 packet= s. This does not
> include
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0vxlan changes.
>=C2=A0 =C2=A0 =C2=A0 =C2=A0* The GRO is performed only for ipv6 packets= that does not contain
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 extension headers.
>=C2=A0 =C2=A0 =C2=A0 =C2=A0* The logic for the TCP coalescing remains t= he same, in ipv6 header
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0the source address, destination addre= ss, flow label, version fields
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0are expected to be the same.
>=C2=A0 =C2=A0 =C2=A0 =C2=A0* Re-organised the code to reuse certain tcp= functions for both ipv4
> and
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ipv6 flows.
> v2:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0* Fix comments in gro_tcp6.h header file. >
>=C2=A0 lib/gro/gro_tcp.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 155 +++++++++++++= +++
>=C2=A0 lib/gro/gro_tcp4.c=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A07 +-<= br> >=C2=A0 lib/gro/gro_tcp4.h=C2=A0 =C2=A0 =C2=A0 =C2=A0| 152 +------------= --
>=C2=A0 lib/gro/gro_tcp6.c=C2=A0 =C2=A0 =C2=A0 =C2=A0| 387
> +++++++++++++++++++++++++++++++++++++++
>=C2=A0 lib/gro/gro_tcp6.h=C2=A0 =C2=A0 =C2=A0 =C2=A0| 150 +++++++++++++= ++
>=C2=A0 lib/gro/gro_vxlan_tcp4.c |=C2=A0 =C2=A03 +-
>=C2=A0 lib/gro/gro_vxlan_tcp4.h |=C2=A0 =C2=A03 +-
>=C2=A0 lib/gro/meson.build=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A01 +
>=C2=A0 lib/gro/rte_gro.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 83 +++++++-= -
>=C2=A0 lib/gro/rte_gro.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A03 + >=C2=A0 10 files changed, 774 insertions(+), 170 deletions(-)=C2=A0 crea= te mode 100644
> lib/gro/gro_tcp.h=C2=A0 create mode 100644 lib/gro/gro_tcp6.c=C2=A0 cr= eate mode
> 100644 lib/gro/gro_tcp6.h
>
> diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h new file mode 10064= 4 index
> 0000000000..c5d248a022
> --- /dev/null
> +++ b/lib/gro/gro_tcp.h
> @@ -0,0 +1,155 @@
> +#ifndef _GRO_TCP_H_
> +#define _GRO_TCP_H_
> +
> +#include <rte_tcp.h>
> +
> +/*
> + * The max length of a IPv4 packet, which includes the length of the = L3
> + * header, the L4 header and the data payload.
> + */
> +#define MAX_IP_PKT_LENGTH UINT16_MAX
> +
> +/* The maximum TCP header length */
> +#define MAX_TCP_HLEN 60
> +#define INVALID_TCP_HDRLEN(len) \
> +=C2=A0 =C2=A0 =C2=A0(((len) < sizeof(struct rte_tcp_hdr)) || ((len= ) > MAX_TCP_HLEN))
> +
> +struct gro_tcp_item {
> +=C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 * The first MBUF segment of the packet. If the v= alue
> +=C2=A0 =C2=A0 =C2=A0 * is NULL, it means the item is empty.
> +=C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0struct rte_mbuf *firstseg;
> +=C2=A0 =C2=A0 =C2=A0/* The last MBUF segment of the packet */
> +=C2=A0 =C2=A0 =C2=A0struct rte_mbuf *lastseg;
> +=C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 * The time when the first packet is inserted int= o the table.
> +=C2=A0 =C2=A0 =C2=A0 * This value won't be updated, even if the p= acket is merged
> +=C2=A0 =C2=A0 =C2=A0 * with other packets.
> +=C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0uint64_t start_time;
> +=C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 * next_pkt_idx is used to chain the packets that=
> +=C2=A0 =C2=A0 =C2=A0 * are in the same flow but can't be merged t= ogether
> +=C2=A0 =C2=A0 =C2=A0 * (e.g. caused by packet reordering).
> +=C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0uint32_t next_pkt_idx;
> +=C2=A0 =C2=A0 =C2=A0/* TCP sequence number of the packet */
> +=C2=A0 =C2=A0 =C2=A0uint32_t sent_seq;
> +=C2=A0 =C2=A0 =C2=A0/* IPv4 ID of the packet */
> +=C2=A0 =C2=A0 =C2=A0uint16_t ip_id;
> +=C2=A0 =C2=A0 =C2=A0/* the number of merged packets */
> +=C2=A0 =C2=A0 =C2=A0uint16_t nb_merged;
> +=C2=A0 =C2=A0 =C2=A0/* Indicate if IPv4 ID can be ignored */
> +=C2=A0 =C2=A0 =C2=A0uint8_t is_atomic;
> +};
> +
> +/*
> + * Merge two TCP packets without updating checksums.
> + * If cmp is larger than 0, append the new packet to the
> + * original packet. Otherwise, pre-pend the new packet to
> + * the original packet.
> + */
> +static inline int
> +merge_two_tcp_packets(struct gro_tcp_item *item,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_mbuf *pkt,=
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int cmp,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t sent_seq, > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t ip_id,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t l2_offset) > +{
> +=C2=A0 =C2=A0 =C2=A0struct rte_mbuf *pkt_head, *pkt_tail, *lastseg; > +=C2=A0 =C2=A0 =C2=A0uint16_t hdr_len, l2_len;
> +
> +=C2=A0 =C2=A0 =C2=A0if (cmp > 0) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_head =3D item->= ;firstseg;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_tail =3D pkt;
> +=C2=A0 =C2=A0 =C2=A0} else {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_head =3D pkt;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_tail =3D item->= ;firstseg;
> +=C2=A0 =C2=A0 =C2=A0}
> +
> +=C2=A0 =C2=A0 =C2=A0/* check if the IPv4 packet length is greater tha= n the max value */
> +=C2=A0 =C2=A0 =C2=A0hdr_len =3D l2_offset + pkt_head->l2_len + pkt= _head->l3_len +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_head->l4_len;<= br> > +=C2=A0 =C2=A0 =C2=A0l2_len =3D l2_offset > 0 ? pkt_head->outer_= l2_len : pkt_head->l2_len;
> +=C2=A0 =C2=A0 =C2=A0if (unlikely(pkt_head->pkt_len - l2_len + pkt_= tail->pkt_len -
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0hdr_len > MAX_IP_PKT_LENGTH))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
> +
> +=C2=A0 =C2=A0 =C2=A0/* remove the packet header for the tail packet *= /
> +=C2=A0 =C2=A0 =C2=A0rte_pktmbuf_adj(pkt_tail, hdr_len);
> +
> +=C2=A0 =C2=A0 =C2=A0/* chain two packets together */
> +=C2=A0 =C2=A0 =C2=A0if (cmp > 0) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->lastseg->= next =3D pkt;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->lastseg =3D = rte_pktmbuf_lastseg(pkt);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* update IP ID to th= e larger value */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->ip_id =3D ip= _id;
> +=C2=A0 =C2=A0 =C2=A0} else {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0lastseg =3D rte_pktmb= uf_lastseg(pkt);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0lastseg->next =3D = item->firstseg;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->firstseg =3D= pkt;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* update sent_seq to= the smaller value */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->sent_seq =3D= sent_seq;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->ip_id =3D ip= _id;
> +=C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0item->nb_merged++;
> +
> +=C2=A0 =C2=A0 =C2=A0/* update MBUF metadata for the merged packet */<= br> > +=C2=A0 =C2=A0 =C2=A0pkt_head->nb_segs +=3D pkt_tail->nb_segs; > +=C2=A0 =C2=A0 =C2=A0pkt_head->pkt_len +=3D pkt_tail->pkt_len; > +
> +=C2=A0 =C2=A0 =C2=A0return 1;
> +}
> +
> +/*
> + * Check if two TCP/IPv4 packets are neighbors.
> + */
> +static inline int
> +check_seq_option(struct gro_tcp_item *item,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_tcp_hdr *t= cph,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t sent_seq, > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t ip_id,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t tcp_hl,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t tcp_dl,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t l2_offset, > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint8_t is_atomic) > +{
> +=C2=A0 =C2=A0 =C2=A0struct rte_mbuf *pkt_orig =3D item->firstseg;<= br> > +=C2=A0 =C2=A0 =C2=A0char *iph_orig;
> +=C2=A0 =C2=A0 =C2=A0struct rte_tcp_hdr *tcph_orig;
> +=C2=A0 =C2=A0 =C2=A0uint16_t len, tcp_hl_orig;
> +
> +=C2=A0 =C2=A0 =C2=A0iph_orig =3D (char *)(rte_pktmbuf_mtod(pkt_orig, = char *) +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0l2_offset + pkt_orig->l2_len);
> +=C2=A0 =C2=A0 =C2=A0tcph_orig =3D (struct rte_tcp_hdr *)(iph_orig + p= kt_orig->l3_len);
> +=C2=A0 =C2=A0 =C2=A0tcp_hl_orig =3D pkt_orig->l4_len;
> +
> +=C2=A0 =C2=A0 =C2=A0/* Check if TCP option fields equal */
> +=C2=A0 =C2=A0 =C2=A0len =3D RTE_MAX(tcp_hl, tcp_hl_orig) - sizeof(str= uct rte_tcp_hdr);
> +=C2=A0 =C2=A0 =C2=A0if ((tcp_hl !=3D tcp_hl_orig) || ((len > 0) &a= mp;&
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(memcmp(tcph + 1, tcph_orig + 1,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0len) !=3D 0)= ))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
> +
> +=C2=A0 =C2=A0 =C2=A0/* Don't merge packets whose DF bits are diff= erent */
> +=C2=A0 =C2=A0 =C2=A0if (unlikely(item->is_atomic ^ is_atomic))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
> +
> +=C2=A0 =C2=A0 =C2=A0/* check if the two packets are neighbors */
> +=C2=A0 =C2=A0 =C2=A0len =3D pkt_orig->pkt_len - l2_offset - pkt_or= ig->l2_len -
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_orig->l3_len -= tcp_hl_orig;
> +=C2=A0 =C2=A0 =C2=A0if ((sent_seq =3D=3D item->sent_seq + len) &am= p;& (is_atomic ||
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(ip_id =3D=3D item->ip_id + 1)))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* append the new pac= ket */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 1;
> +=C2=A0 =C2=A0 =C2=A0else if ((sent_seq + tcp_dl =3D=3D item->sent_= seq) && (is_atomic ||
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(ip_id + item->nb_merged =3D=3D item-= >ip_id)))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* pre-pend the new p= acket */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -1;
> +
> +=C2=A0 =C2=A0 =C2=A0return 0;
> +}
> +
> +#endif
> diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c index
> 8f5e800250..eea2a72ecd 100644
> --- a/lib/gro/gro_tcp4.c
> +++ b/lib/gro/gro_tcp4.c
> @@ -7,6 +7,7 @@
>=C2=A0 #include <rte_ethdev.h>
>
>=C2=A0 #include "gro_tcp4.h"
> +#include "gro_tcp.h"
>
>=C2=A0 void *
>=C2=A0 gro_tcp4_tbl_create(uint16_t socket_id, @@ -30,7 +31,7 @@
> gro_tcp4_tbl_create(uint16_t socket_id,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0if (tbl =3D=3D NULL)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return NULL;
>
> -=C2=A0 =C2=A0 =C2=A0size =3D sizeof(struct gro_tcp4_item) * entries_n= um;
> +=C2=A0 =C2=A0 =C2=A0size =3D sizeof(struct gro_tcp_item) * entries_nu= m;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0tbl->items =3D rte_zmalloc_socket(__func_= _,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0size,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0RTE_CACHE_LINE_SIZE,
> @@ -177,7 +178,7 @@ insert_new_flow(struct gro_tcp4_tbl *tbl,
>=C2=A0 =C2=A0* update the packet length for the flushed packet.
>=C2=A0 =C2=A0*/
>=C2=A0 static inline void
> -update_header(struct gro_tcp4_item *item)
> +update_header(struct gro_tcp_item *item)
>=C2=A0 {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_ipv4_hdr *ipv4_hdr;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_mbuf *pkt =3D item->firstseg; = @@ -302,7 +303,7 @@
> gro_tcp4_reassemble(struct rte_mbuf *pkt,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0sent_seq, ip_id, pkt->l4_len, t= cp_dl, 0,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0is_atomic);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (cmp) {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0if (merge_two_tcp4_packets(&(tbl->items[cur_idx]),
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0if (merge_two_tcp_packets(&(tbl->items[cur_idx]),
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0pkt, cmp, sent_seq, ip_id, 0))
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 1;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0/*
> diff --git a/lib/gro/gro_tcp4.h b/lib/gro/gro_tcp4.h index
> 212f97a042..634a215b98 100644
> --- a/lib/gro/gro_tcp4.h
> +++ b/lib/gro/gro_tcp4.h
> @@ -5,22 +5,9 @@
>=C2=A0 #ifndef _GRO_TCP4_H_
>=C2=A0 #define _GRO_TCP4_H_
>
> -#include <rte_tcp.h>
> -
>=C2=A0 #define INVALID_ARRAY_INDEX 0xffffffffUL=C2=A0 #define
> GRO_TCP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL)
>
> -/*
> - * The max length of a IPv4 packet, which includes the length of the = L3
> - * header, the L4 header and the data payload.
> - */
> -#define MAX_IPV4_PKT_LENGTH UINT16_MAX
> -
> -/* The maximum TCP header length */
> -#define MAX_TCP_HLEN 60
> -#define INVALID_TCP_HDRLEN(len) \
> -=C2=A0 =C2=A0 =C2=A0(((len) < sizeof(struct rte_tcp_hdr)) || ((len= ) > MAX_TCP_HLEN))
> -
>=C2=A0 /* Header fields representing a TCP/IPv4 flow */=C2=A0 struct tc= p4_flow_key {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_ether_addr eth_saddr;
> @@ -42,42 +29,12 @@ struct gro_tcp4_flow {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t start_index;
>=C2=A0 };
>
> -struct gro_tcp4_item {
> -=C2=A0 =C2=A0 =C2=A0/*
> -=C2=A0 =C2=A0 =C2=A0 * The first MBUF segment of the packet. If the v= alue
> -=C2=A0 =C2=A0 =C2=A0 * is NULL, it means the item is empty.
> -=C2=A0 =C2=A0 =C2=A0 */
> -=C2=A0 =C2=A0 =C2=A0struct rte_mbuf *firstseg;
> -=C2=A0 =C2=A0 =C2=A0/* The last MBUF segment of the packet */
> -=C2=A0 =C2=A0 =C2=A0struct rte_mbuf *lastseg;
> -=C2=A0 =C2=A0 =C2=A0/*
> -=C2=A0 =C2=A0 =C2=A0 * The time when the first packet is inserted int= o the table.
> -=C2=A0 =C2=A0 =C2=A0 * This value won't be updated, even if the p= acket is merged
> -=C2=A0 =C2=A0 =C2=A0 * with other packets.
> -=C2=A0 =C2=A0 =C2=A0 */
> -=C2=A0 =C2=A0 =C2=A0uint64_t start_time;
> -=C2=A0 =C2=A0 =C2=A0/*
> -=C2=A0 =C2=A0 =C2=A0 * next_pkt_idx is used to chain the packets that=
> -=C2=A0 =C2=A0 =C2=A0 * are in the same flow but can't be merged t= ogether
> -=C2=A0 =C2=A0 =C2=A0 * (e.g. caused by packet reordering).
> -=C2=A0 =C2=A0 =C2=A0 */
> -=C2=A0 =C2=A0 =C2=A0uint32_t next_pkt_idx;
> -=C2=A0 =C2=A0 =C2=A0/* TCP sequence number of the packet */
> -=C2=A0 =C2=A0 =C2=A0uint32_t sent_seq;
> -=C2=A0 =C2=A0 =C2=A0/* IPv4 ID of the packet */
> -=C2=A0 =C2=A0 =C2=A0uint16_t ip_id;
> -=C2=A0 =C2=A0 =C2=A0/* the number of merged packets */
> -=C2=A0 =C2=A0 =C2=A0uint16_t nb_merged;
> -=C2=A0 =C2=A0 =C2=A0/* Indicate if IPv4 ID can be ignored */
> -=C2=A0 =C2=A0 =C2=A0uint8_t is_atomic;
> -};
> -
>=C2=A0 /*
>=C2=A0 =C2=A0* TCP/IPv4 reassembly table structure.
>=C2=A0 =C2=A0*/
>=C2=A0 struct gro_tcp4_tbl {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* item array */
> -=C2=A0 =C2=A0 =C2=A0struct gro_tcp4_item *items;
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp_item *items;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* flow array */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0struct gro_tcp4_flow *flows;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* current item number */
> @@ -195,111 +152,4 @@ is_same_tcp4_flow(struct tcp4_flow_key k1, struc= t
> tcp4_flow_key k2)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0(k1.dst_port =3D=3D k2.dst_port));
>=C2=A0 }
>
> -/*
> - * Merge two TCP/IPv4 packets without updating checksums.
> - * If cmp is larger than 0, append the new packet to the
> - * original packet. Otherwise, pre-pend the new packet to
> - * the original packet.
> - */
> -static inline int
> -merge_two_tcp4_packets(struct gro_tcp4_item *item,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_mbuf *pkt,=
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int cmp,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t sent_seq, > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t ip_id,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t l2_offset) > -{
> -=C2=A0 =C2=A0 =C2=A0struct rte_mbuf *pkt_head, *pkt_tail, *lastseg; > -=C2=A0 =C2=A0 =C2=A0uint16_t hdr_len, l2_len;
> -
> -=C2=A0 =C2=A0 =C2=A0if (cmp > 0) {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_head =3D item->= ;firstseg;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_tail =3D pkt;
> -=C2=A0 =C2=A0 =C2=A0} else {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_head =3D pkt;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_tail =3D item->= ;firstseg;
> -=C2=A0 =C2=A0 =C2=A0}
> -
> -=C2=A0 =C2=A0 =C2=A0/* check if the IPv4 packet length is greater tha= n the max value */
> -=C2=A0 =C2=A0 =C2=A0hdr_len =3D l2_offset + pkt_head->l2_len + pkt= _head->l3_len +
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_head->l4_len;<= br> > -=C2=A0 =C2=A0 =C2=A0l2_len =3D l2_offset > 0 ? pkt_head->outer_= l2_len : pkt_head->l2_len;
> -=C2=A0 =C2=A0 =C2=A0if (unlikely(pkt_head->pkt_len - l2_len + pkt_= tail->pkt_len -
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0hdr_len > MAX_IPV4_PKT_LENGTH))
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
> -
> -=C2=A0 =C2=A0 =C2=A0/* remove the packet header for the tail packet *= /
> -=C2=A0 =C2=A0 =C2=A0rte_pktmbuf_adj(pkt_tail, hdr_len);
> -
> -=C2=A0 =C2=A0 =C2=A0/* chain two packets together */
> -=C2=A0 =C2=A0 =C2=A0if (cmp > 0) {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->lastseg->= next =3D pkt;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->lastseg =3D = rte_pktmbuf_lastseg(pkt);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* update IP ID to th= e larger value */
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->ip_id =3D ip= _id;
> -=C2=A0 =C2=A0 =C2=A0} else {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0lastseg =3D rte_pktmb= uf_lastseg(pkt);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0lastseg->next =3D = item->firstseg;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->firstseg =3D= pkt;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* update sent_seq to= the smaller value */
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->sent_seq =3D= sent_seq;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item->ip_id =3D ip= _id;
> -=C2=A0 =C2=A0 =C2=A0}
> -=C2=A0 =C2=A0 =C2=A0item->nb_merged++;
> -
> -=C2=A0 =C2=A0 =C2=A0/* update MBUF metadata for the merged packet */<= br> > -=C2=A0 =C2=A0 =C2=A0pkt_head->nb_segs +=3D pkt_tail->nb_segs; > -=C2=A0 =C2=A0 =C2=A0pkt_head->pkt_len +=3D pkt_tail->pkt_len; > -
> -=C2=A0 =C2=A0 =C2=A0return 1;
> -}
> -
> -/*
> - * Check if two TCP/IPv4 packets are neighbors.
> - */
> -static inline int
> -check_seq_option(struct gro_tcp4_item *item,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_tcp_hdr *t= cph,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t sent_seq, > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t ip_id,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t tcp_hl,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t tcp_dl,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t l2_offset, > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint8_t is_atomic) > -{
> -=C2=A0 =C2=A0 =C2=A0struct rte_mbuf *pkt_orig =3D item->firstseg;<= br> > -=C2=A0 =C2=A0 =C2=A0struct rte_ipv4_hdr *iph_orig;
> -=C2=A0 =C2=A0 =C2=A0struct rte_tcp_hdr *tcph_orig;
> -=C2=A0 =C2=A0 =C2=A0uint16_t len, tcp_hl_orig;
> -
> -=C2=A0 =C2=A0 =C2=A0iph_orig =3D (struct rte_ipv4_hdr *)(rte_pktmbuf_= mtod(pkt_orig, char
> *) +
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0l2_offset + pkt_orig->l2_len);
> -=C2=A0 =C2=A0 =C2=A0tcph_orig =3D (struct rte_tcp_hdr *)((char *)iph_= orig + pkt_orig-
> >l3_len);
> -=C2=A0 =C2=A0 =C2=A0tcp_hl_orig =3D pkt_orig->l4_len;
> -
> -=C2=A0 =C2=A0 =C2=A0/* Check if TCP option fields equal */
> -=C2=A0 =C2=A0 =C2=A0len =3D RTE_MAX(tcp_hl, tcp_hl_orig) - sizeof(str= uct rte_tcp_hdr);
> -=C2=A0 =C2=A0 =C2=A0if ((tcp_hl !=3D tcp_hl_orig) || ((len > 0) &a= mp;&
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(memcmp(tcph + 1, tcph_orig + 1,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0len) !=3D 0)= ))
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
> -
> -=C2=A0 =C2=A0 =C2=A0/* Don't merge packets whose DF bits are diff= erent */
> -=C2=A0 =C2=A0 =C2=A0if (unlikely(item->is_atomic ^ is_atomic))
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
> -
> -=C2=A0 =C2=A0 =C2=A0/* check if the two packets are neighbors */
> -=C2=A0 =C2=A0 =C2=A0len =3D pkt_orig->pkt_len - l2_offset - pkt_or= ig->l2_len -
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt_orig->l3_len -= tcp_hl_orig;
> -=C2=A0 =C2=A0 =C2=A0if ((sent_seq =3D=3D item->sent_seq + len) &am= p;& (is_atomic ||
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(ip_id =3D=3D item->ip_id + 1)))
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* append the new pac= ket */
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 1;
> -=C2=A0 =C2=A0 =C2=A0else if ((sent_seq + tcp_dl =3D=3D item->sent_= seq) && (is_atomic ||
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(ip_id + item->nb_merged =3D=3D item-= >ip_id)))
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* pre-pend the new p= acket */
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -1;
> -
> -=C2=A0 =C2=A0 =C2=A0return 0;
> -}
>=C2=A0 #endif
> diff --git a/lib/gro/gro_tcp6.c b/lib/gro/gro_tcp6.c new file mode 100= 644
> index 0000000000..a37d8e2512
> --- /dev/null
> +++ b/lib/gro/gro_tcp6.c
> @@ -0,0 +1,387 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2017 Intel Corporation
> + */
> +
> +#include <rte_malloc.h>
> +#include <rte_mbuf.h>
> +#include <rte_ethdev.h>
> +
> +#include "gro_tcp6.h"
> +#include "gro_tcp.h"
> +
> +void *
> +gro_tcp6_tbl_create(uint16_t socket_id,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t max_flow_num= ,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t max_item_per= _flow)
> +{
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp6_tbl *tbl;
> +=C2=A0 =C2=A0 =C2=A0size_t size;
> +=C2=A0 =C2=A0 =C2=A0uint32_t entries_num, i;
> +
> +=C2=A0 =C2=A0 =C2=A0entries_num =3D max_flow_num * max_item_per_flow;=
> +=C2=A0 =C2=A0 =C2=A0entries_num =3D RTE_MIN(entries_num,
> GRO_TCP6_TBL_MAX_ITEM_NUM);
> +
> +=C2=A0 =C2=A0 =C2=A0if (entries_num =3D=3D 0)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return NULL;
> +
> +=C2=A0 =C2=A0 =C2=A0tbl =3D rte_zmalloc_socket(__func__,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0sizeof(struct gro_tcp6_tbl),
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0RTE_CACHE_LINE_SIZE,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0socket_id);
> +=C2=A0 =C2=A0 =C2=A0if (tbl =3D=3D NULL)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return NULL;
> +
> +=C2=A0 =C2=A0 =C2=A0size =3D sizeof(struct gro_tcp_item) * entries_nu= m;
> +=C2=A0 =C2=A0 =C2=A0tbl->items =3D rte_zmalloc_socket(__func__, > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0size,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0RTE_CACHE_LINE_SIZE,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0socket_id);
> +=C2=A0 =C2=A0 =C2=A0if (tbl->items =3D=3D NULL) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rte_free(tbl);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return NULL;
> +=C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0tbl->max_item_num =3D entries_num;
> +
> +=C2=A0 =C2=A0 =C2=A0size =3D sizeof(struct gro_tcp6_flow) * entries_n= um;
> +=C2=A0 =C2=A0 =C2=A0tbl->flows =3D rte_zmalloc_socket(__func__, > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0size,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0RTE_CACHE_LINE_SIZE,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0socket_id);
> +=C2=A0 =C2=A0 =C2=A0if (tbl->flows =3D=3D NULL) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rte_free(tbl->item= s);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rte_free(tbl);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return NULL;
> +=C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0/* INVALID_ARRAY_INDEX indicates an empty flow */=
> +=C2=A0 =C2=A0 =C2=A0for (i =3D 0; i < entries_num; i++)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tbl->flows[i].star= t_index =3D INVALID_ARRAY_INDEX;
> +=C2=A0 =C2=A0 =C2=A0tbl->max_flow_num =3D entries_num;
> +
> +=C2=A0 =C2=A0 =C2=A0return tbl;
> +}
> +
> +void
> +gro_tcp6_tbl_destroy(void *tbl)
> +{
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp6_tbl *tcp_tbl =3D tbl;
> +
> +=C2=A0 =C2=A0 =C2=A0if (tcp_tbl) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rte_free(tcp_tbl->= items);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rte_free(tcp_tbl->= flows);
> +=C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0rte_free(tcp_tbl);
> +}
> +
> +static inline uint32_t
> +find_an_empty_item(struct gro_tcp6_tbl *tbl) {
> +=C2=A0 =C2=A0 =C2=A0uint32_t i;
> +=C2=A0 =C2=A0 =C2=A0uint32_t max_item_num =3D tbl->max_item_num; > +
> +=C2=A0 =C2=A0 =C2=A0for (i =3D 0; i < max_item_num; i++)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (tbl->items[i].= firstseg =3D=3D NULL)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0return i;
> +=C2=A0 =C2=A0 =C2=A0return INVALID_ARRAY_INDEX;
> +}
> +
> +static inline uint32_t
> +find_an_empty_flow(struct gro_tcp6_tbl *tbl) {
> +=C2=A0 =C2=A0 =C2=A0uint32_t i;
> +=C2=A0 =C2=A0 =C2=A0uint32_t max_flow_num =3D tbl->max_flow_num; > +
> +=C2=A0 =C2=A0 =C2=A0for (i =3D 0; i < max_flow_num; i++)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (tbl->flows[i].= start_index =3D=3D INVALID_ARRAY_INDEX)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0return i;
> +=C2=A0 =C2=A0 =C2=A0return INVALID_ARRAY_INDEX;
> +}
> +
> +static inline uint32_t
> +insert_new_item(struct gro_tcp6_tbl *tbl,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_mbuf *pkt,=
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t start_time,<= br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t prev_idx, > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t sent_seq, > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint8_t is_atomic) > +{
> +=C2=A0 =C2=A0 =C2=A0uint32_t item_idx;
> +
> +=C2=A0 =C2=A0 =C2=A0item_idx =3D find_an_empty_item(tbl);
> +=C2=A0 =C2=A0 =C2=A0if (item_idx =3D=3D INVALID_ARRAY_INDEX)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return INVALID_ARRAY_= INDEX;
> +
> +=C2=A0 =C2=A0 =C2=A0tbl->items[item_idx].firstseg =3D pkt;
> +=C2=A0 =C2=A0 =C2=A0tbl->items[item_idx].lastseg =3D rte_pktmbuf_l= astseg(pkt);
> +=C2=A0 =C2=A0 =C2=A0tbl->items[item_idx].start_time =3D start_time= ;
> +=C2=A0 =C2=A0 =C2=A0tbl->items[item_idx].next_pkt_idx =3D INVALID_= ARRAY_INDEX;
> +=C2=A0 =C2=A0 =C2=A0tbl->items[item_idx].sent_seq =3D sent_seq; > +=C2=A0 =C2=A0 =C2=A0tbl->items[item_idx].nb_merged =3D 1;
> +=C2=A0 =C2=A0 =C2=A0tbl->items[item_idx].is_atomic =3D is_atomic;<= br> > +=C2=A0 =C2=A0 =C2=A0tbl->item_num++;
> +
> +=C2=A0 =C2=A0 =C2=A0/* if the previous packet exists, chain them toge= ther. */
> +=C2=A0 =C2=A0 =C2=A0if (prev_idx !=3D INVALID_ARRAY_INDEX) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tbl->items[item_id= x].next_pkt_idx =3D
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0tbl->items[prev_idx].next_pkt_idx;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tbl->items[prev_id= x].next_pkt_idx =3D item_idx;
> +=C2=A0 =C2=A0 =C2=A0}
> +
> +=C2=A0 =C2=A0 =C2=A0return item_idx;
> +}
> +
> +static inline uint32_t
> +delete_item(struct gro_tcp6_tbl *tbl, uint32_t item_idx,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t prev_item_id= x)
> +{
> +=C2=A0 =C2=A0 =C2=A0uint32_t next_idx =3D tbl->items[item_idx].nex= t_pkt_idx;
> +
> +=C2=A0 =C2=A0 =C2=A0/* NULL indicates an empty item */
> +=C2=A0 =C2=A0 =C2=A0tbl->items[item_idx].firstseg =3D NULL;
> +=C2=A0 =C2=A0 =C2=A0tbl->item_num--;
> +=C2=A0 =C2=A0 =C2=A0if (prev_item_idx !=3D INVALID_ARRAY_INDEX)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tbl->items[prev_it= em_idx].next_pkt_idx =3D next_idx;
> +
> +=C2=A0 =C2=A0 =C2=A0return next_idx;
> +}
> +
> +static inline uint32_t
> +insert_new_flow(struct gro_tcp6_tbl *tbl,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct tcp6_flow_key = *src,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rte_be32_t vtc_flow,<= br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t item_idx) > +{
> +=C2=A0 =C2=A0 =C2=A0struct tcp6_flow_key *dst;
> +=C2=A0 =C2=A0 =C2=A0uint32_t flow_idx;
> +
> +=C2=A0 =C2=A0 =C2=A0flow_idx =3D find_an_empty_flow(tbl);
> +=C2=A0 =C2=A0 =C2=A0if (unlikely(flow_idx =3D=3D INVALID_ARRAY_INDEX)= )
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return INVALID_ARRAY_= INDEX;
> +
> +=C2=A0 =C2=A0 =C2=A0dst =3D &(tbl->flows[flow_idx].key);
> +
> +=C2=A0 =C2=A0 =C2=A0rte_ether_addr_copy(&(src->eth_saddr), &am= p;(dst->eth_saddr));
> +=C2=A0 =C2=A0 =C2=A0rte_ether_addr_copy(&(src->eth_daddr), &am= p;(dst->eth_daddr));
> +=C2=A0 =C2=A0 =C2=A0memcpy(&dst->src_addr[0], &src->src= _addr[0], sizeof(dst-
> >src_addr));
> +=C2=A0 =C2=A0 =C2=A0memcpy(&dst->dst_addr[0], &src->dst= _addr[0], sizeof(dst-
> >dst_addr));
> +=C2=A0 =C2=A0 =C2=A0dst->recv_ack =3D src->recv_ack;
> +=C2=A0 =C2=A0 =C2=A0dst->src_port =3D src->src_port;
> +=C2=A0 =C2=A0 =C2=A0dst->dst_port =3D src->dst_port;
> +
> +=C2=A0 =C2=A0 =C2=A0tbl->flows[flow_idx].start_index =3D item_idx;=
> +=C2=A0 =C2=A0 =C2=A0tbl->flow_num++;
> +=C2=A0 =C2=A0 =C2=A0tbl->flows->vtc_flow =3D vtc_flow;
> +
> +=C2=A0 =C2=A0 =C2=A0return flow_idx;
> +}
> +
> +/*
> + * update the packet length for the flushed packet.
> + */
> +static inline void
> +update_header(struct gro_tcp_item *item) {
> +=C2=A0 =C2=A0 =C2=A0struct rte_ipv6_hdr *ipv6_hdr;
> +=C2=A0 =C2=A0 =C2=A0struct rte_mbuf *pkt =3D item->firstseg;
> +
> +=C2=A0 =C2=A0 =C2=A0ipv6_hdr =3D (struct rte_ipv6_hdr *)(rte_pktmbuf_= mtod(pkt, char *) +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0pkt->l2_len);
> +=C2=A0 =C2=A0 =C2=A0ipv6_hdr->payload_len =3D rte_cpu_to_be_16(pkt= ->pkt_len -
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0pkt->l2_len - pkt->l3_len);
> +}
> +
> +int32_t
> +gro_tcp6_reassemble(struct rte_mbuf *pkt,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct gro_tcp6_tbl *= tbl,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t start_time)<= br> > +{
> +=C2=A0 =C2=A0 =C2=A0struct rte_ether_hdr *eth_hdr;
> +=C2=A0 =C2=A0 =C2=A0struct rte_ipv6_hdr *ipv6_hdr;
> +=C2=A0 =C2=A0 =C2=A0struct rte_tcp_hdr *tcp_hdr;
> +=C2=A0 =C2=A0 =C2=A0uint32_t sent_seq;
> +=C2=A0 =C2=A0 =C2=A0int32_t tcp_dl;
> +=C2=A0 =C2=A0 =C2=A0uint16_t ip_tlen;
> +=C2=A0 =C2=A0 =C2=A0struct tcp6_flow_key key;
> +=C2=A0 =C2=A0 =C2=A0uint32_t cur_idx, prev_idx, item_idx;
> +=C2=A0 =C2=A0 =C2=A0uint32_t i, max_flow_num, remaining_flow_num;
> +=C2=A0 =C2=A0 =C2=A0int cmp;
> +=C2=A0 =C2=A0 =C2=A0uint8_t find;
> +=C2=A0 =C2=A0 =C2=A0rte_be32_t vtc_flow_diff;
> +
> +=C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 * Don't process the packet whose TCP header = length is greater
> +=C2=A0 =C2=A0 =C2=A0 * than 60 bytes or less than 20 bytes.
> +=C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0if (unlikely(INVALID_TCP_HDRLEN(pkt->l4_len)))=
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -1;
> +
> +=C2=A0 =C2=A0 =C2=A0eth_hdr =3D rte_pktmbuf_mtod(pkt, struct rte_ethe= r_hdr *);
> +=C2=A0 =C2=A0 =C2=A0ipv6_hdr =3D (struct rte_ipv6_hdr *)((char *)eth_= hdr + pkt->l2_len);
> +=C2=A0 =C2=A0 =C2=A0tcp_hdr =3D (struct rte_tcp_hdr *)((char *)ipv6_h= dr + pkt->l3_len);
> +
> +=C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 * Don't process the packet which has FIN, SY= N, RST, PSH, URG, ECE
> +=C2=A0 =C2=A0 =C2=A0 * or CWR set.
> +=C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0if (tcp_hdr->tcp_flags !=3D RTE_TCP_ACK_FLAG)<= br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -1;
> +
> +=C2=A0 =C2=A0 =C2=A0ip_tlen =3D rte_be_to_cpu_16(ipv6_hdr->payload= _len);
> +=C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 * Trim the tail padding bytes. The IPv6 header i= s fixed to
> +=C2=A0 =C2=A0 =C2=A0 * 40 bytes unlike IPv4 that is variable. The len= gth in the IPv6 header
> +=C2=A0 =C2=A0 =C2=A0 * contains only length of TCP Header + TCP Paylo= ad, whereas IPv4
> header contains
> +=C2=A0 =C2=A0 =C2=A0 * length of IP Header + TCP Header + TCP Payload=
> +=C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0if (pkt->pkt_len > (uint32_t)(ip_tlen + pkt= ->l2_len + pkt->l3_len))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rte_pktmbuf_trim(pkt,= pkt->pkt_len - ip_tlen - pkt->l2_len -
> pkt->l3_len);
> +=C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 * Don't process the packet whose payload len= gth is less than or
> +=C2=A0 =C2=A0 =C2=A0 * equal to 0.
> +=C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0tcp_dl =3D ip_tlen - pkt->l4_len;
> +=C2=A0 =C2=A0 =C2=A0if (tcp_dl <=3D 0)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -1;
> +
> +=C2=A0 =C2=A0 =C2=A0sent_seq =3D rte_be_to_cpu_32(tcp_hdr->sent_se= q);
> +
> +=C2=A0 =C2=A0 =C2=A0rte_ether_addr_copy(&(eth_hdr->src_addr), = &(key.eth_saddr));
> +=C2=A0 =C2=A0 =C2=A0rte_ether_addr_copy(&(eth_hdr->dst_addr), = &(key.eth_daddr));
> +=C2=A0 =C2=A0 =C2=A0memcpy(&key.src_addr[0], &ipv6_hdr->sr= c_addr,
> sizeof(key.src_addr));
> +=C2=A0 =C2=A0 =C2=A0memcpy(&key.dst_addr[0], &ipv6_hdr->ds= t_addr,
> sizeof(key.dst_addr));
> +=C2=A0 =C2=A0 =C2=A0key.src_port =3D tcp_hdr->src_port;
> +=C2=A0 =C2=A0 =C2=A0key.dst_port =3D tcp_hdr->dst_port;
> +=C2=A0 =C2=A0 =C2=A0key.recv_ack =3D tcp_hdr->recv_ack;
> +
> +=C2=A0 =C2=A0 =C2=A0/* Search for a matched flow. */
> +=C2=A0 =C2=A0 =C2=A0max_flow_num =3D tbl->max_flow_num;
> +=C2=A0 =C2=A0 =C2=A0remaining_flow_num =3D tbl->flow_num;
> +=C2=A0 =C2=A0 =C2=A0find =3D 0;
> +=C2=A0 =C2=A0 =C2=A0for (i =3D 0; i < max_flow_num && rema= ining_flow_num; i++) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (tbl->flows[i].= start_index !=3D INVALID_ARRAY_INDEX) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0if (is_same_tcp6_flow(tbl->flows[i].key, key)) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * IP version (4) Traffic Class (8) Flow= Label (20)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * All fields except Traffic class shoul= d be
> same
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0vtc_flow_diff =3D (ipv6_hdr->vtc_flow= ^ tbl-
> >flows->vtc_flow);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (vtc_flow_diff & htonl(0xF00FFFFF= ))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0continue; > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0find =3D 1;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0remaining_flow_num--;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0}
> +
> +=C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 * Fail to find a matched flow. Insert a new flow= and store the
> +=C2=A0 =C2=A0 =C2=A0 * packet into the flow.
> +=C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0if (find =3D=3D 0) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0item_idx =3D insert_n= ew_item(tbl, pkt, start_time,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0INVALID_ARRAY_INDEX, sent_seq, true); > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (item_idx =3D=3D I= NVALID_ARRAY_INDEX)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0return -1;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (insert_new_flow(t= bl, &key, ipv6_hdr->vtc_flow, item_idx)
> =3D=3D
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0INVALID_ARRAY_INDEX) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 * Fail to insert a new flow, so delete the
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 * stored packet.
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0delete_item(tbl, item_idx, INVALID_ARRAY_INDEX);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0return -1;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
> +=C2=A0 =C2=A0 =C2=A0}
> +
> +=C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 * Check all packets in the flow and try to find = a neighbor for
> +=C2=A0 =C2=A0 =C2=A0 * the input packet.
> +=C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0cur_idx =3D tbl->flows[i].start_index;
> +=C2=A0 =C2=A0 =C2=A0prev_idx =3D cur_idx;
> +=C2=A0 =C2=A0 =C2=A0do {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cmp =3D check_seq_opt= ion(&(tbl->items[cur_idx]), tcp_hdr,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0sent_seq, 0, pkt->l4_len, tcp_dl, 0,<= br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0true);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (cmp) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0if (merge_two_tcp_packets(&(tbl->items[cur_idx]),
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0pkt, cmp, sent_seq, 0, 0)) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 1;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0}
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 * Fail to merge the two packets, as the packet
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 * length is greater than the max value. Store
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 * the packet into the flow.
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0if (insert_new_item(tbl, pkt, start_time, cur_idx,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0sent_seq, true) =3D=3D
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0INVALID_ARRA= Y_INDEX)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -1;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0return 0;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0prev_idx =3D cur_idx;=
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cur_idx =3D tbl->i= tems[cur_idx].next_pkt_idx;
> +=C2=A0 =C2=A0 =C2=A0} while (cur_idx !=3D INVALID_ARRAY_INDEX);
> +
> +=C2=A0 =C2=A0 =C2=A0/* Fail to find a neighbor, so store the packet i= nto the flow. */
> +=C2=A0 =C2=A0 =C2=A0if (insert_new_item(tbl, pkt, start_time, prev_id= x, sent_seq,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0true) =3D=3D INVALID_ARRAY_INDEX)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -1;
> +
> +=C2=A0 =C2=A0 =C2=A0return 0;
> +}
> +
> +uint16_t
> +gro_tcp6_tbl_timeout_flush(struct gro_tcp6_tbl *tbl,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t flush_timest= amp,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_mbuf **out= ,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t nb_out)
> +{
> +=C2=A0 =C2=A0 =C2=A0uint16_t k =3D 0;
> +=C2=A0 =C2=A0 =C2=A0uint32_t i, j;
> +=C2=A0 =C2=A0 =C2=A0uint32_t max_flow_num =3D tbl->max_flow_num; > +
> +=C2=A0 =C2=A0 =C2=A0for (i =3D 0; i < max_flow_num; i++) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (unlikely(tbl->= flow_num =3D=3D 0))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0return k;
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0j =3D tbl->flows[i= ].start_index;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0while (j !=3D INVALID= _ARRAY_INDEX) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0if (tbl->items[j].start_time <=3D flush_timestamp) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0out[k++] =3D tbl->items[j].firstseg;<= br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (tbl->items[j].nb_merged > 1) > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0update_heade= r(&(tbl->items[j]));
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * Delete the packet and get the next > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * packet in the flow.
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0j =3D delete_item(tbl, j,
> INVALID_ARRAY_INDEX);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tbl->flows[i].start_index =3D j;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (j =3D=3D INVALID_ARRAY_INDEX)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tbl->flow= _num--;
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (unlikely(k =3D=3D nb_out))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return k; > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0} else
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * The left packets in this flow won'= ;t be
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * timeout. Go to check other flows.
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0return k;
> +}
> +
> +uint32_t
> +gro_tcp6_tbl_pkt_count(void *tbl)
> +{
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp6_tbl *gro_tbl =3D tbl;
> +
> +=C2=A0 =C2=A0 =C2=A0if (gro_tbl)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return gro_tbl->it= em_num;
> +
> +=C2=A0 =C2=A0 =C2=A0return 0;
> +}
> diff --git a/lib/gro/gro_tcp6.h b/lib/gro/gro_tcp6.h new file mode 100= 644
> index 0000000000..91325c0da2
> --- /dev/null
> +++ b/lib/gro/gro_tcp6.h
> @@ -0,0 +1,150 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2017 Intel Corporation
> + */
> +
> +#ifndef _GRO_TCP6_H_
> +#define _GRO_TCP6_H_
> +
> +#define INVALID_ARRAY_INDEX 0xffffffffUL #define
> +GRO_TCP6_TBL_MAX_ITEM_NUM (1024UL * 1024UL)
> +
> +/* Header fields representing a TCP/IPv6 flow */ struct tcp6_flow_key= {
> +=C2=A0 =C2=A0 =C2=A0struct rte_ether_addr eth_saddr;
> +=C2=A0 =C2=A0 =C2=A0struct rte_ether_addr eth_daddr;
> +=C2=A0 =C2=A0 =C2=A0uint8_t=C2=A0 src_addr[16];
> +=C2=A0 =C2=A0 =C2=A0uint8_t=C2=A0 dst_addr[16];
> +
> +=C2=A0 =C2=A0 =C2=A0uint32_t recv_ack;
> +=C2=A0 =C2=A0 =C2=A0uint16_t src_port;
> +=C2=A0 =C2=A0 =C2=A0uint16_t dst_port;
> +};
> +
> +struct gro_tcp6_flow {
> +=C2=A0 =C2=A0 =C2=A0struct tcp6_flow_key key;
> +=C2=A0 =C2=A0 =C2=A0rte_be32_t vtc_flow;
> +=C2=A0 =C2=A0 =C2=A0/*
> +=C2=A0 =C2=A0 =C2=A0 * The index of the first packet in the flow.
> +=C2=A0 =C2=A0 =C2=A0 * INVALID_ARRAY_INDEX indicates an empty flow. > +=C2=A0 =C2=A0 =C2=A0 */
> +=C2=A0 =C2=A0 =C2=A0uint32_t start_index;
> +};
> +
> +/*
> + * TCP/IPv6 reassembly table structure.
> + */
> +struct gro_tcp6_tbl {
> +=C2=A0 =C2=A0 =C2=A0/* item array */
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp_item *items;
> +=C2=A0 =C2=A0 =C2=A0/* flow array */
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp6_flow *flows;
> +=C2=A0 =C2=A0 =C2=A0/* current item number */
> +=C2=A0 =C2=A0 =C2=A0uint32_t item_num;
> +=C2=A0 =C2=A0 =C2=A0/* current flow num */
> +=C2=A0 =C2=A0 =C2=A0uint32_t flow_num;
> +=C2=A0 =C2=A0 =C2=A0/* item array size */
> +=C2=A0 =C2=A0 =C2=A0uint32_t max_item_num;
> +=C2=A0 =C2=A0 =C2=A0/* flow array size */
> +=C2=A0 =C2=A0 =C2=A0uint32_t max_flow_num;
> +};
> +
> +/**
> + * This function creates a TCP/IPv6 reassembly table.
> + *
> + * @param socket_id
> + *=C2=A0 Socket index for allocating the TCP/IPv6 reassemble table > + * @param max_flow_num
> + *=C2=A0 The maximum number of flows in the TCP/IPv6 GRO table
> + * @param max_item_per_flow
> + *=C2=A0 The maximum number of packets per flow
> + *
> + * @return
> + *=C2=A0 - Return the table pointer on success.
> + *=C2=A0 - Return NULL on failure.
> + */
> +void *gro_tcp6_tbl_create(uint16_t socket_id,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t max_flow_num= ,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t max_item_per= _flow);
> +
> +/**
> + * This function destroys a TCP/IPv6 reassembly table.
> + *
> + * @param tbl
> + *=C2=A0 Pointer pointing to the TCP/IPv6 reassembly table.
> + */
> +void gro_tcp6_tbl_destroy(void *tbl);
> +
> +/**
> + * This function merges a TCP/IPv6 packet. It doesn't process the=
> +packet,
> + * which has SYN, FIN, RST, PSH, CWR, ECE or URG set, or doesn't = have
> + * payload.
> + *
> + * This function doesn't check if the packet has correct checksum= s and
> + * doesn't re-calculate checksums for the merged packet. Addition= ally,
> + * it assumes the packets are complete (i.e., MF=3D=3D0 && fr= ag_off=3D=3D0),
> + * when IP fragmentation is possible (i.e., DF=3D=3D0). It returns th= e
> + * packet, if the packet has invalid parameters (e.g. SYN bit is set)=
> + * or there is no available space in the table.
> + *
> + * @param pkt
> + *=C2=A0 Packet to reassemble
> + * @param tbl
> + *=C2=A0 Pointer pointing to the TCP/IPv6 reassembly table
> + * @start_time
> + *=C2=A0 The time when the packet is inserted into the table
> + *
> + * @return
> + *=C2=A0 - Return a positive value if the packet is merged.
> + *=C2=A0 - Return zero if the packet isn't merged but stored in t= he table.
> + *=C2=A0 - Return a negative value for invalid parameters or no avail= able
> + *=C2=A0 =C2=A0 space in the table.
> + */
> +int32_t gro_tcp6_reassemble(struct rte_mbuf *pkt,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct gro_tcp6_tbl *= tbl,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t start_time);=
> +
> +/**
> + * This function flushes timeout packets in a TCP/IPv6 reassembly
> +table,
> + * and without updating checksums.
> + *
> + * @param tbl
> + *=C2=A0 TCP/IPv6 reassembly table pointer
> + * @param flush_timestamp
> + *=C2=A0 Flush packets which are inserted into the table before or at= the
> + *=C2=A0 flush_timestamp.
> + * @param out
> + *=C2=A0 Pointer array used to keep flushed packets
> + * @param nb_out
> + *=C2=A0 The element number in 'out'. It also determines the = maximum number
> +of
> + *=C2=A0 packets that can be flushed finally.
> + *
> + * @return
> + *=C2=A0 The number of flushed packets
> + */
> +uint16_t gro_tcp6_tbl_timeout_flush(struct gro_tcp6_tbl *tbl,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t flush_timest= amp,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_mbuf **out= ,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t nb_out);
> +
> +/**
> + * This function returns the number of the packets in a TCP/IPv6
> + * reassembly table.
> + *
> + * @param tbl
> + *=C2=A0 TCP/IPv6 reassembly table pointer
> + *
> + * @return
> + *=C2=A0 The number of packets in the table
> + */
> +uint32_t gro_tcp6_tbl_pkt_count(void *tbl);
> +
> +/*
> + * Check if two TCP/IPv6 packets belong to the same flow.
> + */
> +static inline int
> +is_same_tcp6_flow(struct tcp6_flow_key k1, struct tcp6_flow_key k2) {=
> +=C2=A0 =C2=A0 =C2=A0return (!memcmp(&k1, &k2, sizeof(struct t= cp6_flow_key))); }
> +
> +#endif
> diff --git a/lib/gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c index=
> 3be4deb7c7..56b30b8c98 100644
> --- a/lib/gro/gro_vxlan_tcp4.c
> +++ b/lib/gro/gro_vxlan_tcp4.c
> @@ -7,6 +7,7 @@
>=C2=A0 #include <rte_ethdev.h>
>=C2=A0 #include <rte_udp.h>
>
> +#include "gro_tcp.h"
>=C2=A0 #include "gro_vxlan_tcp4.h"
>
>=C2=A0 void *
> @@ -248,7 +249,7 @@ merge_two_vxlan_tcp4_packets(struct
> gro_vxlan_tcp4_item *item,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t outer_i= p_id,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t ip_id)<= br> >=C2=A0 {
> -=C2=A0 =C2=A0 =C2=A0if (merge_two_tcp4_packets(&item->inner_it= em, pkt, cmp,
> sent_seq,
> +=C2=A0 =C2=A0 =C2=A0if (merge_two_tcp_packets(&item->inner_ite= m, pkt, cmp, sent_seq,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ip_id, pkt->outer_l2_len +
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pkt->outer_l3_len)) {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Update the ou= ter IPv4 ID to the large value. */ diff --git
> a/lib/gro/gro_vxlan_tcp4.h b/lib/gro/gro_vxlan_tcp4.h index
> 7832942a68..d68d5fcd5b 100644
> --- a/lib/gro/gro_vxlan_tcp4.h
> +++ b/lib/gro/gro_vxlan_tcp4.h
> @@ -5,6 +5,7 @@
>=C2=A0 #ifndef _GRO_VXLAN_TCP4_H_
>=C2=A0 #define _GRO_VXLAN_TCP4_H_
>
> +#include "gro_tcp.h"
>=C2=A0 #include "gro_tcp4.h"
>
>=C2=A0 #define GRO_VXLAN_TCP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL) @@ - > 36,7 +37,7 @@ struct gro_vxlan_tcp4_flow {=C2=A0 };
>
>=C2=A0 struct gro_vxlan_tcp4_item {
> -=C2=A0 =C2=A0 =C2=A0struct gro_tcp4_item inner_item;
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp_item inner_item;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* IPv4 ID in the outer IPv4 header */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t outer_ip_id;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Indicate if outer IPv4 ID can be ignored = */ diff --git
> a/lib/gro/meson.build b/lib/gro/meson.build index e4fa2958bd..dbce0522= 0d
> 100644
> --- a/lib/gro/meson.build
> +++ b/lib/gro/meson.build
> @@ -4,6 +4,7 @@
>=C2=A0 sources =3D files(
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'rte_gro.c',
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'gro_tcp4.c',
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 'gro_tcp6.c',
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'gro_udp4.c',
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'gro_vxlan_tcp4.c',
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'gro_vxlan_udp4.c',
> diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c index
> e35399fd42..d824eebd93 100644
> --- a/lib/gro/rte_gro.c
> +++ b/lib/gro/rte_gro.c
> @@ -8,6 +8,7 @@
>
>=C2=A0 #include "rte_gro.h"
>=C2=A0 #include "gro_tcp4.h"
> +#include "gro_tcp6.h"
>=C2=A0 #include "gro_udp4.h"
>=C2=A0 #include "gro_vxlan_tcp4.h"
>=C2=A0 #include "gro_vxlan_udp4.h"
> @@ -20,14 +21,16 @@ typedef uint32_t (*gro_tbl_pkt_count_fn)(void *tbl= );
>
>=C2=A0 static gro_tbl_create_fn tbl_create_fn[RTE_GRO_TYPE_MAX_NUM] =3D= {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gro_tcp4_tbl_cre= ate, gro_vxlan_tcp4_tbl_create,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gro_udp4_tbl_create, = gro_vxlan_udp4_tbl_create, NULL};
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gro_udp4_tbl_create, = gro_vxlan_udp4_tbl_create,
> gro_tcp6_tbl_create,
> +NULL};
>=C2=A0 static gro_tbl_destroy_fn tbl_destroy_fn[RTE_GRO_TYPE_MAX_NUM] = =3D {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0gro_tcp4_tbl_destroy, gro_vxlan_tcp4_tbl_destroy,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0gro_udp4_tbl_destroy, gro_vxlan_udp4_tbl_destroy,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0gro_tcp6_tbl_destroy,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0NULL};
>=C2=A0 static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NU= M]
> =3D {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0gro_tcp4_tbl_pkt_count,
> gro_vxlan_tcp4_tbl_pkt_count,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0gro_udp4_tbl_pkt_count,
> gro_vxlan_udp4_tbl_pkt_count,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0gro_tcp6_tbl_pkt_count,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0NULL};
>
>=C2=A0 #define IS_IPV4_TCP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) &= & \ @@
> -35,6 +38,12 @@ static gro_tbl_pkt_count_fn
> tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] =3D {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0((ptype & RT= E_PTYPE_L4_FRAG) !=3D RTE_PTYPE_L4_FRAG) &&
> \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(RTE_ETH_IS_TUNN= EL_PKT(ptype) =3D=3D 0))
>
> +/* GRO with extension headers is not supported */ #define
> +IS_IPV6_TCP_PKT(ptype) (RTE_ETH_IS_IPV6_HDR(ptype) && \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0((ptype & RTE_PTY= PE_L4_TCP) =3D=3D RTE_PTYPE_L4_TCP) && \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0((ptype & RTE_PTY= PE_L4_FRAG) !=3D RTE_PTYPE_L4_FRAG) &&
> \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(RTE_ETH_IS_TUNNEL_PK= T(ptype) =3D=3D 0))
> +
>=C2=A0 #define IS_IPV4_UDP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) &= & \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0((ptype & RT= E_PTYPE_L4_UDP) =3D=3D RTE_PTYPE_L4_UDP) && \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(RTE_ETH_IS_TUNN= EL_PKT(ptype) =3D=3D 0))
> @@ -147,7 +156,11 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,<= br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0/* allocate a reassembly table for TCP/IPv4 = GRO */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0struct gro_tcp4_tbl tcp_tbl;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0struct gro_tcp4_flow
> tcp_flows[RTE_GRO_MAX_BURST_ITEM_NUM];
> -=C2=A0 =C2=A0 =C2=A0struct gro_tcp4_item tcp_items[RTE_GRO_MAX_BURST_= ITEM_NUM]
> =3D {{0} };
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp_item tcp_items[RTE_GRO_MAX_BURST_I= TEM_NUM]
> =3D {{0} };
> +
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp6_tbl tcp6_tbl;
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp6_flow
> tcp6_flows[RTE_GRO_MAX_BURST_ITEM_NUM];
> +=C2=A0 =C2=A0 =C2=A0struct gro_tcp_item tcp6_items[RTE_GRO_MAX_BURST_= ITEM_NUM]
> =3D {{0} };
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0/* allocate a reassembly table for UDP/IPv4 = GRO */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0struct gro_udp4_tbl udp_tbl;
> @@ -171,10 +184,10 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0int32_t ret;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t i, unprocess_num =3D 0, nb_after_gr= o =3D nb_pkts;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0uint8_t do_tcp4_gro =3D 0, do_vxlan_tcp_gro = =3D 0, do_udp4_gro =3D 0,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0do_vxlan_udp_gro =3D = 0;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0do_vxlan_udp_gro =3D = 0, do_tcp6_gro =3D 0;
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0if (unlikely((param->gro_types & (RTE= _GRO_IPV4_VXLAN_TCP_IPV4
> |
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GRO_TCP_= IPV4 |
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GRO_TCP_= IPV4 |
> RTE_GRO_TCP_IPV6 |
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GR= O_IPV4_VXLAN_UDP_IPV4 |
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GR= O_UDP_IPV4)) =3D=3D 0))
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return nb_pkts;<= br> > @@ -236,6 +249,18 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,<= br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0do_udp4_gro =3D = 1;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0}
>
> +=C2=A0 =C2=A0 =C2=A0if (param->gro_types & RTE_GRO_TCP_IPV6) {=
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0for (i =3D 0; i < = item_num; i++)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0tcp6_flows[i].start_index =3D INVALID_ARRAY_INDEX;
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tcp6_tbl.flows =3D tc= p6_flows;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tcp6_tbl.items =3D tc= p6_items;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tcp6_tbl.flow_num =3D= 0;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tcp6_tbl.item_num =3D= 0;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tcp6_tbl.max_flow_num= =3D item_num;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0tcp6_tbl.max_item_num= =3D item_num;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0do_tcp6_gro =3D 1; > +=C2=A0 =C2=A0 =C2=A0}
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0for (i =3D 0; i < nb_pkts; i++) {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/*
> @@ -276,6 +301,14 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,<= br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0nb_after_gro--;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0else if (ret < 0)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unprocess_pkts[unprocess_num++] = =3D pkts[i];
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else if (IS_IPV6_TC= P_PKT(pkts[i]->packet_type) &&
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0do_tcp6_gro) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0ret =3D gro_tcp6_reassemble(pkts[i], &tcp6_tbl, 0);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0if (ret > 0)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* merge successfully */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0nb_after_gro--;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0else if (ret < 0)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unprocess_pkts[unprocess_num++] =3D pkts= [i];
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0unprocess_pkts[unprocess_num++] =3D pkts[i];
>=C2=A0 =C2=A0 =C2=A0 =C2=A0}
> @@ -283,9 +316,17 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,<= br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0if ((nb_after_gro < nb_pkts)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 || (unprocess_n= um < nb_pkts)) {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0i =3D 0;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Copy unprocessed p= ackets */
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (unprocess_num >= ; 0) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0memcpy(&pkts[i], unprocess_pkts,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0sizeof(struc= t rte_mbuf *) *
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unprocess_nu= m);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0i =3D unprocess_num;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> +
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Flush all pac= kets from the tables */
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (do_vxlan_tcp= _gro) {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0i =3D
> gro_vxlan_tcp4_tbl_timeout_flush(&vxlan_tcp_tbl,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0i +=3D
> gro_vxlan_tcp4_tbl_timeout_flush(&vxlan_tcp_tbl,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A00, pkt= s, nb_pkts);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
>
> @@ -304,13 +345,11 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0i +=3D gro_udp4_tbl_timeout_flush(&udp_tbl, 0,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&p= kts[i], nb_pkts - i);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Copy unprocessed p= ackets */
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (unprocess_num >= ; 0) {
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0memcpy(&pkts[i], unprocess_pkts,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0sizeof(struc= t rte_mbuf *) *
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unprocess_nu= m);
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (do_tcp6_gro) { > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0i +=3D gro_tcp6_tbl_timeout_flush(&tcp6_tbl, 0,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&pkts[i]= , nb_pkts - i);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0nb_after_gro =3D i + = unprocess_num;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0}
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0return nb_after_gro;
> @@ -323,13 +362,13 @@ rte_gro_reassemble(struct rte_mbuf **pkts,=C2=A0= {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0struct rte_mbuf *unprocess_pkts[nb_pkts]; >=C2=A0 =C2=A0 =C2=A0 =C2=A0struct gro_ctx *gro_ctx =3D ctx;
> -=C2=A0 =C2=A0 =C2=A0void *tcp_tbl, *udp_tbl, *vxlan_tcp_tbl, *vxlan_u= dp_tbl;
> +=C2=A0 =C2=A0 =C2=A0void *tcp_tbl, *udp_tbl, *vxlan_tcp_tbl, *vxlan_u= dp_tbl, *tcp6_tbl;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t current_time;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0uint16_t i, unprocess_num =3D 0;
> -=C2=A0 =C2=A0 =C2=A0uint8_t do_tcp4_gro, do_vxlan_tcp_gro, do_udp4_gr= o,
> do_vxlan_udp_gro;
> +=C2=A0 =C2=A0 =C2=A0uint8_t do_tcp4_gro, do_vxlan_tcp_gro, do_udp4_gr= o,
> do_vxlan_udp_gro,
> +do_tcp6_gro;
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0if (unlikely((gro_ctx->gro_types & > (RTE_GRO_IPV4_VXLAN_TCP_IPV4 |
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GRO_TCP_= IPV4 |
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GRO_TCP_= IPV4 |
> RTE_GRO_TCP_IPV6 |
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GR= O_IPV4_VXLAN_UDP_IPV4 |
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GR= O_UDP_IPV4)) =3D=3D 0))
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return nb_pkts;<= br> > @@ -338,6 +377,7 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0vxlan_tcp_tbl =3D gro_ctx-
> >tbls[RTE_GRO_IPV4_VXLAN_TCP_IPV4_INDEX];
>=C2=A0 =C2=A0 =C2=A0 =C2=A0udp_tbl =3D gro_ctx->tbls[RTE_GRO_UDP_IPV= 4_INDEX];
>=C2=A0 =C2=A0 =C2=A0 =C2=A0vxlan_udp_tbl =3D gro_ctx-
> >tbls[RTE_GRO_IPV4_VXLAN_UDP_IPV4_INDEX];
> +=C2=A0 =C2=A0 =C2=A0tcp6_tbl =3D gro_ctx->tbls[RTE_GRO_TCP_IPV6_IN= DEX];
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0do_tcp4_gro =3D (gro_ctx->gro_types &= RTE_GRO_TCP_IPV4) =3D=3D
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GRO_TCP_IPV4= ;
> @@ -347,6 +387,7 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GRO_UDP_IPV4= ;
>=C2=A0 =C2=A0 =C2=A0 =C2=A0do_vxlan_udp_gro =3D (gro_ctx->gro_types = &
> RTE_GRO_IPV4_VXLAN_UDP_IPV4) =3D=3D
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RTE_GRO_IPV4_VXL= AN_UDP_IPV4;
> +=C2=A0 =C2=A0 =C2=A0do_tcp6_gro =3D (gro_ctx->gro_types & RTE_= GRO_TCP_IPV6) =3D=3D
> +RTE_GRO_TCP_IPV6;
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0current_time =3D rte_rdtsc();
>
> @@ -371,6 +412,11 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0if (gro_udp4_reassemble(pkts[i], udp_tbl,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0current_time) < 0)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unprocess_pkts[unprocess_num++] = =3D pkts[i];
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else if (IS_IPV6_TC= P_PKT(pkts[i]->packet_type) &&
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0do_tcp6_gro) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0if (gro_tcp6_reassemble(pkts[i], tcp6_tbl,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0current_time) < 0)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unprocess_pkts[unprocess_num++] =3D pkts= [i];
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0unprocess_pkts[unprocess_num++] =3D pkts[i];
>=C2=A0 =C2=A0 =C2=A0 =C2=A0}
> @@ -426,6 +472,15 @@ rte_gro_timeout_flush(void *ctx,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gro_ctx->tbls[RTE_GRO_UDP_IPV4_= INDEX],
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0flush_timestamp,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&out[num], left_nb_out);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0left_nb_out =3D max_n= b_out - num;
> +=C2=A0 =C2=A0 =C2=A0}
> +
> +=C2=A0 =C2=A0 =C2=A0if ((gro_types & RTE_GRO_TCP_IPV6) &&= left_nb_out > 0) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0num +=3D gro_tcp6_tbl= _timeout_flush(
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gro_ctx->tbls[RTE_GRO_TCP_IPV6_INDEX]= ,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0flush_timestamp,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&out[num], left_nb_out);
> +
>=C2=A0 =C2=A0 =C2=A0 =C2=A0}
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0return num;
> diff --git a/lib/gro/rte_gro.h b/lib/gro/rte_gro.h index
> 9f9ed4935a..c83dfd9ad1 100644
> --- a/lib/gro/rte_gro.h
> +++ b/lib/gro/rte_gro.h
> @@ -38,6 +38,9 @@ extern "C" {
>=C2=A0 #define RTE_GRO_IPV4_VXLAN_UDP_IPV4_INDEX 3=C2=A0 #define
> RTE_GRO_IPV4_VXLAN_UDP_IPV4 (1ULL <<
> RTE_GRO_IPV4_VXLAN_UDP_IPV4_INDEX)
>=C2=A0 /**< VxLAN UDP/IPv4 GRO flag. */
> +#define RTE_GRO_TCP_IPV6_INDEX 4
> +#define RTE_GRO_TCP_IPV6 (1ULL << RTE_GRO_TCP_IPV6_INDEX) /**&l= t;
> TCP/IPv6
> +GRO flag. */
>
>=C2=A0 /**
>=C2=A0 =C2=A0* Structure used to create GRO context objects or used to = pass
> --
> 2.25.1

--000000000000ae7e4005fbcc312a--