Skip to content

Update ENCAP_U1 functionality by u1_* headers emission and u1_ipv4 checksum #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
f4ni wants to merge 1 commit into
base: main
Choose a base branch
from
+86 −66
Open

Update ENCAP_U1 functionality by u1_* headers emission and u1_ipv4 checksum #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions dash-pipeline/bmv2/dash_bmv2_v1model.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,32 @@ control dash_verify_checksum(inout headers_t hdr,
apply { }
}

#define UPDATE_IPV4_CHECKSUM(IPHDR) \
update_checksum( \
IPHDR.isValid(), \
{ \
IPHDR.version, \
IPHDR.ihl, \
IPHDR.diffserv, \
IPHDR.total_len, \
IPHDR.identification, \
IPHDR.frag_offset, \
IPHDR.flags, \
IPHDR.ttl, \
IPHDR.protocol, \
IPHDR.src_addr, \
IPHDR.dst_addr \
}, \
IPHDR.hdr_checksum, \
HashAlgorithm.csum16)

control dash_compute_checksum(inout headers_t hdr,
inout metadata_t meta)
{
apply {
#ifdef TARGET_BMV2_V1MODEL
update_checksum(
hdr.u0_ipv4.isValid(),
{
hdr.u0_ipv4.version,
hdr.u0_ipv4.ihl,
hdr.u0_ipv4.diffserv,
hdr.u0_ipv4.total_len,
hdr.u0_ipv4.identification,
hdr.u0_ipv4.frag_offset,
hdr.u0_ipv4.flags,
hdr.u0_ipv4.ttl,
hdr.u0_ipv4.protocol,
hdr.u0_ipv4.src_addr,
hdr.u0_ipv4.dst_addr
},
hdr.u0_ipv4.hdr_checksum,
HashAlgorithm.csum16);
UPDATE_IPV4_CHECKSUM(hdr.u0_ipv4);
UPDATE_IPV4_CHECKSUM(hdr.u1_ipv4);
#endif // TARGET_BMV2_V1MODEL
}
}
Expand Down
10 changes: 10 additions & 0 deletions dash-pipeline/bmv2/dash_parser.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,15 @@ control dash_deparser(
packet.emit(hdr.flow_u0_encap_data);
packet.emit(hdr.flow_u1_encap_data);

packet.emit(hdr.u1_ethernet);
packet.emit(hdr.u1_ipv4);
packet.emit(hdr.u1_ipv4options);
packet.emit(hdr.u1_ipv6);
packet.emit(hdr.u1_udp);
packet.emit(hdr.u1_tcp);
packet.emit(hdr.u1_vxlan);
packet.emit(hdr.u1_nvgre);

packet.emit(hdr.u0_ethernet);
packet.emit(hdr.u0_ipv4);
packet.emit(hdr.u0_ipv4options);
Expand All @@ -191,6 +200,7 @@ control dash_deparser(
packet.emit(hdr.u0_tcp);
packet.emit(hdr.u0_vxlan);
packet.emit(hdr.u0_nvgre);

packet.emit(hdr.customer_ethernet);
packet.emit(hdr.customer_ipv4);
packet.emit(hdr.customer_ipv6);
Expand Down
104 changes: 55 additions & 49 deletions test/test-cases/functional/ptf/saidashflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
# 2. Flow hit (ENI AMC, VNI, 5 tuple), UDP packet, flow action: ENCAP_U0
# 3. Flow hit (ENI AMC, VNI, 5 tuple), UDP packet, flow action: SET_DMAC (overlay dmac rewrite)
# 4. Flow hit (ENI AMC, VNI, 5 tuple), UDP packet, flow action: ENCAP_U0 | SET_DMAC
# 5. Flow hit (ENI AMC, VNI, 5 tuple), UDP packet, flow action: ENCAP_U0 | SET_SMAC (Disabled due to lack of implementation for overlay smac rewrite)
# 6. Flow hit (ENI AMC, VNI, 5 tuple), UDP packet, flow action: ENCAP_U0 | ENCAP_U1
# SET_SMAC, SNAT, DNAT, SNAT_PORT, DNAT_PORT are not yet implemented so they are not covered in the test cases.
# NAT46 and NAT64 are not yet supported (ipv6 address not supported) so they are not covered in the test cases.
# ENCAP_U1 implementation seems to have some error.

import copy

from sai_thrift.sai_headers import *
Expand Down Expand Up @@ -150,7 +152,11 @@ def runTest(self):
exp_u0_dip_t = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
addr=sai_thrift_ip_addr_t(ip4=self.exp_u0_dip))
exp_u0_sip_t = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
addr=sai_thrift_ip_addr_t(ip4=self.exp_u0_sip))
addr=sai_thrift_ip_addr_t(ip4=self.exp_u0_sip))
exp_u1_dip_t = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
addr=sai_thrift_ip_addr_t(ip4=self.exp_u1_dip))
exp_u1_sip_t = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
addr=sai_thrift_ip_addr_t(ip4=self.exp_u1_sip))
# Assemble flow entry
self.fe = sai_thrift_flow_entry_t(switch_id=self.switch_id, eni_mac=self.eni_mac, vnet_id=self.vnet_vni, ip_proto=self.protocol, src_ip=sip_t, dst_ip=dip_t, src_port=self.inner_sport, dst_port=self.inner_dport)
self.create_flow_entry(
Expand Down Expand Up @@ -179,12 +185,12 @@ def runTest(self):
underlay0_smac=self.exp_u0_smac,
underlay0_dmac=self.exp_u0_dmac,
underlay0_dash_encapsulation=SAI_DASH_ENCAPSULATION_VXLAN,
underlay1_vnet_id=None,
underlay1_sip=None,
underlay1_dip=None,
underlay1_smac="00:00:00:00:00:00",
underlay1_dmac="00:00:00:00:00:00",
underlay1_dash_encapsulation=SAI_DASH_ENCAPSULATION_INVALID,
underlay1_vnet_id=self.vnet_vni,
underlay1_sip=exp_u1_sip_t,
underlay1_dip=exp_u1_dip_t,
underlay1_smac=self.exp_u1_smac,
underlay1_dmac=self.exp_u1_dmac,
underlay1_dash_encapsulation=SAI_DASH_ENCAPSULATION_VXLAN,
# Flow overlay rewrite related attributes
dst_mac=self.exp_inner_dmac,
# sip=self.exp_inner_sip,
Expand Down Expand Up @@ -512,47 +518,6 @@ def setupTest(self):
exp_inner_dport = self.dst_port
))

