From: Yongseok Koh <yskoh@mellanox.com>
To: Andy Green <andy@warmcat.com>
Cc: Bruce Richardson <bruce.richardson@intel.com>,
dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'mbuf: avoid implicit demotion in 64-bit arithmetic' has been queued to LTS release 17.11.5
Date: Thu, 3 Jan 2019 00:13:58 -0800 [thread overview]
Message-ID: <20190103081400.14191-35-yskoh@mellanox.com> (raw)
In-Reply-To: <20190103081400.14191-1-yskoh@mellanox.com>
Hi,
FYI, your patch has been queued to LTS release 17.11.5
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/04/19. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.
Thanks.
Yongseok
---
>From cf80647272d6586f2032059361162f0ad2f9f14f Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Tue, 22 May 2018 09:24:32 +0800
Subject: [PATCH] mbuf: avoid implicit demotion in 64-bit arithmetic
[ upstream commit ef5092e16b137fd5e23d19b4b17b32f330d4a4ad ]
GCC 8.1 warned:
In function 'rte_validate_tx_offload':
rte_mbuf.h:2112:19: warning: conversion to 'uint64_t'
{aka 'long unsigned int'} from 'int' may change the
sign of the result [-Wsign-conversion]
inner_l3_offset += m->outer_l2_len + m->outer_l3_len;
^~
uint64_t inner_l3_offset...
/* fields for TX offloading of tunnels */
uint64_t outer_l3_len:9; /**< Outer L3 (IP) Hdr Length. */
uint64_t outer_l2_len:7; /**< Outer L2 (MAC) Hdr Length. */
We want to do the arithmetic entirely in uint64_t
space, but with the +=, the rhs type becomes int since the
bitfields will fit in int.
Elaborate the artithmetic to be u64 = u64 + int + int, so
the type of the result is correct to be stored in the u64.
Fixes: 4fb7e803eb ("ethdev: add Tx preparation")
Signed-off-by: Andy Green <andy@warmcat.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/librte_mbuf/rte_mbuf.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index ee94ec6b2..8c63a9fdb 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -1870,7 +1870,11 @@ rte_validate_tx_offload(const struct rte_mbuf *m)
return 0;
if (ol_flags & PKT_TX_OUTER_IP_CKSUM)
- inner_l3_offset += m->outer_l2_len + m->outer_l3_len;
+ /* NB: elaborating the addition like this instead of using
+ * += gives the result uint64_t type instead of int,
+ * avoiding compiler warnings on gcc 8.1 at least */
+ inner_l3_offset = inner_l3_offset + m->outer_l2_len +
+ m->outer_l3_len;
/* Headers are fragmented */
if (rte_pktmbuf_data_len(m) < inner_l3_offset + m->l3_len + m->l4_len)
--
2.11.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-01-02 23:59:13.923877201 -0800
+++ 0035-mbuf-avoid-implicit-demotion-in-64-bit-arithmetic.patch 2019-01-02 23:59:12.103815000 -0800
@@ -1,8 +1,10 @@
-From ef5092e16b137fd5e23d19b4b17b32f330d4a4ad Mon Sep 17 00:00:00 2001
+From cf80647272d6586f2032059361162f0ad2f9f14f Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Tue, 22 May 2018 09:24:32 +0800
Subject: [PATCH] mbuf: avoid implicit demotion in 64-bit arithmetic
+[ upstream commit ef5092e16b137fd5e23d19b4b17b32f330d4a4ad ]
+
GCC 8.1 warned:
In function 'rte_validate_tx_offload':
@@ -26,7 +28,6 @@
the type of the result is correct to be stored in the u64.
Fixes: 4fb7e803eb ("ethdev: add Tx preparation")
-Cc: stable@dpdk.org
Signed-off-by: Andy Green <andy@warmcat.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
@@ -35,10 +36,10 @@
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
-index 715f90ea0..0e89a6927 100644
+index ee94ec6b2..8c63a9fdb 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
-@@ -2112,7 +2112,11 @@ rte_validate_tx_offload(const struct rte_mbuf *m)
+@@ -1870,7 +1870,11 @@ rte_validate_tx_offload(const struct rte_mbuf *m)
return 0;
if (ol_flags & PKT_TX_OUTER_IP_CKSUM)
next prev parent reply other threads:[~2019-01-03 8:15 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-03 8:13 [dpdk-stable] patch 'eal: explicit cast of builtin for bsf32' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'eal: explicit cast of core id when getting index' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'eal: declare trace buffer at top of own block' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'spinlock/x86: move stack declaration before code' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'net: move stack variable at top of VLAN strip function' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'ethdev: explicit cast of buffered Tx number' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'hash: move stack declaration at top of CRC32c function' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'hash: explicit casts for truncation in CRC32c' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'bus/pci: replace strncpy by strlcpy' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'bus/dpaa: fix inconsistent struct alignment' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'net/nfp: fix memcpy out of source range' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'net/qede: replace strncpy by strlcpy' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'net/qede: fix strncpy' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'net/sfc: make sure that stats name is nul-terminated' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'app/procinfo: fix sprintf overrun' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'devtools: provide more generic grep in git check' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'eal: explicit cast of strlcpy return' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'eal: fix casts in random functions' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'eal: explicit cast in constant byte swap' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'ring: remove useless variables' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'ring: remove signed type flip-flopping' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'mbuf: fix reference counter integer promotion' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'mbuf: explicit casts of reference counter' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'mbuf: explicit cast of headroom on reset' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'mbuf: explicit cast of size on detach' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'net: explicit cast of multicast bit clearing' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'net: explicit cast of IP checksum to 16-bit' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'net: explicit cast of protocol in IPv6 checksum' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'ethdev: explicit cast of queue count return' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'eal/x86: fix type of variable in memcpy function' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'eal: explicit cast in rwlock functions' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'net: explicit cast in L4 checksum' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'mbuf: fix type of private size in detach' " Yongseok Koh
2019-01-03 8:13 ` [dpdk-stable] patch 'mbuf: fix type of variables in linearize function' " Yongseok Koh
2019-01-03 8:13 ` Yongseok Koh [this message]
2019-01-03 8:13 ` [dpdk-stable] patch 'mbuf: avoid integer promotion in prepend/adj/chain' " Yongseok Koh
2019-01-03 8:14 ` [dpdk-stable] patch 'ethdev: fix type and scope of variables in Rx burst' " Yongseok Koh
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=20190103081400.14191-35-yskoh@mellanox.com \
--to=yskoh@mellanox.com \
--cc=andy@warmcat.com \
--cc=bruce.richardson@intel.com \
--cc=stable@dpdk.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).