* [dpdk-dev] [PATCH] ip_frag: fix the buf of fragmenting IPv4 fragment
@ 2021-10-25 7:55 huichao cai
2021-10-28 12:24 ` Ananyev, Konstantin
0 siblings, 1 reply; 3+ messages in thread
From: huichao cai @ 2021-10-25 7:55 UTC (permalink / raw)
To: dev; +Cc: konstantin.ananyev, stable
The patch ("ip_frag: fix fragmenting IPv4 fragment") introduces
a bug and needs to be rolled back. This is because the patch
and variables "flag_offset" conflict with each other.
Bugzilla ID: 835
Fixes: 567473433b7e ("ip_frag: fix fragmenting IPv4 fragment")
Cc: stable@dpdk.org
Signed-off-by: huichao cai <chcchc88@163.com>
---
lib/ip_frag/rte_ipv4_fragmentation.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c
index fead5a9..2e7739d 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, not_last_frag;
+ uint16_t frag_bytes_remaining;
/*
* Formal parameter checking.
@@ -116,9 +116,7 @@ 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 = (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);
+ fragment_offset = 0;
more_in_segs = 1;
while (likely(more_in_segs)) {
@@ -188,8 +186,7 @@ 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,
- not_last_frag || more_in_segs);
+ flag_offset, fragment_offset, more_in_segs);
fragment_offset = (uint16_t)(fragment_offset +
out_pkt->pkt_len - header_len);
--
1.8.3.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH] ip_frag: fix the buf of fragmenting IPv4 fragment
2021-10-25 7:55 [dpdk-dev] [PATCH] ip_frag: fix the buf of fragmenting IPv4 fragment huichao cai
@ 2021-10-28 12:24 ` Ananyev, Konstantin
2021-11-08 22:54 ` Thomas Monjalon
0 siblings, 1 reply; 3+ messages in thread
From: Ananyev, Konstantin @ 2021-10-28 12:24 UTC (permalink / raw)
To: huichao cai, dev; +Cc: stable
> Bugzilla ID: 835
> Fixes: 567473433b7e ("ip_frag: fix fragmenting IPv4 fragment")
> Cc: stable@dpdk.org
> Signed-off-by: huichao cai <chcchc88@163.com>
> ---
> lib/ip_frag/rte_ipv4_fragmentation.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c
> index fead5a9..2e7739d 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, not_last_frag;
> + uint16_t frag_bytes_remaining;
>
> /*
> * Formal parameter checking.
> @@ -116,9 +116,7 @@ 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 = (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);
> + fragment_offset = 0;
>
> more_in_segs = 1;
> while (likely(more_in_segs)) {
> @@ -188,8 +186,7 @@ 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,
> - not_last_frag || more_in_segs);
> + flag_offset, fragment_offset, more_in_segs);
>
> fragment_offset = (uint16_t)(fragment_offset +
> out_pkt->pkt_len - header_len);
> --
> 1.8.3.1
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH] ip_frag: fix the buf of fragmenting IPv4 fragment
2021-10-28 12:24 ` Ananyev, Konstantin
@ 2021-11-08 22:54 ` Thomas Monjalon
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Monjalon @ 2021-11-08 22:54 UTC (permalink / raw)
To: huichao cai; +Cc: dev, stable, Ananyev, Konstantin
> > Bugzilla ID: 835
> > Fixes: 567473433b7e ("ip_frag: fix fragmenting IPv4 fragment")
> > Cc: stable@dpdk.org
> > Signed-off-by: huichao cai <chcchc88@163.com>
>
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Revert applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-08 22:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-25 7:55 [dpdk-dev] [PATCH] ip_frag: fix the buf of fragmenting IPv4 fragment huichao cai
2021-10-28 12:24 ` Ananyev, Konstantin
2021-11-08 22:54 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).