2016-01-06 15:44:39 -08:00
|
|
|
|
/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
|
2013-06-25 14:45:43 -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:
|
|
|
|
|
*
|
|
|
|
|
* 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. */
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include "ofproto-dpif-upcall.h"
|
|
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <stdbool.h>
|
|
|
|
|
#include <inttypes.h>
|
|
|
|
|
|
2013-10-22 16:16:31 -07:00
|
|
|
|
#include "connmgr.h"
|
2013-06-25 14:45:43 -07:00
|
|
|
|
#include "coverage.h"
|
2014-05-05 15:44:40 +12:00
|
|
|
|
#include "cmap.h"
|
2013-06-25 14:45:43 -07:00
|
|
|
|
#include "dpif.h"
|
2016-03-03 10:20:46 -08:00
|
|
|
|
#include "openvswitch/dynamic-string.h"
|
2013-06-25 14:45:43 -07:00
|
|
|
|
#include "fail-open.h"
|
2013-09-12 17:42:23 -07:00
|
|
|
|
#include "guarded-list.h"
|
2013-06-25 14:45:43 -07:00
|
|
|
|
#include "latch.h"
|
2016-03-25 14:10:21 -07:00
|
|
|
|
#include "openvswitch/list.h"
|
2013-06-25 14:45:43 -07:00
|
|
|
|
#include "netlink.h"
|
2016-03-25 14:10:24 -07:00
|
|
|
|
#include "openvswitch/ofpbuf.h"
|
2013-09-24 15:04:04 -07:00
|
|
|
|
#include "ofproto-dpif-ipfix.h"
|
|
|
|
|
#include "ofproto-dpif-sflow.h"
|
2013-09-24 13:39:56 -07:00
|
|
|
|
#include "ofproto-dpif-xlate.h"
|
2014-03-18 16:34:28 -07:00
|
|
|
|
#include "ovs-rcu.h"
|
2013-06-25 14:45:43 -07:00
|
|
|
|
#include "packets.h"
|
|
|
|
|
#include "poll-loop.h"
|
2013-11-20 18:06:12 -08:00
|
|
|
|
#include "seq.h"
|
|
|
|
|
#include "unixctl.h"
|
2014-12-15 14:10:38 +01:00
|
|
|
|
#include "openvswitch/vlog.h"
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
|
|
|
|
#define MAX_QUEUE_LENGTH 512
|
2014-07-26 06:51:55 +00:00
|
|
|
|
#define UPCALL_MAX_BATCH 64
|
2013-09-24 13:39:56 -07:00
|
|
|
|
#define REVALIDATE_MAX_BATCH 50
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
|
|
|
|
VLOG_DEFINE_THIS_MODULE(ofproto_dpif_upcall);
|
|
|
|
|
|
2014-09-26 17:28:05 +00:00
|
|
|
|
COVERAGE_DEFINE(dumped_duplicate_flow);
|
|
|
|
|
COVERAGE_DEFINE(dumped_new_flow);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
COVERAGE_DEFINE(handler_duplicate_upcall);
|
|
|
|
|
COVERAGE_DEFINE(upcall_ukey_contention);
|
2014-07-08 07:04:05 +00:00
|
|
|
|
COVERAGE_DEFINE(revalidate_missed_dp_flow);
|
revalidator: Prevent handling the same flow twice.
When the datapath flow table is modified while a flow dump operation is
in progress, it is possible for the same flow to be dumped twice. In
such cases, revalidators may perform redundant work, or attempt to
delete the same flow twice.
This was causing intermittent testsuite failures for test #670 -
"ofproto-dpif, active-backup bonding" where a flow (that had not
previously been dumped) was dumped, revalidated and deleted twice.
The logs show errors such as:
"failed to flow_get (No such file or directory) skb_priority(0),..."
"failed to flow_del (No such file or directory) skb_priority(0),..."
This patch adds a 'flow_exists' field to 'struct udpif_key' to track
whether the flow is (in progress) to be deleted. After doing a ukey
lookup, we check whether ukey->mark or ukey->flow indicates that the
flow has already been handled. If it has already been handled, we skip
handling the flow again.
We also defer ukey cleanup for flows that fail revalidation, so that the
ukey will still exist if the same flow is dumped twice. This allows the
above logic to work in this case.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-23 15:31:17 +12:00
|
|
|
|
|
2014-02-26 23:03:24 -08:00
|
|
|
|
/* A thread that reads upcalls from dpif, forwards each upcall's packet,
|
|
|
|
|
* and possibly sets up a kernel flow as a cache. */
|
2013-06-25 14:45:43 -07:00
|
|
|
|
struct handler {
|
|
|
|
|
struct udpif *udpif; /* Parent udpif. */
|
|
|
|
|
pthread_t thread; /* Thread ID. */
|
2014-02-26 23:03:24 -08:00
|
|
|
|
uint32_t handler_id; /* Handler id. */
|
2013-06-25 14:45:43 -07:00
|
|
|
|
};
|
|
|
|
|
|
2014-06-05 17:28:46 +12:00
|
|
|
|
/* In the absence of a multiple-writer multiple-reader datastructure for
|
2016-01-07 16:16:25 -08:00
|
|
|
|
* storing udpif_keys ("ukeys"), we use a large number of cmaps, each with its
|
|
|
|
|
* own lock for writing. */
|
2014-06-05 17:28:46 +12:00
|
|
|
|
#define N_UMAPS 512 /* per udpif. */
|
|
|
|
|
struct umap {
|
|
|
|
|
struct ovs_mutex mutex; /* Take for writing to the following. */
|
|
|
|
|
struct cmap cmap; /* Datapath flow keys. */
|
|
|
|
|
};
|
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
/* A thread that processes datapath flows, updates OpenFlow statistics, and
|
2016-01-07 16:16:25 -08:00
|
|
|
|
* updates or removes them if necessary.
|
|
|
|
|
*
|
|
|
|
|
* Revalidator threads operate in two phases: "dump" and "sweep". In between
|
|
|
|
|
* each phase, all revalidators sync up so that all revalidator threads are
|
|
|
|
|
* either in one phase or the other, but not a combination.
|
|
|
|
|
*
|
|
|
|
|
* During the dump phase, revalidators fetch flows from the datapath and
|
|
|
|
|
* attribute the statistics to OpenFlow rules. Each datapath flow has a
|
|
|
|
|
* corresponding ukey which caches the most recently seen statistics. If
|
|
|
|
|
* a flow needs to be deleted (for example, because it is unused over a
|
|
|
|
|
* period of time), revalidator threads may delete the flow during the
|
|
|
|
|
* dump phase. The datapath is not guaranteed to reliably dump all flows
|
|
|
|
|
* from the datapath, and there is no mapping between datapath flows to
|
|
|
|
|
* revalidators, so a particular flow may be handled by zero or more
|
|
|
|
|
* revalidators during a single dump phase. To avoid duplicate attribution
|
|
|
|
|
* of statistics, ukeys are never deleted during this phase.
|
|
|
|
|
*
|
|
|
|
|
* During the sweep phase, each revalidator takes ownership of a different
|
|
|
|
|
* slice of umaps and sweeps through all ukeys in those umaps to figure out
|
|
|
|
|
* whether they need to be deleted. During this phase, revalidators may
|
|
|
|
|
* fetch individual flows which were not dumped during the dump phase to
|
|
|
|
|
* validate them and attribute statistics.
|
|
|
|
|
*/
|
2013-09-24 13:39:56 -07:00
|
|
|
|
struct revalidator {
|
|
|
|
|
struct udpif *udpif; /* Parent udpif. */
|
|
|
|
|
pthread_t thread; /* Thread ID. */
|
ovs-thread: Make caller provide thread name when creating a thread.
Thread names are occasionally very useful for debugging, but from time to
time we've forgotten to set one. This commit adds the new thread's name
as a parameter to the function to start a thread, to make that mistake
impossible. This also simplifies code, since two function calls become
only one.
This makes a few other changes to the thread creation function:
* Since it is no longer a direct wrapper around a pthread function,
rename it to avoid giving that impression.
* Remove 'pthread_attr_t *' param that every caller supplied as NULL.
* Change 'pthread *' parameter into a return value, for convenience.
The system-stats code hadn't set a thread name, so this fixes that issue.
This patch is a prerequisite for making RCU report the name of a thread
that is blocking RCU synchronization, because the easiest way to do that is
for ovsrcu_quiesce_end() to record the current thread's name.
ovsrcu_quiesce_end() is called before the thread function is called, so it
won't get a name set within the thread function itself. Setting the thread
name earlier, as in this patch, avoids the problem.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-25 17:46:21 -07:00
|
|
|
|
unsigned int id; /* ovsthread_id_self(). */
|
2013-09-24 13:39:56 -07:00
|
|
|
|
};
|
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
/* An upcall handler for ofproto_dpif.
|
|
|
|
|
*
|
2014-02-26 23:03:24 -08:00
|
|
|
|
* udpif keeps records of two kind of logically separate units:
|
|
|
|
|
*
|
|
|
|
|
* upcall handling
|
|
|
|
|
* ---------------
|
|
|
|
|
*
|
|
|
|
|
* - An array of 'struct handler's for upcall handling and flow
|
|
|
|
|
* installation.
|
2013-09-24 13:39:56 -07:00
|
|
|
|
*
|
2014-02-26 23:03:24 -08:00
|
|
|
|
* flow revalidation
|
|
|
|
|
* -----------------
|
|
|
|
|
*
|
2014-04-10 07:14:08 +00:00
|
|
|
|
* - Revalidation threads which read the datapath flow table and maintains
|
|
|
|
|
* them.
|
|
|
|
|
*/
|
2013-06-25 14:45:43 -07:00
|
|
|
|
struct udpif {
|
2014-12-15 14:10:38 +01:00
|
|
|
|
struct ovs_list list_node; /* In all_udpifs list. */
|
2013-11-20 18:06:12 -08:00
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
struct dpif *dpif; /* Datapath handle. */
|
|
|
|
|
struct dpif_backer *backer; /* Opaque dpif_backer pointer. */
|
|
|
|
|
|
2013-09-24 15:04:04 -07:00
|
|
|
|
struct handler *handlers; /* Upcall handlers. */
|
2013-06-25 14:45:43 -07:00
|
|
|
|
size_t n_handlers;
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
struct revalidator *revalidators; /* Flow revalidators. */
|
|
|
|
|
size_t n_revalidators;
|
|
|
|
|
|
|
|
|
|
struct latch exit_latch; /* Tells child threads to exit. */
|
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
/* Revalidation. */
|
|
|
|
|
struct seq *reval_seq; /* Incremented to force revalidation. */
|
|
|
|
|
bool reval_exit; /* Set by leader on 'exit_latch. */
|
2014-05-29 15:37:37 -07:00
|
|
|
|
struct ovs_barrier reval_barrier; /* Barrier used by revalidators. */
|
2014-05-20 11:37:02 -07:00
|
|
|
|
struct dpif_flow_dump *dump; /* DPIF flow dump state. */
|
2013-09-24 13:39:56 -07:00
|
|
|
|
long long int dump_duration; /* Duration of the last flow dump. */
|
2014-04-10 07:14:08 +00:00
|
|
|
|
struct seq *dump_seq; /* Increments each dump iteration. */
|
2014-10-06 11:14:08 +13:00
|
|
|
|
atomic_bool enable_ufid; /* If true, skip dumping flow attrs. */
|
2014-04-10 07:14:08 +00:00
|
|
|
|
|
2015-08-29 06:09:45 +00:00
|
|
|
|
/* These variables provide a mechanism for the main thread to pause
|
|
|
|
|
* all revalidation without having to completely shut the threads down.
|
|
|
|
|
* 'pause_latch' is shared between the main thread and the lead
|
|
|
|
|
* revalidator thread, so when it is desirable to halt revalidation, the
|
|
|
|
|
* main thread will set the latch. 'pause' and 'pause_barrier' are shared
|
|
|
|
|
* by revalidator threads. The lead revalidator will set 'pause' when it
|
|
|
|
|
* observes the latch has been set, and this will cause all revalidator
|
|
|
|
|
* threads to wait on 'pause_barrier' at the beginning of the next
|
|
|
|
|
* revalidation round. */
|
|
|
|
|
bool pause; /* Set by leader on 'pause_latch. */
|
|
|
|
|
struct latch pause_latch; /* Set to force revalidators pause. */
|
|
|
|
|
struct ovs_barrier pause_barrier; /* Barrier used to pause all */
|
|
|
|
|
/* revalidators by main thread. */
|
|
|
|
|
|
2014-06-05 17:28:46 +12:00
|
|
|
|
/* There are 'N_UMAPS' maps containing 'struct udpif_key' elements.
|
2014-04-10 07:14:08 +00:00
|
|
|
|
*
|
|
|
|
|
* During the flow dump phase, revalidators insert into these with a random
|
|
|
|
|
* distribution. During the garbage collection phase, each revalidator
|
2014-06-05 17:28:46 +12:00
|
|
|
|
* takes care of garbage collecting a slice of these maps. */
|
|
|
|
|
struct umap *ukeys;
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
/* Datapath flow statistics. */
|
|
|
|
|
unsigned int max_n_flows;
|
|
|
|
|
unsigned int avg_n_flows;
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
/* Following fields are accessed and modified by different threads. */
|
|
|
|
|
atomic_uint flow_limit; /* Datapath flow hard limit. */
|
2014-01-22 06:50:49 +00:00
|
|
|
|
|
|
|
|
|
/* n_flows_mutex prevents multiple threads updating these concurrently. */
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_uint n_flows; /* Number of flows in the datapath. */
|
2014-01-22 06:50:49 +00:00
|
|
|
|
atomic_llong n_flows_timestamp; /* Last time n_flows was updated. */
|
|
|
|
|
struct ovs_mutex n_flows_mutex;
|
2014-06-25 14:02:45 +00:00
|
|
|
|
|
|
|
|
|
/* Following fields are accessed and modified only from the main thread. */
|
|
|
|
|
struct unixctl_conn **conns; /* Connections waiting on dump_seq. */
|
|
|
|
|
uint64_t conn_seq; /* Corresponds to 'dump_seq' when
|
|
|
|
|
conns[n_conns-1] was stored. */
|
|
|
|
|
size_t n_conns; /* Number of connections waiting. */
|
2013-06-25 14:45:43 -07:00
|
|
|
|
};
|
|
|
|
|
|
2013-09-24 15:04:04 -07:00
|
|
|
|
enum upcall_type {
|
|
|
|
|
BAD_UPCALL, /* Some kind of bug somewhere. */
|
|
|
|
|
MISS_UPCALL, /* A flow miss. */
|
|
|
|
|
SFLOW_UPCALL, /* sFlow sample. */
|
|
|
|
|
FLOW_SAMPLE_UPCALL, /* Per-flow sampling. */
|
|
|
|
|
IPFIX_UPCALL /* Per-bridge sampling. */
|
|
|
|
|
};
|
|
|
|
|
|
2015-08-03 18:43:53 -07:00
|
|
|
|
enum reval_result {
|
|
|
|
|
UKEY_KEEP,
|
|
|
|
|
UKEY_DELETE,
|
|
|
|
|
UKEY_MODIFY
|
|
|
|
|
};
|
|
|
|
|
|
2013-09-24 15:04:04 -07:00
|
|
|
|
struct upcall {
|
2014-08-06 18:49:44 -07:00
|
|
|
|
struct ofproto_dpif *ofproto; /* Parent ofproto. */
|
2015-03-26 11:18:16 -07:00
|
|
|
|
const struct recirc_id_node *recirc; /* Recirculation context. */
|
|
|
|
|
bool have_recirc_ref; /* Reference held on recirc ctx? */
|
2014-05-20 21:50:19 -07:00
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
/* The flow and packet are only required to be constant when using
|
|
|
|
|
* dpif-netdev. If a modification is absolutely necessary, a const cast
|
|
|
|
|
* may be used with other datapaths. */
|
|
|
|
|
const struct flow *flow; /* Parsed representation of the packet. */
|
2014-09-24 15:24:39 +12:00
|
|
|
|
const ovs_u128 *ufid; /* Unique identifier for 'flow'. */
|
2015-05-22 17:14:19 +01:00
|
|
|
|
unsigned pmd_id; /* Datapath poll mode driver id. */
|
2015-02-22 03:21:09 -08:00
|
|
|
|
const struct dp_packet *packet; /* Packet associated with this upcall. */
|
2014-08-06 18:49:44 -07:00
|
|
|
|
ofp_port_t in_port; /* OpenFlow in port, or OFPP_NONE. */
|
2015-02-26 15:52:34 -08:00
|
|
|
|
uint16_t mru; /* If !0, Maximum receive unit of
|
|
|
|
|
fragmented IP packet */
|
2014-05-20 21:50:19 -07:00
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
enum dpif_upcall_type type; /* Datapath type of the upcall. */
|
|
|
|
|
const struct nlattr *userdata; /* Userdata for DPIF_UC_ACTION Upcalls. */
|
2015-07-17 21:37:02 -07:00
|
|
|
|
const struct nlattr *actions; /* Flow actions in DPIF_UC_ACTION Upcalls. */
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
|
|
|
|
bool xout_initialized; /* True if 'xout' must be uninitialized. */
|
|
|
|
|
struct xlate_out xout; /* Result of xlate_actions(). */
|
2015-07-31 13:34:16 -07:00
|
|
|
|
struct ofpbuf odp_actions; /* Datapath actions from xlate_actions(). */
|
2015-07-31 13:15:52 -07:00
|
|
|
|
struct flow_wildcards wc; /* Dependencies that megaflow must match. */
|
2015-07-22 16:38:18 -07:00
|
|
|
|
struct ofpbuf put_actions; /* Actions 'put' in the fastpath. */
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
2014-08-22 09:01:36 -07:00
|
|
|
|
struct dpif_ipfix *ipfix; /* IPFIX pointer or NULL. */
|
|
|
|
|
struct dpif_sflow *sflow; /* SFlow pointer or NULL. */
|
2014-05-20 21:50:19 -07:00
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
struct udpif_key *ukey; /* Revalidator flow cache. */
|
|
|
|
|
bool ukey_persists; /* Set true to keep 'ukey' beyond the
|
|
|
|
|
lifetime of this upcall. */
|
|
|
|
|
|
|
|
|
|
uint64_t dump_seq; /* udpif->dump_seq at translation time. */
|
|
|
|
|
uint64_t reval_seq; /* udpif->reval_seq at translation time. */
|
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
/* Not used by the upcall callback interface. */
|
|
|
|
|
const struct nlattr *key; /* Datapath flow key. */
|
|
|
|
|
size_t key_len; /* Datapath flow key length. */
|
2014-08-17 20:19:36 -07:00
|
|
|
|
const struct nlattr *out_tun_key; /* Datapath output tunnel key. */
|
2015-07-31 13:34:16 -07:00
|
|
|
|
|
|
|
|
|
uint64_t odp_actions_stub[1024 / 8]; /* Stub for odp_actions. */
|
2013-09-24 15:04:04 -07:00
|
|
|
|
};
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
/* 'udpif_key's are responsible for tracking the little bit of state udpif
|
|
|
|
|
* needs to do flow expiration which can't be pulled directly from the
|
2014-07-25 13:54:24 +12:00
|
|
|
|
* datapath. They may be created by any handler or revalidator thread at any
|
|
|
|
|
* time, and read by any revalidator during the dump phase. They are however
|
|
|
|
|
* each owned by a single revalidator which takes care of destroying them
|
|
|
|
|
* during the garbage-collection phase.
|
2014-04-10 07:14:08 +00:00
|
|
|
|
*
|
2014-06-05 17:28:46 +12:00
|
|
|
|
* The mutex within the ukey protects some members of the ukey. The ukey
|
|
|
|
|
* itself is protected by RCU and is held within a umap in the parent udpif.
|
|
|
|
|
* Adding or removing a ukey from a umap is only safe when holding the
|
|
|
|
|
* corresponding umap lock. */
|
2013-09-24 13:39:56 -07:00
|
|
|
|
struct udpif_key {
|
2014-05-05 15:44:40 +12:00
|
|
|
|
struct cmap_node cmap_node; /* In parent revalidator 'ukeys' map. */
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
/* These elements are read only once created, and therefore aren't
|
|
|
|
|
* protected by a mutex. */
|
|
|
|
|
const struct nlattr *key; /* Datapath flow key. */
|
2013-09-24 13:39:56 -07:00
|
|
|
|
size_t key_len; /* Length of 'key'. */
|
2014-08-06 16:40:37 +12:00
|
|
|
|
const struct nlattr *mask; /* Datapath flow mask. */
|
|
|
|
|
size_t mask_len; /* Length of 'mask'. */
|
2014-09-24 15:24:39 +12:00
|
|
|
|
ovs_u128 ufid; /* Unique flow identifier. */
|
2014-09-24 16:26:35 +12:00
|
|
|
|
bool ufid_present; /* True if 'ufid' is in datapath. */
|
2014-05-05 15:44:40 +12:00
|
|
|
|
uint32_t hash; /* Pre-computed hash for 'key'. */
|
2015-05-22 17:14:19 +01:00
|
|
|
|
unsigned pmd_id; /* Datapath poll mode driver id. */
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
struct ovs_mutex mutex; /* Guards the following. */
|
|
|
|
|
struct dpif_flow_stats stats OVS_GUARDED; /* Last known stats.*/
|
|
|
|
|
long long int created OVS_GUARDED; /* Estimate of creation time. */
|
2014-05-14 16:17:25 +12:00
|
|
|
|
uint64_t dump_seq OVS_GUARDED; /* Tracks udpif->dump_seq. */
|
2014-07-25 13:54:24 +12:00
|
|
|
|
uint64_t reval_seq OVS_GUARDED; /* Tracks udpif->reval_seq. */
|
2014-04-10 07:14:08 +00:00
|
|
|
|
bool flow_exists OVS_GUARDED; /* Ensures flows are only deleted
|
|
|
|
|
once. */
|
2015-08-12 14:50:54 -07:00
|
|
|
|
/* Datapath flow actions as nlattrs. Protected by RCU. Read with
|
|
|
|
|
* ukey_get_actions(), and write with ukey_set_actions(). */
|
|
|
|
|
OVSRCU_TYPE(struct ofpbuf *) actions;
|
2014-04-10 07:14:08 +00:00
|
|
|
|
|
|
|
|
|
struct xlate_cache *xcache OVS_GUARDED; /* Cache for xlate entries that
|
|
|
|
|
* are affected by this ukey.
|
|
|
|
|
* Used for stats and learning.*/
|
2014-08-05 13:51:19 -07:00
|
|
|
|
union {
|
2014-08-06 16:40:37 +12:00
|
|
|
|
struct odputil_keybuf buf;
|
|
|
|
|
struct nlattr nla;
|
|
|
|
|
} keybuf, maskbuf;
|
2015-03-26 11:18:16 -07:00
|
|
|
|
|
2015-11-25 15:19:37 -08:00
|
|
|
|
uint32_t key_recirc_id; /* Non-zero if reference is held by the ukey. */
|
|
|
|
|
struct recirc_refs recircs; /* Action recirc IDs with references held. */
|
2013-09-24 13:39:56 -07:00
|
|
|
|
};
|
|
|
|
|
|
2014-08-21 00:21:03 +12:00
|
|
|
|
/* Datapath operation with optional ukey attached. */
|
|
|
|
|
struct ukey_op {
|
|
|
|
|
struct udpif_key *ukey;
|
|
|
|
|
struct dpif_flow_stats stats; /* Stats for 'op'. */
|
|
|
|
|
struct dpif_op dop; /* Flow operation. */
|
|
|
|
|
};
|
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
|
2014-12-15 14:10:38 +01:00
|
|
|
|
static struct ovs_list all_udpifs = OVS_LIST_INITIALIZER(&all_udpifs);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
static size_t recv_upcalls(struct handler *);
|
|
|
|
|
static int process_upcall(struct udpif *, struct upcall *,
|
2015-07-31 13:15:52 -07:00
|
|
|
|
struct ofpbuf *odp_actions, struct flow_wildcards *);
|
2014-07-26 06:51:55 +00:00
|
|
|
|
static void handle_upcalls(struct udpif *, struct upcall *, size_t n_upcalls);
|
2014-04-21 17:31:11 -07:00
|
|
|
|
static void udpif_stop_threads(struct udpif *);
|
|
|
|
|
static void udpif_start_threads(struct udpif *, size_t n_handlers,
|
|
|
|
|
size_t n_revalidators);
|
2015-08-29 06:09:45 +00:00
|
|
|
|
static void udpif_pause_revalidators(struct udpif *);
|
|
|
|
|
static void udpif_resume_revalidators(struct udpif *);
|
2013-09-24 15:04:04 -07:00
|
|
|
|
static void *udpif_upcall_handler(void *);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
static void *udpif_revalidator(void *);
|
2014-05-14 16:19:34 +09:00
|
|
|
|
static unsigned long udpif_get_n_flows(struct udpif *);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
static void revalidate(struct revalidator *);
|
2015-08-29 06:09:45 +00:00
|
|
|
|
static void revalidator_pause(struct revalidator *);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
static void revalidator_sweep(struct revalidator *);
|
2014-02-11 13:55:36 -08:00
|
|
|
|
static void revalidator_purge(struct revalidator *);
|
2013-11-20 18:06:12 -08:00
|
|
|
|
static void upcall_unixctl_show(struct unixctl_conn *conn, int argc,
|
|
|
|
|
const char *argv[], void *aux);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
static void upcall_unixctl_disable_megaflows(struct unixctl_conn *, int argc,
|
|
|
|
|
const char *argv[], void *aux);
|
|
|
|
|
static void upcall_unixctl_enable_megaflows(struct unixctl_conn *, int argc,
|
|
|
|
|
const char *argv[], void *aux);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
static void upcall_unixctl_disable_ufid(struct unixctl_conn *, int argc,
|
|
|
|
|
const char *argv[], void *aux);
|
|
|
|
|
static void upcall_unixctl_enable_ufid(struct unixctl_conn *, int argc,
|
|
|
|
|
const char *argv[], void *aux);
|
2014-02-06 09:49:19 -08:00
|
|
|
|
static void upcall_unixctl_set_flow_limit(struct unixctl_conn *conn, int argc,
|
|
|
|
|
const char *argv[], void *aux);
|
2014-06-25 14:02:45 +00:00
|
|
|
|
static void upcall_unixctl_dump_wait(struct unixctl_conn *conn, int argc,
|
|
|
|
|
const char *argv[], void *aux);
|
2014-11-13 10:42:47 -08:00
|
|
|
|
static void upcall_unixctl_purge(struct unixctl_conn *conn, int argc,
|
|
|
|
|
const char *argv[], void *aux);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
|
2015-07-31 13:15:52 -07:00
|
|
|
|
static struct udpif_key *ukey_create_from_upcall(struct upcall *,
|
|
|
|
|
struct flow_wildcards *);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
static int ukey_create_from_dpif_flow(const struct udpif *,
|
|
|
|
|
const struct dpif_flow *,
|
|
|
|
|
struct udpif_key **);
|
2015-08-12 14:50:54 -07:00
|
|
|
|
static void ukey_get_actions(struct udpif_key *, const struct nlattr **actions,
|
|
|
|
|
size_t *size);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
static bool ukey_install_start(struct udpif *, struct udpif_key *ukey);
|
|
|
|
|
static bool ukey_install_finish(struct udpif_key *ukey, int error);
|
|
|
|
|
static bool ukey_install(struct udpif *udpif, struct udpif_key *ukey);
|
2014-09-24 15:24:39 +12:00
|
|
|
|
static struct udpif_key *ukey_lookup(struct udpif *udpif,
|
2016-02-03 14:31:43 +03:00
|
|
|
|
const ovs_u128 *ufid,
|
|
|
|
|
const unsigned pmd_id);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
static int ukey_acquire(struct udpif *, const struct dpif_flow *,
|
2014-10-06 11:14:08 +13:00
|
|
|
|
struct udpif_key **result, int *error);
|
2014-05-05 15:44:40 +12:00
|
|
|
|
static void ukey_delete__(struct udpif_key *);
|
2014-06-05 17:28:46 +12:00
|
|
|
|
static void ukey_delete(struct umap *, struct udpif_key *);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
static enum upcall_type classify_upcall(enum dpif_upcall_type type,
|
|
|
|
|
const struct nlattr *userdata);
|
|
|
|
|
|
2016-08-31 11:06:02 -07:00
|
|
|
|
static void put_op_init(struct ukey_op *op, struct udpif_key *ukey,
|
|
|
|
|
enum dpif_flow_put_flags flags);
|
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
static int upcall_receive(struct upcall *, const struct dpif_backer *,
|
2015-02-22 03:21:09 -08:00
|
|
|
|
const struct dp_packet *packet, enum dpif_upcall_type,
|
2014-09-24 15:24:39 +12:00
|
|
|
|
const struct nlattr *userdata, const struct flow *,
|
2015-02-26 15:52:34 -08:00
|
|
|
|
const unsigned int mru,
|
2015-05-22 17:14:19 +01:00
|
|
|
|
const ovs_u128 *ufid, const unsigned pmd_id);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
static void upcall_uninit(struct upcall *);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
static upcall_callback upcall_cb;
|
2015-08-25 16:36:46 -07:00
|
|
|
|
static dp_purge_callback dp_purge_cb;
|
2014-07-26 15:39:58 -07:00
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
static atomic_bool enable_megaflows = ATOMIC_VAR_INIT(true);
|
2014-12-19 09:54:38 -08:00
|
|
|
|
static atomic_bool enable_ufid = ATOMIC_VAR_INIT(true);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
2015-07-15 23:41:05 +08:00
|
|
|
|
void
|
|
|
|
|
udpif_init(void)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
{
|
2013-11-20 18:06:12 -08:00
|
|
|
|
static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
|
|
|
|
|
if (ovsthread_once_start(&once)) {
|
|
|
|
|
unixctl_command_register("upcall/show", "", 0, 0, upcall_unixctl_show,
|
|
|
|
|
NULL);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
unixctl_command_register("upcall/disable-megaflows", "", 0, 0,
|
|
|
|
|
upcall_unixctl_disable_megaflows, NULL);
|
|
|
|
|
unixctl_command_register("upcall/enable-megaflows", "", 0, 0,
|
|
|
|
|
upcall_unixctl_enable_megaflows, NULL);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
unixctl_command_register("upcall/disable-ufid", "", 0, 0,
|
|
|
|
|
upcall_unixctl_disable_ufid, NULL);
|
|
|
|
|
unixctl_command_register("upcall/enable-ufid", "", 0, 0,
|
|
|
|
|
upcall_unixctl_enable_ufid, NULL);
|
2014-02-06 09:49:19 -08:00
|
|
|
|
unixctl_command_register("upcall/set-flow-limit", "", 1, 1,
|
|
|
|
|
upcall_unixctl_set_flow_limit, NULL);
|
2014-06-25 14:02:45 +00:00
|
|
|
|
unixctl_command_register("revalidator/wait", "", 0, 0,
|
|
|
|
|
upcall_unixctl_dump_wait, NULL);
|
2014-11-13 10:42:47 -08:00
|
|
|
|
unixctl_command_register("revalidator/purge", "", 0, 0,
|
|
|
|
|
upcall_unixctl_purge, NULL);
|
2013-11-20 18:06:12 -08:00
|
|
|
|
ovsthread_once_done(&once);
|
|
|
|
|
}
|
2015-07-15 23:41:05 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct udpif *
|
|
|
|
|
udpif_create(struct dpif_backer *backer, struct dpif *dpif)
|
|
|
|
|
{
|
|
|
|
|
struct udpif *udpif = xzalloc(sizeof *udpif);
|
2013-11-20 18:06:12 -08:00
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
udpif->dpif = dpif;
|
|
|
|
|
udpif->backer = backer;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
atomic_init(&udpif->flow_limit, MIN(ofproto_flow_limit, 10000));
|
2013-09-17 14:35:53 -07:00
|
|
|
|
udpif->reval_seq = seq_create();
|
2013-09-24 13:39:56 -07:00
|
|
|
|
udpif->dump_seq = seq_create();
|
2013-06-25 14:45:43 -07:00
|
|
|
|
latch_init(&udpif->exit_latch);
|
2015-08-29 06:09:45 +00:00
|
|
|
|
latch_init(&udpif->pause_latch);
|
2016-03-25 14:10:22 -07:00
|
|
|
|
ovs_list_push_back(&all_udpifs, &udpif->list_node);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
atomic_init(&udpif->enable_ufid, false);
|
2014-01-22 06:50:49 +00:00
|
|
|
|
atomic_init(&udpif->n_flows, 0);
|
|
|
|
|
atomic_init(&udpif->n_flows_timestamp, LLONG_MIN);
|
|
|
|
|
ovs_mutex_init(&udpif->n_flows_mutex);
|
2014-06-05 17:28:46 +12:00
|
|
|
|
udpif->ukeys = xmalloc(N_UMAPS * sizeof *udpif->ukeys);
|
|
|
|
|
for (int i = 0; i < N_UMAPS; i++) {
|
|
|
|
|
cmap_init(&udpif->ukeys[i].cmap);
|
|
|
|
|
ovs_mutex_init(&udpif->ukeys[i].mutex);
|
|
|
|
|
}
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
dpif_register_upcall_cb(dpif, upcall_cb, udpif);
|
2015-08-25 16:36:46 -07:00
|
|
|
|
dpif_register_dp_purge_cb(dpif, dp_purge_cb, udpif);
|
2014-07-26 06:51:55 +00:00
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
return udpif;
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-25 14:02:45 +00:00
|
|
|
|
void
|
|
|
|
|
udpif_run(struct udpif *udpif)
|
|
|
|
|
{
|
|
|
|
|
if (udpif->conns && udpif->conn_seq != seq_read(udpif->dump_seq)) {
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < udpif->n_conns; i++) {
|
|
|
|
|
unixctl_command_reply(udpif->conns[i], NULL);
|
|
|
|
|
}
|
|
|
|
|
free(udpif->conns);
|
|
|
|
|
udpif->conns = NULL;
|
|
|
|
|
udpif->n_conns = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
void
|
|
|
|
|
udpif_destroy(struct udpif *udpif)
|
|
|
|
|
{
|
2014-04-21 17:31:11 -07:00
|
|
|
|
udpif_stop_threads(udpif);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
2016-05-16 20:08:01 -07:00
|
|
|
|
dpif_register_dp_purge_cb(udpif->dpif, NULL, udpif);
|
|
|
|
|
dpif_register_upcall_cb(udpif->dpif, NULL, udpif);
|
|
|
|
|
|
2014-06-05 17:28:46 +12:00
|
|
|
|
for (int i = 0; i < N_UMAPS; i++) {
|
|
|
|
|
cmap_destroy(&udpif->ukeys[i].cmap);
|
|
|
|
|
ovs_mutex_destroy(&udpif->ukeys[i].mutex);
|
|
|
|
|
}
|
|
|
|
|
free(udpif->ukeys);
|
|
|
|
|
udpif->ukeys = NULL;
|
|
|
|
|
|
2016-03-25 14:10:22 -07:00
|
|
|
|
ovs_list_remove(&udpif->list_node);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
latch_destroy(&udpif->exit_latch);
|
2015-08-29 06:09:45 +00:00
|
|
|
|
latch_destroy(&udpif->pause_latch);
|
2013-09-17 14:35:53 -07:00
|
|
|
|
seq_destroy(udpif->reval_seq);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
seq_destroy(udpif->dump_seq);
|
2014-01-22 06:50:49 +00:00
|
|
|
|
ovs_mutex_destroy(&udpif->n_flows_mutex);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
free(udpif);
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-21 17:31:11 -07:00
|
|
|
|
/* Stops the handler and revalidator threads, must be enclosed in
|
|
|
|
|
* ovsrcu quiescent state unless when destroying udpif. */
|
|
|
|
|
static void
|
|
|
|
|
udpif_stop_threads(struct udpif *udpif)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
{
|
2014-04-21 20:05:08 -07:00
|
|
|
|
if (udpif && (udpif->n_handlers != 0 || udpif->n_revalidators != 0)) {
|
2013-06-25 14:45:43 -07:00
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
latch_set(&udpif->exit_latch);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < udpif->n_handlers; i++) {
|
|
|
|
|
struct handler *handler = &udpif->handlers[i];
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
xpthread_join(handler->thread, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < udpif->n_revalidators; i++) {
|
2014-04-10 07:14:08 +00:00
|
|
|
|
xpthread_join(udpif->revalidators[i].thread, NULL);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-26 06:51:55 +00:00
|
|
|
|
dpif_disable_upcall(udpif->dpif);
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
for (i = 0; i < udpif->n_revalidators; i++) {
|
|
|
|
|
struct revalidator *revalidator = &udpif->revalidators[i];
|
|
|
|
|
|
2014-02-11 13:55:36 -08:00
|
|
|
|
/* Delete ukeys, and delete all flows from the datapath to prevent
|
|
|
|
|
* double-counting stats. */
|
|
|
|
|
revalidator_purge(revalidator);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
latch_poll(&udpif->exit_latch);
|
|
|
|
|
|
2014-05-29 15:37:37 -07:00
|
|
|
|
ovs_barrier_destroy(&udpif->reval_barrier);
|
2015-08-29 06:09:45 +00:00
|
|
|
|
ovs_barrier_destroy(&udpif->pause_barrier);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
free(udpif->revalidators);
|
|
|
|
|
udpif->revalidators = NULL;
|
|
|
|
|
udpif->n_revalidators = 0;
|
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
free(udpif->handlers);
|
|
|
|
|
udpif->handlers = NULL;
|
|
|
|
|
udpif->n_handlers = 0;
|
|
|
|
|
}
|
2014-04-21 17:31:11 -07:00
|
|
|
|
}
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
2014-04-21 17:31:11 -07:00
|
|
|
|
/* Starts the handler and revalidator threads, must be enclosed in
|
|
|
|
|
* ovsrcu quiescent state. */
|
|
|
|
|
static void
|
|
|
|
|
udpif_start_threads(struct udpif *udpif, size_t n_handlers,
|
|
|
|
|
size_t n_revalidators)
|
|
|
|
|
{
|
2014-04-25 10:39:53 -07:00
|
|
|
|
if (udpif && n_handlers && n_revalidators) {
|
2013-06-25 14:45:43 -07:00
|
|
|
|
size_t i;
|
2014-12-16 17:44:40 -08:00
|
|
|
|
bool enable_ufid;
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
|
|
|
|
udpif->n_handlers = n_handlers;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
udpif->n_revalidators = n_revalidators;
|
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
udpif->handlers = xzalloc(udpif->n_handlers * sizeof *udpif->handlers);
|
|
|
|
|
for (i = 0; i < udpif->n_handlers; i++) {
|
|
|
|
|
struct handler *handler = &udpif->handlers[i];
|
|
|
|
|
|
|
|
|
|
handler->udpif = udpif;
|
2014-02-26 23:03:24 -08:00
|
|
|
|
handler->handler_id = i;
|
ovs-thread: Make caller provide thread name when creating a thread.
Thread names are occasionally very useful for debugging, but from time to
time we've forgotten to set one. This commit adds the new thread's name
as a parameter to the function to start a thread, to make that mistake
impossible. This also simplifies code, since two function calls become
only one.
This makes a few other changes to the thread creation function:
* Since it is no longer a direct wrapper around a pthread function,
rename it to avoid giving that impression.
* Remove 'pthread_attr_t *' param that every caller supplied as NULL.
* Change 'pthread *' parameter into a return value, for convenience.
The system-stats code hadn't set a thread name, so this fixes that issue.
This patch is a prerequisite for making RCU report the name of a thread
that is blocking RCU synchronization, because the easiest way to do that is
for ovsrcu_quiesce_end() to record the current thread's name.
ovsrcu_quiesce_end() is called before the thread function is called, so it
won't get a name set within the thread function itself. Setting the thread
name earlier, as in this patch, avoids the problem.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-25 17:46:21 -07:00
|
|
|
|
handler->thread = ovs_thread_create(
|
|
|
|
|
"handler", udpif_upcall_handler, handler);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-12-16 17:44:40 -08:00
|
|
|
|
enable_ufid = ofproto_dpif_get_enable_ufid(udpif->backer);
|
|
|
|
|
atomic_init(&udpif->enable_ufid, enable_ufid);
|
2014-07-26 06:51:55 +00:00
|
|
|
|
dpif_enable_upcall(udpif->dpif);
|
|
|
|
|
|
2014-05-29 15:37:37 -07:00
|
|
|
|
ovs_barrier_init(&udpif->reval_barrier, udpif->n_revalidators);
|
2015-08-29 06:09:45 +00:00
|
|
|
|
ovs_barrier_init(&udpif->pause_barrier, udpif->n_revalidators + 1);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
udpif->reval_exit = false;
|
2015-08-29 06:09:45 +00:00
|
|
|
|
udpif->pause = false;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
udpif->revalidators = xzalloc(udpif->n_revalidators
|
|
|
|
|
* sizeof *udpif->revalidators);
|
|
|
|
|
for (i = 0; i < udpif->n_revalidators; i++) {
|
|
|
|
|
struct revalidator *revalidator = &udpif->revalidators[i];
|
|
|
|
|
|
|
|
|
|
revalidator->udpif = udpif;
|
ovs-thread: Make caller provide thread name when creating a thread.
Thread names are occasionally very useful for debugging, but from time to
time we've forgotten to set one. This commit adds the new thread's name
as a parameter to the function to start a thread, to make that mistake
impossible. This also simplifies code, since two function calls become
only one.
This makes a few other changes to the thread creation function:
* Since it is no longer a direct wrapper around a pthread function,
rename it to avoid giving that impression.
* Remove 'pthread_attr_t *' param that every caller supplied as NULL.
* Change 'pthread *' parameter into a return value, for convenience.
The system-stats code hadn't set a thread name, so this fixes that issue.
This patch is a prerequisite for making RCU report the name of a thread
that is blocking RCU synchronization, because the easiest way to do that is
for ovsrcu_quiesce_end() to record the current thread's name.
ovsrcu_quiesce_end() is called before the thread function is called, so it
won't get a name set within the thread function itself. Setting the thread
name earlier, as in this patch, avoids the problem.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-25 17:46:21 -07:00
|
|
|
|
revalidator->thread = ovs_thread_create(
|
|
|
|
|
"revalidator", udpif_revalidator, revalidator);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
2014-04-21 17:31:11 -07:00
|
|
|
|
}
|
2014-03-18 16:34:28 -07:00
|
|
|
|
|
2015-08-29 06:09:45 +00:00
|
|
|
|
/* Pauses all revalidators. Should only be called by the main thread.
|
|
|
|
|
* When function returns, all revalidators are paused and will proceed
|
|
|
|
|
* only after udpif_resume_revalidators() is called. */
|
|
|
|
|
static void
|
|
|
|
|
udpif_pause_revalidators(struct udpif *udpif)
|
|
|
|
|
{
|
2015-09-25 11:42:40 -07:00
|
|
|
|
if (ofproto_dpif_backer_enabled(udpif->backer)) {
|
|
|
|
|
latch_set(&udpif->pause_latch);
|
|
|
|
|
ovs_barrier_block(&udpif->pause_barrier);
|
|
|
|
|
}
|
2015-08-29 06:09:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Resumes the pausing of revalidators. Should only be called by the
|
|
|
|
|
* main thread. */
|
|
|
|
|
static void
|
|
|
|
|
udpif_resume_revalidators(struct udpif *udpif)
|
|
|
|
|
{
|
2015-09-25 11:42:40 -07:00
|
|
|
|
if (ofproto_dpif_backer_enabled(udpif->backer)) {
|
|
|
|
|
latch_poll(&udpif->pause_latch);
|
|
|
|
|
ovs_barrier_block(&udpif->pause_barrier);
|
|
|
|
|
}
|
2015-08-29 06:09:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-21 17:31:11 -07:00
|
|
|
|
/* Tells 'udpif' how many threads it should use to handle upcalls.
|
|
|
|
|
* 'n_handlers' and 'n_revalidators' can never be zero. 'udpif''s
|
|
|
|
|
* datapath handle must have packet reception enabled before starting
|
|
|
|
|
* threads. */
|
|
|
|
|
void
|
|
|
|
|
udpif_set_threads(struct udpif *udpif, size_t n_handlers,
|
|
|
|
|
size_t n_revalidators)
|
|
|
|
|
{
|
2014-04-21 20:05:08 -07:00
|
|
|
|
ovs_assert(udpif);
|
2014-04-21 17:31:11 -07:00
|
|
|
|
ovs_assert(n_handlers && n_revalidators);
|
|
|
|
|
|
|
|
|
|
ovsrcu_quiesce_start();
|
2014-04-21 20:05:08 -07:00
|
|
|
|
if (udpif->n_handlers != n_handlers
|
|
|
|
|
|| udpif->n_revalidators != n_revalidators) {
|
|
|
|
|
udpif_stop_threads(udpif);
|
|
|
|
|
}
|
2014-04-21 17:31:11 -07:00
|
|
|
|
|
2014-04-21 20:05:08 -07:00
|
|
|
|
if (!udpif->handlers && !udpif->revalidators) {
|
2014-05-09 14:42:30 -07:00
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
error = dpif_handlers_set(udpif->dpif, n_handlers);
|
|
|
|
|
if (error) {
|
|
|
|
|
VLOG_ERR("failed to configure handlers in dpif %s: %s",
|
|
|
|
|
dpif_name(udpif->dpif), ovs_strerror(error));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-21 20:05:08 -07:00
|
|
|
|
udpif_start_threads(udpif, n_handlers, n_revalidators);
|
|
|
|
|
}
|
2014-03-18 16:34:28 -07:00
|
|
|
|
ovsrcu_quiesce_end();
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-02-25 08:01:01 -08:00
|
|
|
|
/* Waits for all ongoing upcall translations to complete. This ensures that
|
|
|
|
|
* there are no transient references to any removed ofprotos (or other
|
|
|
|
|
* objects). In particular, this should be called after an ofproto is removed
|
|
|
|
|
* (e.g. via xlate_remove_ofproto()) but before it is destroyed. */
|
|
|
|
|
void
|
|
|
|
|
udpif_synchronize(struct udpif *udpif)
|
|
|
|
|
{
|
|
|
|
|
/* This is stronger than necessary. It would be sufficient to ensure
|
|
|
|
|
* (somehow) that each handler and revalidator thread had passed through
|
|
|
|
|
* its main loop once. */
|
|
|
|
|
size_t n_handlers = udpif->n_handlers;
|
|
|
|
|
size_t n_revalidators = udpif->n_revalidators;
|
2014-04-21 17:31:11 -07:00
|
|
|
|
|
|
|
|
|
ovsrcu_quiesce_start();
|
|
|
|
|
udpif_stop_threads(udpif);
|
|
|
|
|
udpif_start_threads(udpif, n_handlers, n_revalidators);
|
|
|
|
|
ovsrcu_quiesce_end();
|
2014-02-25 08:01:01 -08:00
|
|
|
|
}
|
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
/* Notifies 'udpif' that something changed which may render previous
|
|
|
|
|
* xlate_actions() results invalid. */
|
|
|
|
|
void
|
|
|
|
|
udpif_revalidate(struct udpif *udpif)
|
|
|
|
|
{
|
2013-09-17 14:35:53 -07:00
|
|
|
|
seq_change(udpif->reval_seq);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
2013-09-12 17:42:23 -07:00
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
/* Returns a seq which increments every time 'udpif' pulls stats from the
|
|
|
|
|
* datapath. Callers can use this to get a sense of when might be a good time
|
|
|
|
|
* to do periodic work which relies on relatively up to date statistics. */
|
|
|
|
|
struct seq *
|
|
|
|
|
udpif_dump_seq(struct udpif *udpif)
|
|
|
|
|
{
|
|
|
|
|
return udpif->dump_seq;
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-11-20 17:41:02 -08:00
|
|
|
|
void
|
|
|
|
|
udpif_get_memory_usage(struct udpif *udpif, struct simap *usage)
|
|
|
|
|
{
|
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
simap_increase(usage, "handlers", udpif->n_handlers);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
|
|
|
|
simap_increase(usage, "revalidators", udpif->n_revalidators);
|
2014-06-05 17:28:46 +12:00
|
|
|
|
for (i = 0; i < N_UMAPS; i++) {
|
2014-05-05 15:44:40 +12:00
|
|
|
|
simap_increase(usage, "udpif keys", cmap_count(&udpif->ukeys[i].cmap));
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
2013-11-20 17:41:02 -08:00
|
|
|
|
}
|
|
|
|
|
|
udpif: Bug fix updif_flush
Before this commit, all datapath flows are cleared with dpif_flush(),
but the revalidator thread still holds ukeys, which are caches of the
datapath flows in the revalidaor. Flushing ukeys causes flow_del
messages to be sent to the datapath again on flows that have been
deleted by the dpif_flush() already.
Double deletion by itself is not problem, per se, may an efficiency
issue. However, for ever flow_del message sent to the datapath, a log
message, at the warning level, will be generated in case datapath
failed to execute the command. In addition to cause spurious log
messages, Double deletion causes unit tests to report erroneous
failures as all warning messages are considered test failures.
The fix is to simply shut down the revalidator threads to flush all
ukeys, then flush the datapth before restarting the revalidator threads.
dpif_flush() was implemented as flush flows of all datapaths while
most of its invocation should only flush its local datapath.
Only megaflow on/off commands should flush all dapapaths. This bug is
also fixed.
Found during development.
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-03-13 21:48:55 -07:00
|
|
|
|
/* Remove flows from a single datapath. */
|
2013-09-24 13:39:56 -07:00
|
|
|
|
void
|
udpif: Bug fix updif_flush
Before this commit, all datapath flows are cleared with dpif_flush(),
but the revalidator thread still holds ukeys, which are caches of the
datapath flows in the revalidaor. Flushing ukeys causes flow_del
messages to be sent to the datapath again on flows that have been
deleted by the dpif_flush() already.
Double deletion by itself is not problem, per se, may an efficiency
issue. However, for ever flow_del message sent to the datapath, a log
message, at the warning level, will be generated in case datapath
failed to execute the command. In addition to cause spurious log
messages, Double deletion causes unit tests to report erroneous
failures as all warning messages are considered test failures.
The fix is to simply shut down the revalidator threads to flush all
ukeys, then flush the datapth before restarting the revalidator threads.
dpif_flush() was implemented as flush flows of all datapaths while
most of its invocation should only flush its local datapath.
Only megaflow on/off commands should flush all dapapaths. This bug is
also fixed.
Found during development.
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-03-13 21:48:55 -07:00
|
|
|
|
udpif_flush(struct udpif *udpif)
|
|
|
|
|
{
|
|
|
|
|
size_t n_handlers, n_revalidators;
|
|
|
|
|
|
|
|
|
|
n_handlers = udpif->n_handlers;
|
|
|
|
|
n_revalidators = udpif->n_revalidators;
|
|
|
|
|
|
2014-04-21 17:31:11 -07:00
|
|
|
|
ovsrcu_quiesce_start();
|
|
|
|
|
|
|
|
|
|
udpif_stop_threads(udpif);
|
udpif: Bug fix updif_flush
Before this commit, all datapath flows are cleared with dpif_flush(),
but the revalidator thread still holds ukeys, which are caches of the
datapath flows in the revalidaor. Flushing ukeys causes flow_del
messages to be sent to the datapath again on flows that have been
deleted by the dpif_flush() already.
Double deletion by itself is not problem, per se, may an efficiency
issue. However, for ever flow_del message sent to the datapath, a log
message, at the warning level, will be generated in case datapath
failed to execute the command. In addition to cause spurious log
messages, Double deletion causes unit tests to report erroneous
failures as all warning messages are considered test failures.
The fix is to simply shut down the revalidator threads to flush all
ukeys, then flush the datapth before restarting the revalidator threads.
dpif_flush() was implemented as flush flows of all datapaths while
most of its invocation should only flush its local datapath.
Only megaflow on/off commands should flush all dapapaths. This bug is
also fixed.
Found during development.
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-03-13 21:48:55 -07:00
|
|
|
|
dpif_flow_flush(udpif->dpif);
|
2014-04-21 17:31:11 -07:00
|
|
|
|
udpif_start_threads(udpif, n_handlers, n_revalidators);
|
|
|
|
|
|
|
|
|
|
ovsrcu_quiesce_end();
|
udpif: Bug fix updif_flush
Before this commit, all datapath flows are cleared with dpif_flush(),
but the revalidator thread still holds ukeys, which are caches of the
datapath flows in the revalidaor. Flushing ukeys causes flow_del
messages to be sent to the datapath again on flows that have been
deleted by the dpif_flush() already.
Double deletion by itself is not problem, per se, may an efficiency
issue. However, for ever flow_del message sent to the datapath, a log
message, at the warning level, will be generated in case datapath
failed to execute the command. In addition to cause spurious log
messages, Double deletion causes unit tests to report erroneous
failures as all warning messages are considered test failures.
The fix is to simply shut down the revalidator threads to flush all
ukeys, then flush the datapth before restarting the revalidator threads.
dpif_flush() was implemented as flush flows of all datapaths while
most of its invocation should only flush its local datapath.
Only megaflow on/off commands should flush all dapapaths. This bug is
also fixed.
Found during development.
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-03-13 21:48:55 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Removes all flows from all datapaths. */
|
|
|
|
|
static void
|
|
|
|
|
udpif_flush_all_datapaths(void)
|
2013-09-24 13:39:56 -07:00
|
|
|
|
{
|
|
|
|
|
struct udpif *udpif;
|
|
|
|
|
|
|
|
|
|
LIST_FOR_EACH (udpif, list_node, &all_udpifs) {
|
udpif: Bug fix updif_flush
Before this commit, all datapath flows are cleared with dpif_flush(),
but the revalidator thread still holds ukeys, which are caches of the
datapath flows in the revalidaor. Flushing ukeys causes flow_del
messages to be sent to the datapath again on flows that have been
deleted by the dpif_flush() already.
Double deletion by itself is not problem, per se, may an efficiency
issue. However, for ever flow_del message sent to the datapath, a log
message, at the warning level, will be generated in case datapath
failed to execute the command. In addition to cause spurious log
messages, Double deletion causes unit tests to report erroneous
failures as all warning messages are considered test failures.
The fix is to simply shut down the revalidator threads to flush all
ukeys, then flush the datapth before restarting the revalidator threads.
dpif_flush() was implemented as flush flows of all datapaths while
most of its invocation should only flush its local datapath.
Only megaflow on/off commands should flush all dapapaths. This bug is
also fixed.
Found during development.
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-03-13 21:48:55 -07:00
|
|
|
|
udpif_flush(udpif);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
udpif: Bug fix updif_flush
Before this commit, all datapath flows are cleared with dpif_flush(),
but the revalidator thread still holds ukeys, which are caches of the
datapath flows in the revalidaor. Flushing ukeys causes flow_del
messages to be sent to the datapath again on flows that have been
deleted by the dpif_flush() already.
Double deletion by itself is not problem, per se, may an efficiency
issue. However, for ever flow_del message sent to the datapath, a log
message, at the warning level, will be generated in case datapath
failed to execute the command. In addition to cause spurious log
messages, Double deletion causes unit tests to report erroneous
failures as all warning messages are considered test failures.
The fix is to simply shut down the revalidator threads to flush all
ukeys, then flush the datapth before restarting the revalidator threads.
dpif_flush() was implemented as flush flows of all datapaths while
most of its invocation should only flush its local datapath.
Only megaflow on/off commands should flush all dapapaths. This bug is
also fixed.
Found during development.
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-03-13 21:48:55 -07:00
|
|
|
|
|
2014-12-19 09:54:38 -08:00
|
|
|
|
static bool
|
|
|
|
|
udpif_use_ufid(struct udpif *udpif)
|
|
|
|
|
{
|
|
|
|
|
bool enable;
|
|
|
|
|
|
|
|
|
|
atomic_read_relaxed(&enable_ufid, &enable);
|
|
|
|
|
return enable && ofproto_dpif_get_enable_ufid(udpif->backer);
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-05-14 16:19:34 +09:00
|
|
|
|
static unsigned long
|
2014-01-22 06:50:49 +00:00
|
|
|
|
udpif_get_n_flows(struct udpif *udpif)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
{
|
2014-01-22 06:50:49 +00:00
|
|
|
|
long long int time, now;
|
2014-05-14 16:19:34 +09:00
|
|
|
|
unsigned long flow_count;
|
2014-01-22 06:50:49 +00:00
|
|
|
|
|
|
|
|
|
now = time_msec();
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_read_relaxed(&udpif->n_flows_timestamp, &time);
|
2014-01-22 06:50:49 +00:00
|
|
|
|
if (time < now - 100 && !ovs_mutex_trylock(&udpif->n_flows_mutex)) {
|
|
|
|
|
struct dpif_dp_stats stats;
|
|
|
|
|
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_store_relaxed(&udpif->n_flows_timestamp, now);
|
2014-01-22 06:50:49 +00:00
|
|
|
|
dpif_get_dp_stats(udpif->dpif, &stats);
|
|
|
|
|
flow_count = stats.n_flows;
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_store_relaxed(&udpif->n_flows, flow_count);
|
2014-01-22 06:50:49 +00:00
|
|
|
|
ovs_mutex_unlock(&udpif->n_flows_mutex);
|
|
|
|
|
} else {
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_read_relaxed(&udpif->n_flows, &flow_count);
|
2014-01-22 06:50:49 +00:00
|
|
|
|
}
|
|
|
|
|
return flow_count;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
2014-05-20 21:50:19 -07:00
|
|
|
|
/* The upcall handler thread tries to read a batch of UPCALL_MAX_BATCH
|
2014-02-26 23:03:24 -08:00
|
|
|
|
* upcalls from dpif, processes the batch and installs corresponding flows
|
|
|
|
|
* in dpif. */
|
2013-06-25 14:45:43 -07:00
|
|
|
|
static void *
|
2013-09-24 15:04:04 -07:00
|
|
|
|
udpif_upcall_handler(void *arg)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
{
|
|
|
|
|
struct handler *handler = arg;
|
2014-02-26 23:03:24 -08:00
|
|
|
|
struct udpif *udpif = handler->udpif;
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
2013-12-27 16:29:24 -08:00
|
|
|
|
while (!latch_is_set(&handler->udpif->exit_latch)) {
|
2014-07-25 13:54:24 +12:00
|
|
|
|
if (recv_upcalls(handler)) {
|
|
|
|
|
poll_immediate_wake();
|
|
|
|
|
} else {
|
2014-02-26 23:03:24 -08:00
|
|
|
|
dpif_recv_wait(udpif->dpif, handler->handler_id);
|
|
|
|
|
latch_wait(&udpif->exit_latch);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
2014-07-25 13:54:24 +12:00
|
|
|
|
poll_block();
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
2013-12-27 16:29:24 -08:00
|
|
|
|
|
|
|
|
|
return NULL;
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
static size_t
|
|
|
|
|
recv_upcalls(struct handler *handler)
|
|
|
|
|
{
|
|
|
|
|
struct udpif *udpif = handler->udpif;
|
|
|
|
|
uint64_t recv_stubs[UPCALL_MAX_BATCH][512 / 8];
|
|
|
|
|
struct ofpbuf recv_bufs[UPCALL_MAX_BATCH];
|
2014-08-15 00:59:36 -07:00
|
|
|
|
struct dpif_upcall dupcalls[UPCALL_MAX_BATCH];
|
2014-08-06 18:49:44 -07:00
|
|
|
|
struct upcall upcalls[UPCALL_MAX_BATCH];
|
2014-10-10 14:41:10 -07:00
|
|
|
|
struct flow flows[UPCALL_MAX_BATCH];
|
2014-08-06 18:49:44 -07:00
|
|
|
|
size_t n_upcalls, i;
|
|
|
|
|
|
|
|
|
|
n_upcalls = 0;
|
|
|
|
|
while (n_upcalls < UPCALL_MAX_BATCH) {
|
|
|
|
|
struct ofpbuf *recv_buf = &recv_bufs[n_upcalls];
|
2014-08-15 00:59:36 -07:00
|
|
|
|
struct dpif_upcall *dupcall = &dupcalls[n_upcalls];
|
2014-08-06 18:49:44 -07:00
|
|
|
|
struct upcall *upcall = &upcalls[n_upcalls];
|
2014-10-10 14:41:10 -07:00
|
|
|
|
struct flow *flow = &flows[n_upcalls];
|
2015-02-26 15:52:34 -08:00
|
|
|
|
unsigned int mru;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
int error;
|
|
|
|
|
|
2014-08-14 15:48:00 -07:00
|
|
|
|
ofpbuf_use_stub(recv_buf, recv_stubs[n_upcalls],
|
2014-08-06 18:49:44 -07:00
|
|
|
|
sizeof recv_stubs[n_upcalls]);
|
2014-08-15 00:59:36 -07:00
|
|
|
|
if (dpif_recv(udpif->dpif, handler->handler_id, dupcall, recv_buf)) {
|
2014-08-06 18:49:44 -07:00
|
|
|
|
ofpbuf_uninit(recv_buf);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-10 14:41:10 -07:00
|
|
|
|
if (odp_flow_key_to_flow(dupcall->key, dupcall->key_len, flow)
|
2014-08-06 18:49:44 -07:00
|
|
|
|
== ODP_FIT_ERROR) {
|
|
|
|
|
goto free_dupcall;
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-26 15:52:34 -08:00
|
|
|
|
if (dupcall->mru) {
|
|
|
|
|
mru = nl_attr_get_u16(dupcall->mru);
|
|
|
|
|
} else {
|
|
|
|
|
mru = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-15 00:59:36 -07:00
|
|
|
|
error = upcall_receive(upcall, udpif->backer, &dupcall->packet,
|
2015-02-26 15:52:34 -08:00
|
|
|
|
dupcall->type, dupcall->userdata, flow, mru,
|
2014-10-12 18:18:47 -07:00
|
|
|
|
&dupcall->ufid, PMD_ID_NULL);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
if (error) {
|
|
|
|
|
if (error == ENODEV) {
|
|
|
|
|
/* Received packet on datapath port for which we couldn't
|
|
|
|
|
* associate an ofproto. This can happen if a port is removed
|
|
|
|
|
* while traffic is being received. Print a rate-limited
|
|
|
|
|
* message in case it happens frequently. */
|
2014-08-15 00:59:36 -07:00
|
|
|
|
dpif_flow_put(udpif->dpif, DPIF_FP_CREATE, dupcall->key,
|
2014-09-24 16:26:35 +12:00
|
|
|
|
dupcall->key_len, NULL, 0, NULL, 0,
|
2014-10-12 18:18:47 -07:00
|
|
|
|
&dupcall->ufid, PMD_ID_NULL, NULL);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
VLOG_INFO_RL(&rl, "received packet on unassociated datapath "
|
2014-10-10 14:41:10 -07:00
|
|
|
|
"port %"PRIu32, flow->in_port.odp_port);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
}
|
|
|
|
|
goto free_dupcall;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-15 00:59:36 -07:00
|
|
|
|
upcall->key = dupcall->key;
|
|
|
|
|
upcall->key_len = dupcall->key_len;
|
2014-09-24 15:24:39 +12:00
|
|
|
|
upcall->ufid = &dupcall->ufid;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
2014-08-17 20:19:36 -07:00
|
|
|
|
upcall->out_tun_key = dupcall->out_tun_key;
|
2015-07-22 15:49:51 -07:00
|
|
|
|
upcall->actions = dupcall->actions;
|
2014-08-17 20:19:36 -07:00
|
|
|
|
|
2015-02-22 03:21:09 -08:00
|
|
|
|
pkt_metadata_from_flow(&dupcall->packet.md, flow);
|
|
|
|
|
flow_extract(&dupcall->packet, flow);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
2015-07-31 13:34:16 -07:00
|
|
|
|
error = process_upcall(udpif, upcall,
|
|
|
|
|
&upcall->odp_actions, &upcall->wc);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
if (error) {
|
|
|
|
|
goto cleanup;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
n_upcalls++;
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
|
upcall_uninit(upcall);
|
|
|
|
|
free_dupcall:
|
2015-02-22 03:21:09 -08:00
|
|
|
|
dp_packet_uninit(&dupcall->packet);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
ofpbuf_uninit(recv_buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (n_upcalls) {
|
|
|
|
|
handle_upcalls(handler->udpif, upcalls, n_upcalls);
|
|
|
|
|
for (i = 0; i < n_upcalls; i++) {
|
2015-02-22 03:21:09 -08:00
|
|
|
|
dp_packet_uninit(&dupcalls[i].packet);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
ofpbuf_uninit(&recv_bufs[i]);
|
|
|
|
|
upcall_uninit(&upcalls[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return n_upcalls;
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
static void *
|
|
|
|
|
udpif_revalidator(void *arg)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
{
|
2014-04-10 07:14:08 +00:00
|
|
|
|
/* Used by all revalidators. */
|
2013-09-24 13:39:56 -07:00
|
|
|
|
struct revalidator *revalidator = arg;
|
2014-04-10 07:14:08 +00:00
|
|
|
|
struct udpif *udpif = revalidator->udpif;
|
|
|
|
|
bool leader = revalidator == &udpif->revalidators[0];
|
|
|
|
|
|
|
|
|
|
/* Used only by the leader. */
|
|
|
|
|
long long int start_time = 0;
|
|
|
|
|
uint64_t last_reval_seq = 0;
|
|
|
|
|
size_t n_flows = 0;
|
2013-06-25 14:45:43 -07:00
|
|
|
|
|
ovs-thread: Make caller provide thread name when creating a thread.
Thread names are occasionally very useful for debugging, but from time to
time we've forgotten to set one. This commit adds the new thread's name
as a parameter to the function to start a thread, to make that mistake
impossible. This also simplifies code, since two function calls become
only one.
This makes a few other changes to the thread creation function:
* Since it is no longer a direct wrapper around a pthread function,
rename it to avoid giving that impression.
* Remove 'pthread_attr_t *' param that every caller supplied as NULL.
* Change 'pthread *' parameter into a return value, for convenience.
The system-stats code hadn't set a thread name, so this fixes that issue.
This patch is a prerequisite for making RCU report the name of a thread
that is blocking RCU synchronization, because the easiest way to do that is
for ovsrcu_quiesce_end() to record the current thread's name.
ovsrcu_quiesce_end() is called before the thread function is called, so it
won't get a name set within the thread function itself. Setting the thread
name earlier, as in this patch, avoids the problem.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-25 17:46:21 -07:00
|
|
|
|
revalidator->id = ovsthread_id_self();
|
2013-09-24 13:39:56 -07:00
|
|
|
|
for (;;) {
|
2014-04-10 07:14:08 +00:00
|
|
|
|
if (leader) {
|
|
|
|
|
uint64_t reval_seq;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2015-03-26 11:18:16 -07:00
|
|
|
|
recirc_run(); /* Recirculation cleanup. */
|
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
reval_seq = seq_read(udpif->reval_seq);
|
|
|
|
|
last_reval_seq = reval_seq;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
n_flows = udpif_get_n_flows(udpif);
|
|
|
|
|
udpif->max_n_flows = MAX(n_flows, udpif->max_n_flows);
|
|
|
|
|
udpif->avg_n_flows = (udpif->avg_n_flows + n_flows) / 2;
|
|
|
|
|
|
2015-08-29 06:09:45 +00:00
|
|
|
|
/* Only the leader checks the pause latch to prevent a race where
|
|
|
|
|
* some threads think it's false and proceed to block on
|
|
|
|
|
* reval_barrier and others think it's true and block indefinitely
|
|
|
|
|
* on the pause_barrier */
|
|
|
|
|
udpif->pause = latch_is_set(&udpif->pause_latch);
|
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
/* Only the leader checks the exit latch to prevent a race where
|
|
|
|
|
* some threads think it's true and exit and others think it's
|
|
|
|
|
* false and block indefinitely on the reval_barrier */
|
|
|
|
|
udpif->reval_exit = latch_is_set(&udpif->exit_latch);
|
|
|
|
|
|
|
|
|
|
start_time = time_msec();
|
|
|
|
|
if (!udpif->reval_exit) {
|
2014-10-06 11:14:08 +13:00
|
|
|
|
bool terse_dump;
|
|
|
|
|
|
2014-12-19 09:54:38 -08:00
|
|
|
|
terse_dump = udpif_use_ufid(udpif);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
udpif->dump = dpif_flow_dump_create(udpif->dpif, terse_dump);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
/* Wait for the leader to start the flow dump. */
|
2014-05-29 15:37:37 -07:00
|
|
|
|
ovs_barrier_block(&udpif->reval_barrier);
|
2015-08-29 06:09:45 +00:00
|
|
|
|
if (udpif->pause) {
|
|
|
|
|
revalidator_pause(revalidator);
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
if (udpif->reval_exit) {
|
|
|
|
|
break;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
2014-04-10 07:14:08 +00:00
|
|
|
|
revalidate(revalidator);
|
|
|
|
|
|
|
|
|
|
/* Wait for all flows to have been dumped before we garbage collect. */
|
2014-05-29 15:37:37 -07:00
|
|
|
|
ovs_barrier_block(&udpif->reval_barrier);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
revalidator_sweep(revalidator);
|
|
|
|
|
|
|
|
|
|
/* Wait for all revalidators to finish garbage collection. */
|
2014-05-29 15:37:37 -07:00
|
|
|
|
ovs_barrier_block(&udpif->reval_barrier);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
|
|
|
|
|
if (leader) {
|
2014-08-29 10:34:53 -07:00
|
|
|
|
unsigned int flow_limit;
|
2014-04-10 07:14:08 +00:00
|
|
|
|
long long int duration;
|
|
|
|
|
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_read_relaxed(&udpif->flow_limit, &flow_limit);
|
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
dpif_flow_dump_destroy(udpif->dump);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
seq_change(udpif->dump_seq);
|
|
|
|
|
|
|
|
|
|
duration = MAX(time_msec() - start_time, 1);
|
|
|
|
|
udpif->dump_duration = duration;
|
|
|
|
|
if (duration > 2000) {
|
|
|
|
|
flow_limit /= duration / 1000;
|
|
|
|
|
} else if (duration > 1300) {
|
|
|
|
|
flow_limit = flow_limit * 3 / 4;
|
|
|
|
|
} else if (duration < 1000 && n_flows > 2000
|
|
|
|
|
&& flow_limit < n_flows * 1000 / duration) {
|
|
|
|
|
flow_limit += 1000;
|
|
|
|
|
}
|
|
|
|
|
flow_limit = MIN(ofproto_flow_limit, MAX(flow_limit, 1000));
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_store_relaxed(&udpif->flow_limit, flow_limit);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
if (duration > 2000) {
|
|
|
|
|
VLOG_INFO("Spent an unreasonably long %lldms dumping flows",
|
|
|
|
|
duration);
|
|
|
|
|
}
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-04-10 07:14:08 +00:00
|
|
|
|
poll_timer_wait_until(start_time + MIN(ofproto_max_idle, 500));
|
|
|
|
|
seq_wait(udpif->reval_seq, last_reval_seq);
|
|
|
|
|
latch_wait(&udpif->exit_latch);
|
2015-08-29 06:09:45 +00:00
|
|
|
|
latch_wait(&udpif->pause_latch);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
poll_block();
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2013-06-25 14:45:43 -07:00
|
|
|
|
static enum upcall_type
|
2014-08-06 18:49:44 -07:00
|
|
|
|
classify_upcall(enum dpif_upcall_type type, const struct nlattr *userdata)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
{
|
|
|
|
|
union user_action_cookie cookie;
|
|
|
|
|
size_t userdata_len;
|
|
|
|
|
|
|
|
|
|
/* First look at the upcall type. */
|
2014-08-06 18:49:44 -07:00
|
|
|
|
switch (type) {
|
2013-06-25 14:45:43 -07:00
|
|
|
|
case DPIF_UC_ACTION:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DPIF_UC_MISS:
|
|
|
|
|
return MISS_UPCALL;
|
|
|
|
|
|
|
|
|
|
case DPIF_N_UC_TYPES:
|
|
|
|
|
default:
|
2014-08-06 18:49:44 -07:00
|
|
|
|
VLOG_WARN_RL(&rl, "upcall has unexpected type %"PRIu32, type);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
return BAD_UPCALL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* "action" upcalls need a closer look. */
|
2014-08-06 18:49:44 -07:00
|
|
|
|
if (!userdata) {
|
2013-06-25 14:45:43 -07:00
|
|
|
|
VLOG_WARN_RL(&rl, "action upcall missing cookie");
|
|
|
|
|
return BAD_UPCALL;
|
|
|
|
|
}
|
2014-08-06 18:49:44 -07:00
|
|
|
|
userdata_len = nl_attr_get_size(userdata);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
if (userdata_len < sizeof cookie.type
|
|
|
|
|
|| userdata_len > sizeof cookie) {
|
2013-11-25 23:38:48 -08:00
|
|
|
|
VLOG_WARN_RL(&rl, "action upcall cookie has unexpected size %"PRIuSIZE,
|
2013-06-25 14:45:43 -07:00
|
|
|
|
userdata_len);
|
|
|
|
|
return BAD_UPCALL;
|
|
|
|
|
}
|
|
|
|
|
memset(&cookie, 0, sizeof cookie);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
memcpy(&cookie, nl_attr_get(userdata), userdata_len);
|
2014-02-11 15:21:08 -08:00
|
|
|
|
if (userdata_len == MAX(8, sizeof cookie.sflow)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
&& cookie.type == USER_ACTION_COOKIE_SFLOW) {
|
|
|
|
|
return SFLOW_UPCALL;
|
2014-02-11 15:21:08 -08:00
|
|
|
|
} else if (userdata_len == MAX(8, sizeof cookie.slow_path)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
&& cookie.type == USER_ACTION_COOKIE_SLOW_PATH) {
|
|
|
|
|
return MISS_UPCALL;
|
2014-02-11 15:21:08 -08:00
|
|
|
|
} else if (userdata_len == MAX(8, sizeof cookie.flow_sample)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
&& cookie.type == USER_ACTION_COOKIE_FLOW_SAMPLE) {
|
|
|
|
|
return FLOW_SAMPLE_UPCALL;
|
2014-02-11 15:21:08 -08:00
|
|
|
|
} else if (userdata_len == MAX(8, sizeof cookie.ipfix)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
&& cookie.type == USER_ACTION_COOKIE_IPFIX) {
|
|
|
|
|
return IPFIX_UPCALL;
|
|
|
|
|
} else {
|
|
|
|
|
VLOG_WARN_RL(&rl, "invalid user cookie of type %"PRIu16
|
2013-11-25 23:38:48 -08:00
|
|
|
|
" and size %"PRIuSIZE, cookie.type, userdata_len);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
return BAD_UPCALL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
/* Calculates slow path actions for 'xout'. 'buf' must statically be
|
|
|
|
|
* initialized with at least 128 bytes of space. */
|
|
|
|
|
static void
|
|
|
|
|
compose_slow_path(struct udpif *udpif, struct xlate_out *xout,
|
2014-08-06 18:49:44 -07:00
|
|
|
|
const struct flow *flow, odp_port_t odp_in_port,
|
2014-02-26 23:03:24 -08:00
|
|
|
|
struct ofpbuf *buf)
|
2013-09-24 13:39:56 -07:00
|
|
|
|
{
|
|
|
|
|
union user_action_cookie cookie;
|
|
|
|
|
odp_port_t port;
|
|
|
|
|
uint32_t pid;
|
|
|
|
|
|
|
|
|
|
cookie.type = USER_ACTION_COOKIE_SLOW_PATH;
|
|
|
|
|
cookie.slow_path.unused = 0;
|
|
|
|
|
cookie.slow_path.reason = xout->slow;
|
|
|
|
|
|
|
|
|
|
port = xout->slow & (SLOW_CFM | SLOW_BFD | SLOW_LACP | SLOW_STP)
|
|
|
|
|
? ODPP_NONE
|
|
|
|
|
: odp_in_port;
|
2014-02-26 23:03:24 -08:00
|
|
|
|
pid = dpif_port_get_pid(udpif->dpif, port, flow_hash_5tuple(flow, 0));
|
2015-07-17 21:37:02 -07:00
|
|
|
|
odp_put_userspace_action(pid, &cookie, sizeof cookie.slow_path,
|
|
|
|
|
ODPP_NONE, false, buf);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-09-08 10:41:36 -07:00
|
|
|
|
/* If there is no error, the upcall must be destroyed with upcall_uninit()
|
|
|
|
|
* before quiescing, as the referred objects are guaranteed to exist only
|
|
|
|
|
* until the calling thread quiesces. Otherwise, do not call upcall_uninit()
|
|
|
|
|
* since the 'upcall->put_actions' remains uninitialized. */
|
2014-08-06 18:49:44 -07:00
|
|
|
|
static int
|
|
|
|
|
upcall_receive(struct upcall *upcall, const struct dpif_backer *backer,
|
2015-02-22 03:21:09 -08:00
|
|
|
|
const struct dp_packet *packet, enum dpif_upcall_type type,
|
2014-09-24 15:24:39 +12:00
|
|
|
|
const struct nlattr *userdata, const struct flow *flow,
|
2015-02-26 15:52:34 -08:00
|
|
|
|
const unsigned int mru,
|
2015-05-22 17:14:19 +01:00
|
|
|
|
const ovs_u128 *ufid, const unsigned pmd_id)
|
2014-08-06 18:49:44 -07:00
|
|
|
|
{
|
|
|
|
|
int error;
|
|
|
|
|
|
2014-08-22 09:01:36 -07:00
|
|
|
|
error = xlate_lookup(backer, flow, &upcall->ofproto, &upcall->ipfix,
|
|
|
|
|
&upcall->sflow, NULL, &upcall->in_port);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
if (error) {
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-26 11:18:16 -07:00
|
|
|
|
upcall->recirc = NULL;
|
|
|
|
|
upcall->have_recirc_ref = false;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
upcall->flow = flow;
|
|
|
|
|
upcall->packet = packet;
|
2014-09-24 15:24:39 +12:00
|
|
|
|
upcall->ufid = ufid;
|
2014-10-12 18:18:47 -07:00
|
|
|
|
upcall->pmd_id = pmd_id;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
upcall->type = type;
|
|
|
|
|
upcall->userdata = userdata;
|
2015-07-31 13:34:16 -07:00
|
|
|
|
ofpbuf_use_stub(&upcall->odp_actions, upcall->odp_actions_stub,
|
|
|
|
|
sizeof upcall->odp_actions_stub);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
ofpbuf_init(&upcall->put_actions, 0);
|
|
|
|
|
|
|
|
|
|
upcall->xout_initialized = false;
|
2014-07-25 13:54:24 +12:00
|
|
|
|
upcall->ukey_persists = false;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
upcall->ukey = NULL;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
upcall->key = NULL;
|
|
|
|
|
upcall->key_len = 0;
|
2015-02-26 15:52:34 -08:00
|
|
|
|
upcall->mru = mru;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
2014-08-17 20:19:36 -07:00
|
|
|
|
upcall->out_tun_key = NULL;
|
2015-07-17 21:37:02 -07:00
|
|
|
|
upcall->actions = NULL;
|
2014-08-17 20:19:36 -07:00
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-20 21:50:19 -07:00
|
|
|
|
static void
|
2014-08-06 18:49:44 -07:00
|
|
|
|
upcall_xlate(struct udpif *udpif, struct upcall *upcall,
|
2015-07-31 13:15:52 -07:00
|
|
|
|
struct ofpbuf *odp_actions, struct flow_wildcards *wc)
|
2013-06-25 14:45:43 -07:00
|
|
|
|
{
|
2014-08-06 18:49:44 -07:00
|
|
|
|
struct dpif_flow_stats stats;
|
2014-05-22 10:53:27 -07:00
|
|
|
|
struct xlate_in xin;
|
2014-05-20 21:50:19 -07:00
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
stats.n_packets = 1;
|
2015-02-22 03:21:09 -08:00
|
|
|
|
stats.n_bytes = dp_packet_size(upcall->packet);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
stats.used = time_msec();
|
|
|
|
|
stats.tcp_flags = ntohs(upcall->flow->tcp_flags);
|
2014-05-20 21:50:19 -07:00
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
xlate_in_init(&xin, upcall->ofproto, upcall->flow, upcall->in_port, NULL,
|
2015-07-31 13:34:16 -07:00
|
|
|
|
stats.tcp_flags, upcall->packet, wc, odp_actions);
|
2014-05-20 21:50:19 -07:00
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
if (upcall->type == DPIF_UC_MISS) {
|
|
|
|
|
xin.resubmit_stats = &stats;
|
2015-03-26 11:18:16 -07:00
|
|
|
|
|
2016-02-16 10:51:58 -08:00
|
|
|
|
if (xin.frozen_state) {
|
2015-03-26 11:18:16 -07:00
|
|
|
|
/* We may install a datapath flow only if we get a reference to the
|
|
|
|
|
* recirculation context (otherwise we could have recirculation
|
|
|
|
|
* upcalls using recirculation ID for which no context can be
|
|
|
|
|
* found). We may still execute the flow's actions even if we
|
|
|
|
|
* don't install the flow. */
|
2016-02-16 10:51:58 -08:00
|
|
|
|
upcall->recirc = recirc_id_node_from_state(xin.frozen_state);
|
2016-01-20 16:53:01 -08:00
|
|
|
|
upcall->have_recirc_ref = recirc_id_node_try_ref_rcu(upcall->recirc);
|
2015-03-26 11:18:16 -07:00
|
|
|
|
}
|
2014-05-20 21:50:19 -07:00
|
|
|
|
} else {
|
2015-03-26 11:18:16 -07:00
|
|
|
|
/* For non-miss upcalls, we are either executing actions (one of which
|
|
|
|
|
* is an userspace action) for an upcall, in which case the stats have
|
|
|
|
|
* already been taken care of, or there's a flow in the datapath which
|
|
|
|
|
* this packet was accounted to. Presumably the revalidators will deal
|
2014-05-20 21:50:19 -07:00
|
|
|
|
* with pushing its stats eventually. */
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
upcall->dump_seq = seq_read(udpif->dump_seq);
|
|
|
|
|
upcall->reval_seq = seq_read(udpif->reval_seq);
|
2016-06-09 13:18:45 -07:00
|
|
|
|
|
2014-05-20 21:50:19 -07:00
|
|
|
|
xlate_actions(&xin, &upcall->xout);
|
2016-06-09 13:18:45 -07:00
|
|
|
|
if (wc) {
|
|
|
|
|
/* Convert the input port wildcard from OFP to ODP format. There's no
|
|
|
|
|
* real way to do this for arbitrary bitmasks since the numbering spaces
|
|
|
|
|
* aren't the same. However, flow translation always exact matches the
|
|
|
|
|
* whole thing, so we can do the same here. */
|
|
|
|
|
WC_MASK_FIELD(wc, in_port.odp_port);
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
upcall->xout_initialized = true;
|
|
|
|
|
|
|
|
|
|
if (!upcall->xout.slow) {
|
|
|
|
|
ofpbuf_use_const(&upcall->put_actions,
|
2015-07-31 13:34:16 -07:00
|
|
|
|
odp_actions->data, odp_actions->size);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
} else {
|
2015-11-25 15:19:37 -08:00
|
|
|
|
/* upcall->put_actions already initialized by upcall_receive(). */
|
2014-08-06 18:49:44 -07:00
|
|
|
|
compose_slow_path(udpif, &upcall->xout, upcall->flow,
|
|
|
|
|
upcall->flow->in_port.odp_port,
|
|
|
|
|
&upcall->put_actions);
|
|
|
|
|
}
|
2014-07-25 13:54:24 +12:00
|
|
|
|
|
2015-02-24 15:33:59 -08:00
|
|
|
|
/* This function is also called for slow-pathed flows. As we are only
|
|
|
|
|
* going to create new datapath flows for actual datapath misses, there is
|
|
|
|
|
* no point in creating a ukey otherwise. */
|
|
|
|
|
if (upcall->type == DPIF_UC_MISS) {
|
2015-07-31 13:15:52 -07:00
|
|
|
|
upcall->ukey = ukey_create_from_upcall(upcall, wc);
|
2015-02-24 15:33:59 -08:00
|
|
|
|
}
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-26 12:19:03 -07:00
|
|
|
|
static void
|
2014-08-06 18:49:44 -07:00
|
|
|
|
upcall_uninit(struct upcall *upcall)
|
2014-07-26 06:51:55 +00:00
|
|
|
|
{
|
2014-08-06 18:49:44 -07:00
|
|
|
|
if (upcall) {
|
|
|
|
|
if (upcall->xout_initialized) {
|
|
|
|
|
xlate_out_uninit(&upcall->xout);
|
|
|
|
|
}
|
2015-07-31 13:34:16 -07:00
|
|
|
|
ofpbuf_uninit(&upcall->odp_actions);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
ofpbuf_uninit(&upcall->put_actions);
|
2015-03-26 11:18:16 -07:00
|
|
|
|
if (upcall->ukey) {
|
|
|
|
|
if (!upcall->ukey_persists) {
|
|
|
|
|
ukey_delete__(upcall->ukey);
|
|
|
|
|
}
|
|
|
|
|
} else if (upcall->have_recirc_ref) {
|
|
|
|
|
/* The reference was transferred to the ukey if one was created. */
|
|
|
|
|
recirc_id_node_unref(upcall->recirc);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
}
|
2014-08-06 18:49:44 -07:00
|
|
|
|
}
|
2014-07-26 06:51:55 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-08-18 14:50:09 -07:00
|
|
|
|
/* If there are less flows than the limit, and this is a miss upcall which
|
|
|
|
|
*
|
|
|
|
|
* - Has no recirc_id, OR
|
|
|
|
|
* - Has a recirc_id and we can get a reference on the recirc ctx,
|
|
|
|
|
*
|
|
|
|
|
* Then we should install the flow (true). Otherwise, return false. */
|
|
|
|
|
static bool
|
|
|
|
|
should_install_flow(struct udpif *udpif, struct upcall *upcall)
|
|
|
|
|
{
|
|
|
|
|
unsigned int flow_limit;
|
|
|
|
|
|
|
|
|
|
if (upcall->type != DPIF_UC_MISS) {
|
|
|
|
|
return false;
|
|
|
|
|
} else if (upcall->recirc && !upcall->have_recirc_ref) {
|
2016-08-29 17:06:13 -04:00
|
|
|
|
VLOG_DBG_RL(&rl, "upcall: no reference for recirc flow");
|
2016-08-18 14:50:09 -07:00
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
atomic_read_relaxed(&udpif->flow_limit, &flow_limit);
|
|
|
|
|
if (udpif_get_n_flows(udpif) >= flow_limit) {
|
|
|
|
|
VLOG_WARN_RL(&rl, "upcall: datapath flow limit reached");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
static int
|
2015-02-22 03:21:09 -08:00
|
|
|
|
upcall_cb(const struct dp_packet *packet, const struct flow *flow, ovs_u128 *ufid,
|
2015-05-22 17:14:19 +01:00
|
|
|
|
unsigned pmd_id, enum dpif_upcall_type type,
|
2014-10-12 18:18:47 -07:00
|
|
|
|
const struct nlattr *userdata, struct ofpbuf *actions,
|
|
|
|
|
struct flow_wildcards *wc, struct ofpbuf *put_actions, void *aux)
|
2014-07-26 06:51:55 +00:00
|
|
|
|
{
|
2015-08-10 19:42:20 -07:00
|
|
|
|
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
struct udpif *udpif = aux;
|
|
|
|
|
struct upcall upcall;
|
|
|
|
|
bool megaflow;
|
|
|
|
|
int error;
|
2014-07-26 06:51:55 +00:00
|
|
|
|
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_read_relaxed(&enable_megaflows, &megaflow);
|
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
error = upcall_receive(&upcall, udpif->backer, packet, type, userdata,
|
2015-02-26 15:52:34 -08:00
|
|
|
|
flow, 0, ufid, pmd_id);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
if (error) {
|
2014-09-08 10:41:36 -07:00
|
|
|
|
return error;
|
2014-07-26 06:51:55 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-31 13:15:52 -07:00
|
|
|
|
error = process_upcall(udpif, &upcall, actions, wc);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
if (error) {
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
if (upcall.xout.slow && put_actions) {
|
2015-03-02 17:29:44 -08:00
|
|
|
|
ofpbuf_put(put_actions, upcall.put_actions.data,
|
|
|
|
|
upcall.put_actions.size);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
}
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
2015-07-31 13:15:52 -07:00
|
|
|
|
if (OVS_UNLIKELY(!megaflow)) {
|
|
|
|
|
flow_wildcards_init_for_packet(wc, flow);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
}
|
2014-02-26 23:03:24 -08:00
|
|
|
|
|
2016-08-18 14:50:09 -07:00
|
|
|
|
if (!should_install_flow(udpif, &upcall)) {
|
2014-07-25 13:54:24 +12:00
|
|
|
|
error = ENOSPC;
|
2015-03-26 11:18:16 -07:00
|
|
|
|
goto out;
|
2014-07-26 06:51:55 +00:00
|
|
|
|
}
|
2014-07-26 15:39:58 -07:00
|
|
|
|
|
2015-03-26 11:18:16 -07:00
|
|
|
|
if (upcall.ukey && !ukey_install(udpif, upcall.ukey)) {
|
2015-08-10 19:42:20 -07:00
|
|
|
|
VLOG_WARN_RL(&rl, "upcall_cb failure: ukey installation fails");
|
2015-03-26 11:18:16 -07:00
|
|
|
|
error = ENOSPC;
|
|
|
|
|
}
|
2014-07-26 15:39:58 -07:00
|
|
|
|
out:
|
2014-07-25 13:54:24 +12:00
|
|
|
|
if (!error) {
|
|
|
|
|
upcall.ukey_persists = true;
|
|
|
|
|
}
|
2014-07-26 15:39:58 -07:00
|
|
|
|
upcall_uninit(&upcall);
|
|
|
|
|
return error;
|
2014-07-26 06:51:55 +00:00
|
|
|
|
}
|
2013-09-24 15:04:04 -07:00
|
|
|
|
|
2014-07-26 12:19:03 -07:00
|
|
|
|
static int
|
2014-08-06 18:49:44 -07:00
|
|
|
|
process_upcall(struct udpif *udpif, struct upcall *upcall,
|
2015-07-31 13:15:52 -07:00
|
|
|
|
struct ofpbuf *odp_actions, struct flow_wildcards *wc)
|
2014-07-26 06:51:55 +00:00
|
|
|
|
{
|
2014-08-06 18:49:44 -07:00
|
|
|
|
const struct nlattr *userdata = upcall->userdata;
|
2015-02-22 03:21:09 -08:00
|
|
|
|
const struct dp_packet *packet = upcall->packet;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
const struct flow *flow = upcall->flow;
|
2013-09-19 11:03:47 -07:00
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
switch (classify_upcall(upcall->type, userdata)) {
|
|
|
|
|
case MISS_UPCALL:
|
2015-07-31 13:15:52 -07:00
|
|
|
|
upcall_xlate(udpif, upcall, odp_actions, wc);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
return 0;
|
2013-09-24 15:04:04 -07:00
|
|
|
|
|
2014-07-26 06:51:55 +00:00
|
|
|
|
case SFLOW_UPCALL:
|
2014-08-06 18:49:44 -07:00
|
|
|
|
if (upcall->sflow) {
|
2014-07-26 06:51:55 +00:00
|
|
|
|
union user_action_cookie cookie;
|
2015-07-17 21:37:02 -07:00
|
|
|
|
const struct nlattr *actions;
|
2015-08-12 14:50:54 -07:00
|
|
|
|
size_t actions_len = 0;
|
2015-07-17 21:37:02 -07:00
|
|
|
|
struct dpif_sflow_actions sflow_actions;
|
|
|
|
|
memset(&sflow_actions, 0, sizeof sflow_actions);
|
2014-07-26 06:51:55 +00:00
|
|
|
|
memset(&cookie, 0, sizeof cookie);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
memcpy(&cookie, nl_attr_get(userdata), sizeof cookie.sflow);
|
2015-07-17 21:37:02 -07:00
|
|
|
|
if (upcall->actions) {
|
|
|
|
|
/* Actions were passed up from datapath. */
|
|
|
|
|
actions = nl_attr_get(upcall->actions);
|
|
|
|
|
actions_len = nl_attr_get_size(upcall->actions);
|
|
|
|
|
if (actions && actions_len) {
|
|
|
|
|
dpif_sflow_read_actions(flow, actions, actions_len,
|
|
|
|
|
&sflow_actions);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (actions_len == 0) {
|
|
|
|
|
/* Lookup actions in userspace cache. */
|
2016-02-03 14:31:43 +03:00
|
|
|
|
struct udpif_key *ukey = ukey_lookup(udpif, upcall->ufid,
|
|
|
|
|
upcall->pmd_id);
|
2015-07-17 21:37:02 -07:00
|
|
|
|
if (ukey) {
|
2015-08-12 14:50:54 -07:00
|
|
|
|
ukey_get_actions(ukey, &actions, &actions_len);
|
2015-07-17 21:37:02 -07:00
|
|
|
|
dpif_sflow_read_actions(flow, actions, actions_len,
|
|
|
|
|
&sflow_actions);
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-08-06 18:49:44 -07:00
|
|
|
|
dpif_sflow_received(upcall->sflow, packet, flow,
|
2015-07-17 21:37:02 -07:00
|
|
|
|
flow->in_port.odp_port, &cookie,
|
|
|
|
|
actions_len > 0 ? &sflow_actions : NULL);
|
2014-07-26 06:51:55 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
2014-07-26 06:51:55 +00:00
|
|
|
|
case IPFIX_UPCALL:
|
2014-08-06 18:49:44 -07:00
|
|
|
|
if (upcall->ipfix) {
|
2014-08-17 20:19:36 -07:00
|
|
|
|
union user_action_cookie cookie;
|
|
|
|
|
struct flow_tnl output_tunnel_key;
|
|
|
|
|
|
|
|
|
|
memset(&cookie, 0, sizeof cookie);
|
|
|
|
|
memcpy(&cookie, nl_attr_get(userdata), sizeof cookie.ipfix);
|
|
|
|
|
|
|
|
|
|
if (upcall->out_tun_key) {
|
2015-06-29 18:01:59 -07:00
|
|
|
|
odp_tun_key_from_attr(upcall->out_tun_key, false,
|
2014-08-17 20:19:36 -07:00
|
|
|
|
&output_tunnel_key);
|
|
|
|
|
}
|
|
|
|
|
dpif_ipfix_bridge_sample(upcall->ipfix, packet, flow,
|
|
|
|
|
flow->in_port.odp_port,
|
|
|
|
|
cookie.ipfix.output_odp_port,
|
|
|
|
|
upcall->out_tun_key ?
|
|
|
|
|
&output_tunnel_key : NULL);
|
2014-07-26 06:51:55 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
2014-07-26 06:51:55 +00:00
|
|
|
|
case FLOW_SAMPLE_UPCALL:
|
2014-08-06 18:49:44 -07:00
|
|
|
|
if (upcall->ipfix) {
|
2014-07-26 06:51:55 +00:00
|
|
|
|
union user_action_cookie cookie;
|
ipfix: Support tunnel information for Flow IPFIX.
Add support to export tunnel information for flow-based IPFIX.
The original steps to configure flow level IPFIX:
1) Create a new record in Flow_Sample_Collector_Set table:
'ovs-vsctl -- create Flow_Sample_Collector_Set id=1 bridge="Bridge UUID"'
2) Add IPFIX configuration which is referred by corresponding
row in Flow_Sample_Collector_Set table:
'ovs-vsctl -- set Flow_Sample_Collector_Set
"Flow_Sample_Collector_Set UUID" ipfix=@i -- --id=@i create IPFIX
targets=\"IP:4739\" obs_domain_id=123 obs_point_id=456
cache_active_timeout=60 cache_max_flows=13'
3) Add sample action to the flows:
'ovs-ofctl add-flow mybridge in_port=1,
actions=sample'('probability=65535,collector_set_id=1,
obs_domain_id=123,obs_point_id=456')',output:3'
NXAST_SAMPLE action was used in step 3. In order to support exporting tunnel
information, the NXAST_SAMPLE2 action was added and with NXAST_SAMPLE2 action
in this patch, the step 3 should be configured like below:
'ovs-ofctl add-flow mybridge in_port=1,
actions=sample'('probability=65535,collector_set_id=1,obs_domain_id=123,
obs_point_id=456,sampling_port=3')',output:3'
'sampling_port' can be equal to ingress port or one of egress ports. If sampling
port is equal to output port and the output port is a tunnel port,
OVS_USERSPACE_ATTR_EGRESS_TUN_PORT will be set in the datapath flow sample action.
When flow sample action upcall happens, tunnel information will be retrieved from
the datapath and then IPFIX can export egress tunnel port information. If
samping_port=65535 (OFPP_NONE), flow-based IPFIX will keep the same behavior
as before.
This patch mainly do three tasks:
1) Add a new flow sample action NXAST_SAMPLE2 to support exporting
tunnel information. NXAST_SAMPLE2 action has a new added field
'sampling_port'.
2) Use 'other_configure: enable-tunnel-sampling' to enable or disable
exporting tunnel information.
3) If 'sampling_port' is equal to output port and output port is a tunnel
port, the translation of OpenFlow "sample" action should first emit
set(tunnel(...)), then the sample action itself. It makes sure the
egress tunnel information can be sampled.
4) Add a test of flow-based IPFIX for tunnel set.
How to test flow-based IPFIX:
1) Setup a test environment with two Linux host with Docker supported
2) Create a Docker container and a GRE tunnel port on each host
3) Use ovs-docker to add the container on the bridge
4) Listen on port 4739 on the collector machine and use wireshark to filter
'cflow' packets.
5) Configure flow-based IPFIX:
- 'ovs-vsctl -- create Flow_Sample_Collector_Set id=1 bridge="Bridge UUID"'
- 'ovs-vsctl -- set Flow_Sample_Collector_Set
"Flow_Sample_Collector_Set UUID" ipfix=@i -- --id=@i create IPFIX \
targets=\"IP:4739\" cache_active_timeout=60 cache_max_flows=13 \
other_config:enable-tunnel-sampling=true'
- 'ovs-ofctl add-flow mybridge in_port=1,
actions=sample'('probability=65535,collector_set_id=1,obs_domain_id=123,
obs_point_id=456,sampling_port=3')',output:3'
Note: The in-port is container port. The output port and sampling_port
are both open flow port and the output port is a GRE tunnel port.
6) Ping from the container whose host enabled flow-based IPFIX.
7) Get the IPFIX template pakcets and IPFIX information packets.
Signed-off-by: Benli Ye <daniely@vmware.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-14 16:53:34 +08:00
|
|
|
|
struct flow_tnl output_tunnel_key;
|
2014-07-26 06:51:55 +00:00
|
|
|
|
|
|
|
|
|
memset(&cookie, 0, sizeof cookie);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
memcpy(&cookie, nl_attr_get(userdata), sizeof cookie.flow_sample);
|
2014-07-26 06:51:55 +00:00
|
|
|
|
|
ipfix: Support tunnel information for Flow IPFIX.
Add support to export tunnel information for flow-based IPFIX.
The original steps to configure flow level IPFIX:
1) Create a new record in Flow_Sample_Collector_Set table:
'ovs-vsctl -- create Flow_Sample_Collector_Set id=1 bridge="Bridge UUID"'
2) Add IPFIX configuration which is referred by corresponding
row in Flow_Sample_Collector_Set table:
'ovs-vsctl -- set Flow_Sample_Collector_Set
"Flow_Sample_Collector_Set UUID" ipfix=@i -- --id=@i create IPFIX
targets=\"IP:4739\" obs_domain_id=123 obs_point_id=456
cache_active_timeout=60 cache_max_flows=13'
3) Add sample action to the flows:
'ovs-ofctl add-flow mybridge in_port=1,
actions=sample'('probability=65535,collector_set_id=1,
obs_domain_id=123,obs_point_id=456')',output:3'
NXAST_SAMPLE action was used in step 3. In order to support exporting tunnel
information, the NXAST_SAMPLE2 action was added and with NXAST_SAMPLE2 action
in this patch, the step 3 should be configured like below:
'ovs-ofctl add-flow mybridge in_port=1,
actions=sample'('probability=65535,collector_set_id=1,obs_domain_id=123,
obs_point_id=456,sampling_port=3')',output:3'
'sampling_port' can be equal to ingress port or one of egress ports. If sampling
port is equal to output port and the output port is a tunnel port,
OVS_USERSPACE_ATTR_EGRESS_TUN_PORT will be set in the datapath flow sample action.
When flow sample action upcall happens, tunnel information will be retrieved from
the datapath and then IPFIX can export egress tunnel port information. If
samping_port=65535 (OFPP_NONE), flow-based IPFIX will keep the same behavior
as before.
This patch mainly do three tasks:
1) Add a new flow sample action NXAST_SAMPLE2 to support exporting
tunnel information. NXAST_SAMPLE2 action has a new added field
'sampling_port'.
2) Use 'other_configure: enable-tunnel-sampling' to enable or disable
exporting tunnel information.
3) If 'sampling_port' is equal to output port and output port is a tunnel
port, the translation of OpenFlow "sample" action should first emit
set(tunnel(...)), then the sample action itself. It makes sure the
egress tunnel information can be sampled.
4) Add a test of flow-based IPFIX for tunnel set.
How to test flow-based IPFIX:
1) Setup a test environment with two Linux host with Docker supported
2) Create a Docker container and a GRE tunnel port on each host
3) Use ovs-docker to add the container on the bridge
4) Listen on port 4739 on the collector machine and use wireshark to filter
'cflow' packets.
5) Configure flow-based IPFIX:
- 'ovs-vsctl -- create Flow_Sample_Collector_Set id=1 bridge="Bridge UUID"'
- 'ovs-vsctl -- set Flow_Sample_Collector_Set
"Flow_Sample_Collector_Set UUID" ipfix=@i -- --id=@i create IPFIX \
targets=\"IP:4739\" cache_active_timeout=60 cache_max_flows=13 \
other_config:enable-tunnel-sampling=true'
- 'ovs-ofctl add-flow mybridge in_port=1,
actions=sample'('probability=65535,collector_set_id=1,obs_domain_id=123,
obs_point_id=456,sampling_port=3')',output:3'
Note: The in-port is container port. The output port and sampling_port
are both open flow port and the output port is a GRE tunnel port.
6) Ping from the container whose host enabled flow-based IPFIX.
7) Get the IPFIX template pakcets and IPFIX information packets.
Signed-off-by: Benli Ye <daniely@vmware.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-14 16:53:34 +08:00
|
|
|
|
if (upcall->out_tun_key) {
|
|
|
|
|
odp_tun_key_from_attr(upcall->out_tun_key, false,
|
|
|
|
|
&output_tunnel_key);
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-26 06:51:55 +00:00
|
|
|
|
/* The flow reflects exactly the contents of the packet.
|
|
|
|
|
* Sample the packet using it. */
|
2014-08-06 18:49:44 -07:00
|
|
|
|
dpif_ipfix_flow_sample(upcall->ipfix, packet, flow,
|
ipfix: Support tunnel information for Flow IPFIX.
Add support to export tunnel information for flow-based IPFIX.
The original steps to configure flow level IPFIX:
1) Create a new record in Flow_Sample_Collector_Set table:
'ovs-vsctl -- create Flow_Sample_Collector_Set id=1 bridge="Bridge UUID"'
2) Add IPFIX configuration which is referred by corresponding
row in Flow_Sample_Collector_Set table:
'ovs-vsctl -- set Flow_Sample_Collector_Set
"Flow_Sample_Collector_Set UUID" ipfix=@i -- --id=@i create IPFIX
targets=\"IP:4739\" obs_domain_id=123 obs_point_id=456
cache_active_timeout=60 cache_max_flows=13'
3) Add sample action to the flows:
'ovs-ofctl add-flow mybridge in_port=1,
actions=sample'('probability=65535,collector_set_id=1,
obs_domain_id=123,obs_point_id=456')',output:3'
NXAST_SAMPLE action was used in step 3. In order to support exporting tunnel
information, the NXAST_SAMPLE2 action was added and with NXAST_SAMPLE2 action
in this patch, the step 3 should be configured like below:
'ovs-ofctl add-flow mybridge in_port=1,
actions=sample'('probability=65535,collector_set_id=1,obs_domain_id=123,
obs_point_id=456,sampling_port=3')',output:3'
'sampling_port' can be equal to ingress port or one of egress ports. If sampling
port is equal to output port and the output port is a tunnel port,
OVS_USERSPACE_ATTR_EGRESS_TUN_PORT will be set in the datapath flow sample action.
When flow sample action upcall happens, tunnel information will be retrieved from
the datapath and then IPFIX can export egress tunnel port information. If
samping_port=65535 (OFPP_NONE), flow-based IPFIX will keep the same behavior
as before.
This patch mainly do three tasks:
1) Add a new flow sample action NXAST_SAMPLE2 to support exporting
tunnel information. NXAST_SAMPLE2 action has a new added field
'sampling_port'.
2) Use 'other_configure: enable-tunnel-sampling' to enable or disable
exporting tunnel information.
3) If 'sampling_port' is equal to output port and output port is a tunnel
port, the translation of OpenFlow "sample" action should first emit
set(tunnel(...)), then the sample action itself. It makes sure the
egress tunnel information can be sampled.
4) Add a test of flow-based IPFIX for tunnel set.
How to test flow-based IPFIX:
1) Setup a test environment with two Linux host with Docker supported
2) Create a Docker container and a GRE tunnel port on each host
3) Use ovs-docker to add the container on the bridge
4) Listen on port 4739 on the collector machine and use wireshark to filter
'cflow' packets.
5) Configure flow-based IPFIX:
- 'ovs-vsctl -- create Flow_Sample_Collector_Set id=1 bridge="Bridge UUID"'
- 'ovs-vsctl -- set Flow_Sample_Collector_Set
"Flow_Sample_Collector_Set UUID" ipfix=@i -- --id=@i create IPFIX \
targets=\"IP:4739\" cache_active_timeout=60 cache_max_flows=13 \
other_config:enable-tunnel-sampling=true'
- 'ovs-ofctl add-flow mybridge in_port=1,
actions=sample'('probability=65535,collector_set_id=1,obs_domain_id=123,
obs_point_id=456,sampling_port=3')',output:3'
Note: The in-port is container port. The output port and sampling_port
are both open flow port and the output port is a GRE tunnel port.
6) Ping from the container whose host enabled flow-based IPFIX.
7) Get the IPFIX template pakcets and IPFIX information packets.
Signed-off-by: Benli Ye <daniely@vmware.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2016-06-14 16:53:34 +08:00
|
|
|
|
&cookie, flow->in_port.odp_port,
|
|
|
|
|
upcall->out_tun_key ?
|
|
|
|
|
&output_tunnel_key : NULL);
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
2014-07-26 06:51:55 +00:00
|
|
|
|
break;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
|
2014-07-26 06:51:55 +00:00
|
|
|
|
case BAD_UPCALL:
|
|
|
|
|
break;
|
|
|
|
|
}
|
2013-09-24 15:04:04 -07:00
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
return EAGAIN;
|
2014-02-26 23:03:24 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2014-07-26 06:51:55 +00:00
|
|
|
|
handle_upcalls(struct udpif *udpif, struct upcall *upcalls,
|
2014-05-20 21:50:19 -07:00
|
|
|
|
size_t n_upcalls)
|
2014-02-26 23:03:24 -08:00
|
|
|
|
{
|
2014-05-20 21:50:19 -07:00
|
|
|
|
struct dpif_op *opsp[UPCALL_MAX_BATCH * 2];
|
2014-08-21 00:21:03 +12:00
|
|
|
|
struct ukey_op ops[UPCALL_MAX_BATCH * 2];
|
2014-07-25 13:54:24 +12:00
|
|
|
|
size_t n_ops, n_opsp, i;
|
2014-02-26 23:03:24 -08:00
|
|
|
|
|
2014-05-20 21:50:19 -07:00
|
|
|
|
/* Handle the packets individually in order of arrival.
|
2013-09-19 11:03:47 -07:00
|
|
|
|
*
|
|
|
|
|
* - For SLOW_CFM, SLOW_LACP, SLOW_STP, and SLOW_BFD, translation is what
|
|
|
|
|
* processes received packets for these protocols.
|
|
|
|
|
*
|
|
|
|
|
* - For SLOW_CONTROLLER, translation sends the packet to the OpenFlow
|
|
|
|
|
* controller.
|
|
|
|
|
*
|
|
|
|
|
* The loop fills 'ops' with an array of operations to execute in the
|
|
|
|
|
* datapath. */
|
|
|
|
|
n_ops = 0;
|
2014-02-26 23:03:24 -08:00
|
|
|
|
for (i = 0; i < n_upcalls; i++) {
|
|
|
|
|
struct upcall *upcall = &upcalls[i];
|
2015-02-22 03:21:09 -08:00
|
|
|
|
const struct dp_packet *packet = upcall->packet;
|
2014-08-21 00:21:03 +12:00
|
|
|
|
struct ukey_op *op;
|
2014-01-07 00:17:25 -08:00
|
|
|
|
|
2016-08-18 14:50:09 -07:00
|
|
|
|
if (should_install_flow(udpif, upcall)) {
|
2014-08-06 16:40:37 +12:00
|
|
|
|
struct udpif_key *ukey = upcall->ukey;
|
2014-01-07 00:17:25 -08:00
|
|
|
|
|
2016-08-31 11:06:03 -07:00
|
|
|
|
if (ukey_install_start(udpif, ukey)) {
|
|
|
|
|
upcall->ukey_persists = true;
|
|
|
|
|
put_op_init(&ops[n_ops++], ukey, DPIF_FP_CREATE);
|
|
|
|
|
}
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-31 13:34:16 -07:00
|
|
|
|
if (upcall->odp_actions.size) {
|
2013-09-19 11:03:47 -07:00
|
|
|
|
op = &ops[n_ops++];
|
2014-07-25 13:54:24 +12:00
|
|
|
|
op->ukey = NULL;
|
2014-08-21 00:21:03 +12:00
|
|
|
|
op->dop.type = DPIF_OP_EXECUTE;
|
2015-02-22 03:21:09 -08:00
|
|
|
|
op->dop.u.execute.packet = CONST_CAST(struct dp_packet *, packet);
|
2016-05-17 18:26:02 -07:00
|
|
|
|
op->dop.u.execute.flow = upcall->flow;
|
2014-05-20 21:50:19 -07:00
|
|
|
|
odp_key_to_pkt_metadata(upcall->key, upcall->key_len,
|
2015-02-22 03:21:09 -08:00
|
|
|
|
&op->dop.u.execute.packet->md);
|
2015-07-31 13:34:16 -07:00
|
|
|
|
op->dop.u.execute.actions = upcall->odp_actions.data;
|
|
|
|
|
op->dop.u.execute.actions_len = upcall->odp_actions.size;
|
2014-08-21 00:21:03 +12:00
|
|
|
|
op->dop.u.execute.needs_help = (upcall->xout.slow & SLOW_ACTION) != 0;
|
|
|
|
|
op->dop.u.execute.probe = false;
|
2015-02-26 15:52:34 -08:00
|
|
|
|
op->dop.u.execute.mtu = upcall->mru;
|
2013-09-19 11:03:47 -07:00
|
|
|
|
}
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
/* Execute batch.
|
|
|
|
|
*
|
|
|
|
|
* We install ukeys before installing the flows, locking them for exclusive
|
|
|
|
|
* access by this thread for the period of installation. This ensures that
|
|
|
|
|
* other threads won't attempt to delete the flows as we are creating them.
|
|
|
|
|
*/
|
|
|
|
|
n_opsp = 0;
|
2013-12-16 08:14:52 -08:00
|
|
|
|
for (i = 0; i < n_ops; i++) {
|
2014-07-25 13:54:24 +12:00
|
|
|
|
opsp[n_opsp++] = &ops[i].dop;
|
|
|
|
|
}
|
|
|
|
|
dpif_operate(udpif->dpif, opsp, n_opsp);
|
|
|
|
|
for (i = 0; i < n_ops; i++) {
|
|
|
|
|
if (ops[i].ukey) {
|
|
|
|
|
ukey_install_finish(ops[i].ukey, ops[i].dop.error);
|
|
|
|
|
}
|
2013-12-16 08:14:52 -08:00
|
|
|
|
}
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-09-24 15:24:39 +12:00
|
|
|
|
static uint32_t
|
2016-02-03 14:31:43 +03:00
|
|
|
|
get_ukey_hash(const ovs_u128 *ufid, const unsigned pmd_id)
|
2014-09-24 15:24:39 +12:00
|
|
|
|
{
|
2016-02-03 14:31:43 +03:00
|
|
|
|
return hash_2words(ufid->u32[0], pmd_id);
|
2014-09-24 15:24:39 +12:00
|
|
|
|
}
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
static struct udpif_key *
|
2016-02-03 14:31:43 +03:00
|
|
|
|
ukey_lookup(struct udpif *udpif, const ovs_u128 *ufid, const unsigned pmd_id)
|
2013-09-24 13:39:56 -07:00
|
|
|
|
{
|
|
|
|
|
struct udpif_key *ukey;
|
2016-02-03 14:31:43 +03:00
|
|
|
|
int idx = get_ukey_hash(ufid, pmd_id) % N_UMAPS;
|
2014-09-24 15:24:39 +12:00
|
|
|
|
struct cmap *cmap = &udpif->ukeys[idx].cmap;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2016-02-03 14:31:43 +03:00
|
|
|
|
CMAP_FOR_EACH_WITH_HASH (ukey, cmap_node,
|
|
|
|
|
get_ukey_hash(ufid, pmd_id), cmap) {
|
2016-05-03 18:20:51 -07:00
|
|
|
|
if (ovs_u128_equals(ukey->ufid, *ufid)) {
|
2013-09-24 13:39:56 -07:00
|
|
|
|
return ukey;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-12 14:50:54 -07:00
|
|
|
|
/* Provides safe lockless access of RCU protected 'ukey->actions'. Callers may
|
|
|
|
|
* alternatively access the field directly if they take 'ukey->mutex'. */
|
|
|
|
|
static void
|
|
|
|
|
ukey_get_actions(struct udpif_key *ukey, const struct nlattr **actions, size_t *size)
|
|
|
|
|
{
|
|
|
|
|
const struct ofpbuf *buf = ovsrcu_get(struct ofpbuf *, &ukey->actions);
|
|
|
|
|
*actions = buf->data;
|
|
|
|
|
*size = buf->size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ukey_set_actions(struct udpif_key *ukey, const struct ofpbuf *actions)
|
|
|
|
|
{
|
|
|
|
|
ovsrcu_postpone(ofpbuf_delete,
|
|
|
|
|
ovsrcu_get_protected(struct ofpbuf *, &ukey->actions));
|
|
|
|
|
ovsrcu_set(&ukey->actions, ofpbuf_clone(actions));
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-11 13:55:34 -08:00
|
|
|
|
static struct udpif_key *
|
2014-09-24 15:24:39 +12:00
|
|
|
|
ukey_create__(const struct nlattr *key, size_t key_len,
|
2014-08-06 16:40:37 +12:00
|
|
|
|
const struct nlattr *mask, size_t mask_len,
|
2014-09-24 16:26:35 +12:00
|
|
|
|
bool ufid_present, const ovs_u128 *ufid,
|
2015-05-22 17:14:19 +01:00
|
|
|
|
const unsigned pmd_id, const struct ofpbuf *actions,
|
2015-03-26 11:18:16 -07:00
|
|
|
|
uint64_t dump_seq, uint64_t reval_seq, long long int used,
|
2015-11-25 15:19:37 -08:00
|
|
|
|
uint32_t key_recirc_id, struct xlate_out *xout)
|
2014-06-04 09:59:23 +00:00
|
|
|
|
OVS_NO_THREAD_SAFETY_ANALYSIS
|
2014-02-11 13:55:34 -08:00
|
|
|
|
{
|
2015-11-25 15:19:37 -08:00
|
|
|
|
struct udpif_key *ukey = xmalloc(sizeof *ukey);
|
2014-02-11 13:55:34 -08:00
|
|
|
|
|
2014-08-06 16:40:37 +12:00
|
|
|
|
memcpy(&ukey->keybuf, key, key_len);
|
|
|
|
|
ukey->key = &ukey->keybuf.nla;
|
|
|
|
|
ukey->key_len = key_len;
|
|
|
|
|
memcpy(&ukey->maskbuf, mask, mask_len);
|
|
|
|
|
ukey->mask = &ukey->maskbuf.nla;
|
|
|
|
|
ukey->mask_len = mask_len;
|
2014-09-24 16:26:35 +12:00
|
|
|
|
ukey->ufid_present = ufid_present;
|
2014-09-24 15:24:39 +12:00
|
|
|
|
ukey->ufid = *ufid;
|
2014-10-12 18:18:47 -07:00
|
|
|
|
ukey->pmd_id = pmd_id;
|
2016-02-03 14:31:43 +03:00
|
|
|
|
ukey->hash = get_ukey_hash(&ukey->ufid, pmd_id);
|
2015-08-12 14:50:54 -07:00
|
|
|
|
|
|
|
|
|
ovsrcu_init(&ukey->actions, NULL);
|
|
|
|
|
ukey_set_actions(ukey, actions);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
|
|
|
|
|
ovs_mutex_init(&ukey->mutex);
|
|
|
|
|
ukey->dump_seq = dump_seq;
|
|
|
|
|
ukey->reval_seq = reval_seq;
|
|
|
|
|
ukey->flow_exists = false;
|
|
|
|
|
ukey->created = time_msec();
|
2014-02-11 13:55:34 -08:00
|
|
|
|
memset(&ukey->stats, 0, sizeof ukey->stats);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
ukey->stats.used = used;
|
2014-04-10 16:00:28 +12:00
|
|
|
|
ukey->xcache = NULL;
|
2014-02-11 13:55:34 -08:00
|
|
|
|
|
2015-11-25 15:19:37 -08:00
|
|
|
|
ukey->key_recirc_id = key_recirc_id;
|
|
|
|
|
recirc_refs_init(&ukey->recircs);
|
|
|
|
|
if (xout) {
|
|
|
|
|
/* Take ownership of the action recirc id references. */
|
|
|
|
|
recirc_refs_swap(&ukey->recircs, &xout->recircs);
|
2015-03-26 11:18:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-02-11 13:55:34 -08:00
|
|
|
|
return ukey;
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
static struct udpif_key *
|
2015-07-31 13:15:52 -07:00
|
|
|
|
ukey_create_from_upcall(struct upcall *upcall, struct flow_wildcards *wc)
|
2014-07-25 13:54:24 +12:00
|
|
|
|
{
|
2014-08-06 16:40:37 +12:00
|
|
|
|
struct odputil_keybuf keystub, maskstub;
|
|
|
|
|
struct ofpbuf keybuf, maskbuf;
|
2015-06-30 16:43:03 -07:00
|
|
|
|
bool megaflow;
|
2015-06-16 11:15:28 -07:00
|
|
|
|
struct odp_flow_key_parms odp_parms = {
|
|
|
|
|
.flow = upcall->flow,
|
2015-07-31 13:15:52 -07:00
|
|
|
|
.mask = &wc->masks,
|
2015-06-16 11:15:28 -07:00
|
|
|
|
};
|
2014-08-06 16:40:37 +12:00
|
|
|
|
|
2015-06-30 16:43:03 -07:00
|
|
|
|
odp_parms.support = ofproto_dpif_get_support(upcall->ofproto)->odp;
|
2014-08-06 16:40:37 +12:00
|
|
|
|
if (upcall->key_len) {
|
|
|
|
|
ofpbuf_use_const(&keybuf, upcall->key, upcall->key_len);
|
|
|
|
|
} else {
|
|
|
|
|
/* dpif-netdev doesn't provide a netlink-formatted flow key in the
|
|
|
|
|
* upcall, so convert the upcall's flow here. */
|
|
|
|
|
ofpbuf_use_stack(&keybuf, &keystub, sizeof keystub);
|
2015-06-16 11:15:28 -07:00
|
|
|
|
odp_flow_key_from_flow(&odp_parms, &keybuf);
|
2014-08-06 16:40:37 +12:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
atomic_read_relaxed(&enable_megaflows, &megaflow);
|
|
|
|
|
ofpbuf_use_stack(&maskbuf, &maskstub, sizeof maskstub);
|
|
|
|
|
if (megaflow) {
|
2015-06-19 13:54:13 -07:00
|
|
|
|
odp_parms.key_buf = &keybuf;
|
2015-06-16 11:15:28 -07:00
|
|
|
|
odp_flow_key_from_mask(&odp_parms, &maskbuf);
|
2014-08-06 16:40:37 +12:00
|
|
|
|
}
|
|
|
|
|
|
2015-03-02 17:29:44 -08:00
|
|
|
|
return ukey_create__(keybuf.data, keybuf.size, maskbuf.data, maskbuf.size,
|
2014-10-12 18:18:47 -07:00
|
|
|
|
true, upcall->ufid, upcall->pmd_id,
|
|
|
|
|
&upcall->put_actions, upcall->dump_seq,
|
2015-03-26 11:18:16 -07:00
|
|
|
|
upcall->reval_seq, 0,
|
2015-11-25 15:19:37 -08:00
|
|
|
|
upcall->have_recirc_ref ? upcall->recirc->id : 0,
|
2015-03-26 11:18:16 -07:00
|
|
|
|
&upcall->xout);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-06 11:14:08 +13:00
|
|
|
|
static int
|
2014-07-25 13:54:24 +12:00
|
|
|
|
ukey_create_from_dpif_flow(const struct udpif *udpif,
|
2014-10-06 11:14:08 +13:00
|
|
|
|
const struct dpif_flow *flow,
|
|
|
|
|
struct udpif_key **ukey)
|
2014-07-25 13:54:24 +12:00
|
|
|
|
{
|
2014-10-06 11:14:08 +13:00
|
|
|
|
struct dpif_flow full_flow;
|
2014-08-06 16:40:37 +12:00
|
|
|
|
struct ofpbuf actions;
|
2014-07-25 13:54:24 +12:00
|
|
|
|
uint64_t dump_seq, reval_seq;
|
2014-10-06 11:14:08 +13:00
|
|
|
|
uint64_t stub[DPIF_FLOW_BUFSIZE / 8];
|
2015-03-26 11:18:16 -07:00
|
|
|
|
const struct nlattr *a;
|
|
|
|
|
unsigned int left;
|
2014-10-06 11:14:08 +13:00
|
|
|
|
|
2015-03-26 11:18:16 -07:00
|
|
|
|
if (!flow->key_len || !flow->actions_len) {
|
2014-10-06 11:14:08 +13:00
|
|
|
|
struct ofpbuf buf;
|
|
|
|
|
int err;
|
|
|
|
|
|
2015-03-26 11:18:16 -07:00
|
|
|
|
/* If the key or actions were not provided by the datapath, fetch the
|
|
|
|
|
* full flow. */
|
2014-10-06 11:14:08 +13:00
|
|
|
|
ofpbuf_use_stack(&buf, &stub, sizeof stub);
|
2016-05-10 15:42:01 -07:00
|
|
|
|
err = dpif_flow_get(udpif->dpif, flow->key, flow->key_len,
|
|
|
|
|
flow->ufid_present ? &flow->ufid : NULL,
|
2014-10-12 18:18:47 -07:00
|
|
|
|
flow->pmd_id, &buf, &full_flow);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
if (err) {
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
flow = &full_flow;
|
|
|
|
|
}
|
2015-03-26 11:18:16 -07:00
|
|
|
|
|
|
|
|
|
/* Check the flow actions for recirculation action. As recirculation
|
|
|
|
|
* relies on OVS userspace internal state, we need to delete all old
|
2015-11-04 15:47:36 -08:00
|
|
|
|
* datapath flows with either a non-zero recirc_id in the key, or any
|
|
|
|
|
* recirculation actions upon OVS restart. */
|
|
|
|
|
NL_ATTR_FOR_EACH_UNSAFE (a, left, flow->key, flow->key_len) {
|
|
|
|
|
if (nl_attr_type(a) == OVS_KEY_ATTR_RECIRC_ID
|
|
|
|
|
&& nl_attr_get_u32(a) != 0) {
|
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-03-26 11:18:16 -07:00
|
|
|
|
NL_ATTR_FOR_EACH_UNSAFE (a, left, flow->actions, flow->actions_len) {
|
|
|
|
|
if (nl_attr_type(a) == OVS_ACTION_ATTR_RECIRC) {
|
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
dump_seq = seq_read(udpif->dump_seq);
|
|
|
|
|
reval_seq = seq_read(udpif->reval_seq);
|
2014-08-06 16:40:37 +12:00
|
|
|
|
ofpbuf_use_const(&actions, &flow->actions, flow->actions_len);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
*ukey = ukey_create__(flow->key, flow->key_len,
|
|
|
|
|
flow->mask, flow->mask_len, flow->ufid_present,
|
2014-10-12 18:18:47 -07:00
|
|
|
|
&flow->ufid, flow->pmd_id, &actions, dump_seq,
|
2015-11-25 15:19:37 -08:00
|
|
|
|
reval_seq, flow->stats.used, 0, NULL);
|
2014-10-12 18:18:47 -07:00
|
|
|
|
|
2014-10-06 11:14:08 +13:00
|
|
|
|
return 0;
|
2014-07-25 13:54:24 +12:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Attempts to insert a ukey into the shared ukey maps.
|
|
|
|
|
*
|
|
|
|
|
* On success, returns true, installs the ukey and returns it in a locked
|
|
|
|
|
* state. Otherwise, returns false. */
|
|
|
|
|
static bool
|
|
|
|
|
ukey_install_start(struct udpif *udpif, struct udpif_key *new_ukey)
|
|
|
|
|
OVS_TRY_LOCK(true, new_ukey->mutex)
|
|
|
|
|
{
|
|
|
|
|
struct umap *umap;
|
|
|
|
|
struct udpif_key *old_ukey;
|
|
|
|
|
uint32_t idx;
|
|
|
|
|
bool locked = false;
|
|
|
|
|
|
|
|
|
|
idx = new_ukey->hash % N_UMAPS;
|
|
|
|
|
umap = &udpif->ukeys[idx];
|
|
|
|
|
ovs_mutex_lock(&umap->mutex);
|
2016-02-03 14:31:43 +03:00
|
|
|
|
old_ukey = ukey_lookup(udpif, &new_ukey->ufid, new_ukey->pmd_id);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
if (old_ukey) {
|
|
|
|
|
/* Uncommon case: A ukey is already installed with the same UFID. */
|
|
|
|
|
if (old_ukey->key_len == new_ukey->key_len
|
|
|
|
|
&& !memcmp(old_ukey->key, new_ukey->key, new_ukey->key_len)) {
|
|
|
|
|
COVERAGE_INC(handler_duplicate_upcall);
|
|
|
|
|
} else {
|
|
|
|
|
struct ds ds = DS_EMPTY_INITIALIZER;
|
|
|
|
|
|
2014-09-24 16:26:35 +12:00
|
|
|
|
odp_format_ufid(&old_ukey->ufid, &ds);
|
|
|
|
|
ds_put_cstr(&ds, " ");
|
2014-07-25 13:54:24 +12:00
|
|
|
|
odp_flow_key_format(old_ukey->key, old_ukey->key_len, &ds);
|
|
|
|
|
ds_put_cstr(&ds, "\n");
|
2014-09-24 16:26:35 +12:00
|
|
|
|
odp_format_ufid(&new_ukey->ufid, &ds);
|
|
|
|
|
ds_put_cstr(&ds, " ");
|
2014-07-25 13:54:24 +12:00
|
|
|
|
odp_flow_key_format(new_ukey->key, new_ukey->key_len, &ds);
|
|
|
|
|
|
|
|
|
|
VLOG_WARN_RL(&rl, "Conflicting ukey for flows:\n%s", ds_cstr(&ds));
|
|
|
|
|
ds_destroy(&ds);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
ovs_mutex_lock(&new_ukey->mutex);
|
|
|
|
|
cmap_insert(&umap->cmap, &new_ukey->cmap_node, new_ukey->hash);
|
|
|
|
|
locked = true;
|
|
|
|
|
}
|
|
|
|
|
ovs_mutex_unlock(&umap->mutex);
|
|
|
|
|
|
|
|
|
|
return locked;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ukey_install_finish__(struct udpif_key *ukey) OVS_REQUIRES(ukey->mutex)
|
|
|
|
|
{
|
|
|
|
|
ukey->flow_exists = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
ukey_install_finish(struct udpif_key *ukey, int error)
|
|
|
|
|
OVS_RELEASES(ukey->mutex)
|
|
|
|
|
{
|
|
|
|
|
if (!error) {
|
|
|
|
|
ukey_install_finish__(ukey);
|
|
|
|
|
}
|
|
|
|
|
ovs_mutex_unlock(&ukey->mutex);
|
|
|
|
|
|
|
|
|
|
return !error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
ukey_install(struct udpif *udpif, struct udpif_key *ukey)
|
|
|
|
|
{
|
|
|
|
|
/* The usual way to keep 'ukey->flow_exists' in sync with the datapath is
|
|
|
|
|
* to call ukey_install_start(), install the corresponding datapath flow,
|
|
|
|
|
* then call ukey_install_finish(). The netdev interface using upcall_cb()
|
|
|
|
|
* doesn't provide a function to separately finish the flow installation,
|
|
|
|
|
* so we perform the operations together here.
|
|
|
|
|
*
|
|
|
|
|
* This is fine currently, as revalidator threads will only delete this
|
|
|
|
|
* ukey during revalidator_sweep() and only if the dump_seq is mismatched.
|
|
|
|
|
* It is unlikely for a revalidator thread to advance dump_seq and reach
|
|
|
|
|
* the next GC phase between ukey creation and flow installation. */
|
|
|
|
|
return ukey_install_start(udpif, ukey) && ukey_install_finish(ukey, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Searches for a ukey in 'udpif->ukeys' that matches 'flow' and attempts to
|
|
|
|
|
* lock the ukey. If the ukey does not exist, create it.
|
2014-04-10 07:14:08 +00:00
|
|
|
|
*
|
2014-10-06 11:14:08 +13:00
|
|
|
|
* Returns 0 on success, setting *result to the matching ukey and returning it
|
|
|
|
|
* in a locked state. Otherwise, returns an errno and clears *result. EBUSY
|
|
|
|
|
* indicates that another thread is handling this flow. Other errors indicate
|
|
|
|
|
* an unexpected condition creating a new ukey.
|
|
|
|
|
*
|
|
|
|
|
* *error is an output parameter provided to appease the threadsafety analyser,
|
|
|
|
|
* and its value matches the return value. */
|
2014-07-25 13:54:24 +12:00
|
|
|
|
static int
|
|
|
|
|
ukey_acquire(struct udpif *udpif, const struct dpif_flow *flow,
|
2014-10-06 11:14:08 +13:00
|
|
|
|
struct udpif_key **result, int *error)
|
|
|
|
|
OVS_TRY_LOCK(0, (*result)->mutex)
|
2014-04-10 07:14:08 +00:00
|
|
|
|
{
|
2014-06-04 09:59:23 +00:00
|
|
|
|
struct udpif_key *ukey;
|
2014-10-06 11:14:08 +13:00
|
|
|
|
int retval;
|
2014-06-04 09:59:23 +00:00
|
|
|
|
|
2016-02-03 14:31:43 +03:00
|
|
|
|
ukey = ukey_lookup(udpif, &flow->ufid, flow->pmd_id);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
if (ukey) {
|
2014-10-06 11:14:08 +13:00
|
|
|
|
retval = ovs_mutex_trylock(&ukey->mutex);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
} else {
|
|
|
|
|
/* Usually we try to avoid installing flows from revalidator threads,
|
|
|
|
|
* because locking on a umap may cause handler threads to block.
|
|
|
|
|
* However there are certain cases, like when ovs-vswitchd is
|
|
|
|
|
* restarted, where it is desirable to handle flows that exist in the
|
|
|
|
|
* datapath gracefully (ie, don't just clear the datapath). */
|
2014-10-06 11:14:08 +13:00
|
|
|
|
bool install;
|
|
|
|
|
|
|
|
|
|
retval = ukey_create_from_dpif_flow(udpif, flow, &ukey);
|
|
|
|
|
if (retval) {
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
install = ukey_install_start(udpif, ukey);
|
|
|
|
|
if (install) {
|
2014-07-25 13:54:24 +12:00
|
|
|
|
ukey_install_finish__(ukey);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
retval = 0;
|
2014-07-25 13:54:24 +12:00
|
|
|
|
} else {
|
|
|
|
|
ukey_delete__(ukey);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
retval = EBUSY;
|
2014-07-25 13:54:24 +12:00
|
|
|
|
}
|
2014-04-10 07:14:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-06 11:14:08 +13:00
|
|
|
|
done:
|
|
|
|
|
*error = retval;
|
|
|
|
|
if (retval) {
|
2014-06-04 09:59:23 +00:00
|
|
|
|
*result = NULL;
|
2014-10-06 11:14:08 +13:00
|
|
|
|
} else {
|
|
|
|
|
*result = ukey;
|
2014-06-04 09:59:23 +00:00
|
|
|
|
}
|
2014-10-06 11:14:08 +13:00
|
|
|
|
return retval;
|
2014-04-10 07:14:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
static void
|
2014-05-05 15:44:40 +12:00
|
|
|
|
ukey_delete__(struct udpif_key *ukey)
|
2014-04-10 07:14:08 +00:00
|
|
|
|
OVS_NO_THREAD_SAFETY_ANALYSIS
|
2013-09-24 13:39:56 -07:00
|
|
|
|
{
|
2014-07-25 13:54:24 +12:00
|
|
|
|
if (ukey) {
|
2015-11-25 15:19:37 -08:00
|
|
|
|
if (ukey->key_recirc_id) {
|
|
|
|
|
recirc_free_id(ukey->key_recirc_id);
|
2015-03-26 11:18:16 -07:00
|
|
|
|
}
|
2015-11-25 15:19:37 -08:00
|
|
|
|
recirc_refs_unref(&ukey->recircs);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
xlate_cache_delete(ukey->xcache);
|
2015-08-12 14:50:54 -07:00
|
|
|
|
ofpbuf_delete(ovsrcu_get(struct ofpbuf *, &ukey->actions));
|
2014-07-25 13:54:24 +12:00
|
|
|
|
ovs_mutex_destroy(&ukey->mutex);
|
|
|
|
|
free(ukey);
|
|
|
|
|
}
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-05-05 15:44:40 +12:00
|
|
|
|
static void
|
2014-06-05 17:28:46 +12:00
|
|
|
|
ukey_delete(struct umap *umap, struct udpif_key *ukey)
|
|
|
|
|
OVS_REQUIRES(umap->mutex)
|
2014-05-05 15:44:40 +12:00
|
|
|
|
{
|
2014-06-05 17:28:46 +12:00
|
|
|
|
cmap_remove(&umap->cmap, &ukey->cmap_node, ukey->hash);
|
2014-05-05 15:44:40 +12:00
|
|
|
|
ovsrcu_postpone(ukey_delete__, ukey);
|
|
|
|
|
}
|
|
|
|
|
|
revalidator: Only revalidate high-throughput flows.
Previously we would revalidate all flows if the "need_revalidate" flag
was raised. This patch modifies the logic to delete low throughput flows
rather than revalidate them. High-throughput flows are unaffected by
this change. This patch identifies the flows based on the mean time
between packets since the last dump.
This change is primarily targeted at situations where:
* Flow dump duration is high (~1 second)
* Revalidation is triggered. (eg, by bridge reconfiguration or learning)
After the need_revalidate flag is set, next time a new flow dump session
starts, revalidators will begin revalidating the flows. This full
revalidation is more expensive, which significantly increases the flow
dump duration. At the end of this dump session, the datapath flow
management algorithms kick in for the next dump:
* If flow dump duration becomes too long, the flow limit is decreased.
* The number of flows in the datapath then exceeds the flow_limit.
* As the flow_limit is exceeded, max_idle is temporarily set to 100ms.
* Revalidators delete all flows that haven't seen traffic recently.
The effect of this is that many low-throughput flows are deleted after
revalidation, even if they are valid. The revalidation is unnecessary
for flows that would be deleted anyway, so this patch skips the
revalidation step for those flows.
Note that this patch will only perform this optimization if the flow has
already been dumped at least once, and only if the time since the last
dump is sufficiently long. This gives the flow a chance to become
high-throughput.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---
v2: Acked.
v1: Determine "high-throughput" by packets rather than bytes.
Calculate the mean time between packets for comparison, rather than
comparing the number of packets since the last dump.
RFC: First post.
2014-03-04 09:36:37 -08:00
|
|
|
|
static bool
|
2014-07-02 07:41:33 +00:00
|
|
|
|
should_revalidate(const struct udpif *udpif, uint64_t packets,
|
|
|
|
|
long long int used)
|
revalidator: Only revalidate high-throughput flows.
Previously we would revalidate all flows if the "need_revalidate" flag
was raised. This patch modifies the logic to delete low throughput flows
rather than revalidate them. High-throughput flows are unaffected by
this change. This patch identifies the flows based on the mean time
between packets since the last dump.
This change is primarily targeted at situations where:
* Flow dump duration is high (~1 second)
* Revalidation is triggered. (eg, by bridge reconfiguration or learning)
After the need_revalidate flag is set, next time a new flow dump session
starts, revalidators will begin revalidating the flows. This full
revalidation is more expensive, which significantly increases the flow
dump duration. At the end of this dump session, the datapath flow
management algorithms kick in for the next dump:
* If flow dump duration becomes too long, the flow limit is decreased.
* The number of flows in the datapath then exceeds the flow_limit.
* As the flow_limit is exceeded, max_idle is temporarily set to 100ms.
* Revalidators delete all flows that haven't seen traffic recently.
The effect of this is that many low-throughput flows are deleted after
revalidation, even if they are valid. The revalidation is unnecessary
for flows that would be deleted anyway, so this patch skips the
revalidation step for those flows.
Note that this patch will only perform this optimization if the flow has
already been dumped at least once, and only if the time since the last
dump is sufficiently long. This gives the flow a chance to become
high-throughput.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---
v2: Acked.
v1: Determine "high-throughput" by packets rather than bytes.
Calculate the mean time between packets for comparison, rather than
comparing the number of packets since the last dump.
RFC: First post.
2014-03-04 09:36:37 -08:00
|
|
|
|
{
|
|
|
|
|
long long int metric, now, duration;
|
|
|
|
|
|
2014-07-02 07:41:33 +00:00
|
|
|
|
if (udpif->dump_duration < 200) {
|
|
|
|
|
/* We are likely to handle full revalidation for the flows. */
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
revalidator: Only revalidate high-throughput flows.
Previously we would revalidate all flows if the "need_revalidate" flag
was raised. This patch modifies the logic to delete low throughput flows
rather than revalidate them. High-throughput flows are unaffected by
this change. This patch identifies the flows based on the mean time
between packets since the last dump.
This change is primarily targeted at situations where:
* Flow dump duration is high (~1 second)
* Revalidation is triggered. (eg, by bridge reconfiguration or learning)
After the need_revalidate flag is set, next time a new flow dump session
starts, revalidators will begin revalidating the flows. This full
revalidation is more expensive, which significantly increases the flow
dump duration. At the end of this dump session, the datapath flow
management algorithms kick in for the next dump:
* If flow dump duration becomes too long, the flow limit is decreased.
* The number of flows in the datapath then exceeds the flow_limit.
* As the flow_limit is exceeded, max_idle is temporarily set to 100ms.
* Revalidators delete all flows that haven't seen traffic recently.
The effect of this is that many low-throughput flows are deleted after
revalidation, even if they are valid. The revalidation is unnecessary
for flows that would be deleted anyway, so this patch skips the
revalidation step for those flows.
Note that this patch will only perform this optimization if the flow has
already been dumped at least once, and only if the time since the last
dump is sufficiently long. This gives the flow a chance to become
high-throughput.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---
v2: Acked.
v1: Determine "high-throughput" by packets rather than bytes.
Calculate the mean time between packets for comparison, rather than
comparing the number of packets since the last dump.
RFC: First post.
2014-03-04 09:36:37 -08:00
|
|
|
|
/* Calculate the mean time between seeing these packets. If this
|
|
|
|
|
* exceeds the threshold, then delete the flow rather than performing
|
|
|
|
|
* costly revalidation for flows that aren't being hit frequently.
|
|
|
|
|
*
|
|
|
|
|
* This is targeted at situations where the dump_duration is high (~1s),
|
|
|
|
|
* and revalidation is triggered by a call to udpif_revalidate(). In
|
|
|
|
|
* these situations, revalidation of all flows causes fluctuations in the
|
|
|
|
|
* flow_limit due to the interaction with the dump_duration and max_idle.
|
|
|
|
|
* This tends to result in deletion of low-throughput flows anyway, so
|
|
|
|
|
* skip the revalidation and just delete those flows. */
|
|
|
|
|
packets = MAX(packets, 1);
|
|
|
|
|
now = MAX(used, time_msec());
|
|
|
|
|
duration = now - used;
|
|
|
|
|
metric = duration / packets;
|
|
|
|
|
|
2014-07-02 07:41:33 +00:00
|
|
|
|
if (metric < 200) {
|
|
|
|
|
/* The flow is receiving more than ~5pps, so keep it. */
|
|
|
|
|
return true;
|
revalidator: Only revalidate high-throughput flows.
Previously we would revalidate all flows if the "need_revalidate" flag
was raised. This patch modifies the logic to delete low throughput flows
rather than revalidate them. High-throughput flows are unaffected by
this change. This patch identifies the flows based on the mean time
between packets since the last dump.
This change is primarily targeted at situations where:
* Flow dump duration is high (~1 second)
* Revalidation is triggered. (eg, by bridge reconfiguration or learning)
After the need_revalidate flag is set, next time a new flow dump session
starts, revalidators will begin revalidating the flows. This full
revalidation is more expensive, which significantly increases the flow
dump duration. At the end of this dump session, the datapath flow
management algorithms kick in for the next dump:
* If flow dump duration becomes too long, the flow limit is decreased.
* The number of flows in the datapath then exceeds the flow_limit.
* As the flow_limit is exceeded, max_idle is temporarily set to 100ms.
* Revalidators delete all flows that haven't seen traffic recently.
The effect of this is that many low-throughput flows are deleted after
revalidation, even if they are valid. The revalidation is unnecessary
for flows that would be deleted anyway, so this patch skips the
revalidation step for those flows.
Note that this patch will only perform this optimization if the flow has
already been dumped at least once, and only if the time since the last
dump is sufficiently long. This gives the flow a chance to become
high-throughput.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---
v2: Acked.
v1: Determine "high-throughput" by packets rather than bytes.
Calculate the mean time between packets for comparison, rather than
comparing the number of packets since the last dump.
RFC: First post.
2014-03-04 09:36:37 -08:00
|
|
|
|
}
|
2014-07-02 07:41:33 +00:00
|
|
|
|
return false;
|
revalidator: Only revalidate high-throughput flows.
Previously we would revalidate all flows if the "need_revalidate" flag
was raised. This patch modifies the logic to delete low throughput flows
rather than revalidate them. High-throughput flows are unaffected by
this change. This patch identifies the flows based on the mean time
between packets since the last dump.
This change is primarily targeted at situations where:
* Flow dump duration is high (~1 second)
* Revalidation is triggered. (eg, by bridge reconfiguration or learning)
After the need_revalidate flag is set, next time a new flow dump session
starts, revalidators will begin revalidating the flows. This full
revalidation is more expensive, which significantly increases the flow
dump duration. At the end of this dump session, the datapath flow
management algorithms kick in for the next dump:
* If flow dump duration becomes too long, the flow limit is decreased.
* The number of flows in the datapath then exceeds the flow_limit.
* As the flow_limit is exceeded, max_idle is temporarily set to 100ms.
* Revalidators delete all flows that haven't seen traffic recently.
The effect of this is that many low-throughput flows are deleted after
revalidation, even if they are valid. The revalidation is unnecessary
for flows that would be deleted anyway, so this patch skips the
revalidation step for those flows.
Note that this patch will only perform this optimization if the flow has
already been dumped at least once, and only if the time since the last
dump is sufficiently long. This gives the flow a chance to become
high-throughput.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---
v2: Acked.
v1: Determine "high-throughput" by packets rather than bytes.
Calculate the mean time between packets for comparison, rather than
comparing the number of packets since the last dump.
RFC: First post.
2014-03-04 09:36:37 -08:00
|
|
|
|
}
|
|
|
|
|
|
2015-08-03 18:43:53 -07:00
|
|
|
|
/* Verifies that the datapath actions of 'ukey' are still correct, and pushes
|
|
|
|
|
* 'stats' for it.
|
|
|
|
|
*
|
|
|
|
|
* Returns a recommended action for 'ukey', options include:
|
|
|
|
|
* UKEY_DELETE The ukey should be deleted.
|
|
|
|
|
* UKEY_KEEP The ukey is fine as is.
|
|
|
|
|
* UKEY_MODIFY The ukey's actions should be changed but is otherwise
|
|
|
|
|
* fine. Callers should change the actions to those found
|
2015-11-25 15:19:37 -08:00
|
|
|
|
* in the caller supplied 'odp_actions' buffer. The
|
|
|
|
|
* recirculation references can be found in 'recircs' and
|
|
|
|
|
* must be handled by the caller.
|
|
|
|
|
*
|
|
|
|
|
* If the result is UKEY_MODIFY, then references to all recirc_ids used by the
|
|
|
|
|
* new flow will be held within 'recircs' (which may be none).
|
|
|
|
|
*
|
|
|
|
|
* The caller is responsible for both initializing 'recircs' prior this call,
|
|
|
|
|
* and ensuring any references are eventually freed.
|
|
|
|
|
*/
|
2015-08-03 18:43:53 -07:00
|
|
|
|
static enum reval_result
|
2014-04-10 07:14:08 +00:00
|
|
|
|
revalidate_ukey(struct udpif *udpif, struct udpif_key *ukey,
|
2015-08-03 18:43:53 -07:00
|
|
|
|
const struct dpif_flow_stats *stats,
|
2015-11-25 15:19:37 -08:00
|
|
|
|
struct ofpbuf *odp_actions, uint64_t reval_seq,
|
|
|
|
|
struct recirc_refs *recircs)
|
revalidator: Eliminate duplicate flow handling.
A series of bugs have been identified recently that are caused by a
combination of the awkward flow dump API, possibility of duplicate flows
in a flow dump, and premature optimisation of the revalidator logic.
This patch attempts to simplify the revalidator logic by combining
multiple critical sections into one, which should make the state more
consistent.
The new flow of logic is:
+ Lookup the ukey.
+ If the ukey doesn't exist, create it.
+ Insert the ukey into the udpif. If we can't insert it, skip this flow.
+ Lock the ukey. If we can't lock it, skip it.
+ Determine if the ukey was already handled. If it has, skip it.
+ Revalidate.
+ Update ukey's fields (mark, flow_exists).
+ Unlock the ukey.
Previously, we would attempt process a flow without creating a ukey if
it hadn't been dumped before and it was due to be deleted. This patch
changes this to always create a ukey, allowing the ukey's
mutex to be used as the basis for preventing a flow from being handled
twice. This improves code correctness and readability.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2014-05-28 15:23:42 +12:00
|
|
|
|
OVS_REQUIRES(ukey->mutex)
|
2013-09-24 13:39:56 -07:00
|
|
|
|
{
|
|
|
|
|
struct xlate_out xout, *xoutp;
|
2014-04-01 21:21:45 +09:00
|
|
|
|
struct netflow *netflow;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
struct ofproto_dpif *ofproto;
|
|
|
|
|
struct dpif_flow_stats push;
|
2015-09-29 14:21:33 -07:00
|
|
|
|
struct flow flow;
|
|
|
|
|
struct flow_wildcards dp_mask, wc;
|
2015-08-03 18:43:53 -07:00
|
|
|
|
enum reval_result result;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
ofp_port_t ofp_in_port;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
struct xlate_in xin;
|
revalidator: Only revalidate high-throughput flows.
Previously we would revalidate all flows if the "need_revalidate" flag
was raised. This patch modifies the logic to delete low throughput flows
rather than revalidate them. High-throughput flows are unaffected by
this change. This patch identifies the flows based on the mean time
between packets since the last dump.
This change is primarily targeted at situations where:
* Flow dump duration is high (~1 second)
* Revalidation is triggered. (eg, by bridge reconfiguration or learning)
After the need_revalidate flag is set, next time a new flow dump session
starts, revalidators will begin revalidating the flows. This full
revalidation is more expensive, which significantly increases the flow
dump duration. At the end of this dump session, the datapath flow
management algorithms kick in for the next dump:
* If flow dump duration becomes too long, the flow limit is decreased.
* The number of flows in the datapath then exceeds the flow_limit.
* As the flow_limit is exceeded, max_idle is temporarily set to 100ms.
* Revalidators delete all flows that haven't seen traffic recently.
The effect of this is that many low-throughput flows are deleted after
revalidation, even if they are valid. The revalidation is unnecessary
for flows that would be deleted anyway, so this patch skips the
revalidation step for those flows.
Note that this patch will only perform this optimization if the flow has
already been dumped at least once, and only if the time since the last
dump is sufficiently long. This gives the flow a chance to become
high-throughput.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---
v2: Acked.
v1: Determine "high-throughput" by packets rather than bytes.
Calculate the mean time between packets for comparison, rather than
comparing the number of packets since the last dump.
RFC: First post.
2014-03-04 09:36:37 -08:00
|
|
|
|
long long int last_used;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
int error;
|
2014-07-25 13:54:24 +12:00
|
|
|
|
bool need_revalidate;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2015-08-03 18:43:53 -07:00
|
|
|
|
result = UKEY_DELETE;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
xoutp = NULL;
|
2014-04-01 21:21:45 +09:00
|
|
|
|
netflow = NULL;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2015-08-03 18:43:53 -07:00
|
|
|
|
ofpbuf_clear(odp_actions);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
need_revalidate = (ukey->reval_seq != reval_seq);
|
revalidator: Only revalidate high-throughput flows.
Previously we would revalidate all flows if the "need_revalidate" flag
was raised. This patch modifies the logic to delete low throughput flows
rather than revalidate them. High-throughput flows are unaffected by
this change. This patch identifies the flows based on the mean time
between packets since the last dump.
This change is primarily targeted at situations where:
* Flow dump duration is high (~1 second)
* Revalidation is triggered. (eg, by bridge reconfiguration or learning)
After the need_revalidate flag is set, next time a new flow dump session
starts, revalidators will begin revalidating the flows. This full
revalidation is more expensive, which significantly increases the flow
dump duration. At the end of this dump session, the datapath flow
management algorithms kick in for the next dump:
* If flow dump duration becomes too long, the flow limit is decreased.
* The number of flows in the datapath then exceeds the flow_limit.
* As the flow_limit is exceeded, max_idle is temporarily set to 100ms.
* Revalidators delete all flows that haven't seen traffic recently.
The effect of this is that many low-throughput flows are deleted after
revalidation, even if they are valid. The revalidation is unnecessary
for flows that would be deleted anyway, so this patch skips the
revalidation step for those flows.
Note that this patch will only perform this optimization if the flow has
already been dumped at least once, and only if the time since the last
dump is sufficiently long. This gives the flow a chance to become
high-throughput.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---
v2: Acked.
v1: Determine "high-throughput" by packets rather than bytes.
Calculate the mean time between packets for comparison, rather than
comparing the number of packets since the last dump.
RFC: First post.
2014-03-04 09:36:37 -08:00
|
|
|
|
last_used = ukey->stats.used;
|
2014-08-06 16:40:37 +12:00
|
|
|
|
push.used = stats->used;
|
|
|
|
|
push.tcp_flags = stats->tcp_flags;
|
|
|
|
|
push.n_packets = (stats->n_packets > ukey->stats.n_packets
|
|
|
|
|
? stats->n_packets - ukey->stats.n_packets
|
2014-05-20 11:37:02 -07:00
|
|
|
|
: 0);
|
2014-08-06 16:40:37 +12:00
|
|
|
|
push.n_bytes = (stats->n_bytes > ukey->stats.n_bytes
|
|
|
|
|
? stats->n_bytes - ukey->stats.n_bytes
|
2014-05-20 11:37:02 -07:00
|
|
|
|
: 0);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
if (need_revalidate && last_used
|
2014-07-02 07:41:33 +00:00
|
|
|
|
&& !should_revalidate(udpif, push.n_packets, last_used)) {
|
revalidator: Only revalidate high-throughput flows.
Previously we would revalidate all flows if the "need_revalidate" flag
was raised. This patch modifies the logic to delete low throughput flows
rather than revalidate them. High-throughput flows are unaffected by
this change. This patch identifies the flows based on the mean time
between packets since the last dump.
This change is primarily targeted at situations where:
* Flow dump duration is high (~1 second)
* Revalidation is triggered. (eg, by bridge reconfiguration or learning)
After the need_revalidate flag is set, next time a new flow dump session
starts, revalidators will begin revalidating the flows. This full
revalidation is more expensive, which significantly increases the flow
dump duration. At the end of this dump session, the datapath flow
management algorithms kick in for the next dump:
* If flow dump duration becomes too long, the flow limit is decreased.
* The number of flows in the datapath then exceeds the flow_limit.
* As the flow_limit is exceeded, max_idle is temporarily set to 100ms.
* Revalidators delete all flows that haven't seen traffic recently.
The effect of this is that many low-throughput flows are deleted after
revalidation, even if they are valid. The revalidation is unnecessary
for flows that would be deleted anyway, so this patch skips the
revalidation step for those flows.
Note that this patch will only perform this optimization if the flow has
already been dumped at least once, and only if the time since the last
dump is sufficiently long. This gives the flow a chance to become
high-throughput.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---
v2: Acked.
v1: Determine "high-throughput" by packets rather than bytes.
Calculate the mean time between packets for comparison, rather than
comparing the number of packets since the last dump.
RFC: First post.
2014-03-04 09:36:37 -08:00
|
|
|
|
goto exit;
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-25 15:23:43 -07:00
|
|
|
|
/* We will push the stats, so update the ukey stats cache. */
|
2014-08-06 16:40:37 +12:00
|
|
|
|
ukey->stats = *stats;
|
2014-07-25 13:54:24 +12:00
|
|
|
|
if (!push.n_packets && !need_revalidate) {
|
2015-08-03 18:43:53 -07:00
|
|
|
|
result = UKEY_KEEP;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
goto exit;
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
if (ukey->xcache && !need_revalidate) {
|
2014-08-22 15:32:19 -07:00
|
|
|
|
xlate_push_stats(ukey->xcache, &push);
|
2015-08-03 18:43:53 -07:00
|
|
|
|
result = UKEY_KEEP;
|
2014-06-23 15:52:03 +00:00
|
|
|
|
goto exit;
|
2014-04-10 16:00:28 +12:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
if (odp_flow_key_to_flow(ukey->key, ukey->key_len, &flow)
|
|
|
|
|
== ODP_FIT_ERROR) {
|
|
|
|
|
goto exit;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-22 09:01:36 -07:00
|
|
|
|
error = xlate_lookup(udpif->backer, &flow, &ofproto, NULL, NULL, &netflow,
|
|
|
|
|
&ofp_in_port);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
if (error) {
|
|
|
|
|
goto exit;
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
if (need_revalidate) {
|
2014-06-23 15:52:03 +00:00
|
|
|
|
xlate_cache_clear(ukey->xcache);
|
|
|
|
|
}
|
2014-04-10 16:00:28 +12:00
|
|
|
|
if (!ukey->xcache) {
|
|
|
|
|
ukey->xcache = xlate_cache_new();
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
xlate_in_init(&xin, ofproto, &flow, ofp_in_port, NULL, push.tcp_flags,
|
2015-08-03 18:43:53 -07:00
|
|
|
|
NULL, need_revalidate ? &wc : NULL, odp_actions);
|
2014-08-22 15:32:19 -07:00
|
|
|
|
if (push.n_packets) {
|
|
|
|
|
xin.resubmit_stats = &push;
|
|
|
|
|
xin.may_learn = true;
|
|
|
|
|
}
|
2014-04-10 16:00:28 +12:00
|
|
|
|
xin.xcache = ukey->xcache;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
xlate_actions(&xin, &xout);
|
|
|
|
|
xoutp = &xout;
|
2013-09-23 10:57:22 -07:00
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
if (!need_revalidate) {
|
2015-08-03 18:43:53 -07:00
|
|
|
|
result = UKEY_KEEP;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
goto exit;
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-31 13:34:16 -07:00
|
|
|
|
if (xout.slow) {
|
2015-08-03 18:43:53 -07:00
|
|
|
|
ofpbuf_clear(odp_actions);
|
2014-08-06 18:49:44 -07:00
|
|
|
|
compose_slow_path(udpif, &xout, &flow, flow.in_port.odp_port,
|
2015-08-03 18:43:53 -07:00
|
|
|
|
odp_actions);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
|
|
|
|
|
2015-06-19 13:54:13 -07:00
|
|
|
|
if (odp_flow_key_to_mask(ukey->mask, ukey->mask_len, ukey->key,
|
2015-12-07 17:30:25 -08:00
|
|
|
|
ukey->key_len, &dp_mask, &flow)
|
2015-09-29 14:21:33 -07:00
|
|
|
|
== ODP_FIT_ERROR) {
|
2013-09-24 13:39:56 -07:00
|
|
|
|
goto exit;
|
|
|
|
|
}
|
|
|
|
|
|
2015-09-29 14:21:33 -07:00
|
|
|
|
/* Do not modify if any bit is wildcarded by the installed datapath flow,
|
|
|
|
|
* but not the newly revalidated wildcard mask (wc), i.e., if revalidation
|
|
|
|
|
* tells that the datapath flow is now too generic and must be narrowed
|
|
|
|
|
* down. Note that we do not know if the datapath has ignored any of the
|
|
|
|
|
* wildcarded bits, so we may be overtly conservative here. */
|
|
|
|
|
if (flow_wildcards_has_extra(&dp_mask, &wc)) {
|
|
|
|
|
goto exit;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
2014-08-06 16:40:37 +12:00
|
|
|
|
|
2015-08-03 18:43:53 -07:00
|
|
|
|
if (!ofpbuf_equal(odp_actions,
|
|
|
|
|
ovsrcu_get(struct ofpbuf *, &ukey->actions))) {
|
|
|
|
|
/* The datapath mask was OK, but the actions seem to have changed.
|
|
|
|
|
* Let's modify it in place. */
|
|
|
|
|
result = UKEY_MODIFY;
|
2015-11-25 15:19:37 -08:00
|
|
|
|
/* Transfer recirc action ID references to the caller. */
|
|
|
|
|
recirc_refs_swap(recircs, &xoutp->recircs);
|
2015-08-03 18:43:53 -07:00
|
|
|
|
goto exit;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result = UKEY_KEEP;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
|
|
|
|
exit:
|
2015-08-03 18:43:53 -07:00
|
|
|
|
if (result != UKEY_DELETE) {
|
2014-07-25 13:54:24 +12:00
|
|
|
|
ukey->reval_seq = reval_seq;
|
|
|
|
|
}
|
2015-08-03 18:43:53 -07:00
|
|
|
|
if (netflow && result == UKEY_DELETE) {
|
2014-08-22 09:01:36 -07:00
|
|
|
|
netflow_flow_clear(netflow, &flow);
|
2014-04-01 21:21:45 +09:00
|
|
|
|
}
|
2013-09-24 13:39:56 -07:00
|
|
|
|
xlate_out_uninit(xoutp);
|
2015-08-03 18:43:53 -07:00
|
|
|
|
return result;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-06 11:14:08 +13:00
|
|
|
|
static void
|
2014-12-16 17:44:40 -08:00
|
|
|
|
delete_op_init__(struct udpif *udpif, struct ukey_op *op,
|
|
|
|
|
const struct dpif_flow *flow)
|
2014-10-06 11:14:08 +13:00
|
|
|
|
{
|
2014-12-08 17:14:39 -08:00
|
|
|
|
op->ukey = NULL;
|
2014-10-06 11:14:08 +13:00
|
|
|
|
op->dop.type = DPIF_OP_FLOW_DEL;
|
|
|
|
|
op->dop.u.flow_del.key = flow->key;
|
|
|
|
|
op->dop.u.flow_del.key_len = flow->key_len;
|
|
|
|
|
op->dop.u.flow_del.ufid = flow->ufid_present ? &flow->ufid : NULL;
|
2014-10-12 18:18:47 -07:00
|
|
|
|
op->dop.u.flow_del.pmd_id = flow->pmd_id;
|
2014-10-06 11:14:08 +13:00
|
|
|
|
op->dop.u.flow_del.stats = &op->stats;
|
2014-12-19 09:54:38 -08:00
|
|
|
|
op->dop.u.flow_del.terse = udpif_use_ufid(udpif);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
}
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
static void
|
2014-12-16 17:44:40 -08:00
|
|
|
|
delete_op_init(struct udpif *udpif, struct ukey_op *op, struct udpif_key *ukey)
|
2014-02-11 13:55:34 -08:00
|
|
|
|
{
|
|
|
|
|
op->ukey = ukey;
|
2014-08-21 00:21:03 +12:00
|
|
|
|
op->dop.type = DPIF_OP_FLOW_DEL;
|
2014-08-06 16:40:37 +12:00
|
|
|
|
op->dop.u.flow_del.key = ukey->key;
|
|
|
|
|
op->dop.u.flow_del.key_len = ukey->key_len;
|
2014-09-24 16:26:35 +12:00
|
|
|
|
op->dop.u.flow_del.ufid = ukey->ufid_present ? &ukey->ufid : NULL;
|
2014-10-12 18:18:47 -07:00
|
|
|
|
op->dop.u.flow_del.pmd_id = ukey->pmd_id;
|
2014-08-21 00:21:03 +12:00
|
|
|
|
op->dop.u.flow_del.stats = &op->stats;
|
2014-12-19 09:54:38 -08:00
|
|
|
|
op->dop.u.flow_del.terse = udpif_use_ufid(udpif);
|
2014-02-11 13:55:34 -08:00
|
|
|
|
}
|
|
|
|
|
|
2015-08-03 18:43:53 -07:00
|
|
|
|
static void
|
2016-08-31 11:06:02 -07:00
|
|
|
|
put_op_init(struct ukey_op *op, struct udpif_key *ukey,
|
|
|
|
|
enum dpif_flow_put_flags flags)
|
2015-08-03 18:43:53 -07:00
|
|
|
|
{
|
|
|
|
|
op->ukey = ukey;
|
|
|
|
|
op->dop.type = DPIF_OP_FLOW_PUT;
|
2016-08-31 11:06:02 -07:00
|
|
|
|
op->dop.u.flow_put.flags = flags;
|
2015-08-03 18:43:53 -07:00
|
|
|
|
op->dop.u.flow_put.key = ukey->key;
|
|
|
|
|
op->dop.u.flow_put.key_len = ukey->key_len;
|
|
|
|
|
op->dop.u.flow_put.mask = ukey->mask;
|
|
|
|
|
op->dop.u.flow_put.mask_len = ukey->mask_len;
|
2016-05-13 14:17:12 -07:00
|
|
|
|
op->dop.u.flow_put.ufid = ukey->ufid_present ? &ukey->ufid : NULL;
|
2015-08-03 18:43:53 -07:00
|
|
|
|
op->dop.u.flow_put.pmd_id = ukey->pmd_id;
|
|
|
|
|
op->dop.u.flow_put.stats = NULL;
|
|
|
|
|
ukey_get_actions(ukey, &op->dop.u.flow_put.actions,
|
|
|
|
|
&op->dop.u.flow_put.actions_len);
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-07 16:16:25 -08:00
|
|
|
|
/* Executes datapath operations 'ops' and attributes stats retrieved from the
|
|
|
|
|
* datapath as part of those operations. */
|
2014-02-11 13:55:34 -08:00
|
|
|
|
static void
|
2016-01-07 16:16:25 -08:00
|
|
|
|
push_dp_ops(struct udpif *udpif, struct ukey_op *ops, size_t n_ops)
|
2013-09-24 13:39:56 -07:00
|
|
|
|
{
|
2014-02-11 13:55:34 -08:00
|
|
|
|
struct dpif_op *opsp[REVALIDATE_MAX_BATCH];
|
|
|
|
|
size_t i;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-02-11 13:55:34 -08:00
|
|
|
|
ovs_assert(n_ops <= REVALIDATE_MAX_BATCH);
|
|
|
|
|
for (i = 0; i < n_ops; i++) {
|
2014-08-21 00:21:03 +12:00
|
|
|
|
opsp[i] = &ops[i].dop;
|
2014-02-11 13:55:34 -08:00
|
|
|
|
}
|
|
|
|
|
dpif_operate(udpif->dpif, opsp, n_ops);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < n_ops; i++) {
|
2014-08-21 00:21:03 +12:00
|
|
|
|
struct ukey_op *op = &ops[i];
|
2014-02-11 13:55:34 -08:00
|
|
|
|
struct dpif_flow_stats *push, *stats, push_buf;
|
|
|
|
|
|
2014-08-21 00:21:03 +12:00
|
|
|
|
stats = op->dop.u.flow_del.stats;
|
2014-07-01 09:54:18 +00:00
|
|
|
|
push = &push_buf;
|
|
|
|
|
|
2015-08-03 18:43:53 -07:00
|
|
|
|
if (op->dop.type != DPIF_OP_FLOW_DEL) {
|
|
|
|
|
/* Only deleted flows need their stats pushed. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-28 05:05:07 +00:00
|
|
|
|
if (op->dop.error) {
|
|
|
|
|
/* flow_del error, 'stats' is unusable. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-06 11:14:08 +13:00
|
|
|
|
if (op->ukey) {
|
|
|
|
|
ovs_mutex_lock(&op->ukey->mutex);
|
|
|
|
|
push->used = MAX(stats->used, op->ukey->stats.used);
|
|
|
|
|
push->tcp_flags = stats->tcp_flags | op->ukey->stats.tcp_flags;
|
|
|
|
|
push->n_packets = stats->n_packets - op->ukey->stats.n_packets;
|
|
|
|
|
push->n_bytes = stats->n_bytes - op->ukey->stats.n_bytes;
|
|
|
|
|
ovs_mutex_unlock(&op->ukey->mutex);
|
|
|
|
|
} else {
|
|
|
|
|
push = stats;
|
|
|
|
|
}
|
2014-02-11 13:55:34 -08:00
|
|
|
|
|
|
|
|
|
if (push->n_packets || netflow_exists()) {
|
2014-10-06 11:14:08 +13:00
|
|
|
|
const struct nlattr *key = op->dop.u.flow_del.key;
|
|
|
|
|
size_t key_len = op->dop.u.flow_del.key_len;
|
2014-02-11 13:55:34 -08:00
|
|
|
|
struct ofproto_dpif *ofproto;
|
|
|
|
|
struct netflow *netflow;
|
2014-08-06 18:49:44 -07:00
|
|
|
|
ofp_port_t ofp_in_port;
|
2014-02-11 13:55:34 -08:00
|
|
|
|
struct flow flow;
|
2014-07-01 09:54:18 +00:00
|
|
|
|
int error;
|
2014-04-10 16:00:28 +12:00
|
|
|
|
|
2014-10-06 11:14:08 +13:00
|
|
|
|
if (op->ukey) {
|
|
|
|
|
ovs_mutex_lock(&op->ukey->mutex);
|
|
|
|
|
if (op->ukey->xcache) {
|
|
|
|
|
xlate_push_stats(op->ukey->xcache, push);
|
|
|
|
|
ovs_mutex_unlock(&op->ukey->mutex);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2014-04-10 07:14:08 +00:00
|
|
|
|
ovs_mutex_unlock(&op->ukey->mutex);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
key = op->ukey->key;
|
|
|
|
|
key_len = op->ukey->key_len;
|
2014-04-10 16:00:28 +12:00
|
|
|
|
}
|
2014-02-11 13:55:34 -08:00
|
|
|
|
|
2014-10-06 11:14:08 +13:00
|
|
|
|
if (odp_flow_key_to_flow(key, key_len, &flow)
|
2014-08-06 18:49:44 -07:00
|
|
|
|
== ODP_FIT_ERROR) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-26 11:18:16 -07:00
|
|
|
|
error = xlate_lookup(udpif->backer, &flow, &ofproto, NULL, NULL,
|
|
|
|
|
&netflow, &ofp_in_port);
|
2014-07-01 09:54:18 +00:00
|
|
|
|
if (!error) {
|
2014-02-11 13:55:34 -08:00
|
|
|
|
struct xlate_in xin;
|
|
|
|
|
|
2014-08-06 18:49:44 -07:00
|
|
|
|
xlate_in_init(&xin, ofproto, &flow, ofp_in_port, NULL,
|
2015-07-31 13:34:16 -07:00
|
|
|
|
push->tcp_flags, NULL, NULL, NULL);
|
2014-02-11 13:55:34 -08:00
|
|
|
|
xin.resubmit_stats = push->n_packets ? push : NULL;
|
2014-08-22 15:32:19 -07:00
|
|
|
|
xin.may_learn = push->n_packets > 0;
|
2014-02-11 13:55:34 -08:00
|
|
|
|
xlate_actions_for_side_effects(&xin);
|
|
|
|
|
|
|
|
|
|
if (netflow) {
|
|
|
|
|
netflow_flow_clear(netflow, &flow);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-04-10 07:14:08 +00:00
|
|
|
|
}
|
2014-02-11 13:55:34 -08:00
|
|
|
|
|
2016-01-07 16:16:25 -08:00
|
|
|
|
/* Executes datapath operations 'ops', attributes stats retrieved from the
|
|
|
|
|
* datapath, and deletes ukeys corresponding to deleted flows. */
|
2014-04-10 07:14:08 +00:00
|
|
|
|
static void
|
2014-08-21 00:21:03 +12:00
|
|
|
|
push_ukey_ops(struct udpif *udpif, struct umap *umap,
|
|
|
|
|
struct ukey_op *ops, size_t n_ops)
|
2014-04-10 07:14:08 +00:00
|
|
|
|
{
|
|
|
|
|
int i;
|
2014-02-11 13:55:34 -08:00
|
|
|
|
|
2016-01-07 16:16:25 -08:00
|
|
|
|
push_dp_ops(udpif, ops, n_ops);
|
2014-06-05 17:28:46 +12:00
|
|
|
|
ovs_mutex_lock(&umap->mutex);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
for (i = 0; i < n_ops; i++) {
|
2016-01-07 11:47:46 -08:00
|
|
|
|
if (ops[i].dop.type == DPIF_OP_FLOW_DEL) {
|
|
|
|
|
ukey_delete(umap, ops[i].ukey);
|
|
|
|
|
}
|
2014-02-11 13:55:34 -08:00
|
|
|
|
}
|
2014-06-05 17:28:46 +12:00
|
|
|
|
ovs_mutex_unlock(&umap->mutex);
|
2014-02-11 13:55:34 -08:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-06 11:14:08 +13:00
|
|
|
|
static void
|
|
|
|
|
log_unexpected_flow(const struct dpif_flow *flow, int error)
|
|
|
|
|
{
|
|
|
|
|
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 60);
|
|
|
|
|
struct ds ds = DS_EMPTY_INITIALIZER;
|
|
|
|
|
|
|
|
|
|
ds_put_format(&ds, "Failed to acquire udpif_key corresponding to "
|
|
|
|
|
"unexpected flow (%s): ", ovs_strerror(error));
|
|
|
|
|
odp_format_ufid(&flow->ufid, &ds);
|
|
|
|
|
VLOG_WARN_RL(&rl, "%s", ds_cstr(&ds));
|
2016-06-08 13:04:11 -03:00
|
|
|
|
ds_destroy(&ds);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
}
|
|
|
|
|
|
2015-11-25 15:19:37 -08:00
|
|
|
|
static void
|
|
|
|
|
reval_op_init(struct ukey_op *op, enum reval_result result,
|
|
|
|
|
struct udpif *udpif, struct udpif_key *ukey,
|
|
|
|
|
struct recirc_refs *recircs, struct ofpbuf *odp_actions)
|
|
|
|
|
{
|
|
|
|
|
if (result == UKEY_DELETE) {
|
|
|
|
|
delete_op_init(udpif, op, ukey);
|
|
|
|
|
} else if (result == UKEY_MODIFY) {
|
|
|
|
|
/* Store the new recircs. */
|
|
|
|
|
recirc_refs_swap(&ukey->recircs, recircs);
|
|
|
|
|
/* Release old recircs. */
|
|
|
|
|
recirc_refs_unref(recircs);
|
|
|
|
|
/* ukey->key_recirc_id remains, as the key is the same as before. */
|
|
|
|
|
|
|
|
|
|
ukey_set_actions(ukey, odp_actions);
|
2016-08-31 11:06:02 -07:00
|
|
|
|
put_op_init(op, ukey, DPIF_FP_MODIFY);
|
2015-11-25 15:19:37 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-11 13:55:34 -08:00
|
|
|
|
static void
|
2014-04-10 07:14:08 +00:00
|
|
|
|
revalidate(struct revalidator *revalidator)
|
2014-02-11 13:55:34 -08:00
|
|
|
|
{
|
2015-08-03 18:43:53 -07:00
|
|
|
|
uint64_t odp_actions_stub[1024 / 8];
|
|
|
|
|
struct ofpbuf odp_actions = OFPBUF_STUB_INITIALIZER(odp_actions_stub);
|
|
|
|
|
|
2014-02-11 13:55:34 -08:00
|
|
|
|
struct udpif *udpif = revalidator->udpif;
|
2014-05-20 11:37:02 -07:00
|
|
|
|
struct dpif_flow_dump_thread *dump_thread;
|
2014-07-25 13:54:24 +12:00
|
|
|
|
uint64_t dump_seq, reval_seq;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
unsigned int flow_limit;
|
|
|
|
|
|
2014-05-14 16:17:25 +12:00
|
|
|
|
dump_seq = seq_read(udpif->dump_seq);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
reval_seq = seq_read(udpif->reval_seq);
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_read_relaxed(&udpif->flow_limit, &flow_limit);
|
2014-05-20 11:37:02 -07:00
|
|
|
|
dump_thread = dpif_flow_dump_thread_create(udpif->dump);
|
|
|
|
|
for (;;) {
|
2014-08-21 00:21:03 +12:00
|
|
|
|
struct ukey_op ops[REVALIDATE_MAX_BATCH];
|
2014-05-20 11:37:02 -07:00
|
|
|
|
int n_ops = 0;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
struct dpif_flow flows[REVALIDATE_MAX_BATCH];
|
|
|
|
|
const struct dpif_flow *f;
|
|
|
|
|
int n_dumped;
|
2014-04-10 07:14:08 +00:00
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
long long int max_idle;
|
|
|
|
|
long long int now;
|
|
|
|
|
size_t n_dp_flows;
|
|
|
|
|
bool kill_them_all;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
n_dumped = dpif_flow_dump_next(dump_thread, flows, ARRAY_SIZE(flows));
|
|
|
|
|
if (!n_dumped) {
|
|
|
|
|
break;
|
revalidator: Prevent handling the same flow twice.
When the datapath flow table is modified while a flow dump operation is
in progress, it is possible for the same flow to be dumped twice. In
such cases, revalidators may perform redundant work, or attempt to
delete the same flow twice.
This was causing intermittent testsuite failures for test #670 -
"ofproto-dpif, active-backup bonding" where a flow (that had not
previously been dumped) was dumped, revalidated and deleted twice.
The logs show errors such as:
"failed to flow_get (No such file or directory) skb_priority(0),..."
"failed to flow_del (No such file or directory) skb_priority(0),..."
This patch adds a 'flow_exists' field to 'struct udpif_key' to track
whether the flow is (in progress) to be deleted. After doing a ukey
lookup, we check whether ukey->mark or ukey->flow indicates that the
flow has already been handled. If it has already been handled, we skip
handling the flow again.
We also defer ukey cleanup for flows that fail revalidation, so that the
ukey will still exist if the same flow is dumped twice. This allows the
above logic to work in this case.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
2014-04-23 15:31:17 +12:00
|
|
|
|
}
|
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
now = time_msec();
|
|
|
|
|
|
|
|
|
|
/* In normal operation we want to keep flows around until they have
|
|
|
|
|
* been idle for 'ofproto_max_idle' milliseconds. However:
|
|
|
|
|
*
|
|
|
|
|
* - If the number of datapath flows climbs above 'flow_limit',
|
|
|
|
|
* drop that down to 100 ms to try to bring the flows down to
|
|
|
|
|
* the limit.
|
|
|
|
|
*
|
|
|
|
|
* - If the number of datapath flows climbs above twice
|
|
|
|
|
* 'flow_limit', delete all the datapath flows as an emergency
|
|
|
|
|
* measure. (We reassess this condition for the next batch of
|
|
|
|
|
* datapath flows, so we will recover before all the flows are
|
|
|
|
|
* gone.) */
|
|
|
|
|
n_dp_flows = udpif_get_n_flows(udpif);
|
|
|
|
|
kill_them_all = n_dp_flows > flow_limit * 2;
|
|
|
|
|
max_idle = n_dp_flows > flow_limit ? 100 : ofproto_max_idle;
|
|
|
|
|
|
|
|
|
|
for (f = flows; f < &flows[n_dumped]; f++) {
|
|
|
|
|
long long int used = f->stats.used;
|
2015-11-25 15:19:37 -08:00
|
|
|
|
struct recirc_refs recircs = RECIRC_REFS_EMPTY_INITIALIZER;
|
2015-08-03 18:43:53 -07:00
|
|
|
|
enum reval_result result;
|
2014-06-04 09:59:23 +00:00
|
|
|
|
struct udpif_key *ukey;
|
2015-08-03 18:43:53 -07:00
|
|
|
|
bool already_dumped;
|
2014-10-06 11:14:08 +13:00
|
|
|
|
int error;
|
revalidator: Eliminate duplicate flow handling.
A series of bugs have been identified recently that are caused by a
combination of the awkward flow dump API, possibility of duplicate flows
in a flow dump, and premature optimisation of the revalidator logic.
This patch attempts to simplify the revalidator logic by combining
multiple critical sections into one, which should make the state more
consistent.
The new flow of logic is:
+ Lookup the ukey.
+ If the ukey doesn't exist, create it.
+ Insert the ukey into the udpif. If we can't insert it, skip this flow.
+ Lock the ukey. If we can't lock it, skip it.
+ Determine if the ukey was already handled. If it has, skip it.
+ Revalidate.
+ Update ukey's fields (mark, flow_exists).
+ Unlock the ukey.
Previously, we would attempt process a flow without creating a ukey if
it hadn't been dumped before and it was due to be deleted. This patch
changes this to always create a ukey, allowing the ukey's
mutex to be used as the basis for preventing a flow from being handled
twice. This improves code correctness and readability.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2014-05-28 15:23:42 +12:00
|
|
|
|
|
2014-10-06 11:14:08 +13:00
|
|
|
|
if (ukey_acquire(udpif, f, &ukey, &error)) {
|
|
|
|
|
if (error == EBUSY) {
|
|
|
|
|
/* Another thread is processing this flow, so don't bother
|
|
|
|
|
* processing it.*/
|
|
|
|
|
COVERAGE_INC(upcall_ukey_contention);
|
|
|
|
|
} else {
|
|
|
|
|
log_unexpected_flow(f, error);
|
2014-12-10 11:20:10 -08:00
|
|
|
|
if (error != ENOENT) {
|
2014-12-16 17:44:40 -08:00
|
|
|
|
delete_op_init__(udpif, &ops[n_ops++], f);
|
2014-12-10 11:20:10 -08:00
|
|
|
|
}
|
2014-10-06 11:14:08 +13:00
|
|
|
|
}
|
revalidator: Eliminate duplicate flow handling.
A series of bugs have been identified recently that are caused by a
combination of the awkward flow dump API, possibility of duplicate flows
in a flow dump, and premature optimisation of the revalidator logic.
This patch attempts to simplify the revalidator logic by combining
multiple critical sections into one, which should make the state more
consistent.
The new flow of logic is:
+ Lookup the ukey.
+ If the ukey doesn't exist, create it.
+ Insert the ukey into the udpif. If we can't insert it, skip this flow.
+ Lock the ukey. If we can't lock it, skip it.
+ Determine if the ukey was already handled. If it has, skip it.
+ Revalidate.
+ Update ukey's fields (mark, flow_exists).
+ Unlock the ukey.
Previously, we would attempt process a flow without creating a ukey if
it hadn't been dumped before and it was due to be deleted. This patch
changes this to always create a ukey, allowing the ukey's
mutex to be used as the basis for preventing a flow from being handled
twice. This improves code correctness and readability.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2014-05-28 15:23:42 +12:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-14 16:17:25 +12:00
|
|
|
|
already_dumped = ukey->dump_seq == dump_seq;
|
revalidator: Eliminate duplicate flow handling.
A series of bugs have been identified recently that are caused by a
combination of the awkward flow dump API, possibility of duplicate flows
in a flow dump, and premature optimisation of the revalidator logic.
This patch attempts to simplify the revalidator logic by combining
multiple critical sections into one, which should make the state more
consistent.
The new flow of logic is:
+ Lookup the ukey.
+ If the ukey doesn't exist, create it.
+ Insert the ukey into the udpif. If we can't insert it, skip this flow.
+ Lock the ukey. If we can't lock it, skip it.
+ Determine if the ukey was already handled. If it has, skip it.
+ Revalidate.
+ Update ukey's fields (mark, flow_exists).
+ Unlock the ukey.
Previously, we would attempt process a flow without creating a ukey if
it hadn't been dumped before and it was due to be deleted. This patch
changes this to always create a ukey, allowing the ukey's
mutex to be used as the basis for preventing a flow from being handled
twice. This improves code correctness and readability.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2014-05-28 15:23:42 +12:00
|
|
|
|
if (already_dumped) {
|
2014-09-26 17:28:05 +00:00
|
|
|
|
/* The flow has already been handled during this flow dump
|
|
|
|
|
* operation. Skip it. */
|
|
|
|
|
if (ukey->xcache) {
|
|
|
|
|
COVERAGE_INC(dumped_duplicate_flow);
|
|
|
|
|
} else {
|
|
|
|
|
COVERAGE_INC(dumped_new_flow);
|
|
|
|
|
}
|
revalidator: Eliminate duplicate flow handling.
A series of bugs have been identified recently that are caused by a
combination of the awkward flow dump API, possibility of duplicate flows
in a flow dump, and premature optimisation of the revalidator logic.
This patch attempts to simplify the revalidator logic by combining
multiple critical sections into one, which should make the state more
consistent.
The new flow of logic is:
+ Lookup the ukey.
+ If the ukey doesn't exist, create it.
+ Insert the ukey into the udpif. If we can't insert it, skip this flow.
+ Lock the ukey. If we can't lock it, skip it.
+ Determine if the ukey was already handled. If it has, skip it.
+ Revalidate.
+ Update ukey's fields (mark, flow_exists).
+ Unlock the ukey.
Previously, we would attempt process a flow without creating a ukey if
it hadn't been dumped before and it was due to be deleted. This patch
changes this to always create a ukey, allowing the ukey's
mutex to be used as the basis for preventing a flow from being handled
twice. This improves code correctness and readability.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2014-05-28 15:23:42 +12:00
|
|
|
|
ovs_mutex_unlock(&ukey->mutex);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!used) {
|
|
|
|
|
used = ukey->created;
|
|
|
|
|
}
|
2014-05-20 11:37:02 -07:00
|
|
|
|
if (kill_them_all || (used && used < now - max_idle)) {
|
2015-08-03 18:43:53 -07:00
|
|
|
|
result = UKEY_DELETE;
|
2014-05-20 11:37:02 -07:00
|
|
|
|
} else {
|
2015-08-03 18:43:53 -07:00
|
|
|
|
result = revalidate_ukey(udpif, ukey, &f->stats, &odp_actions,
|
2015-11-25 15:19:37 -08:00
|
|
|
|
reval_seq, &recircs);
|
2014-05-20 11:37:02 -07:00
|
|
|
|
}
|
2014-05-14 16:17:25 +12:00
|
|
|
|
ukey->dump_seq = dump_seq;
|
2015-08-03 18:43:53 -07:00
|
|
|
|
ukey->flow_exists = result != UKEY_DELETE;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2015-11-25 15:19:37 -08:00
|
|
|
|
if (result != UKEY_KEEP) {
|
|
|
|
|
/* Takes ownership of 'recircs'. */
|
|
|
|
|
reval_op_init(&ops[n_ops++], result, udpif, ukey, &recircs,
|
|
|
|
|
&odp_actions);
|
2014-05-20 11:37:02 -07:00
|
|
|
|
}
|
revalidator: Eliminate duplicate flow handling.
A series of bugs have been identified recently that are caused by a
combination of the awkward flow dump API, possibility of duplicate flows
in a flow dump, and premature optimisation of the revalidator logic.
This patch attempts to simplify the revalidator logic by combining
multiple critical sections into one, which should make the state more
consistent.
The new flow of logic is:
+ Lookup the ukey.
+ If the ukey doesn't exist, create it.
+ Insert the ukey into the udpif. If we can't insert it, skip this flow.
+ Lock the ukey. If we can't lock it, skip it.
+ Determine if the ukey was already handled. If it has, skip it.
+ Revalidate.
+ Update ukey's fields (mark, flow_exists).
+ Unlock the ukey.
Previously, we would attempt process a flow without creating a ukey if
it hadn't been dumped before and it was due to be deleted. This patch
changes this to always create a ukey, allowing the ukey's
mutex to be used as the basis for preventing a flow from being handled
twice. This improves code correctness and readability.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2014-05-28 15:23:42 +12:00
|
|
|
|
ovs_mutex_unlock(&ukey->mutex);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
}
|
2014-02-11 13:55:33 -08:00
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
if (n_ops) {
|
2016-01-07 16:16:25 -08:00
|
|
|
|
/* Push datapath ops but defer ukey deletion to 'sweep' phase. */
|
|
|
|
|
push_dp_ops(udpif, ops, n_ops);
|
2014-04-10 07:14:08 +00:00
|
|
|
|
}
|
2014-05-05 15:44:40 +12:00
|
|
|
|
ovsrcu_quiesce();
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
2014-05-20 11:37:02 -07:00
|
|
|
|
dpif_flow_dump_thread_destroy(dump_thread);
|
2015-08-03 18:43:53 -07:00
|
|
|
|
ofpbuf_uninit(&odp_actions);
|
2014-07-08 07:04:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-08-29 06:09:45 +00:00
|
|
|
|
/* Pauses the 'revalidator', can only proceed after main thread
|
|
|
|
|
* calls udpif_resume_revalidators(). */
|
|
|
|
|
static void
|
|
|
|
|
revalidator_pause(struct revalidator *revalidator)
|
|
|
|
|
{
|
|
|
|
|
/* The first block is for sync'ing the pause with main thread. */
|
|
|
|
|
ovs_barrier_block(&revalidator->udpif->pause_barrier);
|
|
|
|
|
/* The second block is for pausing until main thread resumes. */
|
|
|
|
|
ovs_barrier_block(&revalidator->udpif->pause_barrier);
|
|
|
|
|
}
|
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
static void
|
2014-02-11 13:55:36 -08:00
|
|
|
|
revalidator_sweep__(struct revalidator *revalidator, bool purge)
|
2013-09-24 13:39:56 -07:00
|
|
|
|
{
|
2014-06-05 17:28:46 +12:00
|
|
|
|
struct udpif *udpif;
|
2014-07-25 13:54:24 +12:00
|
|
|
|
uint64_t dump_seq, reval_seq;
|
2014-06-05 17:28:46 +12:00
|
|
|
|
int slice;
|
2014-02-11 13:55:35 -08:00
|
|
|
|
|
2014-06-05 17:28:46 +12:00
|
|
|
|
udpif = revalidator->udpif;
|
|
|
|
|
dump_seq = seq_read(udpif->dump_seq);
|
2014-07-25 13:54:24 +12:00
|
|
|
|
reval_seq = seq_read(udpif->reval_seq);
|
2014-06-05 17:28:46 +12:00
|
|
|
|
slice = revalidator - udpif->revalidators;
|
|
|
|
|
ovs_assert(slice < udpif->n_revalidators);
|
|
|
|
|
|
|
|
|
|
for (int i = slice; i < N_UMAPS; i += udpif->n_revalidators) {
|
2015-08-03 18:43:53 -07:00
|
|
|
|
uint64_t odp_actions_stub[1024 / 8];
|
|
|
|
|
struct ofpbuf odp_actions = OFPBUF_STUB_INITIALIZER(odp_actions_stub);
|
|
|
|
|
|
2014-08-21 00:21:03 +12:00
|
|
|
|
struct ukey_op ops[REVALIDATE_MAX_BATCH];
|
2014-06-05 17:28:46 +12:00
|
|
|
|
struct udpif_key *ukey;
|
|
|
|
|
struct umap *umap = &udpif->ukeys[i];
|
|
|
|
|
size_t n_ops = 0;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-06-05 17:28:46 +12:00
|
|
|
|
CMAP_FOR_EACH(ukey, cmap_node, &umap->cmap) {
|
ofproto-dpif-upcall: Simplify revalidator_sweep__().
Broadly, there are two cases that are handled during revalidator_sweep__:
- Ukeys which had their corresponding datapath flows deleted during the
most recent dump phase need to be deleted.
- If a flow for a ukey still exists in the datapath, the flow may need
to be removed or updated. This depends on a variety of factors such as
whether the datapath is being flushed, whether individual flows were
recently dumped, and whether those flows are valid for the current
revalidation generation.
Previously, the logic was written such that the first of these cases
would be handled under the "UKEY_KEEP" case to ensure that
revalidator_sweep__() will not attempt to delete flows that already
exist. In this case, ukey->flow_exists would be false, which would
trigger ukey cleanup.
While correct, this is misleading and difficult to follow. Since commit
83b03fe05e7a ("ofproto-dpif-upcall: Avoid double-delete of ukeys."),
this logic is no longer required to prevent double-deletion of such
flows, so we can now make this codepath more straightforward.
Signed-off-by: Joe Stringer <joe@ovn.org>
Co-authored-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
2016-01-07 11:47:47 -08:00
|
|
|
|
bool flow_exists;
|
2014-05-05 15:44:04 +12:00
|
|
|
|
|
2014-07-25 13:54:24 +12:00
|
|
|
|
/* Handler threads could be holding a ukey lock while it installs a
|
|
|
|
|
* new flow, so don't hang around waiting for access to it. */
|
|
|
|
|
if (ovs_mutex_trylock(&ukey->mutex)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2014-06-05 17:28:46 +12:00
|
|
|
|
flow_exists = ukey->flow_exists;
|
ofproto-dpif-upcall: Simplify revalidator_sweep__().
Broadly, there are two cases that are handled during revalidator_sweep__:
- Ukeys which had their corresponding datapath flows deleted during the
most recent dump phase need to be deleted.
- If a flow for a ukey still exists in the datapath, the flow may need
to be removed or updated. This depends on a variety of factors such as
whether the datapath is being flushed, whether individual flows were
recently dumped, and whether those flows are valid for the current
revalidation generation.
Previously, the logic was written such that the first of these cases
would be handled under the "UKEY_KEEP" case to ensure that
revalidator_sweep__() will not attempt to delete flows that already
exist. In this case, ukey->flow_exists would be false, which would
trigger ukey cleanup.
While correct, this is misleading and difficult to follow. Since commit
83b03fe05e7a ("ofproto-dpif-upcall: Avoid double-delete of ukeys."),
this logic is no longer required to prevent double-deletion of such
flows, so we can now make this codepath more straightforward.
Signed-off-by: Joe Stringer <joe@ovn.org>
Co-authored-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
2016-01-07 11:47:47 -08:00
|
|
|
|
if (flow_exists) {
|
|
|
|
|
struct recirc_refs recircs = RECIRC_REFS_EMPTY_INITIALIZER;
|
|
|
|
|
bool seq_mismatch = (ukey->dump_seq != dump_seq
|
|
|
|
|
&& ukey->reval_seq != reval_seq);
|
|
|
|
|
enum reval_result result;
|
|
|
|
|
|
|
|
|
|
if (purge) {
|
|
|
|
|
result = UKEY_DELETE;
|
|
|
|
|
} else if (!seq_mismatch) {
|
|
|
|
|
result = UKEY_KEEP;
|
|
|
|
|
} else {
|
|
|
|
|
struct dpif_flow_stats stats;
|
|
|
|
|
COVERAGE_INC(revalidate_missed_dp_flow);
|
|
|
|
|
memset(&stats, 0, sizeof stats);
|
|
|
|
|
result = revalidate_ukey(udpif, ukey, &stats, &odp_actions,
|
|
|
|
|
reval_seq, &recircs);
|
|
|
|
|
}
|
|
|
|
|
if (result != UKEY_KEEP) {
|
|
|
|
|
/* Clears 'recircs' if filled by revalidate_ukey(). */
|
|
|
|
|
reval_op_init(&ops[n_ops++], result, udpif, ukey, &recircs,
|
|
|
|
|
&odp_actions);
|
|
|
|
|
}
|
2015-08-03 18:43:53 -07:00
|
|
|
|
}
|
2015-11-25 15:19:37 -08:00
|
|
|
|
ovs_mutex_unlock(&ukey->mutex);
|
2015-08-03 18:43:53 -07:00
|
|
|
|
|
|
|
|
|
if (!flow_exists) {
|
2016-01-07 16:16:25 -08:00
|
|
|
|
/* The common flow deletion case involves deletion of the flow
|
|
|
|
|
* during the dump phase and ukey deletion here. */
|
2014-06-05 17:28:46 +12:00
|
|
|
|
ovs_mutex_lock(&umap->mutex);
|
|
|
|
|
ukey_delete(umap, ukey);
|
|
|
|
|
ovs_mutex_unlock(&umap->mutex);
|
2014-02-11 13:55:35 -08:00
|
|
|
|
}
|
ofproto-dpif-upcall: Simplify revalidator_sweep__().
Broadly, there are two cases that are handled during revalidator_sweep__:
- Ukeys which had their corresponding datapath flows deleted during the
most recent dump phase need to be deleted.
- If a flow for a ukey still exists in the datapath, the flow may need
to be removed or updated. This depends on a variety of factors such as
whether the datapath is being flushed, whether individual flows were
recently dumped, and whether those flows are valid for the current
revalidation generation.
Previously, the logic was written such that the first of these cases
would be handled under the "UKEY_KEEP" case to ensure that
revalidator_sweep__() will not attempt to delete flows that already
exist. In this case, ukey->flow_exists would be false, which would
trigger ukey cleanup.
While correct, this is misleading and difficult to follow. Since commit
83b03fe05e7a ("ofproto-dpif-upcall: Avoid double-delete of ukeys."),
this logic is no longer required to prevent double-deletion of such
flows, so we can now make this codepath more straightforward.
Signed-off-by: Joe Stringer <joe@ovn.org>
Co-authored-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
2016-01-07 11:47:47 -08:00
|
|
|
|
|
|
|
|
|
if (n_ops == REVALIDATE_MAX_BATCH) {
|
2016-01-07 16:16:25 -08:00
|
|
|
|
/* Update/delete missed flows and clean up corresponding ukeys
|
|
|
|
|
* if necessary. */
|
ofproto-dpif-upcall: Simplify revalidator_sweep__().
Broadly, there are two cases that are handled during revalidator_sweep__:
- Ukeys which had their corresponding datapath flows deleted during the
most recent dump phase need to be deleted.
- If a flow for a ukey still exists in the datapath, the flow may need
to be removed or updated. This depends on a variety of factors such as
whether the datapath is being flushed, whether individual flows were
recently dumped, and whether those flows are valid for the current
revalidation generation.
Previously, the logic was written such that the first of these cases
would be handled under the "UKEY_KEEP" case to ensure that
revalidator_sweep__() will not attempt to delete flows that already
exist. In this case, ukey->flow_exists would be false, which would
trigger ukey cleanup.
While correct, this is misleading and difficult to follow. Since commit
83b03fe05e7a ("ofproto-dpif-upcall: Avoid double-delete of ukeys."),
this logic is no longer required to prevent double-deletion of such
flows, so we can now make this codepath more straightforward.
Signed-off-by: Joe Stringer <joe@ovn.org>
Co-authored-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
2016-01-07 11:47:47 -08:00
|
|
|
|
push_ukey_ops(udpif, umap, ops, n_ops);
|
|
|
|
|
n_ops = 0;
|
|
|
|
|
}
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
2014-02-11 13:55:35 -08:00
|
|
|
|
|
2014-06-05 17:28:46 +12:00
|
|
|
|
if (n_ops) {
|
2014-08-21 00:21:03 +12:00
|
|
|
|
push_ukey_ops(udpif, umap, ops, n_ops);
|
2014-06-05 17:28:46 +12:00
|
|
|
|
}
|
2015-08-03 18:43:53 -07:00
|
|
|
|
|
|
|
|
|
ofpbuf_uninit(&odp_actions);
|
2014-06-05 17:28:46 +12:00
|
|
|
|
ovsrcu_quiesce();
|
2014-02-11 13:55:35 -08:00
|
|
|
|
}
|
2013-06-25 14:45:43 -07:00
|
|
|
|
}
|
2014-02-11 13:55:36 -08:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
revalidator_sweep(struct revalidator *revalidator)
|
|
|
|
|
{
|
|
|
|
|
revalidator_sweep__(revalidator, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
revalidator_purge(struct revalidator *revalidator)
|
|
|
|
|
{
|
|
|
|
|
revalidator_sweep__(revalidator, true);
|
|
|
|
|
}
|
2015-08-25 16:36:46 -07:00
|
|
|
|
|
|
|
|
|
/* In reaction to dpif purge, purges all 'ukey's with same 'pmd_id'. */
|
|
|
|
|
static void
|
|
|
|
|
dp_purge_cb(void *aux, unsigned pmd_id)
|
|
|
|
|
{
|
|
|
|
|
struct udpif *udpif = aux;
|
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
udpif_pause_revalidators(udpif);
|
|
|
|
|
for (i = 0; i < N_UMAPS; i++) {
|
|
|
|
|
struct ukey_op ops[REVALIDATE_MAX_BATCH];
|
|
|
|
|
struct udpif_key *ukey;
|
|
|
|
|
struct umap *umap = &udpif->ukeys[i];
|
|
|
|
|
size_t n_ops = 0;
|
|
|
|
|
|
|
|
|
|
CMAP_FOR_EACH(ukey, cmap_node, &umap->cmap) {
|
|
|
|
|
if (ukey->pmd_id == pmd_id) {
|
|
|
|
|
delete_op_init(udpif, &ops[n_ops++], ukey);
|
|
|
|
|
if (n_ops == REVALIDATE_MAX_BATCH) {
|
|
|
|
|
push_ukey_ops(udpif, umap, ops, n_ops);
|
|
|
|
|
n_ops = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (n_ops) {
|
|
|
|
|
push_ukey_ops(udpif, umap, ops, n_ops);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ovsrcu_quiesce();
|
|
|
|
|
}
|
|
|
|
|
udpif_resume_revalidators(udpif);
|
|
|
|
|
}
|
2013-11-20 18:06:12 -08:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
upcall_unixctl_show(struct unixctl_conn *conn, int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
struct ds ds = DS_EMPTY_INITIALIZER;
|
|
|
|
|
struct udpif *udpif;
|
|
|
|
|
|
|
|
|
|
LIST_FOR_EACH (udpif, list_node, &all_udpifs) {
|
2013-09-24 13:39:56 -07:00
|
|
|
|
unsigned int flow_limit;
|
2014-10-06 11:14:08 +13:00
|
|
|
|
bool ufid_enabled;
|
2013-11-20 18:06:12 -08:00
|
|
|
|
size_t i;
|
|
|
|
|
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_read_relaxed(&udpif->flow_limit, &flow_limit);
|
2014-12-19 09:54:38 -08:00
|
|
|
|
ufid_enabled = udpif_use_ufid(udpif);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2013-11-20 18:06:12 -08:00
|
|
|
|
ds_put_format(&ds, "%s:\n", dpif_name(udpif->dpif));
|
2014-05-14 16:19:34 +09:00
|
|
|
|
ds_put_format(&ds, "\tflows : (current %lu)"
|
2013-09-24 13:39:56 -07:00
|
|
|
|
" (avg %u) (max %u) (limit %u)\n", udpif_get_n_flows(udpif),
|
|
|
|
|
udpif->avg_n_flows, udpif->max_n_flows, flow_limit);
|
|
|
|
|
ds_put_format(&ds, "\tdump duration : %lldms\n", udpif->dump_duration);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
ds_put_format(&ds, "\tufid enabled : ");
|
|
|
|
|
if (ufid_enabled) {
|
|
|
|
|
ds_put_format(&ds, "true\n");
|
|
|
|
|
} else {
|
|
|
|
|
ds_put_format(&ds, "false\n");
|
|
|
|
|
}
|
2013-09-24 13:39:56 -07:00
|
|
|
|
ds_put_char(&ds, '\n');
|
2014-06-05 17:28:46 +12:00
|
|
|
|
|
2013-09-24 13:39:56 -07:00
|
|
|
|
for (i = 0; i < n_revalidators; i++) {
|
|
|
|
|
struct revalidator *revalidator = &udpif->revalidators[i];
|
2014-06-05 17:28:46 +12:00
|
|
|
|
int j, elements = 0;
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
2014-06-05 17:28:46 +12:00
|
|
|
|
for (j = i; j < N_UMAPS; j += n_revalidators) {
|
|
|
|
|
elements += cmap_count(&udpif->ukeys[j].cmap);
|
|
|
|
|
}
|
|
|
|
|
ds_put_format(&ds, "\t%u: (keys %d)\n", revalidator->id, elements);
|
2013-09-24 13:39:56 -07:00
|
|
|
|
}
|
2013-11-20 18:06:12 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unixctl_command_reply(conn, ds_cstr(&ds));
|
|
|
|
|
ds_destroy(&ds);
|
|
|
|
|
}
|
2013-09-24 13:39:56 -07:00
|
|
|
|
|
|
|
|
|
/* Disable using the megaflows.
|
|
|
|
|
*
|
|
|
|
|
* This command is only needed for advanced debugging, so it's not
|
|
|
|
|
* documented in the man page. */
|
|
|
|
|
static void
|
|
|
|
|
upcall_unixctl_disable_megaflows(struct unixctl_conn *conn,
|
|
|
|
|
int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[] OVS_UNUSED,
|
|
|
|
|
void *aux OVS_UNUSED)
|
|
|
|
|
{
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_store_relaxed(&enable_megaflows, false);
|
udpif: Bug fix updif_flush
Before this commit, all datapath flows are cleared with dpif_flush(),
but the revalidator thread still holds ukeys, which are caches of the
datapath flows in the revalidaor. Flushing ukeys causes flow_del
messages to be sent to the datapath again on flows that have been
deleted by the dpif_flush() already.
Double deletion by itself is not problem, per se, may an efficiency
issue. However, for ever flow_del message sent to the datapath, a log
message, at the warning level, will be generated in case datapath
failed to execute the command. In addition to cause spurious log
messages, Double deletion causes unit tests to report erroneous
failures as all warning messages are considered test failures.
The fix is to simply shut down the revalidator threads to flush all
ukeys, then flush the datapth before restarting the revalidator threads.
dpif_flush() was implemented as flush flows of all datapaths while
most of its invocation should only flush its local datapath.
Only megaflow on/off commands should flush all dapapaths. This bug is
also fixed.
Found during development.
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-03-13 21:48:55 -07:00
|
|
|
|
udpif_flush_all_datapaths();
|
2013-09-24 13:39:56 -07:00
|
|
|
|
unixctl_command_reply(conn, "megaflows disabled");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Re-enable using megaflows.
|
|
|
|
|
*
|
|
|
|
|
* This command is only needed for advanced debugging, so it's not
|
|
|
|
|
* documented in the man page. */
|
|
|
|
|
static void
|
|
|
|
|
upcall_unixctl_enable_megaflows(struct unixctl_conn *conn,
|
|
|
|
|
int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[] OVS_UNUSED,
|
|
|
|
|
void *aux OVS_UNUSED)
|
|
|
|
|
{
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_store_relaxed(&enable_megaflows, true);
|
udpif: Bug fix updif_flush
Before this commit, all datapath flows are cleared with dpif_flush(),
but the revalidator thread still holds ukeys, which are caches of the
datapath flows in the revalidaor. Flushing ukeys causes flow_del
messages to be sent to the datapath again on flows that have been
deleted by the dpif_flush() already.
Double deletion by itself is not problem, per se, may an efficiency
issue. However, for ever flow_del message sent to the datapath, a log
message, at the warning level, will be generated in case datapath
failed to execute the command. In addition to cause spurious log
messages, Double deletion causes unit tests to report erroneous
failures as all warning messages are considered test failures.
The fix is to simply shut down the revalidator threads to flush all
ukeys, then flush the datapth before restarting the revalidator threads.
dpif_flush() was implemented as flush flows of all datapaths while
most of its invocation should only flush its local datapath.
Only megaflow on/off commands should flush all dapapaths. This bug is
also fixed.
Found during development.
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
2014-03-13 21:48:55 -07:00
|
|
|
|
udpif_flush_all_datapaths();
|
2013-09-24 13:39:56 -07:00
|
|
|
|
unixctl_command_reply(conn, "megaflows enabled");
|
|
|
|
|
}
|
2014-02-06 09:49:19 -08:00
|
|
|
|
|
2014-10-06 11:14:08 +13:00
|
|
|
|
/* Disable skipping flow attributes during flow dump.
|
|
|
|
|
*
|
|
|
|
|
* This command is only needed for advanced debugging, so it's not
|
|
|
|
|
* documented in the man page. */
|
|
|
|
|
static void
|
|
|
|
|
upcall_unixctl_disable_ufid(struct unixctl_conn *conn, int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
|
|
|
|
|
{
|
2014-12-19 09:54:38 -08:00
|
|
|
|
atomic_store_relaxed(&enable_ufid, false);
|
2014-10-06 11:14:08 +13:00
|
|
|
|
unixctl_command_reply(conn, "Datapath dumping tersely using UFID disabled");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Re-enable skipping flow attributes during flow dump.
|
|
|
|
|
*
|
|
|
|
|
* This command is only needed for advanced debugging, so it's not documented
|
|
|
|
|
* in the man page. */
|
|
|
|
|
static void
|
|
|
|
|
upcall_unixctl_enable_ufid(struct unixctl_conn *conn, int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
|
|
|
|
|
{
|
2014-12-19 09:54:38 -08:00
|
|
|
|
atomic_store_relaxed(&enable_ufid, true);
|
|
|
|
|
unixctl_command_reply(conn, "Datapath dumping tersely using UFID enabled "
|
|
|
|
|
"for supported datapaths");
|
2014-10-06 11:14:08 +13:00
|
|
|
|
}
|
|
|
|
|
|
2014-02-06 09:49:19 -08:00
|
|
|
|
/* Set the flow limit.
|
|
|
|
|
*
|
|
|
|
|
* This command is only needed for advanced debugging, so it's not
|
|
|
|
|
* documented in the man page. */
|
|
|
|
|
static void
|
|
|
|
|
upcall_unixctl_set_flow_limit(struct unixctl_conn *conn,
|
|
|
|
|
int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[] OVS_UNUSED,
|
|
|
|
|
void *aux OVS_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
struct ds ds = DS_EMPTY_INITIALIZER;
|
|
|
|
|
struct udpif *udpif;
|
|
|
|
|
unsigned int flow_limit = atoi(argv[1]);
|
|
|
|
|
|
|
|
|
|
LIST_FOR_EACH (udpif, list_node, &all_udpifs) {
|
2014-08-29 10:34:53 -07:00
|
|
|
|
atomic_store_relaxed(&udpif->flow_limit, flow_limit);
|
2014-02-06 09:49:19 -08:00
|
|
|
|
}
|
|
|
|
|
ds_put_format(&ds, "set flow_limit to %u\n", flow_limit);
|
|
|
|
|
unixctl_command_reply(conn, ds_cstr(&ds));
|
|
|
|
|
ds_destroy(&ds);
|
|
|
|
|
}
|
2014-06-25 14:02:45 +00:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
upcall_unixctl_dump_wait(struct unixctl_conn *conn,
|
|
|
|
|
int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[] OVS_UNUSED,
|
|
|
|
|
void *aux OVS_UNUSED)
|
|
|
|
|
{
|
2016-03-25 14:10:22 -07:00
|
|
|
|
if (ovs_list_is_singleton(&all_udpifs)) {
|
2014-09-15 10:10:34 -07:00
|
|
|
|
struct udpif *udpif = NULL;
|
2014-06-25 14:02:45 +00:00
|
|
|
|
size_t len;
|
|
|
|
|
|
2016-03-25 14:10:22 -07:00
|
|
|
|
udpif = OBJECT_CONTAINING(ovs_list_front(&all_udpifs), udpif, list_node);
|
2014-06-25 14:02:45 +00:00
|
|
|
|
len = (udpif->n_conns + 1) * sizeof *udpif->conns;
|
|
|
|
|
udpif->conn_seq = seq_read(udpif->dump_seq);
|
|
|
|
|
udpif->conns = xrealloc(udpif->conns, len);
|
|
|
|
|
udpif->conns[udpif->n_conns++] = conn;
|
|
|
|
|
} else {
|
|
|
|
|
unixctl_command_reply_error(conn, "can't wait on multiple udpifs.");
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-11-13 10:42:47 -08:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
upcall_unixctl_purge(struct unixctl_conn *conn, int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
struct udpif *udpif;
|
|
|
|
|
|
|
|
|
|
LIST_FOR_EACH (udpif, list_node, &all_udpifs) {
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
for (n = 0; n < udpif->n_revalidators; n++) {
|
|
|
|
|
revalidator_purge(&udpif->revalidators[n]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
unixctl_command_reply(conn, "");
|
|
|
|
|
}
|