NoAction in ACL should be mapped to NOP
Change-Id: Ia3c9038eb726379ed2f95635c28ddf5794e646de
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 8c90afc..520f2b1 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -7,7 +7,7 @@
["tmp", 4, false],
["tmp_0", 1, false],
["tmp_1", 32, false],
- ["tmp_2", 9, false],
+ ["tmp_2", 8, false],
["tmp_3", 1, false],
["tmp_4", 32, false],
["tmp_5", 32, false],
@@ -28,7 +28,7 @@
["fabric_metadata_t.l4_src_port", 16, false],
["fabric_metadata_t.l4_dst_port", 16, false],
["fabric_metadata_t.compute_checksum", 1, false],
- ["_padding_2", 2, false]
+ ["_padding_2", 3, false]
]
},
{
@@ -1452,12 +1452,32 @@
"value" : {
"op" : "&",
"left" : {
- "type" : "field",
- "value" : ["ipv4", "dst_addr"]
+ "type" : "expression",
+ "value" : {
+ "op" : "&",
+ "left" : {
+ "type" : "expression",
+ "value" : {
+ "op" : ">>",
+ "left" : {
+ "type" : "field",
+ "value" : ["ipv4", "dst_addr"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x18"
+ }
+ }
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0xffffffff"
+ }
+ }
},
"right" : {
"type" : "hexstr",
- "value" : "0x01ff"
+ "value" : "0xff"
}
}
}
@@ -1469,7 +1489,7 @@
"transitions" : [
{
"type" : "hexstr",
- "value" : "0x0000",
+ "value" : "0x8c",
"mask" : null,
"next_state" : "do_parse_gtpu"
},
@@ -1678,7 +1698,7 @@
"id" : 0,
"source_info" : {
"filename" : "include/parser.p4",
- "line" : 222,
+ "line" : 223,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
@@ -1906,7 +1926,7 @@
"id" : 1,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 238,
+ "line" : 237,
"column" : 8,
"source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
},
@@ -2117,14 +2137,8 @@
"primitives" : []
},
{
- "name" : "nop",
- "id" : 15,
- "runtime_data" : [],
- "primitives" : []
- },
- {
"name" : "drop_now",
- "id" : 16,
+ "id" : 15,
"runtime_data" : [],
"primitives" : [
{
@@ -2151,7 +2165,7 @@
},
{
"name" : "FabricIngress.spgw_ingress.gtpu_decap",
- "id" : 17,
+ "id" : 16,
"runtime_data" : [],
"primitives" : [
{
@@ -2203,7 +2217,7 @@
},
{
"name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
- "id" : 18,
+ "id" : 17,
"runtime_data" : [
{
"name" : "teid",
@@ -2280,7 +2294,7 @@
},
{
"name" : "FabricIngress.process_set_source_sink.int_set_source",
- "id" : 19,
+ "id" : 18,
"runtime_data" : [],
"primitives" : [
{
@@ -2306,7 +2320,7 @@
},
{
"name" : "FabricIngress.process_set_source_sink.int_set_sink",
- "id" : 20,
+ "id" : 19,
"runtime_data" : [],
"primitives" : [
{
@@ -2332,7 +2346,7 @@
},
{
"name" : "FabricIngress.filtering.drop",
- "id" : 21,
+ "id" : 20,
"runtime_data" : [],
"primitives" : [
{
@@ -2349,7 +2363,7 @@
},
{
"name" : "FabricIngress.filtering.set_vlan",
- "id" : 22,
+ "id" : 21,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -2380,7 +2394,7 @@
},
{
"name" : "FabricIngress.filtering.push_internal_vlan",
- "id" : 23,
+ "id" : 22,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -2531,7 +2545,7 @@
},
{
"name" : "FabricIngress.filtering.set_forwarding_type",
- "id" : 24,
+ "id" : 23,
"runtime_data" : [
{
"name" : "fwd_type",
@@ -2562,7 +2576,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_bridging",
- "id" : 25,
+ "id" : 24,
"runtime_data" : [
{
"name" : "next_id",
@@ -2593,7 +2607,7 @@
},
{
"name" : "FabricIngress.forwarding.pop_mpls_and_next",
- "id" : 26,
+ "id" : 25,
"runtime_data" : [
{
"name" : "next_id",
@@ -2639,7 +2653,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_unicast_v4",
- "id" : 27,
+ "id" : 26,
"runtime_data" : [
{
"name" : "next_id",
@@ -2670,7 +2684,7 @@
},
{
"name" : "FabricIngress.forwarding.set_next_id_acl",
- "id" : 28,
+ "id" : 27,
"runtime_data" : [
{
"name" : "next_id",
@@ -2701,7 +2715,7 @@
},
{
"name" : "FabricIngress.forwarding.punt_to_cpu",
- "id" : 29,
+ "id" : 28,
"runtime_data" : [],
"primitives" : [
{
@@ -2737,7 +2751,7 @@
},
{
"name" : "FabricIngress.forwarding.clone_to_cpu",
- "id" : 30,
+ "id" : 29,
"runtime_data" : [],
"primitives" : [
{
@@ -2773,7 +2787,7 @@
},
{
"name" : "FabricIngress.forwarding.drop",
- "id" : 31,
+ "id" : 30,
"runtime_data" : [],
"primitives" : [
{
@@ -2789,6 +2803,12 @@
]
},
{
+ "name" : "FabricIngress.forwarding.nop_acl",
+ "id" : 31,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
"name" : "FabricIngress.forwarding.set_next_id_multicast_v4",
"id" : 32,
"runtime_data" : [
@@ -2812,7 +2832,7 @@
],
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 164,
+ "line" : 168,
"column" : 8,
"source_fragment" : "fabric_metadata.next_id = next_id"
}
@@ -2843,7 +2863,7 @@
],
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 189,
+ "line" : 193,
"column" : 8,
"source_fragment" : "fabric_metadata.next_id = next_id"
}
@@ -2874,7 +2894,7 @@
],
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 212,
+ "line" : 216,
"column" : 8,
"source_fragment" : "fabric_metadata.next_id = next_id"
}
@@ -4544,7 +4564,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 154,
+ "line" : 153,
"column" : 12,
"source_fragment" : "return"
}
@@ -4600,7 +4620,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 171,
+ "line" : 170,
"column" : 8,
"source_fragment" : "spgw_meta.ipv4_len = ipv4.total_len"
}
@@ -5218,7 +5238,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 186,
+ "line" : 185,
"column" : 8,
"source_fragment" : "gtpu_ipv4.setValid()"
}
@@ -5237,7 +5257,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 187,
+ "line" : 186,
"column" : 8,
"source_fragment" : "gtpu_ipv4.version = 4"
}
@@ -5275,7 +5295,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 189,
+ "line" : 188,
"column" : 8,
"source_fragment" : "gtpu_ipv4.dscp = 0"
}
@@ -5294,7 +5314,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 190,
+ "line" : 189,
"column" : 8,
"source_fragment" : "gtpu_ipv4.ecn = 0"
}
@@ -5336,7 +5356,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 191,
+ "line" : 190,
"column" : 8,
"source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
}
@@ -5355,7 +5375,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 193,
+ "line" : 192,
"column" : 8,
"source_fragment" : "gtpu_ipv4.identification = 0x1513"
}
@@ -5374,7 +5394,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 194,
+ "line" : 193,
"column" : 8,
"source_fragment" : "gtpu_ipv4.flags = 0"
}
@@ -5393,7 +5413,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 195,
+ "line" : 194,
"column" : 8,
"source_fragment" : "gtpu_ipv4.frag_offset = 0"
}
@@ -5450,7 +5470,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 198,
+ "line" : 197,
"column" : 8,
"source_fragment" : "gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr"
}
@@ -5469,7 +5489,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 199,
+ "line" : 198,
"column" : 8,
"source_fragment" : "gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr"
}
@@ -5488,7 +5508,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 200,
+ "line" : 199,
"column" : 8,
"source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
}
@@ -5503,7 +5523,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 202,
+ "line" : 201,
"column" : 8,
"source_fragment" : "gtpu_udp.setValid()"
}
@@ -5522,7 +5542,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 203,
+ "line" : 202,
"column" : 8,
"source_fragment" : "gtpu_udp.src_port = 2152"
}
@@ -5541,7 +5561,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 204,
+ "line" : 203,
"column" : 8,
"source_fragment" : "gtpu_udp.dst_port = 2152"
}
@@ -5583,7 +5603,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 205,
+ "line" : 204,
"column" : 8,
"source_fragment" : "gtpu_udp.len = spgw_meta.ipv4_len ..."
}
@@ -5602,7 +5622,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 207,
+ "line" : 206,
"column" : 8,
"source_fragment" : "gtpu_udp.checksum = 0"
}
@@ -5617,7 +5637,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 209,
+ "line" : 208,
"column" : 8,
"source_fragment" : "gtpu.setValid()"
}
@@ -5636,7 +5656,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 210,
+ "line" : 209,
"column" : 8,
"source_fragment" : "gtpu.version = 0x01"
}
@@ -5655,7 +5675,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 211,
+ "line" : 210,
"column" : 8,
"source_fragment" : "gtpu.pt = 0x01"
}
@@ -5674,7 +5694,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 212,
+ "line" : 211,
"column" : 8,
"source_fragment" : "gtpu.spare = 0"
}
@@ -5693,7 +5713,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 213,
+ "line" : 212,
"column" : 8,
"source_fragment" : "gtpu.ex_flag = 0"
}
@@ -5712,7 +5732,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 214,
+ "line" : 213,
"column" : 8,
"source_fragment" : "gtpu.seq_flag = 0"
}
@@ -5731,7 +5751,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 215,
+ "line" : 214,
"column" : 8,
"source_fragment" : "gtpu.npdu_flag = 0"
}
@@ -5750,7 +5770,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 216,
+ "line" : 215,
"column" : 8,
"source_fragment" : "gtpu.msgtype = 0xff"
}
@@ -5769,7 +5789,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 217,
+ "line" : 216,
"column" : 8,
"source_fragment" : "gtpu.msglen = spgw_meta.ipv4_len"
}
@@ -5788,7 +5808,7 @@
],
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 218,
+ "line" : 217,
"column" : 8,
"source_fragment" : "gtpu.teid = spgw_meta.teid"
}
@@ -11397,14 +11417,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [16],
+ "action_ids" : [15],
"actions" : ["drop_now"],
"base_default_next" : "tbl_act_8",
"next_tables" : {
"drop_now" : "tbl_act_8"
},
"default_entry" : {
- "action_id" : 16,
+ "action_id" : 15,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11443,14 +11463,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [17],
+ "action_ids" : [16],
"actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
"base_default_next" : "node_27",
"next_tables" : {
"FabricIngress.spgw_ingress.gtpu_decap" : "node_27"
},
"default_entry" : {
- "action_id" : 17,
+ "action_id" : 16,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -11479,7 +11499,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [18, 0],
+ "action_ids" : [17, 0],
"actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"],
"base_default_next" : null,
"next_tables" : {
@@ -11643,7 +11663,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [23, 22, 13, 21],
+ "action_ids" : [22, 21, 13, 20],
"actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "nop", "FabricIngress.filtering.drop"],
"base_default_next" : "FabricIngress.filtering.fwd_classifier",
"next_tables" : {
@@ -11694,14 +11714,14 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [24],
+ "action_ids" : [23],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
"base_default_next" : "node_31",
"next_tables" : {
"FabricIngress.filtering.set_forwarding_type" : "node_31"
},
"default_entry" : {
- "action_id" : 24,
+ "action_id" : 23,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
@@ -11736,7 +11756,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [25, 4],
+ "action_ids" : [24, 4],
"actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
@@ -11773,7 +11793,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [26, 5],
+ "action_ids" : [25, 5],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
"base_default_next" : "tbl_act_14",
"next_tables" : {
@@ -11833,7 +11853,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [27, 6],
+ "action_ids" : [26, 6],
"actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
@@ -11852,7 +11872,7 @@
"id" : 25,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 168,
+ "line" : 172,
"column" : 10,
"source_fragment" : "multicast_v4"
},
@@ -11895,7 +11915,7 @@
"id" : 26,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 193,
+ "line" : 197,
"column" : 10,
"source_fragment" : "unicast_v6"
},
@@ -11932,7 +11952,7 @@
"id" : 27,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 216,
+ "line" : 220,
"column" : 10,
"source_fragment" : "multicast_v6"
},
@@ -11975,7 +11995,7 @@
"id" : 28,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 127,
+ "line" : 131,
"column" : 10,
"source_fragment" : "acl"
},
@@ -12059,18 +12079,18 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [28, 29, 30, 31, 14],
- "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "nop"],
+ "action_ids" : [27, 28, 29, 30, 31],
+ "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "FabricIngress.forwarding.nop_acl"],
"base_default_next" : "tbl_act_15",
"next_tables" : {
"FabricIngress.forwarding.set_next_id_acl" : "tbl_act_15",
"FabricIngress.forwarding.punt_to_cpu" : "tbl_act_15",
"FabricIngress.forwarding.clone_to_cpu" : "tbl_act_15",
"FabricIngress.forwarding.drop" : "tbl_act_15",
- "nop" : "tbl_act_15"
+ "FabricIngress.forwarding.nop_acl" : "tbl_act_15"
},
"default_entry" : {
- "action_id" : 14,
+ "action_id" : 31,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -12122,7 +12142,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [35, 15],
+ "action_ids" : [35, 14],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
"base_default_next" : "FabricIngress.next.simple",
"next_tables" : {
@@ -12130,7 +12150,7 @@
"nop" : "FabricIngress.next.simple"
},
"default_entry" : {
- "action_id" : 15,
+ "action_id" : 14,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -12518,7 +12538,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [19, 2],
+ "action_ids" : [18, 2],
"actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
"base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
"next_tables" : {
@@ -12555,7 +12575,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [20, 3],
+ "action_ids" : [19, 3],
"actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "NoAction"],
"base_default_next" : "node_72",
"next_tables" : {
@@ -12825,7 +12845,7 @@
"id" : 8,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 231,
+ "line" : 235,
"column" : 11,
"source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
},
@@ -12851,7 +12871,7 @@
"id" : 9,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 232,
+ "line" : 236,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
},
@@ -12877,7 +12897,7 @@
"id" : 10,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 238,
+ "line" : 242,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
},
@@ -12903,7 +12923,7 @@
"id" : 11,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 240,
+ "line" : 244,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_MULTICAST"
},
@@ -12929,7 +12949,7 @@
"id" : 12,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 243,
+ "line" : 247,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_UNICAST"
},
@@ -12955,7 +12975,7 @@
"id" : 13,
"source_info" : {
"filename" : "include/control/forwarding.p4",
- "line" : 245,
+ "line" : 249,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_MULTICAST"
},
@@ -13969,7 +13989,7 @@
"id" : 28,
"source_info" : {
"filename" : "include/spgw.p4",
- "line" : 222,
+ "line" : 221,
"column" : 12,
"source_fragment" : "spgw_meta.direction == SPGW_DIR_DOWNLINK"
},
@@ -13995,7 +14015,7 @@
"id" : 29,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 100,
+ "line" : 94,
"column" : 12,
"source_fragment" : "standard_metadata.ingress_port != 255 && ..."
},
@@ -14075,7 +14095,7 @@
"id" : 30,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 103,
+ "line" : 97,
"column" : 16,
"source_fragment" : "fabric_metadata.int_meta.source == 1"
},
@@ -14101,7 +14121,7 @@
"id" : 31,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 106,
+ "line" : 100,
"column" : 15,
"source_fragment" : "hdr.int_header.isValid()"
},
@@ -14193,7 +14213,7 @@
"id" : 35,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 110,
+ "line" : 104,
"column" : 20,
"source_fragment" : "standard_metadata.instance_type == 1"
},
@@ -14219,7 +14239,7 @@
"id" : 36,
"source_info" : {
"filename" : "fabric.p4",
- "line" : 114,
+ "line" : 108,
"column" : 20,
"source_fragment" : "fabric_metadata.int_meta.sink == 1"
},