DPDK patches and discussions
 help / color / mirror / Atom feed
From: huichao cai <caihc1@chinatelecom.cn>
To: konstantin.ananyev@intel.com
Cc: dev@dpdk.org, huichao cai <chcchc88@163.com>
Subject: [dpdk-dev] [PATCH] ip_frag: modify the fragment offset and mf
Date: Mon, 27 Sep 2021 18:06:14 +0800
Message-ID: <1632737174-86870-1-git-send-email-caihc1@chinatelecom.cn> (raw)

From: huichao cai <chcchc88@163.com>

According to RFC791,the fragment offset value should be
calculated based on the long datagram,the more fragments flag
for the last fragment carries the same value as the long datagram.

Signed-off-by: huichao cai <chcchc88@163.com>
---
 lib/ip_frag/rte_ipv4_fragmentation.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c
index 2e7739d..fead5a9 100644
--- a/lib/ip_frag/rte_ipv4_fragmentation.c
+++ b/lib/ip_frag/rte_ipv4_fragmentation.c
@@ -75,7 +75,7 @@ static inline void __free_fragments(struct rte_mbuf *mb[], uint32_t num)
 	uint32_t out_pkt_pos, in_seg_data_pos;
 	uint32_t more_in_segs;
 	uint16_t fragment_offset, flag_offset, frag_size, header_len;
-	uint16_t frag_bytes_remaining;
+	uint16_t frag_bytes_remaining, not_last_frag;
 
 	/*
 	 * Formal parameter checking.
@@ -116,7 +116,9 @@ static inline void __free_fragments(struct rte_mbuf *mb[], uint32_t num)
 	in_seg = pkt_in;
 	in_seg_data_pos = header_len;
 	out_pkt_pos = 0;
-	fragment_offset = 0;
+	fragment_offset = (uint16_t)((flag_offset &
+	    RTE_IPV4_HDR_OFFSET_MASK) << RTE_IPV4_HDR_FO_SHIFT);
+	not_last_frag = (uint16_t)(flag_offset & IPV4_HDR_MF_MASK);
 
 	more_in_segs = 1;
 	while (likely(more_in_segs)) {
@@ -186,7 +188,8 @@ static inline void __free_fragments(struct rte_mbuf *mb[], uint32_t num)
 
 		__fill_ipv4hdr_frag(out_hdr, in_hdr, header_len,
 		    (uint16_t)out_pkt->pkt_len,
-		    flag_offset, fragment_offset, more_in_segs);
+		    flag_offset, fragment_offset,
+		    not_last_frag || more_in_segs);
 
 		fragment_offset = (uint16_t)(fragment_offset +
 		    out_pkt->pkt_len - header_len);
-- 
1.8.3.1


             reply	other threads:[~2021-09-27 10:10 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-27 10:06 huichao cai [this message]
2021-10-07 17:26 ` Ananyev, Konstantin
2021-10-08  8:05   ` 蔡慧超
2021-10-08  8:33     ` Ananyev, Konstantin
2021-10-08  9:37       ` 蔡慧超
2021-10-08 10:24         ` Ananyev, Konstantin
2021-10-09  7:27 ` [dpdk-dev] [PATCH v2] ip_frag: fix fragmenting IPv4 fragment huichao cai
2021-10-12 10:16   ` Ananyev, Konstantin
2021-10-13  6:53     ` 蔡慧超
2021-10-13  9:12       ` Ananyev, Konstantin
2021-10-13  9:50         ` 蔡慧超
2021-10-14  6:51     ` Thomas Monjalon
2021-10-13 21:11   ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2021-10-14  3:30     ` 蔡慧超

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1632737174-86870-1-git-send-email-caihc1@chinatelecom.cn \
    --to=caihc1@chinatelecom.cn \
    --cc=chcchc88@163.com \
    --cc=dev@dpdk.org \
    --cc=konstantin.ananyev@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ http://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git