-
Notifications
You must be signed in to change notification settings - Fork 444
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
P4TC - Emit 'NoAction' in table actions list in template file (#4622)
* Emit 'NoAction' in template file. * Update testcases * Addressed comment
- Loading branch information
Showing
16 changed files
with
949 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| #include <core.p4> | ||
| #include <tc/pna.p4> | ||
|
|
||
| typedef bit<48> EthernetAddress; | ||
|
|
||
| header ethernet_t { | ||
| EthernetAddress dstAddr; | ||
| EthernetAddress srcAddr; | ||
| bit<16> etherType; | ||
| } | ||
|
|
||
| header ipv4_t { | ||
| bit<4> version; | ||
| bit<4> ihl; | ||
| bit<8> diffserv; | ||
| bit<16> totalLen; | ||
| bit<16> identification; | ||
| bit<3> flags; | ||
| bit<13> fragOffset; | ||
| bit<8> ttl; | ||
| bit<8> protocol; | ||
| bit<16> hdrChecksum; | ||
| @tc_type ("ipv4") bit<32> srcAddr; | ||
| @tc_type ("ipv4") bit<32> dstAddr; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////////////////////////// | ||
| // Struct types for holding user-defined collections of headers and | ||
| // metadata in the P4 developer's program. | ||
| // | ||
| // Note: The names of these struct types are completely up to the P4 | ||
| // developer, as are their member fields, with the only restriction | ||
| // being that the structs intended to contain headers should only | ||
| // contain members whose types are header, header stack, or | ||
| // header_union. | ||
| ////////////////////////////////////////////////////////////////////// | ||
|
|
||
| struct main_metadata_t { | ||
| // empty for this skeleton | ||
| } | ||
|
|
||
| // User-defined struct containing all of those headers parsed in the | ||
| // main parser. | ||
| struct headers_t { | ||
| ethernet_t ethernet; | ||
| ipv4_t ipv4; | ||
| } | ||
|
|
||
| parser MainParserImpl( | ||
| packet_in pkt, | ||
| out headers_t hdr, | ||
| inout main_metadata_t main_meta, | ||
| in pna_main_parser_input_metadata_t istd) | ||
| { | ||
| state start { | ||
| pkt.extract(hdr.ethernet); | ||
| transition select(hdr.ethernet.etherType) { | ||
| 0x0800 : parse_ipv4; | ||
| default : accept; | ||
| } | ||
| } | ||
| state parse_ipv4 { | ||
| pkt.extract(hdr.ipv4); | ||
| transition accept; | ||
| } | ||
| } | ||
|
|
||
| control MainControlImpl( | ||
| inout headers_t hdr, // from main parser | ||
| inout main_metadata_t user_meta, // from main parser, to "next block" | ||
| in pna_main_input_metadata_t istd, | ||
| inout pna_main_output_metadata_t ostd) | ||
| { | ||
| action next_hop(PortId_t vport) { | ||
| send_to_port(vport); | ||
| } | ||
| action default_route_drop() { | ||
| drop_packet(); | ||
| } | ||
| action drop() { | ||
| drop_packet(); | ||
| } | ||
|
|
||
| table ipv4_tbl_1 { | ||
| key = { | ||
| hdr.ipv4.dstAddr : exact; | ||
| istd.input_port : exact; | ||
| } | ||
| actions = { | ||
| next_hop; | ||
| default_route_drop; | ||
| } | ||
| } | ||
| table ipv4_tbl_2 { | ||
| key = { | ||
| hdr.ipv4.dstAddr : exact; | ||
| hdr.ipv4.srcAddr : exact; | ||
| hdr.ipv4.protocol : exact; | ||
| } | ||
| actions = {} | ||
| } | ||
|
|
||
| apply { | ||
| if (hdr.ipv4.isValid()) { | ||
| ipv4_tbl_1.apply(); | ||
| ipv4_tbl_2.apply(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| control MainDeparserImpl( | ||
| packet_out pkt, | ||
| inout headers_t hdr, // from main control | ||
| in main_metadata_t user_meta, // from main control | ||
| in pna_main_output_metadata_t ostd) | ||
| { | ||
| apply { | ||
| pkt.emit(hdr.ethernet); | ||
| pkt.emit(hdr.ipv4); | ||
| } | ||
| } | ||
|
|
||
| // BEGIN:Package_Instantiation_Example | ||
| PNA_NIC( | ||
| MainParserImpl(), | ||
| MainControlImpl(), | ||
| MainDeparserImpl() | ||
| ) main; | ||
| // END:Package_Instantiation_Example |
88 changes: 88 additions & 0 deletions
88
testdata/p4tc_samples_outputs/default_action_example_01.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| { | ||
| "schema_version" : "1.0.0", | ||
| "pipeline_name" : "default_action_example_01", | ||
| "tables" : [ | ||
| { | ||
| "name" : "MainControlImpl/ipv4_tbl_1", | ||
| "id" : 1, | ||
| "tentries" : 2048, | ||
| "permissions" : "0x3da4", | ||
| "nummask" : 8, | ||
| "keysize" : 64, | ||
| "keyfields" : [ | ||
| { | ||
| "id" : 1, | ||
| "name" : "hdr.ipv4.dstAddr", | ||
| "type" : "bit32", | ||
| "match_type" : "exact", | ||
| "bitwidth" : 32 | ||
| }, | ||
| { | ||
| "id" : 2, | ||
| "name" : "istd.input_port", | ||
| "type" : "bit32", | ||
| "match_type" : "exact", | ||
| "bitwidth" : 32 | ||
| } | ||
| ], | ||
| "actions" : [ | ||
| { | ||
| "id" : 1, | ||
| "name" : "MainControlImpl/next_hop", | ||
| "action_scope" : "TableAndDefault", | ||
| "annotations" : [], | ||
| "params" : [ | ||
| { | ||
| "id" : 1, | ||
| "name" : "vport", | ||
| "type" : "bit32", | ||
| "bitwidth" : 32 | ||
| } | ||
| ], | ||
| "default_hit_action" : false, | ||
| "default_miss_action" : false | ||
| }, | ||
| { | ||
| "id" : 2, | ||
| "name" : "MainControlImpl/default_route_drop", | ||
| "action_scope" : "TableAndDefault", | ||
| "annotations" : [], | ||
| "params" : [], | ||
| "default_hit_action" : false, | ||
| "default_miss_action" : false | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name" : "MainControlImpl/ipv4_tbl_2", | ||
| "id" : 2, | ||
| "tentries" : 2048, | ||
| "permissions" : "0x3da4", | ||
| "nummask" : 8, | ||
| "keysize" : 72, | ||
| "keyfields" : [ | ||
| { | ||
| "id" : 1, | ||
| "name" : "hdr.ipv4.dstAddr", | ||
| "type" : "bit32", | ||
| "match_type" : "exact", | ||
| "bitwidth" : 32 | ||
| }, | ||
| { | ||
| "id" : 2, | ||
| "name" : "hdr.ipv4.srcAddr", | ||
| "type" : "bit32", | ||
| "match_type" : "exact", | ||
| "bitwidth" : 32 | ||
| }, | ||
| { | ||
| "id" : 3, | ||
| "name" : "hdr.ipv4.protocol", | ||
| "type" : "bit8", | ||
| "match_type" : "exact", | ||
| "bitwidth" : 8 | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
Empty file.
28 changes: 28 additions & 0 deletions
28
testdata/p4tc_samples_outputs/default_action_example_01.template
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #!/bin/bash -x | ||
|
|
||
| set -e | ||
|
|
||
| TC="tc" | ||
| $TC p4template create pipeline/default_action_example_01 numtables 2 | ||
|
|
||
| $TC p4template create action/default_action_example_01/MainControlImpl/next_hop actid 1 \ | ||
| param vport type bit32 | ||
| $TC p4template update action/default_action_example_01/MainControlImpl/next_hop state active | ||
|
|
||
| $TC p4template create action/default_action_example_01/MainControlImpl/default_route_drop actid 2 | ||
| $TC p4template update action/default_action_example_01/MainControlImpl/default_route_drop state active | ||
|
|
||
| $TC p4template create table/default_action_example_01/MainControlImpl/ipv4_tbl_1 \ | ||
| tblid 1 \ | ||
| type exact \ | ||
| keysz 64 nummasks 8 permissions 0x3da4 tentries 2048 \ | ||
| table_acts act name default_action_example_01/MainControlImpl/next_hop \ | ||
| act name default_action_example_01/MainControlImpl/default_route_drop \ | ||
| act name NoAction flags defaultonly | ||
|
|
||
| $TC p4template create table/default_action_example_01/MainControlImpl/ipv4_tbl_2 \ | ||
| tblid 2 \ | ||
| type exact \ | ||
| keysz 72 nummasks 8 permissions 0x3da4 tentries 2048 \ | ||
| table_acts act name NoAction flags defaultonly | ||
| $TC p4template update pipeline/default_action_example_01 state ready |
Oops, something went wrong.