X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Flearning-switch.c;h=60cf731de1a2574be96e84fdfdb1562a7aaf3c53;hb=e764773ccb007e79f44d948a781fae1313ac28fe;hp=cbd24cbfb7892b0ce5efa2729168483701388ebe;hpb=d1e2cf211901ec64dc2f91ab5379a0ac2654ae62;p=sliver-openvswitch.git diff --git a/lib/learning-switch.c b/lib/learning-switch.c index cbd24cbfb..60cf731de 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ #include "hmap.h" #include "mac-learning.h" #include "ofpbuf.h" +#include "ofp-errors.h" #include "ofp-parse.h" #include "ofp-print.h" #include "ofp-util.h" @@ -96,18 +97,28 @@ lswitch_create(struct rconn *rconn, const struct lswitch_config *cfg) sw->max_idle = cfg->max_idle; sw->datapath_id = 0; sw->last_features_request = time_now() - 1; - sw->ml = cfg->mode == LSW_LEARN ? mac_learning_create() : NULL; + sw->ml = (cfg->mode == LSW_LEARN + ? mac_learning_create(MAC_ENTRY_DEFAULT_IDLE_TIME) + : NULL); sw->action_normal = cfg->mode == LSW_NORMAL; flow_wildcards_init_exact(&sw->wc); - if (!cfg->exact_flows) { - /* We cannot wildcard all fields. - * We need in_port to detect moves. - * We need both SA and DA to do learning. */ - sw->wc.wildcards = (FWW_DL_TYPE | FWW_NW_PROTO - | FWW_TP_SRC | FWW_TP_DST); - sw->wc.nw_src_mask = htonl(0); - sw->wc.nw_dst_mask = htonl(0); + if (cfg->wildcards) { + uint32_t ofpfw; + + if (cfg->wildcards == UINT32_MAX) { + /* Try to wildcard as many fields as possible, but we cannot + * wildcard all fields. We need in_port to detect moves. We need + * Ethernet source and dest and VLAN VID to do L2 learning. */ + ofpfw = (OFPFW_DL_TYPE | OFPFW_DL_VLAN_PCP + | OFPFW_NW_SRC_ALL | OFPFW_NW_DST_ALL + | OFPFW_NW_TOS | OFPFW_NW_PROTO + | OFPFW_TP_SRC | OFPFW_TP_DST); + } else { + ofpfw = cfg->wildcards; + } + + ofputil_wildcard_from_openflow(ofpfw, &sw->wc); } sw->default_queue = cfg->default_queue; @@ -131,10 +142,17 @@ lswitch_create(struct rconn *rconn, const struct lswitch_config *cfg) const struct ofpbuf *b; LIST_FOR_EACH (b, list_node, cfg->default_flows) { - queue_tx(sw, rconn, ofpbuf_clone(b)); + struct ofpbuf *copy = ofpbuf_clone(b); + int error = rconn_send(rconn, copy, NULL); + if (error) { + VLOG_INFO_RL(&rl, "%s: failed to queue default flows (%s)", + rconn_get_name(rconn), strerror(error)); + ofpbuf_delete(copy); + break; + } } } - + return sw; } @@ -210,7 +228,7 @@ lswitch_process_packet(struct lswitch *sw, struct rconn *rconn, /* Nothing to do. */ break; - case OFPUTIL_INVALID: + case OFPUTIL_MSG_INVALID: case OFPUTIL_OFPT_HELLO: case OFPUTIL_OFPT_ERROR: case OFPUTIL_OFPT_ECHO_REPLY: @@ -238,12 +256,12 @@ lswitch_process_packet(struct lswitch *sw, struct rconn *rconn, case OFPUTIL_OFPST_PORT_REPLY: case OFPUTIL_OFPST_TABLE_REPLY: case OFPUTIL_OFPST_AGGREGATE_REPLY: - case OFPUTIL_NXT_STATUS_REQUEST: - case OFPUTIL_NXT_STATUS_REPLY: - case OFPUTIL_NXT_TUN_ID_FROM_COOKIE: case OFPUTIL_NXT_ROLE_REQUEST: case OFPUTIL_NXT_ROLE_REPLY: + case OFPUTIL_NXT_FLOW_MOD_TABLE_ID: case OFPUTIL_NXT_SET_FLOW_FORMAT: + case OFPUTIL_NXT_SET_PACKET_IN_FORMAT: + case OFPUTIL_NXT_PACKET_IN: case OFPUTIL_NXT_FLOW_MOD: case OFPUTIL_NXT_FLOW_REMOVED: case OFPUTIL_NXST_FLOW_REQUEST: @@ -326,12 +344,15 @@ lswitch_choose_destination(struct lswitch *sw, const struct flow *flow) uint16_t out_port; /* Learn the source MAC. */ - if (sw->ml) { - if (mac_learning_learn(sw->ml, flow->dl_src, 0, flow->in_port, - GRAT_ARP_LOCK_NONE)) { + if (mac_learning_may_learn(sw->ml, flow->dl_src, 0)) { + struct mac_entry *mac = mac_learning_insert(sw->ml, flow->dl_src, 0); + if (mac_entry_is_new(mac) || mac->port.i != flow->in_port) { VLOG_DBG_RL(&rl, "%016llx: learned that "ETH_ADDR_FMT" is on " "port %"PRIu16, sw->datapath_id, ETH_ADDR_ARGS(flow->dl_src), flow->in_port); + + mac->port.i = flow->in_port; + mac_learning_changed(sw->ml, mac); } } @@ -342,9 +363,11 @@ lswitch_choose_destination(struct lswitch *sw, const struct flow *flow) out_port = OFPP_FLOOD; if (sw->ml) { - int learned_port = mac_learning_lookup(sw->ml, flow->dl_dst, 0, NULL); - if (learned_port >= 0) { - out_port = learned_port; + struct mac_entry *mac; + + mac = mac_learning_lookup(sw->ml, flow->dl_dst, 0, NULL); + if (mac) { + out_port = mac->port.i; if (out_port == flow->in_port) { /* Don't send a packet back out its input port. */ return OFPP_NONE; @@ -400,9 +423,8 @@ process_packet_in(struct lswitch *sw, struct rconn *rconn, /* Extract flow data from 'opi' into 'flow'. */ pkt_ofs = offsetof(struct ofp_packet_in, data); pkt_len = ntohs(opi->header.length) - pkt_ofs; - pkt.data = (void *) opi->data; - pkt.size = pkt_len; - flow_extract(&pkt, 0, in_port, &flow); + ofpbuf_use_const(&pkt, opi->data, pkt_len); + flow_extract(&pkt, 0, 0, in_port, &flow); /* Choose output port. */ out_port = lswitch_choose_destination(sw, &flow); @@ -438,7 +460,6 @@ process_packet_in(struct lswitch *sw, struct rconn *rconn, /* Send the packet, and possibly the whole flow, to the output port. */ if (sw->max_idle >= 0 && (!sw->ml || out_port != OFPP_FLOOD)) { struct ofpbuf *buffer; - struct ofp_flow_mod *ofm; struct cls_rule rule; /* The output port is known, or we always flood everything, so add a @@ -447,7 +468,6 @@ process_packet_in(struct lswitch *sw, struct rconn *rconn, buffer = make_add_flow(&rule, ntohl(opi->buffer_id), sw->max_idle, actions_len); ofpbuf_put(buffer, actions, actions_len); - ofm = buffer->data; queue_tx(sw, rconn, buffer); /* If the switch didn't buffer the packet, we need to send a copy. */