forked from p4lang/p4c
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Convert deparser header to 'inout' and address casting for functions …
…with control block parameters (p4lang#4338) * Convert deparser header to 'inout'. Function with control block parameters generate correct cast * Remove commented code. * Fix failing issue
- Loading branch information
Showing
41 changed files
with
993 additions
and
34 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
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
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,156 @@ | ||
| #include <core.p4> | ||
| #include <tc/pna.p4> | ||
|
|
||
| struct metadata_t { | ||
| bit<32> src; | ||
| bit<32> dst; | ||
| bool push; | ||
| } | ||
|
|
||
| header ethernet_t { | ||
| bit<48> dstAddr; | ||
| bit<48> 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; | ||
| bit<32> srcAddr; | ||
| bit<32> dstAddr; | ||
| } | ||
|
|
||
| struct headers_t { | ||
| ethernet_t ethernet; | ||
| ipv4_t outer; | ||
| ipv4_t inner; | ||
| } | ||
|
|
||
| #define ETHERTYPE_IPV4 0x0800 | ||
| #define IPPROTO_IPV4 0x4 | ||
|
|
||
| /*********************** P A R S E R **************************/ | ||
| parser Parser( | ||
| packet_in pkt, | ||
| out headers_t hdr, | ||
| inout metadata_t meta, | ||
| in pna_main_parser_input_metadata_t istd) | ||
| { | ||
| state start { | ||
| transition parse_ethernet; | ||
| } | ||
|
|
||
| state parse_ethernet { | ||
| pkt.extract(hdr.ethernet); | ||
| transition select(hdr.ethernet.etherType) { | ||
| ETHERTYPE_IPV4: parse_ipv4; | ||
| default: reject; | ||
| } | ||
| } | ||
|
|
||
| state parse_ipv4 { | ||
| pkt.extract(hdr.outer); | ||
| transition select(hdr.outer.protocol) { | ||
| IPPROTO_IPV4: parse_ipv4_inner; | ||
| default: accept; | ||
| } | ||
| } | ||
|
|
||
| state parse_ipv4_inner { | ||
| pkt.extract(hdr.inner); | ||
| transition accept; | ||
| } | ||
| } | ||
|
|
||
| void ipip_push(inout headers_t hdr, in metadata_t meta) | ||
| { | ||
| hdr.inner = hdr.outer; | ||
| hdr.outer.srcAddr = meta.src; | ||
| hdr.outer.dstAddr = meta.dst; | ||
| hdr.outer.ttl = 64; | ||
| hdr.outer.protocol = 4; /* IPIP */ | ||
| /* Assume MTU can accomodate +20 bytes */ | ||
| hdr.outer.totalLen = hdr.outer.totalLen + 20; | ||
| hdr.outer.hdrChecksum = 0; | ||
| } | ||
|
|
||
| /***************** M A T C H - A C T I O N *********************/ | ||
| control Main( | ||
| inout headers_t hdr, | ||
| inout metadata_t meta, | ||
| in pna_main_input_metadata_t istd, | ||
| inout pna_main_output_metadata_t ostd | ||
| ) | ||
| { | ||
| action set_ipip(@tc_type("ipv4") bit<32> src, @tc_type("ipv4") bit<32> dst, @tc_type("dev") PortId_t port) { | ||
| meta.src = src; | ||
| meta.dst = dst; | ||
| meta.push = true; | ||
| send_to_port(port); | ||
| } | ||
|
|
||
| action set_nh(@tc_type("macaddr") bit<48> dmac, @tc_type("dev") PortId_t port) { | ||
| hdr.ethernet.dstAddr = dmac; | ||
| send_to_port(port); | ||
| } | ||
|
|
||
| action drop() { | ||
| drop_packet(); | ||
| } | ||
|
|
||
| table fwd_table { | ||
| key = { | ||
| istd.input_port : exact @tc_type("dev") @name("port"); | ||
| } | ||
| actions = { | ||
| set_ipip; | ||
| set_nh; | ||
| drop; | ||
| } | ||
| default_action = drop; | ||
| } | ||
|
|
||
| apply { | ||
| if (hdr.outer.isValid()) { /* applies to both ipip and plain ip */ | ||
| fwd_table.apply(); /* lookup based on incoming netdev */ | ||
| if (hdr.inner.isValid()) { /* incoming packet ipip */ | ||
| /* Pop the ipip header by invalidating outer header */ | ||
| hdr.outer.setInvalid(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /********************* D E P A R S E R ************************/ | ||
| control Deparser( | ||
| packet_out pkt, | ||
| inout headers_t hdr, | ||
| in metadata_t meta, | ||
| in pna_main_output_metadata_t ostd) | ||
| { | ||
|
|
||
| apply { | ||
| pkt.emit(hdr.ethernet); | ||
| if (meta.push && hdr.outer.isValid()) { | ||
| /* Push the ipip header */ | ||
| ipip_push(hdr, meta); | ||
| } | ||
| pkt.emit(hdr.outer); | ||
| pkt.emit(hdr.inner); | ||
| } | ||
| } | ||
|
|
||
| /************ F I N A L P A C K A G E ******************************/ | ||
| PNA_NIC( | ||
| Parser(), | ||
| Main(), | ||
| Deparser() | ||
| ) main; |
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
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
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
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
Oops, something went wrong.