patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Yongseok Koh <yskoh@mellanox.com>
To: Andy Green <andy@warmcat.com>
Cc: Olivier Matz <olivier.matz@6wind.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'mbuf: explicit casts of reference counter' has been queued to LTS release 17.11.5
Date: Thu,  3 Jan 2019 00:13:46 -0800	[thread overview]
Message-ID: <20190103081400.14191-23-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 6e3304c3b22e94a6c6f655f0f46803da80bf529e Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Thu, 17 May 2018 21:49:32 +0800
Subject: [PATCH] mbuf: explicit casts of reference counter

[ backported from upstream commit f6ffdf1c2c1cfbb2a3cbce246b545560609abeb5 ]

differences to the atomic16 are signed, but the
atomic16 itself is unsigned.  It needs to be
made explicit with casts.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Andy Green <andy@warmcat.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
---
 lib/librte_mbuf/rte_mbuf.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 4f6e0f7e3..ce1ae55b7 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -759,7 +759,7 @@ rte_mbuf_refcnt_read(const struct rte_mbuf *m)
 static inline void
 rte_mbuf_refcnt_set(struct rte_mbuf *m, uint16_t new_value)
 {
-	rte_atomic16_set(&m->refcnt_atomic, new_value);
+	rte_atomic16_set(&m->refcnt_atomic, (int16_t)new_value);
 }
 
 /* internal */
@@ -790,8 +790,8 @@ rte_mbuf_refcnt_update(struct rte_mbuf *m, int16_t value)
 	 */
 	if (likely(rte_mbuf_refcnt_read(m) == 1)) {
 		++value;
-		rte_mbuf_refcnt_set(m, value);
-		return value;
+		rte_mbuf_refcnt_set(m, (uint16_t)value);
+		return (uint16_t)value;
 	}
 
 	return __rte_mbuf_refcnt_update(m, value);
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:13.311112437 -0800
+++ 0023-mbuf-explicit-casts-of-reference-counter.patch	2019-01-02 23:59:12.078820000 -0800
@@ -1,27 +1,27 @@
-From f6ffdf1c2c1cfbb2a3cbce246b545560609abeb5 Mon Sep 17 00:00:00 2001
+From 6e3304c3b22e94a6c6f655f0f46803da80bf529e Mon Sep 17 00:00:00 2001
 From: Andy Green <andy@warmcat.com>
 Date: Thu, 17 May 2018 21:49:32 +0800
 Subject: [PATCH] mbuf: explicit casts of reference counter
 
+[ backported from upstream commit f6ffdf1c2c1cfbb2a3cbce246b545560609abeb5 ]
+
 differences to the atomic16 are signed, but the
 atomic16 itself is unsigned.  It needs to be
 made explicit with casts.
 
 Fixes: af75078fece3 ("first public release")
-Fixes: a53aa2b9f3be ("mbuf: support attaching external buffer")
-Cc: stable@dpdk.org
 
 Signed-off-by: Andy Green <andy@warmcat.com>
 Acked-by: Olivier Matz <olivier.matz@6wind.com>
 ---
- lib/librte_mbuf/rte_mbuf.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ lib/librte_mbuf/rte_mbuf.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
-index 8a2dae23b..b776a6f24 100644
+index 4f6e0f7e3..ce1ae55b7 100644
 --- a/lib/librte_mbuf/rte_mbuf.h
 +++ b/lib/librte_mbuf/rte_mbuf.h
-@@ -806,7 +806,7 @@ rte_mbuf_refcnt_read(const struct rte_mbuf *m)
+@@ -759,7 +759,7 @@ rte_mbuf_refcnt_read(const struct rte_mbuf *m)
  static inline void
  rte_mbuf_refcnt_set(struct rte_mbuf *m, uint16_t new_value)
  {
@@ -30,7 +30,7 @@
  }
  
  /* internal */
-@@ -837,8 +837,8 @@ rte_mbuf_refcnt_update(struct rte_mbuf *m, int16_t value)
+@@ -790,8 +790,8 @@ rte_mbuf_refcnt_update(struct rte_mbuf *m, int16_t value)
  	 */
  	if (likely(rte_mbuf_refcnt_read(m) == 1)) {
  		++value;
@@ -41,26 +41,6 @@
  	}
  
  	return __rte_mbuf_refcnt_update(m, value);
-@@ -909,7 +909,7 @@ static inline void
- rte_mbuf_ext_refcnt_set(struct rte_mbuf_ext_shared_info *shinfo,
- 	uint16_t new_value)
- {
--	rte_atomic16_set(&shinfo->refcnt_atomic, new_value);
-+	rte_atomic16_set(&shinfo->refcnt_atomic, (int16_t)new_value);
- }
- 
- /**
-@@ -929,8 +929,8 @@ rte_mbuf_ext_refcnt_update(struct rte_mbuf_ext_shared_info *shinfo,
- {
- 	if (likely(rte_mbuf_ext_refcnt_read(shinfo) == 1)) {
- 		++value;
--		rte_mbuf_ext_refcnt_set(shinfo, value);
--		return value;
-+		rte_mbuf_ext_refcnt_set(shinfo, (uint16_t)value);
-+		return (uint16_t)value;
- 	}
- 
- 	return (uint16_t)rte_atomic16_add_return(&shinfo->refcnt_atomic, value);
 -- 
 2.11.0
 

  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 ` Yongseok Koh [this message]
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 ` [dpdk-stable] patch 'mbuf: avoid implicit demotion in 64-bit arithmetic' " Yongseok Koh
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-23-yskoh@mellanox.com \
    --to=yskoh@mellanox.com \
    --cc=andy@warmcat.com \
    --cc=olivier.matz@6wind.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).