Forbid egress pipeline in dpdk by default (#3104)

p4lang · Mar 3, 2022 · 369d527 · 369d527
1 parent ab04580
commit 369d527
Show file tree

Hide file tree

Showing 48 changed files with 40 additions and 397 deletions.
diff --git a/backends/dpdk/README.md b/backends/dpdk/README.md
@@ -45,7 +45,7 @@ To load the 'spec' file in dpdk follow the instructions in the
 - Packet Cloning/Recirculation/Resubmission
 
 ### DPDK target limitations
-- Currently, programs written for DPDK target should limit the functionality in Ingress blocks.  When egress block support gets added to the DPDK target, compiler should generate separate spec file for ingress and egress.
+- Currently, programs written for DPDK target should limit the functionality in Ingress blocks, in case non empty  Egress blocks are present it will be ignored by default unless Hidden temporary option `--enableEgress` used.  When egress block support gets added to the DPDK target, and compiler can generate separate spec file for non empty ingress and egress blocks then option `--enableEgress` will be removed.
 - DPDK architecture assumes the following signatures for programmable block of PSA. P4C-DPDK converts the input program to this form.
 
 ```P4

diff --git a/backends/dpdk/backend.cpp b/backends/dpdk/backend.cpp
@@ -43,7 +43,7 @@ void DpdkBackend::convert(const IR::ToplevelBlock *tlb) {
     auto program = tlb->getProgram();
 
     std::set<const IR::P4Table*> invokedInKey;
-    auto convertToDpdk = new ConvertToDpdkProgram(refMap, typeMap, &structure);
+    auto convertToDpdk = new ConvertToDpdkProgram(refMap, typeMap, &structure, options);
     auto genContextJson = new DpdkContextGenerator(refMap, typeMap, &structure, options);
 
     PassManager simplify = {

diff --git a/backends/dpdk/dpdkProgram.cpp b/backends/dpdk/dpdkProgram.cpp
@@ -113,9 +113,10 @@ const IR::DpdkAsmProgram *ConvertToDpdkProgram::create(IR::P4Program *prog) {
     for (auto kv : structure->parsers) {
         if (kv.first == "IngressParser")
             kv.second->apply(*ingress_parser_converter);
-        else if (kv.first == "EgressParser")
-            kv.second->apply(*egress_parser_converter);
-        else if (kv.first == "MainParserT")
+        else if (kv.first == "EgressParser") {
+            if (options.enableEgress)
+                kv.second->apply(*egress_parser_converter);
+        } else if (kv.first == "MainParserT")
             kv.second->apply(*ingress_parser_converter);
         else
             BUG("Unknown parser %s", kv.second->name);
@@ -127,9 +128,10 @@ const IR::DpdkAsmProgram *ConvertToDpdkProgram::create(IR::P4Program *prog) {
     for (auto kv : structure->pipelines) {
         if (kv.first == "Ingress")
             kv.second->apply(*ingress_converter);
-        else if (kv.first == "Egress")
-            kv.second->apply(*egress_converter);
-        else if (kv.first == "PreControlT")
+        else if (kv.first == "Egress") {
+            if (options.enableEgress)
+                kv.second->apply(*egress_converter);
+        } else if (kv.first == "PreControlT")
             kv.second->apply(*ingress_converter);
         else if (kv.first == "MainControlT")
             kv.second->apply(*ingress_converter);
@@ -143,9 +145,10 @@ const IR::DpdkAsmProgram *ConvertToDpdkProgram::create(IR::P4Program *prog) {
     for (auto kv : structure->deparsers) {
         if (kv.first == "IngressDeparser")
             kv.second->apply(*ingress_deparser_converter);
-        else if (kv.first == "EgressDeparser")
-            kv.second->apply(*egress_deparser_converter);
-        else if (kv.first == "MainDeparserT")
+        else if (kv.first == "EgressDeparser") {
+            if (options.enableEgress)
+                kv.second->apply(*egress_deparser_converter);
+        } else if (kv.first == "MainDeparserT")
             kv.second->apply(*ingress_deparser_converter);
         else
             BUG("Unknown deparser block %s", kv.second->name);
@@ -160,9 +163,11 @@ const IR::DpdkAsmProgram *ConvertToDpdkProgram::create(IR::P4Program *prog) {
     instr.append(ingress_parser_converter->getInstructions());
     instr.append(ingress_converter->getInstructions());
     instr.append(ingress_deparser_converter->getInstructions());
-    instr.append(egress_parser_converter->getInstructions());
-    instr.append(egress_converter->getInstructions());
-    instr.append(egress_deparser_converter->getInstructions());
+    if (options.enableEgress) {
+        instr.append(egress_parser_converter->getInstructions());
+        instr.append(egress_converter->getInstructions());
+        instr.append(egress_deparser_converter->getInstructions());
+    }
 
     if (structure->isPNA())
         instr.append(create_pna_postamble());
@@ -230,16 +235,15 @@ const IR::DpdkAsmProgram *ConvertToDpdkProgram::create(IR::P4Program *prog) {
     }
 
     auto tables = ingress_converter->getTables();
-    tables.append(egress_converter->getTables());
-
     auto actions = ingress_converter->getActions();
-    actions.append(egress_converter->getActions());
-
     auto selectors = ingress_converter->getSelectors();
-    selectors.append(egress_converter->getSelectors());
-
     auto learners = ingress_converter->getLearners();
-    learners.append(egress_converter->getLearners());
+    if (options.enableEgress) {
+        tables.append(egress_converter->getTables());
+        actions.append(egress_converter->getActions());
+        selectors.append(egress_converter->getSelectors());
+        learners.append(egress_converter->getLearners());
+    }
 
     return new IR::DpdkAsmProgram(
         headerType, structType, dpdkExternDecls, actions, tables, selectors, learners,

diff --git a/backends/dpdk/dpdkProgram.h b/backends/dpdk/dpdkProgram.h
@@ -31,6 +31,8 @@ limitations under the License.
 #include "ir/ir.h"
 #include "lib/gmputil.h"
 #include "lib/json.h"
+#include "options.h"
+
 namespace DPDK {
 
 /* Maximum size in bits for fields in header and metadata structures */
@@ -40,12 +42,13 @@ class ConvertToDpdkProgram : public Transform {
     P4::TypeMap *typemap;
     P4::ReferenceMap *refmap;
     DpdkProgramStructure *structure;
+    DpdkOptions &options;
     const IR::DpdkAsmProgram *dpdk_program;
 
   public:
     ConvertToDpdkProgram(P4::ReferenceMap *refmap, P4::TypeMap *typemap,
-                         DpdkProgramStructure *structure)
-        : typemap(typemap), refmap(refmap), structure(structure) { }
+                         DpdkProgramStructure *structure, DpdkOptions &options)
+        : typemap(typemap), refmap(refmap), structure(structure), options(options) { }
 
     const IR::DpdkAsmProgram *create(IR::P4Program *prog);
     IR::IndexedVector<IR::DpdkAsmStatement> create_pna_preamble();

diff --git a/backends/dpdk/options.h b/backends/dpdk/options.h
@@ -32,6 +32,8 @@ class DpdkOptions : public CompilerOptions {
     bool loadIRFromJson = false;
     // Compilation command line
     static cstring DpdkCompCmd;
+    // Enable/Disable Egress pipeline in psa
+    bool enableEgress = false;
 
     DpdkOptions() {
         registerOption(
@@ -43,6 +45,14 @@ class DpdkOptions : public CompilerOptions {
                 return false;
             },
             "[Dpdk back-end] Lists exact name of all midend passes.\n");
+        registerOption(
+            "--enableEgress", nullptr,
+            [this](const char *) {
+                enableEgress = true;
+                return true;
+            },
+            "[Dpdk back-end] Enable egress pipeline's codegen\n", OptionFlags::Hide);
+
         registerOption("--bf-rt-schema", "file",
                 [this](const char *arg) { bfRtSchema = arg; return true; },
                 "Generate and write BF-RT JSON schema to the specified file");

diff --git a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.spec
@@ -65,8 +65,6 @@ apply {
 	table tbl
 	jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0
 	emit h.ethernet
-	extract h.ethernet
-	emit h.ethernet
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.spec
@@ -117,9 +117,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.spec
@@ -125,9 +125,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.spec
@@ -117,9 +117,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.spec
@@ -116,9 +116,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.spec
@@ -119,9 +119,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.spec
@@ -112,9 +112,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.spec
@@ -120,9 +120,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.spec
@@ -119,9 +119,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.spec
@@ -114,9 +114,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.spec
@@ -1,6 +1,4 @@
 
-
-
 struct ethernet_t {
 	bit<48> dstAddr
 	bit<48> srcAddr
@@ -61,62 +59,20 @@ struct metadata {
 	bit<32> psa_ingress_input_metadata_ingress_port
 	bit<8> psa_ingress_output_metadata_drop
 	bit<32> psa_ingress_output_metadata_egress_port
-	bit<16> local_metadata_data
-	bit<8> Egress_key
 }
 metadata instanceof metadata
 
 header ethernet instanceof ethernet_t
 header ipv4 instanceof ipv4_t
 header tcp instanceof tcp_t
 
-action NoAction args none {
-	return
-}
-
-action execute args none {
-	mov m.local_metadata_data 0x1
-	return
-}
-
-table tbl {
-	key {
-		m.local_metadata_data exact
-		m.Egress_key exact
-	}
-	actions {
-		NoAction
-		execute
-	}
-	default_action NoAction args none 
-	size 0x10000
-}
-
-
 apply {
 	rx m.psa_ingress_input_metadata_ingress_port
 	mov m.psa_ingress_output_metadata_drop 0x0
 	jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	extract h.ethernet
-	mov m.tmpMask h.ethernet.etherType
-	and m.tmpMask 0xf00
-	jmpeq EGRESSPARSERIMPL_PARSE_IPV4 m.tmpMask 0x800
-	jmpeq EGRESSPARSERIMPL_PARSE_TCP h.ethernet.etherType 0xd00
-	jmp EGRESSPARSERIMPL_ACCEPT
-	EGRESSPARSERIMPL_PARSE_IPV4 :	extract h.ipv4
-	mov m.tmpMask_0 h.ipv4.protocol
-	and m.tmpMask_0 0xfc
-	jmpeq EGRESSPARSERIMPL_PARSE_TCP m.tmpMask_0 0x4
-	jmp EGRESSPARSERIMPL_ACCEPT
-	EGRESSPARSERIMPL_PARSE_TCP :	extract h.tcp
-	EGRESSPARSERIMPL_ACCEPT :	mov m.Egress_key 0x48
-	table tbl
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.spec
@@ -120,9 +120,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.spec
@@ -121,9 +121,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.spec
@@ -132,9 +132,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.spec
@@ -143,9 +143,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.spec
@@ -143,9 +143,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.spec
@@ -126,9 +126,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.spec
@@ -137,9 +137,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }

diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.spec
@@ -125,9 +125,6 @@ apply {
 	emit h.ethernet
 	emit h.ipv4
 	emit h.tcp
-	emit h.ethernet
-	emit h.ipv4
-	emit h.tcp
 	tx m.psa_ingress_output_metadata_egress_port
 	LABEL_DROP :	drop
 }