Adapt P4TC testdata programs to skb metadata

Signed-off-by: Mouse <mouse@mojatatu.com>
p4lang · Sep 16, 2024 · 60d30af · 60d30af
1 parent 2113247
commit 60d30af
Show file tree

Hide file tree

Showing 178 changed files with 1,470 additions and 705 deletions.
diff --git a/testdata/p4tc_samples/add_entry_1_errors.p4 b/testdata/p4tc_samples/add_entry_1_errors.p4
@@ -74,7 +74,8 @@ 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)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action next_hop() {
          add_entry(action_name = "default_route_drop",  // name of action
@@ -112,7 +113,8 @@ 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)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/add_entry_1_example.p4 b/testdata/p4tc_samples/add_entry_1_example.p4
@@ -71,7 +71,8 @@ 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)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action send_nh( @tc_type("macaddr") bit<48> dmac, bit<48> smac) {
         hdr.ethernet.srcAddr = smac;
@@ -115,7 +116,8 @@ 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)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/add_entry_2_errors.p4 b/testdata/p4tc_samples/add_entry_2_errors.p4
@@ -74,7 +74,8 @@ 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)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action next_hop() {
          add_entry(action_name = "default_route_drop",  // name of action
@@ -111,7 +112,8 @@ 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)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/add_entry_3_example.p4 b/testdata/p4tc_samples/add_entry_3_example.p4
@@ -60,7 +60,8 @@ 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)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action send_nh( @tc_type("macaddr") bit<48> dmac, bit<48> smac) {
         hdr.ethernet.srcAddr = smac;
@@ -103,7 +104,8 @@ 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)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/add_entry_errors.p4 b/testdata/p4tc_samples/add_entry_errors.p4
@@ -74,7 +74,8 @@ 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)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action next_hop() {
          add_entry(action_name = "default_route_drop",  // name of action
@@ -112,7 +113,8 @@ 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)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/add_entry_example.p4 b/testdata/p4tc_samples/add_entry_example.p4
@@ -74,7 +74,8 @@ 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)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action next_hop() {
          add_entry(action_name = "dflt_route_drop",  // name of action
@@ -130,7 +131,8 @@ 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)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/calculator.p4 b/testdata/p4tc_samples/calculator.p4
@@ -140,7 +140,8 @@ control MainControlImpl(
     inout headers_t  hdr,
     inout metadata_t meta,
     in    pna_main_input_metadata_t  istd,
-    inout pna_main_output_metadata_t ostd)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
 
     action send_back(bit<32> result) {
@@ -221,7 +222,8 @@ control MainDeparserImpl(
     packet_out pkt,
     inout    headers_t hdr,
     in    metadata_t meta,
-    in    pna_main_output_metadata_t ostd)
+    in    pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/checksum.p4 b/testdata/p4tc_samples/checksum.p4
@@ -94,8 +94,8 @@ control ingress(
     inout my_ingress_headers_t  hdr,
     inout my_ingress_metadata_t meta,
     in    pna_main_input_metadata_t  istd,
-    inout pna_main_output_metadata_t ostd
-)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action send_nh(@tc_type("dev") PortId_t port_id, @tc_type("macaddr") bit<48> dmac, @tc_type("macaddr") bit<48> smac) {
         hdr.ethernet.srcAddr = smac;
@@ -129,7 +129,8 @@ control Ingress_Deparser(
     packet_out pkt,
     inout    my_ingress_headers_t hdr,
     in    my_ingress_metadata_t meta,
-    in    pna_main_output_metadata_t ostd)
+    in    pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/checksum_errors.p4 b/testdata/p4tc_samples/checksum_errors.p4
@@ -94,8 +94,8 @@ control ingress(
     inout my_ingress_headers_t  hdr,
     inout my_ingress_metadata_t meta,
     in    pna_main_input_metadata_t  istd,
-    inout pna_main_output_metadata_t ostd
-)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     InternetChecksum() ck;
     apply {
@@ -119,7 +119,8 @@ control Ingress_Deparser(
     packet_out pkt,
     inout    my_ingress_headers_t hdr,
     in    my_ingress_metadata_t meta,
-    in    pna_main_output_metadata_t ostd)
+    in    pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/const_entries_range_mask.p4 b/testdata/p4tc_samples/const_entries_range_mask.p4
@@ -23,7 +23,8 @@ parser MainParserImpl(packet_in b, out Header_t h, inout Meta_t m, in pna_main_p
 
 control MainControlImpl(inout Header_t h, inout Meta_t m,
                         in    pna_main_input_metadata_t istd,
-                        inout pna_main_output_metadata_t ostd) {
+                        inout pna_main_output_metadata_t ostd,
+                        tc_skb_metadata sm) {
 
     action a() { h.h.e = 0; }
     action a_with_control_params(bit<16> x) { h.h.t = x; }
@@ -58,7 +59,8 @@ control MainControlImpl(inout Header_t h, inout Meta_t m,
 /*********************  D E P A R S E R  ************************/
 
 control MainDeparserImpl(
-    packet_out b, inout Header_t h, in Meta_t m, in pna_main_output_metadata_t ostd)
+    packet_out b, inout Header_t h, in Meta_t m, in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {}
 }

diff --git a/testdata/p4tc_samples/default_action_example.p4 b/testdata/p4tc_samples/default_action_example.p4
@@ -69,7 +69,8 @@ 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)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action next_hop(PortId_t vport) {
         send_to_port(vport);
@@ -117,7 +118,8 @@ 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)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/default_action_example_01.p4 b/testdata/p4tc_samples/default_action_example_01.p4
@@ -69,7 +69,8 @@ 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)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action next_hop(PortId_t vport) {
         send_to_port(vport);
@@ -112,7 +113,8 @@ 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)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/default_action_with_param.p4 b/testdata/p4tc_samples/default_action_with_param.p4
@@ -69,7 +69,8 @@ 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)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action next_hop(PortId_t vport) {
         send_to_port(vport);
@@ -117,7 +118,8 @@ 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)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/default_action_with_param_01.p4 b/testdata/p4tc_samples/default_action_with_param_01.p4
@@ -69,7 +69,8 @@ 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)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     PortId_t z = (PortId_t)4;
     action next_hop(inout PortId_t vport) {
@@ -118,7 +119,8 @@ 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)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.ethernet);

diff --git a/testdata/p4tc_samples/default_hit_const_example.p4 b/testdata/p4tc_samples/default_hit_const_example.p4
@@ -105,7 +105,8 @@ control MainControlImpl(
     inout headers_t hdr,                 // from main parser
     inout metadata_t meta,               // from main parser, to "next block"
     in    pna_main_input_metadata_t istd,
-    inout pna_main_output_metadata_t ostd)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action drop() {
         drop_packet();
@@ -158,7 +159,8 @@ control MainDeparserImpl(
     packet_out pkt,
     inout headers_t hdr,                    // from main control
     in metadata_t meta,                  // from main control
-    in pna_main_output_metadata_t ostd)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.eth);

diff --git a/testdata/p4tc_samples/default_hit_const_repeat_errors.p4 b/testdata/p4tc_samples/default_hit_const_repeat_errors.p4
@@ -105,7 +105,8 @@ control MainControlImpl(
     inout headers_t hdr,                 // from main parser
     inout metadata_t meta,               // from main parser, to "next block"
     in    pna_main_input_metadata_t istd,
-    inout pna_main_output_metadata_t ostd)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action drop() {
         drop_packet();
@@ -159,7 +160,8 @@ control MainDeparserImpl(
     packet_out pkt,
     inout headers_t hdr,                    // from main control
     in metadata_t meta,                  // from main control
-    in pna_main_output_metadata_t ostd)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.eth);

diff --git a/testdata/p4tc_samples/default_hit_default_hit_const_annotation_errors.p4 b/testdata/p4tc_samples/default_hit_default_hit_const_annotation_errors.p4
@@ -105,7 +105,8 @@ control MainControlImpl(
     inout headers_t hdr,                 // from main parser
     inout metadata_t meta,               // from main parser, to "next block"
     in    pna_main_input_metadata_t istd,
-    inout pna_main_output_metadata_t ostd)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action drop() {
         drop_packet();
@@ -159,7 +160,8 @@ control MainDeparserImpl(
     packet_out pkt,
     inout headers_t hdr,                    // from main control
     in metadata_t meta,                  // from main control
-    in pna_main_output_metadata_t ostd)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.eth);

diff --git a/testdata/p4tc_samples/default_hit_repeat_errors.p4 b/testdata/p4tc_samples/default_hit_repeat_errors.p4
@@ -105,7 +105,8 @@ control MainControlImpl(
     inout headers_t hdr,                 // from main parser
     inout metadata_t meta,               // from main parser, to "next block"
     in    pna_main_input_metadata_t istd,
-    inout pna_main_output_metadata_t ostd)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     action drop() {
         drop_packet();
@@ -159,7 +160,8 @@ control MainDeparserImpl(
     packet_out pkt,
     inout headers_t hdr,                    // from main control
     in metadata_t meta,                  // from main control
-    in pna_main_output_metadata_t ostd)
+    in pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     apply {
         pkt.emit(hdr.eth);

diff --git a/testdata/p4tc_samples/digest.p4 b/testdata/p4tc_samples/digest.p4
@@ -86,8 +86,8 @@ control ingress(
     inout my_ingress_headers_t  hdr,
     inout my_ingress_metadata_t meta,
     in    pna_main_input_metadata_t  istd,
-    inout pna_main_output_metadata_t ostd
-)
+    inout pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
    action send_nh(@tc_type("dev") PortId_t port, @tc_type("macaddr") bit<48> srcMac, @tc_type("macaddr") bit<48> dstMac) {
         hdr.ethernet.srcAddr = srcMac;
@@ -128,7 +128,8 @@ control Ingress_Deparser(
     packet_out pkt,
     inout    my_ingress_headers_t hdr,
     in    my_ingress_metadata_t meta,
-    in    pna_main_output_metadata_t ostd)
+    in    pna_main_output_metadata_t ostd,
+    tc_skb_metadata sm)
 {
     Digest<mac_learn_digest_t>() digest_inst;