X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmeta-flow.c;h=a75e5264421486f944e66efeee4be495ae1f5c74;hb=b019d34da6e6c185bb093984906adcb36c3f6686;hp=b53465c74d577b4bdaf08355ed14a99e84360f72;hpb=801d2b2a1de3db51dc9d41ba746ad228c6d1e740;p=sliver-openvswitch.git diff --git a/lib/meta-flow.c b/lib/meta-flow.c index b53465c74..a75e52644 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -114,7 +114,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFM_NONE, MFS_OFP_PORT, MFP_NONE, - false, + true, NXM_OF_IN_PORT, "NXM_OF_IN_PORT", OXM_OF_IN_PORT, "OXM_OF_IN_PORT", }, { @@ -256,6 +256,38 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", }, + /* ## ---- ## */ + /* ## L2.5 ## */ + /* ## ---- ## */ + { + MFF_MPLS_LABEL, "mpls_label", NULL, + 4, 20, + MFM_NONE, + MFS_DECIMAL, + MFP_MPLS, + true, + OXM_OF_MPLS_LABEL, "OXM_OF_MPLS_LABEL", + OXM_OF_MPLS_LABEL, "OXM_OF_MPLS_LABEL", + }, { + MFF_MPLS_TC, "mpls_tc", NULL, + 1, 3, + MFM_NONE, + MFS_DECIMAL, + MFP_MPLS, + true, + OXM_OF_MPLS_TC, "OXM_OF_MPLS_TC", + OXM_OF_MPLS_TC, "OXM_OF_MPLS_TC", + }, { + MFF_MPLS_BOS, "mpls_bos", NULL, + 1, 1, + MFM_NONE, + MFS_DECIMAL, + MFP_MPLS, + false, + OXM_OF_MPLS_BOS, "OXM_OF_MPLS_BOS", + OXM_OF_MPLS_BOS, "OXM_OF_MPLS_BOS", + }, + /* ## -- ## */ /* ## L3 ## */ /* ## -- ## */ @@ -327,6 +359,15 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_IP_ANY, true, NXM_OF_IP_TOS, "NXM_OF_IP_TOS", + NXM_OF_IP_TOS, "NXM_OF_IP_TOS", + }, { + MFF_IP_DSCP_SHIFTED, "nw_tos_shifted", NULL, + MF_FIELD_SIZES(u8), + MFM_NONE, + MFS_DECIMAL, + MFP_IP_ANY, + true, + OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", }, { MFF_IP_ECN, "nw_ecn", NULL, @@ -678,6 +719,13 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) case MFF_VLAN_PCP: return !(wc->masks.vlan_tci & htons(VLAN_PCP_MASK)); + case MFF_MPLS_LABEL: + return !(wc->masks.mpls_lse & htonl(MPLS_LABEL_MASK)); + case MFF_MPLS_TC: + return !(wc->masks.mpls_lse & htonl(MPLS_TC_MASK)); + case MFF_MPLS_BOS: + return !(wc->masks.mpls_lse & htonl(MPLS_BOS_MASK)); + case MFF_IPV4_SRC: return !wc->masks.nw_src; case MFF_IPV4_DST: @@ -694,6 +742,7 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) case MFF_IP_PROTO: return !wc->masks.nw_proto; case MFF_IP_DSCP: + case MFF_IP_DSCP_SHIFTED: return !(wc->masks.nw_tos & IP_DSCP_MASK); case MFF_IP_ECN: return !(wc->masks.nw_tos & IP_ECN_MASK); @@ -791,6 +840,8 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow) return flow->dl_type == htons(ETH_TYPE_IPV6); case MFP_VLAN_VID: return (flow->vlan_tci & htons(VLAN_CFI)) != 0; + case MFP_MPLS: + return eth_type_mpls(flow->dl_type); case MFP_IP_ANY: return is_ip_any(flow); @@ -875,6 +926,8 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_IP_DSCP: return !(value->u8 & ~IP_DSCP_MASK); + case MFF_IP_DSCP_SHIFTED: + return !(value->u8 & (~IP_DSCP_MASK >> 2)); case MFF_IP_ECN: return !(value->u8 & ~IP_ECN_MASK); case MFF_IP_FRAG: @@ -895,6 +948,15 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_IPV6_LABEL: return !(value->be32 & ~htonl(IPV6_LABEL_MASK)); + case MFF_MPLS_LABEL: + return !(value->be32 & ~htonl(MPLS_LABEL_MASK >> MPLS_LABEL_SHIFT)); + + case MFF_MPLS_TC: + return !(value->u8 & ~(MPLS_TC_MASK >> MPLS_TC_SHIFT)); + + case MFF_MPLS_BOS: + return !(value->u8 & ~(MPLS_BOS_MASK >> MPLS_BOS_SHIFT)); + case MFF_N_IDS: default: NOT_REACHED(); @@ -975,6 +1037,18 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, value->u8 = vlan_tci_to_pcp(flow->vlan_tci); break; + case MFF_MPLS_LABEL: + value->be32 = htonl(mpls_lse_to_label(flow->mpls_lse)); + break; + + case MFF_MPLS_TC: + value->u8 = mpls_lse_to_tc(flow->mpls_lse); + break; + + case MFF_MPLS_BOS: + value->u8 = mpls_lse_to_bos(flow->mpls_lse); + break; + case MFF_IPV4_SRC: value->be32 = flow->nw_src; break; @@ -1003,6 +1077,10 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, value->u8 = flow->nw_tos & IP_DSCP_MASK; break; + case MFF_IP_DSCP_SHIFTED: + value->u8 = flow->nw_tos >> 2; + break; + case MFF_IP_ECN: value->u8 = flow->nw_tos & IP_ECN_MASK; break; @@ -1142,6 +1220,18 @@ mf_set_value(const struct mf_field *mf, match_set_dl_vlan_pcp(match, value->u8); break; + case MFF_MPLS_LABEL: + match_set_mpls_label(match, value->be32); + break; + + case MFF_MPLS_TC: + match_set_mpls_tc(match, value->u8); + break; + + case MFF_MPLS_BOS: + match_set_mpls_bos(match, value->u8); + break; + case MFF_IPV4_SRC: match_set_nw_src(match, value->be32); break; @@ -1170,6 +1260,10 @@ mf_set_value(const struct mf_field *mf, match_set_nw_dscp(match, value->u8); break; + case MFF_IP_DSCP_SHIFTED: + match_set_nw_dscp(match, value->u8 << 2); + break; + case MFF_IP_ECN: match_set_nw_ecn(match, value->u8); break; @@ -1309,6 +1403,18 @@ mf_set_flow_value(const struct mf_field *mf, flow_set_vlan_pcp(flow, value->u8); break; + case MFF_MPLS_LABEL: + flow_set_mpls_label(flow, value->be32); + break; + + case MFF_MPLS_TC: + flow_set_mpls_tc(flow, value->u8); + break; + + case MFF_MPLS_BOS: + flow_set_mpls_bos(flow, value->u8); + break; + case MFF_IPV4_SRC: flow->nw_src = value->be32; break; @@ -1338,6 +1444,11 @@ mf_set_flow_value(const struct mf_field *mf, flow->nw_tos |= value->u8 & IP_DSCP_MASK; break; + case MFF_IP_DSCP_SHIFTED: + flow->nw_tos &= ~IP_DSCP_MASK; + flow->nw_tos |= value->u8 << 2; + break; + case MFF_IP_ECN: flow->nw_tos &= ~IP_ECN_MASK; flow->nw_tos |= value->u8 & IP_ECN_MASK; @@ -1495,6 +1606,18 @@ mf_set_wild(const struct mf_field *mf, struct match *match) match_set_any_pcp(match); break; + case MFF_MPLS_LABEL: + match_set_any_mpls_label(match); + break; + + case MFF_MPLS_TC: + match_set_any_mpls_tc(match); + break; + + case MFF_MPLS_BOS: + match_set_any_mpls_bos(match); + break; + case MFF_IPV4_SRC: case MFF_ARP_SPA: match_set_nw_src_masked(match, htonl(0), htonl(0)); @@ -1526,6 +1649,7 @@ mf_set_wild(const struct mf_field *mf, struct match *match) break; case MFF_IP_DSCP: + case MFF_IP_DSCP_SHIFTED: match->wc.masks.nw_tos &= ~IP_DSCP_MASK; match->flow.nw_tos &= ~IP_DSCP_MASK; break; @@ -1622,9 +1746,13 @@ mf_set(const struct mf_field *mf, case MFF_DL_VLAN: case MFF_DL_VLAN_PCP: case MFF_VLAN_PCP: + case MFF_MPLS_LABEL: + case MFF_MPLS_TC: + case MFF_MPLS_BOS: case MFF_IP_PROTO: case MFF_IP_TTL: case MFF_IP_DSCP: + case MFF_IP_DSCP_SHIFTED: case MFF_IP_ECN: case MFF_ARP_OP: case MFF_ICMPV4_TYPE: @@ -1855,6 +1983,10 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) value->u8 &= IP_DSCP_MASK; break; + case MFF_IP_DSCP_SHIFTED: + value->u8 &= IP_DSCP_MASK >> 2; + break; + case MFF_IP_ECN: value->u8 &= IP_ECN_MASK; break; @@ -1879,6 +2011,18 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) value->u8 &= 0x07; break; + case MFF_MPLS_LABEL: + value->be32 &= htonl(MPLS_LABEL_MASK >> MPLS_LABEL_SHIFT); + break; + + case MFF_MPLS_TC: + value->u8 &= MPLS_TC_MASK >> MPLS_TC_SHIFT; + break; + + case MFF_MPLS_BOS: + value->u8 &= MPLS_BOS_MASK >> MPLS_BOS_SHIFT; + break; + case MFF_N_IDS: default: NOT_REACHED();