d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/ip_pipeline: rework routing CLI

Browse Source 
Several routing commands are merged into two commands:
route and arp - these two commands are handled by cli library.
Rest of the commands are handled internaly by the pipeline code.

Signed-off-by: Piotr Azarewicz <piotrx.t.azarewicz@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
This commit is contained in:
Piotr Azarewicz 2016-06-08 12:35:24 +02:00 committed by Thomas Monjalon
parent 816a3db652
commit ccbb3dbde0
6 changed files with 592 additions and 1285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/ip_pipeline/config/l2fwd.cfg
View File

@ -1,6 +1,6 @@
; BSD LICENSE
;
; Copyright(c) 2015 Intel Corporation. All rights reserved.
; Copyright(c) 2015-2016 Intel Corporation. All rights reserved.
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
@ -44,6 +44,9 @@
; |________________|
;
[EAL]
log_level = 0
[PIPELINE0]
type = MASTER
core = 0

9
examples/ip_pipeline/config/l3fwd.cfg
View File

@ -1,6 +1,6 @@
; BSD LICENSE
;
; Copyright(c) 2015 Intel Corporation. All rights reserved.
; Copyright(c) 2015-2016 Intel Corporation. All rights reserved.
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
@ -50,6 +50,9 @@
; 2 Ethernet header 256 14
; 3 IPv4 header 270 20
[EAL]
log_level = 0
[PIPELINE0]
type = MASTER
core = 0
@ -59,5 +62,7 @@ type = ROUTING
core = 1
pktq_in = RXQ0.0 RXQ1.0 RXQ2.0 RXQ3.0
pktq_out = TXQ0.0 TXQ1.0 TXQ2.0 TXQ3.0 SINK0
encap = ethernet; encap = ethernet / ethernet_qinq / ethernet_mpls
encap = ethernet
;encap = ethernet_qinq
;encap = ethernet_mpls
ip_hdr_offset = 270

32
examples/ip_pipeline/config/l3fwd.sh
View File

@ -1,9 +1,33 @@
#
# run ./config/l3fwd.sh
#
################################################################################
# Routing: encap = ethernet, arp = off
################################################################################
p 1 route add default 4 #SINK0
p 1 route add 0.0.0.0 10 port 0 ether a0:b0:c0:d0:e0:f0
p 1 route add 0.64.0.0 10 port 1 ether a1:b1:c1:d1:e1:f1
p 1 route add 0.128.0.0 10 port 2 ether a2:b2:c2:d2:e2:f2
p 1 route add 0.192.0.0 10 port 3 ether a3:b3:c3:d3:e3:f3
p 1 route add 100.0.0.0 10 port 0 ether a0:b0:c0:d0:e0:f0
p 1 route add 100.64.0.0 10 port 1 ether a1:b1:c1:d1:e1:f1
p 1 route add 100.128.0.0 10 port 2 ether a2:b2:c2:d2:e2:f2
p 1 route add 100.192.0.0 10 port 3 ether a3:b3:c3:d3:e3:f3
p 1 route ls
################################################################################
# Routing: encap = ethernet_qinq, arp = off
################################################################################
#p 1 route add default 4 #SINK0
#p 1 route add 100.0.0.0 10 port 0 ether a0:b0:c0:d0:e0:f0 qinq 1000 2000
#p 1 route add 100.64.0.0 10 port 1 ether a1:b1:c1:d1:e1:f1 qinq 1001 2001
#p 1 route add 100.128.0.0 10 port 2 ether a2:b2:c2:d2:e2:f2 qinq 1002 2002
#p 1 route add 100.192.0.0 10 port 3 ether a3:b3:c3:d3:e3:f3 qinq 1003 2003
#p 1 route ls
################################################################################
# Routing: encap = ethernet_mpls, arp = off
################################################################################
#p 1 route add default 4 #SINK0
#p 1 route add 100.0.0.0 10 port 0 ether a0:b0:c0:d0:e0:f0 mpls 1000:2000
#p 1 route add 100.64.0.0 10 port 1 ether a1:b1:c1:d1:e1:f1 mpls 1001:2001
#p 1 route add 100.128.0.0 10 port 2 ether a2:b2:c2:d2:e2:f2 mpls 1002:2002
#p 1 route add 100.192.0.0 10 port 3 ether a3:b3:c3:d3:e3:f3 mpls 1003:2003
#p 1 route ls

