* [dpdk-dev] [PATCH] net: fix Intel prepare function for IP checksum offload
@ 2018-09-19 14:42 Didier Pallard
2018-09-19 17:50 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2018-09-20 14:53 ` [dpdk-dev] " Ananyev, Konstantin
0 siblings, 2 replies; 4+ messages in thread
From: Didier Pallard @ 2018-09-19 14:42 UTC (permalink / raw)
To: dev; +Cc: stable
Current Intel tx prepare function does not properly handle the
case where only IP checksum is requested, without requesting
any L4 checksum or TSO: IP checksum is not properly reset to 0
and output packet may contain invalid IP checksum.
Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation")
Cc: stable@dpdk.org
Signed-off-by: Didier Pallard <didier.pallard@6wind.com>
---
lib/librte_net/rte_net.h | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h
index b6ab6e1d57b2..e59760a0a108 100644
--- a/lib/librte_net/rte_net.h
+++ b/lib/librte_net/rte_net.h
@@ -122,14 +122,16 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
(ol_flags & PKT_TX_OUTER_IPV6))
inner_l3_offset += m->outer_l2_len + m->outer_l3_len;
- if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) {
- if (ol_flags & PKT_TX_IPV4) {
- ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
- inner_l3_offset);
+ if (ol_flags & PKT_TX_IPV4) {
+ ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
+ inner_l3_offset);
- if (ol_flags & PKT_TX_IP_CKSUM)
- ipv4_hdr->hdr_checksum = 0;
+ if (ol_flags & PKT_TX_IP_CKSUM)
+ ipv4_hdr->hdr_checksum = 0;
+ }
+ if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) {
+ if (ol_flags & PKT_TX_IPV4) {
udp_hdr = (struct udp_hdr *)((char *)ipv4_hdr +
m->l3_len);
udp_hdr->dgram_cksum = rte_ipv4_phdr_cksum(ipv4_hdr,
@@ -146,12 +148,6 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
} else if ((ol_flags & PKT_TX_TCP_CKSUM) ||
(ol_flags & PKT_TX_TCP_SEG)) {
if (ol_flags & PKT_TX_IPV4) {
- ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
- inner_l3_offset);
-
- if (ol_flags & PKT_TX_IP_CKSUM)
- ipv4_hdr->hdr_checksum = 0;
-
/* non-TSO tcp or TSO */
tcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr +
m->l3_len);
--
2.11.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH] net: fix Intel prepare function for IP checksum offload
2018-09-19 14:42 [dpdk-dev] [PATCH] net: fix Intel prepare function for IP checksum offload Didier Pallard
@ 2018-09-19 17:50 ` Ferruh Yigit
2018-09-20 14:53 ` [dpdk-dev] " Ananyev, Konstantin
1 sibling, 0 replies; 4+ messages in thread
From: Ferruh Yigit @ 2018-09-19 17:50 UTC (permalink / raw)
To: Didier Pallard, dev; +Cc: stable, Konstantin Ananyev, Tomasz Kulasek
On 9/19/2018 3:42 PM, Didier Pallard wrote:
> Current Intel tx prepare function does not properly handle the
> case where only IP checksum is requested, without requesting
> any L4 checksum or TSO: IP checksum is not properly reset to 0
> and output packet may contain invalid IP checksum.
>
> Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation")
> Cc: stable@dpdk.org
cc'ed developer.
>
> Signed-off-by: Didier Pallard <didier.pallard@6wind.com>
> ---
> lib/librte_net/rte_net.h | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h
> index b6ab6e1d57b2..e59760a0a108 100644
> --- a/lib/librte_net/rte_net.h
> +++ b/lib/librte_net/rte_net.h
> @@ -122,14 +122,16 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
> (ol_flags & PKT_TX_OUTER_IPV6))
> inner_l3_offset += m->outer_l2_len + m->outer_l3_len;
>
> - if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) {
> - if (ol_flags & PKT_TX_IPV4) {
> - ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
> - inner_l3_offset);
> + if (ol_flags & PKT_TX_IPV4) {
> + ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
> + inner_l3_offset);
>
> - if (ol_flags & PKT_TX_IP_CKSUM)
> - ipv4_hdr->hdr_checksum = 0;
> + if (ol_flags & PKT_TX_IP_CKSUM)
> + ipv4_hdr->hdr_checksum = 0;
> + }
>
> + if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) {
> + if (ol_flags & PKT_TX_IPV4) {
> udp_hdr = (struct udp_hdr *)((char *)ipv4_hdr +
> m->l3_len);
> udp_hdr->dgram_cksum = rte_ipv4_phdr_cksum(ipv4_hdr,
> @@ -146,12 +148,6 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
> } else if ((ol_flags & PKT_TX_TCP_CKSUM) ||
> (ol_flags & PKT_TX_TCP_SEG)) {
> if (ol_flags & PKT_TX_IPV4) {
> - ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
> - inner_l3_offset);
> -
> - if (ol_flags & PKT_TX_IP_CKSUM)
> - ipv4_hdr->hdr_checksum = 0;
> -
> /* non-TSO tcp or TSO */
> tcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr +
> m->l3_len);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH] net: fix Intel prepare function for IP checksum offload
2018-09-19 14:42 [dpdk-dev] [PATCH] net: fix Intel prepare function for IP checksum offload Didier Pallard
2018-09-19 17:50 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
@ 2018-09-20 14:53 ` Ananyev, Konstantin
2018-09-21 1:12 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
1 sibling, 1 reply; 4+ messages in thread
From: Ananyev, Konstantin @ 2018-09-20 14:53 UTC (permalink / raw)
To: Didier Pallard, dev; +Cc: stable
>
> Current Intel tx prepare function does not properly handle the
> case where only IP checksum is requested, without requesting
> any L4 checksum or TSO: IP checksum is not properly reset to 0
> and output packet may contain invalid IP checksum.
>
> Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation")
> Cc: stable@dpdk.org
>
> Signed-off-by: Didier Pallard <didier.pallard@6wind.com>
> ---
> lib/librte_net/rte_net.h | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h
> index b6ab6e1d57b2..e59760a0a108 100644
> --- a/lib/librte_net/rte_net.h
> +++ b/lib/librte_net/rte_net.h
> @@ -122,14 +122,16 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
> (ol_flags & PKT_TX_OUTER_IPV6))
> inner_l3_offset += m->outer_l2_len + m->outer_l3_len;
>
> - if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) {
> - if (ol_flags & PKT_TX_IPV4) {
> - ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
> - inner_l3_offset);
> + if (ol_flags & PKT_TX_IPV4) {
> + ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
> + inner_l3_offset);
>
> - if (ol_flags & PKT_TX_IP_CKSUM)
> - ipv4_hdr->hdr_checksum = 0;
> + if (ol_flags & PKT_TX_IP_CKSUM)
> + ipv4_hdr->hdr_checksum = 0;
> + }
>
> + if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) {
> + if (ol_flags & PKT_TX_IPV4) {
> udp_hdr = (struct udp_hdr *)((char *)ipv4_hdr +
> m->l3_len);
> udp_hdr->dgram_cksum = rte_ipv4_phdr_cksum(ipv4_hdr,
> @@ -146,12 +148,6 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
> } else if ((ol_flags & PKT_TX_TCP_CKSUM) ||
> (ol_flags & PKT_TX_TCP_SEG)) {
> if (ol_flags & PKT_TX_IPV4) {
> - ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
> - inner_l3_offset);
> -
> - if (ol_flags & PKT_TX_IP_CKSUM)
> - ipv4_hdr->hdr_checksum = 0;
> -
> /* non-TSO tcp or TSO */
> tcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr +
> m->l3_len);
> --
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> 2.11.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH] net: fix Intel prepare function for IP checksum offload
2018-09-20 14:53 ` [dpdk-dev] " Ananyev, Konstantin
@ 2018-09-21 1:12 ` Ferruh Yigit
0 siblings, 0 replies; 4+ messages in thread
From: Ferruh Yigit @ 2018-09-21 1:12 UTC (permalink / raw)
To: Ananyev, Konstantin, Didier Pallard, dev; +Cc: stable
On 9/20/2018 3:53 PM, Ananyev, Konstantin wrote:
>
>
>>
>> Current Intel tx prepare function does not properly handle the
>> case where only IP checksum is requested, without requesting
>> any L4 checksum or TSO: IP checksum is not properly reset to 0
>> and output packet may contain invalid IP checksum.
>>
>> Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Didier Pallard <didier.pallard@6wind.com>
>
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-21 1:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-19 14:42 [dpdk-dev] [PATCH] net: fix Intel prepare function for IP checksum offload Didier Pallard
2018-09-19 17:50 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2018-09-20 14:53 ` [dpdk-dev] " Ananyev, Konstantin
2018-09-21 1:12 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
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).