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 D3733A04B2; Mon, 4 May 2020 19:27:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 84C9D1D528; Mon, 4 May 2020 19:26:47 +0200 (CEST) Received: from qq.com (out203-205-251-88.mail.qq.com [203.205.251.88]) by dpdk.org (Postfix) with ESMTP id 103B01D9E6; Thu, 30 Apr 2020 04:22:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1588213348; bh=/0UUysXAX7HwreBGZg/mxoT3PVZVUIQ3s/Uhsfg0B2Q=; h=From:To:Cc:Subject:Date; b=NJ0TwB3k6ng56n6nn7LS0fNPni34qyc4pQVwHvEwoiWSFsTogkUlUy16yjGx/Wgpz XAQ0OFLgnPORK76lubmTta1Fbsk4MnDiwUxhR0WqdNwi3oi2uGcC74O2zqqXS9/Q4/ 25J9IDVtFaOXepdKDe/veTx7RdCOC/vQcI9p9YI0= Received: from ubuntu.localdomain ([222.191.249.130]) by newxmesmtplogicsvrszc6.qq.com (NewEsmtp) with SMTP id 5999F48F; Thu, 30 Apr 2020 10:22:25 +0800 X-QQ-mid: xmsmtpt1588213345t3e9niujx X-QQ-XMAILINFO: MHMWHkHpkjqP7Utm8jzoXtIWmgZ28IOpcRnA3uG19YJEx7Tm8FTPyRSWOsKSkF 8nlU2KprR+FEXuXjvqzHbLX9oGLZcaDH1YCi4S+WshRtOJJ2No7TjLe5waoXiNOnpsQX/l38NhvW 9YgmmK8DhXxNT8/PW+1ZoSIVJCcK/3CWO0nl+C0fSL0VJ0dTvy5WETNaAMNw6zYyQFLMEHRAiFfB G0DMoLlEIGdC/9X6/0Oio4SA+2Kxfu6Tccv4ICKGNU+taMGpEb9gT6mQh38pwmgyrWymc6gAbmyE 9T4WEoWECHjmwdp5ckgjmG++vRyuQrJ8JPbNbJYpVRC9MDP8vSyv1YHXePWWbpZCWhla5bib9iov Ex5Fh/aMXbU5qe0z7h6QYmB1pE1IXTFMIjSVLwD9WN6A2IkqSLXeLIWKt9xwSi3rjDjUOzWC4TKi cMNScPsEbQNl2sEmfSVggrAmFH2S6uT4zUC6CT5YqFoDGcIuODLTp3gXMqhgooOOe7090tx8qCux O9LGOoYQzQX79S2N8vk/f/S8OZ6R1+lBctxbWT9lE+UXdGc3tDk9diFf9oxpm5KAv4zrQzw7RaQ5 KjnW4VnogJBoFPd0WJYBLw/a4c8iDOpYiIGkaiHHfnf+UCgokKq2RnhfswHwb8qTiZ8B2EiSYgNS E5bP1yr/Q6I4Bi4Ay0ZOUit2Y= From: Pu Xu <583493798@qq.com> To: konstantin.ananyev@intel.com Cc: dev@dpdk.org, Pu Xu <583493798@qq.com>, anatoly.burakov@intel.com, stable@dpdk.org Date: Wed, 29 Apr 2020 19:22:22 -0700 Message-Id: <20200430022222.3779-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] ip_frag: fix fragmenting ipv4 packet with header options 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" When fragmenting ipv4 packet, the data offset should be calculated through the ihl field in ip header rather than using sizeof(struct rte_ipv4_hdr). Fixes: 4c38e5532a07 ("ip_frag: refactor IPv4 fragmentation into a proper library") Cc: anatoly.burakov@intel.com Cc: stable@dpdk.org 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.17.1