From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 93A282BF4 for ; Thu, 3 Jan 2019 09:15:06 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 3 Jan 2019 10:15:01 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x038EJfq008603; Thu, 3 Jan 2019 10:15:00 +0200 From: Yongseok Koh To: Andy Green Cc: Olivier Matz , dpdk stable Date: Thu, 3 Jan 2019 00:13:46 -0800 Message-Id: <20190103081400.14191-23-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190103081400.14191-1-yskoh@mellanox.com> References: <20190103081400.14191-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'mbuf: explicit casts of reference counter' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jan 2019 08:15:06 -0000 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 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 Acked-by: Olivier Matz --- 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 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 Acked-by: Olivier Matz --- - 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