* derivatives without specific, written prior permission.
*/
+#include <config.h>
#include "switch-flow.h"
#include <arpa/inet.h>
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-#include "buffer.h"
-#include "openflow.h"
+#include "ofpbuf.h"
+#include "openflow/openflow.h"
#include "packets.h"
+#include "timeval.h"
/* Internal function used to compare fields in flow. */
-static inline
-int flow_fields_match(const struct flow *a, const struct flow *b, uint16_t w)
+static inline int
+flow_fields_match(const struct flow *a, const struct flow *b, uint16_t w,
+ uint32_t src_mask, uint32_t dst_mask)
{
return ((w & OFPFW_IN_PORT || a->in_port == b->in_port)
&& (w & OFPFW_DL_VLAN || a->dl_vlan == b->dl_vlan)
- && (w & OFPFW_DL_SRC || !memcmp(a->dl_src, b->dl_src, ETH_ADDR_LEN))
- && (w & OFPFW_DL_DST || !memcmp(a->dl_dst, b->dl_dst, ETH_ADDR_LEN))
+ && (w & OFPFW_DL_SRC || eth_addr_equals(a->dl_src, b->dl_src))
+ && (w & OFPFW_DL_DST || eth_addr_equals(a->dl_dst, b->dl_dst))
&& (w & OFPFW_DL_TYPE || a->dl_type == b->dl_type)
- && (w & OFPFW_NW_SRC || a->nw_src == b->nw_src)
- && (w & OFPFW_NW_DST || a->nw_dst == b->nw_dst)
+ && !((a->nw_src ^ b->nw_src) & src_mask)
+ && !((a->nw_dst ^ b->nw_dst) & dst_mask)
&& (w & OFPFW_NW_PROTO || a->nw_proto == b->nw_proto)
&& (w & OFPFW_TP_SRC || a->tp_src == b->tp_src)
&& (w & OFPFW_TP_DST || a->tp_dst == b->tp_dst));
}
+static uint32_t make_nw_mask(int n_wild_bits)
+{
+ n_wild_bits &= (1u << OFPFW_NW_SRC_BITS) - 1;
+ return n_wild_bits < 32 ? htonl(~((1u << n_wild_bits) - 1)) : 0;
+}
+
+/* Returns nonzero if 'a' and 'b' match, that is, if their fields are equal
+ * modulo wildcards in 'b', zero otherwise. */
+inline int
+flow_matches_1wild(const struct sw_flow_key *a, const struct sw_flow_key *b)
+{
+ return flow_fields_match(&a->flow, &b->flow, b->wildcards,
+ b->nw_src_mask, b->nw_dst_mask);
+}
+
/* Returns nonzero if 'a' and 'b' match, that is, if their fields are equal
- * modulo wildcards, zero otherwise. */
-inline
-int flow_matches(const struct sw_flow_key *a, const struct sw_flow_key *b)
+ * modulo wildcards in 'a' or 'b', zero otherwise. */
+inline int
+flow_matches_2wild(const struct sw_flow_key *a, const struct sw_flow_key *b)
{
- return flow_fields_match(&a->flow, &b->flow, a->wildcards | b->wildcards);
+ return flow_fields_match(&a->flow, &b->flow, a->wildcards | b->wildcards,
+ a->nw_src_mask & b->nw_src_mask,
+ a->nw_dst_mask & b->nw_dst_mask);
}
/* Returns nonzero if 't' (the table entry's key) and 'd' (the key
- * describing the deletion) match, that is, if their fields are
+ * describing the match) match, that is, if their fields are
* equal modulo wildcards, zero otherwise. If 'strict' is nonzero, the
* wildcards must match in both 't_key' and 'd_key'. Note that the
* table's wildcards are ignored unless 'strict' is set. */
-inline
-int flow_del_matches(const struct sw_flow_key *t, const struct sw_flow_key *d, int strict)
+int
+flow_matches_desc(const struct sw_flow_key *t, const struct sw_flow_key *d,
+ int strict)
{
- if (strict && t->wildcards != d->wildcards)
+ if (strict && d->wildcards != t->wildcards) {
return 0;
-
- return flow_fields_match(&t->flow, &d->flow, d->wildcards);
+ }
+ return flow_matches_1wild(t, d);
}
-void flow_extract_match(struct sw_flow_key* to, const struct ofp_match* from)
+void
+flow_extract_match(struct sw_flow_key* to, const struct ofp_match* from)
{
- to->wildcards = ntohs(from->wildcards) & OFPFW_ALL;
+ to->wildcards = ntohl(from->wildcards) & OFPFW_ALL;
to->flow.reserved = 0;
to->flow.in_port = from->in_port;
to->flow.dl_vlan = from->dl_vlan;
memcpy(to->flow.dl_dst, from->dl_dst, ETH_ADDR_LEN);
to->flow.dl_type = from->dl_type;
+ to->flow.nw_src = to->flow.nw_dst = to->flow.nw_proto = 0;
+ to->flow.tp_src = to->flow.tp_dst = 0;
- if (from->dl_type == htons(ETH_TYPE_IP)) {
+#define OFPFW_TP (OFPFW_TP_SRC | OFPFW_TP_DST)
+#define OFPFW_NW (OFPFW_NW_SRC_MASK | OFPFW_NW_DST_MASK | OFPFW_NW_PROTO)
+ if (to->wildcards & OFPFW_DL_TYPE) {
+ /* Can't sensibly match on network or transport headers if the
+ * data link type is unknown. */
+ to->wildcards |= OFPFW_NW | OFPFW_TP;
+ } else if (from->dl_type == htons(ETH_TYPE_IP)) {
to->flow.nw_src = from->nw_src;
to->flow.nw_dst = from->nw_dst;
to->flow.nw_proto = from->nw_proto;
- if ((from->nw_proto != IPPROTO_TCP && from->nw_proto != IPPROTO_UDP)) {
- goto no_th;
+ if (to->wildcards & OFPFW_NW_PROTO) {
+ /* Can't sensibly match on transport headers if the network
+ * protocol is unknown. */
+ to->wildcards |= OFPFW_TP;
+ } else if (from->nw_proto == IPPROTO_TCP
+ || from->nw_proto == IPPROTO_UDP
+ || from->nw_proto == IPPROTO_ICMP) {
+ to->flow.tp_src = from->tp_src;
+ to->flow.tp_dst = from->tp_dst;
+ } else {
+ /* Transport layer fields are undefined. Mark them as
+ * exact-match to allow such flows to reside in table-hash,
+ * instead of falling into table-linear. */
+ to->wildcards &= ~OFPFW_TP;
}
- to->flow.tp_src = from->tp_src;
- to->flow.tp_dst = from->tp_dst;
- return;
- } else if (from->dl_type == htons(ETH_TYPE_ARP)) {
- to->flow.nw_src = from->nw_src;
- to->flow.nw_dst = from->nw_dst;
- to->flow.nw_proto = 0;
- goto no_th;
+ } else {
+ /* Network and transport layer fields are undefined. Mark them
+ * as exact-match to allow such flows to reside in table-hash,
+ * instead of falling into table-linear. */
+ to->wildcards &= ~(OFPFW_NW | OFPFW_TP);
}
- to->flow.nw_src = 0;
- to->flow.nw_dst = 0;
- to->flow.nw_proto = 0;
-
-no_th:
- to->flow.tp_src = 0;
- to->flow.tp_dst = 0;
+ /* We set these late because code above adjusts to->wildcards. */
+ to->nw_src_mask = make_nw_mask(to->wildcards >> OFPFW_NW_SRC_SHIFT);
+ to->nw_dst_mask = make_nw_mask(to->wildcards >> OFPFW_NW_DST_SHIFT);
}
-void flow_fill_match(struct ofp_match* to, const struct sw_flow_key* from)
+void
+flow_fill_match(struct ofp_match* to, const struct sw_flow_key* from)
{
- to->wildcards = htons(from->wildcards);
+ to->wildcards = htonl(from->wildcards);
to->in_port = from->flow.in_port;
to->dl_vlan = from->flow.dl_vlan;
memcpy(to->dl_src, from->flow.dl_src, ETH_ADDR_LEN);
to->nw_proto = from->flow.nw_proto;
to->tp_src = from->flow.tp_src;
to->tp_dst = from->flow.tp_dst;
- memset(to->pad, '\0', sizeof(to->pad));
+ to->pad = 0;
}
-/* Allocates and returns a new flow with 'n_actions' action, using allocation
- * flags 'flags'. Returns the new flow or a null pointer on failure. */
-struct sw_flow *flow_alloc(int n_actions)
+/* Allocates and returns a new flow with room for 'actions_len' actions.
+ * Returns the new flow or a null pointer on failure. */
+struct sw_flow *
+flow_alloc(size_t actions_len)
{
+ struct sw_flow_actions *sfa;
+ size_t size = sizeof *sfa + actions_len;
struct sw_flow *flow = malloc(sizeof *flow);
if (!flow)
return NULL;
- flow->n_actions = n_actions;
- flow->actions = malloc(n_actions * sizeof *flow->actions);
- if (!flow->actions && n_actions > 0) {
+ sfa = malloc(size);
+ if (!sfa) {
free(flow);
return NULL;
}
+ sfa->actions_len = actions_len;
+ flow->sf_acts = sfa;
return flow;
}
/* Frees 'flow' immediately. */
-void flow_free(struct sw_flow *flow)
+void
+flow_free(struct sw_flow *flow)
{
if (!flow) {
return;
}
- free(flow->actions);
+ free(flow->sf_acts);
free(flow);
}
+/* Copies 'actions' into a newly allocated structure for use by 'flow'
+ * and frees the structure that defined the previous actions. */
+void flow_replace_acts(struct sw_flow *flow,
+ const struct ofp_action_header *actions, size_t actions_len)
+{
+ struct sw_flow_actions *sfa;
+ int size = sizeof *sfa + actions_len;
+
+ sfa = malloc(size);
+ if (unlikely(!sfa))
+ return;
+
+ sfa->actions_len = actions_len;
+ memcpy(sfa->actions, actions, actions_len);
+
+ free(flow->sf_acts);
+ flow->sf_acts = sfa;
+
+ return;
+}
+
/* Prints a representation of 'key' to the kernel log. */
-void print_flow(const struct sw_flow_key *key)
+void
+print_flow(const struct sw_flow_key *key)
{
const struct flow *f = &key->flow;
- printf("wild%04x port%04x:vlan%04x mac%02x:%02x:%02x:%02x:%02x:%02x"
+ printf("wild%08x port%04x:vlan%04x mac%02x:%02x:%02x:%02x:%02x:%02x"
"->%02x:%02x:%02x:%02x:%02x:%02x "
"proto%04x ip%u.%u.%u.%u->%u.%u.%u.%u port%d->%d\n",
key->wildcards, ntohs(f->in_port), ntohs(f->dl_vlan),
ntohs(f->tp_src), ntohs(f->tp_dst));
}
-int flow_timeout(struct sw_flow *flow)
+bool flow_timeout(struct sw_flow *flow)
{
- if (flow->max_idle == OFP_FLOW_PERMANENT)
- return 0;
-
- /* FIXME */
- return time(0) > flow->timeout;
+ time_t now = time_now();
+ if (flow->idle_timeout != OFP_FLOW_PERMANENT
+ && now > flow->used + flow->idle_timeout) {
+ flow->reason = OFPER_IDLE_TIMEOUT;
+ return true;
+ } else if (flow->hard_timeout != OFP_FLOW_PERMANENT
+ && now > flow->created + flow->hard_timeout) {
+ flow->reason = OFPER_HARD_TIMEOUT;
+ return true;
+ } else {
+ return false;
+ }
}
-void flow_used(struct sw_flow *flow, struct buffer *buffer)
+/* Returns nonzero if 'flow' contains an output action to 'out_port' or
+ * has the value OFPP_NONE. 'out_port' is in network-byte order. */
+int flow_has_out_port(struct sw_flow *flow, uint16_t out_port)
{
- if (flow->max_idle != OFP_FLOW_PERMANENT)
- flow->timeout = time(0) + flow->max_idle;
+ struct sw_flow_actions *sf_acts = flow->sf_acts;
+ size_t actions_len = sf_acts->actions_len;
+ uint8_t *p = (uint8_t *)sf_acts->actions;
+
+ if (out_port == htons(OFPP_NONE))
+ return 1;
+ while (actions_len > 0) {
+ struct ofp_action_header *ah = (struct ofp_action_header *)p;
+ size_t len = ntohs(ah->len);
+
+ if (ah->type == htons(OFPAT_OUTPUT)) {
+ struct ofp_action_output *oa = (struct ofp_action_output *)p;
+ if (oa->port == out_port) {
+ return 1;
+ }
+ }
+ p += len;
+ actions_len -= len;
+ }
+
+ return 0;
+}
+
+void flow_used(struct sw_flow *flow, struct ofpbuf *buffer)
+{
+ flow->used = time_now();
flow->packet_count++;
flow->byte_count += buffer->size;
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff