X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fflow.h;h=ba2d8063196872975b0d69c6115817a6d2e901bb;hb=3bffc610fa3ae08fa837f6bd0bf7a2deebdd0970;hp=72f62e8a6f5c9730cb37e64a93a4ca46866a402c;hpb=b9298d3f825703063c9538aa37407da43e1e4781;p=sliver-openvswitch.git diff --git a/lib/flow.h b/lib/flow.h index 72f62e8a6..ba2d80631 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,20 +27,25 @@ #include "openvswitch/datapath-protocol.h" #include "util.h" +struct dpif_flow_stats; struct ds; struct flow_wildcards; struct ofp_match; struct ofpbuf; -#define FLOW_N_REGS 3 +#define FLOW_N_REGS 4 BUILD_ASSERT_DECL(FLOW_N_REGS <= NXM_NX_MAX_REGS); +/* Used for struct flow's dl_type member for frames that have no Ethernet + * type, that is, pure 802.2 frames. */ +#define FLOW_DL_TYPE_NONE 0x5ff + struct flow { ovs_be64 tun_id; /* Encapsulating tunnel ID. */ uint32_t regs[FLOW_N_REGS]; /* Registers. */ - ovs_be32 nw_src; /* IP source address. */ - ovs_be32 nw_dst; /* IP destination address. */ - uint16_t in_port; /* Input switch port. */ + ovs_be32 nw_src; /* IPv4 source address. */ + ovs_be32 nw_dst; /* IPv4 destination address. */ + uint16_t in_port; /* OpenFlow port number of input port. */ ovs_be16 vlan_tci; /* If 802.1Q, TCI | VLAN_CFI; otherwise 0. */ ovs_be16 dl_type; /* Ethernet frame type. */ ovs_be16 tp_src; /* TCP/UDP source port. */ @@ -49,20 +54,26 @@ struct flow { uint8_t dl_dst[6]; /* Ethernet destination address. */ uint8_t nw_proto; /* IP protocol or low 8 bits of ARP opcode. */ uint8_t nw_tos; /* IP ToS (DSCP field, 6 bits). */ + uint8_t arp_sha[6]; /* ARP/ND source hardware address. */ + uint8_t arp_tha[6]; /* ARP/ND target hardware address. */ + 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 reserved; /* Reserved for 64-bit packing. */ }; /* 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 (40 + FLOW_N_REGS * 4) -#define FLOW_PAD_SIZE 0 -BUILD_ASSERT_DECL(offsetof(struct flow, nw_tos) == FLOW_SIG_SIZE - 1); -BUILD_ASSERT_DECL(sizeof(((struct flow *)0)->nw_tos) == 1); +#define FLOW_SIG_SIZE (100 + FLOW_N_REGS * 4) +#define FLOW_PAD_SIZE 4 +BUILD_ASSERT_DECL(offsetof(struct flow, nd_target) == FLOW_SIG_SIZE - 16); +BUILD_ASSERT_DECL(sizeof(((struct flow *)0)->nd_target) == 16); BUILD_ASSERT_DECL(sizeof(struct flow) == FLOW_SIG_SIZE + FLOW_PAD_SIZE); -int flow_extract(struct ofpbuf *, uint64_t tun_id, uint16_t in_port, +int flow_extract(struct ofpbuf *, ovs_be64 tun_id, uint16_t in_port, struct flow *); void flow_extract_stats(const struct flow *flow, struct ofpbuf *packet, - struct odp_flow_stats *stats); + struct dpif_flow_stats *); char *flow_to_string(const struct flow *); void flow_format(struct ds *, const struct flow *); void flow_print(FILE *, const struct flow *); @@ -107,22 +118,26 @@ typedef unsigned int OVS_BITWISE flow_wildcards_t; #define FWW_TP_DST ((OVS_FORCE flow_wildcards_t) (1 << 7)) /* Same meanings as corresponding OFPFW_* bits, but differ in value. */ #define FWW_NW_TOS ((OVS_FORCE flow_wildcards_t) (1 << 1)) -/* No OFPFW_* bits, but they do have corresponding OVSFW_* bits. */ -#define FWW_TUN_ID ((OVS_FORCE flow_wildcards_t) (1 << 8)) -/* No corresponding OFPFW_* or OVSFW_* bits. */ -#define FWW_ETH_MCAST ((OVS_FORCE flow_wildcards_t) (1 << 9)) +/* No corresponding OFPFW_* bits. */ +#define FWW_ETH_MCAST ((OVS_FORCE flow_wildcards_t) (1 << 8)) /* multicast bit only */ -#define FWW_ALL ((OVS_FORCE flow_wildcards_t) (((1 << 10)) - 1)) +#define FWW_ARP_SHA ((OVS_FORCE flow_wildcards_t) (1 << 9)) +#define FWW_ARP_THA ((OVS_FORCE flow_wildcards_t) (1 << 10)) +#define FWW_ND_TARGET ((OVS_FORCE flow_wildcards_t) (1 << 11)) +#define FWW_ALL ((OVS_FORCE flow_wildcards_t) (((1 << 12)) - 1)) /* Information on wildcards for a flow, as a supplement to "struct flow". * * Note that the meaning of 1-bits in 'wildcards' is opposite that of 1-bits in * the rest of the members. */ struct flow_wildcards { + ovs_be64 tun_id_mask; /* 1-bit in each significant tun_id 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. */ ovs_be16 vlan_tci_mask; /* 1-bit in each significant vlan_tci bit. */ uint16_t zero; /* Padding field set to zero. */ }; @@ -134,6 +149,10 @@ bool flow_wildcards_is_exact(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); @@ -143,8 +162,18 @@ void flow_wildcards_combine(struct flow_wildcards *dst, bool flow_wildcards_has_extra(const struct flow_wildcards *, const struct flow_wildcards *); -uint32_t flow_wildcards_hash(const struct flow_wildcards *); +uint32_t flow_wildcards_hash(const struct flow_wildcards *, uint32_t basis); bool flow_wildcards_equal(const struct flow_wildcards *, const struct flow_wildcards *); +uint32_t flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis); + +const uint8_t *flow_wildcards_to_dl_dst_mask(flow_wildcards_t); +bool flow_wildcards_is_dl_dst_mask_valid(const uint8_t[6]); +flow_wildcards_t flow_wildcards_set_dl_dst_mask(flow_wildcards_t, + const uint8_t mask[6]); +uint32_t flow_hash_fields(const struct flow *, enum nx_hash_fields, + uint16_t basis); +const char *flow_hash_fields_to_str(enum nx_hash_fields); +bool flow_hash_fields_valid(enum nx_hash_fields); #endif /* flow.h */