X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fpackets.h;h=bf12937b1005b02648028b5eda4ab04db40ad32c;hb=HEAD;hp=e841fb1489ceb4f76735888a4b28d1d9aa796763;hpb=8c46162bb41c27c86523f59e6d0cbf91ea42b5d6;p=cascardo%2Fovs.git diff --git a/lib/packets.h b/lib/packets.h index e841fb148..bf12937b1 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -25,6 +25,7 @@ #include "compiler.h" #include "geneve.h" #include "openvswitch/types.h" +#include "odp-netlink.h" #include "random.h" #include "hash.h" #include "tun-metadata.h" @@ -37,7 +38,9 @@ struct ds; /* Tunnel information used in flow key and metadata. */ struct flow_tnl { ovs_be32 ip_dst; + struct in6_addr ipv6_dst; ovs_be32 ip_src; + struct in6_addr ipv6_src; ovs_be64 tun_id; uint16_t flags; uint8_t ip_tos; @@ -71,12 +74,23 @@ struct flow_tnl { /* Tunnel information is in userspace datapath format. */ #define FLOW_TNL_F_UDPIF (1 << 4) +static inline bool ipv6_addr_is_set(const struct in6_addr *addr); + +static inline bool +flow_tnl_dst_is_set(const struct flow_tnl *tnl) +{ + return tnl->ip_dst || ipv6_addr_is_set(&tnl->ipv6_dst); +} + +struct in6_addr flow_tnl_dst(const struct flow_tnl *tnl); +struct in6_addr flow_tnl_src(const struct flow_tnl *tnl); + /* Returns an offset to 'src' covering all the meaningful fields in 'src'. */ static inline size_t flow_tnl_size(const struct flow_tnl *src) { - if (!src->ip_dst) { - /* Covers ip_dst only. */ + if (!flow_tnl_dst_is_set(src)) { + /* Covers ip_dst and ipv6_dst only. */ return offsetof(struct flow_tnl, ip_src); } if (src->flags & FLOW_TNL_F_UDPIF) { @@ -126,6 +140,10 @@ struct pkt_metadata { action. */ uint32_t skb_priority; /* Packet priority for QoS. */ uint32_t pkt_mark; /* Packet mark. */ + uint16_t ct_state; /* Connection state. */ + uint16_t ct_zone; /* Connection zone. */ + uint32_t ct_mark; /* Connection mark. */ + ovs_u128 ct_label; /* Connection label. */ union flow_in_port in_port; /* Input port. */ struct flow_tnl tunnel; /* Encapsulating tunnel parameters. Note that * if 'ip_dst' == 0, the rest of the fields may @@ -138,12 +156,21 @@ pkt_metadata_init(struct pkt_metadata *md, odp_port_t port) /* It can be expensive to zero out all of the tunnel metadata. However, * we can just zero out ip_dst and the rest of the data will never be * looked at. */ - memset(md, 0, offsetof(struct pkt_metadata, tunnel)); + memset(md, 0, offsetof(struct pkt_metadata, in_port)); md->tunnel.ip_dst = 0; + md->tunnel.ipv6_dst = in6addr_any; md->in_port.odp_port = port; } +/* This function prefetches the cachelines touched by pkt_metadata_init() + * For performance reasons the two functions should be kept in sync. */ +static inline void +pkt_metadata_prefetch_init(struct pkt_metadata *md) +{ + ovs_prefetch_range(md, offsetof(struct pkt_metadata, tunnel.ip_src)); +} + bool dpid_from_string(const char *s, uint64_t *dpidp); #define ETH_ADDR_LEN 6 @@ -311,6 +338,7 @@ ovs_be32 set_mpls_lse_values(uint8_t ttl, uint8_t tc, uint8_t bos, #define ETH_ADDR_ARGS(EA) ETH_ADDR_BYTES_ARGS((EA).ea) #define ETH_ADDR_BYTES_ARGS(EAB) \ (EAB)[0], (EAB)[1], (EAB)[2], (EAB)[3], (EAB)[4], (EAB)[5] +#define ETH_ADDR_STRLEN 17 /* Example: * @@ -561,6 +589,16 @@ ip_is_local_multicast(ovs_be32 ip) } int ip_count_cidr_bits(ovs_be32 netmask); void ip_format_masked(ovs_be32 ip, ovs_be32 mask, struct ds *); +bool ip_parse(const char *s, ovs_be32 *ip); +char *ip_parse_masked(const char *s, ovs_be32 *ip, ovs_be32 *mask) + OVS_WARN_UNUSED_RESULT; +char *ip_parse_cidr(const char *s, ovs_be32 *ip, unsigned int *plen) + OVS_WARN_UNUSED_RESULT; +char *ip_parse_masked_len(const char *s, int *n, ovs_be32 *ip, ovs_be32 *mask) + OVS_WARN_UNUSED_RESULT; +char *ip_parse_cidr_len(const char *s, int *n, ovs_be32 *ip, + unsigned int *plen) + OVS_WARN_UNUSED_RESULT; #define IP_VER(ip_ihl_ver) ((ip_ihl_ver) >> 4) #define IP_IHL(ip_ihl_ver) ((ip_ihl_ver) & 15) @@ -711,6 +749,35 @@ struct tcp_header { }; BUILD_ASSERT_DECL(TCP_HEADER_LEN == sizeof(struct tcp_header)); +/* Connection states */ +enum { + CS_NEW_BIT = 0, + CS_ESTABLISHED_BIT = 1, + CS_RELATED_BIT = 2, + CS_REPLY_DIR_BIT = 3, + CS_INVALID_BIT = 4, + CS_TRACKED_BIT = 5, + CS_SRC_NAT_BIT = 6, + CS_DST_NAT_BIT = 7, +}; + +enum { + CS_NEW = (1 << CS_NEW_BIT), + CS_ESTABLISHED = (1 << CS_ESTABLISHED_BIT), + CS_RELATED = (1 << CS_RELATED_BIT), + CS_REPLY_DIR = (1 << CS_REPLY_DIR_BIT), + CS_INVALID = (1 << CS_INVALID_BIT), + CS_TRACKED = (1 << CS_TRACKED_BIT), + CS_SRC_NAT = (1 << CS_SRC_NAT_BIT), + CS_DST_NAT = (1 << CS_DST_NAT_BIT), +}; + +/* Undefined connection state bits. */ +#define CS_SUPPORTED_MASK (CS_NEW | CS_ESTABLISHED | CS_RELATED \ + | CS_INVALID | CS_REPLY_DIR | CS_TRACKED \ + | CS_SRC_NAT | CS_DST_NAT) +#define CS_UNSUPPORTED_MASK (~(uint32_t)CS_SUPPORTED_MASK) + #define ARP_HRD_ETHERNET 1 #define ARP_PRO_IP 0x0800 #define ARP_OP_REQUEST 1 @@ -734,6 +801,8 @@ struct arp_eth_header { }; BUILD_ASSERT_DECL(ARP_ETH_HEADER_LEN == sizeof(struct arp_eth_header)); +#define IPV6_HEADER_LEN 40 + /* Like struct in6_addr, but whereas that struct requires 32-bit alignment on * most implementations, this one only requires 16-bit alignment. */ union ovs_16aligned_in6_addr { @@ -774,6 +843,8 @@ struct icmp6_header { }; BUILD_ASSERT_DECL(ICMP6_HEADER_LEN == sizeof(struct icmp6_header)); +uint32_t packet_csum_pseudoheader6(const struct ovs_16aligned_ip6_hdr *); + /* Neighbor Discovery option field. * ND options are always a multiple of 8 bytes in size. */ #define ND_OPT_LEN 8 @@ -879,13 +950,18 @@ static inline bool ipv6_addr_is_multicast(const struct in6_addr *ip) { return ip->s6_addr[0] == 0xff; } +static inline struct in6_addr +in6_addr_mapped_ipv4(ovs_be32 ip4) +{ + struct in6_addr ip6 = { .s6_addr = { [10] = 0xff, [11] = 0xff } }; + memcpy(&ip6.s6_addr[12], &ip4, 4); + return ip6; +} + static inline void -in6_addr_set_mapped_ipv4(struct in6_addr *addr, ovs_be32 ip4) +in6_addr_set_mapped_ipv4(struct in6_addr *ip6, ovs_be32 ip4) { - union ovs_16aligned_in6_addr *taddr = (void *) addr; - memset(taddr->be16, 0, sizeof(taddr->be16)); - taddr->be16[5] = OVS_BE16_MAX; - put_16aligned_be32(&taddr->be32[3], ip4); + *ip6 = in6_addr_mapped_ipv4(ip4); } static inline ovs_be32 @@ -899,6 +975,28 @@ in6_addr_get_mapped_ipv4(const struct in6_addr *addr) } } +static inline void +in6_addr_solicited_node(struct in6_addr *addr, const struct in6_addr *ip6) +{ + union ovs_16aligned_in6_addr *taddr = (void *) addr; + memset(taddr->be16, 0, sizeof(taddr->be16)); + taddr->be16[0] = htons(0xff02); + taddr->be16[5] = htons(0x1); + taddr->be16[6] = htons(0xff00); + memcpy(&addr->s6_addr[13], &ip6->s6_addr[13], 3); +} + +static inline void +ipv6_multicast_to_ethernet(struct eth_addr *eth, const struct in6_addr *ip6) +{ + eth->ea[0] = 0x33; + eth->ea[1] = 0x33; + eth->ea[2] = ip6->s6_addr[12]; + eth->ea[3] = ip6->s6_addr[13]; + eth->ea[4] = ip6->s6_addr[14]; + eth->ea[5] = ip6->s6_addr[15]; +} + static inline bool dl_type_is_ip_any(ovs_be16 dl_type) { return dl_type == htons(ETH_TYPE_IP) @@ -930,17 +1028,30 @@ struct vxlanhdr { #define VXLAN_FLAGS 0x08000000 /* struct vxlanhdr.vx_flags required value. */ -void format_ipv6_addr(char *addr_str, const struct in6_addr *addr); -void print_ipv6_addr(struct ds *string, const struct in6_addr *addr); -void print_ipv6_mapped(struct ds *string, const struct in6_addr *addr); -void print_ipv6_masked(struct ds *string, const struct in6_addr *addr, - const struct in6_addr *mask); +void ipv6_format_addr(const struct in6_addr *addr, struct ds *); +void ipv6_format_addr_bracket(const struct in6_addr *addr, struct ds *, + bool bracket); +void ipv6_format_mapped(const struct in6_addr *addr, struct ds *); +void ipv6_format_masked(const struct in6_addr *addr, + const struct in6_addr *mask, struct ds *); +const char * ipv6_string_mapped(char *addr_str, const struct in6_addr *addr); struct in6_addr ipv6_addr_bitand(const struct in6_addr *src, const struct in6_addr *mask); struct in6_addr ipv6_create_mask(int mask); int ipv6_count_cidr_bits(const struct in6_addr *netmask); bool ipv6_is_cidr(const struct in6_addr *netmask); +bool ipv6_parse(const char *s, struct in6_addr *ip); +char *ipv6_parse_masked(const char *s, struct in6_addr *ipv6, + struct in6_addr *mask); +char *ipv6_parse_cidr(const char *s, struct in6_addr *ip, unsigned int *plen) + OVS_WARN_UNUSED_RESULT; +char *ipv6_parse_masked_len(const char *s, int *n, struct in6_addr *ipv6, + struct in6_addr *mask); +char *ipv6_parse_cidr_len(const char *s, int *n, struct in6_addr *ip, + unsigned int *plen) + OVS_WARN_UNUSED_RESULT; + void *eth_compose(struct dp_packet *, const struct eth_addr eth_dst, const struct eth_addr eth_src, uint16_t eth_type, size_t size); @@ -955,6 +1066,7 @@ void packet_set_ipv6(struct dp_packet *, uint8_t proto, const ovs_be32 src[4], void packet_set_tcp_port(struct dp_packet *, ovs_be16 src, ovs_be16 dst); void packet_set_udp_port(struct dp_packet *, ovs_be16 src, ovs_be16 dst); void packet_set_sctp_port(struct dp_packet *, ovs_be16 src, ovs_be16 dst); +void packet_set_icmp(struct dp_packet *, uint8_t type, uint8_t code); void packet_set_nd(struct dp_packet *, const ovs_be32 target[4], const struct eth_addr sll, const struct eth_addr tll); @@ -964,6 +1076,8 @@ void compose_arp(struct dp_packet *, uint16_t arp_op, const struct eth_addr arp_sha, const struct eth_addr arp_tha, bool broadcast, ovs_be32 arp_spa, ovs_be32 arp_tpa); +void compose_nd(struct dp_packet *, const struct eth_addr eth_src, + struct in6_addr *, struct in6_addr *); uint32_t packet_csum_pseudoheader(const struct ip_header *); #endif /* packets.h */