examples/ip_pipeline: rework flow classification CLI
This patch modifies flow classifications pipeline command line interface. All commands are merged into one cmd_fc_parsed. Additionally a classification for ipv6, ipv4 and qinq can be added from configuration file. 1. flow add qinq bulk File line format: qinq <svlan> <cvlan> port <port ID> id <flow ID> File line example: qinq 1 2 port 3 id 0 2. flow add ipv4 bulk File line format: ipv4 <sipaddr> <dipaddr> <sport> <dport> <proto> port <port ID> id <flowID> File line example: ipv4 1.2.3.4 10.20.30.40 63 127 6 port 2 id 999 3. flow add ipv6 bulk File line format: ipv6 <sipaddr> <dipaddr> <sport> <dport> <proto> port <port ID> id <flowID> Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com> Signed-off-by: Marcin Kerlin <marcinx.kerlin@intel.com> Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com> Signed-off-by: Michal Kobylinski <michalx.kobylinski@intel.com> Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
This commit is contained in:
Tomasz Kulasek
Thomas Monjalon
parent
0c1f2c4a0b
commit
93771a569d
72
examples/ip_pipeline/config/flow.cfg
Normal file
72
examples/ip_pipeline/config/flow.cfg
Normal file
@ -0,0 +1,72 @@
|
||||
; 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
|
||||
; | Flow |
|
||||
; RXQ2.0 --->| Classification |---> TXQ2.0
|
||||
; | |
|
||||
; RXQ3.0 --->| |---> TXQ3.0
|
||||
; |________________|
|
||||
; |
|
||||
; +-----------> SINK0 (flow lookup 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 QinQ/IPv4/IPv6 header 270 8/20/40
|
||||
|
||||
[EAL]
|
||||
log_level = 0
|
||||
|
||||
[PIPELINE0]
|
||||
type = MASTER
|
||||
core = 0
|
||||
|
||||
[PIPELINE1]
|
||||
type = FLOW_CLASSIFICATION
|
||||
core = 1
|
||||
pktq_in = RXQ0.0 RXQ1.0 RXQ2.0 RXQ3.0
|
||||
pktq_out = TXQ0.0 TXQ1.0 TXQ2.0 TXQ3.0 SINK0
|
||||
n_flows = 65536
|
||||
;key_size = 8 ; QinQ key size
|
||||
;key_offset = 270 ; QinQ key offset
|
||||
;key_mask = 0000FFF00000FFF0 ; QinQ key mask
|
||||
key_size = 16 ; IPv4 5-tuple key size
|
||||
key_offset = 278 ; IPv4 5-tuple key offset
|
||||
key_mask = 00FF0000FFFFFFFFFFFFFFFFFFFFFFFF ; IPv4 5-tuple key mask
|
||||
flowid_offset = 128
|
||||
25
examples/ip_pipeline/config/flow.sh
Normal file
25
examples/ip_pipeline/config/flow.sh
Normal file
@ -0,0 +1,25 @@
|
||||
#
|
||||
# run ./config/flow.sh
|
||||
#
|
||||
|
||||
################################################################################
|
||||
# Flow classification (QinQ)
|
||||
################################################################################
|
||||
#p 1 flow add default 4 #SINK0
|
||||
#p 1 flow add qinq 100 200 port 0 id 0
|
||||
#p 1 flow add qinq 101 201 port 1 id 1
|
||||
#p 1 flow add qinq 102 202 port 2 id 2
|
||||
#p 1 flow add qinq 103 203 port 3 id 3
|
||||
|
||||
#p 1 flow add qinq bulk ./config/flow.txt
|
||||
|
||||
################################################################################
|
||||
# Flow classification (IPv4 5-tuple)
|
||||
################################################################################
|
||||
p 1 flow add default 4 #SINK0
|
||||
p 1 flow add ipv4 100.0.0.10 200.0.0.10 100 200 6 port 0 id 0
|
||||
p 1 flow add ipv4 100.0.0.11 200.0.0.11 101 201 6 port 1 id 1
|
||||
p 1 flow add ipv4 100.0.0.12 200.0.0.12 102 202 6 port 2 id 2
|
||||
p 1 flow add ipv4 100.0.0.13 200.0.0.13 103 203 6 port 3 id 3
|
||||
|
||||
#p 1 flow add ipv4 bulk ./config/flow.txt
|
||||
17
examples/ip_pipeline/config/flow.txt
Normal file
17
examples/ip_pipeline/config/flow.txt
Normal file
@ -0,0 +1,17 @@
|
||||
#
|
||||
# p <pipelineid> flow add qinq bulk ./config/flow.txt
|
||||
#
|
||||
|
||||
#qinq 100 200 port 0 id 0
|
||||
#qinq 101 201 port 1 id 1
|
||||
#qinq 102 202 port 2 id 2
|
||||
#qinq 103 203 port 3 id 3
|
||||
|
||||
#
|
||||
# p <pipelineid> flow add ipv4 bulk ./config/flow.txt
|
||||
#
|
||||
|
||||
ipv4 100.0.0.10 200.0.0.10 100 200 6 port 0 id 0
|
||||
ipv4 100.0.0.11 200.0.0.11 101 201 6 port 1 id 1
|
||||
ipv4 100.0.0.12 200.0.0.12 102 202 6 port 2 id 2
|
||||
ipv4 100.0.0.13 200.0.0.13 103 203 6 port 3 id 3
|
||||
File diff suppressed because it is too large
Load Diff
@ -102,6 +102,34 @@ int
|
||||
app_pipeline_fc_del_default(struct app_params *app,
|
||||
uint32_t pipeline_id);
|
||||
|
||||
#ifndef APP_PIPELINE_FC_MAX_FLOWS_IN_FILE
|
||||
#define APP_PIPELINE_FC_MAX_FLOWS_IN_FILE (16 * 1024 * 1024)
|
||||
#endif
|
||||
|
||||
int
|
||||
app_pipeline_fc_load_file_qinq(char *filename,
|
||||
struct pipeline_fc_key *keys,
|
||||
uint32_t *port_ids,
|
||||
uint32_t *flow_ids,
|
||||
uint32_t *n_keys,
|
||||
uint32_t *line);
|
||||
|
||||
int
|
||||
app_pipeline_fc_load_file_ipv4(char *filename,
|
||||
struct pipeline_fc_key *keys,
|
||||
uint32_t *port_ids,
|
||||
uint32_t *flow_ids,
|
||||
uint32_t *n_keys,
|
||||
uint32_t *line);
|
||||
|
||||
int
|
||||
app_pipeline_fc_load_file_ipv6(char *filename,
|
||||
struct pipeline_fc_key *keys,
|
||||
uint32_t *port_ids,
|
||||
uint32_t *flow_ids,
|
||||
uint32_t *n_keys,
|
||||
uint32_t *line);
|
||||
|
||||
extern struct pipeline_type pipeline_flow_classification;
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user