X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmeta-flow.h;h=d02d320373495c5d30fa454cc0f22d92db56f48c;hb=d4e781981a769acd59108c5db062980b71a1cc50;hp=60bfecaa586515f7ebd10d59891a3782b0f3285d;hpb=9bab681f33e09882e8f652c8e96a2b998b3ef9b3;p=sliver-openvswitch.git diff --git a/lib/meta-flow.h b/lib/meta-flow.h index 60bfecaa5..d02d32037 100644 --- a/lib/meta-flow.h +++ b/lib/meta-flow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012 Nicira, Inc. + * Copyright (c) 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,18 +22,30 @@ #include #include "flow.h" #include "ofp-errors.h" +#include "ofp-util.h" #include "packets.h" +#include "util.h" struct ds; struct match; /* The comment on each of these indicates the member in "union mf_value" used * to represent its value. */ -enum mf_field_id { +enum OVS_PACKED_ENUM mf_field_id { /* Metadata. */ + MFF_DP_HASH, /* be32 */ + MFF_RECIRC_ID, /* be32 */ MFF_TUN_ID, /* be64 */ + MFF_TUN_SRC, /* be32 */ + MFF_TUN_DST, /* be32 */ + MFF_TUN_FLAGS, /* be16 */ + MFF_TUN_TTL, /* u8 */ + MFF_TUN_TOS, /* u8 */ MFF_METADATA, /* be64 */ MFF_IN_PORT, /* be16 */ + MFF_IN_PORT_OXM, /* be32 */ + MFF_SKB_PRIORITY, /* be32 */ + MFF_PKT_MARK, /* be32 */ #if FLOW_N_REGS > 0 MFF_REG0, /* be32 */ @@ -71,7 +83,14 @@ enum mf_field_id { MFF_DL_VLAN_PCP, /* u8 (OpenFlow 1.0 compatibility) */ MFF_VLAN_PCP, /* be16 (OpenFlow 1.2 compatibility) */ + /* L2.5 */ + MFF_MPLS_LABEL, /* be32 */ + MFF_MPLS_TC, /* u8 */ + MFF_MPLS_BOS, /* u8 */ + /* L3. */ + /* Update mf_is_l3_or_higher() if MFF_IPV4_SRC is + * no longer the first element for a field of layer 3 or higher */ MFF_IPV4_SRC, /* be32 */ MFF_IPV4_DST, /* be32 */ @@ -79,8 +98,18 @@ enum mf_field_id { MFF_IPV6_DST, /* ipv6 */ MFF_IPV6_LABEL, /* be32 */ + /* The IPv4/IPv6 DSCP field has two different views: + * + * - MFF_IP_DSCP has the DSCP in bits 2-7, their bit positions in the + * IPv4 and IPv6 "traffic class" field, as used in OpenFlow 1.0 and 1.1 + * flow format and in NXM's NXM_OF_IP_TOS + * + * - MFF_IP_DSCP has the DSCP in bits 0-5, shifted right two bits from + * their positions in the IPv4 and IPv6 "traffic class" field, as used + * in OpenFlow 1.2+ OXM's OXM_OF_IP_DSCP. */ MFF_IP_PROTO, /* u8 (used for IPv4 or IPv6) */ MFF_IP_DSCP, /* u8 (used for IPv4 or IPv6) */ + MFF_IP_DSCP_SHIFTED, /* u8 (used for IPv4 or IPv6) (OF1.2 compat) */ MFF_IP_ECN, /* u8 (used for IPv4 or IPv6) */ MFF_IP_TTL, /* u8 (used for IPv4 or IPv6) */ MFF_IP_FRAG, /* u8 (used for IPv4 or IPv6) */ @@ -94,10 +123,15 @@ enum mf_field_id { /* L4. */ MFF_TCP_SRC, /* be16 (used for IPv4 or IPv6) */ MFF_TCP_DST, /* be16 (used for IPv4 or IPv6) */ + MFF_TCP_FLAGS, /* be16, 12 bits (4 MSB zeroed, + * used for IPv4 or IPv6) */ MFF_UDP_SRC, /* be16 (used for IPv4 or IPv6) */ MFF_UDP_DST, /* be16 (used for IPv4 or IPv6) */ + MFF_SCTP_SRC, /* be16 (used for IPv4 or IPv6) */ + MFF_SCTP_DST, /* be16 (used for IPv4 or IPv6) */ + MFF_ICMPV4_TYPE, /* u8 */ MFF_ICMPV4_CODE, /* u8 */ @@ -151,7 +185,7 @@ enum mf_field_id { * A field may only be matched if the correct lower-level protocols are also * matched. For example, the TCP port may be matched only if the Ethernet type * matches ETH_TYPE_IP and the IP protocol matches IPPROTO_TCP. */ -enum mf_prereqs { +enum OVS_PACKED_ENUM mf_prereqs { MFP_NONE, /* L2 requirements. */ @@ -161,9 +195,13 @@ enum mf_prereqs { MFP_IPV6, MFP_IP_ANY, + /* L2.5 requirements. */ + MFP_MPLS, + /* L2+L3 requirements. */ MFP_TCP, /* On IPv4 or IPv6. */ MFP_UDP, /* On IPv4 or IPv6. */ + MFP_SCTP, /* On IPv4 or IPv6. */ MFP_ICMPV4, MFP_ICMPV6, @@ -176,13 +214,13 @@ enum mf_prereqs { /* Forms of partial-field masking allowed for a field. * * Every field may be masked as a whole. */ -enum mf_maskable { +enum OVS_PACKED_ENUM mf_maskable { MFM_NONE, /* No sub-field masking. */ MFM_FULLY, /* Every bit is individually maskable. */ }; /* How to format or parse a field's value. */ -enum mf_string { +enum OVS_PACKED_ENUM mf_string { /* Integer formats. * * The particular MFS_* constant sets the output format. On input, either @@ -195,7 +233,10 @@ enum mf_string { MFS_IPV4, MFS_IPV6, MFS_OFP_PORT, /* An OpenFlow port number or name. */ - MFS_FRAG /* no, yes, first, later, not_later */ + MFS_OFP_PORT_OXM, /* An OpenFlow port number or name (32-bit). */ + MFS_FRAG, /* no, yes, first, later, not_later */ + MFS_TNL_FLAGS, /* FLOW_TNL_F_* flags */ + MFS_TCP_FLAGS, /* TCP_* flags */ }; struct mf_field { @@ -212,6 +253,9 @@ struct mf_field { * - "dl_vlan_pcp" is 1 byte but only 3 bits. * - "is_frag" is 1 byte but only 2 bits. * - "ipv6_label" is 4 bytes but only 20 bits. + * - "mpls_label" is 4 bytes but only 20 bits. + * - "mpls_tc" is 1 byte but only 3 bits. + * - "mpls_bos" is 1 byte but only 1 bit. */ unsigned int n_bytes; /* Width of the field in bytes. */ unsigned int n_bits; /* Number of significant bits in field. */ @@ -245,20 +289,36 @@ struct mf_field { uint32_t nxm_header; /* An NXM_* (or OXM_*) constant. */ const char *nxm_name; /* The nxm_header constant's name. */ uint32_t oxm_header; /* An OXM_* (or NXM_*) constant. */ - const char *oxm_name; /* The oxm_header constant's name */ + const char *oxm_name; /* The oxm_header constant's name */ + + /* Usable protocols. + * NXM and OXM are extensible, allowing later extensions to be sent in + * earlier protocol versions, so this does not necessarily correspond to + * the OpenFlow protocol version the field was introduced in. + * Also, some field types are tranparently mapped to each other via the + * struct flow (like vlan and dscp/tos fields), so each variant supports + * all protocols. */ + enum ofputil_protocol usable_protocols; /* If fully/cidr masked. */ + /* If partially/non-cidr masked. */ + enum ofputil_protocol usable_protocols_bitwise; + + int flow_be32ofs; /* Field's be32 offset in "struct flow", if prefix tree + * lookup is supported for the field, or -1. */ }; /* The representation of a field's value. */ union mf_value { - uint8_t u8; - ovs_be16 be16; - ovs_be32 be32; - ovs_be64 be64; - uint8_t mac[ETH_ADDR_LEN]; struct in6_addr ipv6; + uint8_t mac[ETH_ADDR_LEN]; + ovs_be64 be64; + ovs_be32 be32; + ovs_be16 be16; + uint8_t u8; }; BUILD_ASSERT_DECL(sizeof(union mf_value) == 16); +#define MF_EXACT_MASK_INITIALIZER { IN6ADDR_EXACT_INIT } + /* Part of a field. */ struct mf_subfield { const struct mf_field *field; @@ -280,11 +340,18 @@ union mf_subvalue { BUILD_ASSERT_DECL(sizeof(union mf_value) == sizeof (union mf_subvalue)); /* Finding mf_fields. */ -const struct mf_field *mf_from_id(enum mf_field_id); const struct mf_field *mf_from_name(const char *name); const struct mf_field *mf_from_nxm_header(uint32_t nxm_header); const struct mf_field *mf_from_nxm_name(const char *nxm_name); +static inline const struct mf_field * +mf_from_id(enum mf_field_id id) +{ + extern const struct mf_field mf_fields[MFF_N_IDS]; + ovs_assert((unsigned int) id < MFF_N_IDS); + return &mf_fields[id]; +} + /* Inspecting wildcarded bits. */ bool mf_is_all_wild(const struct mf_field *, const struct flow_wildcards *); @@ -294,7 +361,13 @@ void mf_get_mask(const struct mf_field *, const struct flow_wildcards *, /* Prerequisites. */ bool mf_are_prereqs_ok(const struct mf_field *, const struct flow *); -void mf_force_prereqs(const struct mf_field *, struct match *); +void mf_mask_field_and_prereqs(const struct mf_field *, struct flow *mask); + +static inline bool +mf_is_l3_or_higher(const struct mf_field *mf) +{ + return mf->id >= MFF_IPV4_SRC; +} /* Field values. */ bool mf_is_value_valid(const struct mf_field *, const union mf_value *value); @@ -306,16 +379,18 @@ void mf_set_value(const struct mf_field *, const union mf_value *value, void mf_set_flow_value(const struct mf_field *, const union mf_value *value, struct flow *); bool mf_is_zero(const struct mf_field *, const struct flow *); +void mf_mask_field(const struct mf_field *, struct flow *); void mf_get(const struct mf_field *, const struct match *, union mf_value *value, union mf_value *mask); -void mf_set(const struct mf_field *, - const union mf_value *value, const union mf_value *mask, - struct match *); -void mf_set_wild(const struct mf_field *, struct match *); +/* Returns the set of usable protocols. */ +enum ofputil_protocol mf_set(const struct mf_field *, + const union mf_value *value, + const union mf_value *mask, + struct match *); -void mf_random_value(const struct mf_field *, union mf_value *value); +void mf_set_wild(const struct mf_field *, struct match *); /* Subfields. */ void mf_write_subfield_flow(const struct mf_subfield *, @@ -329,8 +404,10 @@ uint64_t mf_get_subfield(const struct mf_subfield *, const struct flow *); void mf_format_subfield(const struct mf_subfield *, struct ds *); -char *mf_parse_subfield__(struct mf_subfield *sf, const char **s); -const char *mf_parse_subfield(struct mf_subfield *, const char *); +char *mf_parse_subfield__(struct mf_subfield *sf, const char **s) + WARN_UNUSED_RESULT; +char *mf_parse_subfield(struct mf_subfield *, const char *s) + WARN_UNUSED_RESULT; enum ofperr mf_check_src(const struct mf_subfield *, const struct flow *); enum ofperr mf_check_dst(const struct mf_subfield *, const struct flow *);