create dpdk specific pna.p4 and extend it #3658
Added test and updated readme
- Loading branch information
commit e22a36d212a30a2724308e2bb5c4f73ff4ea0f7d
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,139 @@ | ||
| #include <core.p4> | ||
| #include <dpdk/psa.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<32> 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 empty_metadata_t { | ||
| } | ||
|
|
||
| struct metadata_t { | ||
| bit<32> port_in; | ||
| bit<32> port_out; | ||
| } | ||
|
|
||
| struct headers { | ||
| ethernet_t ethernet; | ||
| ipv4_t ipv4; | ||
| } | ||
|
|
||
| // Define additional error values, one of them for packets with | ||
| // incorrect IPv4 header checksums. | ||
| error { | ||
| UnhandledIPv4Options, | ||
| BadIPv4HeaderChecksum | ||
| } | ||
|
|
||
| parser IngressParserImpl(packet_in buffer, out headers hdr, inout metadata_t user_meta, in psa_ingress_parser_input_metadata_t istd, in empty_metadata_t resubmit_meta, in empty_metadata_t recirculate_meta) { | ||
| state start { | ||
| buffer.extract(hdr.ethernet); | ||
| transition select(hdr.ethernet.etherType) { | ||
| 0x800: parse_ipv4; | ||
| default: accept; | ||
| } | ||
| } | ||
| state parse_ipv4 { | ||
| buffer.extract(hdr.ipv4); | ||
| verify(hdr.ipv4.ihl == 5, error.UnhandledIPv4Options); | ||
| transition select(hdr.ipv4.version) { | ||
| default: accept; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| control ingress(inout headers hdr, inout metadata_t user_meta, in psa_ingress_input_metadata_t istd, inout psa_ingress_output_metadata_t ostd) { | ||
| Counter<bit<10>, bit<12>>(1024, PSA_CounterType_t.PACKETS_AND_BYTES) counter0; | ||
| Counter<bit<10>, bit<12>>(1024, PSA_CounterType_t.PACKETS) counter1; | ||
| Counter<bit<10>, bit<12>>(1024, PSA_CounterType_t.BYTES) counter2; | ||
| Register<bit<32>, bit<12>>(1024) reg; | ||
| Meter<bit<12>>(1024, PSA_MeterType_t.BYTES) meter0; | ||
| PSA_MeterColor_t color_out; | ||
| PSA_MeterColor_t color_in = PSA_MeterColor_t.RED; | ||
| action execute(bit<12> index) { | ||
| hdr.ipv4.ihl = 5; | ||
| color_out = meter0.execute(index, color_in/*, hdr.ipv4.totalLen*/); | ||
| user_meta.port_out = (color_out == PSA_MeterColor_t.GREEN ? 32w1 : 32w0); | ||
| reg.write(index, user_meta.port_out); | ||
| if (hdr.ipv4.hdrChecksum[5:0] == 6) | ||
| hdr.ipv4.ihl = 5; | ||
| if (hdr.ipv4.version == 6) | ||
| hdr.ipv4.ihl = 6; | ||
| } | ||
|
|
||
| action test(bit<4> version) { | ||
| if (version == 4) { | ||
| hdr.ipv4.hdrChecksum[3:0] = hdr.ipv4.version + 5; | ||
| } | ||
| } | ||
| table tbl { | ||
| key = { | ||
| hdr.ethernet.srcAddr: exact; | ||
| } | ||
| actions = { | ||
| NoAction; | ||
| execute; | ||
| } | ||
| } | ||
| apply { | ||
| if (user_meta.port_out == 1) { | ||
| tbl.apply(); | ||
| counter0.count(1023, 20); | ||
| counter1.count(512, 32); | ||
| counter2.count(1023, 64); | ||
| user_meta.port_out = reg.read(1); | ||
| test(hdr.ipv4.version); | ||
| } else { | ||
| return; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| parser EgressParserImpl(packet_in buffer, out headers hdr, inout metadata_t user_meta, in psa_egress_parser_input_metadata_t istd, in empty_metadata_t normal_meta, in empty_metadata_t clone_i2e_meta, in empty_metadata_t clone_e2e_meta) { | ||
| state start { | ||
| transition accept; | ||
| } | ||
| } | ||
|
|
||
| control egress(inout headers hdr, inout metadata_t user_meta, in psa_egress_input_metadata_t istd, inout psa_egress_output_metadata_t ostd) { | ||
| apply { | ||
| } | ||
| } | ||
|
|
||
| control IngressDeparserImpl(packet_out packet, out empty_metadata_t clone_i2e_meta, out empty_metadata_t resubmit_meta, out empty_metadata_t normal_meta, inout headers hdr, in metadata_t meta, in psa_ingress_output_metadata_t istd) { | ||
| apply { | ||
| hdr.ipv4.hdrChecksum = 4; // Works fine | ||
| packet.emit(hdr.ethernet); | ||
| packet.emit(hdr.ipv4); | ||
| } | ||
| } | ||
|
|
||
| control EgressDeparserImpl(packet_out packet, out empty_metadata_t clone_e2e_meta, out empty_metadata_t recirculate_meta, inout headers hdr, in metadata_t meta, in psa_egress_output_metadata_t istd, in psa_egress_deparser_input_metadata_t edstd) { | ||
| apply { | ||
| } | ||
| } | ||
|
|
||
| IngressPipeline(IngressParserImpl(), ingress(), IngressDeparserImpl()) ip; | ||
|
|
||
| EgressPipeline(EgressParserImpl(), egress(), EgressDeparserImpl()) ep; | ||
|
|
||
| PSA_Switch(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| error { | ||
| UnhandledIPv4Options, | ||
| BadIPv4HeaderChecksum | ||
| } | ||
| #include <core.p4> | ||
| #include <dpdk/psa.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<32> 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 empty_metadata_t { | ||
| } | ||
|
|
||
| struct metadata_t { | ||
| bit<32> port_in; | ||
| bit<32> port_out; | ||
| } | ||
|
|
||
| struct headers { | ||
| ethernet_t ethernet; | ||
| ipv4_t ipv4; | ||
| } | ||
|
|
||
| parser IngressParserImpl(packet_in buffer, out headers hdr, inout metadata_t user_meta, in psa_ingress_parser_input_metadata_t istd, in empty_metadata_t resubmit_meta, in empty_metadata_t recirculate_meta) { | ||
| state start { | ||
| buffer.extract<ethernet_t>(hdr.ethernet); | ||
| transition select(hdr.ethernet.etherType) { | ||
| 16w0x800: parse_ipv4; | ||
| default: accept; | ||
| } | ||
| } | ||
| state parse_ipv4 { | ||
| buffer.extract<ipv4_t>(hdr.ipv4); | ||
| verify(hdr.ipv4.ihl == 4w5, error.UnhandledIPv4Options); | ||
| transition select(hdr.ipv4.version) { | ||
| default: accept; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| control ingress(inout headers hdr, inout metadata_t user_meta, in psa_ingress_input_metadata_t istd, inout psa_ingress_output_metadata_t ostd) { | ||
| Counter<bit<10>, bit<12>>(32w1024, PSA_CounterType_t.PACKETS_AND_BYTES) counter0; | ||
| Counter<bit<10>, bit<12>>(32w1024, PSA_CounterType_t.PACKETS) counter1; | ||
| Counter<bit<10>, bit<12>>(32w1024, PSA_CounterType_t.BYTES) counter2; | ||
| Register<bit<32>, bit<12>>(32w1024) reg; | ||
| Meter<bit<12>>(32w1024, PSA_MeterType_t.BYTES) meter0; | ||
| PSA_MeterColor_t color_out; | ||
| PSA_MeterColor_t color_in = PSA_MeterColor_t.RED; | ||
| action execute(bit<12> index) { | ||
| hdr.ipv4.ihl = 4w5; | ||
| color_out = meter0.execute(index, color_in); | ||
| user_meta.port_out = (color_out == PSA_MeterColor_t.GREEN ? 32w1 : 32w0); | ||
| reg.write(index, user_meta.port_out); | ||
| if (hdr.ipv4.hdrChecksum[5:0] == 6w6) { | ||
| hdr.ipv4.ihl = 4w5; | ||
| } | ||
| if (hdr.ipv4.version == 4w6) { | ||
| hdr.ipv4.ihl = 4w6; | ||
| } | ||
| } | ||
| action test(bit<4> version) { | ||
| if (version == 4w4) { | ||
| hdr.ipv4.hdrChecksum[3:0] = hdr.ipv4.version + 4w5; | ||
| } | ||
| } | ||
| table tbl { | ||
| key = { | ||
| hdr.ethernet.srcAddr: exact @name("hdr.ethernet.srcAddr") ; | ||
| } | ||
| actions = { | ||
| NoAction(); | ||
| execute(); | ||
| } | ||
| default_action = NoAction(); | ||
| } | ||
| apply { | ||
| if (user_meta.port_out == 32w1) { | ||
| tbl.apply(); | ||
| counter0.count(12w1023, 32w20); | ||
| counter1.count(12w512, 32w32); | ||
| counter2.count(12w1023, 32w64); | ||
| user_meta.port_out = reg.read(12w1); | ||
| test(hdr.ipv4.version); | ||
| } else { | ||
| return; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| parser EgressParserImpl(packet_in buffer, out headers hdr, inout metadata_t user_meta, in psa_egress_parser_input_metadata_t istd, in empty_metadata_t normal_meta, in empty_metadata_t clone_i2e_meta, in empty_metadata_t clone_e2e_meta) { | ||
| state start { | ||
| transition accept; | ||
| } | ||
| } | ||
|
|
||
| control egress(inout headers hdr, inout metadata_t user_meta, in psa_egress_input_metadata_t istd, inout psa_egress_output_metadata_t ostd) { | ||
| apply { | ||
| } | ||
| } | ||
|
|
||
| control IngressDeparserImpl(packet_out packet, out empty_metadata_t clone_i2e_meta, out empty_metadata_t resubmit_meta, out empty_metadata_t normal_meta, inout headers hdr, in metadata_t meta, in psa_ingress_output_metadata_t istd) { | ||
| apply { | ||
| hdr.ipv4.hdrChecksum = 16w4; | ||
| packet.emit<ethernet_t>(hdr.ethernet); | ||
| packet.emit<ipv4_t>(hdr.ipv4); | ||
| } | ||
| } | ||
|
|
||
| control EgressDeparserImpl(packet_out packet, out empty_metadata_t clone_e2e_meta, out empty_metadata_t recirculate_meta, inout headers hdr, in metadata_t meta, in psa_egress_output_metadata_t istd, in psa_egress_deparser_input_metadata_t edstd) { | ||
| apply { | ||
| } | ||
| } | ||
|
|
||
| IngressPipeline<headers, metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t>(IngressParserImpl(), ingress(), IngressDeparserImpl()) ip; | ||
|
|
||
| EgressPipeline<headers, metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t>(EgressParserImpl(), egress(), EgressDeparserImpl()) ep; | ||
|
|
||
| PSA_Switch<headers, metadata_t, headers, metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t>(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) main; | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does DPDK development have any plans in the future to support the standard count and execute methods, without a packet length parameter?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no plan in the near future. There was an earlier discussion of providing ethernet frame size as default packet length, however it seems that it wouldn't be correct as DPDK implements trCM which do not work on ethernet frame length.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"which do not work on ethernet frame length" Meters/policers can work on whatever length in bytes you give for a packet, whether it matches the packet's length or not, so it isn't clear to me what your statement means. If DPDK implements meters by default with ethernet frame length, then I would recommend enabling them to do so, and DOCUMENTING that the methods that do not take a packet length as input, use the ethernet frame length in bytes. If they work as documented, then I'd say that they work :-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will take this up with the DPDK target team again and see if they can have this in their worklist. We can enable the p4c support when we have the default packet length available from the target side.