From: Yongseok Koh <yskoh@mellanox.com>
To: Marko Kovacevic <marko.kovacevic@intel.com>
Cc: Reshma Pattan <reshma.pattan@intel.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'app/pdump: fix port id storage size' has been queued to LTS release 17.11.5
Date: Fri, 11 Jan 2019 02:31:40 -0800 [thread overview]
Message-ID: <20190111103142.21088-17-yskoh@mellanox.com> (raw)
In-Reply-To: <20190111103142.21088-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/13/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 bd65361a65a27534bfe4e6a31ed39f156e4a35f7 Mon Sep 17 00:00:00 2001
From: Marko Kovacevic <marko.kovacevic@intel.com>
Date: Wed, 14 Nov 2018 08:56:45 +0000
Subject: [PATCH] app/pdump: fix port id storage size
[ upstream commit e772cf1bd0c10c13375d7de9acff842b76cb8f35 ]
port_id size should be uint16_t,
fix where it is defined as uint8_t
Fixes: f8244c6399d9 ("ethdev: increase port id range")
Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.com>
---
app/pdump/main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/pdump/main.c b/app/pdump/main.c
index 66272f59a..8e42b3647 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -148,8 +148,8 @@ struct pdump_tuples {
/* params for packet dumping */
enum pdump_by dump_by_type;
- int rx_vdev_id;
- int tx_vdev_id;
+ uint16_t rx_vdev_id;
+ uint16_t tx_vdev_id;
enum pcap_stream rx_vdev_stream_type;
enum pcap_stream tx_vdev_stream_type;
bool single_pdump_dev;
@@ -301,7 +301,7 @@ parse_pdump(const char *optarg)
&parse_uint_value, &v);
if (ret < 0)
goto free_kvlist;
- pt->port = (uint8_t) v.val;
+ pt->port = (uint16_t) v.val;
pt->dump_by_type = PORT_ID;
} else if (cnt2 == 1) {
ret = rte_kvargs_process(kvlist, PDUMP_PCI_ARG,
@@ -489,7 +489,7 @@ disable_pdump(struct pdump_tuples *pt)
}
static inline void
-pdump_rxtx(struct rte_ring *ring, uint8_t vdev_id, struct pdump_stats *stats)
+pdump_rxtx(struct rte_ring *ring, uint16_t vdev_id, struct pdump_stats *stats)
{
/* write input packets of port to vdev for pdump */
struct rte_mbuf *rxtx_bufs[BURST_SIZE];
@@ -516,7 +516,7 @@ pdump_rxtx(struct rte_ring *ring, uint8_t vdev_id, struct pdump_stats *stats)
}
static void
-free_ring_data(struct rte_ring *ring, uint8_t vdev_id,
+free_ring_data(struct rte_ring *ring, uint16_t vdev_id,
struct pdump_stats *stats)
{
while (rte_ring_count(ring))
--
2.11.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-01-11 02:29:11.822341303 -0800
+++ 0017-app-pdump-fix-port-id-storage-size.patch 2019-01-11 02:29:10.824973000 -0800
@@ -1,13 +1,14 @@
-From e772cf1bd0c10c13375d7de9acff842b76cb8f35 Mon Sep 17 00:00:00 2001
+From bd65361a65a27534bfe4e6a31ed39f156e4a35f7 Mon Sep 17 00:00:00 2001
From: Marko Kovacevic <marko.kovacevic@intel.com>
Date: Wed, 14 Nov 2018 08:56:45 +0000
Subject: [PATCH] app/pdump: fix port id storage size
+[ upstream commit e772cf1bd0c10c13375d7de9acff842b76cb8f35 ]
+
port_id size should be uint16_t,
fix where it is defined as uint8_t
Fixes: f8244c6399d9 ("ethdev: increase port id range")
-Cc: stable@dpdk.org
Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.com>
@@ -16,10 +17,10 @@
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/pdump/main.c b/app/pdump/main.c
-index d96556ecf..9e86bf623 100644
+index 66272f59a..8e42b3647 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
-@@ -119,8 +119,8 @@ struct pdump_tuples {
+@@ -148,8 +148,8 @@ struct pdump_tuples {
/* params for packet dumping */
enum pdump_by dump_by_type;
@@ -30,7 +31,7 @@
enum pcap_stream rx_vdev_stream_type;
enum pcap_stream tx_vdev_stream_type;
bool single_pdump_dev;
-@@ -266,7 +266,7 @@ parse_pdump(const char *optarg)
+@@ -301,7 +301,7 @@ parse_pdump(const char *optarg)
&parse_uint_value, &v);
if (ret < 0)
goto free_kvlist;
@@ -39,7 +40,7 @@
pt->dump_by_type = PORT_ID;
} else if (cnt2 == 1) {
ret = rte_kvargs_process(kvlist, PDUMP_PCI_ARG,
-@@ -435,7 +435,7 @@ disable_pdump(struct pdump_tuples *pt)
+@@ -489,7 +489,7 @@ disable_pdump(struct pdump_tuples *pt)
}
static inline void
@@ -48,7 +49,7 @@
{
/* write input packets of port to vdev for pdump */
struct rte_mbuf *rxtx_bufs[BURST_SIZE];
-@@ -462,7 +462,7 @@ pdump_rxtx(struct rte_ring *ring, uint8_t vdev_id, struct pdump_stats *stats)
+@@ -516,7 +516,7 @@ pdump_rxtx(struct rte_ring *ring, uint8_t vdev_id, struct pdump_stats *stats)
}
static void
next prev parent reply other threads:[~2019-01-11 10:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-11 10:31 [dpdk-stable] patch 'net/octeontx: fix packet corruption on Tx' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: fix style and syntax in flow API guide' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/mvpp2: fix array initialization' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/mlx5: fix interrupt completion queue index wrapping' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: fix missing CCM to QAT feature list' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: check Rx VLAN offload flag to print VLAN TCI' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: fix typos in the flow API guide' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: fix metering and policing commands' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/virtio: fix PCI config error handling' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'bus/dpaa: fix build with gcc 9.0' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: fix RED byte stats' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'examples/flow_filtering: remove VLAN item' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/virtio: fix unchecked return value' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/octeontx: fix mbuf corruption with large private sizes' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: fix memory leak for TM object' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/octeontx: fix failures when available ports > queues' " Yongseok Koh
2019-01-11 10:31 ` Yongseok Koh [this message]
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: add cross-compilation in sample apps guide' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/mlx4: fix possible uninitialized variable' " 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=20190111103142.21088-17-yskoh@mellanox.com \
--to=yskoh@mellanox.com \
--cc=marko.kovacevic@intel.com \
--cc=reshma.pattan@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).