X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fflow.c;h=7ae90d2b56f8c7210238aeaf4cbc33ca11f800fa;hb=f4b6076acab233cfe02e7eaefdeafbb69dfae556;hp=7d4a1bd4d98a36a3c106f92fad459f8b7889672f;hpb=58fda1dab104041fc693032475ec4662c1a52849;p=openvswitch diff --git a/lib/flow.c b/lib/flow.c index 7d4a1bd4..7ae90d2b 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 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,6 +27,8 @@ #include "openflow/openflow.h" #include "openvswitch/datapath-protocol.h" #include "packets.h" +#include "unaligned.h" +#include "xtoxll.h" #include "vlog.h" #define THIS_MODULE VLM_flow @@ -87,9 +89,12 @@ pull_vlan(struct ofpbuf *packet) return ofpbuf_try_pull(packet, VLAN_HEADER_LEN); } -/* Returns 1 if 'packet' is an IP fragment, 0 otherwise. */ +/* Returns 1 if 'packet' is an IP fragment, 0 otherwise. + * 'tun_id' is in network byte order, while 'in_port' is in host byte order. + * These byte orders are the same as they are in struct odp_flow_key. */ int -flow_extract(struct ofpbuf *packet, uint16_t in_port, flow_t *flow) +flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port, + flow_t *flow) { struct ofpbuf b = *packet; struct eth_header *eth; @@ -98,8 +103,9 @@ flow_extract(struct ofpbuf *packet, uint16_t in_port, flow_t *flow) COVERAGE_INC(flow_extract); memset(flow, 0, sizeof *flow); - flow->dl_vlan = htons(OFP_VLAN_NONE); + flow->tun_id = tun_id; flow->in_port = in_port; + flow->dl_vlan = htons(OFP_VLAN_NONE); packet->l2 = b.data; packet->l3 = NULL; @@ -139,6 +145,7 @@ flow_extract(struct ofpbuf *packet, uint16_t in_port, flow_t *flow) if (vh) { flow->dl_type = vh->vlan_next_type; flow->dl_vlan = vh->vlan_tci & htons(VLAN_VID_MASK); + flow->dl_vlan_pcp = (ntohs(vh->vlan_tci) & 0xe000) >> 13; } } memcpy(flow->dl_src, eth->eth_src, ETH_ADDR_LEN); @@ -148,8 +155,9 @@ flow_extract(struct ofpbuf *packet, uint16_t in_port, flow_t *flow) if (flow->dl_type == htons(ETH_TYPE_IP)) { const struct ip_header *nh = pull_ip(&b); if (nh) { - flow->nw_src = nh->ip_src; - flow->nw_dst = nh->ip_dst; + flow->nw_src = get_unaligned_u32(&nh->ip_src); + flow->nw_dst = get_unaligned_u32(&nh->ip_dst); + flow->nw_tos = nh->ip_tos & IP_DSCP_MASK; flow->nw_proto = nh->ip_proto; packet->l4 = b.data; if (!IP_IS_FRAGMENT(nh->ip_frag_off)) { @@ -235,75 +243,64 @@ flow_extract_stats(const flow_t *flow, struct ofpbuf *packet, stats->n_packets = 1; } -/* The Open vSwitch datapath supports matching on ARP payloads, which - * OpenFlow does not. This function is identical to 'flow_to_match', - * but does not hide the datapath's ability to match on ARP. */ +/* Extract 'flow' with 'wildcards' into the OpenFlow match structure + * 'match'. */ void -flow_to_ovs_match(const flow_t *flow, uint32_t wildcards, - struct ofp_match *match) +flow_to_match(const flow_t *flow, uint32_t wildcards, bool tun_id_from_cookie, + struct ofp_match *match) { + if (!tun_id_from_cookie) { + wildcards &= OFPFW_ALL; + } match->wildcards = htonl(wildcards); + match->in_port = htons(flow->in_port == ODPP_LOCAL ? OFPP_LOCAL : flow->in_port); match->dl_vlan = flow->dl_vlan; + match->dl_vlan_pcp = flow->dl_vlan_pcp; memcpy(match->dl_src, flow->dl_src, ETH_ADDR_LEN); memcpy(match->dl_dst, flow->dl_dst, ETH_ADDR_LEN); match->dl_type = flow->dl_type; match->nw_src = flow->nw_src; match->nw_dst = flow->nw_dst; + match->nw_tos = flow->nw_tos; match->nw_proto = flow->nw_proto; match->tp_src = flow->tp_src; match->tp_dst = flow->tp_dst; - match->pad = 0; + memset(match->pad1, '\0', sizeof match->pad1); + memset(match->pad2, '\0', sizeof match->pad2); } -/* Extract 'flow' with 'wildcards' into the OpenFlow match structure - * 'match'. */ void -flow_to_match(const flow_t *flow, uint32_t wildcards, struct ofp_match *match) +flow_from_match(const struct ofp_match *match, bool tun_id_from_cookie, + uint64_t cookie, flow_t *flow, uint32_t *flow_wildcards) { - flow_to_ovs_match(flow, wildcards, match); - - /* The datapath supports matching on an ARP's opcode and IP addresses, - * but OpenFlow does not. We wildcard and zero out the appropriate - * fields so that OpenFlow is unaware of our trickery. */ - if (flow->dl_type == htons(ETH_TYPE_ARP)) { - wildcards |= (OFPFW_NW_PROTO | OFPFW_NW_SRC_ALL | OFPFW_NW_DST_ALL); - match->nw_src = 0; - match->nw_dst = 0; - match->nw_proto = 0; - } - match->wildcards = htonl(wildcards); -} - - -void -flow_from_match(flow_t *flow, uint32_t *wildcards, - const struct ofp_match *match) -{ - if (wildcards) { - *wildcards = ntohl(match->wildcards); - } - /* The datapath supports matching on an ARP's opcode and IP addresses, - * but OpenFlow does not. In case the controller hasn't, we need to - * set the appropriate wildcard bits so that we're externally - * OpenFlow-compliant. */ - if (match->dl_type == htons(ETH_TYPE_ARP)) { - *wildcards |= (OFPFW_NW_PROTO | OFPFW_NW_SRC_ALL | OFPFW_NW_DST_ALL); - } + uint32_t wildcards = ntohl(match->wildcards); flow->nw_src = match->nw_src; flow->nw_dst = match->nw_dst; + if (tun_id_from_cookie && !(wildcards & NXFW_TUN_ID)) { + flow->tun_id = htonl(ntohll(cookie) >> 32); + } else { + wildcards |= NXFW_TUN_ID; + flow->tun_id = 0; + } flow->in_port = (match->in_port == htons(OFPP_LOCAL) ? ODPP_LOCAL : ntohs(match->in_port)); flow->dl_vlan = match->dl_vlan; + flow->dl_vlan_pcp = match->dl_vlan_pcp; flow->dl_type = match->dl_type; flow->tp_src = match->tp_src; flow->tp_dst = match->tp_dst; memcpy(flow->dl_src, match->dl_src, ETH_ADDR_LEN); memcpy(flow->dl_dst, match->dl_dst, ETH_ADDR_LEN); + flow->nw_tos = match->nw_tos; flow->nw_proto = match->nw_proto; - flow->reserved = 0; + memset(flow->reserved, 0, sizeof flow->reserved); + + if (flow_wildcards) { + *flow_wildcards = wildcards; + } } char * @@ -317,13 +314,27 @@ flow_to_string(const flow_t *flow) void flow_format(struct ds *ds, const flow_t *flow) { - ds_put_format(ds, "in_port%04x:vlan%d mac"ETH_ADDR_FMT"->"ETH_ADDR_FMT" " - "type%04x proto%"PRId8" ip"IP_FMT"->"IP_FMT" port%d->%d", - flow->in_port, ntohs(flow->dl_vlan), - ETH_ADDR_ARGS(flow->dl_src), ETH_ADDR_ARGS(flow->dl_dst), - ntohs(flow->dl_type), flow->nw_proto, - IP_ARGS(&flow->nw_src), IP_ARGS(&flow->nw_dst), - ntohs(flow->tp_src), ntohs(flow->tp_dst)); + ds_put_format(ds, "tunnel%08"PRIx32":in_port%04"PRIx16 + ":vlan%"PRIu16":pcp%"PRIu8 + " mac"ETH_ADDR_FMT"->"ETH_ADDR_FMT + " type%04"PRIx16 + " proto%"PRIu8 + " tos%"PRIu8 + " ip"IP_FMT"->"IP_FMT + " port%"PRIu16"->%"PRIu16, + ntohl(flow->tun_id), + flow->in_port, + ntohs(flow->dl_vlan), + flow->dl_vlan_pcp, + ETH_ADDR_ARGS(flow->dl_src), + ETH_ADDR_ARGS(flow->dl_dst), + ntohs(flow->dl_type), + flow->nw_proto, + flow->nw_tos, + IP_ARGS(&flow->nw_src), + IP_ARGS(&flow->nw_dst), + ntohs(flow->tp_src), + ntohs(flow->tp_dst)); } void