From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 31F1FA04F5 for ; Wed, 11 Dec 2019 22:28:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 12BDA1BE80; Wed, 11 Dec 2019 22:28:18 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 995C12C6A for ; Wed, 11 Dec 2019 22:28:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7COI/LGCljmOTvT5xO+m+RIT+11XHwr5J829x7HC3l8=; b=AU3XCanG9Ykbc0W5SYTctETBRKVRnCoAT36VoZfF4yAc1qqtM2/U1NZJJ9TFY+j8Fg/J92 FYkVoEHAAnTv8il0m631gNVhmC57NmIJr53O9vxG2eaYFieghIQuLvt8Dqf83gNWzYPf5/ qlx316qMu1bXxGpJLOyCREhS7/Em5mM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-99-C2c7hk4UMlOw7oLi4RKCZQ-1; Wed, 11 Dec 2019 16:28:12 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id C1460DBFC; Wed, 11 Dec 2019 21:28:11 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id B65B210013A1; Wed, 11 Dec 2019 21:28:10 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Bernard Iremonger , dpdk stable Date: Wed, 11 Dec 2019 21:26:13 +0000 Message-Id: <20191211212702.27851-21-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: C2c7hk4UMlOw7oLi4RKCZQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'app/testpmd: block xstats for hidden ports' has been queued to LTS release 18.11.6 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 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/17/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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/43349d39036bfca5c0= 217484c97629d75c730534 Thanks. Kevin. --- >From 43349d39036bfca5c0217484c97629d75c730534 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 1 Nov 2019 13:12:55 -0700 Subject: [PATCH] app/testpmd: block xstats for hidden ports [ upstream commit bd67b6772492cdd9f7249bdff7163e9698bdcc16 ] All the other testpmd commands block access to devices that are owned. Looks like xstat got overlooked. Fixes: bfd5051b43b5 ("app/testpmd: new command to get extended statistics") Signed-off-by: Stephen Hemminger Acked-by: Bernard Iremonger --- app/test-pmd/config.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 1f61e4c2d..6798f7697 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -220,4 +220,8 @@ nic_xstats_display(portid_t port_id) =09struct rte_eth_xstat_name *xstats_names; =20 +=09if (port_id_is_invalid(port_id, ENABLED_WARN)) { +=09=09print_valid_ports(); +=09=09return; +=09} =09printf("###### NIC extended statistics for port %-2d\n", port_id); =09if (!rte_eth_dev_is_valid_port(port_id)) { @@ -275,4 +279,8 @@ void nic_xstats_clear(portid_t port_id) { +=09if (port_id_is_invalid(port_id, ENABLED_WARN)) { +=09=09print_valid_ports(); +=09=09return; +=09} =09rte_eth_xstats_reset(port_id); } --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:14.399049135 +0000 +++ 0021-app-testpmd-block-xstats-for-hidden-ports.patch=092019-12-11 21:24= :12.620652189 +0000 @@ -1 +1 @@ -From bd67b6772492cdd9f7249bdff7163e9698bdcc16 Mon Sep 17 00:00:00 2001 +From 43349d39036bfca5c0217484c97629d75c730534 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bd67b6772492cdd9f7249bdff7163e9698bdcc16 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index b6039749c..2a51d9664 100644 +index 1f61e4c2d..6798f7697 100644 @@ -22 +23 @@ -@@ -239,4 +239,8 @@ nic_xstats_display(portid_t port_id) +@@ -220,4 +220,8 @@ nic_xstats_display(portid_t port_id) @@ -31,3 +32,3 @@ -@@ -296,4 +300,8 @@ nic_xstats_clear(portid_t port_id) - =09int ret; -=20 +@@ -275,4 +279,8 @@ void + nic_xstats_clear(portid_t port_id) + { @@ -38,2 +39,2 @@ - =09ret =3D rte_eth_xstats_reset(port_id); - =09if (ret !=3D 0) { + =09rte_eth_xstats_reset(port_id); + }