From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id DB2AEA00E6 for ; Tue, 14 May 2019 16:45:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CD13B5B2A; Tue, 14 May 2019 16:45:08 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8E0675B2A for ; Tue, 14 May 2019 16:45:07 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 00827307AD12; Tue, 14 May 2019 14:45:07 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-124.ams2.redhat.com [10.36.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1478608AB; Tue, 14 May 2019 14:45:04 +0000 (UTC) From: Kevin Traynor To: Kevin Traynor Cc: Bernard Iremonger , dpdk stable Date: Tue, 14 May 2019 15:44:02 +0100 Message-Id: <20190514144406.7526-18-ktraynor@redhat.com> In-Reply-To: <20190514144406.7526-1-ktraynor@redhat.com> References: <20190514144406.7526-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 14 May 2019 14:45:07 +0000 (UTC) Subject: [dpdk-stable] patch 'doc: fix formatting in testpmd guide' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/20/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 rebasing (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/16261afbb04f6e5e7cf8d00bcfb8e0406311626f Thanks. Kevin Traynor --- >From 16261afbb04f6e5e7cf8d00bcfb8e0406311626f Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Thu, 2 May 2019 19:43:42 +0100 Subject: [PATCH] doc: fix formatting in testpmd guide [ upstream commit 7fa1a2de3663d7ae702f2ac956b449931f8c5971 ] Minor formatting error related to code block noticed when reading the doc. Fix it and some other errors. Fixes: c7217b9dd8ef ("app/testpmd: change log level at run time") Fixes: 3c272b280a50 ("app/testpmd: add commands for RSS queue region") Fixes: e38ea44f1714 ("app/testpmd: add configuration for input set") Fixes: 08e0b3440baf ("app/testpmd: add option to configure UDP tunnel port") Fixes: e977e4199a8d ("app/testpmd: add commands to load/unload BPF filters") Signed-off-by: Kevin Traynor Acked-by: Bernard Iremonger --- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 6b08a01c8..81f10727f 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -527,7 +527,9 @@ Where: For example, to change the global log level:: + testpmd> set log global (level) Regexes can also be used for type. To change log level of user1, user2 and user3:: + testpmd> set log user[1-3] (level) @@ -981,9 +983,10 @@ Flush all queue region related configuration on a port:: where: -* "on"is just an enable function which server for other configuration, +* ``on``: is just an enable function which server for other configuration, it is for all configuration about queue region from up layer, at first will only keep in DPDK software stored in driver, only after "flush on", it commit all configuration to HW. - "off" is just clean all configuration about queue region just now, + +* ``off``: is just clean all configuration about queue region just now, and restore all to DPDK i40e driver default config when start up. @@ -2194,4 +2197,5 @@ port config input set Config RSS/FDIR/FDIR flexible payload input set for some pctype:: + testpmd> port config (port_id) pctype (pctype_id) \ (hash_inset|fdir_inset|fdir_flx_inset) \ @@ -2199,4 +2203,5 @@ Config RSS/FDIR/FDIR flexible payload input set for some pctype:: Clear RSS/FDIR/FDIR flexible payload input set for some pctype:: + testpmd> port config (port_id) pctype (pctype_id) \ (hash_inset|fdir_inset|fdir_flx_inset) clear all @@ -2211,4 +2216,5 @@ port config udp_tunnel_port Add/remove UDP tunnel port for VXLAN/GENEVE tunneling protocols:: + testpmd> port config (port_id) udp_tunnel_port add|rm vxlan|geneve (udp_port) @@ -4591,5 +4597,5 @@ For example: clang -O2 -target bpf -c t1.c -Then to load (and JIT compile) t1.o at RX queue 0, port 1:: +Then to load (and JIT compile) t1.o at RX queue 0, port 1: .. code-block:: console @@ -4597,5 +4603,5 @@ Then to load (and JIT compile) t1.o at RX queue 0, port 1:: testpmd> bpf-load rx 1 0 J ./dpdk.org/test/bpf/t1.o -To load (not JITed) t1.o at TX queue 0, port 0:: +To load (not JITed) t1.o at TX queue 0, port 0: .. code-block:: console -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-14 15:39:08.167600937 +0100 +++ 0018-doc-fix-formatting-in-testpmd-guide.patch 2019-05-14 15:39:07.318558711 +0100 @@ -1 +1 @@ -From 7fa1a2de3663d7ae702f2ac956b449931f8c5971 Mon Sep 17 00:00:00 2001 +From 16261afbb04f6e5e7cf8d00bcfb8e0406311626f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7fa1a2de3663d7ae702f2ac956b449931f8c5971 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 89d494c5b..cb83a3ce8 100644 +index 6b08a01c8..81f10727f 100644 @@ -26 +27 @@ -@@ -564,7 +564,9 @@ Where: +@@ -527,7 +527,9 @@ Where: @@ -36 +37 @@ -@@ -1020,9 +1022,10 @@ Flush all queue region related configuration on a port:: +@@ -981,9 +983,10 @@ Flush all queue region related configuration on a port:: @@ -46 +47 @@ -+* ``"off``: is just clean all configuration about queue region just now, ++* ``off``: is just clean all configuration about queue region just now, @@ -49 +50 @@ -@@ -2237,4 +2240,5 @@ port config input set +@@ -2194,4 +2197,5 @@ port config input set @@ -55 +56 @@ -@@ -2242,4 +2246,5 @@ Config RSS/FDIR/FDIR flexible payload input set for some pctype:: +@@ -2199,4 +2203,5 @@ Config RSS/FDIR/FDIR flexible payload input set for some pctype:: @@ -61 +62 @@ -@@ -2254,4 +2259,5 @@ port config udp_tunnel_port +@@ -2211,4 +2216,5 @@ port config udp_tunnel_port @@ -65 +66 @@ - testpmd> port config (port_id) udp_tunnel_port add|rm vxlan|geneve|vxlan-gpe (udp_port) + testpmd> port config (port_id) udp_tunnel_port add|rm vxlan|geneve (udp_port) @@ -67 +68 @@ -@@ -4646,5 +4652,5 @@ For example: +@@ -4591,5 +4597,5 @@ For example: @@ -74,2 +75,2 @@ -@@ -4652,5 +4658,5 @@ Then to load (and JIT compile) t1.o at RX queue 0, port 1:: - testpmd> bpf-load rx 1 0 J ./dpdk.org/examples/bpf/t1.o +@@ -4597,5 +4603,5 @@ Then to load (and JIT compile) t1.o at RX queue 0, port 1:: + testpmd> bpf-load rx 1 0 J ./dpdk.org/test/bpf/t1.o