X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fflow.h;h=5e78f7963b1dfbb72b1915e4a7089a793f28db90;hb=cc34bc8c8611868474253b8fbd9e79cd66c60c94;hp=443986e6fa5ed475c4c6425b183a3829e49e50f1;hpb=eadef313296eac5c2fa99bc1d7a32e514a7989bf;p=openvswitch diff --git a/lib/flow.h b/lib/flow.h index 443986e6..5e78f796 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,15 +29,14 @@ struct dpif_flow_stats; struct ds; struct flow_wildcards; -struct ofp_match; struct ofpbuf; /* This sequence number should be incremented whenever anything involving flows * or the wildcarding of flows changes. This will cause build assertion * failures in places which likely need to be updated. */ -#define FLOW_WC_SEQ 6 +#define FLOW_WC_SEQ 14 -#define FLOW_N_REGS 5 +#define FLOW_N_REGS 8 BUILD_ASSERT_DECL(FLOW_N_REGS <= NXM_NX_MAX_REGS); /* Used for struct flow's dl_type member for frames that have no Ethernet @@ -54,10 +53,11 @@ BUILD_ASSERT_DECL(FLOW_NW_FRAG_LATER == NX_IP_FRAG_LATER); struct flow { ovs_be64 tun_id; /* Encapsulating tunnel ID. */ + ovs_be64 metadata; /* OpenFlow Metadata. */ struct in6_addr ipv6_src; /* IPv6 source address. */ struct in6_addr ipv6_dst; /* IPv6 destination address. */ struct in6_addr nd_target; /* IPv6 neighbor discovery (ND) target. */ - uint32_t priority; /* Packet priority for QoS. */ + uint32_t skb_priority; /* Packet priority for QoS. */ uint32_t regs[FLOW_N_REGS]; /* Registers. */ ovs_be32 nw_src; /* IPv4 source address. */ ovs_be32 nw_dst; /* IPv4 destination address. */ @@ -75,35 +75,56 @@ struct flow { uint8_t arp_tha[6]; /* ARP/ND target hardware address. */ uint8_t nw_ttl; /* IP TTL/Hop Limit. */ uint8_t nw_frag; /* FLOW_FRAG_* flags. */ - uint8_t reserved[6]; /* Reserved for 64-bit packing. */ + uint8_t reserved[2]; /* Reserved for 64-bit packing. */ +}; + +/* Represents the metadata fields of struct flow. The masks are used to + * indicate which metadata fields are relevant in a given context. Typically + * they will be all 1 or all 0. */ +struct flow_metadata { + ovs_be64 tun_id; /* Encapsulating tunnel ID. */ + ovs_be64 tun_id_mask; /* 1-bit in each significant tun_id bit.*/ + + ovs_be64 metadata; + ovs_be64 metadata_mask; + + uint32_t regs[FLOW_N_REGS]; /* Registers. */ + uint32_t reg_masks[FLOW_N_REGS]; /* 1-bit in each significant regs bit. */ + + uint16_t in_port; /* OpenFlow port or zero. */ }; /* Assert that there are FLOW_SIG_SIZE bytes of significant data in "struct * flow", followed by FLOW_PAD_SIZE bytes of padding. */ -#define FLOW_SIG_SIZE (110 + FLOW_N_REGS * 4) -#define FLOW_PAD_SIZE 6 +#define FLOW_SIG_SIZE (118 + FLOW_N_REGS * 4) +#define FLOW_PAD_SIZE 2 BUILD_ASSERT_DECL(offsetof(struct flow, nw_frag) == FLOW_SIG_SIZE - 1); BUILD_ASSERT_DECL(sizeof(((struct flow *)0)->nw_frag) == 1); BUILD_ASSERT_DECL(sizeof(struct flow) == FLOW_SIG_SIZE + FLOW_PAD_SIZE); /* Remember to update FLOW_WC_SEQ when changing 'struct flow'. */ -BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 130 && FLOW_WC_SEQ == 6); +BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 150 && FLOW_WC_SEQ == 14); void flow_extract(struct ofpbuf *, uint32_t priority, ovs_be64 tun_id, uint16_t in_port, struct flow *); void flow_zero_wildcards(struct flow *, const struct flow_wildcards *); +void flow_get_metadata(const struct flow *, struct flow_metadata *); char *flow_to_string(const struct flow *); void flow_format(struct ds *, const struct flow *); void flow_print(FILE *, const struct flow *); -static inline int flow_compare(const struct flow *, const struct flow *); +static inline int flow_compare_3way(const struct flow *, const struct flow *); static inline bool flow_equal(const struct flow *, const struct flow *); static inline size_t flow_hash(const struct flow *, uint32_t basis); +void flow_set_dl_vlan(struct flow *, ovs_be16 vid); +void flow_set_vlan_vid(struct flow *, ovs_be16 vid); +void flow_set_vlan_pcp(struct flow *, uint8_t pcp); + void flow_compose(struct ofpbuf *, const struct flow *); static inline int -flow_compare(const struct flow *a, const struct flow *b) +flow_compare_3way(const struct flow *a, const struct flow *b) { return memcmp(a, b, FLOW_SIG_SIZE); } @@ -111,7 +132,7 @@ flow_compare(const struct flow *a, const struct flow *b) static inline bool flow_equal(const struct flow *a, const struct flow *b) { - return !flow_compare(a, b); + return !flow_compare_3way(a, b); } static inline size_t @@ -128,27 +149,18 @@ flow_hash(const struct flow *flow, uint32_t basis) typedef unsigned int OVS_BITWISE flow_wildcards_t; -/* Same values and meanings as corresponding OFPFW_* bits. */ +/* Same values and meanings as corresponding OFPFW10_* bits. */ #define FWW_IN_PORT ((OVS_FORCE flow_wildcards_t) (1 << 0)) -#define FWW_DL_SRC ((OVS_FORCE flow_wildcards_t) (1 << 2)) -#define FWW_DL_DST ((OVS_FORCE flow_wildcards_t) (1 << 3)) - /* excluding the multicast bit */ #define FWW_DL_TYPE ((OVS_FORCE flow_wildcards_t) (1 << 4)) #define FWW_NW_PROTO ((OVS_FORCE flow_wildcards_t) (1 << 5)) -#define FWW_TP_SRC ((OVS_FORCE flow_wildcards_t) (1 << 6)) -#define FWW_TP_DST ((OVS_FORCE flow_wildcards_t) (1 << 7)) -/* No corresponding OFPFW_* bits. */ -#define FWW_ETH_MCAST ((OVS_FORCE flow_wildcards_t) (1 << 1)) - /* multicast bit only */ -#define FWW_ARP_SHA ((OVS_FORCE flow_wildcards_t) (1 << 8)) -#define FWW_ARP_THA ((OVS_FORCE flow_wildcards_t) (1 << 9)) -#define FWW_ND_TARGET ((OVS_FORCE flow_wildcards_t) (1 << 10)) -#define FWW_IPV6_LABEL ((OVS_FORCE flow_wildcards_t) (1 << 11)) -#define FWW_NW_TTL ((OVS_FORCE flow_wildcards_t) (1 << 12)) -#define FWW_ALL ((OVS_FORCE flow_wildcards_t) (((1 << 13)) - 1)) +/* No corresponding OFPFW10_* bits. */ +#define FWW_NW_DSCP ((OVS_FORCE flow_wildcards_t) (1 << 1)) +#define FWW_NW_ECN ((OVS_FORCE flow_wildcards_t) (1 << 2)) +#define FWW_NW_TTL ((OVS_FORCE flow_wildcards_t) (1 << 3)) +#define FWW_ALL ((OVS_FORCE flow_wildcards_t) (((1 << 6)) - 1)) /* Remember to update FLOW_WC_SEQ when adding or removing FWW_*. */ -BUILD_ASSERT_DECL(FWW_ALL == ((1 << 13) - 1) && FLOW_WC_SEQ == 6); +BUILD_ASSERT_DECL(FWW_ALL == ((1 << 6) - 1) && FLOW_WC_SEQ == 14); /* Information on wildcards for a flow, as a supplement to "struct flow". * @@ -156,20 +168,29 @@ BUILD_ASSERT_DECL(FWW_ALL == ((1 << 13) - 1) && FLOW_WC_SEQ == 6); * the rest of the members. */ struct flow_wildcards { ovs_be64 tun_id_mask; /* 1-bit in each significant tun_id bit. */ + ovs_be64 metadata_mask; /* 1-bit in each significant metadata bit. */ flow_wildcards_t wildcards; /* 1-bit in each FWW_* wildcarded field. */ uint32_t reg_masks[FLOW_N_REGS]; /* 1-bit in each significant regs bit. */ ovs_be32 nw_src_mask; /* 1-bit in each significant nw_src bit. */ ovs_be32 nw_dst_mask; /* 1-bit in each significant nw_dst bit. */ struct in6_addr ipv6_src_mask; /* 1-bit in each signficant ipv6_src bit. */ struct in6_addr ipv6_dst_mask; /* 1-bit in each signficant ipv6_dst bit. */ + struct in6_addr nd_target_mask; /* 1-bit in each significant + nd_target bit. */ + ovs_be32 ipv6_label_mask; /* 1 bit in each significant ipv6_label bit. */ ovs_be16 vlan_tci_mask; /* 1-bit in each significant vlan_tci bit. */ - uint8_t nw_tos_mask; /* 1-bit in each significant nw_tos bit. */ + ovs_be16 tp_src_mask; /* 1-bit in each significant tp_src bit. */ + ovs_be16 tp_dst_mask; /* 1-bit in each significant tp_dst bit. */ uint8_t nw_frag_mask; /* 1-bit in each significant nw_frag bit. */ - uint8_t zeros[4]; /* Padding field set to zero. */ + uint8_t dl_src_mask[6]; /* 1-bit in each significant dl_src bit. */ + uint8_t dl_dst_mask[6]; /* 1-bit in each significant dl_dst bit. */ + uint8_t arp_sha_mask[6]; /* 1-bit in each significant dl_dst bit. */ + uint8_t arp_tha_mask[6]; /* 1-bit in each significant dl_dst bit. */ + uint8_t zeros[1]; /* Padding field set to zero. */ }; /* Remember to update FLOW_WC_SEQ when updating struct flow_wildcards. */ -BUILD_ASSERT_DECL(sizeof(struct flow_wildcards) == 80 && FLOW_WC_SEQ == 6); +BUILD_ASSERT_DECL(sizeof(struct flow_wildcards) == 144 && FLOW_WC_SEQ == 14); void flow_wildcards_init_catchall(struct flow_wildcards *); void flow_wildcards_init_exact(struct flow_wildcards *); @@ -177,12 +198,6 @@ void flow_wildcards_init_exact(struct flow_wildcards *); bool flow_wildcards_is_exact(const struct flow_wildcards *); bool flow_wildcards_is_catchall(const struct flow_wildcards *); -bool flow_wildcards_set_nw_src_mask(struct flow_wildcards *, ovs_be32); -bool flow_wildcards_set_nw_dst_mask(struct flow_wildcards *, ovs_be32); -bool flow_wildcards_set_ipv6_src_mask(struct flow_wildcards *, - const struct in6_addr *); -bool flow_wildcards_set_ipv6_dst_mask(struct flow_wildcards *, - const struct in6_addr *); void flow_wildcards_set_reg_mask(struct flow_wildcards *, int idx, uint32_t mask);