X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fmatch.h;h=650a203d3c64b37c99c0b3ed48fe3ccff122af00;hb=ffe4c74f9331114287754d5b0ca8eec219927acc;hp=0ea1f2d6bac9387cb4a1fdc2a637ea2211cc1490;hpb=4e022ec09e14ac89add74c1b4b8e3ff3873edbf0;p=cascardo%2Fovs.git diff --git a/lib/match.h b/lib/match.h index 0ea1f2d6b..650a203d3 100644 --- a/lib/match.h +++ b/lib/match.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,8 @@ #define MATCH_H 1 #include "flow.h" +#include "packets.h" +#include "tun-metadata.h" struct ds; @@ -32,19 +34,33 @@ struct ds; struct match { struct flow flow; struct flow_wildcards wc; + struct tun_metadata_allocation tun_md; }; +/* Initializer for a "struct match" that matches every packet. */ +#define MATCH_CATCHALL_INITIALIZER { .flow = { .dl_type = 0 } } + void match_init(struct match *, const struct flow *, const struct flow_wildcards *); void match_wc_init(struct match *match, const struct flow *flow); void match_init_catchall(struct match *); -void match_init_exact(struct match *, const struct flow *); void match_zero_wildcarded_fields(struct match *); +void match_set_dp_hash(struct match *, uint32_t value); +void match_set_dp_hash_masked(struct match *, uint32_t value, uint32_t mask); + +void match_set_recirc_id(struct match *, uint32_t value); + +void match_set_conj_id(struct match *, uint32_t value); + void match_set_reg(struct match *, unsigned int reg_idx, uint32_t value); void match_set_reg_masked(struct match *, unsigned int reg_idx, uint32_t value, uint32_t mask); +void match_set_xreg(struct match *, unsigned int xreg_idx, uint64_t value); +void match_set_xreg_masked(struct match *, unsigned int xreg_idx, + uint64_t value, uint64_t mask); +void match_set_actset_output(struct match *, ofp_port_t actset_output); void match_set_metadata(struct match *, ovs_be64 metadata); void match_set_metadata_masked(struct match *, ovs_be64 metadata, ovs_be64 mask); @@ -54,22 +70,40 @@ void match_set_tun_src(struct match *match, ovs_be32 src); void match_set_tun_src_masked(struct match *match, ovs_be32 src, ovs_be32 mask); void match_set_tun_dst(struct match *match, ovs_be32 dst); void match_set_tun_dst_masked(struct match *match, ovs_be32 dst, ovs_be32 mask); +void match_set_tun_ipv6_src(struct match *, const struct in6_addr *); +void match_set_tun_ipv6_src_masked(struct match *, const struct in6_addr *, + const struct in6_addr *); +void match_set_tun_ipv6_dst(struct match *, const struct in6_addr *); +void match_set_tun_ipv6_dst_masked(struct match *, const struct in6_addr *, + const struct in6_addr *); void match_set_tun_ttl(struct match *match, uint8_t ttl); void match_set_tun_ttl_masked(struct match *match, uint8_t ttl, uint8_t mask); void match_set_tun_tos(struct match *match, uint8_t tos); void match_set_tun_tos_masked(struct match *match, uint8_t tos, uint8_t mask); void match_set_tun_flags(struct match *match, uint16_t flags); void match_set_tun_flags_masked(struct match *match, uint16_t flags, uint16_t mask); +void match_set_tun_gbp_id_masked(struct match *match, ovs_be16 gbp_id, ovs_be16 mask); +void match_set_tun_gbp_id(struct match *match, ovs_be16 gbp_id); +void match_set_tun_gbp_flags_masked(struct match *match, uint8_t flags, uint8_t mask); +void match_set_tun_gbp_flags(struct match *match, uint8_t flags); void match_set_in_port(struct match *, ofp_port_t ofp_port); -void match_set_skb_mark(struct match *, uint32_t skb_mark); +void match_set_pkt_mark(struct match *, uint32_t pkt_mark); +void match_set_pkt_mark_masked(struct match *, uint32_t pkt_mark, uint32_t mask); +void match_set_ct_state(struct match *, uint32_t ct_state); +void match_set_ct_state_masked(struct match *, uint32_t ct_state, uint32_t mask); +void match_set_ct_zone(struct match *, uint16_t ct_zone); +void match_set_ct_mark(struct match *, uint32_t ct_mark); +void match_set_ct_mark_masked(struct match *, uint32_t ct_mark, uint32_t mask); +void match_set_ct_label(struct match *, ovs_u128 ct_label); +void match_set_ct_label_masked(struct match *, ovs_u128 ct_label, ovs_u128 mask); void match_set_skb_priority(struct match *, uint32_t skb_priority); void match_set_dl_type(struct match *, ovs_be16); -void match_set_dl_src(struct match *, const uint8_t[6]); -void match_set_dl_src_masked(struct match *, const uint8_t dl_src[6], - const uint8_t mask[6]); -void match_set_dl_dst(struct match *, const uint8_t[6]); -void match_set_dl_dst_masked(struct match *, const uint8_t dl_dst[6], - const uint8_t mask[6]); +void match_set_dl_src(struct match *, const struct eth_addr ); +void match_set_dl_src_masked(struct match *, const struct eth_addr dl_src, + const struct eth_addr mask); +void match_set_dl_dst(struct match *, const struct eth_addr); +void match_set_dl_dst_masked(struct match *, const struct eth_addr dl_dst, + const struct eth_addr mask); void match_set_dl_tci(struct match *, ovs_be16 tci); void match_set_dl_tci_masked(struct match *, ovs_be16 tci, ovs_be16 mask); void match_set_any_vid(struct match *); @@ -78,16 +112,21 @@ void match_set_vlan_vid(struct match *, ovs_be16); void match_set_vlan_vid_masked(struct match *, ovs_be16 vid, ovs_be16 mask); void match_set_any_pcp(struct match *); void match_set_dl_vlan_pcp(struct match *, uint8_t); -void match_set_any_mpls_label(struct match *); -void match_set_mpls_label(struct match *, ovs_be32); -void match_set_any_mpls_tc(struct match *); -void match_set_mpls_tc(struct match *, uint8_t); -void match_set_any_mpls_bos(struct match *); -void match_set_mpls_bos(struct match *, uint8_t); +void match_set_any_mpls_lse(struct match *, int idx); +void match_set_mpls_lse(struct match *, int idx, ovs_be32); +void match_set_any_mpls_label(struct match *, int idx); +void match_set_mpls_label(struct match *, int idx, ovs_be32); +void match_set_any_mpls_tc(struct match *, int idx); +void match_set_mpls_tc(struct match *, int idx, uint8_t); +void match_set_any_mpls_bos(struct match *, int idx); +void match_set_mpls_bos(struct match *, int idx, uint8_t); void match_set_tp_src(struct match *, ovs_be16); +void match_set_mpls_lse(struct match *, int idx, ovs_be32 lse); void match_set_tp_src_masked(struct match *, ovs_be16 port, ovs_be16 mask); void match_set_tp_dst(struct match *, ovs_be16); void match_set_tp_dst_masked(struct match *, ovs_be16 port, ovs_be16 mask); +void match_set_tcp_flags(struct match *, ovs_be16); +void match_set_tcp_flags_masked(struct match *, ovs_be16 flags, ovs_be16 mask); void match_set_nw_proto(struct match *, uint8_t); void match_set_nw_src(struct match *, ovs_be32); void match_set_nw_src_masked(struct match *, ovs_be32 ip, ovs_be32 mask); @@ -100,14 +139,14 @@ void match_set_nw_frag(struct match *, uint8_t nw_frag); void match_set_nw_frag_masked(struct match *, uint8_t nw_frag, uint8_t mask); void match_set_icmp_type(struct match *, uint8_t); void match_set_icmp_code(struct match *, uint8_t); -void match_set_arp_sha(struct match *, const uint8_t[6]); +void match_set_arp_sha(struct match *, const struct eth_addr); void match_set_arp_sha_masked(struct match *, - const uint8_t arp_sha[6], - const uint8_t mask[6]); -void match_set_arp_tha(struct match *, const uint8_t[6]); + const struct eth_addr arp_sha, + const struct eth_addr mask); +void match_set_arp_tha(struct match *, const struct eth_addr); void match_set_arp_tha_masked(struct match *, - const uint8_t arp_tha[6], - const uint8_t mask[6]); + const struct eth_addr arp_tha, + const struct eth_addr mask); void match_set_ipv6_src(struct match *, const struct in6_addr *); void match_set_ipv6_src_masked(struct match *, const struct in6_addr *, const struct in6_addr *); @@ -123,37 +162,51 @@ void match_set_nd_target_masked(struct match *, const struct in6_addr *, bool match_equal(const struct match *, const struct match *); uint32_t match_hash(const struct match *, uint32_t basis); -void match_format(const struct match *, struct ds *, unsigned int priority); -char *match_to_string(const struct match *, unsigned int priority); +void match_init_hidden_fields(struct match *); +bool match_has_default_hidden_fields(const struct match *); + +void match_format(const struct match *, struct ds *, int priority); +char *match_to_string(const struct match *, int priority); void match_print(const struct match *); /* Compressed match. */ /* A sparse representation of a "struct match". * - * This has the same invariant as "struct match", that is, a 1-bit in the - * 'flow' must correspond to a 1-bit in 'mask'. + * 'flows' is used for allocating both 'flow' and 'mask' with one + * miniflow_alloc() call. * - * The invariants for the underlying miniflow and minimask are also maintained, - * which means that 'flow' and 'mask' can have different 'map's. In - * particular, if the match checks that a given 32-bit field has value 0, then - * 'map' will have a 1-bit in 'mask' but a 0-bit in 'flow' for that field. */ + * There are two invariants: + * + * - The same invariant as "struct match", that is, a 1-bit in the 'flow' + * must correspond to a 1-bit in 'mask'. + * + * - 'flow' and 'mask' have the same 'map'. This implies that 'flow' and + * 'mask' have the same part of "struct flow" at the same offset into + * 'values', which makes minimatch_matches_flow() faster. + */ struct minimatch { - struct miniflow flow; - struct minimask mask; + union { + struct { + struct miniflow *flow; + struct minimask *mask; + }; + struct miniflow *flows[2]; + }; }; void minimatch_init(struct minimatch *, const struct match *); void minimatch_clone(struct minimatch *, const struct minimatch *); +void minimatch_move(struct minimatch *dst, struct minimatch *src); void minimatch_destroy(struct minimatch *); void minimatch_expand(const struct minimatch *, struct match *); bool minimatch_equal(const struct minimatch *a, const struct minimatch *b); -uint32_t minimatch_hash(const struct minimatch *, uint32_t basis); -void minimatch_format(const struct minimatch *, struct ds *, - unsigned int priority); -char *minimatch_to_string(const struct minimatch *, unsigned int priority); +bool minimatch_matches_flow(const struct minimatch *, const struct flow *); + +void minimatch_format(const struct minimatch *, struct ds *, int priority); +char *minimatch_to_string(const struct minimatch *, int priority); #endif /* match.h */