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 BDB1E1B94A for ; Fri, 11 Jan 2019 11:32:18 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 11 Jan 2019 12:32:16 +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 x0BAVjcf018586; Fri, 11 Jan 2019 12:32:14 +0200 From: Yongseok Koh To: Marko Kovacevic Cc: Reshma Pattan , dpdk stable Date: Fri, 11 Jan 2019 02:31:40 -0800 Message-Id: <20190111103142.21088-17-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190111103142.21088-1-yskoh@mellanox.com> References: <20190111103142.21088-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'app/pdump: fix port id storage size' 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: Fri, 11 Jan 2019 10:32:19 -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/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 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 Acked-by: Reshma Pattan --- 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 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 Acked-by: Reshma Pattan @@ -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