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 B4C03A00C3 for ; Wed, 8 Jun 2022 11:57:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A772B41132; Wed, 8 Jun 2022 11:57:12 +0200 (CEST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mails.dpdk.org (Postfix) with ESMTP id EEB3941132; Wed, 8 Jun 2022 11:57:10 +0200 (CEST) Received: by mail-pl1-f169.google.com with SMTP id d22so17178088plr.9; Wed, 08 Jun 2022 02:57:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C/hoZUzAVHK3ABSQl36vS0en4O3zH+RlXmgycPT2ou8=; b=UuJshMdHAMX/aPjG7wcb1pdpkUmdC+g4Hu61rhxuxPXCvIh18m4lsPuU7azPZjh9FP 0pTGc3hqOatGYbRveUnLuXJBMe+yXmu8NZFxr8mBpGoidS2CNKvWUim2w21qYQC9DydS H5Wkl6gtKxUmewZB5jHOyVPuUHanShcVIf7m8qQ55FOi1pONCcW6ihsR/AZRvmc0GsoS bxwenpCF+J9px+HUeH1eOSZTXMsGFp0yZ6nZwu5Y5kbm2MRJfS7YKiJO2WTCJrl+2ME9 G+FNVEMO+z1vtc/vmviwWovBOzwB5NrBNcfsjqkYHMvM+bEgdaKsfWDEUmVC04L/9BH9 nZLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C/hoZUzAVHK3ABSQl36vS0en4O3zH+RlXmgycPT2ou8=; b=LDhPfimzei5bKS9b+Au4H2FMlfZ6NqJAJdlMQ57eBb1qteCjBoHAQqV/G7FPfaxqIo aVR8MucdR7cWLjoxKraPyWUWCZV/mN/RaQO0hH+lMQD6hnh3P0y09c+icluSyWOAGOFJ pqLRO7XDhSZC+mSImaLNG354LNBMge+yp/Kq1rEMeNqXcgSoPue/CzZYtx0zRMddUnNB zNhXGGFhx94fRxEIrHCiTRnyXeE7m4Sa7E100D4ugZkCplmQn4npsmzmGs0sg0HduJZP IwB8jUZkYUz6Qo2XTtwzk+KLQ7TzFGskkzPl8X3hX9cczDK78LT091/gDwHRx88tQeBf WknA== X-Gm-Message-State: AOAM531lycbWP3crbWIk6nl+UBE/ay4MMal31oVEq2AiuNPb4gl2AT+B f+08ifblvCZYORN86kAl+vL4Etk26b/W/Feh X-Google-Smtp-Source: ABdhPJyn/YPnuxRoMVhW8xdZm0o0NsljeCk6qGVeMBB3jRpK7hWs5eKDWvop41Tr13Eh4V0oRVpRVQ== X-Received: by 2002:a17:902:ea08:b0:163:ec68:ae08 with SMTP id s8-20020a170902ea0800b00163ec68ae08mr2755758plg.52.1654682230171; Wed, 08 Jun 2022 02:57:10 -0700 (PDT) Received: from kparameshwa-a02.vmware.com.com ([49.206.13.91]) by smtp.gmail.com with ESMTPSA id d196-20020a621dcd000000b00512ee2f22acsm15125572pfd.97.2022.06.08.02.57.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 08 Jun 2022 02:57:09 -0700 (PDT) From: Kumara Parameshwaran X-Google-Original-From: Kumara Parameshwaran To: jiayu.hu@intel.com Cc: dev@dpdk.org, Kumara Parameshwaran , stable@dpdk.org Subject: [PATCH v4] gro: bug fix in identifying fragmented packets Date: Wed, 8 Jun 2022 15:27:04 +0530 Message-Id: <20220608095704.45375-1-kumaraparmesh92@gmail.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220320101232.34438-1-kumaraparamesh92@gmail.com> References: <20220320101232.34438-1-kumaraparamesh92@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org From: Kumara Parameshwaran A packet with RTE_PTYPE_L4_FRAG(0x300) contains both RTE_PTYPE_L4_TCP (0x100) & RTE_PTYPE_L4_UDP (0x200). A fragmented packet as defined in rte_mbuf_ptype.h cannot be recognized as other L4 types and hence the GRO layer should not use IS_IPV4_TCP_PKT or IS_IPV4_UDP_PKT for RTE_PTYPE_L4_FRAG. Hence, if the packet type is RTE_PTYPE_L4_FRAG the ip header should be parsed to recognize the appropriate IP type and invoke the respective gro handler. Fixes: 1ca5e6740852 ("gro: support UDP/IPv4") Cc: stable@dpdk.org Signed-off-by: Kumara Parameshwaran --- v1: * Introduce IS_IPV4_FRAGMENT macro to check if fragmented packet and if true extract the IP header to identify the protocol type and invoke the appropriate gro handler. This is done for both rte_gro_reassemble and rte_gro_reassemble_burst APIs. v2,v3,v4: * Fix extra whitespace and column limit warnings lib/gro/rte_gro.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) lib/gro/rte_gro.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c index 6f7dd4d709..83d6e21dbb 100644 --- a/lib/gro/rte_gro.c +++ b/lib/gro/rte_gro.c @@ -38,6 +38,9 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { ((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \ (RTE_ETH_IS_TUNNEL_PKT(ptype) == 0)) +#define IS_IPV4_FRAGMENT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ + ((ptype & RTE_PTYPE_L4_FRAG) == RTE_PTYPE_L4_FRAG)) + #define IS_IPV4_VXLAN_TCP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ ((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \ ((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \ @@ -240,7 +243,28 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts, * The timestamp is ignored, since all packets * will be flushed from the tables. */ - if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) && + if (IS_IPV4_FRAGMENT(pkts[i]->packet_type)) { + struct rte_ipv4_hdr ip4h_copy; + const struct rte_ipv4_hdr *ip4h = rte_pktmbuf_read(pkts[i], pkts[i]->l2_len, + sizeof(*ip4h), &ip4h_copy); + if (ip4h->next_proto_id == IPPROTO_UDP && do_udp4_gro) { + ret = gro_udp4_reassemble(pkts[i], + &udp_tbl, 0); + if (ret > 0) + nb_after_gro--; + else if (ret < 0) + unprocess_pkts[unprocess_num++] = pkts[i]; + } else if (ip4h->next_proto_id == IPPROTO_TCP && do_tcp4_gro) { + ret = gro_tcp4_reassemble(pkts[i], + &tcp_tbl, 0); + if (ret > 0) + nb_after_gro--; + else if (ret < 0) + unprocess_pkts[unprocess_num++] = pkts[i]; + } else { + unprocess_pkts[unprocess_num++] = pkts[i]; + } + } else if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) && do_vxlan_tcp_gro) { ret = gro_vxlan_tcp4_reassemble(pkts[i], &vxlan_tcp_tbl, 0); @@ -349,7 +373,22 @@ rte_gro_reassemble(struct rte_mbuf **pkts, current_time = rte_rdtsc(); for (i = 0; i < nb_pkts; i++) { - if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) && + if (IS_IPV4_FRAGMENT(pkts[i]->packet_type)) { + struct rte_ipv4_hdr ip4h_copy; + const struct rte_ipv4_hdr *ip4h = rte_pktmbuf_read(pkts[i], pkts[i]->l2_len, + sizeof(*ip4h), &ip4h_copy); + if (ip4h->next_proto_id == IPPROTO_UDP && do_udp4_gro) { + if (gro_udp4_reassemble(pkts[i], udp_tbl, + current_time) < 0) + unprocess_pkts[unprocess_num++] = pkts[i]; + } else if (ip4h->next_proto_id == IPPROTO_TCP && do_tcp4_gro) { + if (gro_tcp4_reassemble(pkts[i], tcp_tbl, + current_time) < 0) + unprocess_pkts[unprocess_num++] = pkts[i]; + } else { + unprocess_pkts[unprocess_num++] = pkts[i]; + } + } else if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) && do_vxlan_tcp_gro) { if (gro_vxlan_tcp4_reassemble(pkts[i], vxlan_tcp_tbl, current_time) < 0) -- 2.25.1