Revert "Set the initial default action for tables when generating a P…

…3Info. (#4773)" This reverts commit 8beb35c.
p4lang · Oct 8, 2024 · 975335d · 975335d
1 parent 5c6fab2
commit 975335d
Show file tree

Hide file tree

Showing 333 changed files with 78 additions and 1,852 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -420,7 +420,7 @@ set(FETCHCONTENT_QUIET OFF)
 FetchContent_Declare(
   p4runtime
   GIT_REPOSITORY https://github.com/p4lang/p4runtime.git
-  GIT_TAG        ec4eb5ef70dbcbcbf2f8357a4b2b8c2f218845a5
+  GIT_TAG        62a9bd60599b87497a15feb6c7893b7ec8ba461f
   GIT_PROGRESS TRUE
 )
 FetchContent_MakeAvailable(p4runtime)

diff --git a/backends/ebpf/psa/examples/bng.p4info.txtpb b/backends/ebpf/psa/examples/bng.p4info.txtpb
@@ -47,9 +47,6 @@ tables {
     id: 17049673
   }
   const_default_action_id: 28724955
-  initial_default_action {
-    action_id: 28724955
-  }
   size: 8192
 }
 tables {
@@ -89,13 +86,6 @@ tables {
     id: 17126659
   }
   const_default_action_id: 17126659
-  initial_default_action {
-    action_id: 17126659
-    arguments {
-      param_id: 1
-      value: "\000"
-    }
-  }
   size: 1024
 }
 tables {
@@ -118,9 +108,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -150,9 +137,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -177,13 +161,6 @@ tables {
     id: 27019812
   }
   const_default_action_id: 27019812
-  initial_default_action {
-    action_id: 27019812
-    arguments {
-      param_id: 1
-      value: "\000\000\000\000"
-    }
-  }
   size: 8192
 }
 tables {
@@ -207,9 +184,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 16
 }
 tables {
@@ -245,9 +219,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21552277
-  initial_default_action {
-    action_id: 21552277
-  }
   size: 32768
 }
 tables {
@@ -274,9 +245,6 @@ tables {
     id: 33281717
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 8192
 }
 tables {
@@ -316,9 +284,6 @@ tables {
     id: 23799701
   }
   const_default_action_id: 23799701
-  initial_default_action {
-    action_id: 23799701
-  }
   size: 256
 }
 tables {
@@ -354,9 +319,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 20119496
-  initial_default_action {
-    action_id: 20119496
-  }
   size: 1024
 }
 actions {

diff --git a/backends/ebpf/psa/examples/l2l3-acl.p4info.txtpb b/backends/ebpf/psa/examples/l2l3-acl.p4info.txtpb
@@ -31,9 +31,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -55,9 +52,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 24963522
-  initial_default_action {
-    action_id: 24963522
-  }
   size: 1024
 }
 tables {
@@ -81,9 +75,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -106,9 +97,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 286177969
   size: 1024
 }
@@ -141,9 +129,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -189,9 +174,6 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
 }
 tables {
@@ -220,9 +202,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   direct_resource_ids: 330499363
   size: 1024
 }

diff --git a/backends/ebpf/psa/examples/upf.p4info.txtpb b/backends/ebpf/psa/examples/upf.p4info.txtpb
@@ -27,9 +27,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 512
 }
 tables {
@@ -55,9 +52,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 512
 }
 tables {
@@ -92,9 +86,6 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
@@ -123,9 +114,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   size: 1024
 }
 tables {
@@ -149,9 +137,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   size: 1024
 }
 tables {
@@ -173,9 +158,6 @@ tables {
     id: 28485346
   }
   const_default_action_id: 28485346
-  initial_default_action {
-    action_id: 28485346
-  }
   size: 1024
 }
 tables {
@@ -235,9 +217,6 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 19604500
-  initial_default_action {
-    action_id: 19604500
-  }
   size: 1024
 }
 tables {
@@ -262,9 +241,6 @@ tables {
     id: 19604500
   }
   const_default_action_id: 19604500
-  initial_default_action {
-    action_id: 19604500
-  }
   size: 1024
 }
 tables {
@@ -292,9 +268,6 @@ tables {
     id: 23916784
   }
   const_default_action_id: 23916784
-  initial_default_action {
-    action_id: 23916784
-  }
   size: 1024
 }
 actions {

diff --git a/backends/ebpf/tests/p4testdata/action-profile2.p4info.txtpb b/backends/ebpf/tests/p4testdata/action-profile2.p4info.txtpb
@@ -25,9 +25,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }
@@ -52,9 +49,6 @@ tables {
   action_refs {
     id: 23466264
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 298015716
   size: 1024
 }

diff --git a/backends/ebpf/tests/p4testdata/action-selector2.p4info.txtpb b/backends/ebpf/tests/p4testdata/action-selector2.p4info.txtpb
@@ -22,9 +22,6 @@ tables {
   action_refs {
     id: 30183046
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294316857
   size: 1024
 }
@@ -46,9 +43,6 @@ tables {
   action_refs {
     id: 30183046
   }
-  initial_default_action {
-    action_id: 21257015
-  }
   implementation_id: 294316857
   size: 1024
 }

diff --git a/backends/ebpf/tests/p4testdata/counters.p4info.txtpb b/backends/ebpf/tests/p4testdata/counters.p4info.txtpb
@@ -28,13 +28,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 30696436
-    arguments {
-      param_id: 1
-      value: "\000\000\000\005"
-    }
-  }
   size: 100
 }
 actions {

diff --git a/backends/ebpf/tests/p4testdata/meters-direct.p4info.txtpb b/backends/ebpf/tests/p4testdata/meters-direct.p4info.txtpb
@@ -25,13 +25,6 @@ tables {
   action_refs {
     id: 21257015
   }
-  initial_default_action {
-    action_id: 30696436
-    arguments {
-      param_id: 1
-      value: "\000\000\000\006"
-    }
-  }
   direct_resource_ids: 358755246
   size: 100
 }

diff --git a/bazel/p4c_deps.bzl b/bazel/p4c_deps.bzl
@@ -47,8 +47,8 @@ filegroup(
         git_repository(
             name = "com_github_p4lang_p4runtime",
             remote = "https://github.com/p4lang/p4runtime",
-            # Newest commit on main branch as of August 18, 2024.
-            commit = "ec4eb5ef70dbcbcbf2f8357a4b2b8c2f218845a5",
+            # Newest commit on main branch as of May 30, 2024.
+            commit = "62a9bd60599b87497a15feb6c7893b7ec8ba461f",
             shallow_since = "1680213111 -0700",
             strip_prefix = "proto",
         )