From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30053.outbound.protection.outlook.com [40.107.3.53]) by dpdk.org (Postfix) with ESMTP id D40211B617 for ; Wed, 27 Jun 2018 01:58:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ICnsfWKI0SHjeEmfhrGZL2xtd/bok7bnDOQX645zyBA=; b=nWRTpCsdB82xADOv09bTGKfF6RHOvoeHCu9GAcXZ+E74xh8cStjDCucdpTASaZ4aitpum4SYRqkx2mcTDYaW2bX1Ct4JO5DG/jR9EoG9ZgJP9o0jrzOLoen9RWNdPdBhuiorZopeyeYKOJTxdNRfK76oRJWWTyx8R/EZYcEEEjM= Received: from HE1PR0501MB2314.eurprd05.prod.outlook.com (10.168.34.19) by HE1PR0501MB2762.eurprd05.prod.outlook.com (10.172.125.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.24; Tue, 26 Jun 2018 23:58:46 +0000 Received: from HE1PR0501MB2314.eurprd05.prod.outlook.com ([fe80::9c25:4bf1:cc2a:7e54]) by HE1PR0501MB2314.eurprd05.prod.outlook.com ([fe80::9c25:4bf1:cc2a:7e54%3]) with mapi id 15.20.0884.024; Tue, 26 Jun 2018 23:58:46 +0000 From: Ophir Munk To: Jiayu Hu , "dev@dpdk.org" CC: "xiao.w.wang@intel.com" , "konstantin.ananyev@intel.com" , "yuwei1.zhang@intel.com" , "bernard.iremonger@intel.com" , Thomas Monjalon Thread-Topic: [dpdk-dev] [PATCH v3 1/3] gso: support UDP/IPv4 fragmentation Thread-Index: AQHUCexZLQu33e7zNEW+aGewmPUmxaRzLXZw Date: Tue, 26 Jun 2018 23:58:46 +0000 Message-ID: References: <1529205194-87434-1-git-send-email-jiayu.hu@intel.com> <1529646843-45903-1-git-send-email-jiayu.hu@intel.com> <1529646843-45903-2-git-send-email-jiayu.hu@intel.com> In-Reply-To: <1529646843-45903-2-git-send-email-jiayu.hu@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=ophirmu@mellanox.com; x-originating-ip: [85.250.91.11] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1PR0501MB2762; 7:BTjKVYrsdrV2u2JREq0EEpKN1iYrRNy9M4rpDfyyTZ9iuPR0PNv6Tx941nJwcr/m+ZpBELOqPpkBsLNf9e+u3SwxWMpTYWLwlb6nnt9xddW9JTgW2WLoGlgRJT+uxJDMp5vF66DBaQKdGOHborTQ2CTOd3F3U/BDuYhXIyADJGl1fDzVu3rBPkkfez65WpAmpH64oa5LSqKYcC+L3wEW3O9FQd5+3FEb2eOcQ0+96p3E1SJuwKBjuxyMKqIzdhmt x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 46160ecd-0040-4b44-5dbc-08d5dbc0c14e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:HE1PR0501MB2762; x-ms-traffictypediagnostic: HE1PR0501MB2762: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(228905959029699); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:HE1PR0501MB2762; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0501MB2762; x-forefront-prvs: 071518EF63 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(376002)(136003)(396003)(346002)(13464003)(199004)(189003)(76176011)(68736007)(8676002)(7736002)(86362001)(26005)(74316002)(186003)(305945005)(5660300001)(7696005)(2900100001)(81156014)(6116002)(8936002)(99286004)(110136005)(3846002)(106356001)(14444005)(54906003)(446003)(5250100002)(11346002)(486006)(476003)(102836004)(6506007)(53546011)(316002)(81166006)(2501003)(6246003)(14454004)(478600001)(66066001)(105586002)(9686003)(33656002)(4326008)(55016002)(53936002)(25786009)(229853002)(2906002)(6436002)(97736004)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2762; H:HE1PR0501MB2314.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: jE4tTIKO6t3unaR6pdLvauISpcjcEbEkHfsE3dVaWgULQiqwOijQEsjIuP7Yin7foaqFaALvvUHRDK5JZsqVy+QC5jQHt4nQKAHIG4o7qfBn/xAw7HnCgCoI/p5xgQZAqsPpJSGQzE5eAIeG1K7503TfFebAuulkbyMej23GMsN1vIqEd1upmpsc8+ejRWUNgKFjxntwX4g8iie9P+YJi7q/Fl1w2i3tz3o0VKPJNf/7+YoI8zHkOo+tJCyvoC6ZfX4zplJtcmmWMnjp/pAa2CPeg4wIGUtqivMsPrlNKL6g7Ep/1zl1LctLE/aiCNGjFUG4rv/azlyheu/u3CiItU9hdgL2Pp+KShjXibgAiks= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46160ecd-0040-4b44-5dbc-08d5dbc0c14e X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Jun 2018 23:58:46.4434 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2762 Subject: Re: [dpdk-dev] [PATCH v3 1/3] gso: support UDP/IPv4 fragmentation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2018 23:58:50 -0000 Hi, Please find some comments below. > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Jiayu Hu > Sent: Friday, June 22, 2018 8:54 AM > To: dev@dpdk.org > Cc: xiao.w.wang@intel.com; konstantin.ananyev@intel.com; > yuwei1.zhang@intel.com; bernard.iremonger@intel.com; Thomas Monjalon > ; Jiayu Hu > Subject: [dpdk-dev] [PATCH v3 1/3] gso: support UDP/IPv4 fragmentation >=20 > This patch adds GSO support for UDP/IPv4 packets. Supported packets may > include a single VLAN tag. UDP/IPv4 GSO doesn't check if input packets ha= ve > correct checksums, and doesn't update checksums for output packets (the > responsibility for this lies with the application). > Additionally, UDP/IPv4 GSO doesn't process IP fragmented packets. >=20 > UDP/IPv4 GSO uses two chained MBUFs, one direct MBUF and one indrect > MBUF, to organize an output packet. The direct MBUF stores the packet > header, while the indirect mbuf simply points to a location within the or= iginal > packet's payload. Consequently, use of UDP GSO requires multi-segment > MBUF support in the TX functions of the NIC driver. >=20 > If a packet is GSO'd, UDP/IPv4 GSO reduces its MBUF refcnt by 1. As a res= ult, > when all of its GSOed segments are freed, the packet is freed automatical= ly. >=20 > Signed-off-by: Jiayu Hu > --- > lib/librte_gso/Makefile | 1 + > lib/librte_gso/gso_common.h | 3 ++ > lib/librte_gso/gso_udp4.c | 81 > +++++++++++++++++++++++++++++++++++++++++++++ > lib/librte_gso/gso_udp4.h | 42 +++++++++++++++++++++++ > lib/librte_gso/meson.build | 2 +- > lib/librte_gso/rte_gso.c | 24 +++++++++++--- > lib/librte_gso/rte_gso.h | 6 +++- > 7 files changed, 152 insertions(+), 7 deletions(-) create mode 100644 > lib/librte_gso/gso_udp4.c create mode 100644 lib/librte_gso/gso_udp4.h >=20 > diff --git a/lib/librte_gso/Makefile b/lib/librte_gso/Makefile index > 3648ec0..1fac53a 100644 > --- a/lib/librte_gso/Makefile > +++ b/lib/librte_gso/Makefile > @@ -19,6 +19,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_GSO) +=3D rte_gso.c > SRCS-$(CONFIG_RTE_LIBRTE_GSO) +=3D gso_common.c > SRCS-$(CONFIG_RTE_LIBRTE_GSO) +=3D gso_tcp4.c > SRCS-$(CONFIG_RTE_LIBRTE_GSO) +=3D gso_tunnel_tcp4.c > +SRCS-$(CONFIG_RTE_LIBRTE_GSO) +=3D gso_udp4.c >=20 > # install this header file > SYMLINK-$(CONFIG_RTE_LIBRTE_GSO)-include +=3D rte_gso.h diff --git > a/lib/librte_gso/gso_common.h b/lib/librte_gso/gso_common.h index > 5ca5974..6cd764f 100644 > --- a/lib/librte_gso/gso_common.h > +++ b/lib/librte_gso/gso_common.h > @@ -31,6 +31,9 @@ > (PKT_TX_TCP_SEG | PKT_TX_IPV4 | PKT_TX_OUTER_IPV4 | \ > PKT_TX_TUNNEL_GRE)) >=20 > +#define IS_IPV4_UDP(flag) (((flag) & (PKT_TX_UDP_SEG | PKT_TX_IPV4)) =3D= =3D > \ > + (PKT_TX_UDP_SEG | PKT_TX_IPV4)) > + > /** > * Internal function which updates the UDP header of a packet, following > * segmentation. This is required to update the header's datagram length > field. > diff --git a/lib/librte_gso/gso_udp4.c b/lib/librte_gso/gso_udp4.c new fi= le > mode 100644 index 0000000..927dee1 > --- /dev/null > +++ b/lib/librte_gso/gso_udp4.c File gso_upd4.c could be very similar to file gso_tcp4.c and that would avo= id code duplication. In a unified file you could use a tcp vs. udp flag to distinguish between t= hem when necessary. The files are short (~75 lines) so it is not a critical issue. > @@ -0,0 +1,81 @@ > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) 2018 Intel Corporation > + */ > + > +#include "gso_common.h" > +#include "gso_udp4.h" > + > +#define IPV4_HDR_MF_BIT (1U << 13) > + > +static inline void > +update_ipv4_udp_headers(struct rte_mbuf *pkt, struct rte_mbuf **segs, > + uint16_t nb_segs) > +{ > + struct ipv4_hdr *ipv4_hdr; > + uint16_t frag_offset =3D 0, is_mf; > + uint16_t l2_hdrlen =3D pkt->l2_len, l3_hdrlen =3D pkt->l3_len; > + uint16_t tail_idx =3D nb_segs - 1, length, i; > + > + /* > + * Update IP header fields for output segments. Specifically, > + * keep the same IP id, update fragment offset and total > + * length. > + */ > + for (i =3D 0; i < nb_segs; i++) { > + ipv4_hdr =3D rte_pktmbuf_mtod_offset(segs[i], struct ipv4_hdr > *, > + l2_hdrlen); > + length =3D segs[i]->pkt_len - l2_hdrlen; > + ipv4_hdr->total_length =3D rte_cpu_to_be_16(length); > + > + is_mf =3D i < tail_idx ? IPV4_HDR_MF_BIT : 0; > + ipv4_hdr->fragment_offset =3D > + rte_cpu_to_be_16(frag_offset | is_mf); > + frag_offset +=3D ((length - l3_hdrlen) >> 3); > + } > +} > + > +int > +gso_udp4_segment(struct rte_mbuf *pkt, > + uint16_t gso_size, > + struct rte_mempool *direct_pool, > + struct rte_mempool *indirect_pool, > + struct rte_mbuf **pkts_out, > + uint16_t nb_pkts_out) > +{ > + struct ipv4_hdr *ipv4_hdr; > + uint16_t pyld_unit_size, hdr_offset; > + uint16_t frag_off; > + int ret; > + > + /* Don't process the fragmented packet */ > + ipv4_hdr =3D rte_pktmbuf_mtod_offset(pkt, struct ipv4_hdr *, > + pkt->l2_len); > + frag_off =3D rte_be_to_cpu_16(ipv4_hdr->fragment_offset); > + if (unlikely(IS_FRAGMENTED(frag_off))) { > + pkts_out[0] =3D pkt; > + return 1; > + } > + > + /* > + * UDP fragmentation is the same as IP fragmentation. > + * Except the first one, other output packets just have l2 > + * and l3 headers. > + */ > + hdr_offset =3D pkt->l2_len + pkt->l3_len; > + > + /* Don't process the packet without data. */ > + if (unlikely(hdr_offset + pkt->l4_len >=3D pkt->pkt_len)) { > + pkts_out[0] =3D pkt; > + return 1; > + } > + > + pyld_unit_size =3D gso_size - hdr_offset; > + > + /* Segment the payload */ > + ret =3D gso_do_segment(pkt, hdr_offset, pyld_unit_size, direct_pool, > + indirect_pool, pkts_out, nb_pkts_out); > + if (ret > 1) > + update_ipv4_udp_headers(pkt, pkts_out, ret); > + > + return ret; > +} > diff --git a/lib/librte_gso/gso_udp4.h b/lib/librte_gso/gso_udp4.h new fi= le > mode 100644 index 0000000..b2a2908 File gso_upd4.h is almost identical to file gso_tcp4.h so both files (altho= ugh short ~40 lines) could have been unified into one file. > --- /dev/null > +++ b/lib/librte_gso/gso_udp4.h > @@ -0,0 +1,42 @@ > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) 2018 Intel Corporation > + */ > + > +#ifndef _GSO_UDP4_H_ > +#define _GSO_UDP4_H_ > + > +#include > +#include > + > +/** > + * Segment an UDP/IPv4 packet. This function doesn't check if the input > + * packet has correct checksums, and doesn't update checksums for > +output > + * GSO segments. Furthermore, it doesn't process IP fragment packets. > + * > + * @param pkt > + * The packet mbuf to segment. > + * @param gso_size > + * The max length of a GSO segment, measured in bytes. > + * @param direct_pool > + * MBUF pool used for allocating direct buffers for output segments. > + * @param indirect_pool > + * MBUF pool used for allocating indirect buffers for output segments. > + * @param pkts_out > + * Pointer array used to store the MBUF addresses of output GSO > + * segments, when the function succeeds. If the memory space in > + * pkts_out is insufficient, it fails and returns -EINVAL. > + * @param nb_pkts_out > + * The max number of items that 'pkts_out' can keep. > + * > + * @return > + * - The number of GSO segments filled in pkts_out on success. > + * - Return -ENOMEM if run out of memory in MBUF pools. > + * - Return -EINVAL for invalid parameters. > + */ > +int gso_udp4_segment(struct rte_mbuf *pkt, > + uint16_t gso_size, > + struct rte_mempool *direct_pool, > + struct rte_mempool *indirect_pool, > + struct rte_mbuf **pkts_out, > + uint16_t nb_pkts_out); > +#endif > diff --git a/lib/librte_gso/meson.build b/lib/librte_gso/meson.build inde= x > 056534f..ad8dd85 100644 > --- a/lib/librte_gso/meson.build > +++ b/lib/librte_gso/meson.build > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel > Corporation >=20 > -sources =3D files('gso_common.c', 'gso_tcp4.c', > +sources =3D files('gso_common.c', 'gso_tcp4.c', 'gso_udp4.c', > 'gso_tunnel_tcp4.c', 'rte_gso.c') > headers =3D files('rte_gso.h') > deps +=3D ['ethdev'] > diff --git a/lib/librte_gso/rte_gso.c b/lib/librte_gso/rte_gso.c index > a44e3d4..751b5b6 100644 > --- a/lib/librte_gso/rte_gso.c > +++ b/lib/librte_gso/rte_gso.c > @@ -11,6 +11,17 @@ > #include "gso_common.h" > #include "gso_tcp4.h" > #include "gso_tunnel_tcp4.h" > +#include "gso_udp4.h" > + > +#define ILLEGAL_UDP_GSO_CTX(ctx) \ > + ((((ctx)->gso_types & DEV_TX_OFFLOAD_UDP_TSO) =3D=3D 0) || \ > + (ctx)->gso_size < RTE_GSO_UDP_SEG_SIZE_MIN) > + > +#define ILLEGAL_TCP_GSO_CTX(ctx) \ > + ((((ctx)->gso_types & (DEV_TX_OFFLOAD_TCP_TSO | \ > + DEV_TX_OFFLOAD_VXLAN_TNL_TSO | \ > + DEV_TX_OFFLOAD_GRE_TNL_TSO)) =3D=3D 0) || \ > + (ctx)->gso_size < RTE_GSO_SEG_SIZE_MIN) Can you please explain why it is correct that the min len for VXLAN_TNL or = GRE_TNL is that of TCP MIN size (RTE_GSO_SEG_SIZE_MIN) >=20 To make the macros above and their usage below clearer: 1. I would change the || with &&. and =3D=3D with !=3D=20 #define ILLEGAL_UDP_GSO_CTX(ctx) \ ((((ctx)->gso_types & DEV_TX_OFFLOAD_UDP_TSO) !=3D 0) && \ (ctx)->gso_size < RTE_GSO_UDP_SEG_SIZE_MIN) #define ILLEGAL_TCP_GSO_CTX(ctx) \ ((((ctx)->gso_types & (DEV_TX_OFFLOAD_TCP_TSO | \ DEV_TX_OFFLOAD_VXLAN_TNL_TSO | \ DEV_TX_OFFLOAD_GRE_TNL_TSO)) !=3D 0) && \ (ctx)->gso_size < RTE_GSO_SEG_SIZE_MIN) 2. Then later I would change the && with ||=20 Changing original: (ILLEGAL_UDP_GSO_CTX(gso_ctx) && ILLEGAL_TCP_GSO_CTX(gso_ctx))) With this: ILLEGAL_UDP_GSO_CTX(gso_ctx) || ILLEGAL_TCP_GSO_CTX(gso_ctx)) > int > rte_gso_segment(struct rte_mbuf *pkt, > @@ -27,14 +38,12 @@ rte_gso_segment(struct rte_mbuf *pkt, >=20 > if (pkt =3D=3D NULL || pkts_out =3D=3D NULL || gso_ctx =3D=3D NULL || > nb_pkts_out < 1 || > - gso_ctx->gso_size < RTE_GSO_SEG_SIZE_MIN || > - ((gso_ctx->gso_types & > (DEV_TX_OFFLOAD_TCP_TSO | > - DEV_TX_OFFLOAD_VXLAN_TNL_TSO | > - DEV_TX_OFFLOAD_GRE_TNL_TSO)) =3D=3D 0)) > + (ILLEGAL_UDP_GSO_CTX(gso_ctx) && > + ILLEGAL_TCP_GSO_CTX(gso_ctx))) > return -EINVAL; >=20 > if (gso_ctx->gso_size >=3D pkt->pkt_len) { > - pkt->ol_flags &=3D (~PKT_TX_TCP_SEG); > + pkt->ol_flags &=3D (~(PKT_TX_TCP_SEG | PKT_TX_UDP_SEG)); > pkts_out[0] =3D pkt; > return 1; > } > @@ -59,6 +68,11 @@ rte_gso_segment(struct rte_mbuf *pkt, > ret =3D gso_tcp4_segment(pkt, gso_size, ipid_delta, > direct_pool, indirect_pool, > pkts_out, nb_pkts_out); > + } else if (IS_IPV4_UDP(pkt->ol_flags) && > + (gso_ctx->gso_types & > DEV_TX_OFFLOAD_UDP_TSO)) { > + pkt->ol_flags &=3D (~PKT_TX_UDP_SEG); > + ret =3D gso_udp4_segment(pkt, gso_size, direct_pool, > + indirect_pool, pkts_out, nb_pkts_out); > } else { > /* unsupported packet, skip */ > pkts_out[0] =3D pkt; > diff --git a/lib/librte_gso/rte_gso.h b/lib/librte_gso/rte_gso.h index > f4abd61..a626a11 100644 > --- a/lib/librte_gso/rte_gso.h > +++ b/lib/librte_gso/rte_gso.h > @@ -17,10 +17,14 @@ extern "C" { > #include > #include >=20 > -/* Minimum GSO segment size. */ > +/* Minimum GSO segment size for TCP based packets. */ > #define RTE_GSO_SEG_SIZE_MIN (sizeof(struct ether_hdr) + \ > sizeof(struct ipv4_hdr) + sizeof(struct tcp_hdr) + 1) RTE_GSO_SEG_SIZE_MIN is actually TCP min size. Can you name this macro as RTE_GSO_TCP_SEG_SIZE_MIN (symmetrically to the UDP macro below)? >=20 > +/* Minimum GSO segment size for UDP based packets. */ #define > +RTE_GSO_UDP_SEG_SIZE_MIN (sizeof(struct ether_hdr) + \ > + sizeof(struct ipv4_hdr) + sizeof(struct udp_hdr) + 1) > + > /* GSO flags for rte_gso_ctx. */ > #define RTE_GSO_FLAG_IPID_FIXED (1ULL << 0) /**< Use fixed IP ids for > output GSO segments. Setting > -- > 2.7.4