2009-07-08 13:19:16 -07:00
|
|
|
|
/*
|
2014-02-27 11:06:30 -08:00
|
|
|
|
* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
2009-06-15 15:11:30 -07:00
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
|
* You may obtain a copy of the License at:
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
2009-06-15 15:11:30 -07:00
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
*
|
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
|
* limitations under the License.
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include "rconn.h"
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <limits.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include "coverage.h"
|
2012-07-19 23:23:17 -07:00
|
|
|
|
#include "ofp-msgs.h"
|
2010-05-27 13:14:05 -07:00
|
|
|
|
#include "ofp-util.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#include "ofpbuf.h"
|
|
|
|
|
#include "openflow/openflow.h"
|
|
|
|
|
#include "poll-loop.h"
|
|
|
|
|
#include "sat-math.h"
|
|
|
|
|
#include "timeval.h"
|
|
|
|
|
#include "util.h"
|
|
|
|
|
#include "vconn.h"
|
|
|
|
|
#include "vlog.h"
|
|
|
|
|
|
2010-10-19 14:47:01 -07:00
|
|
|
|
VLOG_DEFINE_THIS_MODULE(rconn);
|
2010-07-16 11:02:49 -07:00
|
|
|
|
|
coverage: Make the coverage counters catalog program-specific.
Until now, the collection of coverage counters supported by a given OVS
program was not specific to that program. That means that, for example,
even though ovs-dpctl does not have anything to do with mac_learning, it
still has a coverage counter for it. This is confusing, at best.
This commit fixes the problem on some systems, in particular on ones that
use GCC and the GNU linker. It uses the feature of the GNU linker
described in its manual as:
If an orphaned section's name is representable as a C identifier then
the linker will automatically see PROVIDE two symbols: __start_SECNAME
and __end_SECNAME, where SECNAME is the name of the section. These
indicate the start address and end address of the orphaned section
respectively.
Systems that don't support these features retain the earlier behavior.
This commit also fixes the annoyance that files that include coverage
counters must be listed on COVERAGE_FILES in lib/automake.mk.
This commit also fixes the annoyance that modifying any source file that
includes a coverage counter caused all programs that link against
libopenvswitch.a to relink, even programs that the source file was not
linked into. For example, modifying ofproto/ofproto.c (which includes
coverage counters) caused tests/test-aes128 to relink, even though
test-aes128 does not link again ofproto.o.
2010-11-01 14:14:27 -07:00
|
|
|
|
COVERAGE_DEFINE(rconn_discarded);
|
|
|
|
|
COVERAGE_DEFINE(rconn_overflow);
|
|
|
|
|
COVERAGE_DEFINE(rconn_queued);
|
|
|
|
|
COVERAGE_DEFINE(rconn_sent);
|
|
|
|
|
|
rconn: Preserve the name of an unreliable connection beyond disconnection.
An rconn has a human-readable name that typically designates both endpoints
of the connection. For a "reliable" rconn, that automatically reconnects,
the name remains constant regardless of whether the rconn is currently
connected. Until now, though, an "unreliable" rconn, that cannot
automatically reconnect, kept its name only until disconnection occurred.
This is OK for the uses currently in the OVS tree, which only use the name
of a rconn while it is connected, but an upcoming commit will add a final
log message following disconnection in some cases, and it makes the log
messages less useful if unreliable rconns just report "void" in that case.
This commit, therefore, modifies the rconn code so that unreliable rconns
preserve their names past disconnection, just like reliable ones.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-30 10:45:16 -07:00
|
|
|
|
/* The connection states have the following meanings:
|
|
|
|
|
*
|
|
|
|
|
* - S_VOID: No connection information is configured.
|
|
|
|
|
*
|
|
|
|
|
* - S_BACKOFF: Waiting for a period of time before reconnecting.
|
|
|
|
|
*
|
|
|
|
|
* - S_CONNECTING: A connection attempt is in progress and has not yet
|
|
|
|
|
* succeeded or failed.
|
|
|
|
|
*
|
|
|
|
|
* - S_ACTIVE: A connection has been established and appears to be healthy.
|
|
|
|
|
*
|
|
|
|
|
* - S_IDLE: A connection has been established but has been idle for some
|
|
|
|
|
* time. An echo request has been sent, but no reply has yet been
|
|
|
|
|
* received.
|
|
|
|
|
*
|
|
|
|
|
* - S_DISCONNECTED: An unreliable connection has disconnected and cannot be
|
|
|
|
|
* automatically retried.
|
|
|
|
|
*/
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#define STATES \
|
|
|
|
|
STATE(VOID, 1 << 0) \
|
|
|
|
|
STATE(BACKOFF, 1 << 1) \
|
|
|
|
|
STATE(CONNECTING, 1 << 2) \
|
|
|
|
|
STATE(ACTIVE, 1 << 3) \
|
rconn: Preserve the name of an unreliable connection beyond disconnection.
An rconn has a human-readable name that typically designates both endpoints
of the connection. For a "reliable" rconn, that automatically reconnects,
the name remains constant regardless of whether the rconn is currently
connected. Until now, though, an "unreliable" rconn, that cannot
automatically reconnect, kept its name only until disconnection occurred.
This is OK for the uses currently in the OVS tree, which only use the name
of a rconn while it is connected, but an upcoming commit will add a final
log message following disconnection in some cases, and it makes the log
messages less useful if unreliable rconns just report "void" in that case.
This commit, therefore, modifies the rconn code so that unreliable rconns
preserve their names past disconnection, just like reliable ones.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-30 10:45:16 -07:00
|
|
|
|
STATE(IDLE, 1 << 4) \
|
|
|
|
|
STATE(DISCONNECTED, 1 << 5)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
enum state {
|
|
|
|
|
#define STATE(NAME, VALUE) S_##NAME = VALUE,
|
|
|
|
|
STATES
|
|
|
|
|
#undef STATE
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
|
state_name(enum state state)
|
|
|
|
|
{
|
|
|
|
|
switch (state) {
|
|
|
|
|
#define STATE(NAME, VALUE) case S_##NAME: return #NAME;
|
|
|
|
|
STATES
|
|
|
|
|
#undef STATE
|
|
|
|
|
}
|
|
|
|
|
return "***ERROR***";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A reliable connection to an OpenFlow switch or controller.
|
|
|
|
|
*
|
|
|
|
|
* See the large comment in rconn.h for more information. */
|
|
|
|
|
struct rconn {
|
2013-10-11 10:08:32 -07:00
|
|
|
|
struct ovs_mutex mutex;
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
enum state state;
|
|
|
|
|
time_t state_entered;
|
|
|
|
|
|
|
|
|
|
struct vconn *vconn;
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
char *name; /* Human-readable descriptive name. */
|
|
|
|
|
char *target; /* vconn name, passed to vconn_open(). */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
bool reliable;
|
|
|
|
|
|
2014-12-15 14:10:38 +01:00
|
|
|
|
struct ovs_list txq; /* Contains "struct ofpbuf"s. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
int backoff;
|
|
|
|
|
int max_backoff;
|
|
|
|
|
time_t backoff_deadline;
|
|
|
|
|
time_t last_connected;
|
2011-03-14 13:19:20 -07:00
|
|
|
|
time_t last_disconnected;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
unsigned int packets_sent;
|
|
|
|
|
unsigned int seqno;
|
2010-02-11 14:39:25 -08:00
|
|
|
|
int last_error;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
/* In S_ACTIVE and S_IDLE, probably_admitted reports whether we believe
|
|
|
|
|
* that the peer has made a (positive) admission control decision on our
|
|
|
|
|
* connection. If we have not yet been (probably) admitted, then the
|
|
|
|
|
* connection does not reset the timer used for deciding whether the switch
|
|
|
|
|
* should go into fail-open mode.
|
|
|
|
|
*
|
|
|
|
|
* last_admitted reports the last time we believe such a positive admission
|
|
|
|
|
* control decision was made. */
|
|
|
|
|
bool probably_admitted;
|
|
|
|
|
time_t last_admitted;
|
|
|
|
|
|
|
|
|
|
/* These values are simply for statistics reporting, not used directly by
|
2009-07-08 10:30:42 -07:00
|
|
|
|
* anything internal to the rconn (or ofproto for that matter). */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
unsigned int packets_received;
|
|
|
|
|
unsigned int n_attempted_connections, n_successful_connections;
|
|
|
|
|
time_t creation_time;
|
|
|
|
|
unsigned long int total_time_connected;
|
|
|
|
|
|
2012-08-06 15:03:32 -07:00
|
|
|
|
/* 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'. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
int probe_interval; /* Secs of inactivity before sending probe. */
|
2012-08-06 15:03:32 -07:00
|
|
|
|
time_t last_activity; /* Last time we saw some activity. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2012-03-10 15:58:10 -08:00
|
|
|
|
uint8_t dscp;
|
2009-09-02 12:52:50 -07:00
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
/* Messages sent or received are copied to the monitor connections. */
|
2014-09-09 13:19:22 -07:00
|
|
|
|
#define MAXIMUM_MONITORS 8
|
|
|
|
|
struct vconn *monitors[MAXIMUM_MONITORS];
|
2009-07-08 13:19:16 -07:00
|
|
|
|
size_t n_monitors;
|
2012-11-07 17:03:00 +09:00
|
|
|
|
|
|
|
|
|
uint32_t allowed_versions;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
};
|
|
|
|
|
|
2012-11-07 17:03:01 +09:00
|
|
|
|
uint32_t rconn_get_allowed_versions(const struct rconn *rconn)
|
|
|
|
|
{
|
|
|
|
|
return rconn->allowed_versions;
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
static unsigned int elapsed_in_this_state(const struct rconn *rc)
|
|
|
|
|
OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static unsigned int timeout(const struct rconn *rc) OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static bool timed_out(const struct rconn *rc) OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static void state_transition(struct rconn *rc, enum state)
|
|
|
|
|
OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static void rconn_set_target__(struct rconn *rc,
|
|
|
|
|
const char *target, const char *name)
|
|
|
|
|
OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static int rconn_send__(struct rconn *rc, struct ofpbuf *,
|
|
|
|
|
struct rconn_packet_counter *)
|
|
|
|
|
OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static int try_send(struct rconn *rc) OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static void reconnect(struct rconn *rc) OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static void report_error(struct rconn *rc, int error) OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static void rconn_disconnect__(struct rconn *rc) OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static void disconnect(struct rconn *rc, int error) OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static void flush_queue(struct rconn *rc) OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static void close_monitor(struct rconn *rc, size_t idx, int retval)
|
|
|
|
|
OVS_REQUIRES(rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
static void copy_to_monitor(struct rconn *, const struct ofpbuf *);
|
|
|
|
|
static bool is_connected_state(enum state);
|
|
|
|
|
static bool is_admitted_msg(const struct ofpbuf *);
|
2013-10-11 10:08:32 -07:00
|
|
|
|
static bool rconn_logging_connection_attempts__(const struct rconn *rc)
|
|
|
|
|
OVS_REQUIRES(rc->mutex);
|
|
|
|
|
static int rconn_get_version__(const struct rconn *rconn)
|
|
|
|
|
OVS_REQUIRES(rconn->mutex);
|
|
|
|
|
|
|
|
|
|
/* The following prototypes duplicate those in rconn.h, but there we weren't
|
|
|
|
|
* able to add the OVS_EXCLUDED annotations because the definition of struct
|
|
|
|
|
* rconn was not visible. */
|
|
|
|
|
|
|
|
|
|
void rconn_set_max_backoff(struct rconn *rc, int max_backoff)
|
|
|
|
|
OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
void rconn_connect(struct rconn *rc, const char *target, const char *name)
|
|
|
|
|
OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
void rconn_connect_unreliably(struct rconn *rc,
|
|
|
|
|
struct vconn *vconn, const char *name)
|
|
|
|
|
OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
void rconn_reconnect(struct rconn *rc) OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
void rconn_disconnect(struct rconn *rc) OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
void rconn_run(struct rconn *rc) OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
void rconn_run_wait(struct rconn *rc) OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
struct ofpbuf *rconn_recv(struct rconn *rc) OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
void rconn_recv_wait(struct rconn *rc) OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
int rconn_send(struct rconn *rc, struct ofpbuf *b,
|
|
|
|
|
struct rconn_packet_counter *counter)
|
|
|
|
|
OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
int rconn_send_with_limit(struct rconn *rc, struct ofpbuf *b,
|
|
|
|
|
struct rconn_packet_counter *counter,
|
|
|
|
|
int queue_limit)
|
|
|
|
|
OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
void rconn_add_monitor(struct rconn *rc, struct vconn *vconn)
|
|
|
|
|
OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
void rconn_set_name(struct rconn *rc, const char *new_name)
|
|
|
|
|
OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
bool rconn_is_admitted(const struct rconn *rconn) OVS_EXCLUDED(rconn->mutex);
|
|
|
|
|
int rconn_failure_duration(const struct rconn *rconn)
|
|
|
|
|
OVS_EXCLUDED(rconn->mutex);
|
|
|
|
|
ovs_be16 rconn_get_local_port(const struct rconn *rconn)
|
|
|
|
|
OVS_EXCLUDED(rconn->mutex);
|
|
|
|
|
int rconn_get_version(const struct rconn *rconn) OVS_EXCLUDED(rconn->mutex);
|
|
|
|
|
unsigned int rconn_count_txqlen(const struct rconn *rc)
|
|
|
|
|
OVS_EXCLUDED(rc->mutex);
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
/* Creates and returns a new rconn.
|
|
|
|
|
*
|
|
|
|
|
* 'probe_interval' is a number of seconds. If the interval passes once
|
|
|
|
|
* without an OpenFlow message being received from the peer, the rconn sends
|
|
|
|
|
* out an "echo request" message. If the interval passes again without a
|
|
|
|
|
* message being received, the rconn disconnects and re-connects to the peer.
|
|
|
|
|
* Setting 'probe_interval' to 0 disables this behavior.
|
|
|
|
|
*
|
|
|
|
|
* 'max_backoff' is the maximum number of seconds between attempts to connect
|
|
|
|
|
* to the peer. The actual interval starts at 1 second and doubles on each
|
|
|
|
|
* failure until it reaches 'max_backoff'. If 0 is specified, the default of
|
2010-06-03 14:41:35 -07:00
|
|
|
|
* 8 seconds is used.
|
|
|
|
|
*
|
|
|
|
|
* The new rconn is initially unconnected. Use rconn_connect() or
|
2012-11-07 17:03:00 +09:00
|
|
|
|
* 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
|
2012-12-04 18:23:00 -08:00
|
|
|
|
* 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.)
|
|
|
|
|
*/
|
2009-07-08 13:19:16 -07:00
|
|
|
|
struct rconn *
|
2012-11-07 17:03:00 +09:00
|
|
|
|
rconn_create(int probe_interval, int max_backoff, uint8_t dscp,
|
|
|
|
|
uint32_t allowed_versions)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2009-09-28 13:56:42 -07:00
|
|
|
|
struct rconn *rc = xzalloc(sizeof *rc);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_init(&rc->mutex);
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->state = S_VOID;
|
|
|
|
|
rc->state_entered = time_now();
|
|
|
|
|
|
|
|
|
|
rc->vconn = NULL;
|
|
|
|
|
rc->name = xstrdup("void");
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
rc->target = xstrdup("void");
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->reliable = false;
|
|
|
|
|
|
2010-12-06 10:03:31 -08:00
|
|
|
|
list_init(&rc->txq);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
rc->backoff = 0;
|
2009-07-28 10:21:03 -07:00
|
|
|
|
rc->max_backoff = max_backoff ? max_backoff : 8;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->backoff_deadline = TIME_MIN;
|
2011-03-14 13:19:20 -07:00
|
|
|
|
rc->last_connected = TIME_MIN;
|
|
|
|
|
rc->last_disconnected = TIME_MIN;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->seqno = 0;
|
|
|
|
|
|
|
|
|
|
rc->packets_sent = 0;
|
|
|
|
|
|
|
|
|
|
rc->probably_admitted = false;
|
|
|
|
|
rc->last_admitted = time_now();
|
|
|
|
|
|
|
|
|
|
rc->packets_received = 0;
|
|
|
|
|
rc->n_attempted_connections = 0;
|
|
|
|
|
rc->n_successful_connections = 0;
|
|
|
|
|
rc->creation_time = time_now();
|
|
|
|
|
rc->total_time_connected = 0;
|
|
|
|
|
|
2012-08-06 15:03:32 -07:00
|
|
|
|
rc->last_activity = time_now();
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rconn_set_probe_interval(rc, probe_interval);
|
2012-03-10 15:58:10 -08:00
|
|
|
|
rconn_set_dscp(rc, dscp);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
rc->n_monitors = 0;
|
2012-12-04 18:23:00 -08:00
|
|
|
|
rc->allowed_versions = allowed_versions;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
rconn_set_max_backoff(struct rconn *rc, int max_backoff)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->max_backoff = MAX(1, max_backoff);
|
|
|
|
|
if (rc->state == S_BACKOFF && rc->backoff > max_backoff) {
|
|
|
|
|
rc->backoff = max_backoff;
|
|
|
|
|
if (rc->backoff_deadline > time_now() + max_backoff) {
|
|
|
|
|
rc->backoff_deadline = time_now() + max_backoff;
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
rconn_get_max_backoff(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->max_backoff;
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-10 15:58:10 -08:00
|
|
|
|
void
|
|
|
|
|
rconn_set_dscp(struct rconn *rc, uint8_t dscp)
|
|
|
|
|
{
|
|
|
|
|
rc->dscp = dscp;
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-21 12:22:42 -07:00
|
|
|
|
uint8_t
|
|
|
|
|
rconn_get_dscp(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->dscp;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
void
|
|
|
|
|
rconn_set_probe_interval(struct rconn *rc, int probe_interval)
|
|
|
|
|
{
|
|
|
|
|
rc->probe_interval = probe_interval ? MAX(5, probe_interval) : 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
rconn_get_probe_interval(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->probe_interval;
|
|
|
|
|
}
|
|
|
|
|
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
/* Drops any existing connection on 'rc', then sets up 'rc' to connect to
|
|
|
|
|
* 'target' and reconnect as needed. 'target' should be a remote OpenFlow
|
|
|
|
|
* target in a form acceptable to vconn_open().
|
|
|
|
|
*
|
|
|
|
|
* If 'name' is nonnull, then it is used in log messages in place of 'target'.
|
|
|
|
|
* It should presumably give more information to a human reader than 'target',
|
|
|
|
|
* but it need not be acceptable to vconn_open(). */
|
2010-06-03 17:15:53 -07:00
|
|
|
|
void
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
rconn_connect(struct rconn *rc, const char *target, const char *name)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
|
|
|
|
rconn_disconnect__(rc);
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
rconn_set_target__(rc, target, name);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->reliable = true;
|
2010-06-03 17:15:53 -07:00
|
|
|
|
reconnect(rc);
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
/* Drops any existing connection on 'rc', then configures 'rc' to use
|
|
|
|
|
* 'vconn'. If the connection on 'vconn' drops, 'rc' will not reconnect on it
|
|
|
|
|
* own.
|
|
|
|
|
*
|
|
|
|
|
* By default, the target obtained from vconn_get_name(vconn) is used in log
|
|
|
|
|
* messages. If 'name' is nonnull, then it is used instead. It should
|
|
|
|
|
* presumably give more information to a human reader than the target, but it
|
|
|
|
|
* need not be acceptable to vconn_open(). */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
void
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
rconn_connect_unreliably(struct rconn *rc,
|
|
|
|
|
struct vconn *vconn, const char *name)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2012-11-06 13:14:55 -08:00
|
|
|
|
ovs_assert(vconn != NULL);
|
2013-10-11 10:08:32 -07:00
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
|
|
|
|
rconn_disconnect__(rc);
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
rconn_set_target__(rc, vconn_get_name(vconn), name);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->reliable = false;
|
|
|
|
|
rc->vconn = vconn;
|
|
|
|
|
rc->last_connected = time_now();
|
|
|
|
|
state_transition(rc, S_ACTIVE);
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If 'rc' is connected, forces it to drop the connection and reconnect. */
|
|
|
|
|
void
|
|
|
|
|
rconn_reconnect(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (rc->state & (S_ACTIVE | S_IDLE)) {
|
2010-02-11 14:32:49 -08:00
|
|
|
|
VLOG_INFO("%s: disconnecting", rc->name);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
disconnect(rc, 0);
|
|
|
|
|
}
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
static void
|
|
|
|
|
rconn_disconnect__(struct rconn *rc)
|
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
if (rc->state != S_VOID) {
|
|
|
|
|
if (rc->vconn) {
|
|
|
|
|
vconn_close(rc->vconn);
|
|
|
|
|
rc->vconn = NULL;
|
|
|
|
|
}
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
rconn_set_target__(rc, "void", NULL);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->reliable = false;
|
|
|
|
|
|
|
|
|
|
rc->backoff = 0;
|
|
|
|
|
rc->backoff_deadline = TIME_MIN;
|
|
|
|
|
|
|
|
|
|
state_transition(rc, S_VOID);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
void
|
|
|
|
|
rconn_disconnect(struct rconn *rc)
|
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
|
|
|
|
{
|
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
|
|
|
|
rconn_disconnect__(rc);
|
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
/* Disconnects 'rc' and frees the underlying storage. */
|
|
|
|
|
void
|
|
|
|
|
rconn_destroy(struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
if (rc) {
|
|
|
|
|
size_t i;
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
free(rc->name);
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
free(rc->target);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
vconn_close(rc->vconn);
|
|
|
|
|
flush_queue(rc);
|
2010-12-06 10:03:31 -08:00
|
|
|
|
ofpbuf_list_delete(&rc->txq);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
for (i = 0; i < rc->n_monitors; i++) {
|
|
|
|
|
vconn_close(rc->monitors[i]);
|
|
|
|
|
}
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
|
|
|
|
ovs_mutex_destroy(&rc->mutex);
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
free(rc);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
2010-02-11 10:59:47 -08:00
|
|
|
|
timeout_VOID(const struct rconn *rc OVS_UNUSED)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
return UINT_MAX;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2010-02-11 10:59:47 -08:00
|
|
|
|
run_VOID(struct rconn *rc OVS_UNUSED)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
/* Nothing to do. */
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-03 17:15:53 -07:00
|
|
|
|
static void
|
2009-07-08 13:19:16 -07:00
|
|
|
|
reconnect(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
int retval;
|
|
|
|
|
|
2010-06-24 12:44:47 -07:00
|
|
|
|
if (rconn_logging_connection_attempts__(rc)) {
|
|
|
|
|
VLOG_INFO("%s: connecting...", rc->name);
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->n_attempted_connections++;
|
2013-01-02 17:10:43 -08:00
|
|
|
|
retval = vconn_open(rc->target, rc->allowed_versions, rc->dscp,
|
|
|
|
|
&rc->vconn);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (!retval) {
|
|
|
|
|
rc->backoff_deadline = time_now() + rc->backoff;
|
|
|
|
|
state_transition(rc, S_CONNECTING);
|
|
|
|
|
} else {
|
2013-06-24 10:54:49 -07:00
|
|
|
|
VLOG_WARN("%s: connection failed (%s)",
|
|
|
|
|
rc->name, ovs_strerror(retval));
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->backoff_deadline = TIME_MAX; /* Prevent resetting backoff. */
|
2010-02-11 14:39:25 -08:00
|
|
|
|
disconnect(rc, retval);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
|
|
|
|
timeout_BACKOFF(const struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
return rc->backoff;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
run_BACKOFF(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
if (timed_out(rc)) {
|
|
|
|
|
reconnect(rc);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
|
|
|
|
timeout_CONNECTING(const struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
return MAX(1, rc->backoff);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
run_CONNECTING(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
int retval = vconn_connect(rc->vconn);
|
|
|
|
|
if (!retval) {
|
|
|
|
|
VLOG_INFO("%s: connected", rc->name);
|
|
|
|
|
rc->n_successful_connections++;
|
|
|
|
|
state_transition(rc, S_ACTIVE);
|
|
|
|
|
rc->last_connected = rc->state_entered;
|
|
|
|
|
} else if (retval != EAGAIN) {
|
2010-06-24 12:44:47 -07:00
|
|
|
|
if (rconn_logging_connection_attempts__(rc)) {
|
|
|
|
|
VLOG_INFO("%s: connection failed (%s)",
|
2013-06-24 10:54:49 -07:00
|
|
|
|
rc->name, ovs_strerror(retval));
|
2010-06-24 12:44:47 -07:00
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
disconnect(rc, retval);
|
|
|
|
|
} else if (timed_out(rc)) {
|
2010-06-24 12:44:47 -07:00
|
|
|
|
if (rconn_logging_connection_attempts__(rc)) {
|
|
|
|
|
VLOG_INFO("%s: connection timed out", rc->name);
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->backoff_deadline = TIME_MAX; /* Prevent resetting backoff. */
|
2010-02-11 14:39:25 -08:00
|
|
|
|
disconnect(rc, ETIMEDOUT);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_tx_work(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2010-12-06 10:03:31 -08:00
|
|
|
|
if (list_is_empty(&rc->txq)) {
|
2009-07-08 13:19:16 -07:00
|
|
|
|
return;
|
|
|
|
|
}
|
2010-12-06 10:03:31 -08:00
|
|
|
|
while (!list_is_empty(&rc->txq)) {
|
2009-07-08 13:19:16 -07:00
|
|
|
|
int error = try_send(rc);
|
|
|
|
|
if (error) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2012-08-06 15:03:32 -07:00
|
|
|
|
rc->last_activity = time_now();
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2010-12-06 10:03:31 -08:00
|
|
|
|
if (list_is_empty(&rc->txq)) {
|
2009-07-08 13:19:16 -07:00
|
|
|
|
poll_immediate_wake();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
|
|
|
|
timeout_ACTIVE(const struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
if (rc->probe_interval) {
|
2012-08-06 15:03:32 -07:00
|
|
|
|
unsigned int base = MAX(rc->last_activity, rc->state_entered);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
unsigned int arg = base + rc->probe_interval - rc->state_entered;
|
|
|
|
|
return arg;
|
|
|
|
|
}
|
|
|
|
|
return UINT_MAX;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
run_ACTIVE(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
if (timed_out(rc)) {
|
2012-08-06 15:03:32 -07:00
|
|
|
|
unsigned int base = MAX(rc->last_activity, rc->state_entered);
|
2012-08-01 16:01:50 +09:00
|
|
|
|
int version;
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
VLOG_DBG("%s: idle %u seconds, sending inactivity probe",
|
|
|
|
|
rc->name, (unsigned int) (time_now() - base));
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
version = rconn_get_version__(rc);
|
2012-11-06 13:14:55 -08:00
|
|
|
|
ovs_assert(version >= 0 && version <= 0xff);
|
2012-08-01 16:01:50 +09:00
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
/* 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);
|
2013-10-11 10:08:32 -07:00
|
|
|
|
rconn_send__(rc, make_echo_request(version), NULL);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do_tx_work(rc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
|
|
|
|
timeout_IDLE(const struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
return rc->probe_interval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
run_IDLE(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
if (timed_out(rc)) {
|
|
|
|
|
VLOG_ERR("%s: no response to inactivity probe after %u "
|
|
|
|
|
"seconds, disconnecting",
|
|
|
|
|
rc->name, elapsed_in_this_state(rc));
|
2010-02-11 14:39:25 -08:00
|
|
|
|
disconnect(rc, ETIMEDOUT);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
} else {
|
|
|
|
|
do_tx_work(rc);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
rconn: Preserve the name of an unreliable connection beyond disconnection.
An rconn has a human-readable name that typically designates both endpoints
of the connection. For a "reliable" rconn, that automatically reconnects,
the name remains constant regardless of whether the rconn is currently
connected. Until now, though, an "unreliable" rconn, that cannot
automatically reconnect, kept its name only until disconnection occurred.
This is OK for the uses currently in the OVS tree, which only use the name
of a rconn while it is connected, but an upcoming commit will add a final
log message following disconnection in some cases, and it makes the log
messages less useful if unreliable rconns just report "void" in that case.
This commit, therefore, modifies the rconn code so that unreliable rconns
preserve their names past disconnection, just like reliable ones.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-30 10:45:16 -07:00
|
|
|
|
static unsigned int
|
|
|
|
|
timeout_DISCONNECTED(const struct rconn *rc OVS_UNUSED)
|
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
|
|
|
|
{
|
|
|
|
|
return UINT_MAX;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
run_DISCONNECTED(struct rconn *rc OVS_UNUSED)
|
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
|
|
|
|
{
|
|
|
|
|
/* Nothing to do. */
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
/* Performs whatever activities are necessary to maintain 'rc': if 'rc' is
|
|
|
|
|
* disconnected, attempts to (re)connect, backing off as necessary; if 'rc' is
|
|
|
|
|
* connected, attempts to send packets in the send queue, if any. */
|
|
|
|
|
void
|
|
|
|
|
rconn_run(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
int old_state;
|
2010-01-06 14:27:46 -08:00
|
|
|
|
size_t i;
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
2010-01-06 14:27:46 -08:00
|
|
|
|
if (rc->vconn) {
|
2014-02-27 11:06:30 -08:00
|
|
|
|
int error;
|
|
|
|
|
|
2010-01-06 14:27:46 -08:00
|
|
|
|
vconn_run(rc->vconn);
|
2014-02-27 11:06:30 -08:00
|
|
|
|
|
|
|
|
|
error = vconn_get_status(rc->vconn);
|
|
|
|
|
if (error) {
|
|
|
|
|
report_error(rc, error);
|
|
|
|
|
disconnect(rc, error);
|
|
|
|
|
}
|
2010-01-06 14:27:46 -08:00
|
|
|
|
}
|
2012-10-24 09:47:44 -07:00
|
|
|
|
for (i = 0; i < rc->n_monitors; ) {
|
|
|
|
|
struct ofpbuf *msg;
|
|
|
|
|
int retval;
|
|
|
|
|
|
2010-01-06 14:27:46 -08:00
|
|
|
|
vconn_run(rc->monitors[i]);
|
2012-10-24 09:47:44 -07:00
|
|
|
|
|
|
|
|
|
/* Drain any stray message that came in on the monitor connection. */
|
|
|
|
|
retval = vconn_recv(rc->monitors[i], &msg);
|
|
|
|
|
if (!retval) {
|
|
|
|
|
ofpbuf_delete(msg);
|
|
|
|
|
} else if (retval != EAGAIN) {
|
|
|
|
|
close_monitor(rc, i, retval);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
i++;
|
2010-01-06 14:27:46 -08:00
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
do {
|
|
|
|
|
old_state = rc->state;
|
|
|
|
|
switch (rc->state) {
|
|
|
|
|
#define STATE(NAME, VALUE) case S_##NAME: run_##NAME(rc); break;
|
|
|
|
|
STATES
|
|
|
|
|
#undef STATE
|
|
|
|
|
default:
|
2013-12-17 10:32:12 -08:00
|
|
|
|
OVS_NOT_REACHED();
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
} while (rc->state != old_state);
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Causes the next call to poll_block() to wake up when rconn_run() should be
|
|
|
|
|
* called on 'rc'. */
|
|
|
|
|
void
|
|
|
|
|
rconn_run_wait(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2010-01-06 14:27:46 -08:00
|
|
|
|
unsigned int timeo;
|
|
|
|
|
size_t i;
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
2010-01-06 14:27:46 -08:00
|
|
|
|
if (rc->vconn) {
|
|
|
|
|
vconn_run_wait(rc->vconn);
|
2011-02-23 12:35:32 -08:00
|
|
|
|
if ((rc->state & (S_ACTIVE | S_IDLE)) && !list_is_empty(&rc->txq)) {
|
|
|
|
|
vconn_wait(rc->vconn, WAIT_SEND);
|
|
|
|
|
}
|
2010-01-06 14:27:46 -08:00
|
|
|
|
}
|
|
|
|
|
for (i = 0; i < rc->n_monitors; i++) {
|
|
|
|
|
vconn_run_wait(rc->monitors[i]);
|
2012-10-24 09:47:44 -07:00
|
|
|
|
vconn_recv_wait(rc->monitors[i]);
|
2010-01-06 14:27:46 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
timeo = timeout(rc);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (timeo != UINT_MAX) {
|
2010-05-12 12:53:07 -07:00
|
|
|
|
long long int expires = sat_add(rc->state_entered, timeo);
|
|
|
|
|
poll_timer_wait_until(expires * 1000);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Attempts to receive a packet from 'rc'. If successful, returns the packet;
|
|
|
|
|
* otherwise, returns a null pointer. The caller is responsible for freeing
|
|
|
|
|
* the packet (with ofpbuf_delete()). */
|
|
|
|
|
struct ofpbuf *
|
|
|
|
|
rconn_recv(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
struct ofpbuf *buffer = NULL;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (rc->state & (S_ACTIVE | S_IDLE)) {
|
|
|
|
|
int error = vconn_recv(rc->vconn, &buffer);
|
|
|
|
|
if (!error) {
|
|
|
|
|
copy_to_monitor(rc, buffer);
|
2009-09-16 15:12:19 -07:00
|
|
|
|
if (rc->probably_admitted || is_admitted_msg(buffer)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|| time_now() - rc->last_connected >= 30) {
|
|
|
|
|
rc->probably_admitted = true;
|
|
|
|
|
rc->last_admitted = time_now();
|
|
|
|
|
}
|
2012-08-06 15:03:32 -07:00
|
|
|
|
rc->last_activity = time_now();
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->packets_received++;
|
|
|
|
|
if (rc->state == S_IDLE) {
|
|
|
|
|
state_transition(rc, S_ACTIVE);
|
|
|
|
|
}
|
|
|
|
|
} else if (error != EAGAIN) {
|
2010-02-11 14:32:49 -08:00
|
|
|
|
report_error(rc, error);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
disconnect(rc, error);
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
|
|
|
|
|
|
|
|
|
return buffer;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Causes the next call to poll_block() to wake up when a packet may be ready
|
|
|
|
|
* to be received by vconn_recv() on 'rc'. */
|
|
|
|
|
void
|
|
|
|
|
rconn_recv_wait(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (rc->vconn) {
|
|
|
|
|
vconn_wait(rc->vconn, WAIT_RECV);
|
|
|
|
|
}
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
static int
|
|
|
|
|
rconn_send__(struct rconn *rc, struct ofpbuf *b,
|
2009-07-08 13:19:16 -07:00
|
|
|
|
struct rconn_packet_counter *counter)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
if (rconn_is_connected(rc)) {
|
|
|
|
|
COVERAGE_INC(rconn_queued);
|
|
|
|
|
copy_to_monitor(rc, b);
|
lib/ofpbuf: Compact
This patch shrinks the struct ofpbuf from 104 to 48 bytes on 64-bit
systems, or from 52 to 36 bytes on 32-bit systems (counting in the
'l7' removal from an earlier patch). This may help contribute to
cache efficiency, and will speed up initializing, copying and
manipulating ofpbufs. This is potentially important for the DPDK
datapath, but the rest of the code base may also see a little benefit.
Changes are:
- Remove 'l7' pointer (previous patch).
- Use offsets instead of layer pointers for l2_5, l3, and l4 using
'l2' as basis. Usually 'data' is the same as 'l2', but this is not
always the case (e.g., when parsing or constructing a packet), so it
can not be easily used as the offset basis. Also, packet parsing is
faster if we do not need to maintain the offsets each time we pull
data from the ofpbuf.
- Use uint32_t for 'allocated' and 'size', as 2^32 is enough even for
largest possible messages/packets.
- Use packed enum for 'source'.
- Rearrange to avoid unnecessary padding.
- Remove 'private_p', which was used only in two cases, both of which
had the invariant ('l2' == 'data'), so we can temporarily use 'l2'
as a private pointer.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2014-03-24 09:17:01 -07:00
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (counter) {
|
2014-03-30 01:31:50 -07:00
|
|
|
|
rconn_packet_counter_inc(counter, ofpbuf_size(b));
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
lib/ofpbuf: Compact
This patch shrinks the struct ofpbuf from 104 to 48 bytes on 64-bit
systems, or from 52 to 36 bytes on 32-bit systems (counting in the
'l7' removal from an earlier patch). This may help contribute to
cache efficiency, and will speed up initializing, copying and
manipulating ofpbufs. This is potentially important for the DPDK
datapath, but the rest of the code base may also see a little benefit.
Changes are:
- Remove 'l7' pointer (previous patch).
- Use offsets instead of layer pointers for l2_5, l3, and l4 using
'l2' as basis. Usually 'data' is the same as 'l2', but this is not
always the case (e.g., when parsing or constructing a packet), so it
can not be easily used as the offset basis. Also, packet parsing is
faster if we do not need to maintain the offsets each time we pull
data from the ofpbuf.
- Use uint32_t for 'allocated' and 'size', as 2^32 is enough even for
largest possible messages/packets.
- Use packed enum for 'source'.
- Rearrange to avoid unnecessary padding.
- Remove 'private_p', which was used only in two cases, both of which
had the invariant ('l2' == 'data'), so we can temporarily use 'l2'
as a private pointer.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2014-03-24 09:17:01 -07:00
|
|
|
|
|
2014-04-02 15:44:21 -07:00
|
|
|
|
/* Reuse 'frame' as a private pointer while 'b' is in txq. */
|
|
|
|
|
ofpbuf_set_frame(b, counter);
|
lib/ofpbuf: Compact
This patch shrinks the struct ofpbuf from 104 to 48 bytes on 64-bit
systems, or from 52 to 36 bytes on 32-bit systems (counting in the
'l7' removal from an earlier patch). This may help contribute to
cache efficiency, and will speed up initializing, copying and
manipulating ofpbufs. This is potentially important for the DPDK
datapath, but the rest of the code base may also see a little benefit.
Changes are:
- Remove 'l7' pointer (previous patch).
- Use offsets instead of layer pointers for l2_5, l3, and l4 using
'l2' as basis. Usually 'data' is the same as 'l2', but this is not
always the case (e.g., when parsing or constructing a packet), so it
can not be easily used as the offset basis. Also, packet parsing is
faster if we do not need to maintain the offsets each time we pull
data from the ofpbuf.
- Use uint32_t for 'allocated' and 'size', as 2^32 is enough even for
largest possible messages/packets.
- Use packed enum for 'source'.
- Rearrange to avoid unnecessary padding.
- Remove 'private_p', which was used only in two cases, both of which
had the invariant ('l2' == 'data'), so we can temporarily use 'l2'
as a private pointer.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2014-03-24 09:17:01 -07:00
|
|
|
|
|
2010-12-06 10:03:31 -08:00
|
|
|
|
list_push_back(&rc->txq, &b->list_node);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
/* If the queue was empty before we added 'b', try to send some
|
|
|
|
|
* packets. (But if the queue had packets in it, it's because the
|
|
|
|
|
* vconn is backlogged and there's no point in stuffing more into it
|
|
|
|
|
* now. We'll get back to that in rconn_run().) */
|
2010-12-06 10:03:31 -08:00
|
|
|
|
if (rc->txq.next == &b->list_node) {
|
2009-07-08 13:19:16 -07:00
|
|
|
|
try_send(rc);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
} else {
|
2012-04-25 21:12:18 -07:00
|
|
|
|
ofpbuf_delete(b);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
return ENOTCONN;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
/* 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
|
|
|
|
|
* due to disconnection). Because 'b' may be sent (or discarded) before this
|
|
|
|
|
* function returns, the caller may not be able to observe any change in
|
|
|
|
|
* 'counter'.
|
|
|
|
|
*
|
|
|
|
|
* There is no rconn_send_wait() function: an rconn has a send queue that it
|
|
|
|
|
* takes care of sending if you call rconn_run(), which will have the side
|
|
|
|
|
* effect of waking up poll_block(). */
|
|
|
|
|
int
|
|
|
|
|
rconn_send(struct rconn *rc, struct ofpbuf *b,
|
|
|
|
|
struct rconn_packet_counter *counter)
|
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
|
|
|
|
{
|
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
|
|
|
|
error = rconn_send__(rc, b, counter);
|
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
|
|
|
|
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
/* Sends 'b' on 'rc'. Increments 'counter' while the packet is in flight; it
|
|
|
|
|
* will be decremented when it has been sent (or discarded due to
|
|
|
|
|
* disconnection). Returns 0 if successful, EAGAIN if 'counter->n' is already
|
|
|
|
|
* at least as large as 'queue_limit', or ENOTCONN if 'rc' is not currently
|
|
|
|
|
* connected. Regardless of return value, 'b' is destroyed.
|
|
|
|
|
*
|
|
|
|
|
* Because 'b' may be sent (or discarded) before this function returns, the
|
|
|
|
|
* caller may not be able to observe any change in 'counter'.
|
|
|
|
|
*
|
|
|
|
|
* There is no rconn_send_wait() function: an rconn has a send queue that it
|
|
|
|
|
* takes care of sending if you call rconn_run(), which will have the side
|
|
|
|
|
* effect of waking up poll_block(). */
|
|
|
|
|
int
|
|
|
|
|
rconn_send_with_limit(struct rconn *rc, struct ofpbuf *b,
|
|
|
|
|
struct rconn_packet_counter *counter, int queue_limit)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
2013-09-13 15:07:35 -07:00
|
|
|
|
if (rconn_packet_counter_n_packets(counter) < queue_limit) {
|
2013-10-11 10:08:32 -07:00
|
|
|
|
error = rconn_send__(rc, b, counter);
|
2013-01-04 13:48:19 -08:00
|
|
|
|
} else {
|
2009-07-08 13:19:16 -07:00
|
|
|
|
COVERAGE_INC(rconn_overflow);
|
2013-01-04 13:48:19 -08:00
|
|
|
|
ofpbuf_delete(b);
|
2013-10-11 10:08:32 -07:00
|
|
|
|
error = EAGAIN;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
|
|
|
|
|
|
|
|
|
return error;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns the total number of packets successfully sent on the underlying
|
|
|
|
|
* vconn. A packet is not counted as sent while it is still queued in the
|
|
|
|
|
* rconn, only when it has been successfuly passed to the vconn. */
|
|
|
|
|
unsigned int
|
|
|
|
|
rconn_packets_sent(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->packets_sent;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Adds 'vconn' to 'rc' as a monitoring connection, to which all messages sent
|
|
|
|
|
* and received on 'rconn' will be copied. 'rc' takes ownership of 'vconn'. */
|
|
|
|
|
void
|
|
|
|
|
rconn_add_monitor(struct rconn *rc, struct vconn *vconn)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (rc->n_monitors < ARRAY_SIZE(rc->monitors)) {
|
|
|
|
|
VLOG_INFO("new monitor connection from %s", vconn_get_name(vconn));
|
|
|
|
|
rc->monitors[rc->n_monitors++] = vconn;
|
|
|
|
|
} else {
|
|
|
|
|
VLOG_DBG("too many monitor connections, discarding %s",
|
|
|
|
|
vconn_get_name(vconn));
|
|
|
|
|
vconn_close(vconn);
|
|
|
|
|
}
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
/* Returns 'rc''s name. This is a name for human consumption, appropriate for
|
|
|
|
|
* use in log messages. It is not necessarily a name that may be passed
|
|
|
|
|
* directly to, e.g., vconn_open(). */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
const char *
|
|
|
|
|
rconn_get_name(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->name;
|
|
|
|
|
}
|
|
|
|
|
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
/* Sets 'rc''s name to 'new_name'. */
|
|
|
|
|
void
|
|
|
|
|
rconn_set_name(struct rconn *rc, const char *new_name)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
free(rc->name);
|
|
|
|
|
rc->name = xstrdup(new_name);
|
2013-10-11 10:08:32 -07:00
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns 'rc''s target. This is intended to be a string that may be passed
|
|
|
|
|
* directly to, e.g., vconn_open(). */
|
|
|
|
|
const char *
|
|
|
|
|
rconn_get_target(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->target;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
/* Returns true if 'rconn' is connected or in the process of reconnecting,
|
|
|
|
|
* false if 'rconn' is disconnected and will not reconnect on its own. */
|
|
|
|
|
bool
|
|
|
|
|
rconn_is_alive(const struct rconn *rconn)
|
|
|
|
|
{
|
rconn: Preserve the name of an unreliable connection beyond disconnection.
An rconn has a human-readable name that typically designates both endpoints
of the connection. For a "reliable" rconn, that automatically reconnects,
the name remains constant regardless of whether the rconn is currently
connected. Until now, though, an "unreliable" rconn, that cannot
automatically reconnect, kept its name only until disconnection occurred.
This is OK for the uses currently in the OVS tree, which only use the name
of a rconn while it is connected, but an upcoming commit will add a final
log message following disconnection in some cases, and it makes the log
messages less useful if unreliable rconns just report "void" in that case.
This commit, therefore, modifies the rconn code so that unreliable rconns
preserve their names past disconnection, just like reliable ones.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-30 10:45:16 -07:00
|
|
|
|
return rconn->state != S_VOID && rconn->state != S_DISCONNECTED;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns true if 'rconn' is connected, false otherwise. */
|
|
|
|
|
bool
|
|
|
|
|
rconn_is_connected(const struct rconn *rconn)
|
|
|
|
|
{
|
|
|
|
|
return is_connected_state(rconn->state);
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
static bool
|
|
|
|
|
rconn_is_admitted__(const struct rconn *rconn)
|
|
|
|
|
OVS_REQUIRES(rconn->mutex)
|
|
|
|
|
{
|
|
|
|
|
return (rconn_is_connected(rconn)
|
|
|
|
|
&& rconn->last_admitted >= rconn->last_connected);
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-16 15:12:19 -07:00
|
|
|
|
/* Returns true if 'rconn' is connected and thought to have been accepted by
|
|
|
|
|
* the peer's admission-control policy. */
|
|
|
|
|
bool
|
|
|
|
|
rconn_is_admitted(const struct rconn *rconn)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rconn->mutex)
|
2009-09-16 15:12:19 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
bool admitted;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&rconn->mutex);
|
|
|
|
|
admitted = rconn_is_admitted__(rconn);
|
|
|
|
|
ovs_mutex_unlock(&rconn->mutex);
|
|
|
|
|
|
|
|
|
|
return admitted;
|
2009-09-16 15:12:19 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns 0 if 'rconn' is currently connected and considered to have been
|
|
|
|
|
* accepted by the peer's admission-control policy, otherwise the number of
|
|
|
|
|
* seconds since 'rconn' was last in such a state. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
int
|
|
|
|
|
rconn_failure_duration(const struct rconn *rconn)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rconn->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
int duration;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&rconn->mutex);
|
|
|
|
|
duration = (rconn_is_admitted__(rconn)
|
|
|
|
|
? 0
|
|
|
|
|
: time_now() - rconn->last_admitted);
|
|
|
|
|
ovs_mutex_unlock(&rconn->mutex);
|
|
|
|
|
|
|
|
|
|
return duration;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-10-11 10:08:32 -07:00
|
|
|
|
static int
|
|
|
|
|
rconn_get_version__(const struct rconn *rconn)
|
|
|
|
|
OVS_REQUIRES(rconn->mutex)
|
|
|
|
|
{
|
|
|
|
|
return rconn->vconn ? vconn_get_version(rconn->vconn) : -1;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2012-02-10 13:30:23 -08:00
|
|
|
|
/* Returns the OpenFlow version negotiated with the peer, or -1 if there is
|
|
|
|
|
* currently no connection or if version negotiation is not yet complete. */
|
|
|
|
|
int
|
|
|
|
|
rconn_get_version(const struct rconn *rconn)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rconn->mutex)
|
2012-02-10 13:30:23 -08:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
int version;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&rconn->mutex);
|
|
|
|
|
version = rconn_get_version__(rconn);
|
|
|
|
|
ovs_mutex_unlock(&rconn->mutex);
|
|
|
|
|
|
|
|
|
|
return version;
|
2012-02-10 13:30:23 -08:00
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
/* Returns the total number of packets successfully received by the underlying
|
|
|
|
|
* vconn. */
|
|
|
|
|
unsigned int
|
|
|
|
|
rconn_packets_received(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->packets_received;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns a string representing the internal state of 'rc'. The caller must
|
|
|
|
|
* not modify or free the string. */
|
|
|
|
|
const char *
|
|
|
|
|
rconn_get_state(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return state_name(rc->state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns the time at which the last successful connection was made by
|
2011-03-14 13:19:20 -07:00
|
|
|
|
* 'rc'. Returns TIME_MIN if never connected. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
time_t
|
|
|
|
|
rconn_get_last_connection(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->last_connected;
|
|
|
|
|
}
|
|
|
|
|
|
2011-03-14 13:19:20 -07:00
|
|
|
|
/* Returns the time at which 'rc' was last disconnected. Returns TIME_MIN
|
|
|
|
|
* if never disconnected. */
|
|
|
|
|
time_t
|
|
|
|
|
rconn_get_last_disconnect(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->last_disconnected;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
/* Returns 'rc''s current connection sequence number, a number that changes
|
|
|
|
|
* every time that 'rconn' connects or disconnects. */
|
|
|
|
|
unsigned int
|
|
|
|
|
rconn_get_connection_seqno(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->seqno;
|
|
|
|
|
}
|
2010-02-11 14:39:25 -08:00
|
|
|
|
|
|
|
|
|
/* Returns a value that explains why 'rc' last disconnected:
|
|
|
|
|
*
|
|
|
|
|
* - 0 means that the last disconnection was caused by a call to
|
|
|
|
|
* rconn_disconnect(), or that 'rc' is new and has not yet completed its
|
|
|
|
|
* initial connection or connection attempt.
|
|
|
|
|
*
|
|
|
|
|
* - EOF means that the connection was closed in the normal way by the peer.
|
|
|
|
|
*
|
|
|
|
|
* - A positive integer is an errno value that represents the error.
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
rconn_get_last_error(const struct rconn *rc)
|
|
|
|
|
{
|
|
|
|
|
return rc->last_error;
|
|
|
|
|
}
|
2012-05-08 15:44:21 -07:00
|
|
|
|
|
|
|
|
|
/* Returns the number of messages queued for transmission on 'rc'. */
|
|
|
|
|
unsigned int
|
|
|
|
|
rconn_count_txqlen(const struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_EXCLUDED(rc->mutex)
|
2012-05-08 15:44:21 -07:00
|
|
|
|
{
|
2013-10-11 10:08:32 -07:00
|
|
|
|
unsigned int len;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&rc->mutex);
|
|
|
|
|
len = list_size(&rc->txq);
|
|
|
|
|
ovs_mutex_unlock(&rc->mutex);
|
|
|
|
|
|
|
|
|
|
return len;
|
2012-05-08 15:44:21 -07:00
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
|
|
struct rconn_packet_counter *
|
|
|
|
|
rconn_packet_counter_create(void)
|
|
|
|
|
{
|
2012-07-12 10:15:35 -07:00
|
|
|
|
struct rconn_packet_counter *c = xzalloc(sizeof *c);
|
2013-09-13 15:07:35 -07:00
|
|
|
|
ovs_mutex_init(&c->mutex);
|
|
|
|
|
ovs_mutex_lock(&c->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
c->ref_cnt = 1;
|
2013-09-13 15:07:35 -07:00
|
|
|
|
ovs_mutex_unlock(&c->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
return c;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
rconn_packet_counter_destroy(struct rconn_packet_counter *c)
|
|
|
|
|
{
|
|
|
|
|
if (c) {
|
2013-09-13 15:07:35 -07:00
|
|
|
|
bool dead;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&c->mutex);
|
2012-11-06 13:14:55 -08:00
|
|
|
|
ovs_assert(c->ref_cnt > 0);
|
2013-09-13 15:07:35 -07:00
|
|
|
|
dead = !--c->ref_cnt && !c->n_packets;
|
|
|
|
|
ovs_mutex_unlock(&c->mutex);
|
|
|
|
|
|
|
|
|
|
if (dead) {
|
|
|
|
|
ovs_mutex_destroy(&c->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
free(c);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2012-07-12 10:15:35 -07:00
|
|
|
|
rconn_packet_counter_inc(struct rconn_packet_counter *c, unsigned int n_bytes)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2013-09-13 15:07:35 -07:00
|
|
|
|
ovs_mutex_lock(&c->mutex);
|
2012-07-12 10:15:35 -07:00
|
|
|
|
c->n_packets++;
|
|
|
|
|
c->n_bytes += n_bytes;
|
2013-09-13 15:07:35 -07:00
|
|
|
|
ovs_mutex_unlock(&c->mutex);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2012-07-12 10:15:35 -07:00
|
|
|
|
rconn_packet_counter_dec(struct rconn_packet_counter *c, unsigned int n_bytes)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2013-09-13 15:07:35 -07:00
|
|
|
|
bool dead = false;
|
2012-07-12 10:15:35 -07:00
|
|
|
|
|
2013-09-13 15:07:35 -07:00
|
|
|
|
ovs_mutex_lock(&c->mutex);
|
|
|
|
|
ovs_assert(c->n_packets > 0);
|
|
|
|
|
ovs_assert(c->n_packets == 1
|
|
|
|
|
? c->n_bytes == n_bytes
|
|
|
|
|
: c->n_bytes > n_bytes);
|
2012-07-12 10:15:35 -07:00
|
|
|
|
c->n_packets--;
|
2013-09-13 15:07:35 -07:00
|
|
|
|
c->n_bytes -= n_bytes;
|
|
|
|
|
dead = !c->n_packets && !c->ref_cnt;
|
|
|
|
|
ovs_mutex_unlock(&c->mutex);
|
|
|
|
|
|
|
|
|
|
if (dead) {
|
|
|
|
|
ovs_mutex_destroy(&c->mutex);
|
|
|
|
|
free(c);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
2013-09-13 15:07:35 -07:00
|
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
|
rconn_packet_counter_n_packets(const struct rconn_packet_counter *c)
|
|
|
|
|
{
|
|
|
|
|
unsigned int n;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&c->mutex);
|
|
|
|
|
n = c->n_packets;
|
|
|
|
|
ovs_mutex_unlock(&c->mutex);
|
|
|
|
|
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
|
rconn_packet_counter_n_bytes(const struct rconn_packet_counter *c)
|
|
|
|
|
{
|
|
|
|
|
unsigned int n;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&c->mutex);
|
|
|
|
|
n = c->n_bytes;
|
|
|
|
|
ovs_mutex_unlock(&c->mutex);
|
|
|
|
|
|
|
|
|
|
return n;
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
/* Set rc->target and rc->name to 'target' and 'name', respectively. If 'name'
|
2014-04-30 10:40:25 -07:00
|
|
|
|
* is null, 'target' is used. */
|
2009-09-02 12:52:50 -07:00
|
|
|
|
static void
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
rconn_set_target__(struct rconn *rc, const char *target, const char *name)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-09-02 12:52:50 -07:00
|
|
|
|
{
|
|
|
|
|
free(rc->name);
|
ofproto: Make OpenFlow connection log messages name the datapath.
Until now, log messages about OpenFlow connections have named the target
of the connection, e.g. "tcp:1.2.3.4:5555", but they have not named the
datapath. Most often, every datapath has the same target, so this can
make it difficult to tell which connection is going wrong. Usually, that
isn't important, because all connections with the same target will have the
same problems, but it's probably better to be more informative.
This commit changes the log messages to include the datapath name, so that
"tcp:1.2.3.4:5555" becomes, e.g., "xenbr0<->tcp:1.2.3.4:5555".
Requested-by: Keith Amidon <keith@nicira.com>
2010-06-08 10:38:57 -07:00
|
|
|
|
rc->name = xstrdup(name ? name : target);
|
|
|
|
|
free(rc->target);
|
|
|
|
|
rc->target = xstrdup(target);
|
2009-09-02 12:52:50 -07:00
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
/* Tries to send a packet from 'rc''s send buffer. Returns 0 if successful,
|
|
|
|
|
* otherwise a positive errno value. */
|
|
|
|
|
static int
|
|
|
|
|
try_send(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2010-12-06 10:03:31 -08:00
|
|
|
|
struct ofpbuf *msg = ofpbuf_from_list(rc->txq.next);
|
2014-03-30 01:31:50 -07:00
|
|
|
|
unsigned int n_bytes = ofpbuf_size(msg);
|
2014-04-02 15:44:21 -07:00
|
|
|
|
struct rconn_packet_counter *counter = msg->frame;
|
2010-12-06 10:03:31 -08:00
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
|
|
/* Eagerly remove 'msg' from the txq. We can't remove it from the list
|
|
|
|
|
* after sending, if sending is successful, because it is then owned by the
|
|
|
|
|
* vconn, which might have freed it already. */
|
|
|
|
|
list_remove(&msg->list_node);
|
2014-04-02 15:44:21 -07:00
|
|
|
|
ofpbuf_set_frame(msg, NULL);
|
2010-12-06 10:03:31 -08:00
|
|
|
|
|
|
|
|
|
retval = vconn_send(rc->vconn, msg);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (retval) {
|
2014-04-02 15:44:21 -07:00
|
|
|
|
ofpbuf_set_frame(msg, counter);
|
2010-12-06 10:03:31 -08:00
|
|
|
|
list_push_front(&rc->txq, &msg->list_node);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (retval != EAGAIN) {
|
2010-02-11 14:32:49 -08:00
|
|
|
|
report_error(rc, retval);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
disconnect(rc, retval);
|
|
|
|
|
}
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
COVERAGE_INC(rconn_sent);
|
|
|
|
|
rc->packets_sent++;
|
|
|
|
|
if (counter) {
|
2012-07-12 10:15:35 -07:00
|
|
|
|
rconn_packet_counter_dec(counter, n_bytes);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-02-11 14:32:49 -08:00
|
|
|
|
/* Reports that 'error' caused 'rc' to disconnect. 'error' may be a positive
|
|
|
|
|
* errno value, or it may be EOF to indicate that the connection was closed
|
|
|
|
|
* normally. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
static void
|
2010-02-11 14:32:49 -08:00
|
|
|
|
report_error(struct rconn *rc, int error)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2010-02-11 14:32:49 -08:00
|
|
|
|
{
|
2014-06-09 08:47:12 -07:00
|
|
|
|
/* On Windows, when a peer terminates without calling a closesocket()
|
|
|
|
|
* on socket fd, we get WSAECONNRESET. Don't print warning messages
|
|
|
|
|
* for that case. */
|
|
|
|
|
if (error == EOF
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
|
|| error == WSAECONNRESET
|
|
|
|
|
#endif
|
|
|
|
|
) {
|
2010-02-11 14:32:49 -08:00
|
|
|
|
/* If 'rc' isn't reliable, then we don't really expect this connection
|
|
|
|
|
* to last forever anyway (probably it's a connection that we received
|
|
|
|
|
* via accept()), so use DBG level to avoid cluttering the logs. */
|
|
|
|
|
enum vlog_level level = rc->reliable ? VLL_INFO : VLL_DBG;
|
|
|
|
|
VLOG(level, "%s: connection closed by peer", rc->name);
|
|
|
|
|
} else {
|
2013-06-24 10:54:49 -07:00
|
|
|
|
VLOG_WARN("%s: connection dropped (%s)",
|
|
|
|
|
rc->name, ovs_strerror(error));
|
2010-02-11 14:32:49 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-02-11 14:39:25 -08:00
|
|
|
|
/* Disconnects 'rc' and records 'error' as the error that caused 'rc''s last
|
|
|
|
|
* disconnection:
|
|
|
|
|
*
|
|
|
|
|
* - 0 means that this disconnection is due to a request by 'rc''s client,
|
|
|
|
|
* not due to any kind of network error.
|
|
|
|
|
*
|
|
|
|
|
* - EOF means that the connection was closed in the normal way by the peer.
|
|
|
|
|
*
|
|
|
|
|
* - A positive integer is an errno value that represents the error.
|
|
|
|
|
*/
|
2009-07-08 13:19:16 -07:00
|
|
|
|
static void
|
|
|
|
|
disconnect(struct rconn *rc, int error)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2010-02-11 14:39:25 -08:00
|
|
|
|
rc->last_error = error;
|
rconn: Preserve the name of an unreliable connection beyond disconnection.
An rconn has a human-readable name that typically designates both endpoints
of the connection. For a "reliable" rconn, that automatically reconnects,
the name remains constant regardless of whether the rconn is currently
connected. Until now, though, an "unreliable" rconn, that cannot
automatically reconnect, kept its name only until disconnection occurred.
This is OK for the uses currently in the OVS tree, which only use the name
of a rconn while it is connected, but an upcoming commit will add a final
log message following disconnection in some cases, and it makes the log
messages less useful if unreliable rconns just report "void" in that case.
This commit, therefore, modifies the rconn code so that unreliable rconns
preserve their names past disconnection, just like reliable ones.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-30 10:45:16 -07:00
|
|
|
|
if (rc->vconn) {
|
|
|
|
|
vconn_close(rc->vconn);
|
|
|
|
|
rc->vconn = NULL;
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (rc->reliable) {
|
|
|
|
|
time_t now = time_now();
|
|
|
|
|
|
|
|
|
|
if (rc->state & (S_CONNECTING | S_ACTIVE | S_IDLE)) {
|
2011-03-14 13:19:20 -07:00
|
|
|
|
rc->last_disconnected = now;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
flush_queue(rc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (now >= rc->backoff_deadline) {
|
|
|
|
|
rc->backoff = 1;
|
2010-06-24 12:44:47 -07:00
|
|
|
|
} else if (rc->backoff < rc->max_backoff / 2) {
|
|
|
|
|
rc->backoff = MAX(1, 2 * rc->backoff);
|
2010-06-11 14:59:43 -07:00
|
|
|
|
VLOG_INFO("%s: waiting %d seconds before reconnect",
|
2009-07-08 13:19:16 -07:00
|
|
|
|
rc->name, rc->backoff);
|
2010-06-24 12:44:47 -07:00
|
|
|
|
} else {
|
|
|
|
|
if (rconn_logging_connection_attempts__(rc)) {
|
|
|
|
|
VLOG_INFO("%s: continuing to retry connections in the "
|
|
|
|
|
"background but suppressing further logging",
|
|
|
|
|
rc->name);
|
|
|
|
|
}
|
|
|
|
|
rc->backoff = rc->max_backoff;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
rc->backoff_deadline = now + rc->backoff;
|
|
|
|
|
state_transition(rc, S_BACKOFF);
|
|
|
|
|
} else {
|
2011-03-14 13:19:20 -07:00
|
|
|
|
rc->last_disconnected = time_now();
|
rconn: Preserve the name of an unreliable connection beyond disconnection.
An rconn has a human-readable name that typically designates both endpoints
of the connection. For a "reliable" rconn, that automatically reconnects,
the name remains constant regardless of whether the rconn is currently
connected. Until now, though, an "unreliable" rconn, that cannot
automatically reconnect, kept its name only until disconnection occurred.
This is OK for the uses currently in the OVS tree, which only use the name
of a rconn while it is connected, but an upcoming commit will add a final
log message following disconnection in some cases, and it makes the log
messages less useful if unreliable rconns just report "void" in that case.
This commit, therefore, modifies the rconn code so that unreliable rconns
preserve their names past disconnection, just like reliable ones.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-30 10:45:16 -07:00
|
|
|
|
state_transition(rc, S_DISCONNECTED);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Drops all the packets from 'rc''s send queue and decrements their queue
|
|
|
|
|
* counts. */
|
|
|
|
|
static void
|
|
|
|
|
flush_queue(struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2010-12-06 10:03:31 -08:00
|
|
|
|
if (list_is_empty(&rc->txq)) {
|
2009-07-08 13:19:16 -07:00
|
|
|
|
return;
|
|
|
|
|
}
|
2010-12-06 10:03:31 -08:00
|
|
|
|
while (!list_is_empty(&rc->txq)) {
|
|
|
|
|
struct ofpbuf *b = ofpbuf_from_list(list_pop_front(&rc->txq));
|
2014-04-02 15:44:21 -07:00
|
|
|
|
struct rconn_packet_counter *counter = b->frame;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
if (counter) {
|
2014-03-30 01:31:50 -07:00
|
|
|
|
rconn_packet_counter_dec(counter, ofpbuf_size(b));
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
COVERAGE_INC(rconn_discarded);
|
|
|
|
|
ofpbuf_delete(b);
|
|
|
|
|
}
|
|
|
|
|
poll_immediate_wake();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
|
|
|
|
elapsed_in_this_state(const struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
return time_now() - rc->state_entered;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
|
|
|
|
timeout(const struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
switch (rc->state) {
|
|
|
|
|
#define STATE(NAME, VALUE) case S_##NAME: return timeout_##NAME(rc);
|
|
|
|
|
STATES
|
|
|
|
|
#undef STATE
|
|
|
|
|
default:
|
2013-12-17 10:32:12 -08:00
|
|
|
|
OVS_NOT_REACHED();
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
timed_out(const struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
return time_now() >= sat_add(rc->state_entered, timeout(rc));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
state_transition(struct rconn *rc, enum state state)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
rc->seqno += (rc->state == S_ACTIVE) != (state == S_ACTIVE);
|
|
|
|
|
if (is_connected_state(state) && !is_connected_state(rc->state)) {
|
|
|
|
|
rc->probably_admitted = false;
|
|
|
|
|
}
|
|
|
|
|
if (rconn_is_connected(rc)) {
|
|
|
|
|
rc->total_time_connected += elapsed_in_this_state(rc);
|
|
|
|
|
}
|
|
|
|
|
VLOG_DBG("%s: entering %s", rc->name, state_name(state));
|
|
|
|
|
rc->state = state;
|
|
|
|
|
rc->state_entered = time_now();
|
|
|
|
|
}
|
|
|
|
|
|
2012-10-24 09:42:34 -07:00
|
|
|
|
static void
|
|
|
|
|
close_monitor(struct rconn *rc, size_t idx, int retval)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2012-10-24 09:42:34 -07:00
|
|
|
|
{
|
|
|
|
|
VLOG_DBG("%s: closing monitor connection to %s: %s",
|
|
|
|
|
rconn_get_name(rc), vconn_get_name(rc->monitors[idx]),
|
|
|
|
|
ovs_retval_to_string(retval));
|
|
|
|
|
rc->monitors[idx] = rc->monitors[--rc->n_monitors];
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
static void
|
|
|
|
|
copy_to_monitor(struct rconn *rc, const struct ofpbuf *b)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
struct ofpbuf *clone = NULL;
|
|
|
|
|
int retval;
|
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < rc->n_monitors; ) {
|
|
|
|
|
struct vconn *vconn = rc->monitors[i];
|
|
|
|
|
|
|
|
|
|
if (!clone) {
|
|
|
|
|
clone = ofpbuf_clone(b);
|
|
|
|
|
}
|
|
|
|
|
retval = vconn_send(vconn, clone);
|
|
|
|
|
if (!retval) {
|
|
|
|
|
clone = NULL;
|
|
|
|
|
} else if (retval != EAGAIN) {
|
2012-10-24 09:42:34 -07:00
|
|
|
|
close_monitor(rc, i, retval);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
ofpbuf_delete(clone);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
2010-08-30 00:24:53 -07:00
|
|
|
|
is_connected_state(enum state state)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
|
|
|
|
return (state & (S_ACTIVE | S_IDLE)) != 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-21 15:03:23 -08:00
|
|
|
|
/* When a switch initially connects to a controller, the controller may spend a
|
|
|
|
|
* little time examining the switch, looking at, for example, its datapath ID,
|
|
|
|
|
* before it decides whether it is willing to control that switch. At that
|
|
|
|
|
* point, it either disconnects or starts controlling the switch.
|
|
|
|
|
*
|
|
|
|
|
* This function returns a guess to its caller about whether 'b' is OpenFlow
|
|
|
|
|
* message that indicates that the controller has decided to control the
|
|
|
|
|
* switch. It returns false if the message is one that a controller typically
|
|
|
|
|
* uses to determine whether a switch is admissible, true if the message is one
|
|
|
|
|
* that would typically be used only after the controller has admitted the
|
|
|
|
|
* switch. */
|
2009-07-08 13:19:16 -07:00
|
|
|
|
static bool
|
|
|
|
|
is_admitted_msg(const struct ofpbuf *b)
|
|
|
|
|
{
|
2012-07-19 23:23:17 -07:00
|
|
|
|
enum ofptype type;
|
|
|
|
|
enum ofperr error;
|
|
|
|
|
|
2014-03-30 01:31:50 -07:00
|
|
|
|
error = ofptype_decode(&type, ofpbuf_data(b));
|
2012-07-19 23:23:17 -07:00
|
|
|
|
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:
|
2012-12-07 15:48:21 +02:00
|
|
|
|
case OFPTYPE_QUEUE_GET_CONFIG_REQUEST:
|
|
|
|
|
case OFPTYPE_QUEUE_GET_CONFIG_REPLY:
|
2012-11-27 17:44:22 +02:00
|
|
|
|
case OFPTYPE_GET_ASYNC_REQUEST:
|
|
|
|
|
case OFPTYPE_GET_ASYNC_REPLY:
|
2013-06-28 13:41:53 -07:00
|
|
|
|
case OFPTYPE_GROUP_STATS_REQUEST:
|
|
|
|
|
case OFPTYPE_GROUP_STATS_REPLY:
|
|
|
|
|
case OFPTYPE_GROUP_DESC_STATS_REQUEST:
|
|
|
|
|
case OFPTYPE_GROUP_DESC_STATS_REPLY:
|
|
|
|
|
case OFPTYPE_GROUP_FEATURES_STATS_REQUEST:
|
|
|
|
|
case OFPTYPE_GROUP_FEATURES_STATS_REPLY:
|
|
|
|
|
case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
|
|
|
|
|
case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
|
2014-05-02 09:54:27 +03:00
|
|
|
|
case OFPTYPE_BUNDLE_CONTROL:
|
|
|
|
|
case OFPTYPE_BUNDLE_ADD_MESSAGE:
|
2012-07-19 23:23:17 -07:00
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
case OFPTYPE_PACKET_IN:
|
|
|
|
|
case OFPTYPE_FLOW_REMOVED:
|
|
|
|
|
case OFPTYPE_PORT_STATUS:
|
|
|
|
|
case OFPTYPE_PACKET_OUT:
|
|
|
|
|
case OFPTYPE_FLOW_MOD:
|
2013-09-01 18:30:17 -07:00
|
|
|
|
case OFPTYPE_GROUP_MOD:
|
2012-07-19 23:23:17 -07:00
|
|
|
|
case OFPTYPE_PORT_MOD:
|
2013-09-07 03:02:32 -07:00
|
|
|
|
case OFPTYPE_TABLE_MOD:
|
2013-06-27 01:39:51 +03:00
|
|
|
|
case OFPTYPE_METER_MOD:
|
2012-07-19 23:23:17 -07:00
|
|
|
|
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:
|
2013-06-28 13:41:53 -07:00
|
|
|
|
case OFPTYPE_METER_STATS_REQUEST:
|
|
|
|
|
case OFPTYPE_METER_STATS_REPLY:
|
|
|
|
|
case OFPTYPE_METER_CONFIG_STATS_REQUEST:
|
|
|
|
|
case OFPTYPE_METER_CONFIG_STATS_REPLY:
|
|
|
|
|
case OFPTYPE_METER_FEATURES_STATS_REQUEST:
|
|
|
|
|
case OFPTYPE_METER_FEATURES_STATS_REPLY:
|
2012-07-19 23:23:17 -07:00
|
|
|
|
case OFPTYPE_ROLE_REQUEST:
|
|
|
|
|
case OFPTYPE_ROLE_REPLY:
|
2013-10-22 11:40:02 +03:00
|
|
|
|
case OFPTYPE_ROLE_STATUS:
|
2012-07-19 23:23:17 -07:00
|
|
|
|
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;
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
2010-06-24 12:44:47 -07:00
|
|
|
|
|
|
|
|
|
/* Returns true if 'rc' is currently logging information about connection
|
|
|
|
|
* attempts, false if logging should be suppressed because 'rc' hasn't
|
|
|
|
|
* successuflly connected in too long. */
|
|
|
|
|
static bool
|
|
|
|
|
rconn_logging_connection_attempts__(const struct rconn *rc)
|
2013-10-11 10:08:32 -07:00
|
|
|
|
OVS_REQUIRES(rc->mutex)
|
2010-06-24 12:44:47 -07:00
|
|
|
|
{
|
|
|
|
|
return rc->backoff < rc->max_backoff;
|
|
|
|
|
}
|