[dpdk-stable] patch 'mbuf: explicit cast of size on detach' has been queued to LTS release 17.11.5
Yongseok Koh
yskoh at mellanox.com
Thu Jan 3 09:13:48 CET 2019
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 <andy at warmcat.com>
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 <andy at warmcat.com>
---
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 <andy at warmcat.com>
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 at dpdk.org
Signed-off-by: Andy Green <andy at warmcat.com>
---
@@ -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;
More information about the stable
mailing list