# # Test case xx: flow hit (5 tuple)
# # action: encap_u0 | encap_u1
# # expected: pass
# self.tests.append(FlowTest(saithrift = self,
# name = "FlowHitActionEncapU0EncapU1",
# create_entry = True,
# switch_id = self.switch_id,
# vnet_vni = self.vnet_vni,
# vnet_id = self.vnet_id,
# outbound_vni = self.outbound_vni,
# eni_mac = self.vm_mac,
# outer_smac = "00:00:00:00:00:00",
# outer_dmac = "00:00:00:00:00:00",
# outer_sip = self.src_vm_pa_ip,
# outer_dip = self.vip,
# inner_smac = self.vm_mac,
# inner_dmac = self.dst_ca_mac,
# protocol = 17,
# inner_sip = self.src_vm_ca_ip,
# inner_dip = self.dst_ca_ip,
# inner_sport = self.src_vm_port,
# inner_dport = self.dst_port,
# priority = 1,
# action = SAI_DASH_FLOW_ACTION_ENCAP_U0 | SAI_DASH_FLOW_ACTION_ENCAP_U1,
# exp_receive = True,
# exp_u0_smac = self.eni_mac,
# exp_u0_dmac = self.underlay_dmac,
# exp_u0_sip = self.src_vm_pa_ip,
# exp_u0_dip = self.dst_pa_ip,
# exp_u1_smac = "11:22:33:44:55:66",
# exp_u1_dmac = "77:88:99:aa:bb:cc",
# exp_u1_sip = "200.0.1.2",
# exp_u1_dip = "200.3.4.5",
# exp_inner_smac = self.vm_mac,
# exp_inner_dmac = self.dst_ca_mac,
# exp_inner_sip = self.src_vm_ca_ip,
# exp_inner_dip = self.dst_ca_ip,
# exp_inner_sport = self.src_vm_port,
# exp_inner_dport = self.dst_port
# ))

# Test case 3: flow hit (5 tuple)
# action: overlay dmac rewrite
# expected: pass
Expand Down Expand Up @@ -660,6 +625,47 @@ def setupTest(self):
# exp_inner_dport = self.dst_port
# ))

# Test case 6: flow hit (5 tuple)
# action: encap_u0 | encap_u1
# expected: pass
self.tests.append(FlowTest(saithrift = self,
name = "FlowHitActionEncapU0EncapU1",
create_entry = True,
switch_id = self.switch_id,
vnet_vni = self.vnet_vni,
vnet_id = self.vnet_id,
outbound_vni = self.outbound_vni,
eni_mac = self.vm_mac,
outer_smac = "00:00:00:00:00:00",
outer_dmac = "00:00:00:00:00:00",
outer_sip = self.src_vm_pa_ip,
outer_dip = self.vip,
inner_smac = self.vm_mac,
inner_dmac = self.dst_ca_mac,
protocol = 17,
inner_sip = self.src_vm_ca_ip,
inner_dip = self.dst_ca_ip,
inner_sport = self.src_vm_port,
inner_dport = self.dst_port,
priority = 1,
action = SAI_DASH_FLOW_ACTION_ENCAP_U0 | SAI_DASH_FLOW_ACTION_ENCAP_U1,
exp_receive = True,
exp_u0_smac = self.eni_mac,
exp_u0_dmac = self.underlay_dmac,
exp_u0_sip = self.src_vm_pa_ip,
exp_u0_dip = self.dst_pa_ip,
exp_u1_smac = "11:22:33:44:55:66",
exp_u1_dmac = "77:88:99:aa:bb:cc",
exp_u1_sip = "200.0.1.2",
exp_u1_dip = "200.3.4.5",
exp_inner_smac = self.vm_mac,
exp_inner_dmac = self.dst_ca_mac,
exp_inner_sip = self.src_vm_ca_ip,
exp_inner_dip = self.dst_ca_ip,
exp_inner_sport = self.src_vm_port,
exp_inner_dport = self.dst_port
))

def setUp(self):
super(SaiThriftDashFlowTest, self).setUp()
self.cleaned_up = False
Expand Down