tc struct fields addition

* Addition of fields in table key value structure * Updated testcase outputs
Sosutha · Mar 11, 2024 · d333533 · d333533
1 parent d56f93b
commit d333533
Show file tree

Hide file tree

Showing 29 changed files with 183 additions and 0 deletions.
diff --git a/backends/tc/ebpfCodeGen.cpp b/backends/tc/ebpfCodeGen.cpp
@@ -826,6 +826,18 @@ void EBPFTablePNA::emitValueStructStructure(EBPF::CodeBuilder *builder) {
     builder->append("unsigned int action;");
     builder->newline();
 
+    builder->emitIndent();
+    builder->append("u32 hit:1,");
+    builder->newline();
+
+    builder->emitIndent();
+    builder->append("   is_default_miss_act:1,");
+    builder->newline();
+
+    builder->emitIndent();
+    builder->append("   is_default_hit_act:1;");
+    builder->newline();
+
     if (isTernaryTable()) {
         builder->emitIndent();
         builder->append("__u32 priority;");

diff --git a/backends/tc/runtime/pna.h b/backends/tc/runtime/pna.h
@@ -105,6 +105,9 @@ struct p4tc_table_entry_act_bpf_params__local {
 
 struct __attribute__((__packed__)) p4tc_table_entry_act_bpf {
         u32 act_id;
+        u32 hit:1,
+           is_default_miss_act:1,
+           is_default_hit_act:1;
         u8 params[124];
 };
 

diff --git a/testdata/p4tc_samples_outputs/calculator_control_blocks.c b/testdata/p4tc_samples_outputs/calculator_control_blocks.c
@@ -19,6 +19,9 @@ struct __attribute__((__packed__)) MainControlImpl_calculate_key {
 #define MAINCONTROLIMPL_CALCULATE_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_calculate_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/checksum_control_blocks.c b/testdata/p4tc_samples_outputs/checksum_control_blocks.c
@@ -15,6 +15,9 @@ struct __attribute__((__packed__)) ingress_nh_table_key {
 #define INGRESS_NH_TABLE_ACT_NOACTION 0
 struct __attribute__((__packed__)) ingress_nh_table_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/const_entries_range_mask_control_blocks.c b/testdata/p4tc_samples_outputs/const_entries_range_mask_control_blocks.c
@@ -15,6 +15,9 @@ struct __attribute__((__packed__)) MainControlImpl_t_range_key {
 #define MAINCONTROLIMPL_T_RANGE_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_t_range_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/default_action_example_control_blocks.c b/testdata/p4tc_samples_outputs/default_action_example_control_blocks.c
@@ -16,6 +16,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_key {
 #define MAINCONTROLIMPL_IPV4_TBL_1_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -38,6 +41,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_2_key {
 #define MAINCONTROLIMPL_IPV4_TBL_2_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_2_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/default_action_with_param_01_control_blocks.c b/testdata/p4tc_samples_outputs/default_action_with_param_01_control_blocks.c
@@ -16,6 +16,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_key {
 #define MAINCONTROLIMPL_IPV4_TBL_1_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -37,6 +40,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_2_key {
 #define MAINCONTROLIMPL_IPV4_TBL_2_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_2_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/default_action_with_param_control_blocks.c b/testdata/p4tc_samples_outputs/default_action_with_param_control_blocks.c
@@ -16,6 +16,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_key {
 #define MAINCONTROLIMPL_IPV4_TBL_1_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -38,6 +41,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_2_key {
 #define MAINCONTROLIMPL_IPV4_TBL_2_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_2_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/default_hit_const_example_control_blocks.c b/testdata/p4tc_samples_outputs/default_hit_const_example_control_blocks.c
@@ -20,6 +20,9 @@ struct MainControlImpl_set_ct_options_key_mask {
 #define MAINCONTROLIMPL_SET_CT_OPTIONS_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_set_ct_options_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     __u32 priority;
     union {
         struct {

diff --git a/testdata/p4tc_samples_outputs/drop_packet_example_control_blocks.c b/testdata/p4tc_samples_outputs/drop_packet_example_control_blocks.c
@@ -15,6 +15,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_key {
 #define MAINCONTROLIMPL_IPV4_TBL_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/global_action_example_01_control_blocks.c b/testdata/p4tc_samples_outputs/global_action_example_01_control_blocks.c
@@ -15,6 +15,9 @@ struct __attribute__((__packed__)) ingress_nh_table2_key {
 #define INGRESS_NH_TABLE2_ACT_NOACTION 0
 struct __attribute__((__packed__)) ingress_nh_table2_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -36,6 +39,9 @@ struct __attribute__((__packed__)) ingress_nh_table_key {
 #define INGRESS_NH_TABLE_ACT_NOACTION 0
 struct __attribute__((__packed__)) ingress_nh_table_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/global_action_example_02_control_blocks.c b/testdata/p4tc_samples_outputs/global_action_example_02_control_blocks.c
@@ -15,6 +15,9 @@ struct __attribute__((__packed__)) ingress_nh_table2_key {
 #define INGRESS_NH_TABLE2_ACT_NOACTION 0
 struct __attribute__((__packed__)) ingress_nh_table2_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -37,6 +40,9 @@ struct __attribute__((__packed__)) ingress_nh_table_key {
 #define INGRESS_NH_TABLE_ACT_NOACTION 0
 struct __attribute__((__packed__)) ingress_nh_table_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/ipip_control_blocks.c b/testdata/p4tc_samples_outputs/ipip_control_blocks.c
@@ -16,6 +16,9 @@ struct __attribute__((__packed__)) Main_fwd_table_key {
 #define MAIN_FWD_TABLE_ACT_NOACTION 0
 struct __attribute__((__packed__)) Main_fwd_table_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/matchtype_control_blocks.c b/testdata/p4tc_samples_outputs/matchtype_control_blocks.c
@@ -15,6 +15,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_key {
 #define MAINCONTROLIMPL_IPV4_TBL_1_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -41,6 +44,9 @@ struct MainControlImpl_ipv4_tbl_2_key_mask {
 #define MAINCONTROLIMPL_IPV4_TBL_2_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_2_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     __u32 priority;
     union {
         struct {
@@ -62,6 +68,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_3_key {
 #define MAINCONTROLIMPL_IPV4_TBL_3_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_3_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -84,6 +93,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_4_key {
 #define MAINCONTROLIMPL_IPV4_TBL_4_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_4_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/mix_matchtype_example_control_blocks.c b/testdata/p4tc_samples_outputs/mix_matchtype_example_control_blocks.c
@@ -15,6 +15,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_key {
 #define MAINCONTROLIMPL_IPV4_TBL_1_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -41,6 +44,9 @@ struct MainControlImpl_ipv4_tbl_2_key_mask {
 #define MAINCONTROLIMPL_IPV4_TBL_2_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_2_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     __u32 priority;
     union {
         struct {
@@ -67,6 +73,9 @@ struct MainControlImpl_ipv4_tbl_3_key_mask {
 #define MAINCONTROLIMPL_IPV4_TBL_3_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_3_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     __u32 priority;
     union {
         struct {
@@ -90,6 +99,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_4_key {
 #define MAINCONTROLIMPL_IPV4_TBL_4_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_4_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;

diff --git a/testdata/p4tc_samples_outputs/multiple_tables_example_01_control_blocks.c b/testdata/p4tc_samples_outputs/multiple_tables_example_01_control_blocks.c
@@ -15,6 +15,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_key {
 #define MAINCONTROLIMPL_IPV4_TBL_1_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_1_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -37,6 +40,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_2_key {
 #define MAINCONTROLIMPL_IPV4_TBL_2_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_2_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -59,6 +65,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_3_key {
 #define MAINCONTROLIMPL_IPV4_TBL_3_ACT__NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_3_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -81,6 +90,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_4_key {
 #define MAINCONTROLIMPL_IPV4_TBL_4_ACT__NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_4_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -99,6 +111,9 @@ struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_5_key {
 #define MAINCONTROLIMPL_IPV4_TBL_5_ACT__NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_ipv4_tbl_5_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -122,6 +137,9 @@ struct __attribute__((__packed__)) MainControlImpl_set_all_options_key {
 #define MAINCONTROLIMPL_SET_ALL_OPTIONS_ACT__NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_set_all_options_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     union {
         struct {
         } _NoAction;
@@ -158,6 +176,9 @@ struct MainControlImpl_set_ct_options_key_mask {
 #define MAINCONTROLIMPL_SET_CT_OPTIONS_ACT_NOACTION 0
 struct __attribute__((__packed__)) MainControlImpl_set_ct_options_value {
     unsigned int action;
+    u32 hit:1,
+       is_default_miss_act:1,
+       is_default_hit_act:1;
     __u32 priority;
     union {
         struct {