Skip to content
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

[dash-p4] Modularize direction lookup, eni lookup and metering update stages. #528

Merged
merged 3 commits into from
Mar 1, 2024
Merged

[dash-p4] Modularize direction lookup, eni lookup and metering update stages. #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2f4883
Extract metering update stage into dedicated file.
r12f Feb 25, 2024
7fd3595
Extract direction lookup stage and eni lookup stage.
r12f Feb 26, 2024
490d157
Move VIP miss counters to TODO.
r12f Feb 27, 2024
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
179 changes: 10 additions & 169 deletions dash-pipeline/bmv2/dash_pipeline.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
#include "dash_outbound.p4"
#include "dash_inbound.p4"
#include "dash_conntrack.p4"
#include "stages/direction_lookup.p4"
#include "stages/eni_lookup.p4"
#include "stages/routing_action_apply.p4"
#include "stages/metering_update.p4"
#include "underlay.p4"

#define MAX_ENI 64
Expand Down Expand Up @@ -44,8 +47,6 @@ control dash_ingress(
#ifdef TARGET_BMV2_V1MODEL
@SaiCounter[name="lb_fast_path_icmp_in", attr_type="stats"]
counter(1, CounterType.packets_and_bytes) port_lb_fast_path_icmp_in_counter;
@SaiCounter[name="lb_fast_path_eni_miss", attr_type="stats"]
counter(1, CounterType.packets_and_bytes) port_lb_fast_path_eni_miss_counter;
#endif

@SaiTable[name = "vip", api = "dash_vip"]
Expand All @@ -62,28 +63,6 @@ control dash_ingress(
const default_action = deny;
}

action set_outbound_direction() {
meta.direction = dash_direction_t.OUTBOUND;
}

action set_inbound_direction() {
meta.direction = dash_direction_t.INBOUND;
}

@SaiTable[name = "direction_lookup", api = "dash_direction_lookup"]
table direction_lookup {
key = {
hdr.u0_vxlan.vni : exact @SaiVal[name = "VNI"];
}

actions = {
set_outbound_direction;
@defaultonly set_inbound_direction;
}

const default_action = set_inbound_direction;
}

action set_appliance(EthernetAddress neighbor_mac,
EthernetAddress mac) {
meta.encap_data.underlay_dmac = neighbor_mac;
Expand Down Expand Up @@ -188,21 +167,6 @@ control dash_ingress(
const default_action = deny;
}

DEFINE_TABLE_COUNTER(eni_counter)

@SaiTable[ignored = "true"]
table eni_meter {
key = {
meta.eni_id : exact @SaiVal[type="sai_object_id_t"];
meta.direction : exact;
meta.dropped : exact;
}

actions = { NoAction; }

ATTACH_TABLE_COUNTER(eni_counter)
}

action permit() {
}

Expand Down Expand Up @@ -241,88 +205,6 @@ control dash_ingress(
const default_action = deny;
}

action check_ip_addr_family(@SaiVal[type="sai_ip_addr_family_t", isresourcetype="true"] bit<32> ip_addr_family) {
if (ip_addr_family == 0) /* SAI_IP_ADDR_FAMILY_IPV4 */ {
if (meta.is_overlay_ip_v6 == 1) {
meta.dropped = true;
}
} else {
if (meta.is_overlay_ip_v6 == 0) {
meta.dropped = true;
}
}
}

@SaiTable[name = "meter_policy", api = "dash_meter", order = 1, isobject="true"]
table meter_policy {
key = {
meta.meter_policy_id : exact;
}
actions = {
check_ip_addr_family;
}
}

action set_policy_meter_class(bit<16> meter_class) {
meta.policy_meter_class = meter_class;
}

@SaiTable[name = "meter_rule", api = "dash_meter", order = 2, isobject="true"]
table meter_rule {
key = {
meta.meter_policy_id: exact @SaiVal[type="sai_object_id_t", isresourcetype="true", objects="METER_POLICY"];
hdr.u0_ipv4.dst_addr : ternary @SaiVal[name = "dip", type="sai_ip_address_t"];
}

actions = {
set_policy_meter_class;
@defaultonly NoAction;
}
const default_action = NoAction();
}

// MAX_METER_BUCKET = MAX_ENI(64) * NUM_BUCKETS_PER_ENI(4096)
#define MAX_METER_BUCKETS 262144
#ifdef TARGET_BMV2_V1MODEL
@SaiCounter[name="outbound", action_names="meter_bucket_action", attr_type="counter_attr"]
counter(MAX_METER_BUCKETS, CounterType.bytes) meter_bucket_outbound;
@SaiCounter[name="inbound", action_names="meter_bucket_action", attr_type="counter_attr"]
counter(MAX_METER_BUCKETS, CounterType.bytes) meter_bucket_inbound;
#endif // TARGET_BMV2_V1MODEL
action meter_bucket_action(@SaiVal[type="sai_uint32_t", skipattr="true"] bit<32> meter_bucket_index) {
meta.meter_bucket_index = meter_bucket_index;
}

@SaiTable[name = "meter_bucket", api = "dash_meter", order = 0, isobject="true"]
table meter_bucket {
key = {
meta.eni_id: exact @SaiVal[type="sai_object_id_t"];
meta.meter_class: exact;
}
actions = {
meter_bucket_action;
@defaultonly NoAction;
}
const default_action = NoAction();
}

action set_eni(@SaiVal[type="sai_object_id_t"] bit<16> eni_id) {
meta.eni_id = eni_id;
}

@SaiTable[name = "eni_ether_address_map", api = "dash_eni", order=0]
table eni_ether_address_map {
key = {
meta.eni_addr : exact @SaiVal[name = "address", type = "sai_mac_t"];
}

actions = {
set_eni;
@defaultonly deny;
}
const default_action = deny;
}

action set_acl_group_attrs(@SaiVal[type="sai_ip_addr_family_t", isresourcetype="true"] bit<32> ip_addr_family) {
if (ip_addr_family == 0) /* SAI_IP_ADDR_FAMILY_IPV4 */ {
if (meta.is_overlay_ip_v6 == 1) {
Expand Down Expand Up @@ -372,35 +254,20 @@ control dash_ingress(
present in the VIP table */
meta.encap_data.underlay_sip = hdr.u0_ipv4.dst_addr;
} else {
// TODO: Count the packet drops due to VIP miss
if (meta.is_fast_path_icmp_flow_redirection_packet) {
#ifdef TARGET_BMV2_V1MODEL
port_lb_fast_path_eni_miss_counter.count(0);
#endif
}
}

/* If Outer VNI matches with a reserved VNI, then the direction is Outbound - */
direction_lookup.apply();
direction_lookup_stage.apply(hdr, meta);

appliance.apply();

// Save the original DSCP value
meta.eni_data.dscp = (bit<6>)hdr.u0_ipv4.diffserv;

/* Outer header processing */
eni_lookup_stage.apply(hdr, meta);

/* Put VM's MAC in the direction agnostic metadata field */
meta.eni_addr = meta.direction == dash_direction_t.OUTBOUND ?
hdr.customer_ethernet.src_addr :
hdr.customer_ethernet.dst_addr;

if (!eni_ether_address_map.apply().hit) {
if (meta.is_fast_path_icmp_flow_redirection_packet) {
#ifdef TARGET_BMV2_V1MODEL
port_lb_fast_path_eni_miss_counter.count(0);
#endif
}
}
// Save the original DSCP value
meta.eni_data.dscp = (bit<6>)hdr.u0_ipv4.diffserv;

if (meta.direction == dash_direction_t.OUTBOUND) {
tunnel_decap(hdr, meta);
Expand Down Expand Up @@ -462,6 +329,7 @@ control dash_ingress(

/* Underlay routing */
meta.dst_ip_addr = (bit<128>)hdr.u0_ipv4.dst_addr;

underlay.apply(
hdr
, meta
Expand All @@ -473,38 +341,11 @@ control dash_ingress(
#endif // TARGET_DPDK_PNA
);

if (meta.meter_policy_en == 1) {
meter_policy.apply();
meter_rule.apply();
}

{
if (meta.meter_policy_en == 1) {
meta.meter_class = meta.policy_meter_class;
} else {
meta.meter_class = meta.route_meter_class;
}
if ((meta.meter_class == 0) || (meta.mapping_meter_class_override == 1)) {
meta.meter_class = meta.mapping_meter_class;
}
}

meter_bucket.apply();
if (meta.direction == dash_direction_t.OUTBOUND) {
#ifdef TARGET_BMV2_V1MODEL
meter_bucket_outbound.count(meta.meter_bucket_index);
#endif
} else if (meta.direction == dash_direction_t.INBOUND) {
#ifdef TARGET_BMV2_V1MODEL
meter_bucket_inbound.count(meta.meter_bucket_index);
#endif
}

if (meta.eni_data.dscp_mode == dash_tunnel_dscp_mode_t.PIPE_MODEL) {
hdr.u0_ipv4.diffserv = (bit<8>)meta.eni_data.dscp;
}

eni_meter.apply();
metering_update_stage.apply(hdr, meta);

if (meta.dropped) {
drop_action();
Expand Down
36 changes: 36 additions & 0 deletions dash-pipeline/bmv2/stages/direction_lookup.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#ifndef _DASH_STAGE_DIRECTION_LOOKUP_P4_
#define _DASH_STAGE_DIRECTION_LOOKUP_P4_

control direction_lookup_stage(
inout headers_t hdr,
inout metadata_t meta)
{
action set_outbound_direction() {
meta.direction = dash_direction_t.OUTBOUND;
}

action set_inbound_direction() {
meta.direction = dash_direction_t.INBOUND;
}

@SaiTable[name = "direction_lookup", api = "dash_direction_lookup"]
table direction_lookup {
key = {
hdr.u0_vxlan.vni : exact @SaiVal[name = "VNI"];
}

actions = {
set_outbound_direction;
@defaultonly set_inbound_direction;
}

const default_action = set_inbound_direction;
}

apply {
/* If Outer VNI matches with a reserved VNI, then the direction is Outbound - */
direction_lookup.apply();
}
}

#endif /* _DASH_STAGE_DIRECTION_LOOKUP_P4_ */
50 changes: 50 additions & 0 deletions dash-pipeline/bmv2/stages/eni_lookup.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#ifndef _DASH_STAGE_ENI_LOOKUP_P4_
#define _DASH_STAGE_ENI_LOOKUP_P4_

control eni_lookup_stage(
inout headers_t hdr,
inout metadata_t meta)
{
#ifdef TARGET_BMV2_V1MODEL
@SaiCounter[name="lb_fast_path_eni_miss", attr_type="stats"]
counter(1, CounterType.packets_and_bytes) port_lb_fast_path_eni_miss_counter;
#endif

action set_eni(@SaiVal[type="sai_object_id_t"] bit<16> eni_id) {
meta.eni_id = eni_id;
}

action deny() {
meta.dropped = true;
}

@SaiTable[name = "eni_ether_address_map", api = "dash_eni", order=0]
table eni_ether_address_map {
key = {
meta.eni_addr : exact @SaiVal[name = "address", type = "sai_mac_t"];
}

actions = {
set_eni;
@defaultonly deny;
}
const default_action = deny;
}

apply {
/* Put VM's MAC in the direction agnostic metadata field */
meta.eni_addr = meta.direction == dash_direction_t.OUTBOUND ?
hdr.customer_ethernet.src_addr :
hdr.customer_ethernet.dst_addr;

if (!eni_ether_address_map.apply().hit) {
if (meta.is_fast_path_icmp_flow_redirection_packet) {
#ifdef TARGET_BMV2_V1MODEL
port_lb_fast_path_eni_miss_counter.count(0);
#endif
}
}
}
}

#endif /* _DASH_STAGE_ENI_LOOKUP_P4_ */
Loading
Loading