Refactor fabric.p4
minor refactor for coding style
Change-Id: I7b73b9c3f439c66ce435404cb42fdb38323845b3
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 4bb1d92..86a4a11 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
@@ -118,6 +118,8 @@
PiCounterId.of("FabricIngress.forwarding.multicast_v4_counter");
public static final PiCounterId FABRIC_INGRESS_FORWARDING_UNICAST_V6_COUNTER =
PiCounterId.of("FabricIngress.forwarding.unicast_v6_counter");
+ public static final PiCounterId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN_COUNTER =
+ PiCounterId.of("FabricEgress.egress_next.egress_vlan_counter");
public static final PiCounterId FABRIC_INGRESS_FORWARDING_UNICAST_V4_COUNTER =
PiCounterId.of("FabricIngress.forwarding.unicast_v4_counter");
public static final PiCounterId FABRIC_INGRESS_NEXT_SIMPLE_COUNTER =
@@ -129,44 +131,60 @@
public static final PiCounterId FABRIC_INGRESS_NEXT_HASHED_COUNTER =
PiCounterId.of("FabricIngress.next.hashed_counter");
// Action IDs
- public static final PiActionId FABRIC_INGRESS_FILTERING_DROP =
- PiActionId.of("FabricIngress.filtering.drop");
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_SEND_TO_CONTROLLER =
+ PiActionId.of("FabricIngress.forwarding.send_to_controller");
+ public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V6_SIMPLE =
+ PiActionId.of("FabricIngress.next.mpls_routing_v6_simple");
+ 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_NEXT_SET_VLAN =
PiActionId.of("FabricIngress.next.set_vlan");
- public static final PiActionId FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT =
- PiActionId.of("FabricIngress.forwarding.pop_mpls_and_next");
- public static final PiActionId FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN =
- PiActionId.of("FabricEgress.egress_next.pop_vlan");
- public static final PiActionId FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE =
- PiActionId.of("FabricIngress.filtering.set_forwarding_type");
- public static final PiActionId NOP = PiActionId.of("nop");
- public static final PiActionId FABRIC_INGRESS_FILTERING_SET_VLAN =
- PiActionId.of("FabricIngress.filtering.set_vlan");
- public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V6 =
- PiActionId.of("FabricIngress.next.mpls_routing_v6");
public static final PiActionId FABRIC_EGRESS_PKT_IO_EGRESS_POP_VLAN =
PiActionId.of("FabricEgress.pkt_io_egress.pop_vlan");
- public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_VLAN =
- PiActionId.of("FabricIngress.next.l3_routing_vlan");
- public static final PiActionId NO_ACTION = PiActionId.of("NoAction");
+ public static final PiActionId FABRIC_INGRESS_FILTERING_SET_VLAN =
+ PiActionId.of("FabricIngress.filtering.set_vlan");
+ public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_SIMPLE =
+ PiActionId.of("FabricIngress.next.l3_routing_simple");
public static final PiActionId FABRIC_INGRESS_NEXT_SET_MCAST_GROUP =
PiActionId.of("FabricIngress.next.set_mcast_group");
- public static final PiActionId FABRIC_INGRESS_FORWARDING_DUPLICATE_TO_CONTROLLER =
- PiActionId.of("FabricIngress.forwarding.duplicate_to_controller");
- public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING =
- PiActionId.of("FabricIngress.next.l3_routing");
- public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4 =
- PiActionId.of("FabricIngress.next.mpls_routing_v4");
- public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN_OUTPUT =
- PiActionId.of("FabricIngress.next.set_vlan_output");
- public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID =
- PiActionId.of("FabricIngress.forwarding.set_next_id");
public static final PiActionId FABRIC_INGRESS_FILTERING_PUSH_INTERNAL_VLAN =
PiActionId.of("FabricIngress.filtering.push_internal_vlan");
+ public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V6_HASHED =
+ PiActionId.of("FabricIngress.next.mpls_routing_v6_hashed");
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT =
+ PiActionId.of("FabricIngress.forwarding.pop_mpls_and_next");
+ public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_HASHED =
+ PiActionId.of("FabricIngress.next.l3_routing_hashed");
+ public static final PiActionId FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN =
+ PiActionId.of("FabricEgress.egress_next.pop_vlan");
+ public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_HASHED =
+ PiActionId.of("FabricIngress.next.mpls_routing_v4_hashed");
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V6 =
+ PiActionId.of("FabricIngress.forwarding.set_next_id_unicast_v6");
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V4 =
+ PiActionId.of("FabricIngress.forwarding.set_next_id_unicast_v4");
+ public static final PiActionId NOP = PiActionId.of("nop");
public static final PiActionId FABRIC_INGRESS_FORWARDING_DROP =
PiActionId.of("FabricIngress.forwarding.drop");
- public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT =
- PiActionId.of("FabricIngress.next.output");
+ public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE =
+ PiActionId.of("FabricIngress.next.output_simple");
+ public static final PiActionId FABRIC_INGRESS_FILTERING_DROP =
+ PiActionId.of("FabricIngress.filtering.drop");
+ public static final PiActionId FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE =
+ PiActionId.of("FabricIngress.filtering.set_forwarding_type");
+ public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN_OUTPUT =
+ PiActionId.of("FabricIngress.next.set_vlan_output");
+ public static final PiActionId NO_ACTION = PiActionId.of("NoAction");
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_MULTICAST_V6 =
+ PiActionId.of("FabricIngress.forwarding.set_next_id_multicast_v6");
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_MULTICAST_V4 =
+ PiActionId.of("FabricIngress.forwarding.set_next_id_multicast_v4");
+ public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_SIMPLE =
+ PiActionId.of("FabricIngress.next.mpls_routing_v4_simple");
+ public static final PiActionId FABRIC_INGRESS_NEXT_L3_ROUTING_VLAN =
+ PiActionId.of("FabricIngress.next.l3_routing_vlan");
+ public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ACL =
+ PiActionId.of("FabricIngress.forwarding.set_next_id_acl");
// Action Param IDs
public static final PiActionParamId DMAC = PiActionParamId.of("dmac");
public static final PiActionParamId PORT_NUM =
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
index 11f551e..8fbff96 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
@@ -164,13 +164,13 @@
throws PiInterpreterException {
if (FILTERING_CTRL_TBLS.contains(piTableId)) {
- return FabricTreatmentInterpreter.mapFilteringTreatment(treatment);
+ return FabricTreatmentInterpreter.mapFilteringTreatment(treatment, piTableId);
} else if (FORWARDING_CTRL_TBLS.contains(piTableId)) {
- return FabricTreatmentInterpreter.mapForwardingTreatment(treatment);
+ return FabricTreatmentInterpreter.mapForwardingTreatment(treatment, piTableId);
} else if (NEXT_CTRL_TBLS.contains(piTableId)) {
- return FabricTreatmentInterpreter.mapNextTreatment(treatment);
+ return FabricTreatmentInterpreter.mapNextTreatment(treatment, piTableId);
} else if (E_NEXT_CTRL_TBLS.contains(piTableId)) {
- return FabricTreatmentInterpreter.mapEgressNextTreatment(treatment);
+ return FabricTreatmentInterpreter.mapEgressNextTreatment(treatment, piTableId);
} else {
throw new PiInterpreterException(String.format("Table %s unsupported", piTableId));
}
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
index 2c41985..921b5f4 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricTreatmentInterpreter.java
@@ -33,6 +33,7 @@
import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModVlanIdInstruction;
import org.onosproject.net.pi.model.PiActionId;
import org.onosproject.net.pi.model.PiPipelineInterpreter.PiInterpreterException;
+import org.onosproject.net.pi.model.PiTableId;
import org.onosproject.net.pi.runtime.PiAction;
import org.onosproject.net.pi.runtime.PiActionParam;
import org.slf4j.Logger;
@@ -64,16 +65,16 @@
/*
* In Filtering block, we need to implement these actions:
- *
* push_internal_vlan
* set_vlan
* nop
*
* Unsupported, using PiAction directly:
* set_forwarding_type
+ * drop
*/
- static PiAction mapFilteringTreatment(TrafficTreatment treatment)
+ static PiAction mapFilteringTreatment(TrafficTreatment treatment, PiTableId tableId)
throws PiInterpreterException {
List<Instruction> instructions = treatment.allInstructions();
Instruction noActInst = Instructions.createNoAction();
@@ -122,15 +123,20 @@
/*
* In forwarding block, we need to implement these actions:
- * duplicate_to_controller
+ * send_to_controller
*
* Unsupported, using PiAction directly:
- * set_next_id
- * push_mpls_and_next_v4
- * push_mpls_and_next_v6
+ * set_next_id_bridging
+ * pop_mpls_and_next
+ * set_next_id_unicast_v4
+ * set_next_id_multicast_v4
+ * set_next_id_acl
+ * drop
+ * set_next_id_unicast_v6
+ * set_next_id_multicast_v6
*/
- public static PiAction mapForwardingTreatment(TrafficTreatment treatment)
+ public static PiAction mapForwardingTreatment(TrafficTreatment treatment, PiTableId tableId)
throws PiInterpreterException {
// Empty treatment, generate table entry with no action
if (treatment.equals(DefaultTrafficTreatment.emptyTreatment())) {
@@ -155,23 +161,31 @@
}
return PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_DUPLICATE_TO_CONTROLLER)
+ .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SEND_TO_CONTROLLER)
.build();
}
/*
* In Next block, we need to implement these actions:
- * output
+ * set_vlan
* set_vlan_output
- * l3_routing
+ * output_simple
+ * output_hashed
+ * l3_routing_simple
* l3_routing_vlan
- * mpls_routing_v4
+ * l3_routing_hashed
+ * mpls_routing_v4_simple
+ * mpls_routing_v6_simple
+ * mpls_routing_v4_hashed
+ * mpls_routing_v6_hashed
*
* Unsupported, need to find a way to implement it
- * mpls_routing_v6
+ *
+ * set_mcast_group
+ *
*/
- public static PiAction mapNextTreatment(TrafficTreatment treatment)
+ public static PiAction mapNextTreatment(TrafficTreatment treatment, PiTableId tableId)
throws PiInterpreterException {
// TODO: refactor this method
List<Instruction> insts = treatment.allInstructions();
@@ -213,21 +227,21 @@
}
}
+ if (tableId.equals(FabricConstants.FABRIC_INGRESS_NEXT_VLAN_META) &&
+ modVlanIdInst != null) {
+ // set_vlan
+ VlanId vlanId = modVlanIdInst.vlanId();
+ PiActionParam newVlanParam =
+ new PiActionParam(FabricConstants.NEW_VLAN_ID,
+ ImmutableByteSequence.copyFrom(vlanId.toShort()));
+ return PiAction.builder()
+ .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_VLAN)
+ .withParameter(newVlanParam)
+ .build();
+ }
+
if (outInst == null) {
- // for vlan_meta table only
- if (modVlanIdInst != null) {
- // set_vlan
- VlanId vlanId = modVlanIdInst.vlanId();
- PiActionParam newVlanParam =
- new PiActionParam(FabricConstants.NEW_VLAN_ID,
- ImmutableByteSequence.copyFrom(vlanId.toShort()));
- return PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_VLAN)
- .withParameter(newVlanParam)
- .build();
- } else {
- throw new PiInterpreterException(format(INVALID_TREATMENT, "next", treatment));
- }
+ throw new PiInterpreterException(format(INVALID_TREATMENT, "next", treatment));
}
short portNum = (short) outInst.port().toLong();
@@ -239,15 +253,15 @@
PiActionParam vlanParam =
new PiActionParam(FabricConstants.NEW_VLAN_ID,
ImmutableByteSequence.copyFrom(vlanId.toShort()));
- // set_vlan_output
+ // set_vlan_output (simple table)
return PiAction.builder()
.withId(FabricConstants.FABRIC_INGRESS_NEXT_SET_VLAN_OUTPUT)
.withParameters(ImmutableList.of(portNumParam, vlanParam))
.build();
} else {
- // output
+ // output (simple or hashed table)
return PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_NEXT_OUTPUT)
+ .withId(FabricConstants.FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE)
.withParameter(portNumParam)
.build();
}
@@ -268,9 +282,19 @@
ImmutableByteSequence mplsValue =
ImmutableByteSequence.copyFrom(mplsLabel.toInt()).fit(20);
PiActionParam mplsParam = new PiActionParam(FabricConstants.LABEL, mplsValue);
+
+ PiActionId actionId;
+ // FIXME: finds a way to determine v4 or v6
+ if (tableId.equals(FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE)) {
+ actionId = FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_SIMPLE;
+ } else if (tableId.equals(FabricConstants.FABRIC_INGRESS_NEXT_HASHED)) {
+ actionId = FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_HASHED;
+ } else {
+ throw new PiInterpreterException(format(INVALID_TREATMENT, "next", treatment));
+ }
+
return PiAction.builder()
- // FIXME: fins a way to determine v4 or v6
- .withId(FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4)
+ .withId(actionId)
.withParameters(ImmutableList.of(portNumParam,
srcMacParam,
dstMacParam,
@@ -294,9 +318,18 @@
.withParameters(ImmutableList.of(srcMacParam, dstMacParam, portNumParam, vlanParam))
.build();
} else {
+ PiActionId actionId;
+ if (tableId.equals(FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE)) {
+ actionId = FabricConstants.FABRIC_INGRESS_NEXT_L3_ROUTING_SIMPLE;
+ } else if (tableId.equals(FabricConstants.FABRIC_INGRESS_NEXT_HASHED)) {
+ actionId = FabricConstants.FABRIC_INGRESS_NEXT_L3_ROUTING_HASHED;
+ } else {
+ throw new PiInterpreterException(format(INVALID_TREATMENT, "next", treatment));
+ }
+
// L3 routing
return PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_NEXT_L3_ROUTING)
+ .withId(actionId)
.withParameters(ImmutableList.of(portNumParam,
srcMacParam,
dstMacParam))
@@ -307,7 +340,10 @@
throw new PiInterpreterException(format(INVALID_TREATMENT, "next", treatment));
}
- public static PiAction mapEgressNextTreatment(TrafficTreatment treatment) {
+ /*
+ * pop_vlan
+ */
+ public static PiAction mapEgressNextTreatment(TrafficTreatment treatment, PiTableId tableId) {
// Pop VLAN action for now, may add new action to this control block in the future.
return treatment.allInstructions()
.stream()
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
index 785870e..c4ecdfd 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
@@ -34,6 +34,7 @@
import org.onosproject.net.flow.criteria.VlanIdCriterion;
import org.onosproject.net.flowobjective.ForwardingObjective;
import org.onosproject.net.flowobjective.ObjectiveError;
+import org.onosproject.net.pi.model.PiActionId;
import org.onosproject.net.pi.runtime.PiAction;
import org.onosproject.net.pi.runtime.PiActionParam;
import org.onosproject.pipelines.fabric.FabricConstants;
@@ -178,7 +179,8 @@
.build();
TrafficTreatment treatment = fwd.treatment();
if (fwd.nextId() != null) {
- treatment = buildSetNextIdTreatment(fwd.nextId());
+ treatment = buildSetNextIdTreatment(fwd.nextId(),
+ FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING);
}
FlowRule flowRule = DefaultFlowRule.builder()
@@ -206,7 +208,8 @@
.build();
TrafficTreatment treatment = fwd.treatment();
if (fwd.nextId() != null) {
- treatment = buildSetNextIdTreatment(fwd.nextId());
+ treatment = buildSetNextIdTreatment(fwd.nextId(),
+ FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING);
}
FlowRule flowRule = DefaultFlowRule.builder()
.withSelector(selector)
@@ -229,7 +232,8 @@
.build();
TrafficTreatment treatment = fwd.treatment();
if (fwd.nextId() != null) {
- treatment = buildSetNextIdTreatment(fwd.nextId());
+ treatment = buildSetNextIdTreatment(fwd.nextId(),
+ FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V4);
}
FlowRule flowRule = DefaultFlowRule.builder()
.withSelector(selector)
@@ -286,11 +290,11 @@
* @param nextId the next id for action
* @return treatment with set_next_id action; empty treatment if next id is null
*/
- private static TrafficTreatment buildSetNextIdTreatment(Integer nextId) {
+ private static TrafficTreatment buildSetNextIdTreatment(Integer nextId, PiActionId actionId) {
PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID,
ImmutableByteSequence.copyFrom(nextId.byteValue()));
PiAction nextIdAction = PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID)
+ .withId(actionId)
.withParameter(nextIdParam)
.build();
diff --git a/pipelines/fabric/src/main/resources/include/control/filtering.p4 b/pipelines/fabric/src/main/resources/include/control/filtering.p4
index a037fcf..050ee8d 100644
--- a/pipelines/fabric/src/main/resources/include/control/filtering.p4
+++ b/pipelines/fabric/src/main/resources/include/control/filtering.p4
@@ -24,15 +24,23 @@
inout parsed_headers_t hdr,
inout fabric_metadata_t fabric_metadata,
inout standard_metadata_t standard_metadata) {
+
+ /*
+ * Ingress Port VLAN Table.
+ * Process packets for different interfaces (Port number + VLAN).
+ * For example, an untagged packet will be tagged when it entered to an
+ * interface with untagged VLAN configuration.
+ */
direct_counter(CounterType.packets_and_bytes) ingress_port_vlan_counter;
- direct_counter(CounterType.packets_and_bytes) fwd_classifier_counter;
action drop() {
mark_to_drop();
+ ingress_port_vlan_counter.count();
}
action set_vlan(vlan_id_t new_vlan_id) {
hdr.vlan_tag.vlan_id = new_vlan_id;
+ ingress_port_vlan_counter.count();
}
action push_internal_vlan(vlan_id_t new_vlan_id) {
@@ -43,17 +51,13 @@
hdr.vlan_tag.pri = 0;
hdr.vlan_tag.ether_type = hdr.ethernet.ether_type;
hdr.ethernet.ether_type = ETHERTYPE_VLAN;
- set_vlan(new_vlan_id);
+ hdr.vlan_tag.vlan_id = new_vlan_id;
// pop internal vlan before packet in
fabric_metadata.pop_vlan_when_packet_in = _TRUE;
+ ingress_port_vlan_counter.count();
}
- action set_forwarding_type(fwd_type_t fwd_type) {
- fabric_metadata.fwd_type = fwd_type;
- }
-
- // Originally Ingress port and Vlan table in OF-DPA pipeline
table ingress_port_vlan {
key = {
standard_metadata.ingress_port: exact;
@@ -64,7 +68,7 @@
actions = {
push_internal_vlan;
set_vlan;
- nop;
+ @defaultonly nop;
drop;
}
@@ -72,7 +76,25 @@
counters = ingress_port_vlan_counter;
}
- // Originally TMAC table in OF-DPA pipeline
+ /*
+ * Forwarding Classifier.
+ * Setup Forwarding Type metadata for Forwarding control block.
+ * There are six types of tables in Forwarding control block:
+ * - Bridging: default forwarding type
+ * - MPLS: destination mac address is the router mac and ethernet type is
+ * MPLS(0x8847)
+ * - IP Multicast: destination mac address is multicast address and ethernet
+ * type is IP(0x0800 or 0x86dd)
+ * - IP Unicast: destination mac address is router mac and ethernet type is
+ * IP(0x0800 or 0x86dd)
+ */
+ direct_counter(CounterType.packets_and_bytes) fwd_classifier_counter;
+
+ action set_forwarding_type(fwd_type_t fwd_type) {
+ fabric_metadata.fwd_type = fwd_type;
+ fwd_classifier_counter.count();
+ }
+
table fwd_classifier {
key = {
standard_metadata.ingress_port: exact;
diff --git a/pipelines/fabric/src/main/resources/include/control/forwarding.p4 b/pipelines/fabric/src/main/resources/include/control/forwarding.p4
index f0bfd5c..bfc180c 100644
--- a/pipelines/fabric/src/main/resources/include/control/forwarding.p4
+++ b/pipelines/fabric/src/main/resources/include/control/forwarding.p4
@@ -27,26 +27,15 @@
inout fabric_metadata_t fabric_metadata,
inout standard_metadata_t standard_metadata) {
+ /*
+ * Bridging Table.
+ * Matches destination mac address and VLAN Id and make egress decision.
+ */
direct_counter(CounterType.packets_and_bytes) bridging_counter;
- direct_counter(CounterType.packets_and_bytes) mpls_counter;
- direct_counter(CounterType.packets_and_bytes) unicast_v4_counter;
- direct_counter(CounterType.packets_and_bytes) acl_counter;
- action drop() {
- mark_to_drop();
- }
-
- action set_next_id(next_id_t next_id) {
+ action set_next_id_bridging(next_id_t next_id) {
fabric_metadata.next_id = next_id;
- }
-
- action pop_mpls_and_next(next_id_t next_id) {
- hdr.mpls.setInvalid();
- fabric_metadata.next_id = next_id;
- }
-
- action duplicate_to_controller() {
- standard_metadata.egress_spec = CPU_PORT;
+ bridging_counter.count();
}
table bridging {
@@ -56,11 +45,23 @@
}
actions = {
- set_next_id;
+ set_next_id_bridging;
}
counters = bridging_counter;
}
+ /*
+ * MPLS Table.
+ * Matches MPLS label and make egress decision.
+ */
+ direct_counter(CounterType.packets_and_bytes) mpls_counter;
+
+ action pop_mpls_and_next(next_id_t next_id) {
+ hdr.mpls.setInvalid();
+ fabric_metadata.next_id = next_id;
+ mpls_counter.count();
+ }
+
table mpls {
key = {
hdr.mpls.label: exact;
@@ -72,63 +73,48 @@
counters = mpls_counter;
}
+ /*
+ * IPv4 Unicast Table.
+ * Matches IPv4 prefix and make egress decision.
+ */
+ direct_counter(CounterType.packets_and_bytes) unicast_v4_counter;
+
+ action set_next_id_unicast_v4(next_id_t next_id) {
+ fabric_metadata.next_id = next_id;
+ unicast_v4_counter.count();
+ }
+
table unicast_v4 {
key = {
hdr.ipv4.dst_addr: lpm;
}
actions = {
- set_next_id;
+ set_next_id_unicast_v4;
}
counters = unicast_v4_counter;
}
-#ifdef WITH_MULTICAST
- direct_counter(CounterType.packets_and_bytes) multicast_v4_counter;
+ /*
+ * ACL Table.
+ * Make final egress decision based on general metch fields.
+ */
+ direct_counter(CounterType.packets_and_bytes) acl_counter;
- table multicast_v4 {
- key = {
- hdr.vlan_tag.vlan_id: exact;
- hdr.ipv4.dst_addr: lpm;
- }
-
- actions = {
- set_next_id;
- }
- counters = multicast_v4_counter;
- }
-#endif // WITH_MULTICAST
-
-#ifdef WITH_IPV6
- direct_counter(CounterType.packets_and_bytes) unicast_v6_counter;
-
- table unicast_v6 {
- key = {
- hdr.ipv6.dst_addr: lpm;
- }
-
- actions = {
- set_next_id;
- }
- counters = unicast_v6_counter;
+ action set_next_id_acl(next_id_t next_id) {
+ fabric_metadata.next_id = next_id;
+ acl_counter.count();
}
-#ifdef WITH_MULTICAST
- direct_counter(CounterType.packets_and_bytes) multicast_v6_counter;
-
- table multicast_v6 {
- key = {
- hdr.vlan_tag.vlan_id: exact;
- hdr.ipv6.dst_addr: lpm;
- }
-
- actions = {
- set_next_id;
- }
- counters = multicast_v6_counter;
+ action send_to_controller() {
+ standard_metadata.egress_spec = CPU_PORT;
+ acl_counter.count();
}
-#endif // WITH_MULTICAST
-#endif // WITH_IPV6
+
+ action drop() {
+ mark_to_drop();
+ acl_counter.count();
+ }
table acl {
key = {
@@ -148,10 +134,10 @@
}
actions = {
- set_next_id;
- duplicate_to_controller;
+ set_next_id_acl;
+ send_to_controller;
drop;
- nop;
+ @defaultonly nop;
}
const default_action = nop();
@@ -159,6 +145,79 @@
counters = acl_counter;
}
+#ifdef WITH_MULTICAST
+ /*
+ * IPv4 Multicast Table.
+ * Maches multcast IPv4 address and make egress decision.
+ */
+ direct_counter(CounterType.packets_and_bytes) multicast_v4_counter;
+ action set_next_id_multicast_v4(next_id_t next_id) {
+ fabric_metadata.next_id = next_id;
+ multicast_v4_counter.count();
+ }
+
+ table multicast_v4 {
+ key = {
+ hdr.vlan_tag.vlan_id: exact;
+ hdr.ipv4.dst_addr: lpm;
+ }
+
+ actions = {
+ set_next_id_multicast_v4;
+ }
+ counters = multicast_v4_counter;
+ }
+#endif // WITH_MULTICAST
+
+#ifdef WITH_IPV6
+ /*
+ * IPv6 Unicast Table.
+ * Matches IPv6 prefix and make egress decision.
+ */
+ direct_counter(CounterType.packets_and_bytes) unicast_v6_counter;
+
+ action set_next_id_unicast_v6(next_id_t next_id) {
+ fabric_metadata.next_id = next_id;
+ unicast_v6_counter.count();
+ }
+
+ table unicast_v6 {
+ key = {
+ hdr.ipv6.dst_addr: lpm;
+ }
+
+ actions = {
+ set_next_id_unicast_v6;
+ }
+ counters = unicast_v6_counter;
+ }
+
+#ifdef WITH_MULTICAST
+ /*
+ * IPv6 Multicast Table.
+ * Maches multcast IPv6 address and make egress decision.
+ */
+ direct_counter(CounterType.packets_and_bytes) multicast_v6_counter;
+
+ action set_next_id_multicast_v6(next_id_t next_id) {
+ fabric_metadata.next_id = next_id;
+ multicast_v6_counter.count();
+ }
+
+ table multicast_v6 {
+ key = {
+ hdr.vlan_tag.vlan_id: exact;
+ hdr.ipv6.dst_addr: lpm;
+ }
+
+ actions = {
+ set_next_id_multicast_v6;
+ }
+ counters = multicast_v6_counter;
+ }
+#endif // WITH_MULTICAST
+#endif // WITH_IPV6
+
apply {
if(fabric_metadata.fwd_type == FWD_BRIDGING) bridging.apply();
else if (fabric_metadata.fwd_type == FWD_MPLS) {
diff --git a/pipelines/fabric/src/main/resources/include/control/next.p4 b/pipelines/fabric/src/main/resources/include/control/next.p4
index 0b22ca1..b88bedc 100644
--- a/pipelines/fabric/src/main/resources/include/control/next.p4
+++ b/pipelines/fabric/src/main/resources/include/control/next.p4
@@ -24,29 +24,15 @@
inout parsed_headers_t hdr,
inout fabric_metadata_t fabric_metadata,
inout standard_metadata_t standard_metadata) {
- action_selector(HashAlgorithm.crc16, 32w64, 32w16) ecmp_selector;
- direct_counter(CounterType.packets_and_bytes) vlan_meta_counter;
- direct_counter(CounterType.packets_and_bytes) simple_counter;
- direct_counter(CounterType.packets_and_bytes) hashed_counter;
- action output(port_num_t port_num) {
- standard_metadata.egress_spec = port_num;
- }
-
- action set_vlan(vlan_id_t new_vlan_id) {
- hdr.vlan_tag.vlan_id = new_vlan_id;
- }
-
+ /*
+ * General actions.
+ */
action pop_vlan() {
hdr.ethernet.ether_type = hdr.vlan_tag.ether_type;
hdr.vlan_tag.setInvalid();
}
- action set_vlan_output(vlan_id_t new_vlan_id, port_num_t port_num){
- hdr.vlan_tag.vlan_id = new_vlan_id;
- output(port_num);
- }
-
action rewrite_smac(mac_addr_t smac) {
hdr.ethernet.src_addr = smac;
}
@@ -55,18 +41,6 @@
hdr.ethernet.dst_addr = dmac;
}
- action l3_routing(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac) {
- rewrite_smac(smac);
- rewrite_dmac(dmac);
- output(port_num);
- }
-
- action l3_routing_vlan(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac, vlan_id_t new_vlan_id) {
- rewrite_smac(smac);
- rewrite_dmac(dmac);
- set_vlan_output(new_vlan_id, port_num);
- }
-
action push_mpls (mpls_label_t label, bit<3> tc) {
// Suppose that the maximum number of label is one.
hdr.mpls.setValid();
@@ -77,20 +51,15 @@
hdr.mpls.ttl = DEFAULT_MPLS_TTL;
}
- action mpls_routing_v4 (port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
- mpls_label_t label) {
- l3_routing(port_num, smac, dmac);
+ /*
+ * VLAN Metadata Table.
+ * Modify VLAN Id according to metadata from NextObjective(next id).
+ */
+ direct_counter(CounterType.packets_and_bytes) vlan_meta_counter;
- // TODO: set tc according to diffserv from ipv4
- push_mpls(label, 3w0);
- }
-
- action mpls_routing_v6 (port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
- mpls_label_t label) {
- l3_routing(port_num, smac, dmac);
-
- // TODO: set tc according to traffic_class from ipv4
- push_mpls(label, 3w0);
+ action set_vlan(vlan_id_t new_vlan_id) {
+ hdr.vlan_tag.vlan_id = new_vlan_id;
+ vlan_meta_counter.count();
}
table vlan_meta {
@@ -100,27 +69,109 @@
actions = {
set_vlan;
- nop;
+ @defaultonly nop;
}
default_action = nop;
counters = vlan_meta_counter;
}
+ /*
+ * Simple Table.
+ * Do a single egress action based on next id.
+ */
+ direct_counter(CounterType.packets_and_bytes) simple_counter;
+
+ action output_simple(port_num_t port_num) {
+ standard_metadata.egress_spec = port_num;
+ simple_counter.count();
+ }
+
+ action set_vlan_output(vlan_id_t new_vlan_id, port_num_t port_num){
+ hdr.vlan_tag.vlan_id = new_vlan_id;
+ output_simple(port_num);
+ }
+
+ action l3_routing_simple(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac) {
+ rewrite_smac(smac);
+ rewrite_dmac(dmac);
+ output_simple(port_num);
+ }
+
+ action mpls_routing_v4_simple(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
+ mpls_label_t label) {
+ l3_routing_simple(port_num, smac, dmac);
+
+ // TODO: set tc according to diffserv from ipv4
+ push_mpls(label, 3w0);
+ }
+
+ action mpls_routing_v6_simple (port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
+ mpls_label_t label) {
+ l3_routing_simple(port_num, smac, dmac);
+
+ // TODO: set tc according to traffic_class from ipv4
+ push_mpls(label, 3w0);
+ }
+
+ action l3_routing_vlan(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac, vlan_id_t new_vlan_id) {
+ rewrite_smac(smac);
+ rewrite_dmac(dmac);
+ set_vlan_output(new_vlan_id, port_num);
+ }
+
table simple {
key = {
fabric_metadata.next_id: exact;
}
actions = {
- output;
+ output_simple;
set_vlan_output;
- l3_routing;
- mpls_routing_v4;
+ l3_routing_simple;
+ mpls_routing_v4_simple;
+ mpls_routing_v6_simple;
l3_routing_vlan;
}
counters = simple_counter;
}
+ /*
+ * Hashed table.
+ * Execute an action profile group based on next id.
+ * One action profile group may contains multple egress decision.
+ * The execution picks one action profile group memebr by using 5-tuple
+ * hashing.
+ */
+ action_selector(HashAlgorithm.crc16, 32w64, 32w16) ecmp_selector;
+ direct_counter(CounterType.packets_and_bytes) hashed_counter;
+
+ action output_hashed(port_num_t port_num) {
+ standard_metadata.egress_spec = port_num;
+ hashed_counter.count();
+ }
+
+ action l3_routing_hashed(port_num_t port_num, mac_addr_t smac, mac_addr_t dmac) {
+ rewrite_smac(smac);
+ rewrite_dmac(dmac);
+ output_hashed(port_num);
+ }
+
+ action mpls_routing_v4_hashed (port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
+ mpls_label_t label) {
+ l3_routing_hashed(port_num, smac, dmac);
+
+ // TODO: set tc according to diffserv from ipv4
+ push_mpls(label, 3w0);
+ }
+
+ action mpls_routing_v6_hashed (port_num_t port_num, mac_addr_t smac, mac_addr_t dmac,
+ mpls_label_t label) {
+ l3_routing_hashed(port_num, smac, dmac);
+
+ // TODO: set tc according to traffic_class from ipv4
+ push_mpls(label, 3w0);
+ }
+
table hashed {
key = {
fabric_metadata.next_id: exact;
@@ -132,9 +183,9 @@
}
actions = {
- l3_routing;
- mpls_routing_v4;
- mpls_routing_v6;
+ l3_routing_hashed;
+ mpls_routing_v4_hashed;
+ mpls_routing_v6_hashed;
}
implementation = ecmp_selector;
@@ -142,14 +193,16 @@
}
/*
- * Work in progress
+ * Multicast Table.
+ * Setup multicast group id for packet replication engine (PRE).
*/
+ direct_counter(CounterType.packets_and_bytes) multicast_counter;
+
action set_mcast_group(group_id_t gid) {
standard_metadata.mcast_grp = gid;
+ multicast_counter.count();
}
- direct_counter(CounterType.packets_and_bytes) multicast_counter;
-
table multicast {
key = {
fabric_metadata.next_id: exact;
@@ -184,9 +237,16 @@
inout fabric_metadata_t fabric_metadata,
inout standard_metadata_t standard_metadata) {
+ /*
+ * Egress VLAN Table.
+ * Pops VLAN tag according to interface(Port and VLAN) configuration.
+ */
+ direct_counter(CounterType.packets_and_bytes) egress_vlan_counter;
+
action pop_vlan() {
hdr.ethernet.ether_type = hdr.vlan_tag.ether_type;
hdr.vlan_tag.setInvalid();
+ egress_vlan_counter.count();
}
table egress_vlan {
@@ -196,9 +256,10 @@
}
actions = {
pop_vlan;
- nop;
+ @defaultonly nop;
}
default_action = nop;
+ counters = egress_vlan_counter;
}
apply {
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 8a09ac2..10deed0 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
@@ -863,7 +863,7 @@
"name" : "deparser",
"id" : 0,
"source_info" : {
- "filename" : "include/parser.p4",
+ "filename" : "./include/parser.p4",
"line" : 165,
"column" : 8,
"source_fragment" : "FabricDeparser"
@@ -943,7 +943,7 @@
"name" : "FabricIngress.port_counters_control.egress_port_counter",
"id" : 11,
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 23,
"column" : 48,
"source_fragment" : "egress_port_counter"
@@ -955,13 +955,19 @@
"name" : "FabricIngress.port_counters_control.ingress_port_counter",
"id" : 12,
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 24,
"column" : 48,
"source_fragment" : "ingress_port_counter"
},
"size" : 511,
"is_direct" : false
+ },
+ {
+ "name" : "FabricEgress.egress_next.egress_vlan_counter",
+ "id" : 13,
+ "is_direct" : true,
+ "binding" : "FabricEgress.egress_next.egress_vlan"
}
],
"register_arrays" : [],
@@ -970,7 +976,7 @@
"name" : "calc",
"id" : 0,
"source_info" : {
- "filename" : "include/checksum.p4",
+ "filename" : "./include/checksum.p4",
"line" : 28,
"column" : 8,
"source_fragment" : "update_checksum(hdr.ipv4.isValid(), ..."
@@ -1027,7 +1033,7 @@
"name" : "calc_0",
"id" : 1,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 296,
"column" : 8,
"source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
@@ -1084,7 +1090,7 @@
"name" : "calc_1",
"id" : 2,
"source_info" : {
- "filename" : "include/checksum.p4",
+ "filename" : "./include/checksum.p4",
"line" : 56,
"column" : 8,
"source_fragment" : "verify_checksum(hdr.ipv4.isValid(), ..."
@@ -1227,7 +1233,7 @@
"op" : "drop",
"parameters" : [],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 33,
"column" : 8,
"source_fragment" : "mark_to_drop()"
@@ -1237,7 +1243,7 @@
"op" : "exit",
"parameters" : [],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 34,
"column" : 8,
"source_fragment" : "exit"
@@ -1259,7 +1265,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 38,
"column" : 8,
"source_fragment" : "gtpu_ipv4.setInvalid()"
@@ -1274,7 +1280,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 39,
"column" : 8,
"source_fragment" : "gtpu_udp.setInvalid()"
@@ -1289,7 +1295,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 40,
"column" : 8,
"source_fragment" : "gtpu.setInvalid()"
@@ -1328,7 +1334,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 46,
"column" : 8,
"source_fragment" : "spgw_meta.teid = teid"
@@ -1347,7 +1353,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 47,
"column" : 8,
"source_fragment" : "spgw_meta.s1u_enb_addr = s1u_enb_addr"
@@ -1366,7 +1372,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 48,
"column" : 8,
"source_fragment" : "spgw_meta.s1u_sgw_addr = s1u_sgw_addr"
@@ -1389,8 +1395,8 @@
"op" : "drop",
"parameters" : [],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 31,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "mark_to_drop()"
}
@@ -1420,8 +1426,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 35,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 42,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
}
@@ -1447,8 +1453,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 41,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 49,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setValid()"
}
@@ -1466,8 +1472,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 42,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 50,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.cfi = 0"
}
@@ -1485,8 +1491,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 43,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 51,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.pri = 0"
}
@@ -1504,8 +1510,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 44,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 52,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
}
@@ -1523,7 +1529,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 66,
"column" : 31,
"source_fragment" : "0x8100; ..."
@@ -1542,10 +1548,10 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 35,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 54,
"column" : 8,
- "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
+ "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
}
},
{
@@ -1571,8 +1577,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 49,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 57,
"column" : 8,
"source_fragment" : "fabric_metadata.pop_vlan_when_packet_in = true"
}
@@ -1602,8 +1608,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 53,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 94,
"column" : 8,
"source_fragment" : "fabric_metadata.fwd_type = fwd_type"
}
@@ -1611,25 +1617,8 @@
]
},
{
- "name" : "FabricIngress.forwarding.drop",
+ "name" : "FabricIngress.forwarding.set_next_id_bridging",
"id" : 21,
- "runtime_data" : [],
- "primitives" : [
- {
- "op" : "drop",
- "parameters" : [],
- "source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 36,
- "column" : 8,
- "source_fragment" : "mark_to_drop()"
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.forwarding.set_next_id",
- "id" : 22,
"runtime_data" : [
{
"name" : "next_id",
@@ -1650,8 +1639,8 @@
}
],
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 40,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "fabric_metadata.next_id = next_id"
}
@@ -1659,7 +1648,53 @@
]
},
{
- "name" : "FabricIngress.forwarding.set_next_id",
+ "name" : "FabricIngress.forwarding.pop_mpls_and_next",
+ "id" : 22,
+ "runtime_data" : [
+ {
+ "name" : "next_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "mpls"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 60,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.setInvalid()"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.next_id"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 61,
+ "column" : 8,
+ "source_fragment" : "fabric_metadata.next_id = next_id"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.forwarding.set_next_id_unicast_v4",
"id" : 23,
"runtime_data" : [
{
@@ -1681,8 +1716,8 @@
}
],
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 40,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 83,
"column" : 8,
"source_fragment" : "fabric_metadata.next_id = next_id"
}
@@ -1690,7 +1725,7 @@
]
},
{
- "name" : "FabricIngress.forwarding.set_next_id",
+ "name" : "FabricIngress.forwarding.set_next_id_acl",
"id" : 24,
"runtime_data" : [
{
@@ -1712,8 +1747,8 @@
}
],
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 40,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 105,
"column" : 8,
"source_fragment" : "fabric_metadata.next_id = next_id"
}
@@ -1721,54 +1756,8 @@
]
},
{
- "name" : "FabricIngress.forwarding.pop_mpls_and_next",
+ "name" : "FabricIngress.forwarding.send_to_controller",
"id" : 25,
- "runtime_data" : [
- {
- "name" : "next_id",
- "bitwidth" : 32
- }
- ],
- "primitives" : [
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "mpls"
- }
- ],
- "source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 44,
- "column" : 8,
- "source_fragment" : "hdr.mpls.setInvalid()"
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t.next_id"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 45,
- "column" : 8,
- "source_fragment" : "fabric_metadata.next_id = next_id"
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.forwarding.duplicate_to_controller",
- "id" : 26,
"runtime_data" : [],
"primitives" : [
{
@@ -1784,8 +1773,8 @@
}
],
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 49,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 110,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = 255"
}
@@ -1793,39 +1782,25 @@
]
},
{
- "name" : "FabricIngress.next.output",
- "id" : 27,
- "runtime_data" : [
- {
- "name" : "port_num",
- "bitwidth" : 9
- }
- ],
+ "name" : "FabricIngress.forwarding.drop",
+ "id" : 26,
+ "runtime_data" : [],
"primitives" : [
{
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["standard_metadata", "egress_spec"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
+ "op" : "drop",
+ "parameters" : [],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 115,
"column" : 8,
- "source_fragment" : "standard_metadata.egress_spec = port_num"
+ "source_fragment" : "mark_to_drop()"
}
}
]
},
{
"name" : "FabricIngress.next.set_vlan",
- "id" : 28,
+ "id" : 27,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -1846,8 +1821,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 37,
+ "filename" : "./include/control/next.p4",
+ "line" : 61,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
}
@@ -1855,6 +1830,37 @@
]
},
{
+ "name" : "FabricIngress.next.output_simple",
+ "id" : 28,
+ "runtime_data" : [
+ {
+ "name" : "port_num",
+ "bitwidth" : 9
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["standard_metadata", "egress_spec"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
+ "column" : 8,
+ "source_fragment" : "standard_metadata.egress_spec = port_num"
+ }
+ }
+ ]
+ },
+ {
"name" : "FabricIngress.next.set_vlan_output",
"id" : 29,
"runtime_data" : [
@@ -1881,8 +1887,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 46,
+ "filename" : "./include/control/next.p4",
+ "line" : 90,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
}
@@ -1900,8 +1906,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
@@ -1909,7 +1915,7 @@
]
},
{
- "name" : "FabricIngress.next.l3_routing",
+ "name" : "FabricIngress.next.l3_routing_simple",
"id" : 30,
"runtime_data" : [
{
@@ -1939,8 +1945,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "hdr.ethernet.src_addr = smac; ..."
}
@@ -1958,8 +1964,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
"column" : 8,
"source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
}
@@ -1977,8 +1983,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
@@ -1986,7 +1992,7 @@
]
},
{
- "name" : "FabricIngress.next.l3_routing",
+ "name" : "FabricIngress.next.mpls_routing_v4_simple",
"id" : 31,
"runtime_data" : [
{
@@ -2000,6 +2006,10 @@
{
"name" : "dmac",
"bitwidth" : 48
+ },
+ {
+ "name" : "label",
+ "bitwidth" : 20
}
],
"primitives" : [
@@ -2016,8 +2026,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "hdr.ethernet.src_addr = smac; ..."
}
@@ -2035,8 +2045,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
"column" : 8,
"source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
}
@@ -2054,17 +2064,318 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
+ },
+ {
+ "op" : "add_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "mpls"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 46,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.setValid()"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["vlan_tag", "ether_type"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x8847"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/../define.p4",
+ "line" : 67,
+ "column" : 31,
+ "source_fragment" : "0x8847; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "label"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 48,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.label = label; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "tc"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 49,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.tc = tc; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "bos"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x01"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 50,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.bos = 1w1"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "ttl"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x40"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/../define.p4",
+ "line" : 87,
+ "column" : 32,
+ "source_fragment" : "64; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.next.mpls_routing_v6_simple",
+ "id" : 32,
+ "runtime_data" : [
+ {
+ "name" : "port_num",
+ "bitwidth" : 9
+ },
+ {
+ "name" : "smac",
+ "bitwidth" : 48
+ },
+ {
+ "name" : "dmac",
+ "bitwidth" : 48
+ },
+ {
+ "name" : "label",
+ "bitwidth" : 20
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ethernet", "src_addr"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
+ "column" : 8,
+ "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ethernet", "dst_addr"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 2
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
+ "column" : 8,
+ "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["standard_metadata", "egress_spec"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
+ "column" : 8,
+ "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+ }
+ },
+ {
+ "op" : "add_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "mpls"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 46,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.setValid()"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["vlan_tag", "ether_type"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x8847"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/../define.p4",
+ "line" : 67,
+ "column" : 31,
+ "source_fragment" : "0x8847; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "label"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 48,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.label = label; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "tc"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 49,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.tc = tc; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "bos"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x01"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 50,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.bos = 1w1"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "ttl"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x40"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/../define.p4",
+ "line" : 87,
+ "column" : 32,
+ "source_fragment" : "64; ..."
+ }
}
]
},
{
"name" : "FabricIngress.next.l3_routing_vlan",
- "id" : 32,
+ "id" : 33,
"runtime_data" : [
{
"name" : "port_num",
@@ -2097,8 +2408,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "hdr.ethernet.src_addr = smac; ..."
}
@@ -2116,8 +2427,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
"column" : 8,
"source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
}
@@ -2135,8 +2446,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 46,
+ "filename" : "./include/control/next.p4",
+ "line" : 90,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
}
@@ -2154,8 +2465,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
@@ -2163,198 +2474,7 @@
]
},
{
- "name" : "FabricIngress.next.mpls_routing_v4",
- "id" : 33,
- "runtime_data" : [
- {
- "name" : "port_num",
- "bitwidth" : 9
- },
- {
- "name" : "smac",
- "bitwidth" : 48
- },
- {
- "name" : "dmac",
- "bitwidth" : 48
- },
- {
- "name" : "label",
- "bitwidth" : 20
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["ethernet", "src_addr"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
- "column" : 8,
- "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["ethernet", "dst_addr"]
- },
- {
- "type" : "runtime_data",
- "value" : 2
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
- "column" : 8,
- "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["standard_metadata", "egress_spec"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
- "column" : 8,
- "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
- }
- },
- {
- "op" : "add_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "mpls"
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 72,
- "column" : 8,
- "source_fragment" : "hdr.mpls.setValid()"
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["vlan_tag", "ether_type"]
- },
- {
- "type" : "hexstr",
- "value" : "0x8847"
- }
- ],
- "source_info" : {
- "filename" : "include/control/../define.p4",
- "line" : 67,
- "column" : 31,
- "source_fragment" : "0x8847; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "label"]
- },
- {
- "type" : "runtime_data",
- "value" : 3
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 74,
- "column" : 8,
- "source_fragment" : "hdr.mpls.label = label; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "tc"]
- },
- {
- "type" : "hexstr",
- "value" : "0x00"
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 75,
- "column" : 8,
- "source_fragment" : "hdr.mpls.tc = tc; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "bos"]
- },
- {
- "type" : "hexstr",
- "value" : "0x01"
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 76,
- "column" : 8,
- "source_fragment" : "hdr.mpls.bos = 1w1"
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "ttl"]
- },
- {
- "type" : "hexstr",
- "value" : "0x40"
- }
- ],
- "source_info" : {
- "filename" : "include/control/../define.p4",
- "line" : 87,
- "column" : 32,
- "source_fragment" : "64; ..."
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.next.mpls_routing_v4",
+ "name" : "FabricIngress.next.l3_routing_hashed",
"id" : 34,
"runtime_data" : [
{
@@ -2368,10 +2488,6 @@
{
"name" : "dmac",
"bitwidth" : 48
- },
- {
- "name" : "label",
- "bitwidth" : 20
}
],
"primitives" : [
@@ -2388,8 +2504,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "hdr.ethernet.src_addr = smac; ..."
}
@@ -2407,8 +2523,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
"column" : 8,
"source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
}
@@ -2426,126 +2542,16 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 149,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
- },
- {
- "op" : "add_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "mpls"
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 72,
- "column" : 8,
- "source_fragment" : "hdr.mpls.setValid()"
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["vlan_tag", "ether_type"]
- },
- {
- "type" : "hexstr",
- "value" : "0x8847"
- }
- ],
- "source_info" : {
- "filename" : "include/control/../define.p4",
- "line" : 67,
- "column" : 31,
- "source_fragment" : "0x8847; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "label"]
- },
- {
- "type" : "runtime_data",
- "value" : 3
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 74,
- "column" : 8,
- "source_fragment" : "hdr.mpls.label = label; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "tc"]
- },
- {
- "type" : "hexstr",
- "value" : "0x00"
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 75,
- "column" : 8,
- "source_fragment" : "hdr.mpls.tc = tc; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "bos"]
- },
- {
- "type" : "hexstr",
- "value" : "0x01"
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 76,
- "column" : 8,
- "source_fragment" : "hdr.mpls.bos = 1w1"
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "ttl"]
- },
- {
- "type" : "hexstr",
- "value" : "0x40"
- }
- ],
- "source_info" : {
- "filename" : "include/control/../define.p4",
- "line" : 87,
- "column" : 32,
- "source_fragment" : "64; ..."
- }
}
]
},
{
- "name" : "FabricIngress.next.mpls_routing_v6",
+ "name" : "FabricIngress.next.mpls_routing_v4_hashed",
"id" : 35,
"runtime_data" : [
{
@@ -2579,8 +2585,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "hdr.ethernet.src_addr = smac; ..."
}
@@ -2598,8 +2604,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
"column" : 8,
"source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
}
@@ -2617,8 +2623,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 149,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
@@ -2632,8 +2638,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 72,
+ "filename" : "./include/control/next.p4",
+ "line" : 46,
"column" : 8,
"source_fragment" : "hdr.mpls.setValid()"
}
@@ -2651,7 +2657,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 67,
"column" : 31,
"source_fragment" : "0x8847; ..."
@@ -2670,8 +2676,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 74,
+ "filename" : "./include/control/next.p4",
+ "line" : 48,
"column" : 8,
"source_fragment" : "hdr.mpls.label = label; ..."
}
@@ -2689,8 +2695,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 75,
+ "filename" : "./include/control/next.p4",
+ "line" : 49,
"column" : 8,
"source_fragment" : "hdr.mpls.tc = tc; ..."
}
@@ -2708,8 +2714,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 76,
+ "filename" : "./include/control/next.p4",
+ "line" : 50,
"column" : 8,
"source_fragment" : "hdr.mpls.bos = 1w1"
}
@@ -2727,7 +2733,198 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
+ "line" : 87,
+ "column" : 32,
+ "source_fragment" : "64; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.next.mpls_routing_v6_hashed",
+ "id" : 36,
+ "runtime_data" : [
+ {
+ "name" : "port_num",
+ "bitwidth" : 9
+ },
+ {
+ "name" : "smac",
+ "bitwidth" : 48
+ },
+ {
+ "name" : "dmac",
+ "bitwidth" : 48
+ },
+ {
+ "name" : "label",
+ "bitwidth" : 20
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ethernet", "src_addr"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
+ "column" : 8,
+ "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ethernet", "dst_addr"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 2
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
+ "column" : 8,
+ "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["standard_metadata", "egress_spec"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 149,
+ "column" : 8,
+ "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+ }
+ },
+ {
+ "op" : "add_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "mpls"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 46,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.setValid()"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["vlan_tag", "ether_type"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x8847"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/../define.p4",
+ "line" : 67,
+ "column" : 31,
+ "source_fragment" : "0x8847; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "label"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 48,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.label = label; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "tc"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 49,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.tc = tc; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "bos"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x01"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 50,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.bos = 1w1"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "ttl"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x40"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/../define.p4",
"line" : 87,
"column" : 32,
"source_fragment" : "64; ..."
@@ -2737,7 +2934,7 @@
},
{
"name" : "FabricIngress.next.set_mcast_group",
- "id" : 36,
+ "id" : 37,
"runtime_data" : [
{
"name" : "gid",
@@ -2758,8 +2955,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 148,
+ "filename" : "./include/control/next.p4",
+ "line" : 202,
"column" : 8,
"source_fragment" : "standard_metadata.mcast_grp = gid"
}
@@ -2768,7 +2965,7 @@
},
{
"name" : "act",
- "id" : 37,
+ "id" : 38,
"runtime_data" : [],
"primitives" : [
{
@@ -2784,7 +2981,7 @@
}
],
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 26,
"column" : 12,
"source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
@@ -2799,7 +2996,7 @@
}
],
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 27,
"column" : 12,
"source_fragment" : "hdr.packet_out.setInvalid()"
@@ -2809,7 +3006,7 @@
},
{
"name" : "act_0",
- "id" : 38,
+ "id" : 39,
"runtime_data" : [],
"primitives" : [
{
@@ -2839,7 +3036,7 @@
},
{
"name" : "act_1",
- "id" : 39,
+ "id" : 40,
"runtime_data" : [],
"primitives" : [
{
@@ -2869,7 +3066,7 @@
},
{
"name" : "act_2",
- "id" : 40,
+ "id" : 41,
"runtime_data" : [],
"primitives" : [
{
@@ -2885,7 +3082,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 152,
"column" : 12,
"source_fragment" : "spgw_meta.s1u_enb_addr = ipv4.src_addr"
@@ -2904,7 +3101,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 153,
"column" : 12,
"source_fragment" : "spgw_meta.s1u_sgw_addr = ipv4.dst_addr"
@@ -2923,7 +3120,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 154,
"column" : 17,
"source_fragment" : "= gtpu_ipv4; ..."
@@ -2942,7 +3139,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 155,
"column" : 16,
"source_fragment" : "= gtpu_udp; ..."
@@ -2952,7 +3149,7 @@
},
{
"name" : "act_3",
- "id" : 41,
+ "id" : 42,
"runtime_data" : [],
"primitives" : [
{
@@ -2978,7 +3175,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 159,
"column" : 16,
"source_fragment" : "spgw_meta.do_spgw = true"
@@ -2997,7 +3194,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 98,
"column" : 31,
"source_fragment" : "1w0; ..."
@@ -3007,7 +3204,7 @@
},
{
"name" : "act_4",
- "id" : 42,
+ "id" : 43,
"runtime_data" : [],
"primitives" : [
{
@@ -3037,7 +3234,7 @@
},
{
"name" : "act_5",
- "id" : 43,
+ "id" : 44,
"runtime_data" : [],
"primitives" : [
{
@@ -3067,7 +3264,7 @@
},
{
"name" : "act_6",
- "id" : 44,
+ "id" : 45,
"runtime_data" : [],
"primitives" : [
{
@@ -3093,7 +3290,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 163,
"column" : 12,
"source_fragment" : "spgw_meta.do_spgw = true"
@@ -3112,7 +3309,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 99,
"column" : 33,
"source_fragment" : "1w1; ..."
@@ -3122,7 +3319,7 @@
},
{
"name" : "act_7",
- "id" : 45,
+ "id" : 46,
"runtime_data" : [],
"primitives" : [
{
@@ -3171,7 +3368,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 146,
"column" : 8,
"source_fragment" : "spgw_meta.do_spgw = false"
@@ -3181,7 +3378,7 @@
},
{
"name" : "act_8",
- "id" : 46,
+ "id" : 47,
"runtime_data" : [],
"primitives" : [
{
@@ -3207,7 +3404,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 169,
"column" : 12,
"source_fragment" : "return"
@@ -3217,7 +3414,7 @@
},
{
"name" : "act_9",
- "id" : 47,
+ "id" : 48,
"runtime_data" : [],
"primitives" : [
{
@@ -3247,7 +3444,7 @@
},
{
"name" : "act_10",
- "id" : 48,
+ "id" : 49,
"runtime_data" : [],
"primitives" : [
{
@@ -3277,7 +3474,7 @@
},
{
"name" : "act_11",
- "id" : 49,
+ "id" : 50,
"runtime_data" : [],
"primitives" : [
{
@@ -3293,7 +3490,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 199,
"column" : 8,
"source_fragment" : "spgw_meta.ipv4_len = ipv4.total_len"
@@ -3303,7 +3500,7 @@
},
{
"name" : "act_12",
- "id" : 50,
+ "id" : 51,
"runtime_data" : [],
"primitives" : [
{
@@ -3319,7 +3516,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 69,
"column" : 31,
"source_fragment" : "0x0800; ..."
@@ -3338,7 +3535,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 69,
"column" : 31,
"source_fragment" : "0x0800; ..."
@@ -3348,7 +3545,7 @@
},
{
"name" : "act_13",
- "id" : 51,
+ "id" : 52,
"runtime_data" : [],
"primitives" : [
{
@@ -3378,7 +3575,7 @@
},
{
"name" : "act_14",
- "id" : 52,
+ "id" : 53,
"runtime_data" : [],
"primitives" : [
{
@@ -3408,7 +3605,7 @@
},
{
"name" : "act_15",
- "id" : 53,
+ "id" : 54,
"runtime_data" : [],
"primitives" : [
{
@@ -3447,8 +3644,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 168,
+ "filename" : "./include/control/next.p4",
+ "line" : 221,
"column" : 20,
"source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
}
@@ -3457,7 +3654,7 @@
},
{
"name" : "act_16",
- "id" : 54,
+ "id" : 55,
"runtime_data" : [],
"primitives" : [
{
@@ -3486,7 +3683,7 @@
}
],
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 28,
"column" : 38,
"source_fragment" : "(bit<32>)standard_metadata.egress_spec"
@@ -3505,7 +3702,7 @@
}
],
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 28,
"column" : 12,
"source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
@@ -3515,7 +3712,7 @@
},
{
"name" : "act_17",
- "id" : 55,
+ "id" : 56,
"runtime_data" : [],
"primitives" : [
{
@@ -3544,7 +3741,7 @@
}
],
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 31,
"column" : 39,
"source_fragment" : "(bit<32>)standard_metadata.ingress_port"
@@ -3563,7 +3760,7 @@
}
],
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 31,
"column" : 12,
"source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
@@ -3573,13 +3770,13 @@
},
{
"name" : "nop",
- "id" : 56,
+ "id" : 57,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.spgw_egress.gtpu_encap",
- "id" : 57,
+ "id" : 58,
"runtime_data" : [],
"primitives" : [
{
@@ -3591,7 +3788,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 214,
"column" : 8,
"source_fragment" : "gtpu_ipv4.setValid()"
@@ -3610,7 +3807,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 215,
"column" : 8,
"source_fragment" : "gtpu_ipv4.version = 4"
@@ -3629,7 +3826,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 78,
"column" : 28,
"source_fragment" : "5; ..."
@@ -3648,7 +3845,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 217,
"column" : 8,
"source_fragment" : "gtpu_ipv4.diffserv = 0"
@@ -3690,7 +3887,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 218,
"column" : 8,
"source_fragment" : "gtpu_ipv4.total_len = spgw_meta.ipv4_len ..."
@@ -3709,7 +3906,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 220,
"column" : 8,
"source_fragment" : "gtpu_ipv4.identification = 0x1513"
@@ -3728,7 +3925,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 221,
"column" : 8,
"source_fragment" : "gtpu_ipv4.flags = 0"
@@ -3747,7 +3944,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 222,
"column" : 8,
"source_fragment" : "gtpu_ipv4.frag_offset = 0"
@@ -3766,7 +3963,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 88,
"column" : 32,
"source_fragment" : "64; ..."
@@ -3785,7 +3982,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 75,
"column" : 25,
"source_fragment" : "17; ..."
@@ -3804,7 +4001,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 225,
"column" : 8,
"source_fragment" : "gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr"
@@ -3823,7 +4020,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 226,
"column" : 8,
"source_fragment" : "gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr"
@@ -3842,7 +4039,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 227,
"column" : 8,
"source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
@@ -3857,7 +4054,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 229,
"column" : 8,
"source_fragment" : "gtpu_udp.setValid()"
@@ -3876,7 +4073,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 230,
"column" : 8,
"source_fragment" : "gtpu_udp.src_port = 2152"
@@ -3895,7 +4092,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 231,
"column" : 8,
"source_fragment" : "gtpu_udp.dst_port = 2152"
@@ -3937,7 +4134,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 232,
"column" : 8,
"source_fragment" : "gtpu_udp.len = spgw_meta.ipv4_len ..."
@@ -3956,7 +4153,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 234,
"column" : 8,
"source_fragment" : "gtpu_udp.checksum = 0"
@@ -3971,7 +4168,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 236,
"column" : 8,
"source_fragment" : "gtpu.setValid()"
@@ -3990,7 +4187,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 237,
"column" : 8,
"source_fragment" : "gtpu.version = 0x01"
@@ -4009,7 +4206,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 238,
"column" : 8,
"source_fragment" : "gtpu.pt = 0x01"
@@ -4028,7 +4225,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 239,
"column" : 8,
"source_fragment" : "gtpu.spare = 0"
@@ -4047,7 +4244,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 240,
"column" : 8,
"source_fragment" : "gtpu.ex_flag = 0"
@@ -4066,7 +4263,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 241,
"column" : 8,
"source_fragment" : "gtpu.seq_flag = 0"
@@ -4085,7 +4282,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 242,
"column" : 8,
"source_fragment" : "gtpu.npdu_flag = 0"
@@ -4104,7 +4301,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 243,
"column" : 8,
"source_fragment" : "gtpu.msgtype = 0xff"
@@ -4123,7 +4320,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 244,
"column" : 8,
"source_fragment" : "gtpu.msglen = spgw_meta.ipv4_len"
@@ -4142,7 +4339,7 @@
}
],
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 245,
"column" : 8,
"source_fragment" : "gtpu.teid = spgw_meta.teid"
@@ -4152,47 +4349,6 @@
},
{
"name" : "FabricEgress.pkt_io_egress.pop_vlan",
- "id" : 58,
- "runtime_data" : [],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["ethernet", "ether_type"]
- },
- {
- "type" : "field",
- "value" : ["vlan_tag", "ether_type"]
- }
- ],
- "source_info" : {
- "filename" : "include/control/packetio.p4",
- "line" : 38,
- "column" : 8,
- "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
- }
- },
- {
- "op" : "remove_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "vlan_tag"
- }
- ],
- "source_info" : {
- "filename" : "include/control/packetio.p4",
- "line" : 39,
- "column" : 8,
- "source_fragment" : "hdr.vlan_tag.setInvalid()"
- }
- }
- ]
- },
- {
- "name" : "FabricEgress.egress_next.pop_vlan",
"id" : 59,
"runtime_data" : [],
"primitives" : [
@@ -4209,8 +4365,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 188,
+ "filename" : "./include/control/packetio.p4",
+ "line" : 38,
"column" : 8,
"source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
}
@@ -4224,8 +4380,49 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 189,
+ "filename" : "./include/control/packetio.p4",
+ "line" : 39,
+ "column" : 8,
+ "source_fragment" : "hdr.vlan_tag.setInvalid()"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricEgress.egress_next.pop_vlan",
+ "id" : 60,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ethernet", "ether_type"]
+ },
+ {
+ "type" : "field",
+ "value" : ["vlan_tag", "ether_type"]
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 247,
+ "column" : 8,
+ "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
+ }
+ },
+ {
+ "op" : "remove_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "vlan_tag"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 248,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setInvalid()"
}
@@ -4234,7 +4431,7 @@
},
{
"name" : "act_18",
- "id" : 60,
+ "id" : 61,
"runtime_data" : [],
"primitives" : [
{
@@ -4246,7 +4443,7 @@
}
],
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 46,
"column" : 12,
"source_fragment" : "hdr.packet_in.setValid()"
@@ -4265,7 +4462,7 @@
}
],
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 47,
"column" : 12,
"source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
@@ -4275,7 +4472,7 @@
},
{
"name" : "act_19",
- "id" : 61,
+ "id" : 62,
"runtime_data" : [],
"primitives" : [
{
@@ -4348,14 +4545,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [37],
+ "action_ids" : [38],
"actions" : ["act"],
"base_default_next" : null,
"next_tables" : {
"act" : null
},
"default_entry" : {
- "action_id" : 37,
+ "action_id" : 38,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4371,14 +4568,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [45],
+ "action_ids" : [46],
"actions" : ["act_7"],
"base_default_next" : "node_5",
"next_tables" : {
"act_7" : "node_5"
},
"default_entry" : {
- "action_id" : 45,
+ "action_id" : 46,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4394,14 +4591,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [40],
+ "action_ids" : [41],
"actions" : ["act_2"],
"base_default_next" : "FabricIngress.spgw_ingress.s1u_filter_table",
"next_tables" : {
"act_2" : "FabricIngress.spgw_ingress.s1u_filter_table"
},
"default_entry" : {
- "action_id" : 40,
+ "action_id" : 41,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4411,7 +4608,7 @@
"name" : "FabricIngress.spgw_ingress.s1u_filter_table",
"id" : 3,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 65,
"column" : 10,
"source_fragment" : "s1u_filter_table"
@@ -4454,14 +4651,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [38],
+ "action_ids" : [39],
"actions" : ["act_0"],
"base_default_next" : "node_10",
"next_tables" : {
"act_0" : "node_10"
},
"default_entry" : {
- "action_id" : 38,
+ "action_id" : 39,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4477,14 +4674,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [39],
+ "action_ids" : [40],
"actions" : ["act_1"],
"base_default_next" : "node_10",
"next_tables" : {
"act_1" : "node_10"
},
"default_entry" : {
- "action_id" : 39,
+ "action_id" : 40,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4500,14 +4697,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [41],
+ "action_ids" : [42],
"actions" : ["act_3"],
"base_default_next" : "node_17",
"next_tables" : {
"act_3" : "node_17"
},
"default_entry" : {
- "action_id" : 41,
+ "action_id" : 42,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4517,7 +4714,7 @@
"name" : "FabricIngress.spgw_ingress.ue_filter_table",
"id" : 7,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 55,
"column" : 10,
"source_fragment" : "ue_filter_table"
@@ -4560,14 +4757,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [42],
+ "action_ids" : [43],
"actions" : ["act_4"],
"base_default_next" : "node_15",
"next_tables" : {
"act_4" : "node_15"
},
"default_entry" : {
- "action_id" : 42,
+ "action_id" : 43,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4583,14 +4780,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [43],
+ "action_ids" : [44],
"actions" : ["act_5"],
"base_default_next" : "node_15",
"next_tables" : {
"act_5" : "node_15"
},
"default_entry" : {
- "action_id" : 43,
+ "action_id" : 44,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4606,14 +4803,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [44],
+ "action_ids" : [45],
"actions" : ["act_6"],
"base_default_next" : "node_17",
"next_tables" : {
"act_6" : "node_17"
},
"default_entry" : {
- "action_id" : 44,
+ "action_id" : 45,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4629,14 +4826,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [46],
+ "action_ids" : [47],
"actions" : ["act_8"],
"base_default_next" : "node_19",
"next_tables" : {
"act_8" : "node_19"
},
"default_entry" : {
- "action_id" : 46,
+ "action_id" : 47,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4669,7 +4866,7 @@
"name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
"id" : 13,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 124,
"column" : 10,
"source_fragment" : "dl_sess_lookup"
@@ -4712,14 +4909,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [47],
+ "action_ids" : [48],
"actions" : ["act_9"],
"base_default_next" : "node_26",
"next_tables" : {
"act_9" : "node_26"
},
"default_entry" : {
- "action_id" : 47,
+ "action_id" : 48,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4735,14 +4932,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [48],
+ "action_ids" : [49],
"actions" : ["act_10"],
"base_default_next" : "node_26",
"next_tables" : {
"act_10" : "node_26"
},
"default_entry" : {
- "action_id" : 48,
+ "action_id" : 49,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4775,7 +4972,7 @@
"name" : "FabricIngress.spgw_ingress.ue_cdr_table",
"id" : 17,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 134,
"column" : 10,
"source_fragment" : "ue_cdr_table"
@@ -4818,14 +5015,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [49],
+ "action_ids" : [50],
"actions" : ["act_11"],
"base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
"next_tables" : {
"act_11" : "FabricIngress.filtering.ingress_port_vlan"
},
"default_entry" : {
- "action_id" : 49,
+ "action_id" : 50,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -4835,8 +5032,8 @@
"name" : "FabricIngress.filtering.ingress_port_vlan",
"id" : 19,
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 57,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 61,
"column" : 10,
"source_fragment" : "ingress_port_vlan"
},
@@ -4886,8 +5083,8 @@
"name" : "FabricIngress.filtering.fwd_classifier",
"id" : 20,
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 76,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 98,
"column" : 10,
"source_fragment" : "fwd_classifier"
},
@@ -4934,8 +5131,8 @@
"name" : "FabricIngress.forwarding.bridging",
"id" : 21,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 52,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 41,
"column" : 10,
"source_fragment" : "bridging"
},
@@ -4959,11 +5156,11 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [22, 4],
- "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+ "action_ids" : [21, 4],
+ "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+ "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.forwarding.acl",
"NoAction" : "FabricIngress.forwarding.acl"
},
"default_entry" : {
@@ -4977,8 +5174,8 @@
"name" : "FabricIngress.forwarding.mpls",
"id" : 22,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 64,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 65,
"column" : 10,
"source_fragment" : "mpls"
},
@@ -4996,7 +5193,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [25, 5],
+ "action_ids" : [22, 5],
"actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
"base_default_next" : "tbl_act_12",
"next_tables" : {
@@ -5020,14 +5217,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [50],
+ "action_ids" : [51],
"actions" : ["act_12"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
"act_12" : "FabricIngress.forwarding.acl"
},
"default_entry" : {
- "action_id" : 50,
+ "action_id" : 51,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5037,8 +5234,8 @@
"name" : "FabricIngress.forwarding.unicast_v4",
"id" : 24,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 75,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 87,
"column" : 10,
"source_fragment" : "unicast_v4"
},
@@ -5057,10 +5254,10 @@
"support_timeout" : false,
"direct_meters" : null,
"action_ids" : [23, 6],
- "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+ "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+ "FabricIngress.forwarding.set_next_id_unicast_v4" : "FabricIngress.forwarding.acl",
"NoAction" : "FabricIngress.forwarding.acl"
},
"default_entry" : {
@@ -5074,8 +5271,8 @@
"name" : "FabricIngress.forwarding.acl",
"id" : 25,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 133,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 119,
"column" : 10,
"source_fragment" : "acl"
},
@@ -5159,12 +5356,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [24, 26, 21, 11],
- "actions" : ["FabricIngress.forwarding.set_next_id", "FabricIngress.forwarding.duplicate_to_controller", "FabricIngress.forwarding.drop", "nop"],
+ "action_ids" : [24, 25, 26, 11],
+ "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.send_to_controller", "FabricIngress.forwarding.drop", "nop"],
"base_default_next" : "FabricIngress.next.vlan_meta",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id" : "FabricIngress.next.vlan_meta",
- "FabricIngress.forwarding.duplicate_to_controller" : "FabricIngress.next.vlan_meta",
+ "FabricIngress.forwarding.set_next_id_acl" : "FabricIngress.next.vlan_meta",
+ "FabricIngress.forwarding.send_to_controller" : "FabricIngress.next.vlan_meta",
"FabricIngress.forwarding.drop" : "FabricIngress.next.vlan_meta",
"nop" : "FabricIngress.next.vlan_meta"
},
@@ -5179,8 +5376,8 @@
"name" : "FabricIngress.next.vlan_meta",
"id" : 26,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 96,
+ "filename" : "./include/control/next.p4",
+ "line" : 65,
"column" : 10,
"source_fragment" : "vlan_meta"
},
@@ -5198,7 +5395,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [28, 12],
+ "action_ids" : [27, 12],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
"base_default_next" : "FabricIngress.next.simple",
"next_tables" : {
@@ -5216,8 +5413,8 @@
"name" : "FabricIngress.next.simple",
"id" : 27,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 109,
+ "filename" : "./include/control/next.p4",
+ "line" : 122,
"column" : 10,
"source_fragment" : "simple"
},
@@ -5235,8 +5432,8 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [27, 29, 30, 33, 32, 7],
- "actions" : ["FabricIngress.next.output", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing", "FabricIngress.next.mpls_routing_v4", "FabricIngress.next.l3_routing_vlan", "NoAction"],
+ "action_ids" : [28, 29, 30, 31, 32, 33, 7],
+ "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_13",
@@ -5259,14 +5456,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [51],
+ "action_ids" : [52],
"actions" : ["act_13"],
"base_default_next" : "node_44",
"next_tables" : {
"act_13" : "node_44"
},
"default_entry" : {
- "action_id" : 51,
+ "action_id" : 52,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5282,14 +5479,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [52],
+ "action_ids" : [53],
"actions" : ["act_14"],
"base_default_next" : "node_44",
"next_tables" : {
"act_14" : "node_44"
},
"default_entry" : {
- "action_id" : 52,
+ "action_id" : 53,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5305,14 +5502,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [53],
+ "action_ids" : [54],
"actions" : ["act_15"],
"base_default_next" : "FabricIngress.next.hashed",
"next_tables" : {
"act_15" : "FabricIngress.next.hashed"
},
"default_entry" : {
- "action_id" : 53,
+ "action_id" : 54,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5322,8 +5519,8 @@
"name" : "FabricIngress.next.hashed",
"id" : 31,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 124,
+ "filename" : "./include/control/next.p4",
+ "line" : 175,
"column" : 10,
"source_fragment" : "hashed"
},
@@ -5342,13 +5539,13 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [31, 34, 35, 8],
- "actions" : ["FabricIngress.next.l3_routing", "FabricIngress.next.mpls_routing_v4", "FabricIngress.next.mpls_routing_v6", "NoAction"],
+ "action_ids" : [34, 35, 36, 8],
+ "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
"base_default_next" : "FabricIngress.next.multicast",
"next_tables" : {
- "FabricIngress.next.l3_routing" : "FabricIngress.next.multicast",
- "FabricIngress.next.mpls_routing_v4" : "FabricIngress.next.multicast",
- "FabricIngress.next.mpls_routing_v6" : "FabricIngress.next.multicast",
+ "FabricIngress.next.l3_routing_hashed" : "FabricIngress.next.multicast",
+ "FabricIngress.next.mpls_routing_v4_hashed" : "FabricIngress.next.multicast",
+ "FabricIngress.next.mpls_routing_v6_hashed" : "FabricIngress.next.multicast",
"NoAction" : "FabricIngress.next.multicast"
}
},
@@ -5356,8 +5553,8 @@
"name" : "FabricIngress.next.multicast",
"id" : 32,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 153,
+ "filename" : "./include/control/next.p4",
+ "line" : 206,
"column" : 10,
"source_fragment" : "multicast"
},
@@ -5375,7 +5572,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [36, 9],
+ "action_ids" : [37, 9],
"actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
"base_default_next" : "node_50",
"next_tables" : {
@@ -5399,14 +5596,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [54],
+ "action_ids" : [55],
"actions" : ["act_16"],
"base_default_next" : "node_52",
"next_tables" : {
"act_16" : "node_52"
},
"default_entry" : {
- "action_id" : 54,
+ "action_id" : 55,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5422,14 +5619,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [55],
+ "action_ids" : [56],
"actions" : ["act_17"],
"base_default_next" : null,
"next_tables" : {
"act_17" : null
},
"default_entry" : {
- "action_id" : 55,
+ "action_id" : 56,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5473,7 +5670,7 @@
"name" : "node_2",
"id" : 0,
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 25,
"column" : 12,
"source_fragment" : "hdr.packet_out.isValid()"
@@ -5496,7 +5693,7 @@
"name" : "node_5",
"id" : 1,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 147,
"column" : 12,
"source_fragment" : "gtpu.isValid()"
@@ -5553,7 +5750,7 @@
"name" : "node_17",
"id" : 4,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 167,
"column" : 12,
"source_fragment" : "spgw_meta.do_spgw == false"
@@ -5610,7 +5807,7 @@
"name" : "node_20",
"id" : 6,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 172,
"column" : 12,
"source_fragment" : "spgw_meta.direction == DIR_UPLINK"
@@ -5636,7 +5833,7 @@
"name" : "node_22",
"id" : 7,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 189,
"column" : 12,
"source_fragment" : "spgw_meta.direction == DIR_DOWNLINK"
@@ -5662,7 +5859,7 @@
"name" : "node_26",
"id" : 8,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 190,
"column" : 16,
"source_fragment" : "!dl_sess_lookup.apply().hit"
@@ -5692,8 +5889,8 @@
"name" : "node_32",
"id" : 9,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 163,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 222,
"column" : 11,
"source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
},
@@ -5718,8 +5915,8 @@
"name" : "node_34",
"id" : 10,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 164,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 223,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
},
@@ -5744,8 +5941,8 @@
"name" : "node_37",
"id" : 11,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 179,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 238,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
},
@@ -5787,8 +5984,8 @@
"name" : "node_45",
"id" : 13,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 166,
+ "filename" : "./include/control/next.p4",
+ "line" : 219,
"column" : 16,
"source_fragment" : "!hdr.mpls.isValid()"
},
@@ -5817,8 +6014,8 @@
"name" : "node_46",
"id" : 14,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 167,
+ "filename" : "./include/control/next.p4",
+ "line" : 220,
"column" : 19,
"source_fragment" : "hdr.ipv4.isValid()"
},
@@ -5840,7 +6037,7 @@
"name" : "node_50",
"id" : 15,
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 27,
"column" : 12,
"source_fragment" : "standard_metadata.egress_spec < 511"
@@ -5866,7 +6063,7 @@
"name" : "node_52",
"id" : 16,
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 30,
"column" : 12,
"source_fragment" : "standard_metadata.ingress_port < 511"
@@ -5905,8 +6102,8 @@
"name" : "FabricEgress.egress_next.egress_vlan",
"id" : 35,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 192,
+ "filename" : "./include/control/next.p4",
+ "line" : 252,
"column" : 10,
"source_fragment" : "egress_vlan"
},
@@ -5927,10 +6124,10 @@
"match_type" : "exact",
"type" : "simple",
"max_size" : 1024,
- "with_counters" : false,
+ "with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [59, 56],
+ "action_ids" : [60, 57],
"actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
"base_default_next" : "node_57",
"next_tables" : {
@@ -5938,7 +6135,7 @@
"nop" : "node_57"
},
"default_entry" : {
- "action_id" : 56,
+ "action_id" : 57,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -5954,14 +6151,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [58],
+ "action_ids" : [59],
"actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
"base_default_next" : "tbl_act_18",
"next_tables" : {
"FabricEgress.pkt_io_egress.pop_vlan" : "tbl_act_18"
},
"default_entry" : {
- "action_id" : 58,
+ "action_id" : 59,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -5977,14 +6174,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [60],
+ "action_ids" : [61],
"actions" : ["act_18"],
"base_default_next" : "tbl_act_19",
"next_tables" : {
"act_18" : "tbl_act_19"
},
"default_entry" : {
- "action_id" : 60,
+ "action_id" : 61,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6000,14 +6197,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [61],
+ "action_ids" : [62],
"actions" : ["act_19"],
"base_default_next" : "node_62",
"next_tables" : {
"act_19" : "node_62"
},
"default_entry" : {
- "action_id" : 61,
+ "action_id" : 62,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6023,14 +6220,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [57],
+ "action_ids" : [58],
"actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
"base_default_next" : null,
"next_tables" : {
"FabricEgress.spgw_egress.gtpu_encap" : null
},
"default_entry" : {
- "action_id" : 57,
+ "action_id" : 58,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -6043,7 +6240,7 @@
"name" : "node_57",
"id" : 17,
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 42,
"column" : 12,
"source_fragment" : "standard_metadata.egress_port == 255"
@@ -6069,7 +6266,7 @@
"name" : "node_58",
"id" : 18,
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 43,
"column" : 16,
"source_fragment" : "hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == true"
@@ -6119,7 +6316,7 @@
"name" : "node_62",
"id" : 19,
"source_info" : {
- "filename" : "include/spgw.p4",
+ "filename" : "./include/control/../spgw.p4",
"line" : 249,
"column" : 12,
"source_fragment" : "spgw_meta.do_spgw == true && spgw_meta.direction == DIR_DOWNLINK"
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 3b7c27c..93b7a12 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
@@ -111,6 +111,7 @@
}
action_refs {
id: 16819938
+ annotations: "@defaultonly()"
}
action_refs {
id: 16798734
@@ -171,7 +172,7 @@
match_type: TERNARY
}
action_refs {
- id: 16839692
+ id: 16811012
}
action_refs {
id: 16800567
@@ -217,7 +218,7 @@
match_type: LPM
}
action_refs {
- id: 16839692
+ id: 16828976
}
action_refs {
id: 16800567
@@ -306,16 +307,17 @@
match_type: TERNARY
}
action_refs {
- id: 16839692
+ id: 16785374
}
action_refs {
- id: 16801739
+ id: 16810628
}
action_refs {
id: 16833260
}
action_refs {
id: 16819938
+ annotations: "@defaultonly()"
}
const_default_action_id: 16819938
direct_resource_ids: 318772272
@@ -339,6 +341,7 @@
}
action_refs {
id: 16819938
+ annotations: "@defaultonly()"
}
direct_resource_ids: 318785328
size: 1024
@@ -357,16 +360,19 @@
match_type: EXACT
}
action_refs {
- id: 16832750
+ id: 16802668
}
action_refs {
id: 16808391
}
action_refs {
- id: 16812135
+ id: 16780007
}
action_refs {
- id: 16780811
+ id: 16806134
+ }
+ action_refs {
+ id: 16795970
}
action_refs {
id: 16791579
@@ -392,13 +398,13 @@
match_type: EXACT
}
action_refs {
- id: 16812135
+ id: 16800211
}
action_refs {
- id: 16780811
+ id: 16779239
}
action_refs {
- id: 16827088
+ id: 16819349
}
action_refs {
id: 16800567
@@ -455,7 +461,9 @@
}
action_refs {
id: 16819938
+ annotations: "@defaultonly()"
}
+ direct_resource_ids: 318827144
size: 1024
idle_timeout_behavior: NO_TIMEOUT
}
@@ -561,16 +569,9 @@
}
actions {
preamble {
- id: 16833260
- name: "FabricIngress.forwarding.drop"
- alias: "forwarding.drop"
- }
-}
-actions {
- preamble {
- id: 16839692
- name: "FabricIngress.forwarding.set_next_id"
- alias: "set_next_id"
+ id: 16811012
+ name: "FabricIngress.forwarding.set_next_id_bridging"
+ alias: "set_next_id_bridging"
}
params {
id: 1
@@ -592,21 +593,40 @@
}
actions {
preamble {
- id: 16801739
- name: "FabricIngress.forwarding.duplicate_to_controller"
- alias: "duplicate_to_controller"
+ id: 16828976
+ name: "FabricIngress.forwarding.set_next_id_unicast_v4"
+ alias: "set_next_id_unicast_v4"
+ }
+ params {
+ id: 1
+ name: "next_id"
+ bitwidth: 32
}
}
actions {
preamble {
- id: 16832750
- name: "FabricIngress.next.output"
- alias: "output"
+ id: 16785374
+ name: "FabricIngress.forwarding.set_next_id_acl"
+ alias: "set_next_id_acl"
}
params {
id: 1
- name: "port_num"
- bitwidth: 9
+ name: "next_id"
+ bitwidth: 32
+ }
+}
+actions {
+ preamble {
+ id: 16810628
+ name: "FabricIngress.forwarding.send_to_controller"
+ alias: "send_to_controller"
+ }
+}
+actions {
+ preamble {
+ id: 16833260
+ name: "FabricIngress.forwarding.drop"
+ alias: "forwarding.drop"
}
}
actions {
@@ -623,6 +643,18 @@
}
actions {
preamble {
+ id: 16802668
+ name: "FabricIngress.next.output_simple"
+ alias: "output_simple"
+ }
+ params {
+ id: 1
+ name: "port_num"
+ bitwidth: 9
+ }
+}
+actions {
+ preamble {
id: 16808391
name: "FabricIngress.next.set_vlan_output"
alias: "set_vlan_output"
@@ -640,9 +672,9 @@
}
actions {
preamble {
- id: 16812135
- name: "FabricIngress.next.l3_routing"
- alias: "l3_routing"
+ id: 16780007
+ name: "FabricIngress.next.l3_routing_simple"
+ alias: "l3_routing_simple"
}
params {
id: 1
@@ -662,6 +694,60 @@
}
actions {
preamble {
+ id: 16806134
+ name: "FabricIngress.next.mpls_routing_v4_simple"
+ alias: "mpls_routing_v4_simple"
+ }
+ params {
+ id: 1
+ name: "port_num"
+ bitwidth: 9
+ }
+ params {
+ id: 2
+ name: "smac"
+ bitwidth: 48
+ }
+ params {
+ id: 3
+ name: "dmac"
+ bitwidth: 48
+ }
+ params {
+ id: 4
+ name: "label"
+ bitwidth: 20
+ }
+}
+actions {
+ preamble {
+ id: 16795970
+ name: "FabricIngress.next.mpls_routing_v6_simple"
+ alias: "mpls_routing_v6_simple"
+ }
+ params {
+ id: 1
+ name: "port_num"
+ bitwidth: 9
+ }
+ params {
+ id: 2
+ name: "smac"
+ bitwidth: 48
+ }
+ params {
+ id: 3
+ name: "dmac"
+ bitwidth: 48
+ }
+ params {
+ id: 4
+ name: "label"
+ bitwidth: 20
+ }
+}
+actions {
+ preamble {
id: 16791579
name: "FabricIngress.next.l3_routing_vlan"
alias: "l3_routing_vlan"
@@ -689,9 +775,31 @@
}
actions {
preamble {
- id: 16780811
- name: "FabricIngress.next.mpls_routing_v4"
- alias: "mpls_routing_v4"
+ id: 16800211
+ name: "FabricIngress.next.l3_routing_hashed"
+ alias: "l3_routing_hashed"
+ }
+ params {
+ id: 1
+ name: "port_num"
+ bitwidth: 9
+ }
+ params {
+ id: 2
+ name: "smac"
+ bitwidth: 48
+ }
+ params {
+ id: 3
+ name: "dmac"
+ bitwidth: 48
+ }
+}
+actions {
+ preamble {
+ id: 16779239
+ name: "FabricIngress.next.mpls_routing_v4_hashed"
+ alias: "mpls_routing_v4_hashed"
}
params {
id: 1
@@ -716,9 +824,9 @@
}
actions {
preamble {
- id: 16827088
- name: "FabricIngress.next.mpls_routing_v6"
- alias: "mpls_routing_v6"
+ id: 16819349
+ name: "FabricIngress.next.mpls_routing_v6_hashed"
+ alias: "mpls_routing_v6_hashed"
}
params {
id: 1
@@ -927,6 +1035,17 @@
}
direct_table_id: 33606828
}
+direct_counters {
+ preamble {
+ id: 318827144
+ name: "FabricEgress.egress_next.egress_vlan_counter"
+ alias: "egress_vlan_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ direct_table_id: 33599342
+}
controller_packet_metadata {
preamble {
id: 67146229
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 53a7735..2a692f7 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
@@ -93,9 +93,23 @@
]
},
{
- "name" : "arp_t",
+ "name" : "ipv6_t",
"id" : 6,
"fields" : [
+ ["version", 4, false],
+ ["traffic_class", 8, false],
+ ["flow_label", 20, false],
+ ["payload_len", 16, false],
+ ["next_hdr", 8, false],
+ ["hop_limit", 8, false],
+ ["src_addr", 128, false],
+ ["dst_addr", 128, false]
+ ]
+ },
+ {
+ "name" : "arp_t",
+ "id" : 7,
+ "fields" : [
["hw_type", 16, false],
["proto_type", 16, false],
["hw_addr_len", 8, false],
@@ -105,7 +119,7 @@
},
{
"name" : "tcp_t",
- "id" : 7,
+ "id" : 8,
"fields" : [
["src_port", 16, false],
["dst_port", 16, false],
@@ -122,7 +136,7 @@
},
{
"name" : "udp_t",
- "id" : 8,
+ "id" : 9,
"fields" : [
["src_port", 16, false],
["dst_port", 16, false],
@@ -132,7 +146,7 @@
},
{
"name" : "icmp_t",
- "id" : 9,
+ "id" : 10,
"fields" : [
["icmp_type", 8, false],
["icmp_code", 8, false],
@@ -144,7 +158,7 @@
},
{
"name" : "packet_out_header_t",
- "id" : 10,
+ "id" : 11,
"fields" : [
["egress_port", 9, false],
["_pad", 7, false]
@@ -152,7 +166,7 @@
},
{
"name" : "packet_in_header_t",
- "id" : 11,
+ "id" : 12,
"fields" : [
["ingress_port", 9, false],
["_pad", 7, false]
@@ -203,43 +217,50 @@
"pi_omit" : true
},
{
- "name" : "arp",
+ "name" : "ipv6",
"id" : 6,
+ "header_type" : "ipv6_t",
+ "metadata" : false,
+ "pi_omit" : true
+ },
+ {
+ "name" : "arp",
+ "id" : 7,
"header_type" : "arp_t",
"metadata" : false,
"pi_omit" : true
},
{
"name" : "tcp",
- "id" : 7,
+ "id" : 8,
"header_type" : "tcp_t",
"metadata" : false,
"pi_omit" : true
},
{
"name" : "udp",
- "id" : 8,
+ "id" : 9,
"header_type" : "udp_t",
"metadata" : false,
"pi_omit" : true
},
{
"name" : "icmp",
- "id" : 9,
+ "id" : 10,
"header_type" : "icmp_t",
"metadata" : false,
"pi_omit" : true
},
{
"name" : "packet_out",
- "id" : 10,
+ "id" : 11,
"header_type" : "packet_out_header_t",
"metadata" : false,
"pi_omit" : true
},
{
"name" : "packet_in",
- "id" : 11,
+ "id" : 12,
"header_type" : "packet_in_header_t",
"metadata" : false,
"pi_omit" : true
@@ -358,6 +379,12 @@
"next_state" : "parse_ipv4"
},
{
+ "type" : "hexstr",
+ "value" : "0x86dd",
+ "mask" : null,
+ "next_state" : "parse_ipv6"
+ },
+ {
"value" : "default",
"mask" : null,
"next_state" : null
@@ -412,6 +439,12 @@
},
{
"type" : "hexstr",
+ "value" : "0x86dd",
+ "mask" : null,
+ "next_state" : "parse_ipv6"
+ },
+ {
+ "type" : "hexstr",
"value" : "0x8847",
"mask" : null,
"next_state" : "parse_mpls"
@@ -464,6 +497,12 @@
"next_state" : "parse_ipv4"
},
{
+ "type" : "hexstr",
+ "value" : "0x06",
+ "mask" : null,
+ "next_state" : "parse_ipv6"
+ },
+ {
"value" : "default",
"mask" : null,
"next_state" : "parse_ethernet"
@@ -536,13 +575,72 @@
]
},
{
- "name" : "parse_arp",
+ "name" : "parse_ipv6",
"id" : 6,
"parser_ops" : [
{
"parameters" : [
{
"type" : "regular",
+ "value" : "ipv6"
+ }
+ ],
+ "op" : "extract"
+ },
+ {
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+ },
+ {
+ "type" : "field",
+ "value" : ["ipv6", "next_hdr"]
+ }
+ ],
+ "op" : "set"
+ }
+ ],
+ "transitions" : [
+ {
+ "type" : "hexstr",
+ "value" : "0x06",
+ "mask" : null,
+ "next_state" : "parse_tcp"
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x11",
+ "mask" : null,
+ "next_state" : "parse_udp"
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x3a",
+ "mask" : null,
+ "next_state" : "parse_icmp"
+ },
+ {
+ "value" : "default",
+ "mask" : null,
+ "next_state" : null
+ }
+ ],
+ "transition_key" : [
+ {
+ "type" : "field",
+ "value" : ["ipv6", "next_hdr"]
+ }
+ ]
+ },
+ {
+ "name" : "parse_arp",
+ "id" : 7,
+ "parser_ops" : [
+ {
+ "parameters" : [
+ {
+ "type" : "regular",
"value" : "arp"
}
],
@@ -560,7 +658,7 @@
},
{
"name" : "parse_tcp",
- "id" : 7,
+ "id" : 8,
"parser_ops" : [
{
"parameters" : [
@@ -609,7 +707,7 @@
},
{
"name" : "parse_udp",
- "id" : 8,
+ "id" : 9,
"parser_ops" : [
{
"parameters" : [
@@ -658,7 +756,7 @@
},
{
"name" : "parse_icmp",
- "id" : 9,
+ "id" : 10,
"parser_ops" : [
{
"parameters" : [
@@ -688,12 +786,12 @@
"name" : "deparser",
"id" : 0,
"source_info" : {
- "filename" : "include/parser.p4",
+ "filename" : "./include/parser.p4",
"line" : 165,
"column" : 8,
"source_fragment" : "FabricDeparser"
},
- "order" : ["packet_in", "ethernet", "vlan_tag", "mpls", "arp", "ipv4", "tcp", "udp", "icmp"]
+ "order" : ["packet_in", "ethernet", "vlan_tag", "mpls", "arp", "ipv4", "ipv6", "tcp", "udp", "icmp"]
}
],
"meter_arrays" : [],
@@ -735,34 +833,52 @@
"binding" : "FabricIngress.forwarding.acl"
},
{
- "name" : "FabricIngress.next.vlan_meta_counter",
+ "name" : "FabricIngress.forwarding.multicast_v4_counter",
"id" : 6,
"is_direct" : true,
+ "binding" : "FabricIngress.forwarding.multicast_v4"
+ },
+ {
+ "name" : "FabricIngress.forwarding.unicast_v6_counter",
+ "id" : 7,
+ "is_direct" : true,
+ "binding" : "FabricIngress.forwarding.unicast_v6"
+ },
+ {
+ "name" : "FabricIngress.forwarding.multicast_v6_counter",
+ "id" : 8,
+ "is_direct" : true,
+ "binding" : "FabricIngress.forwarding.multicast_v6"
+ },
+ {
+ "name" : "FabricIngress.next.vlan_meta_counter",
+ "id" : 9,
+ "is_direct" : true,
"binding" : "FabricIngress.next.vlan_meta"
},
{
"name" : "FabricIngress.next.simple_counter",
- "id" : 7,
+ "id" : 10,
"is_direct" : true,
"binding" : "FabricIngress.next.simple"
},
{
"name" : "FabricIngress.next.hashed_counter",
- "id" : 8,
+ "id" : 11,
"is_direct" : true,
"binding" : "FabricIngress.next.hashed"
},
{
"name" : "FabricIngress.next.multicast_counter",
- "id" : 9,
+ "id" : 12,
"is_direct" : true,
"binding" : "FabricIngress.next.multicast"
},
{
"name" : "FabricIngress.port_counters_control.egress_port_counter",
- "id" : 10,
+ "id" : 13,
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 23,
"column" : 48,
"source_fragment" : "egress_port_counter"
@@ -772,15 +888,21 @@
},
{
"name" : "FabricIngress.port_counters_control.ingress_port_counter",
- "id" : 11,
+ "id" : 14,
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 24,
"column" : 48,
"source_fragment" : "ingress_port_counter"
},
"size" : 511,
"is_direct" : false
+ },
+ {
+ "name" : "FabricEgress.egress_next.egress_vlan_counter",
+ "id" : 15,
+ "is_direct" : true,
+ "binding" : "FabricEgress.egress_next.egress_vlan"
}
],
"register_arrays" : [],
@@ -789,7 +911,7 @@
"name" : "calc",
"id" : 0,
"source_info" : {
- "filename" : "include/checksum.p4",
+ "filename" : "./include/checksum.p4",
"line" : 28,
"column" : 8,
"source_fragment" : "update_checksum(hdr.ipv4.isValid(), ..."
@@ -846,7 +968,7 @@
"name" : "calc_0",
"id" : 1,
"source_info" : {
- "filename" : "include/checksum.p4",
+ "filename" : "./include/checksum.p4",
"line" : 56,
"column" : 8,
"source_fragment" : "verify_checksum(hdr.ipv4.isValid(), ..."
@@ -957,16 +1079,34 @@
"primitives" : []
},
{
- "name" : "FabricIngress.filtering.drop",
+ "name" : "NoAction",
"id" : 9,
"runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "NoAction",
+ "id" : 10,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "NoAction",
+ "id" : 11,
+ "runtime_data" : [],
+ "primitives" : []
+ },
+ {
+ "name" : "FabricIngress.filtering.drop",
+ "id" : 12,
+ "runtime_data" : [],
"primitives" : [
{
"op" : "drop",
"parameters" : [],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 31,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "mark_to_drop()"
}
@@ -975,7 +1115,7 @@
},
{
"name" : "FabricIngress.filtering.set_vlan",
- "id" : 10,
+ "id" : 13,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -996,8 +1136,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 35,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 42,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
}
@@ -1006,7 +1146,7 @@
},
{
"name" : "FabricIngress.filtering.push_internal_vlan",
- "id" : 11,
+ "id" : 14,
"runtime_data" : [
{
"name" : "new_vlan_id",
@@ -1023,8 +1163,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 41,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 49,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setValid()"
}
@@ -1042,8 +1182,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 42,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 50,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.cfi = 0"
}
@@ -1061,8 +1201,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 43,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 51,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.pri = 0"
}
@@ -1080,8 +1220,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 44,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 52,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
}
@@ -1099,7 +1239,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 66,
"column" : 31,
"source_fragment" : "0x8100; ..."
@@ -1118,10 +1258,10 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 35,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 54,
"column" : 8,
- "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
+ "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
}
},
{
@@ -1147,8 +1287,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 49,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 57,
"column" : 8,
"source_fragment" : "fabric_metadata.pop_vlan_when_packet_in = true"
}
@@ -1157,7 +1297,7 @@
},
{
"name" : "FabricIngress.filtering.set_forwarding_type",
- "id" : 12,
+ "id" : 15,
"runtime_data" : [
{
"name" : "fwd_type",
@@ -1178,8 +1318,8 @@
}
],
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 53,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 94,
"column" : 8,
"source_fragment" : "fabric_metadata.fwd_type = fwd_type"
}
@@ -1187,86 +1327,7 @@
]
},
{
- "name" : "FabricIngress.forwarding.drop",
- "id" : 13,
- "runtime_data" : [],
- "primitives" : [
- {
- "op" : "drop",
- "parameters" : [],
- "source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 36,
- "column" : 8,
- "source_fragment" : "mark_to_drop()"
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.forwarding.set_next_id",
- "id" : 14,
- "runtime_data" : [
- {
- "name" : "next_id",
- "bitwidth" : 32
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t.next_id"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 40,
- "column" : 8,
- "source_fragment" : "fabric_metadata.next_id = next_id"
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.forwarding.set_next_id",
- "id" : 15,
- "runtime_data" : [
- {
- "name" : "next_id",
- "bitwidth" : 32
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["scalars", "fabric_metadata_t.next_id"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 40,
- "column" : 8,
- "source_fragment" : "fabric_metadata.next_id = next_id"
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.forwarding.set_next_id",
+ "name" : "FabricIngress.forwarding.set_next_id_bridging",
"id" : 16,
"runtime_data" : [
{
@@ -1288,8 +1349,8 @@
}
],
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 40,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "fabric_metadata.next_id = next_id"
}
@@ -1315,8 +1376,8 @@
}
],
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 44,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 60,
"column" : 8,
"source_fragment" : "hdr.mpls.setInvalid()"
}
@@ -1334,8 +1395,8 @@
}
],
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 45,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 61,
"column" : 8,
"source_fragment" : "fabric_metadata.next_id = next_id"
}
@@ -1343,8 +1404,70 @@
]
},
{
- "name" : "FabricIngress.forwarding.duplicate_to_controller",
+ "name" : "FabricIngress.forwarding.set_next_id_unicast_v4",
"id" : 18,
+ "runtime_data" : [
+ {
+ "name" : "next_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.next_id"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 83,
+ "column" : 8,
+ "source_fragment" : "fabric_metadata.next_id = next_id"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.forwarding.set_next_id_acl",
+ "id" : 19,
+ "runtime_data" : [
+ {
+ "name" : "next_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.next_id"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 105,
+ "column" : 8,
+ "source_fragment" : "fabric_metadata.next_id = next_id"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.forwarding.send_to_controller",
+ "id" : 20,
"runtime_data" : [],
"primitives" : [
{
@@ -1360,8 +1483,8 @@
}
],
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 49,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 110,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = 255"
}
@@ -1369,8 +1492,149 @@
]
},
{
- "name" : "FabricIngress.next.output",
- "id" : 19,
+ "name" : "FabricIngress.forwarding.drop",
+ "id" : 21,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "drop",
+ "parameters" : [],
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 115,
+ "column" : 8,
+ "source_fragment" : "mark_to_drop()"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.forwarding.set_next_id_multicast_v4",
+ "id" : 22,
+ "runtime_data" : [
+ {
+ "name" : "next_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.next_id"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 155,
+ "column" : 8,
+ "source_fragment" : "fabric_metadata.next_id = next_id"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.forwarding.set_next_id_unicast_v6",
+ "id" : 23,
+ "runtime_data" : [
+ {
+ "name" : "next_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.next_id"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 180,
+ "column" : 8,
+ "source_fragment" : "fabric_metadata.next_id = next_id"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.forwarding.set_next_id_multicast_v6",
+ "id" : 24,
+ "runtime_data" : [
+ {
+ "name" : "next_id",
+ "bitwidth" : 32
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.next_id"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 203,
+ "column" : 8,
+ "source_fragment" : "fabric_metadata.next_id = next_id"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.next.set_vlan",
+ "id" : 25,
+ "runtime_data" : [
+ {
+ "name" : "new_vlan_id",
+ "bitwidth" : 12
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["vlan_tag", "vlan_id"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 61,
+ "column" : 8,
+ "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.next.output_simple",
+ "id" : 26,
"runtime_data" : [
{
"name" : "port_num",
@@ -1391,8 +1655,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num"
}
@@ -1400,12 +1664,16 @@
]
},
{
- "name" : "FabricIngress.next.set_vlan",
- "id" : 20,
+ "name" : "FabricIngress.next.set_vlan_output",
+ "id" : 27,
"runtime_data" : [
{
"name" : "new_vlan_id",
"bitwidth" : 12
+ },
+ {
+ "name" : "port_num",
+ "bitwidth" : 9
}
],
"primitives" : [
@@ -1422,25 +1690,129 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
+ "filename" : "./include/control/next.p4",
+ "line" : 90,
+ "column" : 8,
+ "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["standard_metadata", "egress_spec"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
+ "column" : 8,
+ "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.next.l3_routing_simple",
+ "id" : 28,
+ "runtime_data" : [
+ {
+ "name" : "port_num",
+ "bitwidth" : 9
+ },
+ {
+ "name" : "smac",
+ "bitwidth" : 48
+ },
+ {
+ "name" : "dmac",
+ "bitwidth" : 48
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ethernet", "src_addr"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
"line" : 37,
"column" : 8,
- "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
+ "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ethernet", "dst_addr"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 2
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
+ "column" : 8,
+ "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["standard_metadata", "egress_spec"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
+ "column" : 8,
+ "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
}
]
},
{
- "name" : "FabricIngress.next.set_vlan_output",
- "id" : 21,
+ "name" : "FabricIngress.next.mpls_routing_v4_simple",
+ "id" : 29,
"runtime_data" : [
{
- "name" : "new_vlan_id",
- "bitwidth" : 12
- },
- {
"name" : "port_num",
"bitwidth" : 9
+ },
+ {
+ "name" : "smac",
+ "bitwidth" : 48
+ },
+ {
+ "name" : "dmac",
+ "bitwidth" : 48
+ },
+ {
+ "name" : "label",
+ "bitwidth" : 20
}
],
"primitives" : [
@@ -1449,7 +1821,45 @@
"parameters" : [
{
"type" : "field",
- "value" : ["vlan_tag", "vlan_id"]
+ "value" : ["ethernet", "src_addr"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
+ "column" : 8,
+ "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ethernet", "dst_addr"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 2
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
+ "column" : 8,
+ "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["standard_metadata", "egress_spec"]
},
{
"type" : "runtime_data",
@@ -1457,10 +1867,25 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
+ "column" : 8,
+ "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+ }
+ },
+ {
+ "op" : "add_header",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "mpls"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
"line" : 46,
"column" : 8,
- "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
+ "source_fragment" : "hdr.mpls.setValid()"
}
},
{
@@ -1468,25 +1893,101 @@
"parameters" : [
{
"type" : "field",
- "value" : ["standard_metadata", "egress_spec"]
+ "value" : ["vlan_tag", "ether_type"]
},
{
- "type" : "runtime_data",
- "value" : 1
+ "type" : "hexstr",
+ "value" : "0x8847"
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/../define.p4",
+ "line" : 67,
+ "column" : 31,
+ "source_fragment" : "0x8847; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "label"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 3
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 48,
"column" : 8,
- "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+ "source_fragment" : "hdr.mpls.label = label; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "tc"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 49,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.tc = tc; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "bos"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x01"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 50,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.bos = 1w1"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "ttl"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x40"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/../define.p4",
+ "line" : 87,
+ "column" : 32,
+ "source_fragment" : "64; ..."
}
}
]
},
{
- "name" : "FabricIngress.next.l3_routing",
- "id" : 22,
+ "name" : "FabricIngress.next.mpls_routing_v6_simple",
+ "id" : 30,
"runtime_data" : [
{
"name" : "port_num",
@@ -1499,6 +2000,10 @@
{
"name" : "dmac",
"bitwidth" : 48
+ },
+ {
+ "name" : "label",
+ "bitwidth" : 20
}
],
"primitives" : [
@@ -1515,8 +2020,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "hdr.ethernet.src_addr = smac; ..."
}
@@ -1534,8 +2039,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
"column" : 8,
"source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
}
@@ -1553,49 +2058,25 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
- }
- ]
- },
- {
- "name" : "FabricIngress.next.l3_routing",
- "id" : 23,
- "runtime_data" : [
- {
- "name" : "port_num",
- "bitwidth" : 9
},
{
- "name" : "smac",
- "bitwidth" : 48
- },
- {
- "name" : "dmac",
- "bitwidth" : 48
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
+ "op" : "add_header",
"parameters" : [
{
- "type" : "field",
- "value" : ["ethernet", "src_addr"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
+ "type" : "header",
+ "value" : "mpls"
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
+ "filename" : "./include/control/next.p4",
+ "line" : 46,
"column" : 8,
- "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+ "source_fragment" : "hdr.mpls.setValid()"
}
},
{
@@ -1603,18 +2084,18 @@
"parameters" : [
{
"type" : "field",
- "value" : ["ethernet", "dst_addr"]
+ "value" : ["vlan_tag", "ether_type"]
},
{
- "type" : "runtime_data",
- "value" : 2
+ "type" : "hexstr",
+ "value" : "0x8847"
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
- "column" : 8,
- "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
+ "filename" : "./include/control/../define.p4",
+ "line" : 67,
+ "column" : 31,
+ "source_fragment" : "0x8847; ..."
}
},
{
@@ -1622,25 +2103,82 @@
"parameters" : [
{
"type" : "field",
- "value" : ["standard_metadata", "egress_spec"]
+ "value" : ["mpls", "label"]
},
{
"type" : "runtime_data",
- "value" : 0
+ "value" : 3
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 48,
"column" : 8,
- "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+ "source_fragment" : "hdr.mpls.label = label; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "tc"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x00"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 49,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.tc = tc; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "bos"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x01"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 50,
+ "column" : 8,
+ "source_fragment" : "hdr.mpls.bos = 1w1"
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["mpls", "ttl"]
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x40"
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/../define.p4",
+ "line" : 87,
+ "column" : 32,
+ "source_fragment" : "64; ..."
}
}
]
},
{
"name" : "FabricIngress.next.l3_routing_vlan",
- "id" : 24,
+ "id" : 31,
"runtime_data" : [
{
"name" : "port_num",
@@ -1673,8 +2211,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "hdr.ethernet.src_addr = smac; ..."
}
@@ -1692,8 +2230,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
"column" : 8,
"source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
}
@@ -1711,8 +2249,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 46,
+ "filename" : "./include/control/next.p4",
+ "line" : 90,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
}
@@ -1730,8 +2268,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 85,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
@@ -1739,8 +2277,85 @@
]
},
{
- "name" : "FabricIngress.next.mpls_routing_v4",
- "id" : 25,
+ "name" : "FabricIngress.next.l3_routing_hashed",
+ "id" : 32,
+ "runtime_data" : [
+ {
+ "name" : "port_num",
+ "bitwidth" : 9
+ },
+ {
+ "name" : "smac",
+ "bitwidth" : 48
+ },
+ {
+ "name" : "dmac",
+ "bitwidth" : 48
+ }
+ ],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ethernet", "src_addr"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 1
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
+ "column" : 8,
+ "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ethernet", "dst_addr"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 2
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
+ "column" : 8,
+ "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
+ }
+ },
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["standard_metadata", "egress_spec"]
+ },
+ {
+ "type" : "runtime_data",
+ "value" : 0
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 149,
+ "column" : 8,
+ "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+ }
+ }
+ ]
+ },
+ {
+ "name" : "FabricIngress.next.mpls_routing_v4_hashed",
+ "id" : 33,
"runtime_data" : [
{
"name" : "port_num",
@@ -1773,8 +2388,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "hdr.ethernet.src_addr = smac; ..."
}
@@ -1792,8 +2407,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
"column" : 8,
"source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
}
@@ -1811,8 +2426,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 149,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
@@ -1826,8 +2441,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 72,
+ "filename" : "./include/control/next.p4",
+ "line" : 46,
"column" : 8,
"source_fragment" : "hdr.mpls.setValid()"
}
@@ -1845,7 +2460,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 67,
"column" : 31,
"source_fragment" : "0x8847; ..."
@@ -1864,8 +2479,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 74,
+ "filename" : "./include/control/next.p4",
+ "line" : 48,
"column" : 8,
"source_fragment" : "hdr.mpls.label = label; ..."
}
@@ -1883,8 +2498,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 75,
+ "filename" : "./include/control/next.p4",
+ "line" : 49,
"column" : 8,
"source_fragment" : "hdr.mpls.tc = tc; ..."
}
@@ -1902,8 +2517,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 76,
+ "filename" : "./include/control/next.p4",
+ "line" : 50,
"column" : 8,
"source_fragment" : "hdr.mpls.bos = 1w1"
}
@@ -1921,7 +2536,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 87,
"column" : 32,
"source_fragment" : "64; ..."
@@ -1930,8 +2545,8 @@
]
},
{
- "name" : "FabricIngress.next.mpls_routing_v4",
- "id" : 26,
+ "name" : "FabricIngress.next.mpls_routing_v6_hashed",
+ "id" : 34,
"runtime_data" : [
{
"name" : "port_num",
@@ -1964,8 +2579,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
+ "filename" : "./include/control/next.p4",
+ "line" : 37,
"column" : 8,
"source_fragment" : "hdr.ethernet.src_addr = smac; ..."
}
@@ -1983,8 +2598,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
+ "filename" : "./include/control/next.p4",
+ "line" : 41,
"column" : 8,
"source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
}
@@ -2002,8 +2617,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
+ "filename" : "./include/control/next.p4",
+ "line" : 149,
"column" : 8,
"source_fragment" : "standard_metadata.egress_spec = port_num; ..."
}
@@ -2017,8 +2632,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 72,
+ "filename" : "./include/control/next.p4",
+ "line" : 46,
"column" : 8,
"source_fragment" : "hdr.mpls.setValid()"
}
@@ -2036,7 +2651,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 67,
"column" : 31,
"source_fragment" : "0x8847; ..."
@@ -2055,8 +2670,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 74,
+ "filename" : "./include/control/next.p4",
+ "line" : 48,
"column" : 8,
"source_fragment" : "hdr.mpls.label = label; ..."
}
@@ -2074,8 +2689,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 75,
+ "filename" : "./include/control/next.p4",
+ "line" : 49,
"column" : 8,
"source_fragment" : "hdr.mpls.tc = tc; ..."
}
@@ -2093,8 +2708,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 76,
+ "filename" : "./include/control/next.p4",
+ "line" : 50,
"column" : 8,
"source_fragment" : "hdr.mpls.bos = 1w1"
}
@@ -2112,198 +2727,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
- "line" : 87,
- "column" : 32,
- "source_fragment" : "64; ..."
- }
- }
- ]
- },
- {
- "name" : "FabricIngress.next.mpls_routing_v6",
- "id" : 27,
- "runtime_data" : [
- {
- "name" : "port_num",
- "bitwidth" : 9
- },
- {
- "name" : "smac",
- "bitwidth" : 48
- },
- {
- "name" : "dmac",
- "bitwidth" : 48
- },
- {
- "name" : "label",
- "bitwidth" : 20
- }
- ],
- "primitives" : [
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["ethernet", "src_addr"]
- },
- {
- "type" : "runtime_data",
- "value" : 1
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 51,
- "column" : 8,
- "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["ethernet", "dst_addr"]
- },
- {
- "type" : "runtime_data",
- "value" : 2
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 55,
- "column" : 8,
- "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["standard_metadata", "egress_spec"]
- },
- {
- "type" : "runtime_data",
- "value" : 0
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 33,
- "column" : 8,
- "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
- }
- },
- {
- "op" : "add_header",
- "parameters" : [
- {
- "type" : "header",
- "value" : "mpls"
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 72,
- "column" : 8,
- "source_fragment" : "hdr.mpls.setValid()"
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["vlan_tag", "ether_type"]
- },
- {
- "type" : "hexstr",
- "value" : "0x8847"
- }
- ],
- "source_info" : {
- "filename" : "include/control/../define.p4",
- "line" : 67,
- "column" : 31,
- "source_fragment" : "0x8847; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "label"]
- },
- {
- "type" : "runtime_data",
- "value" : 3
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 74,
- "column" : 8,
- "source_fragment" : "hdr.mpls.label = label; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "tc"]
- },
- {
- "type" : "hexstr",
- "value" : "0x00"
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 75,
- "column" : 8,
- "source_fragment" : "hdr.mpls.tc = tc; ..."
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "bos"]
- },
- {
- "type" : "hexstr",
- "value" : "0x01"
- }
- ],
- "source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 76,
- "column" : 8,
- "source_fragment" : "hdr.mpls.bos = 1w1"
- }
- },
- {
- "op" : "assign",
- "parameters" : [
- {
- "type" : "field",
- "value" : ["mpls", "ttl"]
- },
- {
- "type" : "hexstr",
- "value" : "0x40"
- }
- ],
- "source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 87,
"column" : 32,
"source_fragment" : "64; ..."
@@ -2313,7 +2737,7 @@
},
{
"name" : "FabricIngress.next.set_mcast_group",
- "id" : 28,
+ "id" : 35,
"runtime_data" : [
{
"name" : "gid",
@@ -2334,8 +2758,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 148,
+ "filename" : "./include/control/next.p4",
+ "line" : 202,
"column" : 8,
"source_fragment" : "standard_metadata.mcast_grp = gid"
}
@@ -2344,7 +2768,7 @@
},
{
"name" : "act",
- "id" : 29,
+ "id" : 36,
"runtime_data" : [],
"primitives" : [
{
@@ -2360,7 +2784,7 @@
}
],
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 26,
"column" : 12,
"source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
@@ -2375,7 +2799,7 @@
}
],
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 27,
"column" : 12,
"source_fragment" : "hdr.packet_out.setInvalid()"
@@ -2385,7 +2809,7 @@
},
{
"name" : "act_0",
- "id" : 30,
+ "id" : 37,
"runtime_data" : [],
"primitives" : [
{
@@ -2401,7 +2825,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 69,
"column" : 31,
"source_fragment" : "0x0800; ..."
@@ -2420,7 +2844,7 @@
}
],
"source_info" : {
- "filename" : "include/control/../define.p4",
+ "filename" : "./include/control/../define.p4",
"line" : 69,
"column" : 31,
"source_fragment" : "0x0800; ..."
@@ -2430,7 +2854,7 @@
},
{
"name" : "act_1",
- "id" : 31,
+ "id" : 38,
"runtime_data" : [],
"primitives" : [
{
@@ -2460,7 +2884,7 @@
},
{
"name" : "act_2",
- "id" : 32,
+ "id" : 39,
"runtime_data" : [],
"primitives" : [
{
@@ -2490,7 +2914,7 @@
},
{
"name" : "act_3",
- "id" : 33,
+ "id" : 40,
"runtime_data" : [],
"primitives" : [
{
@@ -2529,8 +2953,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 168,
+ "filename" : "./include/control/next.p4",
+ "line" : 221,
"column" : 20,
"source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
}
@@ -2539,7 +2963,56 @@
},
{
"name" : "act_4",
- "id" : 34,
+ "id" : 41,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "assign",
+ "parameters" : [
+ {
+ "type" : "field",
+ "value" : ["ipv6", "hop_limit"]
+ },
+ {
+ "type" : "expression",
+ "value" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "&",
+ "left" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "+",
+ "left" : {
+ "type" : "field",
+ "value" : ["ipv6", "hop_limit"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0xff"
+ }
+ }
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0xff"
+ }
+ }
+ }
+ }
+ ],
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 225,
+ "column" : 20,
+ "source_fragment" : "hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1"
+ }
+ }
+ ]
+ },
+ {
+ "name" : "act_5",
+ "id" : 42,
"runtime_data" : [],
"primitives" : [
{
@@ -2568,7 +3041,7 @@
}
],
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 28,
"column" : 38,
"source_fragment" : "(bit<32>)standard_metadata.egress_spec"
@@ -2587,7 +3060,7 @@
}
],
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 28,
"column" : 12,
"source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
@@ -2596,8 +3069,8 @@
]
},
{
- "name" : "act_5",
- "id" : 35,
+ "name" : "act_6",
+ "id" : 43,
"runtime_data" : [],
"primitives" : [
{
@@ -2626,7 +3099,7 @@
}
],
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 31,
"column" : 39,
"source_fragment" : "(bit<32>)standard_metadata.ingress_port"
@@ -2645,7 +3118,7 @@
}
],
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 31,
"column" : 12,
"source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
@@ -2655,13 +3128,13 @@
},
{
"name" : "nop",
- "id" : 36,
+ "id" : 44,
"runtime_data" : [],
"primitives" : []
},
{
"name" : "FabricEgress.pkt_io_egress.pop_vlan",
- "id" : 37,
+ "id" : 45,
"runtime_data" : [],
"primitives" : [
{
@@ -2677,7 +3150,7 @@
}
],
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 38,
"column" : 8,
"source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
@@ -2692,7 +3165,7 @@
}
],
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 39,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setInvalid()"
@@ -2702,7 +3175,7 @@
},
{
"name" : "FabricEgress.egress_next.pop_vlan",
- "id" : 38,
+ "id" : 46,
"runtime_data" : [],
"primitives" : [
{
@@ -2718,8 +3191,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 188,
+ "filename" : "./include/control/next.p4",
+ "line" : 247,
"column" : 8,
"source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
}
@@ -2733,8 +3206,8 @@
}
],
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 189,
+ "filename" : "./include/control/next.p4",
+ "line" : 248,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setInvalid()"
}
@@ -2742,8 +3215,8 @@
]
},
{
- "name" : "act_6",
- "id" : 39,
+ "name" : "act_7",
+ "id" : 47,
"runtime_data" : [],
"primitives" : [
{
@@ -2755,7 +3228,7 @@
}
],
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 46,
"column" : 12,
"source_fragment" : "hdr.packet_in.setValid()"
@@ -2774,7 +3247,7 @@
}
],
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 47,
"column" : 12,
"source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
@@ -2805,14 +3278,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [29],
+ "action_ids" : [36],
"actions" : ["act"],
"base_default_next" : null,
"next_tables" : {
"act" : null
},
"default_entry" : {
- "action_id" : 29,
+ "action_id" : 36,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -2822,8 +3295,8 @@
"name" : "FabricIngress.filtering.ingress_port_vlan",
"id" : 1,
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 57,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 61,
"column" : 10,
"source_fragment" : "ingress_port_vlan"
},
@@ -2853,7 +3326,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [11, 10, 0, 9],
+ "action_ids" : [14, 13, 0, 12],
"actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "nop", "FabricIngress.filtering.drop"],
"base_default_next" : "FabricIngress.filtering.fwd_classifier",
"next_tables" : {
@@ -2873,8 +3346,8 @@
"name" : "FabricIngress.filtering.fwd_classifier",
"id" : 2,
"source_info" : {
- "filename" : "include/control/filtering.p4",
- "line" : 76,
+ "filename" : "./include/control/filtering.p4",
+ "line" : 98,
"column" : 10,
"source_fragment" : "fwd_classifier"
},
@@ -2904,14 +3377,14 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [12],
+ "action_ids" : [15],
"actions" : ["FabricIngress.filtering.set_forwarding_type"],
"base_default_next" : "node_6",
"next_tables" : {
"FabricIngress.filtering.set_forwarding_type" : "node_6"
},
"default_entry" : {
- "action_id" : 12,
+ "action_id" : 15,
"action_const" : true,
"action_data" : ["0x0"],
"action_entry_const" : true
@@ -2921,8 +3394,8 @@
"name" : "FabricIngress.forwarding.bridging",
"id" : 3,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 52,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 41,
"column" : 10,
"source_fragment" : "bridging"
},
@@ -2946,11 +3419,11 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [14, 3],
- "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+ "action_ids" : [16, 3],
+ "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+ "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.forwarding.acl",
"NoAction" : "FabricIngress.forwarding.acl"
},
"default_entry" : {
@@ -2964,8 +3437,8 @@
"name" : "FabricIngress.forwarding.mpls",
"id" : 4,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 64,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 65,
"column" : 10,
"source_fragment" : "mpls"
},
@@ -3007,14 +3480,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [30],
+ "action_ids" : [37],
"actions" : ["act_0"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
"act_0" : "FabricIngress.forwarding.acl"
},
"default_entry" : {
- "action_id" : 30,
+ "action_id" : 37,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -3024,8 +3497,8 @@
"name" : "FabricIngress.forwarding.unicast_v4",
"id" : 6,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 75,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 87,
"column" : 10,
"source_fragment" : "unicast_v4"
},
@@ -3043,11 +3516,11 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [15, 5],
- "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+ "action_ids" : [18, 5],
+ "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
"base_default_next" : "FabricIngress.forwarding.acl",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+ "FabricIngress.forwarding.set_next_id_unicast_v4" : "FabricIngress.forwarding.acl",
"NoAction" : "FabricIngress.forwarding.acl"
},
"default_entry" : {
@@ -3058,11 +3531,134 @@
}
},
{
- "name" : "FabricIngress.forwarding.acl",
+ "name" : "FabricIngress.forwarding.multicast_v4",
"id" : 7,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 133,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 159,
+ "column" : 10,
+ "source_fragment" : "multicast_v4"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "hdr.vlan_tag.vlan_id",
+ "target" : ["vlan_tag", "vlan_id"],
+ "mask" : null
+ },
+ {
+ "match_type" : "lpm",
+ "name" : "hdr.ipv4.dst_addr",
+ "target" : ["ipv4", "dst_addr"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "lpm",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : true,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [22, 6],
+ "actions" : ["FabricIngress.forwarding.set_next_id_multicast_v4", "NoAction"],
+ "base_default_next" : "FabricIngress.forwarding.acl",
+ "next_tables" : {
+ "FabricIngress.forwarding.set_next_id_multicast_v4" : "FabricIngress.forwarding.acl",
+ "NoAction" : "FabricIngress.forwarding.acl"
+ },
+ "default_entry" : {
+ "action_id" : 6,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
+ }
+ },
+ {
+ "name" : "FabricIngress.forwarding.unicast_v6",
+ "id" : 8,
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 184,
+ "column" : 10,
+ "source_fragment" : "unicast_v6"
+ },
+ "key" : [
+ {
+ "match_type" : "lpm",
+ "name" : "hdr.ipv6.dst_addr",
+ "target" : ["ipv6", "dst_addr"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "lpm",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : true,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [23, 7],
+ "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v6", "NoAction"],
+ "base_default_next" : "FabricIngress.forwarding.acl",
+ "next_tables" : {
+ "FabricIngress.forwarding.set_next_id_unicast_v6" : "FabricIngress.forwarding.acl",
+ "NoAction" : "FabricIngress.forwarding.acl"
+ },
+ "default_entry" : {
+ "action_id" : 7,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
+ }
+ },
+ {
+ "name" : "FabricIngress.forwarding.multicast_v6",
+ "id" : 9,
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 207,
+ "column" : 10,
+ "source_fragment" : "multicast_v6"
+ },
+ "key" : [
+ {
+ "match_type" : "exact",
+ "name" : "hdr.vlan_tag.vlan_id",
+ "target" : ["vlan_tag", "vlan_id"],
+ "mask" : null
+ },
+ {
+ "match_type" : "lpm",
+ "name" : "hdr.ipv6.dst_addr",
+ "target" : ["ipv6", "dst_addr"],
+ "mask" : null
+ }
+ ],
+ "match_type" : "lpm",
+ "type" : "simple",
+ "max_size" : 1024,
+ "with_counters" : true,
+ "support_timeout" : false,
+ "direct_meters" : null,
+ "action_ids" : [24, 8],
+ "actions" : ["FabricIngress.forwarding.set_next_id_multicast_v6", "NoAction"],
+ "base_default_next" : "FabricIngress.forwarding.acl",
+ "next_tables" : {
+ "FabricIngress.forwarding.set_next_id_multicast_v6" : "FabricIngress.forwarding.acl",
+ "NoAction" : "FabricIngress.forwarding.acl"
+ },
+ "default_entry" : {
+ "action_id" : 8,
+ "action_const" : false,
+ "action_data" : [],
+ "action_entry_const" : false
+ }
+ },
+ {
+ "name" : "FabricIngress.forwarding.acl",
+ "id" : 10,
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 119,
"column" : 10,
"source_fragment" : "acl"
},
@@ -3146,12 +3742,12 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [16, 18, 13, 1],
- "actions" : ["FabricIngress.forwarding.set_next_id", "FabricIngress.forwarding.duplicate_to_controller", "FabricIngress.forwarding.drop", "nop"],
+ "action_ids" : [19, 20, 21, 1],
+ "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.send_to_controller", "FabricIngress.forwarding.drop", "nop"],
"base_default_next" : "FabricIngress.next.vlan_meta",
"next_tables" : {
- "FabricIngress.forwarding.set_next_id" : "FabricIngress.next.vlan_meta",
- "FabricIngress.forwarding.duplicate_to_controller" : "FabricIngress.next.vlan_meta",
+ "FabricIngress.forwarding.set_next_id_acl" : "FabricIngress.next.vlan_meta",
+ "FabricIngress.forwarding.send_to_controller" : "FabricIngress.next.vlan_meta",
"FabricIngress.forwarding.drop" : "FabricIngress.next.vlan_meta",
"nop" : "FabricIngress.next.vlan_meta"
},
@@ -3164,10 +3760,10 @@
},
{
"name" : "FabricIngress.next.vlan_meta",
- "id" : 8,
+ "id" : 11,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 96,
+ "filename" : "./include/control/next.p4",
+ "line" : 65,
"column" : 10,
"source_fragment" : "vlan_meta"
},
@@ -3185,7 +3781,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [20, 2],
+ "action_ids" : [25, 2],
"actions" : ["FabricIngress.next.set_vlan", "nop"],
"base_default_next" : "FabricIngress.next.simple",
"next_tables" : {
@@ -3201,10 +3797,10 @@
},
{
"name" : "FabricIngress.next.simple",
- "id" : 9,
+ "id" : 12,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 109,
+ "filename" : "./include/control/next.p4",
+ "line" : 122,
"column" : 10,
"source_fragment" : "simple"
},
@@ -3222,15 +3818,15 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [19, 21, 22, 25, 24, 6],
- "actions" : ["FabricIngress.next.output", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing", "FabricIngress.next.mpls_routing_v4", "FabricIngress.next.l3_routing_vlan", "NoAction"],
+ "action_ids" : [26, 27, 28, 29, 30, 31, 9],
+ "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_1",
"__MISS__" : "tbl_act_2"
},
"default_entry" : {
- "action_id" : 6,
+ "action_id" : 9,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -3238,7 +3834,7 @@
},
{
"name" : "tbl_act_1",
- "id" : 10,
+ "id" : 13,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3246,14 +3842,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [31],
+ "action_ids" : [38],
"actions" : ["act_1"],
- "base_default_next" : "node_18",
+ "base_default_next" : "node_24",
"next_tables" : {
- "act_1" : "node_18"
+ "act_1" : "node_24"
},
"default_entry" : {
- "action_id" : 31,
+ "action_id" : 38,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -3261,7 +3857,7 @@
},
{
"name" : "tbl_act_2",
- "id" : 11,
+ "id" : 14,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3269,14 +3865,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [32],
+ "action_ids" : [39],
"actions" : ["act_2"],
- "base_default_next" : "node_18",
+ "base_default_next" : "node_24",
"next_tables" : {
- "act_2" : "node_18"
+ "act_2" : "node_24"
},
"default_entry" : {
- "action_id" : 32,
+ "action_id" : 39,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -3284,7 +3880,7 @@
},
{
"name" : "tbl_act_3",
- "id" : 12,
+ "id" : 15,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3292,14 +3888,37 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [33],
+ "action_ids" : [40],
"actions" : ["act_3"],
"base_default_next" : "FabricIngress.next.hashed",
"next_tables" : {
"act_3" : "FabricIngress.next.hashed"
},
"default_entry" : {
- "action_id" : 33,
+ "action_id" : 40,
+ "action_const" : true,
+ "action_data" : [],
+ "action_entry_const" : true
+ }
+ },
+ {
+ "name" : "tbl_act_4",
+ "id" : 16,
+ "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" : "FabricIngress.next.hashed",
+ "next_tables" : {
+ "act_4" : "FabricIngress.next.hashed"
+ },
+ "default_entry" : {
+ "action_id" : 41,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -3307,10 +3926,10 @@
},
{
"name" : "FabricIngress.next.hashed",
- "id" : 13,
+ "id" : 17,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 124,
+ "filename" : "./include/control/next.p4",
+ "line" : 175,
"column" : 10,
"source_fragment" : "hashed"
},
@@ -3329,22 +3948,22 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [23, 26, 27, 7],
- "actions" : ["FabricIngress.next.l3_routing", "FabricIngress.next.mpls_routing_v4", "FabricIngress.next.mpls_routing_v6", "NoAction"],
+ "action_ids" : [32, 33, 34, 10],
+ "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
"base_default_next" : "FabricIngress.next.multicast",
"next_tables" : {
- "FabricIngress.next.l3_routing" : "FabricIngress.next.multicast",
- "FabricIngress.next.mpls_routing_v4" : "FabricIngress.next.multicast",
- "FabricIngress.next.mpls_routing_v6" : "FabricIngress.next.multicast",
+ "FabricIngress.next.l3_routing_hashed" : "FabricIngress.next.multicast",
+ "FabricIngress.next.mpls_routing_v4_hashed" : "FabricIngress.next.multicast",
+ "FabricIngress.next.mpls_routing_v6_hashed" : "FabricIngress.next.multicast",
"NoAction" : "FabricIngress.next.multicast"
}
},
{
"name" : "FabricIngress.next.multicast",
- "id" : 14,
+ "id" : 18,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 153,
+ "filename" : "./include/control/next.p4",
+ "line" : 206,
"column" : 10,
"source_fragment" : "multicast"
},
@@ -3362,23 +3981,23 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [28, 8],
+ "action_ids" : [35, 11],
"actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
- "base_default_next" : "node_24",
+ "base_default_next" : "node_32",
"next_tables" : {
- "FabricIngress.next.set_mcast_group" : "node_24",
- "NoAction" : "node_24"
+ "FabricIngress.next.set_mcast_group" : "node_32",
+ "NoAction" : "node_32"
},
"default_entry" : {
- "action_id" : 8,
+ "action_id" : 11,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
}
},
{
- "name" : "tbl_act_4",
- "id" : 15,
+ "name" : "tbl_act_5",
+ "id" : 19,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3386,22 +4005,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [34],
- "actions" : ["act_4"],
- "base_default_next" : "node_26",
+ "action_ids" : [42],
+ "actions" : ["act_5"],
+ "base_default_next" : "node_34",
"next_tables" : {
- "act_4" : "node_26"
+ "act_5" : "node_34"
},
"default_entry" : {
- "action_id" : 34,
+ "action_id" : 42,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_5",
- "id" : 16,
+ "name" : "tbl_act_6",
+ "id" : 20,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3409,14 +4028,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [35],
- "actions" : ["act_5"],
+ "action_ids" : [43],
+ "actions" : ["act_6"],
"base_default_next" : null,
"next_tables" : {
- "act_5" : null
+ "act_6" : null
},
"default_entry" : {
- "action_id" : 35,
+ "action_id" : 43,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -3460,7 +4079,7 @@
"name" : "node_2",
"id" : 0,
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 25,
"column" : 12,
"source_fragment" : "hdr.packet_out.isValid()"
@@ -3483,8 +4102,8 @@
"name" : "node_6",
"id" : 1,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 163,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 222,
"column" : 11,
"source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
},
@@ -3509,8 +4128,8 @@
"name" : "node_8",
"id" : 2,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 164,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 223,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
},
@@ -3535,8 +4154,8 @@
"name" : "node_11",
"id" : 3,
"source_info" : {
- "filename" : "include/control/forwarding.p4",
- "line" : 179,
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 230,
"column" : 17,
"source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
},
@@ -3555,11 +4174,89 @@
}
},
"true_next" : "FabricIngress.forwarding.unicast_v4",
+ "false_next" : "node_13"
+ },
+ {
+ "name" : "node_13",
+ "id" : 4,
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 232,
+ "column" : 17,
+ "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_MULTICAST"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x03"
+ }
+ }
+ },
+ "true_next" : "FabricIngress.forwarding.multicast_v4",
+ "false_next" : "node_15"
+ },
+ {
+ "name" : "node_15",
+ "id" : 5,
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 235,
+ "column" : 17,
+ "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_UNICAST"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x04"
+ }
+ }
+ },
+ "true_next" : "FabricIngress.forwarding.unicast_v6",
+ "false_next" : "node_17"
+ },
+ {
+ "name" : "node_17",
+ "id" : 6,
+ "source_info" : {
+ "filename" : "./include/control/forwarding.p4",
+ "line" : 237,
+ "column" : 17,
+ "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_MULTICAST"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "==",
+ "left" : {
+ "type" : "field",
+ "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+ },
+ "right" : {
+ "type" : "hexstr",
+ "value" : "0x05"
+ }
+ }
+ },
+ "true_next" : "FabricIngress.forwarding.multicast_v6",
"false_next" : "FabricIngress.forwarding.acl"
},
{
- "name" : "node_18",
- "id" : 4,
+ "name" : "node_24",
+ "id" : 7,
"expression" : {
"type" : "expression",
"value" : {
@@ -3571,15 +4268,15 @@
}
}
},
- "true_next" : "node_19",
+ "true_next" : "node_25",
"false_next" : "FabricIngress.next.hashed"
},
{
- "name" : "node_19",
- "id" : 5,
+ "name" : "node_25",
+ "id" : 8,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 166,
+ "filename" : "./include/control/next.p4",
+ "line" : 219,
"column" : 16,
"source_fragment" : "!hdr.mpls.isValid()"
},
@@ -3601,15 +4298,15 @@
}
}
},
- "true_next" : "node_20",
+ "true_next" : "node_26",
"false_next" : "FabricIngress.next.hashed"
},
{
- "name" : "node_20",
- "id" : 6,
+ "name" : "node_26",
+ "id" : 9,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 167,
+ "filename" : "./include/control/next.p4",
+ "line" : 220,
"column" : 19,
"source_fragment" : "hdr.ipv4.isValid()"
},
@@ -3625,13 +4322,36 @@
}
},
"true_next" : "tbl_act_3",
+ "false_next" : "node_28"
+ },
+ {
+ "name" : "node_28",
+ "id" : 10,
+ "source_info" : {
+ "filename" : "./include/control/next.p4",
+ "line" : 224,
+ "column" : 25,
+ "source_fragment" : "hdr.ipv6.isValid()"
+ },
+ "expression" : {
+ "type" : "expression",
+ "value" : {
+ "op" : "d2b",
+ "left" : null,
+ "right" : {
+ "type" : "field",
+ "value" : ["ipv6", "$valid$"]
+ }
+ }
+ },
+ "true_next" : "tbl_act_4",
"false_next" : "FabricIngress.next.hashed"
},
{
- "name" : "node_24",
- "id" : 7,
+ "name" : "node_32",
+ "id" : 11,
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 27,
"column" : 12,
"source_fragment" : "standard_metadata.egress_spec < 511"
@@ -3650,14 +4370,14 @@
}
}
},
- "true_next" : "tbl_act_4",
- "false_next" : "node_26"
+ "true_next" : "tbl_act_5",
+ "false_next" : "node_34"
},
{
- "name" : "node_26",
- "id" : 8,
+ "name" : "node_34",
+ "id" : 12,
"source_info" : {
- "filename" : "include/control/port_counter.p4",
+ "filename" : "./include/control/port_counter.p4",
"line" : 30,
"column" : 12,
"source_fragment" : "standard_metadata.ingress_port < 511"
@@ -3677,7 +4397,7 @@
}
},
"false_next" : null,
- "true_next" : "tbl_act_5"
+ "true_next" : "tbl_act_6"
}
]
},
@@ -3694,10 +4414,10 @@
"tables" : [
{
"name" : "FabricEgress.egress_next.egress_vlan",
- "id" : 17,
+ "id" : 21,
"source_info" : {
- "filename" : "include/control/next.p4",
- "line" : 192,
+ "filename" : "./include/control/next.p4",
+ "line" : 252,
"column" : 10,
"source_fragment" : "egress_vlan"
},
@@ -3718,18 +4438,18 @@
"match_type" : "exact",
"type" : "simple",
"max_size" : 1024,
- "with_counters" : false,
+ "with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [38, 36],
+ "action_ids" : [46, 44],
"actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
- "base_default_next" : "node_31",
+ "base_default_next" : "node_39",
"next_tables" : {
- "FabricEgress.egress_next.pop_vlan" : "node_31",
- "nop" : "node_31"
+ "FabricEgress.egress_next.pop_vlan" : "node_39",
+ "nop" : "node_39"
},
"default_entry" : {
- "action_id" : 36,
+ "action_id" : 44,
"action_const" : false,
"action_data" : [],
"action_entry_const" : false
@@ -3737,7 +4457,7 @@
},
{
"name" : "tbl_pkt_io_egress_pop_vlan",
- "id" : 18,
+ "id" : 22,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3745,22 +4465,22 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [37],
+ "action_ids" : [45],
"actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
- "base_default_next" : "tbl_act_6",
+ "base_default_next" : "tbl_act_7",
"next_tables" : {
- "FabricEgress.pkt_io_egress.pop_vlan" : "tbl_act_6"
+ "FabricEgress.pkt_io_egress.pop_vlan" : "tbl_act_7"
},
"default_entry" : {
- "action_id" : 37,
+ "action_id" : 45,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
}
},
{
- "name" : "tbl_act_6",
- "id" : 19,
+ "name" : "tbl_act_7",
+ "id" : 23,
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -3768,14 +4488,14 @@
"with_counters" : false,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [39],
- "actions" : ["act_6"],
+ "action_ids" : [47],
+ "actions" : ["act_7"],
"base_default_next" : null,
"next_tables" : {
- "act_6" : null
+ "act_7" : null
},
"default_entry" : {
- "action_id" : 39,
+ "action_id" : 47,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -3785,10 +4505,10 @@
"action_profiles" : [],
"conditionals" : [
{
- "name" : "node_31",
- "id" : 9,
+ "name" : "node_39",
+ "id" : 13,
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 42,
"column" : 12,
"source_fragment" : "standard_metadata.egress_port == 255"
@@ -3808,13 +4528,13 @@
}
},
"false_next" : null,
- "true_next" : "node_32"
+ "true_next" : "node_40"
},
{
- "name" : "node_32",
- "id" : 10,
+ "name" : "node_40",
+ "id" : 14,
"source_info" : {
- "filename" : "include/control/packetio.p4",
+ "filename" : "./include/control/packetio.p4",
"line" : 43,
"column" : 16,
"source_fragment" : "hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == true"
@@ -3858,7 +4578,7 @@
}
},
"true_next" : "tbl_pkt_io_egress_pop_vlan",
- "false_next" : "tbl_act_6"
+ "false_next" : "tbl_act_7"
}
]
}
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
index ce76fa7..db81d51 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
@@ -30,6 +30,7 @@
}
action_refs {
id: 16819938
+ annotations: "@defaultonly()"
}
action_refs {
id: 16798734
@@ -90,7 +91,7 @@
match_type: TERNARY
}
action_refs {
- id: 16839692
+ id: 16811012
}
action_refs {
id: 16800567
@@ -136,7 +137,7 @@
match_type: LPM
}
action_refs {
- id: 16839692
+ id: 16828976
}
action_refs {
id: 16800567
@@ -225,16 +226,17 @@
match_type: TERNARY
}
action_refs {
- id: 16839692
+ id: 16785374
}
action_refs {
- id: 16801739
+ id: 16810628
}
action_refs {
id: 16833260
}
action_refs {
id: 16819938
+ annotations: "@defaultonly()"
}
const_default_action_id: 16819938
direct_resource_ids: 318772272
@@ -243,6 +245,87 @@
}
tables {
preamble {
+ id: 33578363
+ name: "FabricIngress.forwarding.multicast_v4"
+ alias: "multicast_v4"
+ }
+ match_fields {
+ id: 1
+ name: "hdr.vlan_tag.vlan_id"
+ bitwidth: 12
+ match_type: EXACT
+ }
+ match_fields {
+ id: 2
+ name: "hdr.ipv4.dst_addr"
+ bitwidth: 32
+ match_type: LPM
+ }
+ action_refs {
+ id: 16809157
+ }
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly()"
+ }
+ direct_resource_ids: 318797896
+ size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
+}
+tables {
+ preamble {
+ id: 33568751
+ name: "FabricIngress.forwarding.unicast_v6"
+ alias: "unicast_v6"
+ }
+ match_fields {
+ id: 1
+ name: "hdr.ipv6.dst_addr"
+ bitwidth: 128
+ match_type: LPM
+ }
+ action_refs {
+ id: 16823773
+ }
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly()"
+ }
+ direct_resource_ids: 318820865
+ size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
+}
+tables {
+ preamble {
+ id: 33581295
+ name: "FabricIngress.forwarding.multicast_v6"
+ alias: "multicast_v6"
+ }
+ match_fields {
+ id: 1
+ name: "hdr.vlan_tag.vlan_id"
+ bitwidth: 12
+ match_type: EXACT
+ }
+ match_fields {
+ id: 2
+ name: "hdr.ipv6.dst_addr"
+ bitwidth: 128
+ match_type: LPM
+ }
+ action_refs {
+ id: 16819612
+ }
+ action_refs {
+ id: 16800567
+ annotations: "@defaultonly()"
+ }
+ direct_resource_ids: 318815310
+ size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
+}
+tables {
+ preamble {
id: 33562709
name: "FabricIngress.next.vlan_meta"
alias: "vlan_meta"
@@ -258,6 +341,7 @@
}
action_refs {
id: 16819938
+ annotations: "@defaultonly()"
}
direct_resource_ids: 318785328
size: 1024
@@ -276,16 +360,19 @@
match_type: EXACT
}
action_refs {
- id: 16832750
+ id: 16802668
}
action_refs {
id: 16808391
}
action_refs {
- id: 16812135
+ id: 16780007
}
action_refs {
- id: 16780811
+ id: 16806134
+ }
+ action_refs {
+ id: 16795970
}
action_refs {
id: 16791579
@@ -311,13 +398,13 @@
match_type: EXACT
}
action_refs {
- id: 16812135
+ id: 16800211
}
action_refs {
- id: 16780811
+ id: 16779239
}
action_refs {
- id: 16827088
+ id: 16819349
}
action_refs {
id: 16800567
@@ -374,7 +461,9 @@
}
action_refs {
id: 16819938
+ annotations: "@defaultonly()"
}
+ direct_resource_ids: 318827144
size: 1024
idle_timeout_behavior: NO_TIMEOUT
}
@@ -437,16 +526,9 @@
}
actions {
preamble {
- id: 16833260
- name: "FabricIngress.forwarding.drop"
- alias: "forwarding.drop"
- }
-}
-actions {
- preamble {
- id: 16839692
- name: "FabricIngress.forwarding.set_next_id"
- alias: "set_next_id"
+ id: 16811012
+ name: "FabricIngress.forwarding.set_next_id_bridging"
+ alias: "set_next_id_bridging"
}
params {
id: 1
@@ -468,21 +550,76 @@
}
actions {
preamble {
- id: 16801739
- name: "FabricIngress.forwarding.duplicate_to_controller"
- alias: "duplicate_to_controller"
+ id: 16828976
+ name: "FabricIngress.forwarding.set_next_id_unicast_v4"
+ alias: "set_next_id_unicast_v4"
+ }
+ params {
+ id: 1
+ name: "next_id"
+ bitwidth: 32
}
}
actions {
preamble {
- id: 16832750
- name: "FabricIngress.next.output"
- alias: "output"
+ id: 16785374
+ name: "FabricIngress.forwarding.set_next_id_acl"
+ alias: "set_next_id_acl"
}
params {
id: 1
- name: "port_num"
- bitwidth: 9
+ name: "next_id"
+ bitwidth: 32
+ }
+}
+actions {
+ preamble {
+ id: 16810628
+ name: "FabricIngress.forwarding.send_to_controller"
+ alias: "send_to_controller"
+ }
+}
+actions {
+ preamble {
+ id: 16833260
+ name: "FabricIngress.forwarding.drop"
+ alias: "forwarding.drop"
+ }
+}
+actions {
+ preamble {
+ id: 16809157
+ name: "FabricIngress.forwarding.set_next_id_multicast_v4"
+ alias: "set_next_id_multicast_v4"
+ }
+ params {
+ id: 1
+ name: "next_id"
+ bitwidth: 32
+ }
+}
+actions {
+ preamble {
+ id: 16823773
+ name: "FabricIngress.forwarding.set_next_id_unicast_v6"
+ alias: "set_next_id_unicast_v6"
+ }
+ params {
+ id: 1
+ name: "next_id"
+ bitwidth: 32
+ }
+}
+actions {
+ preamble {
+ id: 16819612
+ name: "FabricIngress.forwarding.set_next_id_multicast_v6"
+ alias: "set_next_id_multicast_v6"
+ }
+ params {
+ id: 1
+ name: "next_id"
+ bitwidth: 32
}
}
actions {
@@ -499,6 +636,18 @@
}
actions {
preamble {
+ id: 16802668
+ name: "FabricIngress.next.output_simple"
+ alias: "output_simple"
+ }
+ params {
+ id: 1
+ name: "port_num"
+ bitwidth: 9
+ }
+}
+actions {
+ preamble {
id: 16808391
name: "FabricIngress.next.set_vlan_output"
alias: "set_vlan_output"
@@ -516,9 +665,9 @@
}
actions {
preamble {
- id: 16812135
- name: "FabricIngress.next.l3_routing"
- alias: "l3_routing"
+ id: 16780007
+ name: "FabricIngress.next.l3_routing_simple"
+ alias: "l3_routing_simple"
}
params {
id: 1
@@ -538,6 +687,60 @@
}
actions {
preamble {
+ id: 16806134
+ name: "FabricIngress.next.mpls_routing_v4_simple"
+ alias: "mpls_routing_v4_simple"
+ }
+ params {
+ id: 1
+ name: "port_num"
+ bitwidth: 9
+ }
+ params {
+ id: 2
+ name: "smac"
+ bitwidth: 48
+ }
+ params {
+ id: 3
+ name: "dmac"
+ bitwidth: 48
+ }
+ params {
+ id: 4
+ name: "label"
+ bitwidth: 20
+ }
+}
+actions {
+ preamble {
+ id: 16795970
+ name: "FabricIngress.next.mpls_routing_v6_simple"
+ alias: "mpls_routing_v6_simple"
+ }
+ params {
+ id: 1
+ name: "port_num"
+ bitwidth: 9
+ }
+ params {
+ id: 2
+ name: "smac"
+ bitwidth: 48
+ }
+ params {
+ id: 3
+ name: "dmac"
+ bitwidth: 48
+ }
+ params {
+ id: 4
+ name: "label"
+ bitwidth: 20
+ }
+}
+actions {
+ preamble {
id: 16791579
name: "FabricIngress.next.l3_routing_vlan"
alias: "l3_routing_vlan"
@@ -565,9 +768,31 @@
}
actions {
preamble {
- id: 16780811
- name: "FabricIngress.next.mpls_routing_v4"
- alias: "mpls_routing_v4"
+ id: 16800211
+ name: "FabricIngress.next.l3_routing_hashed"
+ alias: "l3_routing_hashed"
+ }
+ params {
+ id: 1
+ name: "port_num"
+ bitwidth: 9
+ }
+ params {
+ id: 2
+ name: "smac"
+ bitwidth: 48
+ }
+ params {
+ id: 3
+ name: "dmac"
+ bitwidth: 48
+ }
+}
+actions {
+ preamble {
+ id: 16779239
+ name: "FabricIngress.next.mpls_routing_v4_hashed"
+ alias: "mpls_routing_v4_hashed"
}
params {
id: 1
@@ -592,9 +817,9 @@
}
actions {
preamble {
- id: 16827088
- name: "FabricIngress.next.mpls_routing_v6"
- alias: "mpls_routing_v6"
+ id: 16819349
+ name: "FabricIngress.next.mpls_routing_v6_hashed"
+ alias: "mpls_routing_v6_hashed"
}
params {
id: 1
@@ -743,6 +968,39 @@
}
direct_counters {
preamble {
+ id: 318797896
+ name: "FabricIngress.forwarding.multicast_v4_counter"
+ alias: "multicast_v4_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ direct_table_id: 33578363
+}
+direct_counters {
+ preamble {
+ id: 318820865
+ name: "FabricIngress.forwarding.unicast_v6_counter"
+ alias: "unicast_v6_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ direct_table_id: 33568751
+}
+direct_counters {
+ preamble {
+ id: 318815310
+ name: "FabricIngress.forwarding.multicast_v6_counter"
+ alias: "multicast_v6_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ direct_table_id: 33581295
+}
+direct_counters {
+ preamble {
id: 318785328
name: "FabricIngress.next.vlan_meta_counter"
alias: "vlan_meta_counter"
@@ -785,6 +1043,17 @@
}
direct_table_id: 33606828
}
+direct_counters {
+ preamble {
+ id: 318827144
+ name: "FabricEgress.egress_next.egress_vlan_counter"
+ alias: "egress_vlan_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ direct_table_id: 33599342
+}
controller_packet_metadata {
preamble {
id: 67146229
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
index b56d904..0f07bba 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
@@ -120,7 +120,7 @@
PiAction mappedAction = interpreter.mapTreatment(treatment,
FabricConstants.FABRIC_INGRESS_FORWARDING_ACL);
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_DUPLICATE_TO_CONTROLLER)
+ .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SEND_TO_CONTROLLER)
.build();
assertEquals(expectedAction, mappedAction);
@@ -153,7 +153,7 @@
PiActionParam param = new PiActionParam(FabricConstants.PORT_NUM,
ImmutableByteSequence.copyFrom(portNumVal));
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_NEXT_OUTPUT)
+ .withId(FabricConstants.FABRIC_INGRESS_NEXT_OUTPUT_SIMPLE)
.withParameter(param)
.build();
@@ -180,7 +180,7 @@
PiActionParam portParam = new PiActionParam(FabricConstants.PORT_NUM,
ImmutableByteSequence.copyFrom(portNumVal));
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_NEXT_L3_ROUTING)
+ .withId(FabricConstants.FABRIC_INGRESS_NEXT_L3_ROUTING_HASHED)
.withParameters(ImmutableList.of(ethSrcParam, ethDstParam, portParam))
.build();
@@ -236,7 +236,7 @@
ImmutableByteSequence.copyFrom(MPLS_10.toInt()).fit(20);
PiActionParam mplsParam = new PiActionParam(FabricConstants.LABEL, mplsVal);
PiAction expectedAction = PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4)
+ .withId(FabricConstants.FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_HASHED)
.withParameters(ImmutableList.of(ethSrcParam, ethDstParam, portParam, mplsParam))
.build();
assertEquals(expectedAction, mappedAction);
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
index a4e2195..fdeb7a4 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
@@ -262,12 +262,19 @@
} else {
PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID,
ImmutableByteSequence.copyFrom(nextId.byteValue()));
- PiAction setNextIdAction = PiAction.builder()
- .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID)
- .withParameter(nextIdParam)
- .build();
+ PiAction.Builder setNextIdAction = PiAction.builder()
+ .withParameter(nextIdParam);
+
+ if (expectedTableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING)) {
+ setNextIdAction.withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING);
+ } else if (expectedTableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V4)) {
+ setNextIdAction.withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V4);
+ } else if (expectedTableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V6)) {
+ setNextIdAction.withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V6);
+ }
+
setNextIdTreatment = DefaultTrafficTreatment.builder()
- .piTableAction(setNextIdAction)
+ .piTableAction(setNextIdAction.build())
.build();
}