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 18F2BA04B1 for ; Mon, 23 Nov 2020 18:13:31 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0EA00C8F4; Mon, 23 Nov 2020 18:13:30 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id B0B41C91C for ; Mon, 23 Nov 2020 18:13:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151606; 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=O0ZZul1VKY4S8A5RghLHJRPAjmVYLK3KEtHjMHfXzn4=; b=P77oOaqlx4CS85C4aX3twjXkJeQDwIuew0jqPR/loKpFCeMs0270kzRpG1WxOh4JFQcgWv 06ADI+TaqGAiOFDfcozSPm1C23K7unhGGyKkueHW46FlBhkYn/cIsvE5Ma58Xm/oLsGFY2 n+4/+i0ZEXWeprv2A9hhXq+1hGl3sX8= 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-214-DuDO6jkMP5amiCG6vRewiQ-1; Mon, 23 Nov 2020 12:13:23 -0500 X-MC-Unique: DuDO6jkMP5amiCG6vRewiQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 16BC39A229; Mon, 23 Nov 2020 17:13:22 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1795460C04; Mon, 23 Nov 2020 17:13:20 +0000 (UTC) From: Kevin Traynor To: Ibtisam Tariq Cc: David Marchand , dpdk stable Date: Mon, 23 Nov 2020 17:12:14 +0000 Message-Id: <20201123171222.79398-22-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/27/20. 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/591190e371b85365968da3d0e2d991a8babf1a86 Thanks. Kevin. --- >From 591190e371b85365968da3d0e2d991a8babf1a86 Mon Sep 17 00:00:00 2001 From: Ibtisam Tariq Date: Mon, 2 Nov 2020 11:19:15 +0000 Subject: [PATCH] doc: fix rule file parameters in l3fwd-acl guide [ upstream commit 1995c2c1b99afe89be8b532d2fde0d3619446f3c ] Add "--" and remove extra spaces in l3fwd-acl commands. Fixes: d0dff9ba445e ("doc: sample application user guide") Signed-off-by: Ibtisam Tariq Reviewed-by: David Marchand --- doc/guides/sample_app_ug/l3_forward_access_ctrl.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index a44fbcd52c..32adf2d3aa 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -237,5 +237,5 @@ The application has a number of command line options: .. code-block:: console - ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] + ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME --rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] @@ -269,5 +269,5 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s .. code-block:: console - ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar + ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="rule_ipv4.db" -- rule_ipv6="rule_ipv6.db" --scalar In this command: @@ -291,7 +291,7 @@ In this command: +----------+------------+-----------+-------------------------------------+ -* The --rule_ipv4 option specifies the reading of IPv4 rules sets from the ./ rule_ipv4.db file. +* The --rule_ipv4 option specifies the reading of IPv4 rules sets from the rule_ipv4.db file. -* The --rule_ipv6 option specifies the reading of IPv6 rules sets from the ./ rule_ipv6.db file. +* The --rule_ipv6 option specifies the reading of IPv6 rules sets from the rule_ipv6.db file. * The --scalar option specifies the performing of rule lookup with a scalar function. -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.510812766 +0000 +++ 0022-doc-fix-rule-file-parameters-in-l3fwd-acl-guide.patch 2020-11-23 17:10:14.005061599 +0000 @@ -1 +1 @@ -From 1995c2c1b99afe89be8b532d2fde0d3619446f3c Mon Sep 17 00:00:00 2001 +From 591190e371b85365968da3d0e2d991a8babf1a86 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1995c2c1b99afe89be8b532d2fde0d3619446f3c ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index eee5d81850..2cf6e4556f 100644 +index a44fbcd52c..32adf2d3aa 100644 @@ -24,2 +25,2 @@ -- .//examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--alg=] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM] -+ .//examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME --rule_ipv6 FILENAME [--alg=] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM] +- ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] ++ ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME --rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] @@ -28 +29 @@ -@@ -272,5 +272,5 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s +@@ -269,5 +269,5 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s @@ -31,2 +32,2 @@ -- .//examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --alg=scalar -+ .//examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="rule_ipv4.db" --rule_ipv6="rule_ipv6.db" --alg=scalar +- ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar ++ ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="rule_ipv4.db" -- rule_ipv6="rule_ipv6.db" --scalar @@ -35 +36 @@ -@@ -294,7 +294,7 @@ In this command: +@@ -291,7 +291,7 @@ In this command: @@ -44 +45 @@ - * The --alg=scalar option specifies the performing of rule lookup with a scalar function. + * The --scalar option specifies the performing of rule lookup with a scalar function.