Update INT version to 1.0
Change-Id: I898501780cad9c1ad725ee624aa0cd4617ad2559
diff --git a/pipelines/basic/src/main/resources/include/int_headers.p4 b/pipelines/basic/src/main/resources/include/int_headers.p4
index c98ea31..8ea6f0e 100644
--- a/pipelines/basic/src/main/resources/include/int_headers.p4
+++ b/pipelines/basic/src/main/resources/include/int_headers.p4
@@ -22,28 +22,31 @@
#define __INT_HEADERS__
#include "telemetry_report_headers.p4"
-// INT headers
+// INT version 1.0
+
+// INT header
header int_header_t {
- bit<2> ver;
+ bit<4> ver;
bit<2> rep;
bit<1> c;
bit<1> e;
- bit<5> rsvd1;
- bit<5> ins_cnt;
- bit<8> max_hop_cnt;
- bit<8> total_hop_cnt;
+ bit<1> m;
+ bit<7> rsvd1;
+ bit<3> rsvd2;
+ bit<5> hop_metadata_len;
+ bit<8> remaining_hop_cnt;
bit<4> instruction_mask_0003; /* split the bits for lookup */
bit<4> instruction_mask_0407;
bit<4> instruction_mask_0811;
bit<4> instruction_mask_1215;
- bit<16> rsvd2;
+ bit<16> rsvd3;
}
// INT meta-value headers - different header for each value type
header int_switch_id_t {
bit<32> switch_id;
}
-header int_port_ids_t {
+header int_level1_port_ids_t {
bit<16> ingress_port_id;
bit<16> egress_port_id;
}
@@ -60,9 +63,9 @@
header int_egress_tstamp_t {
bit<32> egress_tstamp;
}
-header int_q_congestion_t {
- bit<8> q_id;
- bit<24> q_congestion;
+header int_level2_port_ids_t {
+ bit<32> ingress_port_id;
+ bit<32> egress_port_id;
}
header int_egress_port_tx_util_t {
bit<32> egress_port_tx_util;
@@ -70,8 +73,8 @@
header int_data_t {
// Maximum int metadata stack size in bits:
- // (0xFF -4) * 32 (excluding INT shim header, tail header and INT header)
- varbit<8032> data;
+ // (0x3F - 3) * 4 * 8 (excluding INT shim header and INT header)
+ varbit<1920> data;
}
// INT shim header for TCP/UDP
@@ -79,23 +82,18 @@
bit<8> int_type;
bit<8> rsvd1;
bit<8> len;
- bit<8> rsvd2;
-}
-// INT tail header for TCP/UDP
-header intl4_tail_t {
- bit<8> next_proto;
- bit<16> dest_port;
- bit<8> dscp;
+ bit<6> dscp;
+ bit<2> rsvd2;
}
struct int_metadata_t {
switch_id_t switch_id;
- bit<16> insert_byte_cnt;
- bit<1> source;
- bit<1> sink;
- bit<8> mirror_id;
- bit<16> flow_id;
- bit<8> metadata_len;
+ bit<16> new_bytes;
+ bit<8> new_words;
+ _BOOL source;
+ _BOOL sink;
+ _BOOL transit;
+ bit<8> intl4_shim_len;
}
struct headers_t {
@@ -118,14 +116,13 @@
int_header_t int_header;
int_data_t int_data;
int_switch_id_t int_switch_id;
- int_port_ids_t int_port_ids;
+ int_level1_port_ids_t int_level1_port_ids;
int_hop_latency_t int_hop_latency;
int_q_occupancy_t int_q_occupancy;
int_ingress_tstamp_t int_ingress_tstamp;
int_egress_tstamp_t int_egress_tstamp;
- int_q_congestion_t int_q_congestion;
+ int_level2_port_ids_t int_level2_port_ids;
int_egress_port_tx_util_t int_egress_tx_util;
- intl4_tail_t intl4_tail;
}
struct local_metadata_t {