X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Frconn.c;h=67ea86c0e3f17583ec28761a66ff2c09ef9af86a;hb=f31282b9c152d5e993c8fe0068b7a4ed8c8d98c8;hp=56a7e19764069d28f6a849a375f7f4f045beaad2;hpb=f125905cdd3dc0339ad968c0a70128807884b400;p=sliver-openvswitch.git diff --git a/lib/rconn.c b/lib/rconn.c index 56a7e1976..67ea86c0e 100644 --- a/lib/rconn.c +++ b/lib/rconn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ #include #include "rconn.h" -#include #include #include #include #include #include "coverage.h" +#include "ofp-msgs.h" #include "ofp-util.h" #include "ofpbuf.h" #include "openflow/openflow.h" @@ -79,7 +79,6 @@ struct rconn { int backoff; int max_backoff; time_t backoff_deadline; - time_t last_received; time_t last_connected; time_t last_disconnected; unsigned int packets_sent; @@ -104,11 +103,15 @@ struct rconn { time_t creation_time; unsigned long int total_time_connected; - /* Throughout this file, "probe" is shorthand for "inactivity probe". - * When nothing has been received from the peer for a while, we send out - * an echo request as an inactivity probe packet. We should receive back - * a response. */ + /* Throughout this file, "probe" is shorthand for "inactivity probe". When + * no activity has been observed from the peer for a while, we send out an + * echo request as an inactivity probe packet. We should receive back a + * response. + * + * "Activity" is defined as either receiving an OpenFlow message from the + * peer or successfully sending a message that had been in 'txq'. */ int probe_interval; /* Secs of inactivity before sending probe. */ + time_t last_activity; /* Last time we saw some activity. */ /* When we create a vconn we obtain these values, to save them past the end * of the vconn's lifetime. Otherwise, in-band control will only allow @@ -127,8 +130,15 @@ struct rconn { #define MAX_MONITORS 8 struct vconn *monitors[8]; size_t n_monitors; + + uint32_t allowed_versions; }; +uint32_t rconn_get_allowed_versions(const struct rconn *rconn) +{ + return rconn->allowed_versions; +} + static unsigned int elapsed_in_this_state(const struct rconn *); static unsigned int timeout(const struct rconn *); static bool timed_out(const struct rconn *); @@ -159,9 +169,17 @@ static bool rconn_logging_connection_attempts__(const struct rconn *); * 8 seconds is used. * * The new rconn is initially unconnected. Use rconn_connect() or - * rconn_connect_unreliably() to connect it. */ + * rconn_connect_unreliably() to connect it. + * + * Connections made by the rconn will automatically negotiate an OpenFlow + * protocol version acceptable to both peers on the connection. The version + * negotiated will be one of those in the 'allowed_versions' bitmap: version + * 'x' is allowed if allowed_versions & (1 << x) is nonzero. (The underlying + * vconn will treat an 'allowed_versions' of 0 as OFPUTIL_DEFAULT_VERSIONS.) + */ struct rconn * -rconn_create(int probe_interval, int max_backoff, uint8_t dscp) +rconn_create(int probe_interval, int max_backoff, uint8_t dscp, + uint32_t allowed_versions) { struct rconn *rc = xzalloc(sizeof *rc); @@ -178,7 +196,6 @@ rconn_create(int probe_interval, int max_backoff, uint8_t dscp) rc->backoff = 0; rc->max_backoff = max_backoff ? max_backoff : 8; rc->backoff_deadline = TIME_MIN; - rc->last_received = time_now(); rc->last_connected = TIME_MIN; rc->last_disconnected = TIME_MIN; rc->seqno = 0; @@ -194,10 +211,13 @@ rconn_create(int probe_interval, int max_backoff, uint8_t dscp) rc->creation_time = time_now(); rc->total_time_connected = 0; + rc->last_activity = time_now(); + rconn_set_probe_interval(rc, probe_interval); rconn_set_dscp(rc, dscp); rc->n_monitors = 0; + rc->allowed_versions = allowed_versions; return rc; } @@ -226,6 +246,12 @@ rconn_set_dscp(struct rconn *rc, uint8_t dscp) rc->dscp = dscp; } +uint8_t +rconn_get_dscp(const struct rconn *rc) +{ + return rc->dscp; +} + void rconn_set_probe_interval(struct rconn *rc, int probe_interval) { @@ -266,7 +292,7 @@ void rconn_connect_unreliably(struct rconn *rc, struct vconn *vconn, const char *name) { - assert(vconn != NULL); + ovs_assert(vconn != NULL); rconn_disconnect(rc); rconn_set_target__(rc, vconn_get_name(vconn), name); rc->reliable = false; @@ -343,7 +369,8 @@ reconnect(struct rconn *rc) VLOG_INFO("%s: connecting...", rc->name); } rc->n_attempted_connections++; - retval = vconn_open(rc->target, OFP10_VERSION, &rc->vconn, rc->dscp); + retval = vconn_open(rc->target, rc->allowed_versions, rc->dscp, + &rc->vconn); if (!retval) { rc->remote_ip = vconn_get_remote_ip(rc->vconn); rc->local_ip = vconn_get_local_ip(rc->vconn); @@ -412,6 +439,7 @@ do_tx_work(struct rconn *rc) if (error) { break; } + rc->last_activity = time_now(); } if (list_is_empty(&rc->txq)) { poll_immediate_wake(); @@ -422,7 +450,7 @@ static unsigned int timeout_ACTIVE(const struct rconn *rc) { if (rc->probe_interval) { - unsigned int base = MAX(rc->last_received, rc->state_entered); + unsigned int base = MAX(rc->last_activity, rc->state_entered); unsigned int arg = base + rc->probe_interval - rc->state_entered; return arg; } @@ -433,15 +461,20 @@ static void run_ACTIVE(struct rconn *rc) { if (timed_out(rc)) { - unsigned int base = MAX(rc->last_received, rc->state_entered); + unsigned int base = MAX(rc->last_activity, rc->state_entered); + int version; + VLOG_DBG("%s: idle %u seconds, sending inactivity probe", rc->name, (unsigned int) (time_now() - base)); + version = rconn_get_version(rc); + ovs_assert(version >= 0 && version <= 0xff); + /* Ordering is important here: rconn_send() can transition to BACKOFF, * and we don't want to transition back to IDLE if so, because then we * can end up queuing a packet with vconn == NULL and then *boom*. */ state_transition(rc, S_IDLE); - rconn_send(rc, make_echo_request(), NULL); + rconn_send(rc, make_echo_request(version), NULL); return; } @@ -536,7 +569,7 @@ rconn_recv(struct rconn *rc) rc->probably_admitted = true; rc->last_admitted = time_now(); } - rc->last_received = time_now(); + rc->last_activity = time_now(); rc->packets_received++; if (rc->state == S_IDLE) { state_transition(rc, S_ACTIVE); @@ -560,9 +593,8 @@ rconn_recv_wait(struct rconn *rc) } } -/* Sends 'b' on 'rc'. Returns 0 if successful (in which case 'b' is - * destroyed), or ENOTCONN if 'rc' is not currently connected (in which case - * the caller retains ownership of 'b'). +/* Sends 'b' on 'rc'. Returns 0 if successful, or ENOTCONN if 'rc' is not + * currently connected. Takes ownership of 'b'. * * If 'counter' is non-null, then 'counter' will be incremented while the * packet is in flight, then decremented when it has been sent (or discarded @@ -582,7 +614,7 @@ rconn_send(struct rconn *rc, struct ofpbuf *b, copy_to_monitor(rc, b); b->private_p = counter; if (counter) { - rconn_packet_counter_inc(counter); + rconn_packet_counter_inc(counter, b->size); } list_push_back(&rc->txq, &b->list_node); @@ -595,6 +627,7 @@ rconn_send(struct rconn *rc, struct ofpbuf *b, } return 0; } else { + ofpbuf_delete(b); return ENOTCONN; } } @@ -615,13 +648,13 @@ int rconn_send_with_limit(struct rconn *rc, struct ofpbuf *b, struct rconn_packet_counter *counter, int queue_limit) { - int retval; - retval = counter->n >= queue_limit ? EAGAIN : rconn_send(rc, b, counter); - if (retval) { + if (counter->n_packets < queue_limit) { + return rconn_send(rc, b, counter); + } else { COVERAGE_INC(rconn_overflow); ofpbuf_delete(b); + return EAGAIN; } - return retval; } /* Returns the total number of packets successfully sent on the underlying @@ -639,6 +672,14 @@ void rconn_add_monitor(struct rconn *rc, struct vconn *vconn) { if (rc->n_monitors < ARRAY_SIZE(rc->monitors)) { + int version = vconn_get_version(rc->vconn); + + /* Override the allowed versions of the snoop vconn so that + * only the version of the controller connection is allowed. + * This is because the snoop will see the same messages as the + * controller */ + vconn_set_allowed_versions(vconn, 1u << version); + VLOG_INFO("new monitor connection from %s", vconn_get_name(vconn)); rc->monitors[rc->n_monitors++] = vconn; } else { @@ -763,21 +804,6 @@ rconn_get_state(const struct rconn *rc) return state_name(rc->state); } -/* Returns the number of connection attempts made by 'rc', including any - * ongoing attempt that has not yet succeeded or failed. */ -unsigned int -rconn_get_attempted_connections(const struct rconn *rc) -{ - return rc->n_attempted_connections; -} - -/* Returns the number of successful connection attempts made by 'rc'. */ -unsigned int -rconn_get_successful_connections(const struct rconn *rc) -{ - return rc->n_successful_connections; -} - /* Returns the time at which the last successful connection was made by * 'rc'. Returns TIME_MIN if never connected. */ time_t @@ -794,45 +820,6 @@ rconn_get_last_disconnect(const struct rconn *rc) return rc->last_disconnected; } -/* Returns the time at which the last OpenFlow message was received by 'rc'. - * If no packets have been received on 'rc', returns the time at which 'rc' - * was created. */ -time_t -rconn_get_last_received(const struct rconn *rc) -{ - return rc->last_received; -} - -/* Returns the time at which 'rc' was created. */ -time_t -rconn_get_creation_time(const struct rconn *rc) -{ - return rc->creation_time; -} - -/* Returns the approximate number of seconds that 'rc' has been connected. */ -unsigned long int -rconn_get_total_time_connected(const struct rconn *rc) -{ - return (rc->total_time_connected - + (rconn_is_connected(rc) ? elapsed_in_this_state(rc) : 0)); -} - -/* Returns the current amount of backoff, in seconds. This is the amount of - * time after which the rconn will transition from BACKOFF to CONNECTING. */ -int -rconn_get_backoff(const struct rconn *rc) -{ - return rc->backoff; -} - -/* Returns the number of seconds spent in this state so far. */ -unsigned int -rconn_get_state_elapsed(const struct rconn *rc) -{ - return elapsed_in_this_state(rc); -} - /* Returns 'rc''s current connection sequence number, a number that changes * every time that 'rconn' connects or disconnects. */ unsigned int @@ -856,12 +843,18 @@ rconn_get_last_error(const struct rconn *rc) { return rc->last_error; } + +/* Returns the number of messages queued for transmission on 'rc'. */ +unsigned int +rconn_count_txqlen(const struct rconn *rc) +{ + return list_size(&rc->txq); +} struct rconn_packet_counter * rconn_packet_counter_create(void) { - struct rconn_packet_counter *c = xmalloc(sizeof *c); - c->n = 0; + struct rconn_packet_counter *c = xzalloc(sizeof *c); c->ref_cnt = 1; return c; } @@ -870,25 +863,33 @@ void rconn_packet_counter_destroy(struct rconn_packet_counter *c) { if (c) { - assert(c->ref_cnt > 0); - if (!--c->ref_cnt && !c->n) { + ovs_assert(c->ref_cnt > 0); + if (!--c->ref_cnt && !c->n_packets) { free(c); } } } void -rconn_packet_counter_inc(struct rconn_packet_counter *c) +rconn_packet_counter_inc(struct rconn_packet_counter *c, unsigned int n_bytes) { - c->n++; + c->n_packets++; + c->n_bytes += n_bytes; } void -rconn_packet_counter_dec(struct rconn_packet_counter *c) +rconn_packet_counter_dec(struct rconn_packet_counter *c, unsigned int n_bytes) { - assert(c->n > 0); - if (!--c->n && !c->ref_cnt) { - free(c); + ovs_assert(c->n_packets > 0); + ovs_assert(c->n_bytes >= n_bytes); + + c->n_bytes -= n_bytes; + c->n_packets--; + if (!c->n_packets) { + ovs_assert(!c->n_bytes); + if (!c->ref_cnt) { + free(c); + } } } @@ -915,6 +916,7 @@ static int try_send(struct rconn *rc) { struct ofpbuf *msg = ofpbuf_from_list(rc->txq.next); + unsigned int n_bytes = msg->size; struct rconn_packet_counter *counter = msg->private_p; int retval; @@ -935,7 +937,7 @@ try_send(struct rconn *rc) COVERAGE_INC(rconn_sent); rc->packets_sent++; if (counter) { - rconn_packet_counter_dec(counter); + rconn_packet_counter_dec(counter, n_bytes); } return 0; } @@ -1015,7 +1017,7 @@ flush_queue(struct rconn *rc) struct ofpbuf *b = ofpbuf_from_list(list_pop_front(&rc->txq)); struct rconn_packet_counter *counter = b->private_p; if (counter) { - rconn_packet_counter_dec(counter); + rconn_packet_counter_dec(counter, b->size); } COVERAGE_INC(rconn_discarded); ofpbuf_delete(b); @@ -1099,19 +1101,84 @@ is_connected_state(enum state state) static bool is_admitted_msg(const struct ofpbuf *b) { - struct ofp_header *oh = b->data; - uint8_t type = oh->type; - return !(type < 32 - && (1u << type) & ((1u << OFPT_HELLO) | - (1u << OFPT_ERROR) | - (1u << OFPT_ECHO_REQUEST) | - (1u << OFPT_ECHO_REPLY) | - (1u << OFPT_VENDOR) | - (1u << OFPT_FEATURES_REQUEST) | - (1u << OFPT_FEATURES_REPLY) | - (1u << OFPT_GET_CONFIG_REQUEST) | - (1u << OFPT_GET_CONFIG_REPLY) | - (1u << OFPT_SET_CONFIG))); + enum ofptype type; + enum ofperr error; + + error = ofptype_decode(&type, b->data); + if (error) { + return false; + } + + switch (type) { + case OFPTYPE_HELLO: + case OFPTYPE_ERROR: + case OFPTYPE_ECHO_REQUEST: + case OFPTYPE_ECHO_REPLY: + case OFPTYPE_FEATURES_REQUEST: + case OFPTYPE_FEATURES_REPLY: + case OFPTYPE_GET_CONFIG_REQUEST: + case OFPTYPE_GET_CONFIG_REPLY: + case OFPTYPE_SET_CONFIG: + /* FIXME: Change the following once they are implemented: */ + case OFPTYPE_QUEUE_GET_CONFIG_REQUEST: + case OFPTYPE_QUEUE_GET_CONFIG_REPLY: + case OFPTYPE_GET_ASYNC_REQUEST: + case OFPTYPE_GET_ASYNC_REPLY: + case OFPTYPE_METER_MOD: + case OFPTYPE_GROUP_REQUEST: + case OFPTYPE_GROUP_REPLY: + case OFPTYPE_GROUP_DESC_REQUEST: + case OFPTYPE_GROUP_DESC_REPLY: + case OFPTYPE_GROUP_FEATURES_REQUEST: + case OFPTYPE_GROUP_FEATURES_REPLY: + case OFPTYPE_METER_REQUEST: + case OFPTYPE_METER_REPLY: + case OFPTYPE_METER_CONFIG_REQUEST: + case OFPTYPE_METER_CONFIG_REPLY: + case OFPTYPE_METER_FEATURES_REQUEST: + case OFPTYPE_METER_FEATURES_REPLY: + case OFPTYPE_TABLE_FEATURES_REQUEST: + case OFPTYPE_TABLE_FEATURES_REPLY: + return false; + + case OFPTYPE_PACKET_IN: + case OFPTYPE_FLOW_REMOVED: + case OFPTYPE_PORT_STATUS: + case OFPTYPE_PACKET_OUT: + case OFPTYPE_FLOW_MOD: + case OFPTYPE_PORT_MOD: + case OFPTYPE_BARRIER_REQUEST: + case OFPTYPE_BARRIER_REPLY: + case OFPTYPE_DESC_STATS_REQUEST: + case OFPTYPE_DESC_STATS_REPLY: + case OFPTYPE_FLOW_STATS_REQUEST: + case OFPTYPE_FLOW_STATS_REPLY: + case OFPTYPE_AGGREGATE_STATS_REQUEST: + case OFPTYPE_AGGREGATE_STATS_REPLY: + case OFPTYPE_TABLE_STATS_REQUEST: + case OFPTYPE_TABLE_STATS_REPLY: + case OFPTYPE_PORT_STATS_REQUEST: + case OFPTYPE_PORT_STATS_REPLY: + case OFPTYPE_QUEUE_STATS_REQUEST: + case OFPTYPE_QUEUE_STATS_REPLY: + case OFPTYPE_PORT_DESC_STATS_REQUEST: + case OFPTYPE_PORT_DESC_STATS_REPLY: + case OFPTYPE_ROLE_REQUEST: + case OFPTYPE_ROLE_REPLY: + case OFPTYPE_SET_FLOW_FORMAT: + case OFPTYPE_FLOW_MOD_TABLE_ID: + case OFPTYPE_SET_PACKET_IN_FORMAT: + case OFPTYPE_FLOW_AGE: + case OFPTYPE_SET_ASYNC_CONFIG: + case OFPTYPE_SET_CONTROLLER_ID: + case OFPTYPE_FLOW_MONITOR_STATS_REQUEST: + case OFPTYPE_FLOW_MONITOR_STATS_REPLY: + case OFPTYPE_FLOW_MONITOR_CANCEL: + case OFPTYPE_FLOW_MONITOR_PAUSED: + case OFPTYPE_FLOW_MONITOR_RESUMED: + default: + return true; + } } /* Returns true if 'rc' is currently logging information about connection