70
examples/ip_pipeline/config/l3fwd_arp.cfg Normal file
View File

@ -0,0 +1,70 @@
; BSD LICENSE
;
; Copyright(c) 2015-2016 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.
; _______________
; RXQ0.0 --->| |---> TXQ0.0
; | |
; RXQ1.0 --->| |---> TXQ1.0
; | Routing |
; RXQ2.0 --->| |---> TXQ2.0
; | |
; RXQ3.0 --->| |---> TXQ3.0
; |_______________|
; |
; +-----------> SINK0 (route miss)
;
; Input packet: Ethernet/IPv4
;
; Packet buffer layout:
; # Field Name Offset (Bytes) Size (Bytes)
; 0 Mbuf 0 128
; 1 Headroom 128 128
; 2 Ethernet header 256 14
; 3 IPv4 header 270 20
[EAL]
log_level = 0
[PIPELINE0]
type = MASTER
core = 0
[PIPELINE1]
type = ROUTING
core = 1
pktq_in = RXQ0.0 RXQ1.0 RXQ2.0 RXQ3.0
pktq_out = TXQ0.0 TXQ1.0 TXQ2.0 TXQ3.0 SINK0
encap = ethernet
;encap = ethernet_qinq
;encap = ethernet_mpls
n_arp_entries = 1024
ip_hdr_offset = 270
arp_key_offset = 128

43
examples/ip_pipeline/config/l3fwd_arp.sh Normal file
View File

@ -0,0 +1,43 @@
#
# run ./config/l3fwd_arp.sh
#
################################################################################
# ARP
################################################################################
p 1 arp add default 4 #SINK0
p 1 arp add 0 10.0.0.1 a0:b0:c0:d0:e0:f0
p 1 arp add 1 11.0.0.1 a1:b1:c1:d1:e1:f1
p 1 arp add 2 12.0.0.1 a2:b2:c2:d2:e2:f2
p 1 arp add 3 13.0.0.1 a3:b3:c3:d3:e3:f3
p 1 arp ls
################################################################################
# Routing: encap = ethernet, arp = on
################################################################################
p 1 route add default 4 #SINK0
p 1 route add 100.0.0.0 10 port 0 ether 10.0.0.1
p 1 route add 100.64.0.0 10 port 1 ether 11.0.0.1
p 1 route add 100.128.0.0 10 port 2 ether 12.0.0.1
p 1 route add 100.192.0.0 10 port 3 ether 13.0.0.1
p 1 route ls
################################################################################
# Routing: encap = ethernet_qinq, arp = on
################################################################################
#p 1 route add default 4 #SINK0
#p 1 route add 100.0.0.0 10 port 0 ether 10.0.0.1 qinq 1000 2000
#p 1 route add 100.64.0.0 10 port 1 ether 11.0.0.1 qinq 1001 2001
#p 1 route add 100.128.0.0 10 port 2 ether 12.0.0.1 qinq 1002 2002
#p 1 route add 100.192.0.0 10 port 3 ether 13.0.0.1 qinq 1003 2003
#p 1 route ls
################################################################################
# Routing: encap = ethernet_mpls, arp = on
################################################################################
#p 1 route add default 4 #SINK0
#p 1 route add 100.0.0.0 10 port 0 ether 10.0.0.1 mpls 1000:2000
#p 1 route add 100.64.0.0 10 port 1 ether 11.0.0.1 mpls 1001:2001
#p 1 route add 100.128.0.0 10 port 2 ether 12.0.0.1 mpls 1002:2002
#p 1 route add 100.192.0.0 10 port 3 ether 13.0.0.1 mpls 1003:2003
#p 1 route ls

1718
examples/ip_pipeline/pipeline/pipeline_routing.c
View File

File diff suppressed because it is too large Load Diff