From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9C788A04B2; Mon, 4 May 2020 19:26:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 278D71D50C; Mon, 4 May 2020 19:26:45 +0200 (CEST) Received: from qq.com (out203-205-221-231.mail.qq.com [203.205.221.231]) by dpdk.org (Postfix) with ESMTP id 08D031BF84 for ; Mon, 27 Apr 2020 14:06:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1587989187; bh=ZCP0lH//AOc3d+S+L3u5GxJlBCixBz4lwm6VsSzrDsU=; h=From:To:Cc:Subject:Date; b=SIce9INVCw20dlFyE5b1ZEuBPc+d6PqFXcGDga1oCN0e2SHPbLFzoDwg26pmhP+sn hN4ljAcsGU9ElcJS7B2AEZTq7/Skv0EoammmowpNS+B/sDNk/B/7WKNYCzyg7Lc1oY 0LUv2bU87SDz3/dDKKxor5ak6Z7OQpnHh4GnaqMQ= Received: from localhost.localdomain ([222.191.249.130]) by newxmesmtplogicsvrsza7.qq.com (NewEsmtp) with SMTP id 1993224E; Mon, 27 Apr 2020 20:06:25 +0800 X-QQ-mid: xmsmtpt1587989185tl6zgjswo X-QQ-XMAILINFO: Mak7dZ1Cuqw4+VKF8WXuK7SVrQA5sD9oHNERtKWY7pX2xENAZup4oRJafNW7W4 zX7EruOuvtEj66JUPjfRPiX0BljNaO+iTcd6tIHPLzb304x01JvdXV65TfOlBvMCiUeZ3eKI1kVQ PNoiWGVekyiBE0RQ9d6waplDBIZX7eVmFR/penf8+lfosGId9QZUxjnGHdPSQcV0y38JH0l8Dds6 Y4mcRE80dPkfSIFMlctn3h8NuyXfB/075YXfaqZf/2V7fxb+k1TxgOpk93Yi8SJJmTQxcqieABGH dsiS554eF7wUuYDw+CAKE+GDoofxh0hM0ajiY/TJ2NbVrEZNIJn2RLc4ksqB7K+kihuf0Ta95aT0 J2gUDpthrOmz+UxNfi4w2ZefODCZjT+hkGTm+1G5d2C3gZEVtqNTZy1OkMJ1TG6eBCCY4h7gkdpX qv7VOzhO1SijO1/qkZxP2NxJFlxUh8ofJ1cMLsM2n+Bf99kLptQKrTfIbM3kHQ8fZkxH0ckfGu59 YX6WxJ2KXMSXMG/YCC7Bw9iDZEKtZ1vq6hIjx4PzDS/499fhAVu8Kvg9No6BuZWbF1W0PoXpww5s tKdgZn+geIWmI4hGukGrjLOxH99lXpEbtKuxa9riUoVO+Covm2jVNuOBkj6IYOReGpJcjfQn8AWT /9/b7BfXbilo9KLg5Vs7t7e90= From: Pu Xu <583493798@qq.com> To: konstantin.ananyev@intel.com Cc: dev@dpdk.org, Pu Xu <583493798@qq.com> Date: Mon, 27 Apr 2020 05:06:18 -0700 Message-Id: <20200427120618.84166-1-583493798@qq.com> X-Mailer: git-send-email 2.17.1 X-Mailman-Approved-At: Mon, 04 May 2020 19:26:43 +0200 Subject: [dpdk-dev] [PATCH] ipv4_fragmentation: fix fragmentation of ipv4 packet with optional header X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Pu Xu <583493798@qq.com> --- lib/librte_ip_frag/rte_ipv4_fragmentation.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c index e9de335ae..156087ca3 100644 --- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c +++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c @@ -74,7 +74,7 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, struct rte_ipv4_hdr *in_hdr; uint32_t out_pkt_pos, in_seg_data_pos; uint32_t more_in_segs; - uint16_t fragment_offset, flag_offset, frag_size; + uint16_t fragment_offset, flag_offset, frag_size, header_len; uint16_t frag_bytes_remaining; /* @@ -86,14 +86,16 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, unlikely(mtu_size < RTE_ETHER_MIN_MTU)) return -EINVAL; + in_hdr = rte_pktmbuf_mtod(pkt_in, struct rte_ipv4_hdr *); + + header_len = (in_hdr->version_ihl & 0xf) * 4; /* * Ensure the IP payload length of all fragments is aligned to a * multiple of 8 bytes as per RFC791 section 2.3. */ - frag_size = RTE_ALIGN_FLOOR((mtu_size - sizeof(struct rte_ipv4_hdr)), + frag_size = RTE_ALIGN_FLOOR((mtu_size - header_len), IPV4_HDR_FO_ALIGN); - in_hdr = rte_pktmbuf_mtod(pkt_in, struct rte_ipv4_hdr *); flag_offset = rte_cpu_to_be_16(in_hdr->fragment_offset); /* If Don't Fragment flag is set */ @@ -102,11 +104,11 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, /* Check that pkts_out is big enough to hold all fragments */ if (unlikely(frag_size * nb_pkts_out < - (uint16_t)(pkt_in->pkt_len - sizeof(struct rte_ipv4_hdr)))) + (uint16_t)(pkt_in->pkt_len - header_len))) return -EINVAL; in_seg = pkt_in; - in_seg_data_pos = sizeof(struct rte_ipv4_hdr); + in_seg_data_pos = header_len; out_pkt_pos = 0; fragment_offset = 0; @@ -124,8 +126,8 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, } /* Reserve space for the IP header that will be built later */ - out_pkt->data_len = sizeof(struct rte_ipv4_hdr); - out_pkt->pkt_len = sizeof(struct rte_ipv4_hdr); + out_pkt->data_len = header_len; + out_pkt->pkt_len = header_len; frag_bytes_remaining = frag_size; out_seg_prev = out_pkt; @@ -181,9 +183,9 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in, flag_offset, fragment_offset, more_in_segs); fragment_offset = (uint16_t)(fragment_offset + - out_pkt->pkt_len - sizeof(struct rte_ipv4_hdr)); + out_pkt->pkt_len - header_len); - out_pkt->l3_len = sizeof(struct rte_ipv4_hdr); + out_pkt->l3_len = header_len; /* Write the fragment to the output list */ pkts_out[out_pkt_pos] = out_pkt; -- 2.20.1