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 8DF8542ADA; Fri, 12 May 2023 04:47:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E8DD406B7; Fri, 12 May 2023 04:47:14 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 6347E40223 for ; Fri, 12 May 2023 04:47:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683859632; x=1715395632; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ER/zQUzqGwRFUiFATdWDPzDtqoExTf5OvsUrCQ8oEDY=; b=J+4k/kevYVDSIIOB16uNtq11lNEbfkKupvq9zkMsA9TPGYZH+af/Xxwp C7Wc02V0rdRkPfZbjXdxMpI9kiFH8jU3taks+quLkHLDjMnajUDLk5M0X lNFnYXHUm/LSXMRY2xElMn83Ji/kOZn092dAAY2TdCtKZyte6OOtOXS4V 9wAo+GV3vbYF1JYsiM030WJ1YwLzHYb+jKwn8tt/b/L6ZeT+4Zirsw6HB oWil0uvy3Ma+IRAdFTeGboGuI3uwoy885agGOWYmmQTnCSAaQiLvGomE2 noEnCx7JEJ/b1qRDKwNqKlrV/dLucbsfI+JFZcwsQcxp5wda6BQtsk0al g==; X-IronPort-AV: E=McAfee;i="6600,9927,10707"; a="378824030" X-IronPort-AV: E=Sophos;i="5.99,269,1677571200"; d="scan'208";a="378824030" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2023 19:47:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10707"; a="730638182" X-IronPort-AV: E=Sophos;i="5.99,269,1677571200"; d="scan'208";a="730638182" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga008.jf.intel.com with ESMTP; 11 May 2023 19:47:08 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 11 May 2023 19:47:08 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 11 May 2023 19:47:07 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Thu, 11 May 2023 19:47:07 -0700 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (104.47.74.48) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Thu, 11 May 2023 19:47:06 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mk5AR1Xq4f9ndyEz7X1Z9CIz9xVP7JgKCLaUN58WBKPvOBj9Zn5H/5uKwFSIh9lBpWvQiBHgGzkT3iafDytYBiOpiGk26sxRDkn56+a6xykjYT0EOuzt23n55drkGoslOpjAFNa/QpDPA4urTSe3cVyepPT+t7gQSEoivBpYEr9p+LNY6S2PlV2ySIbmCscfNPG9mL/acu1H9LHmVXvxRoEqDZAfY9ivu0CZ8Iu52gdTaWuDhsNuBQzsuv0No7/92lf3UfCurj2H+FshOMbhA0HJzoCAb7x4H1pCFTQQlhpFocgMJtw+sdoCShQWNhxoSu5K8A6/osKD42Krm8lgeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=O68k9aMJc00WzqdZireNZsa1mP2RHKCV0gyFrxV3K1g=; b=OYtOuwLJGIjtzKBjBEygfRB6WDqkM8PNjPTwlE5piz8Vi2eXolv1iA+ymvcT7fgO5vd68eaUtUOjCZPq9flNEU2aeBXdI4uiqEkIQfs/I8Z0VctyAJy1xqSRTzYEm/cIXQ7l0eZ2HXypVon0wwORuTYIliB7L1XxrNTbZOZRR8QDJXT6TPPg1Znb3rn0FbFdmMxrxf0P6FI0BjT/4AlyJg2bgl+wfzgy2jZPvN0yg2gWnkNWHdx+GHPVYSObkDstrpSQUOLiywv6nwzpwHiH1DzYmwEf5jLSN5+bE74hJ1S8PwN5gsXMlO12X8asDk/gofVZAfOuoOj/q6ISQ9V+mQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from CY5PR11MB6487.namprd11.prod.outlook.com (2603:10b6:930:31::17) by DM4PR11MB7278.namprd11.prod.outlook.com (2603:10b6:8:10a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.21; Fri, 12 May 2023 02:47:03 +0000 Received: from CY5PR11MB6487.namprd11.prod.outlook.com ([fe80::6dae:8e03:4c29:4143]) by CY5PR11MB6487.namprd11.prod.outlook.com ([fe80::6dae:8e03:4c29:4143%5]) with mapi id 15.20.6363.033; Fri, 12 May 2023 02:47:03 +0000 From: "Hu, Jiayu" To: Kumara Parameshwaran CC: "dev@dpdk.org" Subject: RE: [PATCH v2] gro : ipv6 changes to support GRO for TCP/ipv6 Thread-Topic: [PATCH v2] gro : ipv6 changes to support GRO for TCP/ipv6 Thread-Index: AQHY5K/jbz58PLF/HkSmDFlYkOwCka9XJyOQ Date: Fri, 12 May 2023 02:47:03 +0000 Message-ID: References: <20221020180717.47036-1-kumaraparmesh92@gmail.com> <20221020181425.48006-1-kumaraparmesh92@gmail.com> In-Reply-To: <20221020181425.48006-1-kumaraparmesh92@gmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CY5PR11MB6487:EE_|DM4PR11MB7278:EE_ x-ms-office365-filtering-correlation-id: 9cc5c0a1-54bd-439e-c609-08db52932aa0 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TcI+fl4sAW19obl4hZ/xZjUYIalqh0LHzwmKubDmtFTXJzvwhUMOpT4GlN4dufiaGelMBW84d7NUHL7/U3DN+yF+piBcsFORtF60Ay5GmepFI4wUyVJvv8zvpMgCh4pOtVLZeX9/5M5L0uhLb+5Kifi78pF9qMcHEk6ljTnI8u+16ir4WQWdrsAJa0YVB9VDmgJbubyH9r/ZmOWpZOW4pPi6Pl93Ik2XuPtEg6jnH6q1whBQSMk6wxFjkv1EFFTl2FUhYrND64uEgPwO8Rfd2Wv1UYTBPnGK0kfc635MpmAcDk3UciWLmbBE4qVvekiT92sK5B98aERVFdm5y8JndUnHWd/4V+ZUbCTQ6nTm3ZJ8G8ZFjgNUZ8zh1iyrnNBYeb12fhkWIMhd1IJBZ7tq/JXW9aKPEzwrpfFr1XOjXEpvFNXkk7I/PtZR21RI0zoo538Cc+3sgnB7Ue3V14uqvrVcXjlC137MC4CZgYuxVuit3QaEfbl0tpWJicHmjnP/UjUHTwVCPf3Vj+TKDQRXEL1o40m9RM0LY9dAICrZF8tIKmx0cNbTMWwWWpCZOcXcD2bGX51ljpGyUpSfLu0d6VsUkZSgGciK7+Lik8BP+i9eI0VGZ6zISHocbbXUAxGz x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CY5PR11MB6487.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(396003)(39860400002)(366004)(376002)(136003)(451199021)(33656002)(86362001)(4326008)(316002)(6916009)(76116006)(66446008)(64756008)(66556008)(66476007)(66946007)(478600001)(7696005)(41300700001)(55016003)(5660300002)(71200400001)(8936002)(82960400001)(52536014)(2906002)(30864003)(8676002)(38070700005)(38100700002)(122000001)(9686003)(186003)(6506007)(26005)(53546011)(83380400001)(559001)(579004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?PqQMq7vBvdVLFOWlKfyvT51TL47iLNHo3BEFb/2665ezu6A5sIRUKF6ymhwf?= =?us-ascii?Q?Jh1vCOJJchNj6BtXxvz6dotM9Mx+1Q2ucyQ6sjay3yO5kie/cuT8k7vI21pu?= =?us-ascii?Q?Ls1jFjhyhVijHP4CIIRFmPbRKoVIDOAPz5MeShQ/cypduYl0B+TQimca6rBr?= =?us-ascii?Q?VFWClVe/3OZQK5J9W38icX5srGZkDVsIvcc1ug3A7rViPqEWHwJfxjx+gZQf?= =?us-ascii?Q?aHO3gP5wIzxuR6W+fyHg8t17GZ/PJvt/G3TirKA08lGlhwvGHUxtpH+qzKAv?= =?us-ascii?Q?72+RaSEVU6hZtYQAP5USUH+GT/LCfuEHPey6tqTdTuEkE4CRDqQlGvitH9MX?= =?us-ascii?Q?SnYsPJE7P2sfeMGd3T6xuhhsnRcEiMPXcd7pOi0W1VH9i8eZk4M6GAoYXl2m?= =?us-ascii?Q?oTXPMm1W5UtJTthBrg1wGqtkv+K6j3TpCqWMldJWRW1OTQNYrzkyP2Ht4QoA?= =?us-ascii?Q?g39m2SKU9EYGdN12WN/tMbw0pFmZQzDWNxlfZ7o6+HgrDz+YUQay58K7T8NS?= =?us-ascii?Q?eTsbvoDX3BGN7FN5pec2v6yQrGUWoPXtUGsa1LHs21Ky+N4jYtSp47NPf7ep?= =?us-ascii?Q?3EZOXHyfpvfinXflrwyYmcI5HuvmYYLSYyQlqFKd90HYrbxZDcXQ44nt6hx7?= =?us-ascii?Q?QKlyZM4tvr/CTA9Azrx5SUdrtAs0O2Zmr6tts/8vCaLVtDp8IMNnwvWzoJY1?= =?us-ascii?Q?0SNozfVRkYZ6IXhRJzorEtQeD3809gSZNn6SQvAdSGvWcm2kA35KGTcGNKLU?= =?us-ascii?Q?xom4DWQxE3X6iRBapEDksg9Xq51ENXVv69i3KRivWHUI+uJCnhcvt+DV8NOu?= =?us-ascii?Q?6w3NGXyf8kOHmml+dhzrzOvxul46TTe0AX5wIsz2bH6BqcL6JZSKf+8Bu0EW?= =?us-ascii?Q?OLJAgPPvnpJuoiBu7ZWFSwqLRjXdWIjxOF0JxAj/8NsSIyWcKSOTm9Wx4cjm?= =?us-ascii?Q?BrjWvaEm67TTjybPXLMCm3nyKuHXaycvUpzmtN4z9Oq3YGIv/FyLQf/8WPZo?= =?us-ascii?Q?NfkVPlM3uSYAaw+RsvFt3z5H+nB5Q5wG56iEummBO4vk93nCjdjpb/zhfDaF?= =?us-ascii?Q?lRRU2gYOTh5Hg6cdSQJPA4+fwHvwU4kV53BS3oSj7Q2EPvNUDCRqrY6emkQq?= =?us-ascii?Q?knvoGFSwadVM6/qiwM8y1EOkvl9HqxHF4NqbQAqOI5sTzND+H5JlsyGykSZK?= =?us-ascii?Q?oMXSBfLlO5PgDXzDm+/Xar+yiQuxQORcmbAqE4DgA0PqSZTWToszAZrBJgCT?= =?us-ascii?Q?zeLSCpvvQ48a5h45GcoLBAdJPCiy2xbepfPgQFQtCjOz2EvRMxE345Zu5Qvb?= =?us-ascii?Q?WM9hSSoaMfuSGe8NN5FhqsbgezSR8f/i2VdfzkUiIyuShJLFf8Cz3bk7vrnd?= =?us-ascii?Q?zW0BQZvW2MITD+l/BaQIYTWZwO2dZQRN0Vq7QC4AgeR9Htt1yCp2i0WHvqbG?= =?us-ascii?Q?jRE1u1rgg3FJf6c2pUbC0y/sHu300kfruPHABVo7yhXJlf8sHnR6HFtbNpVP?= =?us-ascii?Q?Pet4NjA4HQTmF0bAWL/SszUpeg3T3ou5gvv7LKM0RfxBI/D3x9ZJHyqStbky?= =?us-ascii?Q?U+srXNuj7khQ3wkS08Q=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY5PR11MB6487.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9cc5c0a1-54bd-439e-c609-08db52932aa0 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 May 2023 02:47:03.1314 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: EdvFcHGfuiV0mNMj02uDnJo9O5DpWR8cRCVcPUVx+1Qee9SeYIDFKRH2uKiMg8HoohJFLXXTdm/uizfNvwiP+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB7278 X-OriginatorOrg: intel.com 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 Hi Kumar, For TCP/IPv4 and TCP/IPv6, the TCP layer is the same and the difference is 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 too much code duplication in gro_tcp4.c and = gro_tcp6.c in current implementation. 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 structure 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. 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 >=20 > From: Kumara Parameshwaran >=20 > The patch adds GRO support for TCP/ipv6 packets. This does not include th= e > support for vxlan, udp ipv6 packets. >=20 > 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 contain > extension headers. > * The logic for the TCP coalescing remains the same, in ipv6 header > 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. >=20 > 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 10064= 4 > lib/gro/gro_tcp.h create mode 100644 lib/gro/gro_tcp6.c create mode > 100644 lib/gro/gro_tcp6.h >=20 > diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h new file mode 100644 i= ndex > 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 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) \ > + (((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 >=20 > #include "gro_tcp4.h" > +#include "gro_tcp.h" >=20 > 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; >=20 > - 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_ >=20 > -#include > - > #define INVALID_ARRAY_INDEX 0xffffffffUL #define > GRO_TCP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL) >=20 > -/* > - * 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) \ > - (((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; > }; >=20 > -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)); > } >=20 > -/* > - * 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, char > *) + > - 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 100644 > 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_len); > + 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, ECE > + * 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_len - > 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 ^ tbl- > >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 100644 > 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 >=20 > +#include "gro_tcp.h" > #include "gro_vxlan_tcp4.h" >=20 > 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_ >=20 > +#include "gro_tcp.h" > #include "gro_tcp4.h" >=20 > #define GRO_VXLAN_TCP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL) @@ - > 36,7 +37,7 @@ struct gro_vxlan_tcp4_flow { }; >=20 > 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..dbce05220d > 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 @@ >=20 > #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); >=20 > 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}; >=20 > #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)) >=20 > +/* 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} }; >=20 > /* 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; >=20 > 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; > } >=20 > + 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; > + } >=20 > 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); > } >=20 > @@ -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; > } >=20 > 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_tbl; > 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; >=20 > 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]; >=20 > 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; >=20 > current_time =3D rte_rdtsc(); >=20 > @@ -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); > + > } >=20 > 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. */ >=20 > /** > * Structure used to create GRO context objects or used to pass > -- > 2.25.1