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 B10B91B113 for ; Thu, 3 Jan 2019 09:15:11 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 3 Jan 2019 10:15:06 +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 x038EJfs008603; Thu, 3 Jan 2019 10:15:05 +0200 From: Yongseok Koh To: Andy Green Cc: dpdk stable Date: Thu, 3 Jan 2019 00:13:48 -0800 Message-Id: <20190103081400.14191-25-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 cast of size on detach' 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:12 -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 5cdc66f3144650e5f0f6688f11ea00dcc835015b Mon Sep 17 00:00:00 2001 From: Andy Green Date: Thu, 17 May 2018 21:50:22 +0800 Subject: [PATCH] mbuf: explicit cast of size on detach [ upstream commit c779ebdca0e4765158bd1eaa6f65c9d714605fae ] GCC 8.1 warned: In function 'rte_pktmbuf_detach': rte_mbuf.h:1580:14: warning: conversion from 'long unsigned int' to 'uint32_t' {aka 'unsigned int'} may change value [-Wconversion] mbuf_size = sizeof(struct rte_mbuf) + priv_size; ^~~~~~ Fixes: 355e6735b335 ("mbuf: fix cloning with private mbuf data") Signed-off-by: Andy Green --- lib/librte_mbuf/rte_mbuf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 5b9139739..07687c39b 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1328,7 +1328,7 @@ static inline void rte_pktmbuf_detach(struct rte_mbuf *m) uint32_t mbuf_size, buf_len, priv_size; priv_size = rte_pktmbuf_priv_size(mp); - mbuf_size = sizeof(struct rte_mbuf) + priv_size; + mbuf_size = (uint32_t)(sizeof(struct rte_mbuf) + priv_size); buf_len = rte_pktmbuf_data_room_size(mp); m->priv_size = priv_size; -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-02 23:59:13.416888900 -0800 +++ 0025-mbuf-explicit-cast-of-size-on-detach.patch 2019-01-02 23:59:12.082816000 -0800 @@ -1,8 +1,10 @@ -From c779ebdca0e4765158bd1eaa6f65c9d714605fae Mon Sep 17 00:00:00 2001 +From 5cdc66f3144650e5f0f6688f11ea00dcc835015b Mon Sep 17 00:00:00 2001 From: Andy Green Date: Thu, 17 May 2018 21:50:22 +0800 Subject: [PATCH] mbuf: explicit cast of size on detach +[ upstream commit c779ebdca0e4765158bd1eaa6f65c9d714605fae ] + GCC 8.1 warned: In function 'rte_pktmbuf_detach': @@ -12,7 +14,6 @@ ^~~~~~ Fixes: 355e6735b335 ("mbuf: fix cloning with private mbuf data") -Cc: stable@dpdk.org Signed-off-by: Andy Green --- @@ -20,11 +21,11 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h -index ae0fa4d7c..28fd4ad52 100644 +index 5b9139739..07687c39b 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h -@@ -1579,7 +1579,7 @@ static inline void rte_pktmbuf_detach(struct rte_mbuf *m) - __rte_pktmbuf_free_direct(m); +@@ -1328,7 +1328,7 @@ static inline void rte_pktmbuf_detach(struct rte_mbuf *m) + uint32_t mbuf_size, buf_len, priv_size; priv_size = rte_pktmbuf_priv_size(mp); - mbuf_size = sizeof(struct rte_mbuf) + priv_size;