From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 2977DC5E6 for ; Thu, 25 Jun 2015 13:28:16 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 25 Jun 2015 04:28:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,675,1427785200"; d="scan'208";a="717446940" Received: from unknown (HELO stargo) ([10.217.248.233]) by orsmga001.jf.intel.com with SMTP; 25 Jun 2015 04:28:10 -0700 Received: by stargo (sSMTP sendmail emulation); Thu, 25 Jun 2015 13:29:04 +0200 From: Maciej Gajdzica To: dev@dpdk.org Date: Thu, 25 Jun 2015 13:15:10 +0200 Message-Id: <1435230914-8174-8-git-send-email-maciejx.t.gajdzica@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435230914-8174-1-git-send-email-maciejx.t.gajdzica@intel.com> References: <1435230914-8174-1-git-send-email-maciejx.t.gajdzica@intel.com> Subject: [dpdk-dev] [PATCH v2 07/11] ip_pipeline: moved config files to separate folder X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 11:28:21 -0000 Created new folder for config(.cfg) and script(.sh) files. Signed-off-by: Maciej Gajdzica --- examples/ip_pipeline/config/ip_pipeline.cfg | 9 ++ examples/ip_pipeline/config/ip_pipeline.sh | 5 + examples/ip_pipeline/config/test.cfg | 164 +++++++++++++++++++++++++++ examples/ip_pipeline/config/test.sh | 6 + examples/ip_pipeline/config/tm_profile.cfg | 105 +++++++++++++++++ examples/ip_pipeline/ip_pipeline.cfg | 56 --------- examples/ip_pipeline/ip_pipeline.sh | 18 --- 7 files changed, 289 insertions(+), 74 deletions(-) create mode 100644 examples/ip_pipeline/config/ip_pipeline.cfg create mode 100644 examples/ip_pipeline/config/ip_pipeline.sh create mode 100644 examples/ip_pipeline/config/test.cfg create mode 100644 examples/ip_pipeline/config/test.sh create mode 100644 examples/ip_pipeline/config/tm_profile.cfg delete mode 100644 examples/ip_pipeline/ip_pipeline.cfg delete mode 100644 examples/ip_pipeline/ip_pipeline.sh diff --git a/examples/ip_pipeline/config/ip_pipeline.cfg b/examples/ip_pipeline/config/ip_pipeline.cfg new file mode 100644 index 0000000..095ed25 --- /dev/null +++ b/examples/ip_pipeline/config/ip_pipeline.cfg @@ -0,0 +1,9 @@ +[PIPELINE0] +type = MASTER +core = 0 + +[PIPELINE1] +type = PASS-THROUGH +core = 1 +pktq_in = RXQ0.0 RXQ1.0 RXQ2.0 RXQ3.0 +pktq_out = TXQ0.0 TXQ1.0 TXQ2.0 TXQ3.0 diff --git a/examples/ip_pipeline/config/ip_pipeline.sh b/examples/ip_pipeline/config/ip_pipeline.sh new file mode 100644 index 0000000..4fca259 --- /dev/null +++ b/examples/ip_pipeline/config/ip_pipeline.sh @@ -0,0 +1,5 @@ +# +#run config/ip_pipeline.sh +# + +p 1 ping diff --git a/examples/ip_pipeline/config/test.cfg b/examples/ip_pipeline/config/test.cfg new file mode 100644 index 0000000..99a21dd --- /dev/null +++ b/examples/ip_pipeline/config/test.cfg @@ -0,0 +1,164 @@ +; #define OFFSET_QINQ 142 +; #define OFFSET_IP_DA 166 +; #define OFFSET_HASH 128 +; #define OFFSET_FLOW_ID 132 +; #define OFFSET_COLOR 136 + +; TBD - need to think about +;[EAL] +; c = not allowed +;n = 2 ; +;m = 2048 + + +[PIPELINE0] +type = MASTER +core = 0 + +[PIPELINE1] +type = PASS-THROUGH; Packet RX +core = s0c1 +pktq_in = RXQ0.0 RXQ1.0 SWQ1 +pktq_out = SWQ0 SWQ1 +msgq_in = MSGQ0 +msgq_out = MSGQ1 +pkt_type=qinq_ipv4 +key_type=qinq +key_offset=OFFSET_QINQ +hash_offset=OFFSET_HASH +timer_period = 2 + +[PIPELINE2] +type = FIREWALL +core = s1c2 +pktq_in = SWQ0 SWQ5 +pktq_out = SWQ2 SINK0 +msgq_in = MSGQ1 +msgq_out = MSGQ0 +n_rules=4K +pkt_type=qinq_ipv4 + +[PIPELINE3] +type = FLOW_CLASSIF +core = s0c3 +pktq_in = SWQ2 +pktq_out = SWQ3 SINK1 +time_period = 100 +n_flows=16M +key_size=8 +key_offset=$OFFSET_QINQ +hash_offset=$OFFSET_HASH +flow_id_offset=$OFFSET_FLOW_ID + +[PIPELINE4] +type = FLOW_ACTIONS +core = c4h +pktq_in = SWQ3 +pktq_out = SWQ4 +n_flows=16M +flow_id_offset=$OFFSET_FLOW_ID +color_offset=$OFFSET_COLOR + +[PIPELINE5] +type = ROUTING +core = s1c5h +pktq_in = SWQ4 +pktq_out = TXQ0.0 TXQ1.0 SINK2 +n_routes=1M +next_hop_type=ipv4_mpls +ip_da_offset=$OFFSET_IP_DA +color_offset=$OFFSET_COLOR + +[MEMPOOL1] +pool_size=2k +cache_size=64 + +[LINK0] +ip_local_q=0 +udp_local_q =0 +arp_q=0 +tcp_local_q=0 + +[LINK1] +ip_local_q=0 +udp_local_q =0 +arp_q=0 +tcp_local_q=0 + +[RXQ0.0] +mempool=MEMPOOL0 +burst=16 +size=128 + +[RXQ1.0] +mempool=MEMPOOL0 +burst=16 +size=128 + +[TXQ0.0] +burst=16 +size=128 +dropless=yes + +[TXQ1.0] +burst=16 +size=128 +dropless=no + +[SWQ0] +size=64 + +[SWQ1] +dropless=yes + +[SWQ2] +cpu=0 + +[SWQ3] +dropless=yes + +[SWQ4] +dropless=yes + +[TM1] +cfg=config/tm_profile.cfg + +[SOURCE1] +mempool=MEMPOOL3 +burst=64 + +[MSGQ-REQ-PIPELINE1] +size=16 + +[MSGQ-RSP-PIPELINE1] +size=16 + +[MSGQ-REQ-PIPELINE2] +size=16 + +[MSGQ-RSP-PIPELINE2] +size=16 + +[MSGQ-REQ-PIPELINE3] +size=16 + +[MSGQ-RSP-PIPELINE3] +size=16 + +[MSGQ-REQ-PIPELINE4] +size=16 + +[MSGQ-RSP-PIPELINE4] +size=16 + +[MSGQ-REQ-PIPELINE5] +size=16 + +[MSGQ-RSP-PIPELINE5] +size=16 + +;[MSGQ-REQ-CORE-s1c5h] +;size = 32 + +;[MSGQ-RSP-CORE-s1c5h] +;size = 32 diff --git a/examples/ip_pipeline/config/test.sh b/examples/ip_pipeline/config/test.sh new file mode 100644 index 0000000..ca78a4a --- /dev/null +++ b/examples/ip_pipeline/config/test.sh @@ -0,0 +1,6 @@ +p 1 ping +p 1 stats port in 0 +p 1 stats table 0 +p 1 stats port out 1 +p 1 port in 0 disable +p 1 port in 0 enable diff --git a/examples/ip_pipeline/config/tm_profile.cfg b/examples/ip_pipeline/config/tm_profile.cfg new file mode 100644 index 0000000..53edb67 --- /dev/null +++ b/examples/ip_pipeline/config/tm_profile.cfg @@ -0,0 +1,105 @@ +; BSD LICENSE +; +; Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +; All rights reserved. +; +; Redistribution and use in source and binary forms, with or without +; modification, are permitted provided that the following conditions +; are met: +; +; * Redistributions of source code must retain the above copyright +; notice, this list of conditions and the following disclaimer. +; * Redistributions in binary form must reproduce the above copyright +; notice, this list of conditions and the following disclaimer in +; the documentation and/or other materials provided with the +; distribution. +; * Neither the name of Intel Corporation nor the names of its +; contributors may be used to endorse or promote products derived +; from this software without specific prior written permission. +; +; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +; This file enables the following hierarchical scheduler configuration for each +; 10GbE output port: +; * Single subport (subport 0): +; - Subport rate set to 100% of port rate +; - Each of the 4 traffic classes has rate set to 100% of port rate +; * 4K pipes per subport 0 (pipes 0 .. 4095) with identical configuration: +; - Pipe rate set to 1/4K of port rate +; - Each of the 4 traffic classes has rate set to 100% of pipe rate +; - Within each traffic class, the byte-level WRR weights for the 4 queues +; are set to 1:1:1:1 +; +; For more details, please refer to chapter "Quality of Service (QoS) Framework" +; of Intel Data Plane Development Kit (Intel DPDK) Programmer's Guide. + +; Port configuration +[port] +frame overhead = 24 ; frame overhead = Preamble (7) + SFD (1) + FCS (4) + IFG (12) +mtu = 1522; mtu = Q-in-Q MTU (FCS not included) +number of subports per port = 1 +number of pipes per subport = 4096 +queue sizes = 64 64 64 64 + +; Subport configuration +[subport 0] +tb rate = 1250000000 ; Bytes per second +tb size = 1000000 ; Bytes + +tc 0 rate = 1250000000 ; Bytes per second +tc 1 rate = 1250000000 ; Bytes per second +tc 2 rate = 1250000000 ; Bytes per second +tc 3 rate = 1250000000 ; Bytes per second +tc period = 10 ; Milliseconds + +pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 + +; Pipe configuration +[pipe profile 0] +tb rate = 305175 ; Bytes per second +tb size = 1000000 ; Bytes + +tc 0 rate = 305175 ; Bytes per second +tc 1 rate = 305175 ; Bytes per second +tc 2 rate = 305175 ; Bytes per second +tc 3 rate = 305175 ; Bytes per second +tc period = 40 ; Milliseconds + +tc 3 oversubscription weight = 1 + +tc 0 wrr weights = 1 1 1 1 +tc 1 wrr weights = 1 1 1 1 +tc 2 wrr weights = 1 1 1 1 +tc 3 wrr weights = 1 1 1 1 + +; RED params per traffic class and color (Green / Yellow / Red) +[red] +tc 0 wred min = 48 40 32 +tc 0 wred max = 64 64 64 +tc 0 wred inv prob = 10 10 10 +tc 0 wred weight = 9 9 9 + +tc 1 wred min = 48 40 32 +tc 1 wred max = 64 64 64 +tc 1 wred inv prob = 10 10 10 +tc 1 wred weight = 9 9 9 + +tc 2 wred min = 48 40 32 +tc 2 wred max = 64 64 64 +tc 2 wred inv prob = 10 10 10 +tc 2 wred weight = 9 9 9 + +tc 3 wred min = 48 40 32 +tc 3 wred max = 64 64 64 +tc 3 wred inv prob = 10 10 10 +tc 3 wred weight = 9 9 9 diff --git a/examples/ip_pipeline/ip_pipeline.cfg b/examples/ip_pipeline/ip_pipeline.cfg deleted file mode 100644 index 428830d..0000000 --- a/examples/ip_pipeline/ip_pipeline.cfg +++ /dev/null @@ -1,56 +0,0 @@ -; BSD LICENSE -; -; Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -; All rights reserved. -; -; Redistribution and use in source and binary forms, with or without -; modification, are permitted provided that the following conditions -; are met: -; -; * Redistributions of source code must retain the above copyright -; notice, this list of conditions and the following disclaimer. -; * Redistributions in binary form must reproduce the above copyright -; notice, this list of conditions and the following disclaimer in -; the documentation and/or other materials provided with the -; distribution. -; * Neither the name of Intel Corporation nor the names of its -; contributors may be used to endorse or promote products derived -; from this software without specific prior written permission. -; -; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -; Core configuration -[core 0] -type = MASTER -queues in = 15 16 17 -1 -1 -1 -1 -1 -queues out = 12 13 14 -1 -1 -1 -1 -1 - -[core 1] -type = RX -queues in = -1 -1 -1 -1 -1 -1 -1 12 -queues out = 0 1 2 3 -1 -1 -1 15 - -[core 2] -type = FC -queues in = 0 1 2 3 -1 -1 -1 13 -queues out = 4 5 6 7 -1 -1 -1 16 - -[core 3] -type = RT -queues in = 4 5 6 7 -1 -1 -1 14 -queues out = 8 9 10 11 -1 -1 -1 17 - -[core 4] -type = TX -queues in = 8 9 10 11 -1 -1 -1 -1 -queues out = -1 -1 -1 -1 -1 -1 -1 -1 diff --git a/examples/ip_pipeline/ip_pipeline.sh b/examples/ip_pipeline/ip_pipeline.sh deleted file mode 100644 index c3419ca..0000000 --- a/examples/ip_pipeline/ip_pipeline.sh +++ /dev/null @@ -1,18 +0,0 @@ -#Address Resolution Protocol (ARP) Table -#arp add iface ipaddr macaddr -arp add 0 0.0.0.1 0a:0b:0c:0d:0e:0f -arp add 1 0.128.0.1 1a:1b:1c:1d:1e:1f - -#Routing Table -#route add ipaddr prefixlen iface gateway -route add 0.0.0.0 9 0 0.0.0.1 -route add 0.128.0.0 9 1 0.128.0.1 - -#Flow Table -flow add all -#flow add 0.0.0.0 1.2.3.4 0 0 6 0 -#flow add 10.11.12.13 0.0.0.0 0 0 6 1 - -#Firewall -#firewall add 1 0.0.0.0 0 0.0.0.0 9 0 65535 0 65535 6 0xf 0 -#firewall add 1 0.0.0.0 0 0.128.0.0 9 0 65535 0 65535 6 0xf 1 -- 1.7.9.5