From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 30FDB1B4AA for ; Thu, 29 Nov 2018 14:23:39 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 930483082191; Thu, 29 Nov 2018 13:23:38 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-230.ams2.redhat.com [10.36.117.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05412105705E; Thu, 29 Nov 2018 13:23:36 +0000 (UTC) From: Kevin Traynor To: Marko Kovacevic Cc: Reshma Pattan , dpdk stable Date: Thu, 29 Nov 2018 13:20:57 +0000 Message-Id: <20181129132128.7609-57-ktraynor@redhat.com> In-Reply-To: <20181129132128.7609-1-ktraynor@redhat.com> References: <20181129132128.7609-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 29 Nov 2018 13:23:38 +0000 (UTC) Subject: [dpdk-stable] patch 'app/pdump: fix port id storage size' has been queued to stable release 18.08.1 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, 29 Nov 2018 13:23:39 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/08/18. 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. Kevin Traynor --- >>From 0414a05cf4d929e35063c9842ccda5ab72a738bf 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 ac2287124..af041feaa 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -120,6 +120,6 @@ 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; @@ -267,5 +267,5 @@ parse_pdump(const char *optarg) 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) { @@ -436,5 +436,5 @@ 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 */ @@ -463,5 +463,5 @@ 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) { -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 13:11:36.488582808 +0000 +++ 0056-app-pdump-fix-port-id-storage-size.patch 2018-11-29 13:11:34.000000000 +0000 @@ -1,13 +1,14 @@ -From e772cf1bd0c10c13375d7de9acff842b76cb8f35 Mon Sep 17 00:00:00 2001 +From 0414a05cf4d929e35063c9842ccda5ab72a738bf 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,7 +17,7 @@ 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/pdump/main.c b/app/pdump/main.c -index d96556ecf..9e86bf623 100644 +index ac2287124..af041feaa 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -120,6 +120,6 @@ struct pdump_tuples {