From 427f695a48e97f33c759afea258165b68db50fce Mon Sep 17 00:00:00 2001 From: Zhixiong Niu Date: Thu, 29 Aug 2024 08:46:56 +0000 Subject: [PATCH 1/5] Rename ENI_ADDR Signed-off-by: Zhixiong Niu --- documentation/dataplane/dash-flow-api.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/dataplane/dash-flow-api.md b/documentation/dataplane/dash-flow-api.md index d699b3091..5710bce10 100644 --- a/documentation/dataplane/dash-flow-api.md +++ b/documentation/dataplane/dash-flow-api.md @@ -97,7 +97,7 @@ typedef enum _sai_dash_flow_enabled_key_t { SAI_DASH_FLOW_ENABLED_KEY_NONE = 0, - SAI_DASH_FLOW_ENABLED_KEY_ENI_ADDR = 1 << 1, + SAI_DASH_FLOW_ENABLED_KEY_ENI_MAC = 1 << 1, SAI_DASH_FLOW_ENABLED_KEY_VNI = 1 << 2, @@ -517,7 +517,7 @@ uint32_t attr_count = 3; sai_attribute_t attr_list[3]; attr_list[0].id = SAI_FLOW_TABLE_ATTR_DASH_FLOW_ENABLED_KEY; attr_list[0].value = SAI_DASH_FLOW_ENABLED_KEY_PROTOCOL | - SAI_DASH_FLOW_ENABLED_KEY_ENI_ADDR | + SAI_DASH_FLOW_ENABLED_KEY_ENI_MAC | SAI_DASH_FLOW_ENABLED_KEY_VNI | SAI_DASH_FLOW_ENABLED_KEY_SRC_IP | SAI_DASH_FLOW_ENABLED_KEY_DST_IP | From 45b4647e6ace09991932263b17e869f2dba987d5 Mon Sep 17 00:00:00 2001 From: Zhixiong Niu Date: Thu, 29 Aug 2024 08:48:50 +0000 Subject: [PATCH 2/5] Rename ENI_ADDR Signed-off-by: Zhixiong Niu --- dash-pipeline/bmv2/dash_metadata.p4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dash-pipeline/bmv2/dash_metadata.p4 b/dash-pipeline/bmv2/dash_metadata.p4 index 48f01561c..97601a441 100644 --- a/dash-pipeline/bmv2/dash_metadata.p4 +++ b/dash-pipeline/bmv2/dash_metadata.p4 @@ -52,7 +52,7 @@ enum bit<16> dash_pipeline_stage_t { }; enum bit<16> dash_flow_enabled_key_t { - ENI_ADDR = (1 << 0), + ENI_MAC = (1 << 0), VNI = (1 << 1), PROTOCOL = (1 << 2), SRC_IP = (1 << 3), From a52074b042eb72e9354898f665cd8e77d548d394 Mon Sep 17 00:00:00 2001 From: Zhixiong Niu Date: Thu, 29 Aug 2024 08:52:18 +0000 Subject: [PATCH 3/5] Update Signed-off-by: Zhixiong Niu --- dash-pipeline/bmv2/dash_metadata.p4 | 2 +- dash-pipeline/bmv2/stages/conntrack_lookup.p4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dash-pipeline/bmv2/dash_metadata.p4 b/dash-pipeline/bmv2/dash_metadata.p4 index 97601a441..275a76ad3 100644 --- a/dash-pipeline/bmv2/dash_metadata.p4 +++ b/dash-pipeline/bmv2/dash_metadata.p4 @@ -100,7 +100,7 @@ enum bit<16> dash_flow_entry_bulk_get_session_filter_key_t { INVAILD = 0, FLOW_TABLE_ID = 1, - ENI_ADDR = 2, + ENI_MAC = 2, IP_PROTOCOL = 3, SRC_IP_ADDR = 4, DST_IP_ADDR = 5, diff --git a/dash-pipeline/bmv2/stages/conntrack_lookup.p4 b/dash-pipeline/bmv2/stages/conntrack_lookup.p4 index 99e1c011c..2dbd0d41a 100644 --- a/dash-pipeline/bmv2/stages/conntrack_lookup.p4 +++ b/dash-pipeline/bmv2/stages/conntrack_lookup.p4 @@ -191,7 +191,7 @@ control conntrack_lookup_stage(inout headers_t hdr, inout metadata_t meta) { apply { flow_table.apply(); - if (meta.conntrack_data.flow_table.flow_enabled_key & dash_flow_enabled_key_t.ENI_ADDR != 0) { + if (meta.conntrack_data.flow_table.flow_enabled_key & dash_flow_enabled_key_t.ENI_MAC != 0) { meta.conntrack_data.flow_key.eni_mac = meta.eni_addr; } From e611dc2a3a605113c4a82bc87f522434e8dc6ca0 Mon Sep 17 00:00:00 2001 From: Zhixiong Niu Date: Thu, 29 Aug 2024 08:59:20 +0000 Subject: [PATCH 4/5] Update Signed-off-by: Zhixiong Niu --- dash-pipeline/SAI/specs/dash_flow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dash-pipeline/SAI/specs/dash_flow.yaml b/dash-pipeline/SAI/specs/dash_flow.yaml index 866fcbdb5..5cf17b09b 100644 --- a/dash-pipeline/SAI/specs/dash_flow.yaml +++ b/dash-pipeline/SAI/specs/dash_flow.yaml @@ -28,7 +28,7 @@ sai_apis: description: Action parameter DASH flow enabled key type: sai_dash_flow_enabled_key_t attr_value_field: s32 - default: SAI_DASH_FLOW_ENABLED_KEY_ENI_ADDR + default: SAI_DASH_FLOW_ENABLED_KEY_ENI_MAC isresourcetype: false flags: CREATE_AND_SET object_name: null From e2695017dd2b6967448a24902ebff872cf4f32ea Mon Sep 17 00:00:00 2001 From: Zhixiong Niu Date: Thu, 29 Aug 2024 09:00:07 +0000 Subject: [PATCH 5/5] Update Signed-off-by: Zhixiong Niu --- dash-pipeline/SAI/specs/sai_spec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dash-pipeline/SAI/specs/sai_spec.yaml b/dash-pipeline/SAI/specs/sai_spec.yaml index ed86286e3..74c6bf74d 100644 --- a/dash-pipeline/SAI/specs/sai_spec.yaml +++ b/dash-pipeline/SAI/specs/sai_spec.yaml @@ -198,7 +198,7 @@ enums: description: '' members: - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: ENI_ADDR + name: ENI_MAC description: '' value: '1' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember @@ -238,7 +238,7 @@ enums: description: '' value: '1' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: ENI_ADDR + name: ENI_MAC description: '' value: '2' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember