From 9b0171bc344ec4384bafda58272fac4ac9b31a08 Mon Sep 17 00:00:00 2001 From: Carmelo Cascone Date: Tue, 14 Aug 2018 01:43:57 -0700 Subject: [PATCH] Fixed spgw.p4 decapping GTP packets not meant to be decapped Also reduces the number of tables used for downlink processing. Change-Id: I09a67cfac335b805d80e90cf5bb69fbab931e80b --- .../pipelines/fabric/FabricConstants.java | 20 +- pipelines/fabric/src/main/resources/fabric.p4 | 4 + .../src/main/resources/include/checksum.p4 | 3 - .../src/main/resources/include/define.p4 | 32 +- .../src/main/resources/include/header.p4 | 3 +- .../src/main/resources/include/int_report.p4 | 4 +- .../src/main/resources/include/parser.p4 | 31 +- .../fabric/src/main/resources/include/spgw.p4 | 151 +- .../fabric-full/bmv2/default/bmv2.json | 3025 ++++++++--------- .../fabric-full/bmv2/default/p4info.txt | 59 +- .../p4c-out/fabric-int/bmv2/default/bmv2.json | 48 +- .../fabric-spgw/bmv2/default/bmv2.json | 2487 +++++++------- .../fabric-spgw/bmv2/default/p4info.txt | 59 +- .../p4c-out/fabric/bmv2/default/bmv2.json | 24 +- 14 files changed, 2805 insertions(+), 3145 deletions(-) diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java index 2a4b730d3c..23580f4f50 100644 --- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java +++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java @@ -33,8 +33,6 @@ public final class FabricConstants { } // Header field IDs - public static final PiMatchFieldId SPGW_META_S1U_SGW_ADDR = - PiMatchFieldId.of("spgw_meta.s1u_sgw_addr"); public static final PiMatchFieldId HDR_VLAN_TAG_VLAN_ID = PiMatchFieldId.of("hdr.vlan_tag.vlan_id"); public static final PiMatchFieldId HDR_MPLS_LABEL = @@ -63,6 +61,8 @@ public final class FabricConstants { PiMatchFieldId.of("fabric_metadata.l4_dst_port"); public static final PiMatchFieldId STANDARD_METADATA_EGRESS_SPEC = PiMatchFieldId.of("standard_metadata.egress_spec"); + public static final PiMatchFieldId GTPU_IPV4_DST_ADDR = + PiMatchFieldId.of("gtpu_ipv4.dst_addr"); public static final PiMatchFieldId FABRIC_METADATA_IP_PROTO = PiMatchFieldId.of("fabric_metadata.ip_proto"); public static final PiMatchFieldId FABRIC_METADATA_NEXT_ID = @@ -122,12 +122,8 @@ public final class FabricConstants { PiTableId.of("FabricEgress.egress_next.egress_vlan"); public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SINK = PiTableId.of("FabricIngress.process_set_source_sink.tb_set_sink"); - public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_UE_CDR_TABLE = - PiTableId.of("FabricIngress.spgw_ingress.ue_cdr_table"); public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE = PiTableId.of("FabricIngress.process_set_source_sink.tb_set_source"); - public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_UE_FILTER_TABLE = - PiTableId.of("FabricIngress.spgw_ingress.ue_filter_table"); // Indirect Counter IDs public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_EGRESS_PORT_COUNTER = PiCounterId.of("FabricIngress.port_counters_control.egress_port_counter"); @@ -179,8 +175,8 @@ public final class FabricConstants { // Action IDs public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I14 = PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i14"); - public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_UPDATE_UE_CDR = - PiActionId.of("FabricIngress.spgw_ingress.update_ue_cdr"); + public static final PiActionId FABRIC_INGRESS_FORWARDING_PUNT_TO_CPU = + PiActionId.of("FabricIngress.forwarding.punt_to_cpu"); public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I12 = PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i12"); public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I13 = @@ -197,8 +193,8 @@ public final class FabricConstants { PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i14"); public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING = PiActionId.of("FabricIngress.forwarding.set_next_id_bridging"); - public static final PiActionId FABRIC_INGRESS_FORWARDING_PUNT_TO_CPU = - PiActionId.of("FabricIngress.forwarding.punt_to_cpu"); + public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I15 = + PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i15"); public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I2 = PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i2"); public static final PiActionId FABRIC_EGRESS_PROCESS_INT_OUTER_ENCAP_INT_UPDATE_IPV4 = @@ -322,8 +318,6 @@ public final class FabricConstants { PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i5"); public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_VLAN = PiActionId.of("FabricIngress.next.l3_routing_vlan"); - public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I15 = - PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i15"); public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ACL = PiActionId.of("FabricIngress.forwarding.set_next_id_acl"); public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0407_I6 = @@ -367,4 +361,4 @@ public final class FabricConstants { PiControlMetadataId.of("ingress_port"); public static final PiControlMetadataId EGRESS_PORT = PiControlMetadataId.of("egress_port"); -} \ No newline at end of file +} diff --git a/pipelines/fabric/src/main/resources/fabric.p4 b/pipelines/fabric/src/main/resources/fabric.p4 index 06c16fd741..6153807af3 100644 --- a/pipelines/fabric/src/main/resources/fabric.p4 +++ b/pipelines/fabric/src/main/resources/fabric.p4 @@ -48,6 +48,10 @@ inout standard_metadata_t standard_metadata) { PortCountersControl() port_counters_control; apply { +#ifdef WITH_SPGW + spgw_normalizer.apply(hdr.gtpu.isValid(), hdr.gtpu_ipv4, hdr.gtpu_udp, + hdr.ipv4, hdr.udp, hdr.inner_ipv4, hdr.inner_udp); +#endif // WITH_SPGW packet_io_ingress.apply(hdr, fabric_metadata, standard_metadata); #ifdef WITH_SPGW #ifdef WITH_SPGW_PCC_GATING diff --git a/pipelines/fabric/src/main/resources/include/checksum.p4 b/pipelines/fabric/src/main/resources/include/checksum.p4 index 4d1b803907..a10a393ff3 100644 --- a/pipelines/fabric/src/main/resources/include/checksum.p4 +++ b/pipelines/fabric/src/main/resources/include/checksum.p4 @@ -72,9 +72,6 @@ control FabricVerifyChecksum(inout parsed_headers_t hdr, hdr.ipv4.hdr_checksum, HashAlgorithm.csum16 ); -#ifdef WITH_SPGW - verify_gtpu_checksum.apply(hdr.gtpu_ipv4); -#endif // WITH_SPGW } } diff --git a/pipelines/fabric/src/main/resources/include/define.p4 b/pipelines/fabric/src/main/resources/include/define.p4 index 74c964ee62..d717853bf3 100644 --- a/pipelines/fabric/src/main/resources/include/define.p4 +++ b/pipelines/fabric/src/main/resources/include/define.p4 @@ -68,6 +68,21 @@ typedef bit<9> port_num_t; typedef bit<48> mac_addr_t; typedef bit<16> group_id_t; typedef bit<12> vlan_id_t; +typedef bit<48> timestamp_t; +typedef bit<32> switch_id_t; +typedef bit<32> ipv4_addr_t; +typedef bit<16> l4_port_t; + +// SPGW types +typedef bit<2> direction_t; +typedef bit pcc_gate_status_t; +typedef bit<32> sdf_rule_id_t; +typedef bit<32> pcc_rule_id_t; + +// spgw.p4 expects uplink packets with IP dst on this subnet +// 140.0.0.0/8 +const ipv4_addr_t S1U_SGW_PREFIX = 2348810240; +#define S1U_SGW_PREFIX_LEN 8 const bit<16> ETHERTYPE_QINQ = 0x88A8; const bit<16> ETHERTYPE_QINQ_NON_STD = 0x9100; @@ -95,28 +110,17 @@ const fwd_type_t FWD_IPV6_MULTICAST = 5; const bit<8> DEFAULT_MPLS_TTL = 64; const bit<8> DEFAULT_IPV4_TTL = 64; -typedef bit direction_t; -typedef bit pcc_gate_status_t; -typedef bit<32> sdf_rule_id_t; -typedef bit<32> pcc_rule_id_t; - const sdf_rule_id_t DEFAULT_SDF_RULE_ID = 0; const pcc_rule_id_t DEFAULT_PCC_RULE_ID = 0; - -const direction_t DIR_UPLINK = 1w0; -const direction_t DIR_DOWNLINK = 1w1; - +const direction_t SPGW_DIR_UNKNOWN = 2w0; +const direction_t SPGW_DIR_UPLINK = 2w1; +const direction_t SPGW_DIR_DOWNLINK = 2w2; const pcc_gate_status_t PCC_GATE_OPEN = 1w0; const pcc_gate_status_t PCC_GATE_CLOSED = 1w1; /* indicate INT at LSB of DSCP */ const bit<6> INT_DSCP = 0x1; -typedef bit<48> timestamp_t; -typedef bit<32> switch_id_t; -typedef bit<32> ip_address_t; -typedef bit<16> l4_port_t; - const bit<8> INT_HEADER_LEN_WORD = 4; const bit<8> CPU_MIRROR_SESSION_ID = 250; diff --git a/pipelines/fabric/src/main/resources/include/header.p4 b/pipelines/fabric/src/main/resources/include/header.p4 index c1df60ed68..25ac4001c3 100644 --- a/pipelines/fabric/src/main/resources/include/header.p4 +++ b/pipelines/fabric/src/main/resources/include/header.p4 @@ -132,7 +132,6 @@ header gtpu_t { } struct spgw_meta_t { - _BOOL do_spgw; direction_t direction; bit<16> ipv4_len; bit<32> teid; @@ -291,6 +290,8 @@ struct parsed_headers_t { ipv4_t gtpu_ipv4; udp_t gtpu_udp; gtpu_t gtpu; + ipv4_t inner_ipv4; + udp_t inner_udp; #endif // WITH_SPGW ipv4_t ipv4; #ifdef WITH_IPV6 diff --git a/pipelines/fabric/src/main/resources/include/int_report.p4 b/pipelines/fabric/src/main/resources/include/int_report.p4 index da158e24f6..6d7c29dfeb 100644 --- a/pipelines/fabric/src/main/resources/include/int_report.p4 +++ b/pipelines/fabric/src/main/resources/include/int_report.p4 @@ -44,8 +44,8 @@ control process_int_report ( (bit<32>) standard_metadata.enq_timestamp; } - action do_report_encapsulation(mac_addr_t src_mac, mac_addr_t mon_mac, ip_address_t src_ip, - ip_address_t mon_ip, l4_port_t mon_port) { + action do_report_encapsulation(mac_addr_t src_mac, mac_addr_t mon_mac, ipv4_addr_t src_ip, + ipv4_addr_t mon_ip, l4_port_t mon_port) { //Report Ethernet Header hdr.report_ethernet.setValid(); hdr.report_ethernet.dst_addr = mon_mac; diff --git a/pipelines/fabric/src/main/resources/include/parser.p4 b/pipelines/fabric/src/main/resources/include/parser.p4 index b94ca50bad..20c310ccf0 100644 --- a/pipelines/fabric/src/main/resources/include/parser.p4 +++ b/pipelines/fabric/src/main/resources/include/parser.p4 @@ -179,24 +179,35 @@ inout standard_metadata_t standard_metadata) { #ifdef WITH_SPGW state parse_gtpu { - packet.extract(hdr.gtpu); - transition parse_ipv4_inner; + transition select(hdr.ipv4.dst_addr[31:32-S1U_SGW_PREFIX_LEN]) { + // Avoid parsing GTP and inner headers if we know this GTP packet + // is not to be processed by this switch. + // FIXME: use parser value sets when support is ready in ONOS. + // To set the S1U_SGW_PREFIX value at runtime. + S1U_SGW_PREFIX[31:32-S1U_SGW_PREFIX_LEN]: do_parse_gtpu; + default: accept; + } } - state parse_ipv4_inner { - packet.extract(hdr.gtpu_ipv4); - transition select(hdr.gtpu_ipv4.protocol) { + state do_parse_gtpu { + packet.extract(hdr.gtpu); + transition parse_inner_ipv4; + } + + state parse_inner_ipv4 { + packet.extract(hdr.inner_ipv4); + transition select(hdr.inner_ipv4.protocol) { PROTO_TCP: parse_tcp; - PROTO_UDP: parse_udp_inner; + PROTO_UDP: parse_inner_udp; PROTO_ICMP: parse_icmp; default: accept; } } - state parse_udp_inner { - packet.extract(hdr.gtpu_udp); - fabric_metadata.l4_src_port = hdr.gtpu_udp.src_port; - fabric_metadata.l4_dst_port = hdr.gtpu_udp.dst_port; + state parse_inner_udp { + packet.extract(hdr.inner_udp); + fabric_metadata.l4_src_port = hdr.inner_udp.src_port; + fabric_metadata.l4_dst_port = hdr.inner_udp.dst_port; #ifdef WITH_INT transition select(hdr.ipv4.isValid() && (hdr.ipv4.dscp & INT_DSCP) == INT_DSCP) { true: parse_intl4_shim; diff --git a/pipelines/fabric/src/main/resources/include/spgw.p4 b/pipelines/fabric/src/main/resources/include/spgw.p4 index b3ac3619f8..5b2cd29b31 100644 --- a/pipelines/fabric/src/main/resources/include/spgw.p4 +++ b/pipelines/fabric/src/main/resources/include/spgw.p4 @@ -17,6 +17,27 @@ #ifndef __SPGW__ #define __SPGW__ +control spgw_normalizer( + in bool is_gtpu_encapped, + out ipv4_t gtpu_ipv4, + out udp_t gtpu_udp, + inout ipv4_t ipv4, + inout udp_t udp, + in ipv4_t inner_ipv4, + in udp_t inner_udp + ) { + apply { + if (! is_gtpu_encapped) return; + gtpu_ipv4 = ipv4; + ipv4 = inner_ipv4; + gtpu_udp = udp; + if (inner_udp.isValid()) { + udp = inner_udp; + } else { + udp.setInvalid(); + } + } +} control spgw_ingress( inout ipv4_t gtpu_ipv4, @@ -41,26 +62,24 @@ control spgw_ingress( spgw_meta.teid = teid; spgw_meta.s1u_enb_addr = s1u_enb_addr; spgw_meta.s1u_sgw_addr = s1u_sgw_addr; - } - - action update_ue_cdr() { ue_counter.count(); } - table ue_filter_table { + table dl_sess_lookup { key = { - // IP prefixes of the UEs managed by this switch (when downlink) - ipv4.dst_addr : lpm; + // UE addr for downlink + ipv4.dst_addr : exact; } actions = { - NoAction(); + set_dl_sess_info(); } + counters = ue_counter; } table s1u_filter_table { key = { - // IP addresses of the S1U interfaces embodied by this switch. - spgw_meta.s1u_sgw_addr : exact; + // IP addresses of the S1U interfaces of this SPGW-U instance (when uplink) + gtpu_ipv4.dst_addr : exact; } actions = { NoAction(); @@ -116,56 +135,22 @@ control spgw_ingress( } #endif // WITH_SPGW_PCC_GATING - table dl_sess_lookup { - key = { - // UE addr for downlink - ipv4.dst_addr : exact; - } - actions = { - set_dl_sess_info(); - } - } - - table ue_cdr_table { - key = { - // UE addr for downlink - ipv4.dst_addr : exact; - } - actions = { - update_ue_cdr(); - } - counters = ue_counter; - } - apply { - spgw_meta.do_spgw = _FALSE; if (gtpu.isValid()) { - // If here, the parsed ipv4 header is the outer GTP one, but - // fabric needs to forward on the inner one, i.e. this. - // We store the outer values we need in the metadata, then replace - // the ipv4 header extracted before with this one. - spgw_meta.s1u_enb_addr = ipv4.src_addr; - spgw_meta.s1u_sgw_addr = ipv4.dst_addr; - ipv4 = gtpu_ipv4; - udp = gtpu_udp; - - if (s1u_filter_table.apply().hit) { - // TODO: check also that gtpu.msgtype == GTP_GPDU - spgw_meta.do_spgw = _TRUE; - spgw_meta.direction = DIR_UPLINK; + // If here, pkt has outer IP dst on + // S1U_SGW_PREFIX/S1U_SGW_PREFIX_LEN subnet. + // TODO: check also that gtpu.msgtype == GTP_GPDU + if (!s1u_filter_table.apply().hit) { + drop_now(); } - } else if (ue_filter_table.apply().hit) { - spgw_meta.do_spgw = _TRUE; - spgw_meta.direction = DIR_DOWNLINK; - } - - if (spgw_meta.do_spgw == _FALSE) { - // Exit this control block. - return; - } - - if (spgw_meta.direction == DIR_UPLINK) { + spgw_meta.direction = SPGW_DIR_UPLINK; gtpu_decap(); + } else if (dl_sess_lookup.apply().hit) { + spgw_meta.direction = SPGW_DIR_DOWNLINK; + } else { + spgw_meta.direction = SPGW_DIR_UNKNOWN; + // No SPGW processing needed. + return; } #ifdef WITH_SPGW_PCC_GATING @@ -181,15 +166,6 @@ control spgw_ingress( } #endif // WITH_SPGW_PCC_GATING - if (spgw_meta.direction == DIR_DOWNLINK) { - if (!dl_sess_lookup.apply().hit) { - // We have no other choice than drop, as we miss the session - // info necessary to properly GTPU encap the packet. - drop_now(); - } - ue_cdr_table.apply(); - } - // Don't ask why... we'll need this later. spgw_meta.ipv4_len = ipv4.total_len; } @@ -197,12 +173,12 @@ control spgw_ingress( control spgw_egress( - in ipv4_t ipv4, - out ipv4_t gtpu_ipv4, - out udp_t gtpu_udp, - out gtpu_t gtpu, - in spgw_meta_t spgw_meta, - in standard_metadata_t std_meta + in ipv4_t ipv4, + inout ipv4_t gtpu_ipv4, + inout udp_t gtpu_udp, + inout gtpu_t gtpu, + in spgw_meta_t spgw_meta, + in standard_metadata_t std_meta ) { action gtpu_encap() { @@ -211,7 +187,7 @@ control spgw_egress( gtpu_ipv4.ihl = IPV4_MIN_IHL; gtpu_ipv4.dscp = 0; gtpu_ipv4.ecn = 0; - gtpu_ipv4.total_len = spgw_meta.ipv4_len + gtpu_ipv4.total_len = ipv4.total_len + (IPV4_HDR_SIZE + UDP_HDR_SIZE + GTP_HDR_SIZE); gtpu_ipv4.identification = 0x1513; /* From NGIC */ gtpu_ipv4.flags = 0; @@ -242,44 +218,13 @@ control spgw_egress( } apply { - if (spgw_meta.do_spgw == _TRUE && spgw_meta.direction == DIR_DOWNLINK) { + if (spgw_meta.direction == SPGW_DIR_DOWNLINK) { gtpu_encap(); } } } -control verify_gtpu_checksum( - inout ipv4_t gtpu_ipv4 - ) { - apply { - // TODO: re-enable gtpu_ipv4 verification - // with the current parser logic, gtpu_ip4 contains values of - // the inner header, which is already verified by include/checksum.p4. - // We need to modify the parser to copy the outer header somewhere - // else, and verify that here. - - // verify_checksum(gtpu_ipv4.isValid(), - // { - // gtpu_ipv4.version, - // gtpu_ipv4.ihl, - // gtpu_ipv4.diffserv, - // gtpu_ipv4.total_len, - // gtpu_ipv4.identification, - // gtpu_ipv4.flags, - // gtpu_ipv4.frag_offset, - // gtpu_ipv4.ttl, - // gtpu_ipv4.protocol, - // gtpu_ipv4.src_addr, - // gtpu_ipv4.dst_addr - // }, - // gtpu_ipv4.hdr_checksum, - // HashAlgorithm.csum16 - // ); - } -} - - control update_gtpu_checksum( inout ipv4_t gtpu_ipv4, inout udp_t gtpu_udp, 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 abd55ecd24..8c90afcbe4 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,15 +7,16 @@ ["tmp", 4, false], ["tmp_0", 1, false], ["tmp_1", 32, false], - ["tmp_2", 1, false], - ["tmp_3", 32, false], + ["tmp_2", 9, false], + ["tmp_3", 1, false], ["tmp_4", 32, false], + ["tmp_5", 32, false], + ["spgw_ingress_tmp_1", 1, false], ["spgw_ingress_tmp_2", 1, false], - ["spgw_ingress_tmp_3", 1, false], - ["spgw_ingress_tmp_4", 1, false], ["next_tmp_2", 1, false], ["next_tmp_3", 1, false], ["next_tmp_4", 1, false], + ["spgw_normalizer_hasReturned_0", 1, false], ["spgw_ingress_hasReturned_0", 1, false], ["next_hasReturned_0", 1, false], ["fabric_metadata_t.fwd_type", 3, false], @@ -27,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", 3, false] + ["_padding_2", 2, false] ] }, { @@ -348,8 +349,7 @@ "name" : "spgw_meta_t", "id" : 29, "fields" : [ - ["do_spgw", 1, 0], - ["direction", 1, false], + ["direction", 2, false], ["ipv4_len", 16, false], ["teid", 32, false], ["s1u_enb_addr", 32, false], @@ -430,197 +430,211 @@ "pi_omit" : true }, { - "name" : "ipv4", + "name" : "inner_ipv4", "id" : 8, "header_type" : "ipv4_t", "metadata" : false, "pi_omit" : true }, { - "name" : "ipv6", + "name" : "inner_udp", "id" : 9, + "header_type" : "udp_t", + "metadata" : false, + "pi_omit" : true + }, + { + "name" : "ipv4", + "id" : 10, + "header_type" : "ipv4_t", + "metadata" : false, + "pi_omit" : true + }, + { + "name" : "ipv6", + "id" : 11, "header_type" : "ipv6_t", "metadata" : false, "pi_omit" : true }, { "name" : "arp", - "id" : 10, + "id" : 12, "header_type" : "arp_t", "metadata" : false, "pi_omit" : true }, { "name" : "tcp", - "id" : 11, + "id" : 13, "header_type" : "tcp_t", "metadata" : false, "pi_omit" : true }, { "name" : "udp", - "id" : 12, + "id" : 14, "header_type" : "udp_t", "metadata" : false, "pi_omit" : true }, { "name" : "icmp", - "id" : 13, + "id" : 15, "header_type" : "icmp_t", "metadata" : false, "pi_omit" : true }, { "name" : "packet_out", - "id" : 14, + "id" : 16, "header_type" : "packet_out_header_t", "metadata" : false, "pi_omit" : true }, { "name" : "packet_in", - "id" : 15, + "id" : 17, "header_type" : "packet_in_header_t", "metadata" : false, "pi_omit" : true }, { "name" : "report_ethernet", - "id" : 16, + "id" : 18, "header_type" : "ethernet_t", "metadata" : false, "pi_omit" : true }, { "name" : "report_ipv4", - "id" : 17, + "id" : 19, "header_type" : "ipv4_t", "metadata" : false, "pi_omit" : true }, { "name" : "report_udp", - "id" : 18, + "id" : 20, "header_type" : "udp_t", "metadata" : false, "pi_omit" : true }, { "name" : "report_fixed_header", - "id" : 19, + "id" : 21, "header_type" : "report_fixed_header_t", "metadata" : false, "pi_omit" : true }, { "name" : "report_local.drop_report_header", - "id" : 20, + "id" : 22, "header_type" : "drop_report_header_t", "metadata" : false, "pi_omit" : true }, { "name" : "report_local.local_report_header", - "id" : 21, + "id" : 23, "header_type" : "local_report_header_t", "metadata" : false, "pi_omit" : true }, { "name" : "intl4_shim", - "id" : 22, + "id" : 24, "header_type" : "intl4_shim_t", "metadata" : false, "pi_omit" : true }, { "name" : "int_header", - "id" : 23, + "id" : 25, "header_type" : "int_header_t", "metadata" : false, "pi_omit" : true }, { "name" : "int_data", - "id" : 24, + "id" : 26, "header_type" : "int_data_t", "metadata" : false, "pi_omit" : true }, { "name" : "int_switch_id", - "id" : 25, + "id" : 27, "header_type" : "int_switch_id_t", "metadata" : false, "pi_omit" : true }, { "name" : "int_port_ids", - "id" : 26, + "id" : 28, "header_type" : "int_port_ids_t", "metadata" : false, "pi_omit" : true }, { "name" : "int_hop_latency", - "id" : 27, + "id" : 29, "header_type" : "int_hop_latency_t", "metadata" : false, "pi_omit" : true }, { "name" : "int_q_occupancy", - "id" : 28, + "id" : 30, "header_type" : "int_q_occupancy_t", "metadata" : false, "pi_omit" : true }, { "name" : "int_ingress_tstamp", - "id" : 29, + "id" : 31, "header_type" : "int_ingress_tstamp_t", "metadata" : false, "pi_omit" : true }, { "name" : "int_egress_tstamp", - "id" : 30, + "id" : 32, "header_type" : "int_egress_tstamp_t", "metadata" : false, "pi_omit" : true }, { "name" : "int_q_congestion", - "id" : 31, + "id" : 33, "header_type" : "int_q_congestion_t", "metadata" : false, "pi_omit" : true }, { "name" : "int_egress_tx_util", - "id" : 32, + "id" : 34, "header_type" : "int_egress_port_tx_util_t", "metadata" : false, "pi_omit" : true }, { "name" : "intl4_tail", - "id" : 33, + "id" : 35, "header_type" : "intl4_tail_t", "metadata" : false, "pi_omit" : true }, { "name" : "userMetadata.spgw", - "id" : 34, + "id" : 36, "header_type" : "spgw_meta_t", "metadata" : true, "pi_omit" : true }, { "name" : "userMetadata.int_meta", - "id" : 35, + "id" : 37, "header_type" : "int_metadata_t", "metadata" : true, "pi_omit" : true @@ -642,7 +656,7 @@ "name" : "report_local", "id" : 0, "union_type" : "local_report_t", - "header_ids" : [20, 21], + "header_ids" : [22, 23], "pi_omit" : true } ], @@ -1424,6 +1438,57 @@ { "name" : "parse_gtpu", "id" : 14, + "parser_ops" : [ + { + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "tmp_2"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "&", + "left" : { + "type" : "field", + "value" : ["ipv4", "dst_addr"] + }, + "right" : { + "type" : "hexstr", + "value" : "0x01ff" + } + } + } + } + ], + "op" : "set" + } + ], + "transitions" : [ + { + "type" : "hexstr", + "value" : "0x0000", + "mask" : null, + "next_state" : "do_parse_gtpu" + }, + { + "value" : "default", + "mask" : null, + "next_state" : null + } + ], + "transition_key" : [ + { + "type" : "field", + "value" : ["scalars", "tmp_2"] + } + ] + }, + { + "name" : "do_parse_gtpu", + "id" : 15, "parser_ops" : [ { "parameters" : [ @@ -1438,7 +1503,7 @@ "parameters" : [ { "type" : "regular", - "value" : "gtpu_ipv4" + "value" : "inner_ipv4" } ], "op" : "extract" @@ -1455,7 +1520,7 @@ "type" : "hexstr", "value" : "0x11", "mask" : null, - "next_state" : "parse_udp_inner" + "next_state" : "parse_inner_udp" }, { "type" : "hexstr", @@ -1472,19 +1537,19 @@ "transition_key" : [ { "type" : "field", - "value" : ["gtpu_ipv4", "protocol"] + "value" : ["inner_ipv4", "protocol"] } ] }, { - "name" : "parse_udp_inner", - "id" : 15, + "name" : "parse_inner_udp", + "id" : 16, "parser_ops" : [ { "parameters" : [ { "type" : "regular", - "value" : "gtpu_udp" + "value" : "inner_udp" } ], "op" : "extract" @@ -1497,7 +1562,7 @@ }, { "type" : "field", - "value" : ["gtpu_udp", "src_port"] + "value" : ["inner_udp", "src_port"] } ], "op" : "set" @@ -1510,7 +1575,7 @@ }, { "type" : "field", - "value" : ["gtpu_udp", "dst_port"] + "value" : ["inner_udp", "dst_port"] } ], "op" : "set" @@ -1519,7 +1584,7 @@ "parameters" : [ { "type" : "field", - "value" : ["scalars", "tmp_2"] + "value" : ["scalars", "tmp_3"] }, { "type" : "expression", @@ -1599,7 +1664,7 @@ "transition_key" : [ { "type" : "field", - "value" : ["scalars", "tmp_2"] + "value" : ["scalars", "tmp_3"] } ] } @@ -1613,7 +1678,7 @@ "id" : 0, "source_info" : { "filename" : "include/parser.p4", - "line" : 212, + "line" : 222, "column" : 8, "source_fragment" : "FabricDeparser" }, @@ -1626,7 +1691,7 @@ "name" : "FabricIngress.spgw_ingress.ue_counter", "id" : 0, "is_direct" : true, - "binding" : "FabricIngress.spgw_ingress.ue_cdr_table" + "binding" : "FabricIngress.spgw_ingress.dl_sess_lookup" }, { "name" : "FabricIngress.process_set_source_sink.counter_set_source", @@ -1841,7 +1906,7 @@ "id" : 1, "source_info" : { "filename" : "include/spgw.p4", - "line" : 292, + "line" : 238, "column" : 8, "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..." }, @@ -2040,13 +2105,13 @@ "primitives" : [] }, { - "name" : "NoAction", + "name" : "nop", "id" : 13, "runtime_data" : [], "primitives" : [] }, { - "name" : "NoAction", + "name" : "nop", "id" : 14, "runtime_data" : [], "primitives" : [] @@ -2057,21 +2122,9 @@ "runtime_data" : [], "primitives" : [] }, - { - "name" : "nop", - "id" : 16, - "runtime_data" : [], - "primitives" : [] - }, - { - "name" : "nop", - "id" : 17, - "runtime_data" : [], - "primitives" : [] - }, { "name" : "drop_now", - "id" : 18, + "id" : 16, "runtime_data" : [], "primitives" : [ { @@ -2098,7 +2151,7 @@ }, { "name" : "FabricIngress.spgw_ingress.gtpu_decap", - "id" : 19, + "id" : 17, "runtime_data" : [], "primitives" : [ { @@ -2111,7 +2164,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 33, + "line" : 54, "column" : 8, "source_fragment" : "gtpu_ipv4.setInvalid()" } @@ -2126,7 +2179,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 34, + "line" : 55, "column" : 8, "source_fragment" : "gtpu_udp.setInvalid()" } @@ -2141,7 +2194,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 35, + "line" : 56, "column" : 8, "source_fragment" : "gtpu.setInvalid()" } @@ -2150,7 +2203,7 @@ }, { "name" : "FabricIngress.spgw_ingress.set_dl_sess_info", - "id" : 20, + "id" : 18, "runtime_data" : [ { "name" : "teid", @@ -2180,7 +2233,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 41, + "line" : 62, "column" : 8, "source_fragment" : "spgw_meta.teid = teid" } @@ -2199,7 +2252,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 42, + "line" : 63, "column" : 8, "source_fragment" : "spgw_meta.s1u_enb_addr = s1u_enb_addr" } @@ -2218,22 +2271,16 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 43, + "line" : 64, "column" : 8, "source_fragment" : "spgw_meta.s1u_sgw_addr = s1u_sgw_addr" } } ] }, - { - "name" : "FabricIngress.spgw_ingress.update_ue_cdr", - "id" : 21, - "runtime_data" : [], - "primitives" : [] - }, { "name" : "FabricIngress.process_set_source_sink.int_set_source", - "id" : 22, + "id" : 19, "runtime_data" : [], "primitives" : [ { @@ -2259,7 +2306,7 @@ }, { "name" : "FabricIngress.process_set_source_sink.int_set_sink", - "id" : 23, + "id" : 20, "runtime_data" : [], "primitives" : [ { @@ -2285,7 +2332,7 @@ }, { "name" : "FabricIngress.filtering.drop", - "id" : 24, + "id" : 21, "runtime_data" : [], "primitives" : [ { @@ -2302,7 +2349,7 @@ }, { "name" : "FabricIngress.filtering.set_vlan", - "id" : 25, + "id" : 22, "runtime_data" : [ { "name" : "new_vlan_id", @@ -2333,7 +2380,7 @@ }, { "name" : "FabricIngress.filtering.push_internal_vlan", - "id" : 26, + "id" : 23, "runtime_data" : [ { "name" : "new_vlan_id", @@ -2427,7 +2474,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 74, + "line" : 89, "column" : 31, "source_fragment" : "0x8100; ..." } @@ -2484,7 +2531,7 @@ }, { "name" : "FabricIngress.filtering.set_forwarding_type", - "id" : 27, + "id" : 24, "runtime_data" : [ { "name" : "fwd_type", @@ -2515,7 +2562,7 @@ }, { "name" : "FabricIngress.forwarding.set_next_id_bridging", - "id" : 28, + "id" : 25, "runtime_data" : [ { "name" : "next_id", @@ -2546,7 +2593,7 @@ }, { "name" : "FabricIngress.forwarding.pop_mpls_and_next", - "id" : 29, + "id" : 26, "runtime_data" : [ { "name" : "next_id", @@ -2592,7 +2639,7 @@ }, { "name" : "FabricIngress.forwarding.set_next_id_unicast_v4", - "id" : 30, + "id" : 27, "runtime_data" : [ { "name" : "next_id", @@ -2623,7 +2670,7 @@ }, { "name" : "FabricIngress.forwarding.set_next_id_acl", - "id" : 31, + "id" : 28, "runtime_data" : [ { "name" : "next_id", @@ -2654,7 +2701,7 @@ }, { "name" : "FabricIngress.forwarding.punt_to_cpu", - "id" : 32, + "id" : 29, "runtime_data" : [], "primitives" : [ { @@ -2690,7 +2737,7 @@ }, { "name" : "FabricIngress.forwarding.clone_to_cpu", - "id" : 33, + "id" : 30, "runtime_data" : [], "primitives" : [ { @@ -2726,7 +2773,7 @@ }, { "name" : "FabricIngress.forwarding.drop", - "id" : 34, + "id" : 31, "runtime_data" : [], "primitives" : [ { @@ -2743,7 +2790,7 @@ }, { "name" : "FabricIngress.forwarding.set_next_id_multicast_v4", - "id" : 35, + "id" : 32, "runtime_data" : [ { "name" : "next_id", @@ -2774,7 +2821,7 @@ }, { "name" : "FabricIngress.forwarding.set_next_id_unicast_v6", - "id" : 36, + "id" : 33, "runtime_data" : [ { "name" : "next_id", @@ -2805,7 +2852,7 @@ }, { "name" : "FabricIngress.forwarding.set_next_id_multicast_v6", - "id" : 37, + "id" : 34, "runtime_data" : [ { "name" : "next_id", @@ -2836,7 +2883,7 @@ }, { "name" : "FabricIngress.next.set_vlan", - "id" : 38, + "id" : 35, "runtime_data" : [ { "name" : "new_vlan_id", @@ -2867,7 +2914,7 @@ }, { "name" : "FabricIngress.next.output_simple", - "id" : 39, + "id" : 36, "runtime_data" : [ { "name" : "port_num", @@ -2898,7 +2945,7 @@ }, { "name" : "FabricIngress.next.set_vlan_output", - "id" : 40, + "id" : 37, "runtime_data" : [ { "name" : "new_vlan_id", @@ -2952,7 +2999,7 @@ }, { "name" : "FabricIngress.next.l3_routing_simple", - "id" : 41, + "id" : 38, "runtime_data" : [ { "name" : "port_num", @@ -3029,7 +3076,7 @@ }, { "name" : "FabricIngress.next.mpls_routing_v4_simple", - "id" : 42, + "id" : 39, "runtime_data" : [ { "name" : "port_num", @@ -3135,7 +3182,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -3211,7 +3258,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -3220,7 +3267,7 @@ }, { "name" : "FabricIngress.next.mpls_routing_v6_simple", - "id" : 43, + "id" : 40, "runtime_data" : [ { "name" : "port_num", @@ -3326,7 +3373,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -3402,7 +3449,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -3411,7 +3458,7 @@ }, { "name" : "FabricIngress.next.l3_routing_vlan", - "id" : 44, + "id" : 41, "runtime_data" : [ { "name" : "port_num", @@ -3511,7 +3558,7 @@ }, { "name" : "FabricIngress.next.l3_routing_hashed", - "id" : 45, + "id" : 42, "runtime_data" : [ { "name" : "port_num", @@ -3588,7 +3635,7 @@ }, { "name" : "FabricIngress.next.mpls_routing_v4_hashed", - "id" : 46, + "id" : 43, "runtime_data" : [ { "name" : "port_num", @@ -3694,7 +3741,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -3770,7 +3817,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -3779,7 +3826,7 @@ }, { "name" : "FabricIngress.next.mpls_routing_v6_hashed", - "id" : 47, + "id" : 44, "runtime_data" : [ { "name" : "port_num", @@ -3885,7 +3932,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -3961,7 +4008,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -3970,7 +4017,7 @@ }, { "name" : "FabricIngress.next.set_mcast_group", - "id" : 48, + "id" : 45, "runtime_data" : [ { "name" : "gid", @@ -4030,8 +4077,216 @@ }, { "name" : "act", + "id" : 46, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "spgw_normalizer_hasReturned_0"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : true + } + } + } + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 30, + "column" : 32, + "source_fragment" : "return" + } + } + ] + }, + { + "name" : "act_0", + "id" : 47, + "runtime_data" : [], + "primitives" : [ + { + "op" : "remove_header", + "parameters" : [ + { + "type" : "header", + "value" : "gtpu_ipv4" + } + ], + "source_info" : { + "filename" : "fabric.p4", + "line" : 52, + "column" : 50, + "source_fragment" : "hdr.gtpu_ipv4" + } + }, + { + "op" : "remove_header", + "parameters" : [ + { + "type" : "header", + "value" : "gtpu_udp" + } + ], + "source_info" : { + "filename" : "fabric.p4", + "line" : 52, + "column" : 65, + "source_fragment" : "hdr.gtpu_udp" + } + }, + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "spgw_normalizer_hasReturned_0"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : false + } + } + } + } + ] + } + ] + }, + { + "name" : "act_1", + "id" : 48, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign_header", + "parameters" : [ + { + "type" : "header", + "value" : "udp" + }, + { + "type" : "header", + "value" : "inner_udp" + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 35, + "column" : 16, + "source_fragment" : "= inner_udp; ..." + } + } + ] + }, + { + "name" : "act_2", "id" : 49, "runtime_data" : [], + "primitives" : [ + { + "op" : "remove_header", + "parameters" : [ + { + "type" : "header", + "value" : "udp" + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 37, + "column" : 12, + "source_fragment" : "udp.setInvalid()" + } + } + ] + }, + { + "name" : "act_3", + "id" : 50, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign_header", + "parameters" : [ + { + "type" : "header", + "value" : "gtpu_ipv4" + }, + { + "type" : "header", + "value" : "ipv4" + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 31, + "column" : 18, + "source_fragment" : "= ipv4; ..." + } + }, + { + "op" : "assign_header", + "parameters" : [ + { + "type" : "header", + "value" : "ipv4" + }, + { + "type" : "header", + "value" : "inner_ipv4" + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 32, + "column" : 13, + "source_fragment" : "= inner_ipv4; ..." + } + }, + { + "op" : "assign_header", + "parameters" : [ + { + "type" : "header", + "value" : "gtpu_udp" + }, + { + "type" : "header", + "value" : "udp" + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 33, + "column" : 17, + "source_fragment" : "= udp; ..." + } + } + ] + }, + { + "name" : "act_4", + "id" : 51, + "runtime_data" : [], "primitives" : [ { "op" : "assign", @@ -4070,8 +4325,94 @@ ] }, { - "name" : "act_0", - "id" : 50, + "name" : "act_5", + "id" : 52, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "spgw_ingress_tmp_1"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : true + } + } + } + } + ] + } + ] + }, + { + "name" : "act_6", + "id" : 53, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "spgw_ingress_tmp_1"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : false + } + } + } + } + ] + } + ] + }, + { + "name" : "act_7", + "id" : 54, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["userMetadata.spgw", "direction"] + }, + { + "type" : "hexstr", + "value" : "0x01" + } + ], + "source_info" : { + "filename" : "include/control/../define.p4", + "line" : 116, + "column" : 36, + "source_fragment" : "2w1; ..." + } + } + ] + }, + { + "name" : "act_8", + "id" : 55, "runtime_data" : [], "primitives" : [ { @@ -4100,8 +4441,8 @@ ] }, { - "name" : "act_1", - "id" : 51, + "name" : "act_9", + "id" : 56, "runtime_data" : [], "primitives" : [ { @@ -4130,8 +4471,8 @@ ] }, { - "name" : "act_2", - "id" : 52, + "name" : "act_10", + "id" : 57, "runtime_data" : [], "primitives" : [ { @@ -4139,82 +4480,25 @@ "parameters" : [ { "type" : "field", - "value" : ["userMetadata.spgw", "s1u_enb_addr"] + "value" : ["userMetadata.spgw", "direction"] }, { - "type" : "field", - "value" : ["ipv4", "src_addr"] + "type" : "hexstr", + "value" : "0x02" } ], "source_info" : { - "filename" : "include/spgw.p4", - "line" : 147, - "column" : 12, - "source_fragment" : "spgw_meta.s1u_enb_addr = ipv4.src_addr" - } - }, - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["userMetadata.spgw", "s1u_sgw_addr"] - }, - { - "type" : "field", - "value" : ["ipv4", "dst_addr"] - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 148, - "column" : 12, - "source_fragment" : "spgw_meta.s1u_sgw_addr = ipv4.dst_addr" - } - }, - { - "op" : "assign_header", - "parameters" : [ - { - "type" : "header", - "value" : "ipv4" - }, - { - "type" : "header", - "value" : "gtpu_ipv4" - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 149, - "column" : 17, - "source_fragment" : "= gtpu_ipv4; ..." - } - }, - { - "op" : "assign_header", - "parameters" : [ - { - "type" : "header", - "value" : "udp" - }, - { - "type" : "header", - "value" : "gtpu_udp" - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 150, - "column" : 16, - "source_fragment" : "= gtpu_udp; ..." + "filename" : "include/control/../define.p4", + "line" : 117, + "column" : 38, + "source_fragment" : "2w2; ..." } } ] }, { - "name" : "act_3", - "id" : 53, + "name" : "act_11", + "id" : 58, "runtime_data" : [], "primitives" : [ { @@ -4222,7 +4506,26 @@ "parameters" : [ { "type" : "field", - "value" : ["userMetadata.spgw", "do_spgw"] + "value" : ["userMetadata.spgw", "direction"] + }, + { + "type" : "hexstr", + "value" : "0x00" + } + ], + "source_info" : { + "filename" : "include/control/../define.p4", + "line" : 115, + "column" : 37, + "source_fragment" : "2w0; ..." + } + }, + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "spgw_ingress_hasReturned_0"] }, { "type" : "expression", @@ -4242,235 +4545,6 @@ "source_info" : { "filename" : "include/spgw.p4", "line" : 154, - "column" : 16, - "source_fragment" : "spgw_meta.do_spgw = true" - } - }, - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["userMetadata.spgw", "direction"] - }, - { - "type" : "hexstr", - "value" : "0x00" - } - ], - "source_info" : { - "filename" : "include/control/../define.p4", - "line" : 106, - "column" : 31, - "source_fragment" : "1w0; ..." - } - } - ] - }, - { - "name" : "act_4", - "id" : 54, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_3"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : true - } - } - } - } - ] - } - ] - }, - { - "name" : "act_5", - "id" : 55, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_3"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : false - } - } - } - } - ] - } - ] - }, - { - "name" : "act_6", - "id" : 56, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["userMetadata.spgw", "do_spgw"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : true - } - } - } - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 158, - "column" : 12, - "source_fragment" : "spgw_meta.do_spgw = true" - } - }, - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["userMetadata.spgw", "direction"] - }, - { - "type" : "hexstr", - "value" : "0x01" - } - ], - "source_info" : { - "filename" : "include/control/../define.p4", - "line" : 107, - "column" : 33, - "source_fragment" : "1w1; ..." - } - } - ] - }, - { - "name" : "act_7", - "id" : 57, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "spgw_ingress_hasReturned_0"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : false - } - } - } - } - ] - }, - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["userMetadata.spgw", "do_spgw"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : false - } - } - } - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 141, - "column" : 8, - "source_fragment" : "spgw_meta.do_spgw = false" - } - } - ] - }, - { - "name" : "act_8", - "id" : 58, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "spgw_ingress_hasReturned_0"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : true - } - } - } - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 164, "column" : 12, "source_fragment" : "return" } @@ -4478,7 +4552,7 @@ ] }, { - "name" : "act_9", + "name" : "act_12", "id" : 59, "runtime_data" : [], "primitives" : [ @@ -4487,37 +4561,7 @@ "parameters" : [ { "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_4"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : true - } - } - } - } - ] - } - ] - }, - { - "name" : "act_10", - "id" : 60, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_4"] + "value" : ["scalars", "spgw_ingress_hasReturned_0"] }, { "type" : "expression", @@ -4538,8 +4582,8 @@ ] }, { - "name" : "act_11", - "id" : 61, + "name" : "act_13", + "id" : 60, "runtime_data" : [], "primitives" : [ { @@ -4556,7 +4600,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 194, + "line" : 171, "column" : 8, "source_fragment" : "spgw_meta.ipv4_len = ipv4.total_len" } @@ -4564,8 +4608,8 @@ ] }, { - "name" : "act_12", - "id" : 62, + "name" : "act_14", + "id" : 61, "runtime_data" : [], "primitives" : [ { @@ -4582,7 +4626,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 77, + "line" : 92, "column" : 31, "source_fragment" : "0x0800; ..." } @@ -4590,8 +4634,8 @@ ] }, { - "name" : "act_13", - "id" : 63, + "name" : "act_15", + "id" : 62, "runtime_data" : [], "primitives" : [ { @@ -4619,69 +4663,9 @@ } ] }, - { - "name" : "act_14", - "id" : 64, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "next_tmp_4"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : true - } - } - } - } - ] - } - ] - }, - { - "name" : "act_15", - "id" : 65, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "next_tmp_4"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : false - } - } - } - } - ] - } - ] - }, { "name" : "act_16", - "id" : 66, + "id" : 63, "runtime_data" : [], "primitives" : [ { @@ -4689,7 +4673,7 @@ "parameters" : [ { "type" : "field", - "value" : ["scalars", "next_tmp_3"] + "value" : ["scalars", "next_tmp_4"] }, { "type" : "expression", @@ -4711,7 +4695,67 @@ }, { "name" : "act_17", - "id" : 67, + "id" : 64, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "next_tmp_4"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : false + } + } + } + } + ] + } + ] + }, + { + "name" : "act_18", + "id" : 65, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "next_tmp_3"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : true + } + } + } + } + ] + } + ] + }, + { + "name" : "act_19", + "id" : 66, "runtime_data" : [], "primitives" : [ { @@ -4740,8 +4784,8 @@ ] }, { - "name" : "act_18", - "id" : 68, + "name" : "act_20", + "id" : 67, "runtime_data" : [], "primitives" : [ { @@ -4770,8 +4814,8 @@ ] }, { - "name" : "act_19", - "id" : 69, + "name" : "act_21", + "id" : 68, "runtime_data" : [], "primitives" : [ { @@ -4800,8 +4844,8 @@ ] }, { - "name" : "act_20", - "id" : 70, + "name" : "act_22", + "id" : 69, "runtime_data" : [], "primitives" : [ { @@ -4836,8 +4880,8 @@ ] }, { - "name" : "act_21", - "id" : 71, + "name" : "act_23", + "id" : 70, "runtime_data" : [], "primitives" : [ { @@ -4885,8 +4929,8 @@ ] }, { - "name" : "act_22", - "id" : 72, + "name" : "act_24", + "id" : 71, "runtime_data" : [], "primitives" : [ { @@ -4934,8 +4978,8 @@ ] }, { - "name" : "act_23", - "id" : 73, + "name" : "act_25", + "id" : 72, "runtime_data" : [], "primitives" : [ { @@ -4943,7 +4987,7 @@ "parameters" : [ { "type" : "field", - "value" : ["scalars", "tmp_3"] + "value" : ["scalars", "tmp_4"] }, { "type" : "expression", @@ -4979,7 +5023,7 @@ }, { "type" : "field", - "value" : ["scalars", "tmp_3"] + "value" : ["scalars", "tmp_4"] } ], "source_info" : { @@ -4992,8 +5036,8 @@ ] }, { - "name" : "act_24", - "id" : 74, + "name" : "act_26", + "id" : 73, "runtime_data" : [], "primitives" : [ { @@ -5001,7 +5045,7 @@ "parameters" : [ { "type" : "field", - "value" : ["scalars", "tmp_4"] + "value" : ["scalars", "tmp_5"] }, { "type" : "expression", @@ -5037,7 +5081,7 @@ }, { "type" : "field", - "value" : ["scalars", "tmp_4"] + "value" : ["scalars", "tmp_5"] } ], "source_info" : { @@ -5050,8 +5094,8 @@ ] }, { - "name" : "act_25", - "id" : 75, + "name" : "act_27", + "id" : 74, "runtime_data" : [], "primitives" : [ { @@ -5069,6 +5113,12 @@ } ] }, + { + "name" : "NoAction", + "id" : 75, + "runtime_data" : [], + "primitives" : [] + }, { "name" : "NoAction", "id" : 76, @@ -5094,16 +5144,37 @@ "primitives" : [] }, { - "name" : "NoAction", + "name" : "nop", "id" : 80, "runtime_data" : [], "primitives" : [] }, { - "name" : "nop", + "name" : "drop_now", "id" : 81, "runtime_data" : [], - "primitives" : [] + "primitives" : [ + { + "op" : "drop", + "parameters" : [], + "source_info" : { + "filename" : "include/control/../action.p4", + "line" : 24, + "column" : 4, + "source_fragment" : "mark_to_drop()" + } + }, + { + "op" : "exit", + "parameters" : [], + "source_info" : { + "filename" : "include/control/../action.p4", + "line" : 25, + "column" : 4, + "source_fragment" : "exit" + } + } + ] }, { "name" : "drop_now", @@ -5132,36 +5203,9 @@ } ] }, - { - "name" : "drop_now", - "id" : 83, - "runtime_data" : [], - "primitives" : [ - { - "op" : "drop", - "parameters" : [], - "source_info" : { - "filename" : "include/control/../action.p4", - "line" : 24, - "column" : 4, - "source_fragment" : "mark_to_drop()" - } - }, - { - "op" : "exit", - "parameters" : [], - "source_info" : { - "filename" : "include/control/../action.p4", - "line" : 25, - "column" : 4, - "source_fragment" : "exit" - } - } - ] - }, { "name" : "FabricEgress.spgw_egress.gtpu_encap", - "id" : 84, + "id" : 83, "runtime_data" : [], "primitives" : [ { @@ -5174,7 +5218,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 209, + "line" : 186, "column" : 8, "source_fragment" : "gtpu_ipv4.setValid()" } @@ -5193,7 +5237,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 210, + "line" : 187, "column" : 8, "source_fragment" : "gtpu_ipv4.version = 4" } @@ -5212,7 +5256,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 86, + "line" : 101, "column" : 28, "source_fragment" : "5; ..." } @@ -5231,7 +5275,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 212, + "line" : 189, "column" : 8, "source_fragment" : "gtpu_ipv4.dscp = 0" } @@ -5250,7 +5294,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 213, + "line" : 190, "column" : 8, "source_fragment" : "gtpu_ipv4.ecn = 0" } @@ -5274,7 +5318,7 @@ "op" : "+", "left" : { "type" : "field", - "value" : ["userMetadata.spgw", "ipv4_len"] + "value" : ["ipv4", "total_len"] }, "right" : { "type" : "hexstr", @@ -5292,9 +5336,9 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 214, + "line" : 191, "column" : 8, - "source_fragment" : "gtpu_ipv4.total_len = spgw_meta.ipv4_len ..." + "source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..." } }, { @@ -5311,7 +5355,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 216, + "line" : 193, "column" : 8, "source_fragment" : "gtpu_ipv4.identification = 0x1513" } @@ -5330,7 +5374,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 217, + "line" : 194, "column" : 8, "source_fragment" : "gtpu_ipv4.flags = 0" } @@ -5349,7 +5393,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 218, + "line" : 195, "column" : 8, "source_fragment" : "gtpu_ipv4.frag_offset = 0" } @@ -5368,7 +5412,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 96, + "line" : 111, "column" : 32, "source_fragment" : "64; ..." } @@ -5387,7 +5431,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 83, + "line" : 98, "column" : 25, "source_fragment" : "17; ..." } @@ -5406,7 +5450,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 221, + "line" : 198, "column" : 8, "source_fragment" : "gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr" } @@ -5425,7 +5469,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 222, + "line" : 199, "column" : 8, "source_fragment" : "gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr" } @@ -5444,7 +5488,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 223, + "line" : 200, "column" : 8, "source_fragment" : "gtpu_ipv4.hdr_checksum = 0" } @@ -5459,7 +5503,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 225, + "line" : 202, "column" : 8, "source_fragment" : "gtpu_udp.setValid()" } @@ -5478,7 +5522,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 226, + "line" : 203, "column" : 8, "source_fragment" : "gtpu_udp.src_port = 2152" } @@ -5497,7 +5541,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 227, + "line" : 204, "column" : 8, "source_fragment" : "gtpu_udp.dst_port = 2152" } @@ -5539,7 +5583,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 228, + "line" : 205, "column" : 8, "source_fragment" : "gtpu_udp.len = spgw_meta.ipv4_len ..." } @@ -5558,7 +5602,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 230, + "line" : 207, "column" : 8, "source_fragment" : "gtpu_udp.checksum = 0" } @@ -5573,7 +5617,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 232, + "line" : 209, "column" : 8, "source_fragment" : "gtpu.setValid()" } @@ -5592,7 +5636,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 233, + "line" : 210, "column" : 8, "source_fragment" : "gtpu.version = 0x01" } @@ -5611,7 +5655,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 234, + "line" : 211, "column" : 8, "source_fragment" : "gtpu.pt = 0x01" } @@ -5630,7 +5674,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 235, + "line" : 212, "column" : 8, "source_fragment" : "gtpu.spare = 0" } @@ -5649,7 +5693,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 236, + "line" : 213, "column" : 8, "source_fragment" : "gtpu.ex_flag = 0" } @@ -5668,7 +5712,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 237, + "line" : 214, "column" : 8, "source_fragment" : "gtpu.seq_flag = 0" } @@ -5687,7 +5731,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 238, + "line" : 215, "column" : 8, "source_fragment" : "gtpu.npdu_flag = 0" } @@ -5706,7 +5750,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 239, + "line" : 216, "column" : 8, "source_fragment" : "gtpu.msgtype = 0xff" } @@ -5725,7 +5769,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 240, + "line" : 217, "column" : 8, "source_fragment" : "gtpu.msglen = spgw_meta.ipv4_len" } @@ -5744,7 +5788,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 241, + "line" : 218, "column" : 8, "source_fragment" : "gtpu.teid = spgw_meta.teid" } @@ -5753,7 +5797,7 @@ }, { "name" : "FabricEgress.process_int_source.int_source_dscp", - "id" : 85, + "id" : 84, "runtime_data" : [ { "name" : "max_hop", @@ -5821,7 +5865,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 120, + "line" : 124, "column" : 35, "source_fragment" : "4; ..." } @@ -6252,7 +6296,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 113, + "line" : 122, "column" : 24, "source_fragment" : "0x1; ..." } @@ -6261,7 +6305,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_update_total_hop_cnt", - "id" : 86, + "id" : 85, "runtime_data" : [], "primitives" : [ { @@ -6310,7 +6354,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_transit", - "id" : 87, + "id" : 86, "runtime_data" : [ { "name" : "switch_id", @@ -6393,13 +6437,13 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i0", - "id" : 88, + "id" : 87, "runtime_data" : [], "primitives" : [] }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i1", - "id" : 89, + "id" : 88, "runtime_data" : [], "primitives" : [ { @@ -6472,7 +6516,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i2", - "id" : 90, + "id" : 89, "runtime_data" : [], "primitives" : [ { @@ -6513,7 +6557,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i3", - "id" : 91, + "id" : 90, "runtime_data" : [], "primitives" : [ { @@ -6620,7 +6664,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i4", - "id" : 92, + "id" : 91, "runtime_data" : [], "primitives" : [ { @@ -6706,7 +6750,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i5", - "id" : 93, + "id" : 92, "runtime_data" : [], "primitives" : [ { @@ -6858,7 +6902,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i6", - "id" : 94, + "id" : 93, "runtime_data" : [], "primitives" : [ { @@ -6978,7 +7022,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i7", - "id" : 95, + "id" : 94, "runtime_data" : [], "primitives" : [ { @@ -7164,7 +7208,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i8", - "id" : 96, + "id" : 95, "runtime_data" : [], "primitives" : [ { @@ -7205,7 +7249,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i9", - "id" : 97, + "id" : 96, "runtime_data" : [], "primitives" : [ { @@ -7312,7 +7356,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i10", - "id" : 98, + "id" : 97, "runtime_data" : [], "primitives" : [ { @@ -7387,7 +7431,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i11", - "id" : 99, + "id" : 98, "runtime_data" : [], "primitives" : [ { @@ -7528,7 +7572,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i12", - "id" : 100, + "id" : 99, "runtime_data" : [], "primitives" : [ { @@ -7648,7 +7692,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i13", - "id" : 101, + "id" : 100, "runtime_data" : [], "primitives" : [ { @@ -7834,7 +7878,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i14", - "id" : 102, + "id" : 101, "runtime_data" : [], "primitives" : [ { @@ -7988,7 +8032,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0003_i15", - "id" : 103, + "id" : 102, "runtime_data" : [], "primitives" : [ { @@ -8208,13 +8252,13 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i0", - "id" : 104, + "id" : 103, "runtime_data" : [], "primitives" : [] }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i1", - "id" : 105, + "id" : 104, "runtime_data" : [], "primitives" : [ { @@ -8255,7 +8299,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i2", - "id" : 106, + "id" : 105, "runtime_data" : [], "primitives" : [ { @@ -8315,7 +8359,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i3", - "id" : 107, + "id" : 106, "runtime_data" : [], "primitives" : [ { @@ -8409,7 +8453,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i4", - "id" : 108, + "id" : 107, "runtime_data" : [], "primitives" : [ { @@ -8473,7 +8517,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i5", - "id" : 109, + "id" : 108, "runtime_data" : [], "primitives" : [ { @@ -8571,7 +8615,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i6", - "id" : 110, + "id" : 109, "runtime_data" : [], "primitives" : [ { @@ -8688,7 +8732,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i7", - "id" : 111, + "id" : 110, "runtime_data" : [], "primitives" : [ { @@ -8839,7 +8883,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i8", - "id" : 112, + "id" : 111, "runtime_data" : [], "primitives" : [ { @@ -8880,7 +8924,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i9", - "id" : 113, + "id" : 112, "runtime_data" : [], "primitives" : [ { @@ -8955,7 +8999,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i10", - "id" : 114, + "id" : 113, "runtime_data" : [], "primitives" : [ { @@ -9049,7 +9093,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i11", - "id" : 115, + "id" : 114, "runtime_data" : [], "primitives" : [ { @@ -9177,7 +9221,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i12", - "id" : 116, + "id" : 115, "runtime_data" : [], "primitives" : [ { @@ -9275,7 +9319,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i13", - "id" : 117, + "id" : 116, "runtime_data" : [], "primitives" : [ { @@ -9407,7 +9451,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i14", - "id" : 118, + "id" : 117, "runtime_data" : [], "primitives" : [ { @@ -9558,7 +9602,7 @@ }, { "name" : "FabricEgress.process_int_transit.int_set_header_0407_i15", - "id" : 119, + "id" : 118, "runtime_data" : [], "primitives" : [ { @@ -9743,7 +9787,7 @@ }, { "name" : "FabricEgress.process_int_outer_encap.int_update_ipv4", - "id" : 120, + "id" : 119, "runtime_data" : [], "primitives" : [ { @@ -9792,7 +9836,7 @@ }, { "name" : "FabricEgress.process_int_outer_encap.int_update_udp", - "id" : 121, + "id" : 120, "runtime_data" : [], "primitives" : [ { @@ -9841,7 +9885,7 @@ }, { "name" : "FabricEgress.process_int_outer_encap.int_update_shim", - "id" : 122, + "id" : 121, "runtime_data" : [], "primitives" : [ { @@ -9900,7 +9944,7 @@ }, { "name" : "FabricEgress.process_int_report.do_report_encapsulation", - "id" : 123, + "id" : 122, "runtime_data" : [ { "name" : "src_mac", @@ -9991,7 +10035,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 77, + "line" : 92, "column" : 31, "source_fragment" : "0x0800; ..." } @@ -10219,7 +10263,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 83, + "line" : 98, "column" : 25, "source_fragment" : "17; ..." } @@ -10434,7 +10478,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 125, + "line" : 129, "column" : 31, "source_fragment" : "0; ..." } @@ -10529,7 +10573,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 129, + "line" : 133, "column" : 21, "source_fragment" : "1; ..." } @@ -10576,7 +10620,7 @@ }, { "name" : "FabricEgress.process_int_sink.restore_header", - "id" : 124, + "id" : 123, "runtime_data" : [], "primitives" : [ { @@ -10634,7 +10678,7 @@ }, { "name" : "FabricEgress.process_int_sink.int_sink", - "id" : 125, + "id" : 124, "runtime_data" : [], "primitives" : [ { @@ -10965,7 +11009,7 @@ }, { "name" : "FabricEgress.pkt_io_egress.pop_vlan", - "id" : 126, + "id" : 125, "runtime_data" : [], "primitives" : [ { @@ -11006,7 +11050,7 @@ }, { "name" : "FabricEgress.egress_next.pop_vlan", - "id" : 127, + "id" : 126, "runtime_data" : [], "primitives" : [ { @@ -11046,8 +11090,8 @@ ] }, { - "name" : "act_26", - "id" : 128, + "name" : "act_28", + "id" : 127, "runtime_data" : [], "primitives" : [ { @@ -11085,58 +11129,6 @@ } } ] - }, - { - "name" : "act_27", - "id" : 129, - "runtime_data" : [], - "primitives" : [ - { - "op" : "remove_header", - "parameters" : [ - { - "type" : "header", - "value" : "gtpu_ipv4" - } - ], - "source_info" : { - "filename" : "fabric.p4", - "line" : 86, - "column" : 36, - "source_fragment" : "hdr.gtpu_ipv4" - } - }, - { - "op" : "remove_header", - "parameters" : [ - { - "type" : "header", - "value" : "gtpu_udp" - } - ], - "source_info" : { - "filename" : "fabric.p4", - "line" : 86, - "column" : 51, - "source_fragment" : "hdr.gtpu_udp" - } - }, - { - "op" : "remove_header", - "parameters" : [ - { - "type" : "header", - "value" : "gtpu" - } - ], - "source_info" : { - "filename" : "fabric.p4", - "line" : 86, - "column" : 65, - "source_fragment" : "hdr.gtpu" - } - } - ] } ], "pipelines" : [ @@ -11149,7 +11141,7 @@ "column" : 8, "source_fragment" : "FabricIngress" }, - "init_table" : "node_2", + "init_table" : "tbl_act", "tables" : [ { "name" : "tbl_act", @@ -11161,14 +11153,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [49], - "actions" : ["act"], - "base_default_next" : null, + "action_ids" : [47], + "actions" : ["act_0"], + "base_default_next" : "node_3", "next_tables" : { - "act" : null + "act_0" : "node_3" }, "default_entry" : { - "action_id" : 49, + "action_id" : 47, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -11184,14 +11176,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [57], - "actions" : ["act_7"], + "action_ids" : [46], + "actions" : ["act"], "base_default_next" : "node_5", "next_tables" : { - "act_7" : "node_5" + "act" : "node_5" }, "default_entry" : { - "action_id" : 57, + "action_id" : 46, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -11207,14 +11199,106 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [52], - "actions" : ["act_2"], - "base_default_next" : "FabricIngress.spgw_ingress.s1u_filter_table", + "action_ids" : [50], + "actions" : ["act_3"], + "base_default_next" : "node_7", "next_tables" : { - "act_2" : "FabricIngress.spgw_ingress.s1u_filter_table" + "act_3" : "node_7" }, "default_entry" : { - "action_id" : 52, + "action_id" : 50, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_2", + "id" : 3, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [48], + "actions" : ["act_1"], + "base_default_next" : "node_10", + "next_tables" : { + "act_1" : "node_10" + }, + "default_entry" : { + "action_id" : 48, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_3", + "id" : 4, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [49], + "actions" : ["act_2"], + "base_default_next" : "node_10", + "next_tables" : { + "act_2" : "node_10" + }, + "default_entry" : { + "action_id" : 49, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_4", + "id" : 5, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [51], + "actions" : ["act_4"], + "base_default_next" : null, + "next_tables" : { + "act_4" : null + }, + "default_entry" : { + "action_id" : 51, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_5", + "id" : 6, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [59], + "actions" : ["act_12"], + "base_default_next" : "node_13", + "next_tables" : { + "act_12" : "node_13" + }, + "default_entry" : { + "action_id" : 59, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -11222,18 +11306,18 @@ }, { "name" : "FabricIngress.spgw_ingress.s1u_filter_table", - "id" : 3, + "id" : 7, "source_info" : { "filename" : "include/spgw.p4", - "line" : 60, + "line" : 79, "column" : 10, "source_fragment" : "s1u_filter_table" }, "key" : [ { "match_type" : "exact", - "name" : "spgw_meta.s1u_sgw_addr", - "target" : ["userMetadata.spgw", "s1u_sgw_addr"], + "name" : "gtpu_ipv4.dst_addr", + "target" : ["gtpu_ipv4", "dst_addr"], "mask" : null } ], @@ -11247,8 +11331,8 @@ "actions" : ["NoAction"], "base_default_next" : null, "next_tables" : { - "__HIT__" : "tbl_act_2", - "__MISS__" : "tbl_act_3" + "__HIT__" : "tbl_act_6", + "__MISS__" : "tbl_act_7" }, "default_entry" : { "action_id" : 1, @@ -11258,8 +11342,8 @@ } }, { - "name" : "tbl_act_2", - "id" : 4, + "name" : "tbl_act_6", + "id" : 8, "key" : [], "match_type" : "exact", "type" : "simple", @@ -11267,45 +11351,22 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [50], - "actions" : ["act_0"], - "base_default_next" : "node_10", + "action_ids" : [52], + "actions" : ["act_5"], + "base_default_next" : "node_17", "next_tables" : { - "act_0" : "node_10" + "act_5" : "node_17" }, "default_entry" : { - "action_id" : 50, + "action_id" : 52, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_act_3", - "id" : 5, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [51], - "actions" : ["act_1"], - "base_default_next" : "node_10", - "next_tables" : { - "act_1" : "node_10" - }, - "default_entry" : { - "action_id" : 51, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_4", - "id" : 6, + "name" : "tbl_act_7", + "id" : 9, "key" : [], "match_type" : "exact", "type" : "simple", @@ -11314,10 +11375,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [53], - "actions" : ["act_3"], + "actions" : ["act_6"], "base_default_next" : "node_17", "next_tables" : { - "act_3" : "node_17" + "act_6" : "node_17" }, "default_entry" : { "action_id" : 53, @@ -11327,90 +11388,7 @@ } }, { - "name" : "FabricIngress.spgw_ingress.ue_filter_table", - "id" : 7, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 50, - "column" : 10, - "source_fragment" : "ue_filter_table" - }, - "key" : [ - { - "match_type" : "lpm", - "name" : "ipv4.dst_addr", - "target" : ["ipv4", "dst_addr"], - "mask" : null - } - ], - "match_type" : "lpm", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [0], - "actions" : ["NoAction"], - "base_default_next" : null, - "next_tables" : { - "__HIT__" : "tbl_act_5", - "__MISS__" : "tbl_act_6" - }, - "default_entry" : { - "action_id" : 0, - "action_const" : false, - "action_data" : [], - "action_entry_const" : false - } - }, - { - "name" : "tbl_act_5", - "id" : 8, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [54], - "actions" : ["act_4"], - "base_default_next" : "node_15", - "next_tables" : { - "act_4" : "node_15" - }, - "default_entry" : { - "action_id" : 54, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_6", - "id" : 9, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [55], - "actions" : ["act_5"], - "base_default_next" : "node_15", - "next_tables" : { - "act_5" : "node_15" - }, - "default_entry" : { - "action_id" : 55, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_7", + "name" : "tbl_drop_now", "id" : 10, "key" : [], "match_type" : "exact", @@ -11419,14 +11397,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [56], - "actions" : ["act_6"], - "base_default_next" : "node_17", + "action_ids" : [16], + "actions" : ["drop_now"], + "base_default_next" : "tbl_act_8", "next_tables" : { - "act_6" : "node_17" + "drop_now" : "tbl_act_8" }, "default_entry" : { - "action_id" : 56, + "action_id" : 16, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -11442,14 +11420,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [58], - "actions" : ["act_8"], - "base_default_next" : "node_19", + "action_ids" : [54], + "actions" : ["act_7"], + "base_default_next" : "tbl_spgw_ingress_gtpu_decap", "next_tables" : { - "act_8" : "node_19" + "act_7" : "tbl_spgw_ingress_gtpu_decap" }, "default_entry" : { - "action_id" : 58, + "action_id" : 54, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -11465,14 +11443,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [19], + "action_ids" : [17], "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"], - "base_default_next" : "node_22", + "base_default_next" : "node_27", "next_tables" : { - "FabricIngress.spgw_ingress.gtpu_decap" : "node_22" + "FabricIngress.spgw_ingress.gtpu_decap" : "node_27" }, "default_entry" : { - "action_id" : 19, + "action_id" : 17, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -11483,7 +11461,7 @@ "id" : 13, "source_info" : { "filename" : "include/spgw.p4", - "line" : 119, + "line" : 68, "column" : 10, "source_fragment" : "dl_sess_lookup" }, @@ -11498,131 +11476,117 @@ "match_type" : "exact", "type" : "simple", "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [20, 2], - "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"], - "base_default_next" : null, - "next_tables" : { - "__HIT__" : "tbl_act_9", - "__MISS__" : "tbl_act_10" - }, - "default_entry" : { - "action_id" : 2, - "action_const" : false, - "action_data" : [], - "action_entry_const" : false - } - }, - { - "name" : "tbl_act_9", - "id" : 14, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [59], - "actions" : ["act_9"], - "base_default_next" : "node_26", - "next_tables" : { - "act_9" : "node_26" - }, - "default_entry" : { - "action_id" : 59, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_10", - "id" : 15, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [60], - "actions" : ["act_10"], - "base_default_next" : "node_26", - "next_tables" : { - "act_10" : "node_26" - }, - "default_entry" : { - "action_id" : 60, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_drop_now", - "id" : 16, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [18], - "actions" : ["drop_now"], - "base_default_next" : "FabricIngress.spgw_ingress.ue_cdr_table", - "next_tables" : { - "drop_now" : "FabricIngress.spgw_ingress.ue_cdr_table" - }, - "default_entry" : { - "action_id" : 18, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "FabricIngress.spgw_ingress.ue_cdr_table", - "id" : 17, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 129, - "column" : 10, - "source_fragment" : "ue_cdr_table" - }, - "key" : [ - { - "match_type" : "exact", - "name" : "ipv4.dst_addr", - "target" : ["ipv4", "dst_addr"], - "mask" : null - } - ], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [21, 3], - "actions" : ["FabricIngress.spgw_ingress.update_ue_cdr", "NoAction"], - "base_default_next" : "tbl_act_11", + "action_ids" : [18, 0], + "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"], + "base_default_next" : null, "next_tables" : { - "FabricIngress.spgw_ingress.update_ue_cdr" : "tbl_act_11", - "NoAction" : "tbl_act_11" + "__HIT__" : "tbl_act_9", + "__MISS__" : "tbl_act_10" }, "default_entry" : { - "action_id" : 3, + "action_id" : 0, "action_const" : false, "action_data" : [], "action_entry_const" : false } }, + { + "name" : "tbl_act_9", + "id" : 14, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [55], + "actions" : ["act_8"], + "base_default_next" : "node_24", + "next_tables" : { + "act_8" : "node_24" + }, + "default_entry" : { + "action_id" : 55, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_10", + "id" : 15, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [56], + "actions" : ["act_9"], + "base_default_next" : "node_24", + "next_tables" : { + "act_9" : "node_24" + }, + "default_entry" : { + "action_id" : 56, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, { "name" : "tbl_act_11", + "id" : 16, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [57], + "actions" : ["act_10"], + "base_default_next" : "node_27", + "next_tables" : { + "act_10" : "node_27" + }, + "default_entry" : { + "action_id" : 57, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_12", + "id" : 17, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [58], + "actions" : ["act_11"], + "base_default_next" : "node_27", + "next_tables" : { + "act_11" : "node_27" + }, + "default_entry" : { + "action_id" : 58, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_13", "id" : 18, "key" : [], "match_type" : "exact", @@ -11631,14 +11595,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [61], - "actions" : ["act_11"], + "action_ids" : [60], + "actions" : ["act_13"], "base_default_next" : "FabricIngress.filtering.ingress_port_vlan", "next_tables" : { - "act_11" : "FabricIngress.filtering.ingress_port_vlan" + "act_13" : "FabricIngress.filtering.ingress_port_vlan" }, "default_entry" : { - "action_id" : 61, + "action_id" : 60, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -11679,7 +11643,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [26, 25, 15, 24], + "action_ids" : [23, 22, 13, 21], "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "nop", "FabricIngress.filtering.drop"], "base_default_next" : "FabricIngress.filtering.fwd_classifier", "next_tables" : { @@ -11689,7 +11653,7 @@ "FabricIngress.filtering.drop" : "FabricIngress.filtering.fwd_classifier" }, "default_entry" : { - "action_id" : 15, + "action_id" : 13, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -11730,14 +11694,14 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [27], + "action_ids" : [24], "actions" : ["FabricIngress.filtering.set_forwarding_type"], - "base_default_next" : "node_32", + "base_default_next" : "node_31", "next_tables" : { - "FabricIngress.filtering.set_forwarding_type" : "node_32" + "FabricIngress.filtering.set_forwarding_type" : "node_31" }, "default_entry" : { - "action_id" : 27, + "action_id" : 24, "action_const" : true, "action_data" : ["0x0"], "action_entry_const" : true @@ -11772,7 +11736,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [28, 6], + "action_ids" : [25, 4], "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"], "base_default_next" : "FabricIngress.forwarding.acl", "next_tables" : { @@ -11780,7 +11744,7 @@ "NoAction" : "FabricIngress.forwarding.acl" }, "default_entry" : { - "action_id" : 6, + "action_id" : 4, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -11809,22 +11773,22 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [29, 7], + "action_ids" : [26, 5], "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"], - "base_default_next" : "tbl_act_12", + "base_default_next" : "tbl_act_14", "next_tables" : { - "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_12", - "NoAction" : "tbl_act_12" + "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_14", + "NoAction" : "tbl_act_14" }, "default_entry" : { - "action_id" : 7, + "action_id" : 5, "action_const" : false, "action_data" : [], "action_entry_const" : false } }, { - "name" : "tbl_act_12", + "name" : "tbl_act_14", "id" : 23, "key" : [], "match_type" : "exact", @@ -11833,14 +11797,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [62], - "actions" : ["act_12"], + "action_ids" : [61], + "actions" : ["act_14"], "base_default_next" : "FabricIngress.forwarding.acl", "next_tables" : { - "act_12" : "FabricIngress.forwarding.acl" + "act_14" : "FabricIngress.forwarding.acl" }, "default_entry" : { - "action_id" : 62, + "action_id" : 61, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -11869,7 +11833,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [30, 8], + "action_ids" : [27, 6], "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"], "base_default_next" : "FabricIngress.forwarding.acl", "next_tables" : { @@ -11877,7 +11841,7 @@ "NoAction" : "FabricIngress.forwarding.acl" }, "default_entry" : { - "action_id" : 8, + "action_id" : 6, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -11912,7 +11876,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [35, 9], + "action_ids" : [32, 7], "actions" : ["FabricIngress.forwarding.set_next_id_multicast_v4", "NoAction"], "base_default_next" : "FabricIngress.forwarding.acl", "next_tables" : { @@ -11920,7 +11884,7 @@ "NoAction" : "FabricIngress.forwarding.acl" }, "default_entry" : { - "action_id" : 9, + "action_id" : 7, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -11949,7 +11913,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [36, 10], + "action_ids" : [33, 8], "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v6", "NoAction"], "base_default_next" : "FabricIngress.forwarding.acl", "next_tables" : { @@ -11957,7 +11921,7 @@ "NoAction" : "FabricIngress.forwarding.acl" }, "default_entry" : { - "action_id" : 10, + "action_id" : 8, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -11992,7 +11956,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [37, 11], + "action_ids" : [34, 9], "actions" : ["FabricIngress.forwarding.set_next_id_multicast_v6", "NoAction"], "base_default_next" : "FabricIngress.forwarding.acl", "next_tables" : { @@ -12000,7 +11964,7 @@ "NoAction" : "FabricIngress.forwarding.acl" }, "default_entry" : { - "action_id" : 11, + "action_id" : 9, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -12095,25 +12059,25 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [31, 32, 33, 34, 16], + "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"], - "base_default_next" : "tbl_act_13", + "base_default_next" : "tbl_act_15", "next_tables" : { - "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_13", - "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_13", - "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_13", - "FabricIngress.forwarding.drop" : "tbl_act_13", - "nop" : "tbl_act_13" + "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" }, "default_entry" : { - "action_id" : 16, + "action_id" : 14, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_act_13", + "name" : "tbl_act_15", "id" : 29, "key" : [], "match_type" : "exact", @@ -12122,14 +12086,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [63], - "actions" : ["act_13"], + "action_ids" : [62], + "actions" : ["act_15"], "base_default_next" : "FabricIngress.next.vlan_meta", "next_tables" : { - "act_13" : "FabricIngress.next.vlan_meta" + "act_15" : "FabricIngress.next.vlan_meta" }, "default_entry" : { - "action_id" : 63, + "action_id" : 62, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -12158,7 +12122,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [38, 17], + "action_ids" : [35, 15], "actions" : ["FabricIngress.next.set_vlan", "nop"], "base_default_next" : "FabricIngress.next.simple", "next_tables" : { @@ -12166,7 +12130,7 @@ "nop" : "FabricIngress.next.simple" }, "default_entry" : { - "action_id" : 17, + "action_id" : 15, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -12195,22 +12159,22 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [39, 40, 41, 42, 43, 44, 12], + "action_ids" : [36, 37, 38, 39, 40, 41, 10], "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"], "base_default_next" : null, "next_tables" : { - "__HIT__" : "tbl_act_14", - "__MISS__" : "tbl_act_15" + "__HIT__" : "tbl_act_16", + "__MISS__" : "tbl_act_17" }, "default_entry" : { - "action_id" : 12, + "action_id" : 10, "action_const" : false, "action_data" : [], "action_entry_const" : false } }, { - "name" : "tbl_act_14", + "name" : "tbl_act_16", "id" : 32, "key" : [], "match_type" : "exact", @@ -12219,21 +12183,21 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [64], - "actions" : ["act_14"], - "base_default_next" : "node_51", + "action_ids" : [63], + "actions" : ["act_16"], + "base_default_next" : "node_50", "next_tables" : { - "act_14" : "node_51" + "act_16" : "node_50" }, "default_entry" : { - "action_id" : 64, + "action_id" : 63, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_act_15", + "name" : "tbl_act_17", "id" : 33, "key" : [], "match_type" : "exact", @@ -12242,14 +12206,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [65], - "actions" : ["act_15"], - "base_default_next" : "node_51", + "action_ids" : [64], + "actions" : ["act_17"], + "base_default_next" : "node_50", "next_tables" : { - "act_15" : "node_51" + "act_17" : "node_50" }, "default_entry" : { - "action_id" : 65, + "action_id" : 64, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -12279,16 +12243,16 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [45, 46, 47, 13], + "action_ids" : [42, 43, 44, 11], "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"], "base_default_next" : null, "next_tables" : { - "__HIT__" : "tbl_act_16", - "__MISS__" : "tbl_act_17" + "__HIT__" : "tbl_act_18", + "__MISS__" : "tbl_act_19" } }, { - "name" : "tbl_act_16", + "name" : "tbl_act_18", "id" : 35, "key" : [], "match_type" : "exact", @@ -12297,21 +12261,21 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [66], - "actions" : ["act_16"], - "base_default_next" : "node_55", + "action_ids" : [65], + "actions" : ["act_18"], + "base_default_next" : "node_54", "next_tables" : { - "act_16" : "node_55" + "act_18" : "node_54" }, "default_entry" : { - "action_id" : 66, + "action_id" : 65, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_act_17", + "name" : "tbl_act_19", "id" : 36, "key" : [], "match_type" : "exact", @@ -12320,14 +12284,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [67], - "actions" : ["act_17"], - "base_default_next" : "node_55", + "action_ids" : [66], + "actions" : ["act_19"], + "base_default_next" : "node_54", "next_tables" : { - "act_17" : "node_55" + "act_19" : "node_54" }, "default_entry" : { - "action_id" : 67, + "action_id" : 66, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -12356,22 +12320,22 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [48, 14], + "action_ids" : [45, 12], "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"], "base_default_next" : null, "next_tables" : { - "__HIT__" : "tbl_act_18", - "__MISS__" : "tbl_act_19" + "__HIT__" : "tbl_act_20", + "__MISS__" : "tbl_act_21" }, "default_entry" : { - "action_id" : 14, + "action_id" : 12, "action_const" : false, "action_data" : [], "action_entry_const" : false } }, { - "name" : "tbl_act_18", + "name" : "tbl_act_20", "id" : 38, "key" : [], "match_type" : "exact", @@ -12380,11 +12344,34 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [68], - "actions" : ["act_18"], - "base_default_next" : "node_59", + "action_ids" : [67], + "actions" : ["act_20"], + "base_default_next" : "node_58", "next_tables" : { - "act_18" : "node_59" + "act_20" : "node_58" + }, + "default_entry" : { + "action_id" : 67, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_21", + "id" : 39, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [68], + "actions" : ["act_21"], + "base_default_next" : "node_58", + "next_tables" : { + "act_21" : "node_58" }, "default_entry" : { "action_id" : 68, @@ -12394,8 +12381,8 @@ } }, { - "name" : "tbl_act_19", - "id" : 39, + "name" : "tbl_act_22", + "id" : 40, "key" : [], "match_type" : "exact", "type" : "simple", @@ -12404,10 +12391,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [69], - "actions" : ["act_19"], - "base_default_next" : "node_59", + "actions" : ["act_22"], + "base_default_next" : "node_60", "next_tables" : { - "act_19" : "node_59" + "act_22" : "node_60" }, "default_entry" : { "action_id" : 69, @@ -12417,8 +12404,8 @@ } }, { - "name" : "tbl_act_20", - "id" : 40, + "name" : "tbl_act_23", + "id" : 41, "key" : [], "match_type" : "exact", "type" : "simple", @@ -12427,10 +12414,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [70], - "actions" : ["act_20"], - "base_default_next" : "node_61", + "actions" : ["act_23"], + "base_default_next" : "node_66", "next_tables" : { - "act_20" : "node_61" + "act_23" : "node_66" }, "default_entry" : { "action_id" : 70, @@ -12440,8 +12427,8 @@ } }, { - "name" : "tbl_act_21", - "id" : 41, + "name" : "tbl_act_24", + "id" : 42, "key" : [], "match_type" : "exact", "type" : "simple", @@ -12450,10 +12437,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [71], - "actions" : ["act_21"], - "base_default_next" : "node_67", + "actions" : ["act_24"], + "base_default_next" : "node_66", "next_tables" : { - "act_21" : "node_67" + "act_24" : "node_66" }, "default_entry" : { "action_id" : 71, @@ -12463,8 +12450,8 @@ } }, { - "name" : "tbl_act_22", - "id" : 42, + "name" : "tbl_act_25", + "id" : 43, "key" : [], "match_type" : "exact", "type" : "simple", @@ -12473,10 +12460,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [72], - "actions" : ["act_22"], - "base_default_next" : "node_67", + "actions" : ["act_25"], + "base_default_next" : "node_68", "next_tables" : { - "act_22" : "node_67" + "act_25" : "node_68" }, "default_entry" : { "action_id" : 72, @@ -12486,30 +12473,7 @@ } }, { - "name" : "tbl_act_23", - "id" : 43, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [73], - "actions" : ["act_23"], - "base_default_next" : "node_69", - "next_tables" : { - "act_23" : "node_69" - }, - "default_entry" : { - "action_id" : 73, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_24", + "name" : "tbl_act_26", "id" : 44, "key" : [], "match_type" : "exact", @@ -12518,14 +12482,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [74], - "actions" : ["act_24"], + "action_ids" : [73], + "actions" : ["act_26"], "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source", "next_tables" : { - "act_24" : "FabricIngress.process_set_source_sink.tb_set_source" + "act_26" : "FabricIngress.process_set_source_sink.tb_set_source" }, "default_entry" : { - "action_id" : 74, + "action_id" : 73, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -12554,7 +12518,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [22, 4], + "action_ids" : [19, 2], "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"], "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink", "next_tables" : { @@ -12562,7 +12526,7 @@ "NoAction" : "FabricIngress.process_set_source_sink.tb_set_sink" }, "default_entry" : { - "action_id" : 4, + "action_id" : 2, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -12591,22 +12555,22 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [23, 5], + "action_ids" : [20, 3], "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "NoAction"], - "base_default_next" : "node_73", + "base_default_next" : "node_72", "next_tables" : { - "FabricIngress.process_set_source_sink.int_set_sink" : "node_73", - "NoAction" : "node_73" + "FabricIngress.process_set_source_sink.int_set_sink" : "node_72", + "NoAction" : "node_72" }, "default_entry" : { - "action_id" : 5, + "action_id" : 3, "action_const" : false, "action_data" : [], "action_entry_const" : false } }, { - "name" : "tbl_act_25", + "name" : "tbl_act_27", "id" : 47, "key" : [], "match_type" : "exact", @@ -12615,14 +12579,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [75], - "actions" : ["act_25"], + "action_ids" : [74], + "actions" : ["act_27"], "base_default_next" : null, "next_tables" : { - "act_25" : null + "act_27" : null }, "default_entry" : { - "action_id" : 75, + "action_id" : 74, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -12663,8 +12627,85 @@ ], "conditionals" : [ { - "name" : "node_2", + "name" : "node_3", "id" : 0, + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 30, + "column" : 12, + "source_fragment" : "! is_gtpu_encapped" + }, + "expression" : { + "type" : "expression", + "value" : { + "op" : "not", + "left" : null, + "right" : { + "type" : "expression", + "value" : { + "op" : "d2b", + "left" : null, + "right" : { + "type" : "field", + "value" : ["gtpu", "$valid$"] + } + } + } + } + }, + "true_next" : "tbl_act_0", + "false_next" : "node_5" + }, + { + "name" : "node_5", + "id" : 1, + "expression" : { + "type" : "expression", + "value" : { + "op" : "not", + "left" : null, + "right" : { + "type" : "expression", + "value" : { + "op" : "d2b", + "left" : null, + "right" : { + "type" : "field", + "value" : ["scalars", "spgw_normalizer_hasReturned_0"] + } + } + } + } + }, + "true_next" : "tbl_act_1", + "false_next" : "node_10" + }, + { + "name" : "node_7", + "id" : 2, + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 34, + "column" : 12, + "source_fragment" : "inner_udp.isValid()" + }, + "expression" : { + "type" : "expression", + "value" : { + "op" : "d2b", + "left" : null, + "right" : { + "type" : "field", + "value" : ["inner_udp", "$valid$"] + } + } + }, + "true_next" : "tbl_act_2", + "false_next" : "tbl_act_3" + }, + { + "name" : "node_10", + "id" : 3, "source_info" : { "filename" : "include/control/packetio.p4", "line" : 25, @@ -12682,15 +12723,15 @@ } } }, - "true_next" : "tbl_act", - "false_next" : "tbl_act_0" + "true_next" : "tbl_act_4", + "false_next" : "tbl_act_5" }, { - "name" : "node_5", - "id" : 1, + "name" : "node_13", + "id" : 4, "source_info" : { "filename" : "include/spgw.p4", - "line" : 142, + "line" : 139, "column" : 12, "source_fragment" : "gtpu.isValid()" }, @@ -12705,12 +12746,42 @@ } } }, - "true_next" : "tbl_act_1", - "false_next" : "FabricIngress.spgw_ingress.ue_filter_table" + "true_next" : "FabricIngress.spgw_ingress.s1u_filter_table", + "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup" }, { - "name" : "node_10", - "id" : 2, + "name" : "node_17", + "id" : 5, + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 143, + "column" : 16, + "source_fragment" : "!s1u_filter_table.apply().hit" + }, + "expression" : { + "type" : "expression", + "value" : { + "op" : "not", + "left" : null, + "right" : { + "type" : "expression", + "value" : { + "op" : "d2b", + "left" : null, + "right" : { + "type" : "field", + "value" : ["scalars", "spgw_ingress_tmp_1"] + } + } + } + } + }, + "true_next" : "tbl_drop_now", + "false_next" : "tbl_act_8" + }, + { + "name" : "node_24", + "id" : 6, "expression" : { "type" : "expression", "value" : { @@ -12722,62 +12793,12 @@ } } }, - "true_next" : "tbl_act_4", - "false_next" : "node_17" + "true_next" : "tbl_act_11", + "false_next" : "tbl_act_12" }, { - "name" : "node_15", - "id" : 3, - "expression" : { - "type" : "expression", - "value" : { - "op" : "d2b", - "left" : null, - "right" : { - "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_3"] - } - } - }, - "true_next" : "tbl_act_7", - "false_next" : "node_17" - }, - { - "name" : "node_17", - "id" : 4, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 162, - "column" : 12, - "source_fragment" : "spgw_meta.do_spgw == false" - }, - "expression" : { - "type" : "expression", - "value" : { - "op" : "==", - "left" : { - "type" : "expression", - "value" : { - "op" : "d2b", - "left" : null, - "right" : { - "type" : "field", - "value" : ["userMetadata.spgw", "do_spgw"] - } - } - }, - "right" : { - "type" : "bool", - "value" : false - } - } - }, - "true_next" : "tbl_act_8", - "false_next" : "node_19" - }, - { - "name" : "node_19", - "id" : 5, + "name" : "node_27", + "id" : 7, "expression" : { "type" : "expression", "value" : { @@ -12796,94 +12817,12 @@ } } }, - "true_next" : "node_20", + "true_next" : "tbl_act_13", "false_next" : "FabricIngress.filtering.ingress_port_vlan" }, { - "name" : "node_20", - "id" : 6, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 167, - "column" : 12, - "source_fragment" : "spgw_meta.direction == DIR_UPLINK" - }, - "expression" : { - "type" : "expression", - "value" : { - "op" : "==", - "left" : { - "type" : "field", - "value" : ["userMetadata.spgw", "direction"] - }, - "right" : { - "type" : "hexstr", - "value" : "0x00" - } - } - }, - "true_next" : "tbl_spgw_ingress_gtpu_decap", - "false_next" : "node_22" - }, - { - "name" : "node_22", - "id" : 7, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 184, - "column" : 12, - "source_fragment" : "spgw_meta.direction == DIR_DOWNLINK" - }, - "expression" : { - "type" : "expression", - "value" : { - "op" : "==", - "left" : { - "type" : "field", - "value" : ["userMetadata.spgw", "direction"] - }, - "right" : { - "type" : "hexstr", - "value" : "0x01" - } - } - }, - "true_next" : "FabricIngress.spgw_ingress.dl_sess_lookup", - "false_next" : "tbl_act_11" - }, - { - "name" : "node_26", + "name" : "node_31", "id" : 8, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 185, - "column" : 16, - "source_fragment" : "!dl_sess_lookup.apply().hit" - }, - "expression" : { - "type" : "expression", - "value" : { - "op" : "not", - "left" : null, - "right" : { - "type" : "expression", - "value" : { - "op" : "d2b", - "left" : null, - "right" : { - "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_4"] - } - } - } - } - }, - "true_next" : "tbl_drop_now", - "false_next" : "FabricIngress.spgw_ingress.ue_cdr_table" - }, - { - "name" : "node_32", - "id" : 9, "source_info" : { "filename" : "include/control/forwarding.p4", "line" : 231, @@ -12905,11 +12844,11 @@ } }, "true_next" : "FabricIngress.forwarding.bridging", - "false_next" : "node_34" + "false_next" : "node_33" }, { - "name" : "node_34", - "id" : 10, + "name" : "node_33", + "id" : 9, "source_info" : { "filename" : "include/control/forwarding.p4", "line" : 232, @@ -12931,11 +12870,11 @@ } }, "true_next" : "FabricIngress.forwarding.mpls", - "false_next" : "node_37" + "false_next" : "node_36" }, { - "name" : "node_37", - "id" : 11, + "name" : "node_36", + "id" : 10, "source_info" : { "filename" : "include/control/forwarding.p4", "line" : 238, @@ -12957,11 +12896,11 @@ } }, "true_next" : "FabricIngress.forwarding.unicast_v4", - "false_next" : "node_39" + "false_next" : "node_38" }, { - "name" : "node_39", - "id" : 12, + "name" : "node_38", + "id" : 11, "source_info" : { "filename" : "include/control/forwarding.p4", "line" : 240, @@ -12983,11 +12922,11 @@ } }, "true_next" : "FabricIngress.forwarding.multicast_v4", - "false_next" : "node_41" + "false_next" : "node_40" }, { - "name" : "node_41", - "id" : 13, + "name" : "node_40", + "id" : 12, "source_info" : { "filename" : "include/control/forwarding.p4", "line" : 243, @@ -13009,11 +12948,11 @@ } }, "true_next" : "FabricIngress.forwarding.unicast_v6", - "false_next" : "node_43" + "false_next" : "node_42" }, { - "name" : "node_43", - "id" : 14, + "name" : "node_42", + "id" : 13, "source_info" : { "filename" : "include/control/forwarding.p4", "line" : 245, @@ -13038,8 +12977,8 @@ "false_next" : "FabricIngress.forwarding.acl" }, { - "name" : "node_51", - "id" : 15, + "name" : "node_50", + "id" : 14, "source_info" : { "filename" : "include/control/next.p4", "line" : 219, @@ -13065,11 +13004,11 @@ } }, "true_next" : "FabricIngress.next.hashed", - "false_next" : "node_61" + "false_next" : "node_60" }, { - "name" : "node_55", - "id" : 16, + "name" : "node_54", + "id" : 15, "source_info" : { "filename" : "include/control/next.p4", "line" : 220, @@ -13095,11 +13034,11 @@ } }, "true_next" : "FabricIngress.next.multicast", - "false_next" : "node_61" + "false_next" : "node_60" }, { - "name" : "node_59", - "id" : 17, + "name" : "node_58", + "id" : 16, "source_info" : { "filename" : "include/control/next.p4", "line" : 221, @@ -13124,12 +13063,12 @@ } } }, - "true_next" : "tbl_act_20", - "false_next" : "node_61" + "true_next" : "tbl_act_22", + "false_next" : "node_60" }, { - "name" : "node_61", - "id" : 18, + "name" : "node_60", + "id" : 17, "expression" : { "type" : "expression", "value" : { @@ -13148,12 +13087,12 @@ } } }, - "true_next" : "node_62", - "false_next" : "node_67" + "true_next" : "node_61", + "false_next" : "node_66" }, { - "name" : "node_62", - "id" : 19, + "name" : "node_61", + "id" : 18, "source_info" : { "filename" : "include/control/next.p4", "line" : 228, @@ -13178,12 +13117,12 @@ } } }, - "true_next" : "node_63", - "false_next" : "node_67" + "true_next" : "node_62", + "false_next" : "node_66" }, { - "name" : "node_63", - "id" : 20, + "name" : "node_62", + "id" : 19, "source_info" : { "filename" : "include/control/next.p4", "line" : 229, @@ -13201,12 +13140,12 @@ } } }, - "true_next" : "tbl_act_21", - "false_next" : "node_65" + "true_next" : "tbl_act_23", + "false_next" : "node_64" }, { - "name" : "node_65", - "id" : 21, + "name" : "node_64", + "id" : 20, "source_info" : { "filename" : "include/control/next.p4", "line" : 233, @@ -13224,12 +13163,12 @@ } } }, - "true_next" : "tbl_act_22", - "false_next" : "node_67" + "true_next" : "tbl_act_24", + "false_next" : "node_66" }, { - "name" : "node_67", - "id" : 22, + "name" : "node_66", + "id" : 21, "source_info" : { "filename" : "include/control/port_counter.p4", "line" : 27, @@ -13250,12 +13189,12 @@ } } }, - "true_next" : "tbl_act_23", - "false_next" : "node_69" + "true_next" : "tbl_act_25", + "false_next" : "node_68" }, { - "name" : "node_69", - "id" : 23, + "name" : "node_68", + "id" : 22, "source_info" : { "filename" : "include/control/port_counter.p4", "line" : 30, @@ -13276,15 +13215,15 @@ } } }, - "true_next" : "tbl_act_24", + "true_next" : "tbl_act_26", "false_next" : "FabricIngress.process_set_source_sink.tb_set_source" }, { - "name" : "node_73", - "id" : 24, + "name" : "node_72", + "id" : 23, "source_info" : { "filename" : "fabric.p4", - "line" : 66, + "line" : 70, "column" : 11, "source_fragment" : "fabric_metadata.int_meta.sink == 1" }, @@ -13303,7 +13242,7 @@ } }, "false_next" : null, - "true_next" : "tbl_act_25" + "true_next" : "tbl_act_27" } ] }, @@ -13312,11 +13251,11 @@ "id" : 1, "source_info" : { "filename" : "fabric.p4", - "line" : 76, + "line" : 80, "column" : 8, "source_fragment" : "FabricEgress" }, - "init_table" : "node_77", + "init_table" : "node_76", "tables" : [ { "name" : "tbl_drop_now_0", @@ -13328,14 +13267,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [82], + "action_ids" : [81], "actions" : ["drop_now"], "base_default_next" : "FabricEgress.egress_next.egress_vlan", "next_tables" : { "drop_now" : "FabricEgress.egress_next.egress_vlan" }, "default_entry" : { - "action_id" : 82, + "action_id" : 81, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -13370,15 +13309,15 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [127, 81], + "action_ids" : [126, 80], "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"], - "base_default_next" : "node_80", + "base_default_next" : "node_79", "next_tables" : { - "FabricEgress.egress_next.pop_vlan" : "node_80", - "nop" : "node_80" + "FabricEgress.egress_next.pop_vlan" : "node_79", + "nop" : "node_79" }, "default_entry" : { - "action_id" : 81, + "action_id" : 80, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -13394,14 +13333,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [126], + "action_ids" : [125], "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"], - "base_default_next" : "node_83", + "base_default_next" : "node_82", "next_tables" : { - "FabricEgress.pkt_io_egress.pop_vlan" : "node_83" + "FabricEgress.pkt_io_egress.pop_vlan" : "node_82" }, "default_entry" : { - "action_id" : 126, + "action_id" : 125, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -13417,11 +13356,57 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [83], + "action_ids" : [82], "actions" : ["drop_now"], - "base_default_next" : "tbl_act_26", + "base_default_next" : "tbl_act_28", "next_tables" : { - "drop_now" : "tbl_act_26" + "drop_now" : "tbl_act_28" + }, + "default_entry" : { + "action_id" : 82, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_28", + "id" : 52, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [127], + "actions" : ["act_28"], + "base_default_next" : "node_85", + "next_tables" : { + "act_28" : "node_85" + }, + "default_entry" : { + "action_id" : 127, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_spgw_egress_gtpu_encap", + "id" : 53, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [83], + "actions" : ["FabricEgress.spgw_egress.gtpu_encap"], + "base_default_next" : "node_87", + "next_tables" : { + "FabricEgress.spgw_egress.gtpu_encap" : "node_87" }, "default_entry" : { "action_id" : 83, @@ -13430,78 +13415,9 @@ "action_entry_const" : true } }, - { - "name" : "tbl_act_26", - "id" : 52, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [128], - "actions" : ["act_26"], - "base_default_next" : "tbl_act_27", - "next_tables" : { - "act_26" : "tbl_act_27" - }, - "default_entry" : { - "action_id" : 128, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_27", - "id" : 53, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [129], - "actions" : ["act_27"], - "base_default_next" : "node_87", - "next_tables" : { - "act_27" : "node_87" - }, - "default_entry" : { - "action_id" : 129, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_spgw_egress_gtpu_encap", - "id" : 54, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [84], - "actions" : ["FabricEgress.spgw_egress.gtpu_encap"], - "base_default_next" : "node_89", - "next_tables" : { - "FabricEgress.spgw_egress.gtpu_encap" : "node_89" - }, - "default_entry" : { - "action_id" : 84, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, { "name" : "FabricEgress.process_int_source.tb_int_source", - "id" : 55, + "id" : 54, "source_info" : { "filename" : "include/int_source.p4", "line" : 66, @@ -13540,15 +13456,15 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [85, 76], + "action_ids" : [84, 75], "actions" : ["FabricEgress.process_int_source.int_source_dscp", "NoAction"], - "base_default_next" : "node_92", + "base_default_next" : "node_90", "next_tables" : { - "FabricEgress.process_int_source.int_source_dscp" : "node_92", - "NoAction" : "node_92" + "FabricEgress.process_int_source.int_source_dscp" : "node_90", + "NoAction" : "node_90" }, "default_entry" : { - "action_id" : 76, + "action_id" : 75, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -13556,7 +13472,7 @@ }, { "name" : "FabricEgress.process_int_transit.tb_int_insert", - "id" : 56, + "id" : 55, "source_info" : { "filename" : "include/int_transit.p4", "line" : 227, @@ -13570,7 +13486,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [87, 77], + "action_ids" : [86, 76], "actions" : ["FabricEgress.process_int_transit.int_transit", "NoAction"], "base_default_next" : "FabricEgress.process_int_transit.tb_int_inst_0003", "next_tables" : { @@ -13578,7 +13494,7 @@ "NoAction" : "FabricEgress.process_int_transit.tb_int_inst_0003" }, "default_entry" : { - "action_id" : 77, + "action_id" : 76, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -13586,7 +13502,7 @@ }, { "name" : "FabricEgress.process_int_transit.tb_int_inst_0003", - "id" : 57, + "id" : 56, "source_info" : { "filename" : "include/int_transit.p4", "line" : 237, @@ -13607,7 +13523,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 78], + "action_ids" : [87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 77], "actions" : ["FabricEgress.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_transit.int_set_header_0003_i15", "NoAction"], "base_default_next" : "FabricEgress.process_int_transit.tb_int_inst_0407", "next_tables" : { @@ -13630,7 +13546,7 @@ "NoAction" : "FabricEgress.process_int_transit.tb_int_inst_0407" }, "default_entry" : { - "action_id" : 78, + "action_id" : 77, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -13638,7 +13554,7 @@ }, { "name" : "FabricEgress.process_int_transit.tb_int_inst_0407", - "id" : 58, + "id" : 57, "source_info" : { "filename" : "include/int_transit.p4", "line" : 264, @@ -13659,7 +13575,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 79], + "action_ids" : [103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 78], "actions" : ["FabricEgress.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_transit.int_set_header_0407_i15", "NoAction"], "base_default_next" : "tbl_process_int_transit_int_update_total_hop_cnt", "next_tables" : { @@ -13682,7 +13598,7 @@ "NoAction" : "tbl_process_int_transit_int_update_total_hop_cnt" }, "default_entry" : { - "action_id" : 79, + "action_id" : 78, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -13690,6 +13606,29 @@ }, { "name" : "tbl_process_int_transit_int_update_total_hop_cnt", + "id" : 58, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [85], + "actions" : ["FabricEgress.process_int_transit.int_update_total_hop_cnt"], + "base_default_next" : "node_95", + "next_tables" : { + "FabricEgress.process_int_transit.int_update_total_hop_cnt" : "node_95" + }, + "default_entry" : { + "action_id" : 85, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_process_int_outer_encap_int_update_ipv4", "id" : 59, "key" : [], "match_type" : "exact", @@ -13698,21 +13637,21 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [86], - "actions" : ["FabricEgress.process_int_transit.int_update_total_hop_cnt"], + "action_ids" : [119], + "actions" : ["FabricEgress.process_int_outer_encap.int_update_ipv4"], "base_default_next" : "node_97", "next_tables" : { - "FabricEgress.process_int_transit.int_update_total_hop_cnt" : "node_97" + "FabricEgress.process_int_outer_encap.int_update_ipv4" : "node_97" }, "default_entry" : { - "action_id" : 86, + "action_id" : 119, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_process_int_outer_encap_int_update_ipv4", + "name" : "tbl_process_int_outer_encap_int_update_udp", "id" : 60, "key" : [], "match_type" : "exact", @@ -13722,10 +13661,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [120], - "actions" : ["FabricEgress.process_int_outer_encap.int_update_ipv4"], + "actions" : ["FabricEgress.process_int_outer_encap.int_update_udp"], "base_default_next" : "node_99", "next_tables" : { - "FabricEgress.process_int_outer_encap.int_update_ipv4" : "node_99" + "FabricEgress.process_int_outer_encap.int_update_udp" : "node_99" }, "default_entry" : { "action_id" : 120, @@ -13735,7 +13674,7 @@ } }, { - "name" : "tbl_process_int_outer_encap_int_update_udp", + "name" : "tbl_process_int_outer_encap_int_update_shim", "id" : 61, "key" : [], "match_type" : "exact", @@ -13745,10 +13684,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [121], - "actions" : ["FabricEgress.process_int_outer_encap.int_update_udp"], + "actions" : ["FabricEgress.process_int_outer_encap.int_update_shim"], "base_default_next" : "node_101", "next_tables" : { - "FabricEgress.process_int_outer_encap.int_update_udp" : "node_101" + "FabricEgress.process_int_outer_encap.int_update_shim" : "node_101" }, "default_entry" : { "action_id" : 121, @@ -13757,32 +13696,9 @@ "action_entry_const" : true } }, - { - "name" : "tbl_process_int_outer_encap_int_update_shim", - "id" : 62, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [122], - "actions" : ["FabricEgress.process_int_outer_encap.int_update_shim"], - "base_default_next" : "node_103", - "next_tables" : { - "FabricEgress.process_int_outer_encap.int_update_shim" : "node_103" - }, - "default_entry" : { - "action_id" : 122, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, { "name" : "FabricEgress.process_int_report.tb_generate_report", - "id" : 63, + "id" : 62, "source_info" : { "filename" : "include/int_report.p4", "line" : 87, @@ -13796,15 +13712,15 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [123, 80], + "action_ids" : [122, 79], "actions" : ["FabricEgress.process_int_report.do_report_encapsulation", "NoAction"], - "base_default_next" : "node_105", + "base_default_next" : "node_103", "next_tables" : { - "FabricEgress.process_int_report.do_report_encapsulation" : "node_105", - "NoAction" : "node_105" + "FabricEgress.process_int_report.do_report_encapsulation" : "node_103", + "NoAction" : "node_103" }, "default_entry" : { - "action_id" : 80, + "action_id" : 79, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -13812,6 +13728,29 @@ }, { "name" : "tbl_process_int_sink_restore_header", + "id" : 63, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [123], + "actions" : ["FabricEgress.process_int_sink.restore_header"], + "base_default_next" : "tbl_process_int_sink_int_sink", + "next_tables" : { + "FabricEgress.process_int_sink.restore_header" : "tbl_process_int_sink_int_sink" + }, + "default_entry" : { + "action_id" : 123, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_process_int_sink_int_sink", "id" : 64, "key" : [], "match_type" : "exact", @@ -13821,36 +13760,13 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [124], - "actions" : ["FabricEgress.process_int_sink.restore_header"], - "base_default_next" : "tbl_process_int_sink_int_sink", - "next_tables" : { - "FabricEgress.process_int_sink.restore_header" : "tbl_process_int_sink_int_sink" - }, - "default_entry" : { - "action_id" : 124, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_process_int_sink_int_sink", - "id" : 65, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [125], "actions" : ["FabricEgress.process_int_sink.int_sink"], "base_default_next" : null, "next_tables" : { "FabricEgress.process_int_sink.int_sink" : null }, "default_entry" : { - "action_id" : 125, + "action_id" : 124, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -13860,8 +13776,8 @@ "action_profiles" : [], "conditionals" : [ { - "name" : "node_77", - "id" : 25, + "name" : "node_76", + "id" : 24, "source_info" : { "filename" : "include/control/next.p4", "line" : 272, @@ -13913,8 +13829,8 @@ "false_next" : "FabricEgress.egress_next.egress_vlan" }, { - "name" : "node_80", - "id" : 26, + "name" : "node_79", + "id" : 25, "source_info" : { "filename" : "include/control/packetio.p4", "line" : 42, @@ -13935,12 +13851,12 @@ } } }, - "true_next" : "node_81", - "false_next" : "tbl_act_27" + "true_next" : "node_80", + "false_next" : "node_85" }, { - "name" : "node_81", - "id" : 27, + "name" : "node_80", + "id" : 26, "source_info" : { "filename" : "include/control/packetio.p4", "line" : 43, @@ -13986,11 +13902,11 @@ } }, "true_next" : "tbl_pkt_io_egress_pop_vlan", - "false_next" : "node_83" + "false_next" : "node_82" }, { - "name" : "node_83", - "id" : 28, + "name" : "node_82", + "id" : 27, "source_info" : { "filename" : "include/control/packetio.p4", "line" : 46, @@ -14046,67 +13962,40 @@ } }, "true_next" : "tbl_drop_now_1", - "false_next" : "tbl_act_26" + "false_next" : "tbl_act_28" + }, + { + "name" : "node_85", + "id" : 28, + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 222, + "column" : 12, + "source_fragment" : "spgw_meta.direction == SPGW_DIR_DOWNLINK" + }, + "expression" : { + "type" : "expression", + "value" : { + "op" : "==", + "left" : { + "type" : "field", + "value" : ["userMetadata.spgw", "direction"] + }, + "right" : { + "type" : "hexstr", + "value" : "0x02" + } + } + }, + "true_next" : "tbl_spgw_egress_gtpu_encap", + "false_next" : "node_87" }, { "name" : "node_87", "id" : 29, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 245, - "column" : 12, - "source_fragment" : "spgw_meta.do_spgw == true && spgw_meta.direction == DIR_DOWNLINK" - }, - "expression" : { - "type" : "expression", - "value" : { - "op" : "and", - "left" : { - "type" : "expression", - "value" : { - "op" : "==", - "left" : { - "type" : "expression", - "value" : { - "op" : "d2b", - "left" : null, - "right" : { - "type" : "field", - "value" : ["userMetadata.spgw", "do_spgw"] - } - } - }, - "right" : { - "type" : "bool", - "value" : true - } - } - }, - "right" : { - "type" : "expression", - "value" : { - "op" : "==", - "left" : { - "type" : "field", - "value" : ["userMetadata.spgw", "direction"] - }, - "right" : { - "type" : "hexstr", - "value" : "0x01" - } - } - } - } - }, - "true_next" : "tbl_spgw_egress_gtpu_encap", - "false_next" : "node_89" - }, - { - "name" : "node_89", - "id" : 30, "source_info" : { "filename" : "fabric.p4", - "line" : 90, + "line" : 100, "column" : 12, "source_fragment" : "standard_metadata.ingress_port != 255 && ..." }, @@ -14179,14 +14068,14 @@ } }, "false_next" : null, - "true_next" : "node_90" + "true_next" : "node_88" }, { - "name" : "node_90", - "id" : 31, + "name" : "node_88", + "id" : 30, "source_info" : { "filename" : "fabric.p4", - "line" : 93, + "line" : 103, "column" : 16, "source_fragment" : "fabric_metadata.int_meta.source == 1" }, @@ -14205,14 +14094,14 @@ } }, "true_next" : "FabricEgress.process_int_source.tb_int_source", - "false_next" : "node_92" + "false_next" : "node_90" }, { - "name" : "node_92", - "id" : 32, + "name" : "node_90", + "id" : 31, "source_info" : { "filename" : "fabric.p4", - "line" : 96, + "line" : 106, "column" : 15, "source_fragment" : "hdr.int_header.isValid()" }, @@ -14231,8 +14120,8 @@ "true_next" : "FabricEgress.process_int_transit.tb_int_insert" }, { - "name" : "node_97", - "id" : 33, + "name" : "node_95", + "id" : 32, "source_info" : { "filename" : "include/int_transit.p4", "line" : 314, @@ -14251,11 +14140,11 @@ } }, "true_next" : "tbl_process_int_outer_encap_int_update_ipv4", - "false_next" : "node_99" + "false_next" : "node_97" }, { - "name" : "node_99", - "id" : 34, + "name" : "node_97", + "id" : 33, "source_info" : { "filename" : "include/int_transit.p4", "line" : 317, @@ -14274,11 +14163,11 @@ } }, "true_next" : "tbl_process_int_outer_encap_int_update_udp", - "false_next" : "node_101" + "false_next" : "node_99" }, { - "name" : "node_101", - "id" : 35, + "name" : "node_99", + "id" : 34, "source_info" : { "filename" : "include/int_transit.p4", "line" : 320, @@ -14297,14 +14186,14 @@ } }, "true_next" : "tbl_process_int_outer_encap_int_update_shim", - "false_next" : "node_103" + "false_next" : "node_101" }, { - "name" : "node_103", - "id" : 36, + "name" : "node_101", + "id" : 35, "source_info" : { "filename" : "fabric.p4", - "line" : 100, + "line" : 110, "column" : 20, "source_fragment" : "standard_metadata.instance_type == 1" }, @@ -14323,14 +14212,14 @@ } }, "true_next" : "FabricEgress.process_int_report.tb_generate_report", - "false_next" : "node_105" + "false_next" : "node_103" }, { - "name" : "node_105", - "id" : 37, + "name" : "node_103", + "id" : 36, "source_info" : { "filename" : "fabric.p4", - "line" : 104, + "line" : 114, "column" : 20, "source_fragment" : "fabric_metadata.int_meta.sink == 1" }, diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt index 0f0948bca9..82cba68450 100644 --- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt +++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt @@ -1,39 +1,3 @@ -tables { - preamble { - id: 33618733 - name: "FabricIngress.spgw_ingress.ue_filter_table" - alias: "ue_filter_table" - } - match_fields { - id: 1 - name: "ipv4.dst_addr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 16800567 - } - size: 1024 - idle_timeout_behavior: NO_TIMEOUT -} -tables { - preamble { - id: 33615906 - name: "FabricIngress.spgw_ingress.s1u_filter_table" - alias: "s1u_filter_table" - } - match_fields { - id: 1 - name: "spgw_meta.s1u_sgw_addr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 16800567 - } - size: 1024 - idle_timeout_behavior: NO_TIMEOUT -} tables { preamble { id: 33582731 @@ -53,29 +17,25 @@ tables { id: 16800567 annotations: "@defaultonly()" } + direct_resource_ids: 318781522 size: 1024 idle_timeout_behavior: NO_TIMEOUT } tables { preamble { - id: 33611263 - name: "FabricIngress.spgw_ingress.ue_cdr_table" - alias: "ue_cdr_table" + id: 33615906 + name: "FabricIngress.spgw_ingress.s1u_filter_table" + alias: "s1u_filter_table" } match_fields { id: 1 - name: "ipv4.dst_addr" + name: "gtpu_ipv4.dst_addr" bitwidth: 32 match_type: EXACT } - action_refs { - id: 16818129 - } action_refs { id: 16800567 - annotations: "@defaultonly()" } - direct_resource_ids: 318781522 size: 1024 idle_timeout_behavior: NO_TIMEOUT } @@ -857,13 +817,6 @@ actions { bitwidth: 32 } } -actions { - preamble { - id: 16818129 - name: "FabricIngress.spgw_ingress.update_ue_cdr" - alias: "update_ue_cdr" - } -} actions { preamble { id: 16778827 @@ -1657,7 +1610,7 @@ direct_counters { spec { unit: BOTH } - direct_table_id: 33611263 + direct_table_id: 33582731 } direct_counters { preamble { diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json index c7a6dd4dd6..a347d4fb08 100644 --- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json +++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json @@ -1340,7 +1340,7 @@ "id" : 0, "source_info" : { "filename" : "include/parser.p4", - "line" : 212, + "line" : 222, "column" : 8, "source_fragment" : "FabricDeparser" }, @@ -1865,7 +1865,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 74, + "line" : 89, "column" : 31, "source_fragment" : "0x8100; ..." } @@ -2480,7 +2480,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -2556,7 +2556,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -2671,7 +2671,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -2747,7 +2747,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -3039,7 +3039,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -3115,7 +3115,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -3230,7 +3230,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -3306,7 +3306,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -3433,7 +3433,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 77, + "line" : 92, "column" : 31, "source_fragment" : "0x0800; ..." } @@ -4031,7 +4031,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 120, + "line" : 124, "column" : 35, "source_fragment" : "4; ..." } @@ -4462,7 +4462,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 113, + "line" : 122, "column" : 24, "source_fragment" : "0x1; ..." } @@ -8201,7 +8201,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 77, + "line" : 92, "column" : 31, "source_fragment" : "0x0800; ..." } @@ -8429,7 +8429,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 83, + "line" : 98, "column" : 25, "source_fragment" : "17; ..." } @@ -8644,7 +8644,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 125, + "line" : 129, "column" : 31, "source_fragment" : "0; ..." } @@ -8739,7 +8739,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 129, + "line" : 133, "column" : 21, "source_fragment" : "1; ..." } @@ -10529,7 +10529,7 @@ "id" : 12, "source_info" : { "filename" : "fabric.p4", - "line" : 66, + "line" : 70, "column" : 11, "source_fragment" : "fabric_metadata.int_meta.sink == 1" }, @@ -10557,7 +10557,7 @@ "id" : 1, "source_info" : { "filename" : "fabric.p4", - "line" : 76, + "line" : 80, "column" : 8, "source_fragment" : "FabricEgress" }, @@ -11252,7 +11252,7 @@ "id" : 17, "source_info" : { "filename" : "fabric.p4", - "line" : 90, + "line" : 100, "column" : 12, "source_fragment" : "standard_metadata.ingress_port != 255 && ..." }, @@ -11332,7 +11332,7 @@ "id" : 18, "source_info" : { "filename" : "fabric.p4", - "line" : 93, + "line" : 103, "column" : 16, "source_fragment" : "fabric_metadata.int_meta.source == 1" }, @@ -11358,7 +11358,7 @@ "id" : 19, "source_info" : { "filename" : "fabric.p4", - "line" : 96, + "line" : 106, "column" : 15, "source_fragment" : "hdr.int_header.isValid()" }, @@ -11450,7 +11450,7 @@ "id" : 23, "source_info" : { "filename" : "fabric.p4", - "line" : 100, + "line" : 110, "column" : 20, "source_fragment" : "standard_metadata.instance_type == 1" }, @@ -11476,7 +11476,7 @@ "id" : 24, "source_info" : { "filename" : "fabric.p4", - "line" : 104, + "line" : 114, "column" : 20, "source_fragment" : "fabric_metadata.int_meta.sink == 1" }, diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json index da1df9bbf3..c0adbca293 100644 --- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json +++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json @@ -5,14 +5,15 @@ "id" : 0, "fields" : [ ["tmp", 4, false], - ["tmp_0", 32, false], + ["tmp_0", 8, false], ["tmp_1", 32, false], + ["tmp_2", 32, false], + ["spgw_ingress_tmp_1", 1, false], ["spgw_ingress_tmp_2", 1, false], - ["spgw_ingress_tmp_3", 1, false], - ["spgw_ingress_tmp_4", 1, false], ["next_tmp_2", 1, false], ["next_tmp_3", 1, false], ["next_tmp_4", 1, false], + ["spgw_normalizer_hasReturned_0", 1, false], ["spgw_ingress_hasReturned_0", 1, false], ["next_hasReturned_0", 1, false], ["fabric_metadata_t.fwd_type", 3, false], @@ -186,8 +187,7 @@ "name" : "spgw_meta_t", "id" : 13, "fields" : [ - ["do_spgw", 1, 0], - ["direction", 1, false], + ["direction", 2, false], ["ipv4_len", 16, false], ["teid", 32, false], ["s1u_enb_addr", 32, false], @@ -254,57 +254,71 @@ "pi_omit" : true }, { - "name" : "ipv4", + "name" : "inner_ipv4", "id" : 8, "header_type" : "ipv4_t", "metadata" : false, "pi_omit" : true }, { - "name" : "arp", + "name" : "inner_udp", "id" : 9, + "header_type" : "udp_t", + "metadata" : false, + "pi_omit" : true + }, + { + "name" : "ipv4", + "id" : 10, + "header_type" : "ipv4_t", + "metadata" : false, + "pi_omit" : true + }, + { + "name" : "arp", + "id" : 11, "header_type" : "arp_t", "metadata" : false, "pi_omit" : true }, { "name" : "tcp", - "id" : 10, + "id" : 12, "header_type" : "tcp_t", "metadata" : false, "pi_omit" : true }, { "name" : "udp", - "id" : 11, + "id" : 13, "header_type" : "udp_t", "metadata" : false, "pi_omit" : true }, { "name" : "icmp", - "id" : 12, + "id" : 14, "header_type" : "icmp_t", "metadata" : false, "pi_omit" : true }, { "name" : "packet_out", - "id" : 13, + "id" : 15, "header_type" : "packet_out_header_t", "metadata" : false, "pi_omit" : true }, { "name" : "packet_in", - "id" : 14, + "id" : 16, "header_type" : "packet_in_header_t", "metadata" : false, "pi_omit" : true }, { "name" : "userMetadata.spgw", - "id" : 15, + "id" : 17, "header_type" : "spgw_meta_t", "metadata" : true, "pi_omit" : true @@ -732,6 +746,77 @@ { "name" : "parse_gtpu", "id" : 10, + "parser_ops" : [ + { + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "tmp_0"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "&", + "left" : { + "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" : "0xff" + } + } + } + } + ], + "op" : "set" + } + ], + "transitions" : [ + { + "type" : "hexstr", + "value" : "0x8c", + "mask" : null, + "next_state" : "do_parse_gtpu" + }, + { + "value" : "default", + "mask" : null, + "next_state" : null + } + ], + "transition_key" : [ + { + "type" : "field", + "value" : ["scalars", "tmp_0"] + } + ] + }, + { + "name" : "do_parse_gtpu", + "id" : 11, "parser_ops" : [ { "parameters" : [ @@ -746,7 +831,7 @@ "parameters" : [ { "type" : "regular", - "value" : "gtpu_ipv4" + "value" : "inner_ipv4" } ], "op" : "extract" @@ -763,7 +848,7 @@ "type" : "hexstr", "value" : "0x11", "mask" : null, - "next_state" : "parse_udp_inner" + "next_state" : "parse_inner_udp" }, { "type" : "hexstr", @@ -780,19 +865,19 @@ "transition_key" : [ { "type" : "field", - "value" : ["gtpu_ipv4", "protocol"] + "value" : ["inner_ipv4", "protocol"] } ] }, { - "name" : "parse_udp_inner", - "id" : 11, + "name" : "parse_inner_udp", + "id" : 12, "parser_ops" : [ { "parameters" : [ { "type" : "regular", - "value" : "gtpu_udp" + "value" : "inner_udp" } ], "op" : "extract" @@ -805,7 +890,7 @@ }, { "type" : "field", - "value" : ["gtpu_udp", "src_port"] + "value" : ["inner_udp", "src_port"] } ], "op" : "set" @@ -818,7 +903,7 @@ }, { "type" : "field", - "value" : ["gtpu_udp", "dst_port"] + "value" : ["inner_udp", "dst_port"] } ], "op" : "set" @@ -843,7 +928,7 @@ "id" : 0, "source_info" : { "filename" : "include/parser.p4", - "line" : 212, + "line" : 222, "column" : 8, "source_fragment" : "FabricDeparser" }, @@ -856,7 +941,7 @@ "name" : "FabricIngress.spgw_ingress.ue_counter", "id" : 0, "is_direct" : true, - "binding" : "FabricIngress.spgw_ingress.ue_cdr_table" + "binding" : "FabricIngress.spgw_ingress.dl_sess_lookup" }, { "name" : "FabricIngress.filtering.ingress_port_vlan_counter", @@ -1017,7 +1102,7 @@ "id" : 1, "source_info" : { "filename" : "include/spgw.p4", - "line" : 292, + "line" : 238, "column" : 8, "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..." }, @@ -1186,13 +1271,13 @@ "primitives" : [] }, { - "name" : "NoAction", + "name" : "nop", "id" : 8, "runtime_data" : [], "primitives" : [] }, { - "name" : "NoAction", + "name" : "nop", "id" : 9, "runtime_data" : [], "primitives" : [] @@ -1203,21 +1288,9 @@ "runtime_data" : [], "primitives" : [] }, - { - "name" : "nop", - "id" : 11, - "runtime_data" : [], - "primitives" : [] - }, - { - "name" : "nop", - "id" : 12, - "runtime_data" : [], - "primitives" : [] - }, { "name" : "drop_now", - "id" : 13, + "id" : 11, "runtime_data" : [], "primitives" : [ { @@ -1244,7 +1317,7 @@ }, { "name" : "FabricIngress.spgw_ingress.gtpu_decap", - "id" : 14, + "id" : 12, "runtime_data" : [], "primitives" : [ { @@ -1257,7 +1330,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 33, + "line" : 54, "column" : 8, "source_fragment" : "gtpu_ipv4.setInvalid()" } @@ -1272,7 +1345,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 34, + "line" : 55, "column" : 8, "source_fragment" : "gtpu_udp.setInvalid()" } @@ -1287,7 +1360,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 35, + "line" : 56, "column" : 8, "source_fragment" : "gtpu.setInvalid()" } @@ -1296,7 +1369,7 @@ }, { "name" : "FabricIngress.spgw_ingress.set_dl_sess_info", - "id" : 15, + "id" : 13, "runtime_data" : [ { "name" : "teid", @@ -1326,7 +1399,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 41, + "line" : 62, "column" : 8, "source_fragment" : "spgw_meta.teid = teid" } @@ -1345,7 +1418,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 42, + "line" : 63, "column" : 8, "source_fragment" : "spgw_meta.s1u_enb_addr = s1u_enb_addr" } @@ -1364,22 +1437,16 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 43, + "line" : 64, "column" : 8, "source_fragment" : "spgw_meta.s1u_sgw_addr = s1u_sgw_addr" } } ] }, - { - "name" : "FabricIngress.spgw_ingress.update_ue_cdr", - "id" : 16, - "runtime_data" : [], - "primitives" : [] - }, { "name" : "FabricIngress.filtering.drop", - "id" : 17, + "id" : 14, "runtime_data" : [], "primitives" : [ { @@ -1396,7 +1463,7 @@ }, { "name" : "FabricIngress.filtering.set_vlan", - "id" : 18, + "id" : 15, "runtime_data" : [ { "name" : "new_vlan_id", @@ -1427,7 +1494,7 @@ }, { "name" : "FabricIngress.filtering.push_internal_vlan", - "id" : 19, + "id" : 16, "runtime_data" : [ { "name" : "new_vlan_id", @@ -1521,7 +1588,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 74, + "line" : 89, "column" : 31, "source_fragment" : "0x8100; ..." } @@ -1578,7 +1645,7 @@ }, { "name" : "FabricIngress.filtering.set_forwarding_type", - "id" : 20, + "id" : 17, "runtime_data" : [ { "name" : "fwd_type", @@ -1609,7 +1676,7 @@ }, { "name" : "FabricIngress.forwarding.set_next_id_bridging", - "id" : 21, + "id" : 18, "runtime_data" : [ { "name" : "next_id", @@ -1640,7 +1707,7 @@ }, { "name" : "FabricIngress.forwarding.pop_mpls_and_next", - "id" : 22, + "id" : 19, "runtime_data" : [ { "name" : "next_id", @@ -1686,7 +1753,7 @@ }, { "name" : "FabricIngress.forwarding.set_next_id_unicast_v4", - "id" : 23, + "id" : 20, "runtime_data" : [ { "name" : "next_id", @@ -1717,7 +1784,7 @@ }, { "name" : "FabricIngress.forwarding.set_next_id_acl", - "id" : 24, + "id" : 21, "runtime_data" : [ { "name" : "next_id", @@ -1748,7 +1815,7 @@ }, { "name" : "FabricIngress.forwarding.punt_to_cpu", - "id" : 25, + "id" : 22, "runtime_data" : [], "primitives" : [ { @@ -1784,7 +1851,7 @@ }, { "name" : "FabricIngress.forwarding.clone_to_cpu", - "id" : 26, + "id" : 23, "runtime_data" : [], "primitives" : [ { @@ -1820,7 +1887,7 @@ }, { "name" : "FabricIngress.forwarding.drop", - "id" : 27, + "id" : 24, "runtime_data" : [], "primitives" : [ { @@ -1837,7 +1904,7 @@ }, { "name" : "FabricIngress.next.set_vlan", - "id" : 28, + "id" : 25, "runtime_data" : [ { "name" : "new_vlan_id", @@ -1868,7 +1935,7 @@ }, { "name" : "FabricIngress.next.output_simple", - "id" : 29, + "id" : 26, "runtime_data" : [ { "name" : "port_num", @@ -1899,7 +1966,7 @@ }, { "name" : "FabricIngress.next.set_vlan_output", - "id" : 30, + "id" : 27, "runtime_data" : [ { "name" : "new_vlan_id", @@ -1953,7 +2020,7 @@ }, { "name" : "FabricIngress.next.l3_routing_simple", - "id" : 31, + "id" : 28, "runtime_data" : [ { "name" : "port_num", @@ -2030,7 +2097,7 @@ }, { "name" : "FabricIngress.next.mpls_routing_v4_simple", - "id" : 32, + "id" : 29, "runtime_data" : [ { "name" : "port_num", @@ -2136,7 +2203,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -2212,7 +2279,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -2221,7 +2288,7 @@ }, { "name" : "FabricIngress.next.mpls_routing_v6_simple", - "id" : 33, + "id" : 30, "runtime_data" : [ { "name" : "port_num", @@ -2327,7 +2394,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -2403,7 +2470,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -2412,7 +2479,7 @@ }, { "name" : "FabricIngress.next.l3_routing_vlan", - "id" : 34, + "id" : 31, "runtime_data" : [ { "name" : "port_num", @@ -2512,7 +2579,7 @@ }, { "name" : "FabricIngress.next.l3_routing_hashed", - "id" : 35, + "id" : 32, "runtime_data" : [ { "name" : "port_num", @@ -2589,7 +2656,7 @@ }, { "name" : "FabricIngress.next.mpls_routing_v4_hashed", - "id" : 36, + "id" : 33, "runtime_data" : [ { "name" : "port_num", @@ -2695,7 +2762,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -2771,7 +2838,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -2780,7 +2847,7 @@ }, { "name" : "FabricIngress.next.mpls_routing_v6_hashed", - "id" : 37, + "id" : 34, "runtime_data" : [ { "name" : "port_num", @@ -2886,7 +2953,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -2962,7 +3029,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -2971,7 +3038,7 @@ }, { "name" : "FabricIngress.next.set_mcast_group", - "id" : 38, + "id" : 35, "runtime_data" : [ { "name" : "gid", @@ -3031,8 +3098,216 @@ }, { "name" : "act", + "id" : 36, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "spgw_normalizer_hasReturned_0"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : true + } + } + } + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 30, + "column" : 32, + "source_fragment" : "return" + } + } + ] + }, + { + "name" : "act_0", + "id" : 37, + "runtime_data" : [], + "primitives" : [ + { + "op" : "remove_header", + "parameters" : [ + { + "type" : "header", + "value" : "gtpu_ipv4" + } + ], + "source_info" : { + "filename" : "fabric.p4", + "line" : 52, + "column" : 50, + "source_fragment" : "hdr.gtpu_ipv4" + } + }, + { + "op" : "remove_header", + "parameters" : [ + { + "type" : "header", + "value" : "gtpu_udp" + } + ], + "source_info" : { + "filename" : "fabric.p4", + "line" : 52, + "column" : 65, + "source_fragment" : "hdr.gtpu_udp" + } + }, + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "spgw_normalizer_hasReturned_0"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : false + } + } + } + } + ] + } + ] + }, + { + "name" : "act_1", + "id" : 38, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign_header", + "parameters" : [ + { + "type" : "header", + "value" : "udp" + }, + { + "type" : "header", + "value" : "inner_udp" + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 35, + "column" : 16, + "source_fragment" : "= inner_udp; ..." + } + } + ] + }, + { + "name" : "act_2", "id" : 39, "runtime_data" : [], + "primitives" : [ + { + "op" : "remove_header", + "parameters" : [ + { + "type" : "header", + "value" : "udp" + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 37, + "column" : 12, + "source_fragment" : "udp.setInvalid()" + } + } + ] + }, + { + "name" : "act_3", + "id" : 40, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign_header", + "parameters" : [ + { + "type" : "header", + "value" : "gtpu_ipv4" + }, + { + "type" : "header", + "value" : "ipv4" + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 31, + "column" : 18, + "source_fragment" : "= ipv4; ..." + } + }, + { + "op" : "assign_header", + "parameters" : [ + { + "type" : "header", + "value" : "ipv4" + }, + { + "type" : "header", + "value" : "inner_ipv4" + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 32, + "column" : 13, + "source_fragment" : "= inner_ipv4; ..." + } + }, + { + "op" : "assign_header", + "parameters" : [ + { + "type" : "header", + "value" : "gtpu_udp" + }, + { + "type" : "header", + "value" : "udp" + } + ], + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 33, + "column" : 17, + "source_fragment" : "= udp; ..." + } + } + ] + }, + { + "name" : "act_4", + "id" : 41, + "runtime_data" : [], "primitives" : [ { "op" : "assign", @@ -3071,8 +3346,94 @@ ] }, { - "name" : "act_0", - "id" : 40, + "name" : "act_5", + "id" : 42, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "spgw_ingress_tmp_1"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : true + } + } + } + } + ] + } + ] + }, + { + "name" : "act_6", + "id" : 43, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "spgw_ingress_tmp_1"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : false + } + } + } + } + ] + } + ] + }, + { + "name" : "act_7", + "id" : 44, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["userMetadata.spgw", "direction"] + }, + { + "type" : "hexstr", + "value" : "0x01" + } + ], + "source_info" : { + "filename" : "include/control/../define.p4", + "line" : 116, + "column" : 36, + "source_fragment" : "2w1; ..." + } + } + ] + }, + { + "name" : "act_8", + "id" : 45, "runtime_data" : [], "primitives" : [ { @@ -3101,8 +3462,8 @@ ] }, { - "name" : "act_1", - "id" : 41, + "name" : "act_9", + "id" : 46, "runtime_data" : [], "primitives" : [ { @@ -3131,8 +3492,8 @@ ] }, { - "name" : "act_2", - "id" : 42, + "name" : "act_10", + "id" : 47, "runtime_data" : [], "primitives" : [ { @@ -3140,82 +3501,25 @@ "parameters" : [ { "type" : "field", - "value" : ["userMetadata.spgw", "s1u_enb_addr"] + "value" : ["userMetadata.spgw", "direction"] }, { - "type" : "field", - "value" : ["ipv4", "src_addr"] + "type" : "hexstr", + "value" : "0x02" } ], "source_info" : { - "filename" : "include/spgw.p4", - "line" : 147, - "column" : 12, - "source_fragment" : "spgw_meta.s1u_enb_addr = ipv4.src_addr" - } - }, - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["userMetadata.spgw", "s1u_sgw_addr"] - }, - { - "type" : "field", - "value" : ["ipv4", "dst_addr"] - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 148, - "column" : 12, - "source_fragment" : "spgw_meta.s1u_sgw_addr = ipv4.dst_addr" - } - }, - { - "op" : "assign_header", - "parameters" : [ - { - "type" : "header", - "value" : "ipv4" - }, - { - "type" : "header", - "value" : "gtpu_ipv4" - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 149, - "column" : 17, - "source_fragment" : "= gtpu_ipv4; ..." - } - }, - { - "op" : "assign_header", - "parameters" : [ - { - "type" : "header", - "value" : "udp" - }, - { - "type" : "header", - "value" : "gtpu_udp" - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 150, - "column" : 16, - "source_fragment" : "= gtpu_udp; ..." + "filename" : "include/control/../define.p4", + "line" : 117, + "column" : 38, + "source_fragment" : "2w2; ..." } } ] }, { - "name" : "act_3", - "id" : 43, + "name" : "act_11", + "id" : 48, "runtime_data" : [], "primitives" : [ { @@ -3223,7 +3527,26 @@ "parameters" : [ { "type" : "field", - "value" : ["userMetadata.spgw", "do_spgw"] + "value" : ["userMetadata.spgw", "direction"] + }, + { + "type" : "hexstr", + "value" : "0x00" + } + ], + "source_info" : { + "filename" : "include/control/../define.p4", + "line" : 115, + "column" : 37, + "source_fragment" : "2w0; ..." + } + }, + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "spgw_ingress_hasReturned_0"] }, { "type" : "expression", @@ -3243,235 +3566,6 @@ "source_info" : { "filename" : "include/spgw.p4", "line" : 154, - "column" : 16, - "source_fragment" : "spgw_meta.do_spgw = true" - } - }, - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["userMetadata.spgw", "direction"] - }, - { - "type" : "hexstr", - "value" : "0x00" - } - ], - "source_info" : { - "filename" : "include/control/../define.p4", - "line" : 106, - "column" : 31, - "source_fragment" : "1w0; ..." - } - } - ] - }, - { - "name" : "act_4", - "id" : 44, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_3"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : true - } - } - } - } - ] - } - ] - }, - { - "name" : "act_5", - "id" : 45, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_3"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : false - } - } - } - } - ] - } - ] - }, - { - "name" : "act_6", - "id" : 46, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["userMetadata.spgw", "do_spgw"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : true - } - } - } - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 158, - "column" : 12, - "source_fragment" : "spgw_meta.do_spgw = true" - } - }, - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["userMetadata.spgw", "direction"] - }, - { - "type" : "hexstr", - "value" : "0x01" - } - ], - "source_info" : { - "filename" : "include/control/../define.p4", - "line" : 107, - "column" : 33, - "source_fragment" : "1w1; ..." - } - } - ] - }, - { - "name" : "act_7", - "id" : 47, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "spgw_ingress_hasReturned_0"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : false - } - } - } - } - ] - }, - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["userMetadata.spgw", "do_spgw"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : false - } - } - } - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 141, - "column" : 8, - "source_fragment" : "spgw_meta.do_spgw = false" - } - } - ] - }, - { - "name" : "act_8", - "id" : 48, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "spgw_ingress_hasReturned_0"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : true - } - } - } - } - ], - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 164, "column" : 12, "source_fragment" : "return" } @@ -3479,7 +3573,7 @@ ] }, { - "name" : "act_9", + "name" : "act_12", "id" : 49, "runtime_data" : [], "primitives" : [ @@ -3488,37 +3582,7 @@ "parameters" : [ { "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_4"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : true - } - } - } - } - ] - } - ] - }, - { - "name" : "act_10", - "id" : 50, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_4"] + "value" : ["scalars", "spgw_ingress_hasReturned_0"] }, { "type" : "expression", @@ -3539,8 +3603,8 @@ ] }, { - "name" : "act_11", - "id" : 51, + "name" : "act_13", + "id" : 50, "runtime_data" : [], "primitives" : [ { @@ -3557,7 +3621,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 194, + "line" : 171, "column" : 8, "source_fragment" : "spgw_meta.ipv4_len = ipv4.total_len" } @@ -3565,8 +3629,8 @@ ] }, { - "name" : "act_12", - "id" : 52, + "name" : "act_14", + "id" : 51, "runtime_data" : [], "primitives" : [ { @@ -3583,7 +3647,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 77, + "line" : 92, "column" : 31, "source_fragment" : "0x0800; ..." } @@ -3591,8 +3655,8 @@ ] }, { - "name" : "act_13", - "id" : 53, + "name" : "act_15", + "id" : 52, "runtime_data" : [], "primitives" : [ { @@ -3620,69 +3684,9 @@ } ] }, - { - "name" : "act_14", - "id" : 54, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "next_tmp_4"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : true - } - } - } - } - ] - } - ] - }, - { - "name" : "act_15", - "id" : 55, - "runtime_data" : [], - "primitives" : [ - { - "op" : "assign", - "parameters" : [ - { - "type" : "field", - "value" : ["scalars", "next_tmp_4"] - }, - { - "type" : "expression", - "value" : { - "type" : "expression", - "value" : { - "op" : "b2d", - "left" : null, - "right" : { - "type" : "bool", - "value" : false - } - } - } - } - ] - } - ] - }, { "name" : "act_16", - "id" : 56, + "id" : 53, "runtime_data" : [], "primitives" : [ { @@ -3690,7 +3694,7 @@ "parameters" : [ { "type" : "field", - "value" : ["scalars", "next_tmp_3"] + "value" : ["scalars", "next_tmp_4"] }, { "type" : "expression", @@ -3712,7 +3716,67 @@ }, { "name" : "act_17", - "id" : 57, + "id" : 54, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "next_tmp_4"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : false + } + } + } + } + ] + } + ] + }, + { + "name" : "act_18", + "id" : 55, + "runtime_data" : [], + "primitives" : [ + { + "op" : "assign", + "parameters" : [ + { + "type" : "field", + "value" : ["scalars", "next_tmp_3"] + }, + { + "type" : "expression", + "value" : { + "type" : "expression", + "value" : { + "op" : "b2d", + "left" : null, + "right" : { + "type" : "bool", + "value" : true + } + } + } + } + ] + } + ] + }, + { + "name" : "act_19", + "id" : 56, "runtime_data" : [], "primitives" : [ { @@ -3741,8 +3805,8 @@ ] }, { - "name" : "act_18", - "id" : 58, + "name" : "act_20", + "id" : 57, "runtime_data" : [], "primitives" : [ { @@ -3771,8 +3835,8 @@ ] }, { - "name" : "act_19", - "id" : 59, + "name" : "act_21", + "id" : 58, "runtime_data" : [], "primitives" : [ { @@ -3801,8 +3865,8 @@ ] }, { - "name" : "act_20", - "id" : 60, + "name" : "act_22", + "id" : 59, "runtime_data" : [], "primitives" : [ { @@ -3837,8 +3901,8 @@ ] }, { - "name" : "act_21", - "id" : 61, + "name" : "act_23", + "id" : 60, "runtime_data" : [], "primitives" : [ { @@ -3886,8 +3950,8 @@ ] }, { - "name" : "act_22", - "id" : 62, + "name" : "act_24", + "id" : 61, "runtime_data" : [], "primitives" : [ { @@ -3895,7 +3959,7 @@ "parameters" : [ { "type" : "field", - "value" : ["scalars", "tmp_0"] + "value" : ["scalars", "tmp_1"] }, { "type" : "expression", @@ -3931,7 +3995,7 @@ }, { "type" : "field", - "value" : ["scalars", "tmp_0"] + "value" : ["scalars", "tmp_1"] } ], "source_info" : { @@ -3944,8 +4008,8 @@ ] }, { - "name" : "act_23", - "id" : 63, + "name" : "act_25", + "id" : 62, "runtime_data" : [], "primitives" : [ { @@ -3953,7 +4017,7 @@ "parameters" : [ { "type" : "field", - "value" : ["scalars", "tmp_1"] + "value" : ["scalars", "tmp_2"] }, { "type" : "expression", @@ -3989,7 +4053,7 @@ }, { "type" : "field", - "value" : ["scalars", "tmp_1"] + "value" : ["scalars", "tmp_2"] } ], "source_info" : { @@ -4003,10 +4067,37 @@ }, { "name" : "nop", - "id" : 64, + "id" : 63, "runtime_data" : [], "primitives" : [] }, + { + "name" : "drop_now", + "id" : 64, + "runtime_data" : [], + "primitives" : [ + { + "op" : "drop", + "parameters" : [], + "source_info" : { + "filename" : "include/control/../action.p4", + "line" : 24, + "column" : 4, + "source_fragment" : "mark_to_drop()" + } + }, + { + "op" : "exit", + "parameters" : [], + "source_info" : { + "filename" : "include/control/../action.p4", + "line" : 25, + "column" : 4, + "source_fragment" : "exit" + } + } + ] + }, { "name" : "drop_now", "id" : 65, @@ -4034,36 +4125,9 @@ } ] }, - { - "name" : "drop_now", - "id" : 66, - "runtime_data" : [], - "primitives" : [ - { - "op" : "drop", - "parameters" : [], - "source_info" : { - "filename" : "include/control/../action.p4", - "line" : 24, - "column" : 4, - "source_fragment" : "mark_to_drop()" - } - }, - { - "op" : "exit", - "parameters" : [], - "source_info" : { - "filename" : "include/control/../action.p4", - "line" : 25, - "column" : 4, - "source_fragment" : "exit" - } - } - ] - }, { "name" : "FabricEgress.spgw_egress.gtpu_encap", - "id" : 67, + "id" : 66, "runtime_data" : [], "primitives" : [ { @@ -4076,7 +4140,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 209, + "line" : 186, "column" : 8, "source_fragment" : "gtpu_ipv4.setValid()" } @@ -4095,7 +4159,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 210, + "line" : 187, "column" : 8, "source_fragment" : "gtpu_ipv4.version = 4" } @@ -4114,7 +4178,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 86, + "line" : 101, "column" : 28, "source_fragment" : "5; ..." } @@ -4133,7 +4197,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 212, + "line" : 189, "column" : 8, "source_fragment" : "gtpu_ipv4.dscp = 0" } @@ -4152,7 +4216,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 213, + "line" : 190, "column" : 8, "source_fragment" : "gtpu_ipv4.ecn = 0" } @@ -4176,7 +4240,7 @@ "op" : "+", "left" : { "type" : "field", - "value" : ["userMetadata.spgw", "ipv4_len"] + "value" : ["ipv4", "total_len"] }, "right" : { "type" : "hexstr", @@ -4194,9 +4258,9 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 214, + "line" : 191, "column" : 8, - "source_fragment" : "gtpu_ipv4.total_len = spgw_meta.ipv4_len ..." + "source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..." } }, { @@ -4213,7 +4277,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 216, + "line" : 193, "column" : 8, "source_fragment" : "gtpu_ipv4.identification = 0x1513" } @@ -4232,7 +4296,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 217, + "line" : 194, "column" : 8, "source_fragment" : "gtpu_ipv4.flags = 0" } @@ -4251,7 +4315,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 218, + "line" : 195, "column" : 8, "source_fragment" : "gtpu_ipv4.frag_offset = 0" } @@ -4270,7 +4334,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 96, + "line" : 111, "column" : 32, "source_fragment" : "64; ..." } @@ -4289,7 +4353,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 83, + "line" : 98, "column" : 25, "source_fragment" : "17; ..." } @@ -4308,7 +4372,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 221, + "line" : 198, "column" : 8, "source_fragment" : "gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr" } @@ -4327,7 +4391,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 222, + "line" : 199, "column" : 8, "source_fragment" : "gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr" } @@ -4346,7 +4410,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 223, + "line" : 200, "column" : 8, "source_fragment" : "gtpu_ipv4.hdr_checksum = 0" } @@ -4361,7 +4425,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 225, + "line" : 202, "column" : 8, "source_fragment" : "gtpu_udp.setValid()" } @@ -4380,7 +4444,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 226, + "line" : 203, "column" : 8, "source_fragment" : "gtpu_udp.src_port = 2152" } @@ -4399,7 +4463,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 227, + "line" : 204, "column" : 8, "source_fragment" : "gtpu_udp.dst_port = 2152" } @@ -4441,7 +4505,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 228, + "line" : 205, "column" : 8, "source_fragment" : "gtpu_udp.len = spgw_meta.ipv4_len ..." } @@ -4460,7 +4524,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 230, + "line" : 207, "column" : 8, "source_fragment" : "gtpu_udp.checksum = 0" } @@ -4475,7 +4539,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 232, + "line" : 209, "column" : 8, "source_fragment" : "gtpu.setValid()" } @@ -4494,7 +4558,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 233, + "line" : 210, "column" : 8, "source_fragment" : "gtpu.version = 0x01" } @@ -4513,7 +4577,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 234, + "line" : 211, "column" : 8, "source_fragment" : "gtpu.pt = 0x01" } @@ -4532,7 +4596,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 235, + "line" : 212, "column" : 8, "source_fragment" : "gtpu.spare = 0" } @@ -4551,7 +4615,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 236, + "line" : 213, "column" : 8, "source_fragment" : "gtpu.ex_flag = 0" } @@ -4570,7 +4634,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 237, + "line" : 214, "column" : 8, "source_fragment" : "gtpu.seq_flag = 0" } @@ -4589,7 +4653,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 238, + "line" : 215, "column" : 8, "source_fragment" : "gtpu.npdu_flag = 0" } @@ -4608,7 +4672,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 239, + "line" : 216, "column" : 8, "source_fragment" : "gtpu.msgtype = 0xff" } @@ -4627,7 +4691,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 240, + "line" : 217, "column" : 8, "source_fragment" : "gtpu.msglen = spgw_meta.ipv4_len" } @@ -4646,7 +4710,7 @@ ], "source_info" : { "filename" : "include/spgw.p4", - "line" : 241, + "line" : 218, "column" : 8, "source_fragment" : "gtpu.teid = spgw_meta.teid" } @@ -4655,7 +4719,7 @@ }, { "name" : "FabricEgress.pkt_io_egress.pop_vlan", - "id" : 68, + "id" : 67, "runtime_data" : [], "primitives" : [ { @@ -4696,7 +4760,7 @@ }, { "name" : "FabricEgress.egress_next.pop_vlan", - "id" : 69, + "id" : 68, "runtime_data" : [], "primitives" : [ { @@ -4736,8 +4800,8 @@ ] }, { - "name" : "act_24", - "id" : 70, + "name" : "act_26", + "id" : 69, "runtime_data" : [], "primitives" : [ { @@ -4775,58 +4839,6 @@ } } ] - }, - { - "name" : "act_25", - "id" : 71, - "runtime_data" : [], - "primitives" : [ - { - "op" : "remove_header", - "parameters" : [ - { - "type" : "header", - "value" : "gtpu_ipv4" - } - ], - "source_info" : { - "filename" : "fabric.p4", - "line" : 86, - "column" : 36, - "source_fragment" : "hdr.gtpu_ipv4" - } - }, - { - "op" : "remove_header", - "parameters" : [ - { - "type" : "header", - "value" : "gtpu_udp" - } - ], - "source_info" : { - "filename" : "fabric.p4", - "line" : 86, - "column" : 51, - "source_fragment" : "hdr.gtpu_udp" - } - }, - { - "op" : "remove_header", - "parameters" : [ - { - "type" : "header", - "value" : "gtpu" - } - ], - "source_info" : { - "filename" : "fabric.p4", - "line" : 86, - "column" : 65, - "source_fragment" : "hdr.gtpu" - } - } - ] } ], "pipelines" : [ @@ -4839,7 +4851,7 @@ "column" : 8, "source_fragment" : "FabricIngress" }, - "init_table" : "node_2", + "init_table" : "tbl_act", "tables" : [ { "name" : "tbl_act", @@ -4851,14 +4863,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [39], - "actions" : ["act"], - "base_default_next" : null, + "action_ids" : [37], + "actions" : ["act_0"], + "base_default_next" : "node_3", "next_tables" : { - "act" : null + "act_0" : "node_3" }, "default_entry" : { - "action_id" : 39, + "action_id" : 37, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -4874,14 +4886,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [47], - "actions" : ["act_7"], + "action_ids" : [36], + "actions" : ["act"], "base_default_next" : "node_5", "next_tables" : { - "act_7" : "node_5" + "act" : "node_5" }, "default_entry" : { - "action_id" : 47, + "action_id" : 36, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -4897,14 +4909,106 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [42], - "actions" : ["act_2"], - "base_default_next" : "FabricIngress.spgw_ingress.s1u_filter_table", + "action_ids" : [40], + "actions" : ["act_3"], + "base_default_next" : "node_7", "next_tables" : { - "act_2" : "FabricIngress.spgw_ingress.s1u_filter_table" + "act_3" : "node_7" }, "default_entry" : { - "action_id" : 42, + "action_id" : 40, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_2", + "id" : 3, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [38], + "actions" : ["act_1"], + "base_default_next" : "node_10", + "next_tables" : { + "act_1" : "node_10" + }, + "default_entry" : { + "action_id" : 38, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_3", + "id" : 4, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [39], + "actions" : ["act_2"], + "base_default_next" : "node_10", + "next_tables" : { + "act_2" : "node_10" + }, + "default_entry" : { + "action_id" : 39, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_4", + "id" : 5, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [41], + "actions" : ["act_4"], + "base_default_next" : null, + "next_tables" : { + "act_4" : null + }, + "default_entry" : { + "action_id" : 41, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_5", + "id" : 6, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [49], + "actions" : ["act_12"], + "base_default_next" : "node_13", + "next_tables" : { + "act_12" : "node_13" + }, + "default_entry" : { + "action_id" : 49, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -4912,18 +5016,18 @@ }, { "name" : "FabricIngress.spgw_ingress.s1u_filter_table", - "id" : 3, + "id" : 7, "source_info" : { "filename" : "include/spgw.p4", - "line" : 60, + "line" : 79, "column" : 10, "source_fragment" : "s1u_filter_table" }, "key" : [ { "match_type" : "exact", - "name" : "spgw_meta.s1u_sgw_addr", - "target" : ["userMetadata.spgw", "s1u_sgw_addr"], + "name" : "gtpu_ipv4.dst_addr", + "target" : ["gtpu_ipv4", "dst_addr"], "mask" : null } ], @@ -4937,8 +5041,8 @@ "actions" : ["NoAction"], "base_default_next" : null, "next_tables" : { - "__HIT__" : "tbl_act_2", - "__MISS__" : "tbl_act_3" + "__HIT__" : "tbl_act_6", + "__MISS__" : "tbl_act_7" }, "default_entry" : { "action_id" : 1, @@ -4948,8 +5052,8 @@ } }, { - "name" : "tbl_act_2", - "id" : 4, + "name" : "tbl_act_6", + "id" : 8, "key" : [], "match_type" : "exact", "type" : "simple", @@ -4957,45 +5061,22 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [40], - "actions" : ["act_0"], - "base_default_next" : "node_10", + "action_ids" : [42], + "actions" : ["act_5"], + "base_default_next" : "node_17", "next_tables" : { - "act_0" : "node_10" + "act_5" : "node_17" }, "default_entry" : { - "action_id" : 40, + "action_id" : 42, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_act_3", - "id" : 5, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [41], - "actions" : ["act_1"], - "base_default_next" : "node_10", - "next_tables" : { - "act_1" : "node_10" - }, - "default_entry" : { - "action_id" : 41, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_4", - "id" : 6, + "name" : "tbl_act_7", + "id" : 9, "key" : [], "match_type" : "exact", "type" : "simple", @@ -5004,10 +5085,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [43], - "actions" : ["act_3"], + "actions" : ["act_6"], "base_default_next" : "node_17", "next_tables" : { - "act_3" : "node_17" + "act_6" : "node_17" }, "default_entry" : { "action_id" : 43, @@ -5017,90 +5098,7 @@ } }, { - "name" : "FabricIngress.spgw_ingress.ue_filter_table", - "id" : 7, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 50, - "column" : 10, - "source_fragment" : "ue_filter_table" - }, - "key" : [ - { - "match_type" : "lpm", - "name" : "ipv4.dst_addr", - "target" : ["ipv4", "dst_addr"], - "mask" : null - } - ], - "match_type" : "lpm", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [0], - "actions" : ["NoAction"], - "base_default_next" : null, - "next_tables" : { - "__HIT__" : "tbl_act_5", - "__MISS__" : "tbl_act_6" - }, - "default_entry" : { - "action_id" : 0, - "action_const" : false, - "action_data" : [], - "action_entry_const" : false - } - }, - { - "name" : "tbl_act_5", - "id" : 8, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [44], - "actions" : ["act_4"], - "base_default_next" : "node_15", - "next_tables" : { - "act_4" : "node_15" - }, - "default_entry" : { - "action_id" : 44, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_6", - "id" : 9, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [45], - "actions" : ["act_5"], - "base_default_next" : "node_15", - "next_tables" : { - "act_5" : "node_15" - }, - "default_entry" : { - "action_id" : 45, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_7", + "name" : "tbl_drop_now", "id" : 10, "key" : [], "match_type" : "exact", @@ -5109,14 +5107,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [46], - "actions" : ["act_6"], - "base_default_next" : "node_17", + "action_ids" : [11], + "actions" : ["drop_now"], + "base_default_next" : "tbl_act_8", "next_tables" : { - "act_6" : "node_17" + "drop_now" : "tbl_act_8" }, "default_entry" : { - "action_id" : 46, + "action_id" : 11, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -5132,14 +5130,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [48], - "actions" : ["act_8"], - "base_default_next" : "node_19", + "action_ids" : [44], + "actions" : ["act_7"], + "base_default_next" : "tbl_spgw_ingress_gtpu_decap", "next_tables" : { - "act_8" : "node_19" + "act_7" : "tbl_spgw_ingress_gtpu_decap" }, "default_entry" : { - "action_id" : 48, + "action_id" : 44, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -5155,14 +5153,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [14], + "action_ids" : [12], "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"], - "base_default_next" : "node_22", + "base_default_next" : "node_27", "next_tables" : { - "FabricIngress.spgw_ingress.gtpu_decap" : "node_22" + "FabricIngress.spgw_ingress.gtpu_decap" : "node_27" }, "default_entry" : { - "action_id" : 14, + "action_id" : 12, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -5173,7 +5171,7 @@ "id" : 13, "source_info" : { "filename" : "include/spgw.p4", - "line" : 119, + "line" : 68, "column" : 10, "source_fragment" : "dl_sess_lookup" }, @@ -5188,131 +5186,117 @@ "match_type" : "exact", "type" : "simple", "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [15, 2], - "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"], - "base_default_next" : null, - "next_tables" : { - "__HIT__" : "tbl_act_9", - "__MISS__" : "tbl_act_10" - }, - "default_entry" : { - "action_id" : 2, - "action_const" : false, - "action_data" : [], - "action_entry_const" : false - } - }, - { - "name" : "tbl_act_9", - "id" : 14, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [49], - "actions" : ["act_9"], - "base_default_next" : "node_26", - "next_tables" : { - "act_9" : "node_26" - }, - "default_entry" : { - "action_id" : 49, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_10", - "id" : 15, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [50], - "actions" : ["act_10"], - "base_default_next" : "node_26", - "next_tables" : { - "act_10" : "node_26" - }, - "default_entry" : { - "action_id" : 50, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_drop_now", - "id" : 16, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [13], - "actions" : ["drop_now"], - "base_default_next" : "FabricIngress.spgw_ingress.ue_cdr_table", - "next_tables" : { - "drop_now" : "FabricIngress.spgw_ingress.ue_cdr_table" - }, - "default_entry" : { - "action_id" : 13, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "FabricIngress.spgw_ingress.ue_cdr_table", - "id" : 17, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 129, - "column" : 10, - "source_fragment" : "ue_cdr_table" - }, - "key" : [ - { - "match_type" : "exact", - "name" : "ipv4.dst_addr", - "target" : ["ipv4", "dst_addr"], - "mask" : null - } - ], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [16, 3], - "actions" : ["FabricIngress.spgw_ingress.update_ue_cdr", "NoAction"], - "base_default_next" : "tbl_act_11", + "action_ids" : [13, 0], + "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"], + "base_default_next" : null, "next_tables" : { - "FabricIngress.spgw_ingress.update_ue_cdr" : "tbl_act_11", - "NoAction" : "tbl_act_11" + "__HIT__" : "tbl_act_9", + "__MISS__" : "tbl_act_10" }, "default_entry" : { - "action_id" : 3, + "action_id" : 0, "action_const" : false, "action_data" : [], "action_entry_const" : false } }, + { + "name" : "tbl_act_9", + "id" : 14, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [45], + "actions" : ["act_8"], + "base_default_next" : "node_24", + "next_tables" : { + "act_8" : "node_24" + }, + "default_entry" : { + "action_id" : 45, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_10", + "id" : 15, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [46], + "actions" : ["act_9"], + "base_default_next" : "node_24", + "next_tables" : { + "act_9" : "node_24" + }, + "default_entry" : { + "action_id" : 46, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, { "name" : "tbl_act_11", + "id" : 16, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [47], + "actions" : ["act_10"], + "base_default_next" : "node_27", + "next_tables" : { + "act_10" : "node_27" + }, + "default_entry" : { + "action_id" : 47, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_12", + "id" : 17, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [48], + "actions" : ["act_11"], + "base_default_next" : "node_27", + "next_tables" : { + "act_11" : "node_27" + }, + "default_entry" : { + "action_id" : 48, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_13", "id" : 18, "key" : [], "match_type" : "exact", @@ -5321,14 +5305,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [51], - "actions" : ["act_11"], + "action_ids" : [50], + "actions" : ["act_13"], "base_default_next" : "FabricIngress.filtering.ingress_port_vlan", "next_tables" : { - "act_11" : "FabricIngress.filtering.ingress_port_vlan" + "act_13" : "FabricIngress.filtering.ingress_port_vlan" }, "default_entry" : { - "action_id" : 51, + "action_id" : 50, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -5369,7 +5353,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [19, 18, 10, 17], + "action_ids" : [16, 15, 8, 14], "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "nop", "FabricIngress.filtering.drop"], "base_default_next" : "FabricIngress.filtering.fwd_classifier", "next_tables" : { @@ -5379,7 +5363,7 @@ "FabricIngress.filtering.drop" : "FabricIngress.filtering.fwd_classifier" }, "default_entry" : { - "action_id" : 10, + "action_id" : 8, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -5420,14 +5404,14 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [20], + "action_ids" : [17], "actions" : ["FabricIngress.filtering.set_forwarding_type"], - "base_default_next" : "node_32", + "base_default_next" : "node_31", "next_tables" : { - "FabricIngress.filtering.set_forwarding_type" : "node_32" + "FabricIngress.filtering.set_forwarding_type" : "node_31" }, "default_entry" : { - "action_id" : 20, + "action_id" : 17, "action_const" : true, "action_data" : ["0x0"], "action_entry_const" : true @@ -5462,7 +5446,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [21, 4], + "action_ids" : [18, 2], "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"], "base_default_next" : "FabricIngress.forwarding.acl", "next_tables" : { @@ -5470,7 +5454,7 @@ "NoAction" : "FabricIngress.forwarding.acl" }, "default_entry" : { - "action_id" : 4, + "action_id" : 2, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -5499,22 +5483,22 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [22, 5], + "action_ids" : [19, 3], "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"], - "base_default_next" : "tbl_act_12", + "base_default_next" : "tbl_act_14", "next_tables" : { - "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_12", - "NoAction" : "tbl_act_12" + "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_14", + "NoAction" : "tbl_act_14" }, "default_entry" : { - "action_id" : 5, + "action_id" : 3, "action_const" : false, "action_data" : [], "action_entry_const" : false } }, { - "name" : "tbl_act_12", + "name" : "tbl_act_14", "id" : 23, "key" : [], "match_type" : "exact", @@ -5523,14 +5507,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [52], - "actions" : ["act_12"], + "action_ids" : [51], + "actions" : ["act_14"], "base_default_next" : "FabricIngress.forwarding.acl", "next_tables" : { - "act_12" : "FabricIngress.forwarding.acl" + "act_14" : "FabricIngress.forwarding.acl" }, "default_entry" : { - "action_id" : 52, + "action_id" : 51, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -5559,7 +5543,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [23, 6], + "action_ids" : [20, 4], "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"], "base_default_next" : "FabricIngress.forwarding.acl", "next_tables" : { @@ -5567,7 +5551,7 @@ "NoAction" : "FabricIngress.forwarding.acl" }, "default_entry" : { - "action_id" : 6, + "action_id" : 4, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -5662,25 +5646,25 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [24, 25, 26, 27, 11], + "action_ids" : [21, 22, 23, 24, 9], "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "nop"], - "base_default_next" : "tbl_act_13", + "base_default_next" : "tbl_act_15", "next_tables" : { - "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_13", - "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_13", - "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_13", - "FabricIngress.forwarding.drop" : "tbl_act_13", - "nop" : "tbl_act_13" + "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" }, "default_entry" : { - "action_id" : 11, + "action_id" : 9, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_act_13", + "name" : "tbl_act_15", "id" : 26, "key" : [], "match_type" : "exact", @@ -5689,14 +5673,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [53], - "actions" : ["act_13"], + "action_ids" : [52], + "actions" : ["act_15"], "base_default_next" : "FabricIngress.next.vlan_meta", "next_tables" : { - "act_13" : "FabricIngress.next.vlan_meta" + "act_15" : "FabricIngress.next.vlan_meta" }, "default_entry" : { - "action_id" : 53, + "action_id" : 52, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -5725,7 +5709,7 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [28, 12], + "action_ids" : [25, 10], "actions" : ["FabricIngress.next.set_vlan", "nop"], "base_default_next" : "FabricIngress.next.simple", "next_tables" : { @@ -5733,7 +5717,7 @@ "nop" : "FabricIngress.next.simple" }, "default_entry" : { - "action_id" : 12, + "action_id" : 10, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -5762,22 +5746,22 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [29, 30, 31, 32, 33, 34, 7], + "action_ids" : [26, 27, 28, 29, 30, 31, 5], "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"], "base_default_next" : null, "next_tables" : { - "__HIT__" : "tbl_act_14", - "__MISS__" : "tbl_act_15" + "__HIT__" : "tbl_act_16", + "__MISS__" : "tbl_act_17" }, "default_entry" : { - "action_id" : 7, + "action_id" : 5, "action_const" : false, "action_data" : [], "action_entry_const" : false } }, { - "name" : "tbl_act_14", + "name" : "tbl_act_16", "id" : 29, "key" : [], "match_type" : "exact", @@ -5786,21 +5770,21 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [54], - "actions" : ["act_14"], - "base_default_next" : "node_45", + "action_ids" : [53], + "actions" : ["act_16"], + "base_default_next" : "node_44", "next_tables" : { - "act_14" : "node_45" + "act_16" : "node_44" }, "default_entry" : { - "action_id" : 54, + "action_id" : 53, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_act_15", + "name" : "tbl_act_17", "id" : 30, "key" : [], "match_type" : "exact", @@ -5809,14 +5793,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [55], - "actions" : ["act_15"], - "base_default_next" : "node_45", + "action_ids" : [54], + "actions" : ["act_17"], + "base_default_next" : "node_44", "next_tables" : { - "act_15" : "node_45" + "act_17" : "node_44" }, "default_entry" : { - "action_id" : 55, + "action_id" : 54, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -5846,16 +5830,16 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [35, 36, 37, 8], + "action_ids" : [32, 33, 34, 6], "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"], "base_default_next" : null, "next_tables" : { - "__HIT__" : "tbl_act_16", - "__MISS__" : "tbl_act_17" + "__HIT__" : "tbl_act_18", + "__MISS__" : "tbl_act_19" } }, { - "name" : "tbl_act_16", + "name" : "tbl_act_18", "id" : 32, "key" : [], "match_type" : "exact", @@ -5864,21 +5848,21 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [56], - "actions" : ["act_16"], - "base_default_next" : "node_49", + "action_ids" : [55], + "actions" : ["act_18"], + "base_default_next" : "node_48", "next_tables" : { - "act_16" : "node_49" + "act_18" : "node_48" }, "default_entry" : { - "action_id" : 56, + "action_id" : 55, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_act_17", + "name" : "tbl_act_19", "id" : 33, "key" : [], "match_type" : "exact", @@ -5887,14 +5871,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [57], - "actions" : ["act_17"], - "base_default_next" : "node_49", + "action_ids" : [56], + "actions" : ["act_19"], + "base_default_next" : "node_48", "next_tables" : { - "act_17" : "node_49" + "act_19" : "node_48" }, "default_entry" : { - "action_id" : 57, + "action_id" : 56, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -5923,22 +5907,22 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [38, 9], + "action_ids" : [35, 7], "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"], "base_default_next" : null, "next_tables" : { - "__HIT__" : "tbl_act_18", - "__MISS__" : "tbl_act_19" + "__HIT__" : "tbl_act_20", + "__MISS__" : "tbl_act_21" }, "default_entry" : { - "action_id" : 9, + "action_id" : 7, "action_const" : false, "action_data" : [], "action_entry_const" : false } }, { - "name" : "tbl_act_18", + "name" : "tbl_act_20", "id" : 35, "key" : [], "match_type" : "exact", @@ -5947,11 +5931,34 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [58], - "actions" : ["act_18"], - "base_default_next" : "node_53", + "action_ids" : [57], + "actions" : ["act_20"], + "base_default_next" : "node_52", "next_tables" : { - "act_18" : "node_53" + "act_20" : "node_52" + }, + "default_entry" : { + "action_id" : 57, + "action_const" : true, + "action_data" : [], + "action_entry_const" : true + } + }, + { + "name" : "tbl_act_21", + "id" : 36, + "key" : [], + "match_type" : "exact", + "type" : "simple", + "max_size" : 1024, + "with_counters" : false, + "support_timeout" : false, + "direct_meters" : null, + "action_ids" : [58], + "actions" : ["act_21"], + "base_default_next" : "node_52", + "next_tables" : { + "act_21" : "node_52" }, "default_entry" : { "action_id" : 58, @@ -5961,8 +5968,8 @@ } }, { - "name" : "tbl_act_19", - "id" : 36, + "name" : "tbl_act_22", + "id" : 37, "key" : [], "match_type" : "exact", "type" : "simple", @@ -5971,10 +5978,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [59], - "actions" : ["act_19"], - "base_default_next" : "node_53", + "actions" : ["act_22"], + "base_default_next" : "node_54", "next_tables" : { - "act_19" : "node_53" + "act_22" : "node_54" }, "default_entry" : { "action_id" : 59, @@ -5984,8 +5991,8 @@ } }, { - "name" : "tbl_act_20", - "id" : 37, + "name" : "tbl_act_23", + "id" : 38, "key" : [], "match_type" : "exact", "type" : "simple", @@ -5994,10 +6001,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [60], - "actions" : ["act_20"], - "base_default_next" : "node_55", + "actions" : ["act_23"], + "base_default_next" : "node_58", "next_tables" : { - "act_20" : "node_55" + "act_23" : "node_58" }, "default_entry" : { "action_id" : 60, @@ -6007,8 +6014,8 @@ } }, { - "name" : "tbl_act_21", - "id" : 38, + "name" : "tbl_act_24", + "id" : 39, "key" : [], "match_type" : "exact", "type" : "simple", @@ -6017,10 +6024,10 @@ "support_timeout" : false, "direct_meters" : null, "action_ids" : [61], - "actions" : ["act_21"], - "base_default_next" : "node_59", + "actions" : ["act_24"], + "base_default_next" : "node_60", "next_tables" : { - "act_21" : "node_59" + "act_24" : "node_60" }, "default_entry" : { "action_id" : 61, @@ -6030,30 +6037,7 @@ } }, { - "name" : "tbl_act_22", - "id" : 39, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [62], - "actions" : ["act_22"], - "base_default_next" : "node_61", - "next_tables" : { - "act_22" : "node_61" - }, - "default_entry" : { - "action_id" : 62, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_act_23", + "name" : "tbl_act_25", "id" : 40, "key" : [], "match_type" : "exact", @@ -6062,14 +6046,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [63], - "actions" : ["act_23"], + "action_ids" : [62], + "actions" : ["act_25"], "base_default_next" : null, "next_tables" : { - "act_23" : null + "act_25" : null }, "default_entry" : { - "action_id" : 63, + "action_id" : 62, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -6110,8 +6094,85 @@ ], "conditionals" : [ { - "name" : "node_2", + "name" : "node_3", "id" : 0, + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 30, + "column" : 12, + "source_fragment" : "! is_gtpu_encapped" + }, + "expression" : { + "type" : "expression", + "value" : { + "op" : "not", + "left" : null, + "right" : { + "type" : "expression", + "value" : { + "op" : "d2b", + "left" : null, + "right" : { + "type" : "field", + "value" : ["gtpu", "$valid$"] + } + } + } + } + }, + "true_next" : "tbl_act_0", + "false_next" : "node_5" + }, + { + "name" : "node_5", + "id" : 1, + "expression" : { + "type" : "expression", + "value" : { + "op" : "not", + "left" : null, + "right" : { + "type" : "expression", + "value" : { + "op" : "d2b", + "left" : null, + "right" : { + "type" : "field", + "value" : ["scalars", "spgw_normalizer_hasReturned_0"] + } + } + } + } + }, + "true_next" : "tbl_act_1", + "false_next" : "node_10" + }, + { + "name" : "node_7", + "id" : 2, + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 34, + "column" : 12, + "source_fragment" : "inner_udp.isValid()" + }, + "expression" : { + "type" : "expression", + "value" : { + "op" : "d2b", + "left" : null, + "right" : { + "type" : "field", + "value" : ["inner_udp", "$valid$"] + } + } + }, + "true_next" : "tbl_act_2", + "false_next" : "tbl_act_3" + }, + { + "name" : "node_10", + "id" : 3, "source_info" : { "filename" : "include/control/packetio.p4", "line" : 25, @@ -6129,15 +6190,15 @@ } } }, - "true_next" : "tbl_act", - "false_next" : "tbl_act_0" + "true_next" : "tbl_act_4", + "false_next" : "tbl_act_5" }, { - "name" : "node_5", - "id" : 1, + "name" : "node_13", + "id" : 4, "source_info" : { "filename" : "include/spgw.p4", - "line" : 142, + "line" : 139, "column" : 12, "source_fragment" : "gtpu.isValid()" }, @@ -6152,12 +6213,42 @@ } } }, - "true_next" : "tbl_act_1", - "false_next" : "FabricIngress.spgw_ingress.ue_filter_table" + "true_next" : "FabricIngress.spgw_ingress.s1u_filter_table", + "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup" }, { - "name" : "node_10", - "id" : 2, + "name" : "node_17", + "id" : 5, + "source_info" : { + "filename" : "include/spgw.p4", + "line" : 143, + "column" : 16, + "source_fragment" : "!s1u_filter_table.apply().hit" + }, + "expression" : { + "type" : "expression", + "value" : { + "op" : "not", + "left" : null, + "right" : { + "type" : "expression", + "value" : { + "op" : "d2b", + "left" : null, + "right" : { + "type" : "field", + "value" : ["scalars", "spgw_ingress_tmp_1"] + } + } + } + } + }, + "true_next" : "tbl_drop_now", + "false_next" : "tbl_act_8" + }, + { + "name" : "node_24", + "id" : 6, "expression" : { "type" : "expression", "value" : { @@ -6169,62 +6260,12 @@ } } }, - "true_next" : "tbl_act_4", - "false_next" : "node_17" + "true_next" : "tbl_act_11", + "false_next" : "tbl_act_12" }, { - "name" : "node_15", - "id" : 3, - "expression" : { - "type" : "expression", - "value" : { - "op" : "d2b", - "left" : null, - "right" : { - "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_3"] - } - } - }, - "true_next" : "tbl_act_7", - "false_next" : "node_17" - }, - { - "name" : "node_17", - "id" : 4, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 162, - "column" : 12, - "source_fragment" : "spgw_meta.do_spgw == false" - }, - "expression" : { - "type" : "expression", - "value" : { - "op" : "==", - "left" : { - "type" : "expression", - "value" : { - "op" : "d2b", - "left" : null, - "right" : { - "type" : "field", - "value" : ["userMetadata.spgw", "do_spgw"] - } - } - }, - "right" : { - "type" : "bool", - "value" : false - } - } - }, - "true_next" : "tbl_act_8", - "false_next" : "node_19" - }, - { - "name" : "node_19", - "id" : 5, + "name" : "node_27", + "id" : 7, "expression" : { "type" : "expression", "value" : { @@ -6243,94 +6284,12 @@ } } }, - "true_next" : "node_20", + "true_next" : "tbl_act_13", "false_next" : "FabricIngress.filtering.ingress_port_vlan" }, { - "name" : "node_20", - "id" : 6, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 167, - "column" : 12, - "source_fragment" : "spgw_meta.direction == DIR_UPLINK" - }, - "expression" : { - "type" : "expression", - "value" : { - "op" : "==", - "left" : { - "type" : "field", - "value" : ["userMetadata.spgw", "direction"] - }, - "right" : { - "type" : "hexstr", - "value" : "0x00" - } - } - }, - "true_next" : "tbl_spgw_ingress_gtpu_decap", - "false_next" : "node_22" - }, - { - "name" : "node_22", - "id" : 7, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 184, - "column" : 12, - "source_fragment" : "spgw_meta.direction == DIR_DOWNLINK" - }, - "expression" : { - "type" : "expression", - "value" : { - "op" : "==", - "left" : { - "type" : "field", - "value" : ["userMetadata.spgw", "direction"] - }, - "right" : { - "type" : "hexstr", - "value" : "0x01" - } - } - }, - "true_next" : "FabricIngress.spgw_ingress.dl_sess_lookup", - "false_next" : "tbl_act_11" - }, - { - "name" : "node_26", + "name" : "node_31", "id" : 8, - "source_info" : { - "filename" : "include/spgw.p4", - "line" : 185, - "column" : 16, - "source_fragment" : "!dl_sess_lookup.apply().hit" - }, - "expression" : { - "type" : "expression", - "value" : { - "op" : "not", - "left" : null, - "right" : { - "type" : "expression", - "value" : { - "op" : "d2b", - "left" : null, - "right" : { - "type" : "field", - "value" : ["scalars", "spgw_ingress_tmp_4"] - } - } - } - } - }, - "true_next" : "tbl_drop_now", - "false_next" : "FabricIngress.spgw_ingress.ue_cdr_table" - }, - { - "name" : "node_32", - "id" : 9, "source_info" : { "filename" : "include/control/forwarding.p4", "line" : 231, @@ -6352,11 +6311,11 @@ } }, "true_next" : "FabricIngress.forwarding.bridging", - "false_next" : "node_34" + "false_next" : "node_33" }, { - "name" : "node_34", - "id" : 10, + "name" : "node_33", + "id" : 9, "source_info" : { "filename" : "include/control/forwarding.p4", "line" : 232, @@ -6378,11 +6337,11 @@ } }, "true_next" : "FabricIngress.forwarding.mpls", - "false_next" : "node_37" + "false_next" : "node_36" }, { - "name" : "node_37", - "id" : 11, + "name" : "node_36", + "id" : 10, "source_info" : { "filename" : "include/control/forwarding.p4", "line" : 246, @@ -6407,8 +6366,8 @@ "false_next" : "FabricIngress.forwarding.acl" }, { - "name" : "node_45", - "id" : 12, + "name" : "node_44", + "id" : 11, "source_info" : { "filename" : "include/control/next.p4", "line" : 219, @@ -6434,11 +6393,11 @@ } }, "true_next" : "FabricIngress.next.hashed", - "false_next" : "node_55" + "false_next" : "node_54" }, { - "name" : "node_49", - "id" : 13, + "name" : "node_48", + "id" : 12, "source_info" : { "filename" : "include/control/next.p4", "line" : 220, @@ -6464,11 +6423,11 @@ } }, "true_next" : "FabricIngress.next.multicast", - "false_next" : "node_55" + "false_next" : "node_54" }, { - "name" : "node_53", - "id" : 14, + "name" : "node_52", + "id" : 13, "source_info" : { "filename" : "include/control/next.p4", "line" : 221, @@ -6493,12 +6452,12 @@ } } }, - "true_next" : "tbl_act_20", - "false_next" : "node_55" + "true_next" : "tbl_act_22", + "false_next" : "node_54" }, { - "name" : "node_55", - "id" : 15, + "name" : "node_54", + "id" : 14, "expression" : { "type" : "expression", "value" : { @@ -6517,12 +6476,12 @@ } } }, - "true_next" : "node_56", - "false_next" : "node_59" + "true_next" : "node_55", + "false_next" : "node_58" }, { - "name" : "node_56", - "id" : 16, + "name" : "node_55", + "id" : 15, "source_info" : { "filename" : "include/control/next.p4", "line" : 228, @@ -6547,12 +6506,12 @@ } } }, - "true_next" : "node_57", - "false_next" : "node_59" + "true_next" : "node_56", + "false_next" : "node_58" }, { - "name" : "node_57", - "id" : 17, + "name" : "node_56", + "id" : 16, "source_info" : { "filename" : "include/control/next.p4", "line" : 229, @@ -6570,12 +6529,12 @@ } } }, - "true_next" : "tbl_act_21", - "false_next" : "node_59" + "true_next" : "tbl_act_23", + "false_next" : "node_58" }, { - "name" : "node_59", - "id" : 18, + "name" : "node_58", + "id" : 17, "source_info" : { "filename" : "include/control/port_counter.p4", "line" : 27, @@ -6596,12 +6555,12 @@ } } }, - "true_next" : "tbl_act_22", - "false_next" : "node_61" + "true_next" : "tbl_act_24", + "false_next" : "node_60" }, { - "name" : "node_61", - "id" : 19, + "name" : "node_60", + "id" : 18, "source_info" : { "filename" : "include/control/port_counter.p4", "line" : 30, @@ -6623,7 +6582,7 @@ } }, "false_next" : null, - "true_next" : "tbl_act_23" + "true_next" : "tbl_act_25" } ] }, @@ -6632,11 +6591,11 @@ "id" : 1, "source_info" : { "filename" : "fabric.p4", - "line" : 76, + "line" : 80, "column" : 8, "source_fragment" : "FabricEgress" }, - "init_table" : "node_65", + "init_table" : "node_64", "tables" : [ { "name" : "tbl_drop_now_0", @@ -6648,14 +6607,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [65], + "action_ids" : [64], "actions" : ["drop_now"], "base_default_next" : "FabricEgress.egress_next.egress_vlan", "next_tables" : { "drop_now" : "FabricEgress.egress_next.egress_vlan" }, "default_entry" : { - "action_id" : 65, + "action_id" : 64, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -6690,15 +6649,15 @@ "with_counters" : true, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [69, 64], + "action_ids" : [68, 63], "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"], - "base_default_next" : "node_68", + "base_default_next" : "node_67", "next_tables" : { - "FabricEgress.egress_next.pop_vlan" : "node_68", - "nop" : "node_68" + "FabricEgress.egress_next.pop_vlan" : "node_67", + "nop" : "node_67" }, "default_entry" : { - "action_id" : 64, + "action_id" : 63, "action_const" : false, "action_data" : [], "action_entry_const" : false @@ -6714,14 +6673,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [68], + "action_ids" : [67], "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"], - "base_default_next" : "node_71", + "base_default_next" : "node_70", "next_tables" : { - "FabricEgress.pkt_io_egress.pop_vlan" : "node_71" + "FabricEgress.pkt_io_egress.pop_vlan" : "node_70" }, "default_entry" : { - "action_id" : 68, + "action_id" : 67, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -6737,21 +6696,21 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [66], + "action_ids" : [65], "actions" : ["drop_now"], - "base_default_next" : "tbl_act_24", + "base_default_next" : "tbl_act_26", "next_tables" : { - "drop_now" : "tbl_act_24" + "drop_now" : "tbl_act_26" }, "default_entry" : { - "action_id" : 66, + "action_id" : 65, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_act_24", + "name" : "tbl_act_26", "id" : 45, "key" : [], "match_type" : "exact", @@ -6760,21 +6719,21 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [70], - "actions" : ["act_24"], - "base_default_next" : "tbl_act_25", + "action_ids" : [69], + "actions" : ["act_26"], + "base_default_next" : "node_73", "next_tables" : { - "act_24" : "tbl_act_25" + "act_26" : "node_73" }, "default_entry" : { - "action_id" : 70, + "action_id" : 69, "action_const" : true, "action_data" : [], "action_entry_const" : true } }, { - "name" : "tbl_act_25", + "name" : "tbl_spgw_egress_gtpu_encap", "id" : 46, "key" : [], "match_type" : "exact", @@ -6783,37 +6742,14 @@ "with_counters" : false, "support_timeout" : false, "direct_meters" : null, - "action_ids" : [71], - "actions" : ["act_25"], - "base_default_next" : "node_75", - "next_tables" : { - "act_25" : "node_75" - }, - "default_entry" : { - "action_id" : 71, - "action_const" : true, - "action_data" : [], - "action_entry_const" : true - } - }, - { - "name" : "tbl_spgw_egress_gtpu_encap", - "id" : 47, - "key" : [], - "match_type" : "exact", - "type" : "simple", - "max_size" : 1024, - "with_counters" : false, - "support_timeout" : false, - "direct_meters" : null, - "action_ids" : [67], + "action_ids" : [66], "actions" : ["FabricEgress.spgw_egress.gtpu_encap"], "base_default_next" : null, "next_tables" : { "FabricEgress.spgw_egress.gtpu_encap" : null }, "default_entry" : { - "action_id" : 67, + "action_id" : 66, "action_const" : true, "action_data" : [], "action_entry_const" : true @@ -6823,8 +6759,8 @@ "action_profiles" : [], "conditionals" : [ { - "name" : "node_65", - "id" : 20, + "name" : "node_64", + "id" : 19, "source_info" : { "filename" : "include/control/next.p4", "line" : 272, @@ -6876,8 +6812,8 @@ "false_next" : "FabricEgress.egress_next.egress_vlan" }, { - "name" : "node_68", - "id" : 21, + "name" : "node_67", + "id" : 20, "source_info" : { "filename" : "include/control/packetio.p4", "line" : 42, @@ -6898,12 +6834,12 @@ } } }, - "true_next" : "node_69", - "false_next" : "tbl_act_25" + "true_next" : "node_68", + "false_next" : "node_73" }, { - "name" : "node_69", - "id" : 22, + "name" : "node_68", + "id" : 21, "source_info" : { "filename" : "include/control/packetio.p4", "line" : 43, @@ -6949,11 +6885,11 @@ } }, "true_next" : "tbl_pkt_io_egress_pop_vlan", - "false_next" : "node_71" + "false_next" : "node_70" }, { - "name" : "node_71", - "id" : 23, + "name" : "node_70", + "id" : 22, "source_info" : { "filename" : "include/control/packetio.p4", "line" : 46, @@ -7009,55 +6945,28 @@ } }, "true_next" : "tbl_drop_now_1", - "false_next" : "tbl_act_24" + "false_next" : "tbl_act_26" }, { - "name" : "node_75", - "id" : 24, + "name" : "node_73", + "id" : 23, "source_info" : { "filename" : "include/spgw.p4", - "line" : 245, + "line" : 222, "column" : 12, - "source_fragment" : "spgw_meta.do_spgw == true && spgw_meta.direction == DIR_DOWNLINK" + "source_fragment" : "spgw_meta.direction == SPGW_DIR_DOWNLINK" }, "expression" : { "type" : "expression", "value" : { - "op" : "and", + "op" : "==", "left" : { - "type" : "expression", - "value" : { - "op" : "==", - "left" : { - "type" : "expression", - "value" : { - "op" : "d2b", - "left" : null, - "right" : { - "type" : "field", - "value" : ["userMetadata.spgw", "do_spgw"] - } - } - }, - "right" : { - "type" : "bool", - "value" : true - } - } + "type" : "field", + "value" : ["userMetadata.spgw", "direction"] }, "right" : { - "type" : "expression", - "value" : { - "op" : "==", - "left" : { - "type" : "field", - "value" : ["userMetadata.spgw", "direction"] - }, - "right" : { - "type" : "hexstr", - "value" : "0x01" - } - } + "type" : "hexstr", + "value" : "0x02" } } }, diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt index f480540f4a..aab0b4b8a3 100644 --- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt +++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt @@ -1,39 +1,3 @@ -tables { - preamble { - id: 33618733 - name: "FabricIngress.spgw_ingress.ue_filter_table" - alias: "ue_filter_table" - } - match_fields { - id: 1 - name: "ipv4.dst_addr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 16800567 - } - size: 1024 - idle_timeout_behavior: NO_TIMEOUT -} -tables { - preamble { - id: 33615906 - name: "FabricIngress.spgw_ingress.s1u_filter_table" - alias: "s1u_filter_table" - } - match_fields { - id: 1 - name: "spgw_meta.s1u_sgw_addr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 16800567 - } - size: 1024 - idle_timeout_behavior: NO_TIMEOUT -} tables { preamble { id: 33582731 @@ -53,29 +17,25 @@ tables { id: 16800567 annotations: "@defaultonly()" } + direct_resource_ids: 318781522 size: 1024 idle_timeout_behavior: NO_TIMEOUT } tables { preamble { - id: 33611263 - name: "FabricIngress.spgw_ingress.ue_cdr_table" - alias: "ue_cdr_table" + id: 33615906 + name: "FabricIngress.spgw_ingress.s1u_filter_table" + alias: "s1u_filter_table" } match_fields { id: 1 - name: "ipv4.dst_addr" + name: "gtpu_ipv4.dst_addr" bitwidth: 32 match_type: EXACT } - action_refs { - id: 16818129 - } action_refs { id: 16800567 - annotations: "@defaultonly()" } - direct_resource_ids: 318781522 size: 1024 idle_timeout_behavior: NO_TIMEOUT } @@ -520,13 +480,6 @@ actions { bitwidth: 32 } } -actions { - preamble { - id: 16818129 - name: "FabricIngress.spgw_ingress.update_ue_cdr" - alias: "update_ue_cdr" - } -} actions { preamble { id: 16798734 @@ -933,7 +886,7 @@ direct_counters { spec { unit: BOTH } - direct_table_id: 33611263 + direct_table_id: 33582731 } direct_counters { preamble { diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json index d5bc748d16..2627604739 100644 --- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json +++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json @@ -668,7 +668,7 @@ "id" : 0, "source_info" : { "filename" : "include/parser.p4", - "line" : 212, + "line" : 222, "column" : 8, "source_fragment" : "FabricDeparser" }, @@ -1093,7 +1093,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 74, + "line" : 89, "column" : 31, "source_fragment" : "0x8100; ..." } @@ -1708,7 +1708,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -1784,7 +1784,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -1899,7 +1899,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -1975,7 +1975,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -2267,7 +2267,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -2343,7 +2343,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -2458,7 +2458,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 75, + "line" : 90, "column" : 31, "source_fragment" : "0x8847; ..." } @@ -2534,7 +2534,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 95, + "line" : 110, "column" : 32, "source_fragment" : "64; ..." } @@ -2661,7 +2661,7 @@ ], "source_info" : { "filename" : "include/control/../define.p4", - "line" : 77, + "line" : 92, "column" : 31, "source_fragment" : "0x0800; ..." } @@ -4400,7 +4400,7 @@ "id" : 1, "source_info" : { "filename" : "fabric.p4", - "line" : 76, + "line" : 80, "column" : 8, "source_fragment" : "FabricEgress" },