2009-06-19 14:09:39 -07:00
|
|
|
|
/*
|
2013-12-24 16:08:57 -08:00
|
|
|
|
* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
|
2009-06-19 14:09:39 -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>
|
netdev-dpdk: Fix race condition with DPDK mempools in non pmd threads
DPDK mempools rely on rte_lcore_id() to implement a thread-local cache.
Our non pmd threads had rte_lcore_id() == 0. This allowed concurrent access to
the "thread-local" cache, causing crashes.
This commit resolves the issue with the following changes:
- Every non pmd thread has the same lcore_id (0, for management reasons), which
is not shared with any pmd thread (lcore_id for pmd threads now start from 1)
- DPDK mbufs must be allocated/freed in pmd threads. When there is the need to
use mempools in non pmd threads, like in dpdk_do_tx_copy(), a mutex must be
held.
- The previous change does not allow us anymore to pass DPDK mbufs to handler
threads: therefore this commit partially revert 143859ec63d45e. Now packets
are copied for upcall processing. We can remove the extra memcpy by
processing upcalls in the pmd thread itself.
With the introduction of the extra locking, the packet throughput will be lower
in the following cases:
- When using internal (tap) devices with DPDK devices on the same datapath.
Anyway, to support internal devices efficiently, we needed DPDK KNI devices,
which will be proper pmd devices and will not need this locking.
- When packets are processed in the slow path by non pmd threads. This overhead
can be avoided by handling the upcalls directly in pmd threads (a change that
has already been proposed by Ryan Wilson)
Also, the following two fixes have been introduced:
- In dpdk_free_buf() use rte_pktmbuf_free_seg() instead of rte_mempool_put().
This allows OVS to run properly with CONFIG_RTE_LIBRTE_MBUF_DEBUG DPDK option
- Do not bulk free mbufs in a transmission queue. They may belong to different
mempools
Signed-off-by: Daniele Di Proietto <ddiproietto@vmware.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
2014-07-17 14:29:36 -07:00
|
|
|
|
#include "dpif-netdev.h"
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <inttypes.h>
|
|
|
|
|
#include <netinet/in.h>
|
2010-05-26 10:05:19 -07:00
|
|
|
|
#include <sys/socket.h>
|
2010-02-12 12:51:36 -08:00
|
|
|
|
#include <net/if.h>
|
2010-12-10 10:40:58 -08:00
|
|
|
|
#include <stdint.h>
|
2009-06-19 14:09:39 -07:00
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
#include "cmap.h"
|
2009-06-19 14:09:39 -07:00
|
|
|
|
#include "csum.h"
|
2010-11-29 12:21:08 -08:00
|
|
|
|
#include "dpif.h"
|
2009-06-19 14:09:39 -07:00
|
|
|
|
#include "dpif-provider.h"
|
2010-11-29 12:21:08 -08:00
|
|
|
|
#include "dummy.h"
|
2011-01-23 18:44:44 -08:00
|
|
|
|
#include "dynamic-string.h"
|
lib/classifier: Lockless lookups.
Now that all the relevant classifier structures use RCU and internal
mutual exclusion for modifications, we can remove the fat-rwlock and
thus make the classifier lookups lockless.
As the readers are operating concurrently with the writers, a
concurrent reader may or may not see a new rule being added by a
writer, depending on how the concurrent events overlap with each
other. Overall, this is no different from the former locked behavior,
but there the visibility of the new rule only depended on the timing
of the locking functions.
A new rule is first added to the segment indices, so the readers may
find the rule in the indices before the rule is visible in the
subtables 'rules' map. This may result in us losing the opportunity
to quit lookups earlier, resulting in sub-optimal wildcarding. This
will be fixed by forthcoming revalidation always scheduled after flow
table changes.
Similar behavior may happen due to us removing the overlapping rule
(if any) from the indices only after the corresponding new rule has
been added.
The subtable's max priority is updated only after a rule is inserted
to the maps, so the concurrent readers may not see the rule, as the
updated priority ordered subtable list will only be visible after the
subtable's max priority is updated.
Similarly, the classifier's partitions are updated by the caller after
the rule is inserted to the maps, so the readers may keep skipping the
subtable until they see the updated partitions.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2014-07-11 02:29:08 -07:00
|
|
|
|
#include "fat-rwlock.h"
|
2009-06-19 14:09:39 -07:00
|
|
|
|
#include "flow.h"
|
2014-07-04 06:38:47 -07:00
|
|
|
|
#include "cmap.h"
|
2013-12-27 17:00:30 -08:00
|
|
|
|
#include "latch.h"
|
2009-06-19 14:09:39 -07:00
|
|
|
|
#include "list.h"
|
2014-10-17 09:37:11 -07:00
|
|
|
|
#include "match.h"
|
2013-12-11 11:07:01 -08:00
|
|
|
|
#include "meta-flow.h"
|
2009-06-19 14:09:39 -07:00
|
|
|
|
#include "netdev.h"
|
2014-03-20 22:07:44 -07:00
|
|
|
|
#include "netdev-dpdk.h"
|
2012-12-16 17:08:50 -08:00
|
|
|
|
#include "netdev-vport.h"
|
2010-12-10 10:40:58 -08:00
|
|
|
|
#include "netlink.h"
|
2013-05-29 15:06:38 +09:00
|
|
|
|
#include "odp-execute.h"
|
2009-06-19 14:09:39 -07:00
|
|
|
|
#include "odp-util.h"
|
|
|
|
|
#include "ofp-print.h"
|
|
|
|
|
#include "ofpbuf.h"
|
2014-06-17 10:52:20 -07:00
|
|
|
|
#include "ovs-numa.h"
|
2014-03-05 22:41:30 -08:00
|
|
|
|
#include "ovs-rcu.h"
|
2014-06-23 11:43:57 -07:00
|
|
|
|
#include "packet-dpif.h"
|
2009-06-19 14:09:39 -07:00
|
|
|
|
#include "packets.h"
|
|
|
|
|
#include "poll-loop.h"
|
2014-10-17 09:37:11 -07:00
|
|
|
|
#include "pvector.h"
|
2011-10-11 11:07:14 -07:00
|
|
|
|
#include "random.h"
|
2013-08-07 13:29:54 -07:00
|
|
|
|
#include "seq.h"
|
2010-11-24 12:35:22 -08:00
|
|
|
|
#include "shash.h"
|
2012-01-19 10:24:46 -08:00
|
|
|
|
#include "sset.h"
|
2009-06-19 14:09:39 -07:00
|
|
|
|
#include "timeval.h"
|
2014-11-11 11:53:47 -08:00
|
|
|
|
#include "tnl-arp-cache.h"
|
2013-07-29 15:11:49 -07:00
|
|
|
|
#include "unixctl.h"
|
2009-06-19 14:09:39 -07:00
|
|
|
|
#include "util.h"
|
|
|
|
|
#include "vlog.h"
|
2010-07-16 11:02:49 -07:00
|
|
|
|
|
2010-10-19 14:47:01 -07:00
|
|
|
|
VLOG_DEFINE_THIS_MODULE(dpif_netdev);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-06-23 12:36:11 -07:00
|
|
|
|
#define FLOW_DUMP_MAX_BATCH 50
|
2014-03-05 15:27:31 -08:00
|
|
|
|
/* Use per thread recirc_depth to prevent recirculation loop. */
|
|
|
|
|
#define MAX_RECIRC_DEPTH 5
|
|
|
|
|
DEFINE_STATIC_PER_THREAD_DATA(uint32_t, recirc_depth, 0)
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
/* Configuration parameters. */
|
|
|
|
|
enum { MAX_FLOWS = 65536 }; /* Maximum number of flows in flow table. */
|
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
/* Protects against changes to 'dp_netdevs'. */
|
|
|
|
|
static struct ovs_mutex dp_netdev_mutex = OVS_MUTEX_INITIALIZER;
|
|
|
|
|
|
|
|
|
|
/* Contains all 'struct dp_netdev's. */
|
|
|
|
|
static struct shash dp_netdevs OVS_GUARDED_BY(dp_netdev_mutex)
|
|
|
|
|
= SHASH_INITIALIZER(&dp_netdevs);
|
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
static struct vlog_rate_limit upcall_rl = VLOG_RATE_LIMIT_INIT(600, 600);
|
2014-07-26 06:51:55 +00:00
|
|
|
|
|
2014-09-06 08:10:42 +00:00
|
|
|
|
/* Stores a miniflow with inline values */
|
2014-08-29 16:06:43 -07:00
|
|
|
|
|
|
|
|
|
struct netdev_flow_key {
|
2014-10-17 17:03:13 -07:00
|
|
|
|
uint32_t hash; /* Hash function differs for different users. */
|
|
|
|
|
uint32_t len; /* Length of the following miniflow (incl. map). */
|
2014-10-17 09:37:11 -07:00
|
|
|
|
struct miniflow mf;
|
2014-09-20 07:30:02 +00:00
|
|
|
|
uint32_t buf[FLOW_MAX_PACKET_U32S - MINI_N_INLINE];
|
2014-08-29 16:06:43 -07:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Exact match cache for frequently used flows
|
|
|
|
|
*
|
|
|
|
|
* The cache uses a 32-bit hash of the packet (which can be the RSS hash) to
|
|
|
|
|
* search its entries for a miniflow that matches exactly the miniflow of the
|
2014-10-17 09:37:11 -07:00
|
|
|
|
* packet. It stores the 'dpcls_rule' (rule) that matches the miniflow.
|
2014-08-29 16:06:43 -07:00
|
|
|
|
*
|
|
|
|
|
* A cache entry holds a reference to its 'dp_netdev_flow'.
|
|
|
|
|
*
|
|
|
|
|
* A miniflow with a given hash can be in one of EM_FLOW_HASH_SEGS different
|
|
|
|
|
* entries. The 32-bit hash is split into EM_FLOW_HASH_SEGS values (each of
|
|
|
|
|
* them is EM_FLOW_HASH_SHIFT bits wide and the remainder is thrown away). Each
|
|
|
|
|
* value is the index of a cache entry where the miniflow could be.
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* Thread-safety
|
|
|
|
|
* =============
|
|
|
|
|
*
|
|
|
|
|
* Each pmd_thread has its own private exact match cache.
|
|
|
|
|
* If dp_netdev_input is not called from a pmd thread, a mutex is used.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define EM_FLOW_HASH_SHIFT 10
|
|
|
|
|
#define EM_FLOW_HASH_ENTRIES (1u << EM_FLOW_HASH_SHIFT)
|
|
|
|
|
#define EM_FLOW_HASH_MASK (EM_FLOW_HASH_ENTRIES - 1)
|
|
|
|
|
#define EM_FLOW_HASH_SEGS 2
|
|
|
|
|
|
|
|
|
|
struct emc_entry {
|
|
|
|
|
struct dp_netdev_flow *flow;
|
2014-10-17 09:37:11 -07:00
|
|
|
|
struct netdev_flow_key key; /* key.hash used for emc hash value. */
|
2014-08-29 16:06:43 -07:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct emc_cache {
|
|
|
|
|
struct emc_entry entries[EM_FLOW_HASH_ENTRIES];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Iterate in the exact match cache through every entry that might contain a
|
|
|
|
|
* miniflow with hash 'HASH'. */
|
|
|
|
|
#define EMC_FOR_EACH_POS_WITH_HASH(EMC, CURRENT_ENTRY, HASH) \
|
|
|
|
|
for (uint32_t i__ = 0, srch_hash__ = (HASH); \
|
|
|
|
|
(CURRENT_ENTRY) = &(EMC)->entries[srch_hash__ & EM_FLOW_HASH_MASK], \
|
|
|
|
|
i__ < EM_FLOW_HASH_SEGS; \
|
|
|
|
|
i__++, srch_hash__ >>= EM_FLOW_HASH_SHIFT)
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
|
|
|
|
/* Simple non-wildcarding single-priority classifier. */
|
|
|
|
|
|
|
|
|
|
struct dpcls {
|
|
|
|
|
struct cmap subtables_map;
|
|
|
|
|
struct pvector subtables;
|
|
|
|
|
};
|
2014-08-29 16:06:43 -07:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
/* A rule to be inserted to the classifier. */
|
|
|
|
|
struct dpcls_rule {
|
|
|
|
|
struct cmap_node cmap_node; /* Within struct dpcls_subtable 'rules'. */
|
|
|
|
|
struct netdev_flow_key *mask; /* Subtable's mask. */
|
|
|
|
|
struct netdev_flow_key flow; /* Matching key. */
|
|
|
|
|
/* 'flow' must be the last field, additional space is allocated here. */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void dpcls_init(struct dpcls *);
|
|
|
|
|
static void dpcls_destroy(struct dpcls *);
|
|
|
|
|
static void dpcls_insert(struct dpcls *, struct dpcls_rule *,
|
|
|
|
|
const struct netdev_flow_key *mask);
|
|
|
|
|
static void dpcls_remove(struct dpcls *, struct dpcls_rule *);
|
|
|
|
|
static bool dpcls_lookup(const struct dpcls *cls,
|
|
|
|
|
const struct netdev_flow_key keys[],
|
|
|
|
|
struct dpcls_rule **rules, size_t cnt);
|
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
/* Datapath based on the network device interface from netdev.h.
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* Thread-safety
|
|
|
|
|
* =============
|
|
|
|
|
*
|
|
|
|
|
* Some members, marked 'const', are immutable. Accessing other members
|
|
|
|
|
* requires synchronization, as noted in more detail below.
|
|
|
|
|
*
|
|
|
|
|
* Acquisition order is, from outermost to innermost:
|
|
|
|
|
*
|
|
|
|
|
* dp_netdev_mutex (global)
|
2014-05-20 13:21:09 -07:00
|
|
|
|
* port_mutex
|
2014-01-08 15:58:11 -08:00
|
|
|
|
* flow_mutex
|
|
|
|
|
*/
|
2009-06-19 14:09:39 -07:00
|
|
|
|
struct dp_netdev {
|
2014-01-08 15:58:11 -08:00
|
|
|
|
const struct dpif_class *const class;
|
|
|
|
|
const char *const name;
|
2014-07-26 06:51:55 +00:00
|
|
|
|
struct dpif *dpif;
|
2013-12-27 19:41:10 -08:00
|
|
|
|
struct ovs_refcount ref_cnt;
|
|
|
|
|
atomic_flag destroyed;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
/* Flows.
|
|
|
|
|
*
|
lib/classifier: Lockless lookups.
Now that all the relevant classifier structures use RCU and internal
mutual exclusion for modifications, we can remove the fat-rwlock and
thus make the classifier lookups lockless.
As the readers are operating concurrently with the writers, a
concurrent reader may or may not see a new rule being added by a
writer, depending on how the concurrent events overlap with each
other. Overall, this is no different from the former locked behavior,
but there the visibility of the new rule only depended on the timing
of the locking functions.
A new rule is first added to the segment indices, so the readers may
find the rule in the indices before the rule is visible in the
subtables 'rules' map. This may result in us losing the opportunity
to quit lookups earlier, resulting in sub-optimal wildcarding. This
will be fixed by forthcoming revalidation always scheduled after flow
table changes.
Similar behavior may happen due to us removing the overlapping rule
(if any) from the indices only after the corresponding new rule has
been added.
The subtable's max priority is updated only after a rule is inserted
to the maps, so the concurrent readers may not see the rule, as the
updated priority ordered subtable list will only be visible after the
subtable's max priority is updated.
Similarly, the classifier's partitions are updated by the caller after
the rule is inserted to the maps, so the readers may keep skipping the
subtable until they see the updated partitions.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
2014-07-11 02:29:08 -07:00
|
|
|
|
* Writers of 'flow_table' must take the 'flow_mutex'. Corresponding
|
|
|
|
|
* changes to 'cls' must be made while still holding the 'flow_mutex'.
|
2014-01-08 15:58:11 -08:00
|
|
|
|
*/
|
|
|
|
|
struct ovs_mutex flow_mutex;
|
2014-10-17 09:37:11 -07:00
|
|
|
|
struct dpcls cls;
|
2014-07-04 06:38:47 -07:00
|
|
|
|
struct cmap flow_table OVS_GUARDED; /* Flow table. */
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
|
|
|
|
/* Statistics.
|
|
|
|
|
*
|
2014-03-19 07:47:12 -07:00
|
|
|
|
* ovsthread_stats is internally synchronized. */
|
|
|
|
|
struct ovsthread_stats stats; /* Contains 'struct dp_netdev_stats *'. */
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
/* Ports.
|
|
|
|
|
*
|
2014-05-20 13:21:09 -07:00
|
|
|
|
* Protected by RCU. Take the mutex to add or remove ports. */
|
|
|
|
|
struct ovs_mutex port_mutex;
|
|
|
|
|
struct cmap ports;
|
2013-08-07 13:29:54 -07:00
|
|
|
|
struct seq *port_seq; /* Incremented whenever a port changes. */
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-07-26 06:51:55 +00:00
|
|
|
|
/* Protects access to ofproto-dpif-upcall interface during revalidator
|
|
|
|
|
* thread synchronization. */
|
|
|
|
|
struct fat_rwlock upcall_rwlock;
|
2014-07-26 15:39:58 -07:00
|
|
|
|
upcall_callback *upcall_cb; /* Callback function for executing upcalls. */
|
|
|
|
|
void *upcall_aux;
|
2014-07-26 06:51:55 +00:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
/* Stores all 'struct dp_netdev_pmd_thread's. */
|
|
|
|
|
struct cmap poll_threads;
|
|
|
|
|
|
|
|
|
|
/* Protects the access of the 'struct dp_netdev_pmd_thread'
|
|
|
|
|
* instance for non-pmd thread. */
|
|
|
|
|
struct ovs_mutex non_pmd_mutex;
|
|
|
|
|
|
|
|
|
|
/* Each pmd thread will store its pointer to
|
|
|
|
|
* 'struct dp_netdev_pmd_thread' in 'per_pmd_key'. */
|
|
|
|
|
ovsthread_key_t per_pmd_key;
|
2014-09-08 15:22:26 -07:00
|
|
|
|
|
|
|
|
|
/* Number of rx queues for each dpdk interface and the cpu mask
|
|
|
|
|
* for pin of pmd threads. */
|
|
|
|
|
size_t n_dpdk_rxqs;
|
|
|
|
|
char *pmd_cmask;
|
2014-11-11 11:53:47 -08:00
|
|
|
|
uint64_t last_tnl_conf_seq;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
};
|
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
static struct dp_netdev_port *dp_netdev_lookup_port(const struct dp_netdev *dp,
|
2014-05-20 13:21:09 -07:00
|
|
|
|
odp_port_t);
|
2013-12-24 16:08:57 -08:00
|
|
|
|
|
2014-03-19 07:47:12 -07:00
|
|
|
|
enum dp_stat_type {
|
|
|
|
|
DP_STAT_HIT, /* Packets that matched in the flow table. */
|
|
|
|
|
DP_STAT_MISS, /* Packets that did not match. */
|
|
|
|
|
DP_STAT_LOST, /* Packets not passed up to the client. */
|
|
|
|
|
DP_N_STATS
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Contained by struct dp_netdev's 'stats' member. */
|
|
|
|
|
struct dp_netdev_stats {
|
|
|
|
|
struct ovs_mutex mutex; /* Protects 'n'. */
|
|
|
|
|
|
|
|
|
|
/* Indexed by DP_STAT_*, protected by 'mutex'. */
|
|
|
|
|
unsigned long long int n[DP_N_STATS] OVS_GUARDED;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
/* A port in a netdev-based datapath. */
|
|
|
|
|
struct dp_netdev_port {
|
2014-05-20 13:21:09 -07:00
|
|
|
|
struct cmap_node node; /* Node in dp_netdev's 'ports'. */
|
2013-12-24 16:08:57 -08:00
|
|
|
|
odp_port_t port_no;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
struct netdev *netdev;
|
2013-05-10 08:55:25 -07:00
|
|
|
|
struct netdev_saved_flags *sf;
|
2014-03-20 20:52:06 -07:00
|
|
|
|
struct netdev_rxq **rxq;
|
2014-03-20 10:57:19 -07:00
|
|
|
|
struct ovs_refcount ref_cnt;
|
2012-01-19 10:24:46 -08:00
|
|
|
|
char *type; /* Port type as requested by user. */
|
2009-06-19 14:09:39 -07:00
|
|
|
|
};
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
/* A flow in dp_netdev's 'flow_table'.
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* Thread-safety
|
|
|
|
|
* =============
|
|
|
|
|
*
|
|
|
|
|
* Except near the beginning or ending of its lifespan, rule 'rule' belongs to
|
|
|
|
|
* its dp_netdev's classifier. The text below calls this classifier 'cls'.
|
|
|
|
|
*
|
|
|
|
|
* Motivation
|
|
|
|
|
* ----------
|
|
|
|
|
*
|
|
|
|
|
* The thread safety rules described here for "struct dp_netdev_flow" are
|
|
|
|
|
* motivated by two goals:
|
|
|
|
|
*
|
|
|
|
|
* - Prevent threads that read members of "struct dp_netdev_flow" from
|
|
|
|
|
* reading bad data due to changes by some thread concurrently modifying
|
|
|
|
|
* those members.
|
|
|
|
|
*
|
|
|
|
|
* - Prevent two threads making changes to members of a given "struct
|
|
|
|
|
* dp_netdev_flow" from interfering with each other.
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* Rules
|
|
|
|
|
* -----
|
|
|
|
|
*
|
2014-08-11 17:25:50 -07:00
|
|
|
|
* A flow 'flow' may be accessed without a risk of being freed during an RCU
|
|
|
|
|
* grace period. Code that needs to hold onto a flow for a while
|
|
|
|
|
* should try incrementing 'flow->ref_cnt' with dp_netdev_flow_ref().
|
2014-01-08 15:58:11 -08:00
|
|
|
|
*
|
|
|
|
|
* 'flow->ref_cnt' protects 'flow' from being freed. It doesn't protect the
|
2014-08-11 17:25:50 -07:00
|
|
|
|
* flow from being deleted from 'cls' and it doesn't protect members of 'flow'
|
|
|
|
|
* from modification.
|
2014-01-08 15:58:11 -08:00
|
|
|
|
*
|
|
|
|
|
* Some members, marked 'const', are immutable. Accessing other members
|
|
|
|
|
* requires synchronization, as noted in more detail below.
|
|
|
|
|
*/
|
2009-06-19 14:09:39 -07:00
|
|
|
|
struct dp_netdev_flow {
|
2014-08-29 16:06:43 -07:00
|
|
|
|
bool dead;
|
2013-11-04 06:23:54 -08:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
/* Hash table index by unmasked flow. */
|
2014-07-04 06:38:47 -07:00
|
|
|
|
const struct cmap_node node; /* In owning dp_netdev's 'flow_table'. */
|
2014-10-17 09:37:11 -07:00
|
|
|
|
const struct flow flow; /* Unmasked flow that created this entry. */
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-08-11 17:25:50 -07:00
|
|
|
|
/* Number of references.
|
|
|
|
|
* The classifier owns one reference.
|
|
|
|
|
* Any thread trying to keep a rule from being freed should hold its own
|
|
|
|
|
* reference. */
|
|
|
|
|
struct ovs_refcount ref_cnt;
|
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
/* Statistics.
|
|
|
|
|
*
|
|
|
|
|
* Reading or writing these members requires 'mutex'. */
|
2014-01-22 16:03:10 -08:00
|
|
|
|
struct ovsthread_stats stats; /* Contains "struct dp_netdev_flow_stats". */
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
2014-04-15 14:59:30 +09:00
|
|
|
|
/* Actions. */
|
2014-03-05 22:41:30 -08:00
|
|
|
|
OVSRCU_TYPE(struct dp_netdev_actions *) actions;
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
|
|
|
|
/* Packet classification. */
|
|
|
|
|
struct dpcls_rule cr; /* In owning dp_netdev's 'cls'. */
|
|
|
|
|
/* 'cr' must be the last member. */
|
2009-06-19 14:09:39 -07:00
|
|
|
|
};
|
|
|
|
|
|
2014-08-11 17:25:50 -07:00
|
|
|
|
static void dp_netdev_flow_unref(struct dp_netdev_flow *);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
static bool dp_netdev_flow_ref(struct dp_netdev_flow *);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
2014-01-22 16:03:10 -08:00
|
|
|
|
/* Contained by struct dp_netdev_flow's 'stats' member. */
|
|
|
|
|
struct dp_netdev_flow_stats {
|
|
|
|
|
struct ovs_mutex mutex; /* Guards all the other members. */
|
|
|
|
|
|
|
|
|
|
long long int used OVS_GUARDED; /* Last used time, in monotonic msecs. */
|
|
|
|
|
long long int packet_count OVS_GUARDED; /* Number of packets matched. */
|
|
|
|
|
long long int byte_count OVS_GUARDED; /* Number of bytes matched. */
|
|
|
|
|
uint16_t tcp_flags OVS_GUARDED; /* Bitwise-OR of seen tcp_flags values. */
|
|
|
|
|
};
|
|
|
|
|
|
2014-01-08 14:37:13 -08:00
|
|
|
|
/* A set of datapath actions within a "struct dp_netdev_flow".
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* Thread-safety
|
|
|
|
|
* =============
|
|
|
|
|
*
|
2014-04-15 14:59:30 +09:00
|
|
|
|
* A struct dp_netdev_actions 'actions' is protected with RCU. */
|
2014-01-08 14:37:13 -08:00
|
|
|
|
struct dp_netdev_actions {
|
|
|
|
|
/* These members are immutable: they do not change during the struct's
|
|
|
|
|
* lifetime. */
|
|
|
|
|
struct nlattr *actions; /* Sequence of OVS_ACTION_ATTR_* attributes. */
|
|
|
|
|
unsigned int size; /* Size of 'actions', in bytes. */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct dp_netdev_actions *dp_netdev_actions_create(const struct nlattr *,
|
|
|
|
|
size_t);
|
2014-03-05 22:41:30 -08:00
|
|
|
|
struct dp_netdev_actions *dp_netdev_flow_get_actions(
|
|
|
|
|
const struct dp_netdev_flow *);
|
|
|
|
|
static void dp_netdev_actions_free(struct dp_netdev_actions *);
|
2014-01-08 14:37:13 -08:00
|
|
|
|
|
2014-03-20 10:57:41 -07:00
|
|
|
|
/* PMD: Poll modes drivers. PMD accesses devices via polling to eliminate
|
|
|
|
|
* the performance overhead of interrupt processing. Therefore netdev can
|
|
|
|
|
* not implement rx-wait for these devices. dpif-netdev needs to poll
|
|
|
|
|
* these device to check for recv buffer. pmd-thread does polling for
|
|
|
|
|
* devices assigned to itself thread.
|
|
|
|
|
*
|
|
|
|
|
* DPDK used PMD for accessing NIC.
|
|
|
|
|
*
|
2014-09-05 14:14:20 -07:00
|
|
|
|
* Note, instance with cpu core id NON_PMD_CORE_ID will be reserved for
|
|
|
|
|
* I/O of all non-pmd threads. There will be no actual thread created
|
|
|
|
|
* for the instance.
|
2014-03-20 10:57:41 -07:00
|
|
|
|
**/
|
2014-09-05 14:14:20 -07:00
|
|
|
|
struct dp_netdev_pmd_thread {
|
2013-12-27 17:00:30 -08:00
|
|
|
|
struct dp_netdev *dp;
|
2014-09-05 14:14:20 -07:00
|
|
|
|
struct cmap_node node; /* In 'dp->poll_threads'. */
|
|
|
|
|
/* Per thread exact-match cache. Note, the instance for cpu core
|
|
|
|
|
* NON_PMD_CORE_ID can be accessed by multiple threads, and thusly
|
|
|
|
|
* need to be protected (e.g. by 'dp_netdev_mutex'). All other
|
|
|
|
|
* instances will only be accessed by its own pmd thread. */
|
2014-08-29 16:06:43 -07:00
|
|
|
|
struct emc_cache flow_cache;
|
2014-09-05 14:14:20 -07:00
|
|
|
|
struct latch exit_latch; /* For terminating the pmd thread. */
|
|
|
|
|
atomic_uint change_seq; /* For reloading pmd ports. */
|
2013-12-27 17:00:30 -08:00
|
|
|
|
pthread_t thread;
|
2014-09-05 14:14:20 -07:00
|
|
|
|
int index; /* Idx of this pmd thread among pmd*/
|
|
|
|
|
/* threads on same numa node. */
|
|
|
|
|
int core_id; /* CPU core id of this pmd thread. */
|
|
|
|
|
int numa_id; /* numa node id of this pmd thread. */
|
2013-12-27 17:00:30 -08:00
|
|
|
|
};
|
|
|
|
|
|
2014-08-15 15:09:38 -07:00
|
|
|
|
#define PMD_INITIAL_SEQ 1
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
/* Interface to netdev-based datapath. */
|
|
|
|
|
struct dpif_netdev {
|
|
|
|
|
struct dpif dpif;
|
|
|
|
|
struct dp_netdev *dp;
|
2013-08-07 13:29:54 -07:00
|
|
|
|
uint64_t last_port_seq;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
};
|
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
static int get_port_by_number(struct dp_netdev *dp, odp_port_t port_no,
|
2014-05-20 13:21:09 -07:00
|
|
|
|
struct dp_netdev_port **portp);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
static int get_port_by_name(struct dp_netdev *dp, const char *devname,
|
2014-05-20 13:21:09 -07:00
|
|
|
|
struct dp_netdev_port **portp);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
static void dp_netdev_free(struct dp_netdev *)
|
|
|
|
|
OVS_REQUIRES(dp_netdev_mutex);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static void dp_netdev_flow_flush(struct dp_netdev *);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
static int do_add_port(struct dp_netdev *dp, const char *devname,
|
|
|
|
|
const char *type, odp_port_t port_no)
|
2014-05-20 13:21:09 -07:00
|
|
|
|
OVS_REQUIRES(dp->port_mutex);
|
2014-05-22 09:36:00 -07:00
|
|
|
|
static void do_del_port(struct dp_netdev *dp, struct dp_netdev_port *)
|
2014-05-20 13:21:09 -07:00
|
|
|
|
OVS_REQUIRES(dp->port_mutex);
|
2010-11-29 12:21:08 -08:00
|
|
|
|
static int dpif_netdev_open(const struct dpif_class *, const char *name,
|
|
|
|
|
bool create, struct dpif **);
|
2014-09-05 14:14:20 -07:00
|
|
|
|
static void dp_netdev_execute_actions(struct dp_netdev_pmd_thread *pmd,
|
2014-06-23 11:43:59 -07:00
|
|
|
|
struct dpif_packet **, int c,
|
2014-10-03 20:23:58 -07:00
|
|
|
|
bool may_steal,
|
2011-10-21 14:38:54 -07:00
|
|
|
|
const struct nlattr *actions,
|
2014-03-20 10:57:41 -07:00
|
|
|
|
size_t actions_len);
|
2014-09-05 14:14:20 -07:00
|
|
|
|
static void dp_netdev_input(struct dp_netdev_pmd_thread *,
|
2014-10-03 20:23:58 -07:00
|
|
|
|
struct dpif_packet **, int cnt);
|
|
|
|
|
|
2014-07-26 06:51:55 +00:00
|
|
|
|
static void dp_netdev_disable_upcall(struct dp_netdev *);
|
2014-09-05 14:14:20 -07:00
|
|
|
|
static void dp_netdev_configure_pmd(struct dp_netdev_pmd_thread *pmd,
|
|
|
|
|
struct dp_netdev *dp, int index,
|
|
|
|
|
int core_id, int numa_id);
|
2014-09-08 15:22:26 -07:00
|
|
|
|
static void dp_netdev_set_nonpmd(struct dp_netdev *dp);
|
2014-09-05 14:14:20 -07:00
|
|
|
|
static struct dp_netdev_pmd_thread *dp_netdev_get_nonpmd(struct dp_netdev *dp);
|
|
|
|
|
static void dp_netdev_destroy_all_pmds(struct dp_netdev *dp);
|
|
|
|
|
static void dp_netdev_del_pmds_on_numa(struct dp_netdev *dp, int numa_id);
|
|
|
|
|
static void dp_netdev_set_pmds_on_numa(struct dp_netdev *dp, int numa_id);
|
2014-09-08 15:22:26 -07:00
|
|
|
|
static void dp_netdev_reset_pmd_threads(struct dp_netdev *dp);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-08-29 16:06:43 -07:00
|
|
|
|
static void emc_clear_entry(struct emc_entry *ce);
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
emc_cache_init(struct emc_cache *flow_cache)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2014-10-17 17:03:13 -07:00
|
|
|
|
BUILD_ASSERT(offsetof(struct miniflow, inline_values) == sizeof(uint64_t));
|
|
|
|
|
|
2014-08-29 16:06:43 -07:00
|
|
|
|
for (i = 0; i < ARRAY_SIZE(flow_cache->entries); i++) {
|
|
|
|
|
flow_cache->entries[i].flow = NULL;
|
2014-10-17 09:37:11 -07:00
|
|
|
|
flow_cache->entries[i].key.hash = 0;
|
2014-10-17 17:03:13 -07:00
|
|
|
|
flow_cache->entries[i].key.len
|
|
|
|
|
= offsetof(struct miniflow, inline_values);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
miniflow_initialize(&flow_cache->entries[i].key.mf,
|
|
|
|
|
flow_cache->entries[i].key.buf);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
emc_cache_uninit(struct emc_cache *flow_cache)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(flow_cache->entries); i++) {
|
|
|
|
|
emc_clear_entry(&flow_cache->entries[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static struct dpif_netdev *
|
|
|
|
|
dpif_netdev_cast(const struct dpif *dpif)
|
|
|
|
|
{
|
2012-11-06 13:14:55 -08:00
|
|
|
|
ovs_assert(dpif->dpif_class->open == dpif_netdev_open);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
return CONTAINER_OF(dpif, struct dpif_netdev, dpif);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct dp_netdev *
|
|
|
|
|
get_dp_netdev(const struct dpif *dpif)
|
|
|
|
|
{
|
|
|
|
|
return dpif_netdev_cast(dpif)->dp;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-09 12:17:15 +02:00
|
|
|
|
static int
|
2014-06-12 16:37:33 -07:00
|
|
|
|
dpif_netdev_enumerate(struct sset *all_dps,
|
|
|
|
|
const struct dpif_class *dpif_class)
|
2012-05-09 12:17:15 +02:00
|
|
|
|
{
|
|
|
|
|
struct shash_node *node;
|
|
|
|
|
|
2013-07-30 15:31:48 -07:00
|
|
|
|
ovs_mutex_lock(&dp_netdev_mutex);
|
2012-05-09 12:17:15 +02:00
|
|
|
|
SHASH_FOR_EACH(node, &dp_netdevs) {
|
2014-06-12 16:37:33 -07:00
|
|
|
|
struct dp_netdev *dp = node->data;
|
|
|
|
|
if (dpif_class != dp->class) {
|
|
|
|
|
/* 'dp_netdevs' contains both "netdev" and "dummy" dpifs.
|
|
|
|
|
* If the class doesn't match, skip this dpif. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2012-05-09 12:17:15 +02:00
|
|
|
|
sset_add(all_dps, node->name);
|
|
|
|
|
}
|
2013-07-30 15:31:48 -07:00
|
|
|
|
ovs_mutex_unlock(&dp_netdev_mutex);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2012-05-09 12:17:15 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-08 14:37:23 -08:00
|
|
|
|
static bool
|
|
|
|
|
dpif_netdev_class_is_dummy(const struct dpif_class *class)
|
|
|
|
|
{
|
|
|
|
|
return class != &dpif_netdev_class;
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-14 15:50:20 -08:00
|
|
|
|
static const char *
|
|
|
|
|
dpif_netdev_port_open_type(const struct dpif_class *class, const char *type)
|
|
|
|
|
{
|
|
|
|
|
return strcmp(type, "internal") ? type
|
2013-01-08 14:37:23 -08:00
|
|
|
|
: dpif_netdev_class_is_dummy(class) ? "dummy"
|
2012-11-14 15:50:20 -08:00
|
|
|
|
: "tap";
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static struct dpif *
|
|
|
|
|
create_dpif_netdev(struct dp_netdev *dp)
|
|
|
|
|
{
|
2010-11-24 12:35:22 -08:00
|
|
|
|
uint16_t netflow_id = hash_string(dp->name, 0);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
struct dpif_netdev *dpif;
|
|
|
|
|
|
2013-12-27 19:41:10 -08:00
|
|
|
|
ovs_refcount_ref(&dp->ref_cnt);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
|
|
|
|
dpif = xmalloc(sizeof *dpif);
|
2010-11-29 12:21:08 -08:00
|
|
|
|
dpif_init(&dpif->dpif, dp->class, dp->name, netflow_id >> 8, netflow_id);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
dpif->dp = dp;
|
2013-08-07 13:29:54 -07:00
|
|
|
|
dpif->last_port_seq = seq_read(dp->port_seq);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
|
|
|
|
return &dpif->dpif;
|
|
|
|
|
}
|
|
|
|
|
|
2013-06-19 16:58:44 -07:00
|
|
|
|
/* Choose an unused, non-zero port number and return it on success.
|
|
|
|
|
* Return ODPP_NONE on failure. */
|
|
|
|
|
static odp_port_t
|
2012-10-13 17:45:00 -07:00
|
|
|
|
choose_port(struct dp_netdev *dp, const char *name)
|
2014-05-20 13:21:09 -07:00
|
|
|
|
OVS_REQUIRES(dp->port_mutex)
|
2012-10-13 17:45:00 -07:00
|
|
|
|
{
|
2013-06-19 16:58:44 -07:00
|
|
|
|
uint32_t port_no;
|
2012-10-13 17:45:00 -07:00
|
|
|
|
|
|
|
|
|
if (dp->class != &dpif_netdev_class) {
|
|
|
|
|
const char *p;
|
|
|
|
|
int start_no = 0;
|
|
|
|
|
|
|
|
|
|
/* If the port name begins with "br", start the number search at
|
|
|
|
|
* 100 to make writing tests easier. */
|
|
|
|
|
if (!strncmp(name, "br", 2)) {
|
|
|
|
|
start_no = 100;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the port name contains a number, try to assign that port number.
|
|
|
|
|
* This can make writing unit tests easier because port numbers are
|
|
|
|
|
* predictable. */
|
|
|
|
|
for (p = name; *p != '\0'; p++) {
|
|
|
|
|
if (isdigit((unsigned char) *p)) {
|
|
|
|
|
port_no = start_no + strtol(p, NULL, 10);
|
2013-12-24 16:08:57 -08:00
|
|
|
|
if (port_no > 0 && port_no != odp_to_u32(ODPP_NONE)
|
|
|
|
|
&& !dp_netdev_lookup_port(dp, u32_to_odp(port_no))) {
|
2013-06-19 16:58:44 -07:00
|
|
|
|
return u32_to_odp(port_no);
|
2012-10-13 17:45:00 -07:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-24 16:08:57 -08:00
|
|
|
|
for (port_no = 1; port_no <= UINT16_MAX; port_no++) {
|
|
|
|
|
if (!dp_netdev_lookup_port(dp, u32_to_odp(port_no))) {
|
2013-06-19 16:58:44 -07:00
|
|
|
|
return u32_to_odp(port_no);
|
2012-10-13 17:45:00 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-06-19 16:58:44 -07:00
|
|
|
|
return ODPP_NONE;
|
2012-10-13 17:45:00 -07:00
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static int
|
2010-11-29 12:21:08 -08:00
|
|
|
|
create_dp_netdev(const char *name, const struct dpif_class *class,
|
|
|
|
|
struct dp_netdev **dpp)
|
2014-01-08 15:58:11 -08:00
|
|
|
|
OVS_REQUIRES(dp_netdev_mutex)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp;
|
|
|
|
|
int error;
|
|
|
|
|
|
2010-11-24 12:35:22 -08:00
|
|
|
|
dp = xzalloc(sizeof *dp);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
shash_add(&dp_netdevs, name, dp);
|
|
|
|
|
|
|
|
|
|
*CONST_CAST(const struct dpif_class **, &dp->class) = class;
|
|
|
|
|
*CONST_CAST(const char **, &dp->name) = xstrdup(name);
|
2013-12-27 19:41:10 -08:00
|
|
|
|
ovs_refcount_init(&dp->ref_cnt);
|
2014-03-17 22:10:53 -07:00
|
|
|
|
atomic_flag_clear(&dp->destroyed);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
|
|
|
|
ovs_mutex_init(&dp->flow_mutex);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
dpcls_init(&dp->cls);
|
2014-07-04 06:38:47 -07:00
|
|
|
|
cmap_init(&dp->flow_table);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
2014-03-19 07:47:12 -07:00
|
|
|
|
ovsthread_stats_init(&dp->stats);
|
2013-12-23 14:04:13 -08:00
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_init(&dp->port_mutex);
|
|
|
|
|
cmap_init(&dp->ports);
|
2013-08-07 13:29:54 -07:00
|
|
|
|
dp->port_seq = seq_create();
|
2014-07-26 06:51:55 +00:00
|
|
|
|
fat_rwlock_init(&dp->upcall_rwlock);
|
|
|
|
|
|
|
|
|
|
/* Disable upcalls by default. */
|
|
|
|
|
dp_netdev_disable_upcall(dp);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
dp->upcall_aux = NULL;
|
2014-07-26 06:51:55 +00:00
|
|
|
|
dp->upcall_cb = NULL;
|
2012-10-13 17:45:00 -07:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
cmap_init(&dp->poll_threads);
|
|
|
|
|
ovs_mutex_init_recursive(&dp->non_pmd_mutex);
|
|
|
|
|
ovsthread_key_create(&dp->per_pmd_key, NULL);
|
|
|
|
|
|
|
|
|
|
/* Reserves the core NON_PMD_CORE_ID for all non-pmd threads. */
|
|
|
|
|
ovs_numa_try_pin_core_specific(NON_PMD_CORE_ID);
|
2014-09-08 15:22:26 -07:00
|
|
|
|
dp_netdev_set_nonpmd(dp);
|
|
|
|
|
dp->n_dpdk_rxqs = NR_QUEUE;
|
2014-09-05 14:14:20 -07:00
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_lock(&dp->port_mutex);
|
2013-06-19 16:58:44 -07:00
|
|
|
|
error = do_add_port(dp, name, "internal", ODPP_LOCAL);
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_unlock(&dp->port_mutex);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
if (error) {
|
|
|
|
|
dp_netdev_free(dp);
|
2010-11-24 12:35:22 -08:00
|
|
|
|
return error;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-11-11 11:53:47 -08:00
|
|
|
|
dp->last_tnl_conf_seq = seq_read(tnl_conf_seq);
|
2010-11-24 12:35:22 -08:00
|
|
|
|
*dpp = dp;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2010-11-29 12:21:08 -08:00
|
|
|
|
dpif_netdev_open(const struct dpif_class *class, const char *name,
|
2010-11-18 10:06:41 -08:00
|
|
|
|
bool create, struct dpif **dpifp)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2010-11-24 12:35:22 -08:00
|
|
|
|
struct dp_netdev *dp;
|
2013-07-23 16:56:26 -07:00
|
|
|
|
int error;
|
2010-11-24 12:35:22 -08:00
|
|
|
|
|
2013-07-30 15:31:48 -07:00
|
|
|
|
ovs_mutex_lock(&dp_netdev_mutex);
|
2010-11-24 12:35:22 -08:00
|
|
|
|
dp = shash_find_data(&dp_netdevs, name);
|
|
|
|
|
if (!dp) {
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = create ? create_dp_netdev(name, class, &dp) : ENODEV;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
} else {
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = (dp->class != class ? EINVAL
|
|
|
|
|
: create ? EEXIST
|
|
|
|
|
: 0);
|
|
|
|
|
}
|
|
|
|
|
if (!error) {
|
|
|
|
|
*dpifp = create_dpif_netdev(dp);
|
2014-07-26 06:51:55 +00:00
|
|
|
|
dp->dpif = *dpifp;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
2013-07-30 15:31:48 -07:00
|
|
|
|
ovs_mutex_unlock(&dp_netdev_mutex);
|
2010-11-24 12:35:22 -08:00
|
|
|
|
|
2013-07-23 16:56:26 -07:00
|
|
|
|
return error;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-03 15:04:15 -07:00
|
|
|
|
static void
|
|
|
|
|
dp_netdev_destroy_upcall_lock(struct dp_netdev *dp)
|
|
|
|
|
OVS_NO_THREAD_SAFETY_ANALYSIS
|
|
|
|
|
{
|
|
|
|
|
/* Check that upcalls are disabled, i.e. that the rwlock is taken */
|
|
|
|
|
ovs_assert(fat_rwlock_tryrdlock(&dp->upcall_rwlock));
|
|
|
|
|
|
|
|
|
|
/* Before freeing a lock we should release it */
|
|
|
|
|
fat_rwlock_unlock(&dp->upcall_rwlock);
|
|
|
|
|
fat_rwlock_destroy(&dp->upcall_rwlock);
|
|
|
|
|
}
|
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
/* Requires dp_netdev_mutex so that we can't get a new reference to 'dp'
|
|
|
|
|
* through the 'dp_netdevs' shash while freeing 'dp'. */
|
2011-01-04 17:00:36 -08:00
|
|
|
|
static void
|
|
|
|
|
dp_netdev_free(struct dp_netdev *dp)
|
2014-01-08 15:58:11 -08:00
|
|
|
|
OVS_REQUIRES(dp_netdev_mutex)
|
2011-01-04 17:00:36 -08:00
|
|
|
|
{
|
2014-05-20 13:21:09 -07:00
|
|
|
|
struct dp_netdev_port *port;
|
2014-03-19 07:47:12 -07:00
|
|
|
|
struct dp_netdev_stats *bucket;
|
|
|
|
|
int i;
|
2011-08-10 12:40:10 -07:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
shash_find_and_delete(&dp_netdevs, dp->name);
|
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_destroy_all_pmds(dp);
|
2014-10-03 15:04:15 -07:00
|
|
|
|
cmap_destroy(&dp->poll_threads);
|
2014-09-05 14:14:20 -07:00
|
|
|
|
ovs_mutex_destroy(&dp->non_pmd_mutex);
|
|
|
|
|
ovsthread_key_delete(dp->per_pmd_key);
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2011-01-04 17:00:36 -08:00
|
|
|
|
dp_netdev_flow_flush(dp);
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_lock(&dp->port_mutex);
|
2014-06-11 11:07:43 -07:00
|
|
|
|
CMAP_FOR_EACH (port, node, &dp->ports) {
|
2014-05-22 09:36:00 -07:00
|
|
|
|
do_del_port(dp, port);
|
2011-01-04 17:00:36 -08:00
|
|
|
|
}
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_unlock(&dp->port_mutex);
|
2014-03-19 07:47:12 -07:00
|
|
|
|
|
|
|
|
|
OVSTHREAD_STATS_FOR_EACH_BUCKET (bucket, i, &dp->stats) {
|
|
|
|
|
ovs_mutex_destroy(&bucket->mutex);
|
|
|
|
|
free_cacheline(bucket);
|
|
|
|
|
}
|
|
|
|
|
ovsthread_stats_destroy(&dp->stats);
|
2013-12-27 09:42:51 -08:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
dpcls_destroy(&dp->cls);
|
2014-07-04 06:38:47 -07:00
|
|
|
|
cmap_destroy(&dp->flow_table);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
ovs_mutex_destroy(&dp->flow_mutex);
|
2013-08-07 13:29:54 -07:00
|
|
|
|
seq_destroy(dp->port_seq);
|
2014-05-20 13:21:09 -07:00
|
|
|
|
cmap_destroy(&dp->ports);
|
2014-10-03 15:04:15 -07:00
|
|
|
|
|
|
|
|
|
/* Upcalls must be disabled at this point */
|
|
|
|
|
dp_netdev_destroy_upcall_lock(dp);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
|
2014-09-08 15:22:26 -07:00
|
|
|
|
free(dp->pmd_cmask);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
free(CONST_CAST(char *, dp->name));
|
2009-06-19 14:09:39 -07:00
|
|
|
|
free(dp);
|
|
|
|
|
}
|
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
static void
|
|
|
|
|
dp_netdev_unref(struct dp_netdev *dp)
|
|
|
|
|
{
|
|
|
|
|
if (dp) {
|
|
|
|
|
/* Take dp_netdev_mutex so that, if dp->ref_cnt falls to zero, we can't
|
|
|
|
|
* get a new reference to 'dp' through the 'dp_netdevs' shash. */
|
|
|
|
|
ovs_mutex_lock(&dp_netdev_mutex);
|
2014-07-07 13:18:46 -07:00
|
|
|
|
if (ovs_refcount_unref_relaxed(&dp->ref_cnt) == 1) {
|
2014-01-08 15:58:11 -08:00
|
|
|
|
dp_netdev_free(dp);
|
|
|
|
|
}
|
|
|
|
|
ovs_mutex_unlock(&dp_netdev_mutex);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static void
|
|
|
|
|
dpif_netdev_close(struct dpif *dpif)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
dp_netdev_unref(dp);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
free(dpif);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2010-02-08 13:22:41 -05:00
|
|
|
|
dpif_netdev_destroy(struct dpif *dpif)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2013-12-27 19:41:10 -08:00
|
|
|
|
if (!atomic_flag_test_and_set(&dp->destroyed)) {
|
2014-07-07 13:18:46 -07:00
|
|
|
|
if (ovs_refcount_unref_relaxed(&dp->ref_cnt) == 1) {
|
2013-12-27 19:41:10 -08:00
|
|
|
|
/* Can't happen: 'dpif' still owns a reference to 'dp'. */
|
|
|
|
|
OVS_NOT_REACHED();
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2011-10-05 11:18:13 -07:00
|
|
|
|
dpif_netdev_get_stats(const struct dpif *dpif, struct dpif_dp_stats *stats)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2014-03-19 07:47:12 -07:00
|
|
|
|
struct dp_netdev_stats *bucket;
|
|
|
|
|
size_t i;
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2014-07-04 06:38:47 -07:00
|
|
|
|
stats->n_flows = cmap_count(&dp->flow_table);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
2014-03-19 07:47:12 -07:00
|
|
|
|
stats->n_hit = stats->n_missed = stats->n_lost = 0;
|
|
|
|
|
OVSTHREAD_STATS_FOR_EACH_BUCKET (bucket, i, &dp->stats) {
|
|
|
|
|
ovs_mutex_lock(&bucket->mutex);
|
|
|
|
|
stats->n_hit += bucket->n[DP_STAT_HIT];
|
|
|
|
|
stats->n_missed += bucket->n[DP_STAT_MISS];
|
|
|
|
|
stats->n_lost += bucket->n[DP_STAT_LOST];
|
|
|
|
|
ovs_mutex_unlock(&bucket->mutex);
|
|
|
|
|
}
|
2013-12-17 20:18:18 +01:00
|
|
|
|
stats->n_masks = UINT32_MAX;
|
2013-10-21 14:37:34 -07:00
|
|
|
|
stats->n_mask_hit = UINT64_MAX;
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-20 10:57:41 -07:00
|
|
|
|
static void
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_reload_pmd__(struct dp_netdev_pmd_thread *pmd)
|
2014-03-20 10:57:41 -07:00
|
|
|
|
{
|
2014-09-05 14:14:20 -07:00
|
|
|
|
int old_seq;
|
|
|
|
|
|
|
|
|
|
atomic_add_relaxed(&pmd->change_seq, 1, &old_seq);
|
|
|
|
|
}
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
/* Causes all pmd threads to reload its tx/rx devices.
|
|
|
|
|
* Must be called after adding/removing ports. */
|
|
|
|
|
static void
|
|
|
|
|
dp_netdev_reload_pmds(struct dp_netdev *dp)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_pmd_thread *pmd;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
CMAP_FOR_EACH (pmd, node, &dp->poll_threads) {
|
|
|
|
|
dp_netdev_reload_pmd__(pmd);
|
2014-08-15 15:09:38 -07:00
|
|
|
|
}
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
static uint32_t
|
|
|
|
|
hash_port_no(odp_port_t port_no)
|
|
|
|
|
{
|
|
|
|
|
return hash_int(odp_to_u32(port_no), 0);
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static int
|
2010-12-03 14:41:38 -08:00
|
|
|
|
do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
|
2013-06-19 16:58:44 -07:00
|
|
|
|
odp_port_t port_no)
|
2014-05-20 13:21:09 -07:00
|
|
|
|
OVS_REQUIRES(dp->port_mutex)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2013-05-10 08:55:25 -07:00
|
|
|
|
struct netdev_saved_flags *sf;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
struct netdev *netdev;
|
2013-09-07 12:35:15 +03:00
|
|
|
|
enum netdev_flags flags;
|
2012-01-19 10:24:46 -08:00
|
|
|
|
const char *open_type;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
int error;
|
2014-03-20 20:52:06 -07:00
|
|
|
|
int i;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
|
|
|
|
/* XXX reject devices already in some dp_netdev. */
|
|
|
|
|
|
|
|
|
|
/* Open and validate network device. */
|
2012-11-14 15:50:20 -08:00
|
|
|
|
open_type = dpif_netdev_port_open_type(dp->class, type);
|
2012-01-19 10:24:46 -08:00
|
|
|
|
error = netdev_open(devname, open_type, &netdev);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
if (error) {
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
/* XXX reject non-Ethernet devices */
|
|
|
|
|
|
2013-09-07 12:35:15 +03:00
|
|
|
|
netdev_get_flags(netdev, &flags);
|
|
|
|
|
if (flags & NETDEV_LOOPBACK) {
|
|
|
|
|
VLOG_ERR("%s: cannot add a loopback device", devname);
|
|
|
|
|
netdev_close(netdev);
|
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-17 10:52:20 -07:00
|
|
|
|
if (netdev_is_pmd(netdev)) {
|
|
|
|
|
int n_cores = ovs_numa_get_n_cores();
|
|
|
|
|
|
|
|
|
|
if (n_cores == OVS_CORE_UNSPEC) {
|
|
|
|
|
VLOG_ERR("%s, cannot get cpu core info", devname);
|
|
|
|
|
return ENOENT;
|
|
|
|
|
}
|
|
|
|
|
/* There can only be ovs_numa_get_n_cores() pmd threads,
|
2014-09-08 15:22:26 -07:00
|
|
|
|
* so creates a txq for each. */
|
|
|
|
|
error = netdev_set_multiq(netdev, n_cores, dp->n_dpdk_rxqs);
|
2014-10-14 19:01:49 +02:00
|
|
|
|
if (error && (error != EOPNOTSUPP)) {
|
2014-06-17 10:52:20 -07:00
|
|
|
|
VLOG_ERR("%s, cannot set multiq", devname);
|
|
|
|
|
return errno;
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-03-20 10:57:41 -07:00
|
|
|
|
port = xzalloc(sizeof *port);
|
|
|
|
|
port->port_no = port_no;
|
|
|
|
|
port->netdev = netdev;
|
2014-03-20 20:52:06 -07:00
|
|
|
|
port->rxq = xmalloc(sizeof *port->rxq * netdev_n_rxq(netdev));
|
2014-03-20 10:57:41 -07:00
|
|
|
|
port->type = xstrdup(type);
|
2014-03-20 20:52:06 -07:00
|
|
|
|
for (i = 0; i < netdev_n_rxq(netdev); i++) {
|
|
|
|
|
error = netdev_rxq_open(netdev, &port->rxq[i], i);
|
|
|
|
|
if (error
|
|
|
|
|
&& !(error == EOPNOTSUPP && dpif_netdev_class_is_dummy(dp->class))) {
|
|
|
|
|
VLOG_ERR("%s: cannot receive packets on this network device (%s)",
|
|
|
|
|
devname, ovs_strerror(errno));
|
|
|
|
|
netdev_close(netdev);
|
2014-08-26 18:36:08 +02:00
|
|
|
|
free(port->type);
|
|
|
|
|
free(port->rxq);
|
|
|
|
|
free(port);
|
2014-03-20 20:52:06 -07:00
|
|
|
|
return error;
|
|
|
|
|
}
|
2011-08-05 14:15:32 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-05-10 08:55:25 -07:00
|
|
|
|
error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, &sf);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
if (error) {
|
2014-03-20 20:52:06 -07:00
|
|
|
|
for (i = 0; i < netdev_n_rxq(netdev); i++) {
|
|
|
|
|
netdev_rxq_close(port->rxq[i]);
|
|
|
|
|
}
|
2009-06-19 14:09:39 -07:00
|
|
|
|
netdev_close(netdev);
|
2014-08-26 18:36:08 +02:00
|
|
|
|
free(port->type);
|
2014-03-20 19:38:14 -07:00
|
|
|
|
free(port->rxq);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
free(port);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
return error;
|
|
|
|
|
}
|
2013-05-10 08:55:25 -07:00
|
|
|
|
port->sf = sf;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
|
|
|
|
if (netdev_is_pmd(netdev)) {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_set_pmds_on_numa(dp, netdev_get_numa_id(netdev));
|
|
|
|
|
dp_netdev_reload_pmds(dp);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
|
|
|
|
ovs_refcount_init(&port->ref_cnt);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
cmap_insert(&dp->ports, &port->node, hash_port_no(port_no));
|
2013-08-07 13:29:54 -07:00
|
|
|
|
seq_change(dp->port_seq);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-12 15:23:23 -08:00
|
|
|
|
static int
|
|
|
|
|
dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev,
|
2013-06-19 16:58:44 -07:00
|
|
|
|
odp_port_t *port_nop)
|
2012-01-12 15:23:23 -08:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2013-05-01 11:05:28 -07:00
|
|
|
|
char namebuf[NETDEV_VPORT_NAME_BUFSIZE];
|
|
|
|
|
const char *dpif_port;
|
2013-06-19 16:58:44 -07:00
|
|
|
|
odp_port_t port_no;
|
2013-07-23 16:56:26 -07:00
|
|
|
|
int error;
|
2012-01-12 15:23:23 -08:00
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_lock(&dp->port_mutex);
|
2013-05-01 11:05:28 -07:00
|
|
|
|
dpif_port = netdev_vport_get_dpif_port(netdev, namebuf, sizeof namebuf);
|
2013-06-19 16:58:44 -07:00
|
|
|
|
if (*port_nop != ODPP_NONE) {
|
2013-12-24 16:08:57 -08:00
|
|
|
|
port_no = *port_nop;
|
|
|
|
|
error = dp_netdev_lookup_port(dp, *port_nop) ? EBUSY : 0;
|
2012-07-27 23:58:24 -07:00
|
|
|
|
} else {
|
2013-05-01 11:05:28 -07:00
|
|
|
|
port_no = choose_port(dp, dpif_port);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = port_no == ODPP_NONE ? EFBIG : 0;
|
2012-07-27 23:58:24 -07:00
|
|
|
|
}
|
2013-07-23 16:56:26 -07:00
|
|
|
|
if (!error) {
|
2012-01-12 15:23:23 -08:00
|
|
|
|
*port_nop = port_no;
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = do_add_port(dp, dpif_port, netdev_get_type(netdev), port_no);
|
2012-01-12 15:23:23 -08:00
|
|
|
|
}
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_unlock(&dp->port_mutex);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
|
|
|
|
return error;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2013-06-19 16:58:44 -07:00
|
|
|
|
dpif_netdev_port_del(struct dpif *dpif, odp_port_t port_no)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
int error;
|
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_lock(&dp->port_mutex);
|
2014-05-22 09:36:00 -07:00
|
|
|
|
if (port_no == ODPP_LOCAL) {
|
|
|
|
|
error = EINVAL;
|
|
|
|
|
} else {
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
|
|
|
|
|
error = get_port_by_number(dp, port_no, &port);
|
|
|
|
|
if (!error) {
|
|
|
|
|
do_del_port(dp, port);
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_unlock(&dp->port_mutex);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
|
|
|
|
return error;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
2013-06-19 16:58:44 -07:00
|
|
|
|
is_valid_port_number(odp_port_t port_no)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2013-12-24 16:08:57 -08:00
|
|
|
|
return port_no != ODPP_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct dp_netdev_port *
|
|
|
|
|
dp_netdev_lookup_port(const struct dp_netdev *dp, odp_port_t port_no)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
CMAP_FOR_EACH_WITH_HASH (port, node, hash_port_no(port_no), &dp->ports) {
|
2013-12-24 16:08:57 -08:00
|
|
|
|
if (port->port_no == port_no) {
|
|
|
|
|
return port;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
get_port_by_number(struct dp_netdev *dp,
|
2013-06-19 16:58:44 -07:00
|
|
|
|
odp_port_t port_no, struct dp_netdev_port **portp)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
if (!is_valid_port_number(port_no)) {
|
|
|
|
|
*portp = NULL;
|
|
|
|
|
return EINVAL;
|
|
|
|
|
} else {
|
2013-12-24 16:08:57 -08:00
|
|
|
|
*portp = dp_netdev_lookup_port(dp, port_no);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
return *portp ? 0 : ENOENT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-20 10:57:19 -07:00
|
|
|
|
static void
|
|
|
|
|
port_ref(struct dp_netdev_port *port)
|
|
|
|
|
{
|
|
|
|
|
if (port) {
|
|
|
|
|
ovs_refcount_ref(&port->ref_cnt);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-21 15:54:07 -07:00
|
|
|
|
static bool
|
|
|
|
|
port_try_ref(struct dp_netdev_port *port)
|
|
|
|
|
{
|
|
|
|
|
if (port) {
|
|
|
|
|
return ovs_refcount_try_ref_rcu(&port->ref_cnt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-20 10:57:19 -07:00
|
|
|
|
static void
|
2014-05-20 13:21:09 -07:00
|
|
|
|
port_destroy__(struct dp_netdev_port *port)
|
2014-03-20 10:57:19 -07:00
|
|
|
|
{
|
2014-06-04 15:41:09 -07:00
|
|
|
|
int n_rxq = netdev_n_rxq(port->netdev);
|
2014-05-20 13:21:09 -07:00
|
|
|
|
int i;
|
2014-03-20 20:52:06 -07:00
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
netdev_close(port->netdev);
|
|
|
|
|
netdev_restore_flags(port->sf);
|
2014-03-20 20:52:06 -07:00
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
for (i = 0; i < n_rxq; i++) {
|
|
|
|
|
netdev_rxq_close(port->rxq[i]);
|
|
|
|
|
}
|
|
|
|
|
free(port->rxq);
|
|
|
|
|
free(port->type);
|
|
|
|
|
free(port);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
port_unref(struct dp_netdev_port *port)
|
|
|
|
|
{
|
2014-07-07 13:18:46 -07:00
|
|
|
|
if (port && ovs_refcount_unref_relaxed(&port->ref_cnt) == 1) {
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovsrcu_postpone(port_destroy__, port);
|
2014-03-20 10:57:19 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static int
|
|
|
|
|
get_port_by_name(struct dp_netdev *dp,
|
|
|
|
|
const char *devname, struct dp_netdev_port **portp)
|
2014-05-20 13:21:09 -07:00
|
|
|
|
OVS_REQUIRES(dp->port_mutex)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
|
2014-06-11 11:07:43 -07:00
|
|
|
|
CMAP_FOR_EACH (port, node, &dp->ports) {
|
2013-06-06 15:27:15 -07:00
|
|
|
|
if (!strcmp(netdev_get_name(port->netdev), devname)) {
|
2009-06-19 14:09:39 -07:00
|
|
|
|
*portp = port;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return ENOENT;
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
static int
|
|
|
|
|
get_n_pmd_threads_on_numa(struct dp_netdev *dp, int numa_id)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_pmd_thread *pmd;
|
|
|
|
|
int n_pmds = 0;
|
|
|
|
|
|
|
|
|
|
CMAP_FOR_EACH (pmd, node, &dp->poll_threads) {
|
|
|
|
|
if (pmd->numa_id == numa_id) {
|
|
|
|
|
n_pmds++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return n_pmds;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns 'true' if there is a port with pmd netdev and the netdev
|
|
|
|
|
* is on numa node 'numa_id'. */
|
|
|
|
|
static bool
|
|
|
|
|
has_pmd_port_for_numa(struct dp_netdev *dp, int numa_id)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
|
|
|
|
|
CMAP_FOR_EACH (port, node, &dp->ports) {
|
|
|
|
|
if (netdev_is_pmd(port->netdev)
|
|
|
|
|
&& netdev_get_numa_id(port->netdev) == numa_id) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-05-22 09:36:00 -07:00
|
|
|
|
static void
|
|
|
|
|
do_del_port(struct dp_netdev *dp, struct dp_netdev_port *port)
|
2014-05-20 13:21:09 -07:00
|
|
|
|
OVS_REQUIRES(dp->port_mutex)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2014-05-22 09:36:00 -07:00
|
|
|
|
cmap_remove(&dp->ports, &port->node, hash_odp_port(port->port_no));
|
2013-08-07 13:29:54 -07:00
|
|
|
|
seq_change(dp->port_seq);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
if (netdev_is_pmd(port->netdev)) {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
int numa_id = netdev_get_numa_id(port->netdev);
|
|
|
|
|
|
|
|
|
|
/* If there is no netdev on the numa node, deletes the pmd threads
|
|
|
|
|
* for that numa. Else, just reloads the queues. */
|
|
|
|
|
if (!has_pmd_port_for_numa(dp, numa_id)) {
|
|
|
|
|
dp_netdev_del_pmds_on_numa(dp, numa_id);
|
|
|
|
|
}
|
|
|
|
|
dp_netdev_reload_pmds(dp);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-03-20 10:57:19 -07:00
|
|
|
|
port_unref(port);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2011-01-23 18:48:02 -08:00
|
|
|
|
answer_port_query(const struct dp_netdev_port *port,
|
|
|
|
|
struct dpif_port *dpif_port)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2013-06-06 15:27:15 -07:00
|
|
|
|
dpif_port->name = xstrdup(netdev_get_name(port->netdev));
|
2012-01-19 10:24:46 -08:00
|
|
|
|
dpif_port->type = xstrdup(port->type);
|
2011-01-23 18:48:02 -08:00
|
|
|
|
dpif_port->port_no = port->port_no;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2013-06-19 16:58:44 -07:00
|
|
|
|
dpif_netdev_port_query_by_number(const struct dpif *dpif, odp_port_t port_no,
|
2011-01-23 18:48:02 -08:00
|
|
|
|
struct dpif_port *dpif_port)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
error = get_port_by_number(dp, port_no, &port);
|
2012-10-17 23:11:53 -07:00
|
|
|
|
if (!error && dpif_port) {
|
2011-01-23 18:48:02 -08:00
|
|
|
|
answer_port_query(port, dpif_port);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dpif_netdev_port_query_by_name(const struct dpif *dpif, const char *devname,
|
2011-01-23 18:48:02 -08:00
|
|
|
|
struct dpif_port *dpif_port)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
int error;
|
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_lock(&dp->port_mutex);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
error = get_port_by_name(dp, devname, &port);
|
2012-10-17 23:11:53 -07:00
|
|
|
|
if (!error && dpif_port) {
|
2011-01-23 18:48:02 -08:00
|
|
|
|
answer_port_query(port, dpif_port);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_unlock(&dp->port_mutex);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-05 22:41:30 -08:00
|
|
|
|
static void
|
|
|
|
|
dp_netdev_flow_free(struct dp_netdev_flow *flow)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_flow_stats *bucket;
|
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
OVSTHREAD_STATS_FOR_EACH_BUCKET (bucket, i, &flow->stats) {
|
|
|
|
|
ovs_mutex_destroy(&bucket->mutex);
|
|
|
|
|
free_cacheline(bucket);
|
|
|
|
|
}
|
|
|
|
|
ovsthread_stats_destroy(&flow->stats);
|
|
|
|
|
|
|
|
|
|
dp_netdev_actions_free(dp_netdev_flow_get_actions(flow));
|
|
|
|
|
free(flow);
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-11 17:25:50 -07:00
|
|
|
|
static void dp_netdev_flow_unref(struct dp_netdev_flow *flow)
|
|
|
|
|
{
|
|
|
|
|
if (ovs_refcount_unref_relaxed(&flow->ref_cnt) == 1) {
|
|
|
|
|
ovsrcu_postpone(dp_netdev_flow_free, flow);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static void
|
2014-01-08 15:58:11 -08:00
|
|
|
|
dp_netdev_remove_flow(struct dp_netdev *dp, struct dp_netdev_flow *flow)
|
|
|
|
|
OVS_REQUIRES(dp->flow_mutex)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2014-07-04 06:38:47 -07:00
|
|
|
|
struct cmap_node *node = CONST_CAST(struct cmap_node *, &flow->node);
|
2013-11-04 06:23:54 -08:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
dpcls_remove(&dp->cls, &flow->cr);
|
2014-07-04 06:38:47 -07:00
|
|
|
|
cmap_remove(&dp->flow_table, node, flow_hash(&flow->flow, 0));
|
2014-08-29 16:06:43 -07:00
|
|
|
|
flow->dead = true;
|
2014-08-11 17:25:50 -07:00
|
|
|
|
|
|
|
|
|
dp_netdev_flow_unref(flow);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dp_netdev_flow_flush(struct dp_netdev *dp)
|
|
|
|
|
{
|
2014-07-21 21:00:04 -07:00
|
|
|
|
struct dp_netdev_flow *netdev_flow;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
ovs_mutex_lock(&dp->flow_mutex);
|
2014-07-29 09:02:23 -07:00
|
|
|
|
CMAP_FOR_EACH (netdev_flow, node, &dp->flow_table) {
|
2014-01-08 15:58:11 -08:00
|
|
|
|
dp_netdev_remove_flow(dp, netdev_flow);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
2014-01-08 15:58:11 -08:00
|
|
|
|
ovs_mutex_unlock(&dp->flow_mutex);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dpif_netdev_flow_flush(struct dpif *dpif)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
dp_netdev_flow_flush(dp);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
datapath: Change listing ports to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to add new
features to the kernel vport layer without changing userspace software. In
turn, that means that the odp_port structure must become variable-length.
This does not, however, fit in well with the ODP_PORT_LIST ioctl in its
current form, because that would require userspace to know how much space
to allocate for each port in advance, or to allocate as much space as
could possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_PORT_LIST
by a new ioctl ODP_VPORT_DUMP that retrieves information about a single
vport from the datapath on each call. It is much cleaner to allocate the
maximum amount of space for a single vport than to do so for possibly a
large number of vports.
It would be faster to retrieve a number of vports in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
The Netlink version won't need to take the starting port number from
userspace, since Netlink sockets can keep track of that state as part
of their "dump" feature.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2011-01-10 13:12:12 -08:00
|
|
|
|
struct dp_netdev_port_state {
|
2014-05-20 13:21:09 -07:00
|
|
|
|
struct cmap_position position;
|
2011-01-23 18:48:02 -08:00
|
|
|
|
char *name;
|
datapath: Change listing ports to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to add new
features to the kernel vport layer without changing userspace software. In
turn, that means that the odp_port structure must become variable-length.
This does not, however, fit in well with the ODP_PORT_LIST ioctl in its
current form, because that would require userspace to know how much space
to allocate for each port in advance, or to allocate as much space as
could possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_PORT_LIST
by a new ioctl ODP_VPORT_DUMP that retrieves information about a single
vport from the datapath on each call. It is much cleaner to allocate the
maximum amount of space for a single vport than to do so for possibly a
large number of vports.
It would be faster to retrieve a number of vports in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
The Netlink version won't need to take the starting port number from
userspace, since Netlink sockets can keep track of that state as part
of their "dump" feature.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2011-01-10 13:12:12 -08:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dpif_netdev_port_dump_start(const struct dpif *dpif OVS_UNUSED, void **statep)
|
|
|
|
|
{
|
|
|
|
|
*statep = xzalloc(sizeof(struct dp_netdev_port_state));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static int
|
datapath: Change listing ports to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to add new
features to the kernel vport layer without changing userspace software. In
turn, that means that the odp_port structure must become variable-length.
This does not, however, fit in well with the ODP_PORT_LIST ioctl in its
current form, because that would require userspace to know how much space
to allocate for each port in advance, or to allocate as much space as
could possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_PORT_LIST
by a new ioctl ODP_VPORT_DUMP that retrieves information about a single
vport from the datapath on each call. It is much cleaner to allocate the
maximum amount of space for a single vport than to do so for possibly a
large number of vports.
It would be faster to retrieve a number of vports in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
The Netlink version won't need to take the starting port number from
userspace, since Netlink sockets can keep track of that state as part
of their "dump" feature.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2011-01-10 13:12:12 -08:00
|
|
|
|
dpif_netdev_port_dump_next(const struct dpif *dpif, void *state_,
|
2011-01-23 18:48:02 -08:00
|
|
|
|
struct dpif_port *dpif_port)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
datapath: Change listing ports to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to add new
features to the kernel vport layer without changing userspace software. In
turn, that means that the odp_port structure must become variable-length.
This does not, however, fit in well with the ODP_PORT_LIST ioctl in its
current form, because that would require userspace to know how much space
to allocate for each port in advance, or to allocate as much space as
could possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_PORT_LIST
by a new ioctl ODP_VPORT_DUMP that retrieves information about a single
vport from the datapath on each call. It is much cleaner to allocate the
maximum amount of space for a single vport than to do so for possibly a
large number of vports.
It would be faster to retrieve a number of vports in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
The Netlink version won't need to take the starting port number from
userspace, since Netlink sockets can keep track of that state as part
of their "dump" feature.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2011-01-10 13:12:12 -08:00
|
|
|
|
struct dp_netdev_port_state *state = state_;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2014-05-20 13:21:09 -07:00
|
|
|
|
struct cmap_node *node;
|
2013-12-24 16:08:57 -08:00
|
|
|
|
int retval;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
node = cmap_next_position(&dp->ports, &state->position);
|
2013-12-24 16:08:57 -08:00
|
|
|
|
if (node) {
|
|
|
|
|
struct dp_netdev_port *port;
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2013-12-24 16:08:57 -08:00
|
|
|
|
port = CONTAINER_OF(node, struct dp_netdev_port, node);
|
|
|
|
|
|
|
|
|
|
free(state->name);
|
|
|
|
|
state->name = xstrdup(netdev_get_name(port->netdev));
|
|
|
|
|
dpif_port->name = state->name;
|
|
|
|
|
dpif_port->type = port->type;
|
|
|
|
|
dpif_port->port_no = port->port_no;
|
|
|
|
|
|
|
|
|
|
retval = 0;
|
|
|
|
|
} else {
|
|
|
|
|
retval = EOF;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2013-12-24 16:08:57 -08:00
|
|
|
|
return retval;
|
datapath: Change listing ports to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to add new
features to the kernel vport layer without changing userspace software. In
turn, that means that the odp_port structure must become variable-length.
This does not, however, fit in well with the ODP_PORT_LIST ioctl in its
current form, because that would require userspace to know how much space
to allocate for each port in advance, or to allocate as much space as
could possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_PORT_LIST
by a new ioctl ODP_VPORT_DUMP that retrieves information about a single
vport from the datapath on each call. It is much cleaner to allocate the
maximum amount of space for a single vport than to do so for possibly a
large number of vports.
It would be faster to retrieve a number of vports in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
The Netlink version won't need to take the starting port number from
userspace, since Netlink sockets can keep track of that state as part
of their "dump" feature.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2011-01-10 13:12:12 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2011-01-23 18:48:02 -08:00
|
|
|
|
dpif_netdev_port_dump_done(const struct dpif *dpif OVS_UNUSED, void *state_)
|
datapath: Change listing ports to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to add new
features to the kernel vport layer without changing userspace software. In
turn, that means that the odp_port structure must become variable-length.
This does not, however, fit in well with the ODP_PORT_LIST ioctl in its
current form, because that would require userspace to know how much space
to allocate for each port in advance, or to allocate as much space as
could possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_PORT_LIST
by a new ioctl ODP_VPORT_DUMP that retrieves information about a single
vport from the datapath on each call. It is much cleaner to allocate the
maximum amount of space for a single vport than to do so for possibly a
large number of vports.
It would be faster to retrieve a number of vports in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
The Netlink version won't need to take the starting port number from
userspace, since Netlink sockets can keep track of that state as part
of their "dump" feature.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2011-01-10 13:12:12 -08:00
|
|
|
|
{
|
2011-01-23 18:48:02 -08:00
|
|
|
|
struct dp_netdev_port_state *state = state_;
|
|
|
|
|
free(state->name);
|
datapath: Change listing ports to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to add new
features to the kernel vport layer without changing userspace software. In
turn, that means that the odp_port structure must become variable-length.
This does not, however, fit in well with the ODP_PORT_LIST ioctl in its
current form, because that would require userspace to know how much space
to allocate for each port in advance, or to allocate as much space as
could possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_PORT_LIST
by a new ioctl ODP_VPORT_DUMP that retrieves information about a single
vport from the datapath on each call. It is much cleaner to allocate the
maximum amount of space for a single vport than to do so for possibly a
large number of vports.
It would be faster to retrieve a number of vports in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
The Netlink version won't need to take the starting port number from
userspace, since Netlink sockets can keep track of that state as part
of their "dump" feature.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2011-01-10 13:12:12 -08:00
|
|
|
|
free(state);
|
|
|
|
|
return 0;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2010-02-11 10:59:47 -08:00
|
|
|
|
dpif_netdev_port_poll(const struct dpif *dpif_, char **devnamep OVS_UNUSED)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dpif_netdev *dpif = dpif_netdev_cast(dpif_);
|
2013-08-07 13:29:54 -07:00
|
|
|
|
uint64_t new_port_seq;
|
2013-07-23 16:56:26 -07:00
|
|
|
|
int error;
|
|
|
|
|
|
2013-08-07 13:29:54 -07:00
|
|
|
|
new_port_seq = seq_read(dpif->dp->port_seq);
|
|
|
|
|
if (dpif->last_port_seq != new_port_seq) {
|
|
|
|
|
dpif->last_port_seq = new_port_seq;
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = ENOBUFS;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
} else {
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = EAGAIN;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
|
|
|
|
return error;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dpif_netdev_port_poll_wait(const struct dpif *dpif_)
|
|
|
|
|
{
|
|
|
|
|
struct dpif_netdev *dpif = dpif_netdev_cast(dpif_);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
2013-08-07 13:29:54 -07:00
|
|
|
|
seq_wait(dpif->dp->port_seq, dpif->last_port_seq);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct dp_netdev_flow *
|
2014-10-17 09:37:11 -07:00
|
|
|
|
dp_netdev_flow_cast(const struct dpcls_rule *cr)
|
2014-01-08 15:58:11 -08:00
|
|
|
|
{
|
|
|
|
|
return cr ? CONTAINER_OF(cr, struct dp_netdev_flow, cr) : NULL;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-29 16:06:43 -07:00
|
|
|
|
static bool dp_netdev_flow_ref(struct dp_netdev_flow *flow)
|
|
|
|
|
{
|
|
|
|
|
return ovs_refcount_try_ref_rcu(&flow->ref_cnt);
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-06 08:10:42 +00:00
|
|
|
|
/* netdev_flow_key utilities.
|
|
|
|
|
*
|
|
|
|
|
* netdev_flow_key is basically a miniflow. We use these functions
|
|
|
|
|
* (netdev_flow_key_clone, netdev_flow_key_equal, ...) instead of the miniflow
|
|
|
|
|
* functions (miniflow_clone_inline, miniflow_equal, ...), because:
|
|
|
|
|
*
|
|
|
|
|
* - Since we are dealing exclusively with miniflows created by
|
|
|
|
|
* miniflow_extract(), if the map is different the miniflow is different.
|
|
|
|
|
* Therefore we can be faster by comparing the map and the miniflow in a
|
|
|
|
|
* single memcmp().
|
|
|
|
|
* _ netdev_flow_key's miniflow has always inline values.
|
|
|
|
|
* - These functions can be inlined by the compiler.
|
|
|
|
|
*
|
|
|
|
|
* The following assertions make sure that what we're doing with miniflow is
|
|
|
|
|
* safe
|
|
|
|
|
*/
|
|
|
|
|
BUILD_ASSERT_DECL(offsetof(struct miniflow, inline_values)
|
|
|
|
|
== sizeof(uint64_t));
|
|
|
|
|
|
|
|
|
|
/* Given the number of bits set in the miniflow map, returns the size of the
|
2014-10-17 17:03:13 -07:00
|
|
|
|
* 'netdev_flow_key.mf' */
|
2014-09-06 08:10:42 +00:00
|
|
|
|
static inline uint32_t
|
|
|
|
|
netdev_flow_key_size(uint32_t flow_u32s)
|
|
|
|
|
{
|
2014-10-17 17:03:13 -07:00
|
|
|
|
return offsetof(struct miniflow, inline_values) +
|
2014-10-17 09:37:11 -07:00
|
|
|
|
MINIFLOW_VALUES_SIZE(flow_u32s);
|
2014-09-06 08:10:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool
|
|
|
|
|
netdev_flow_key_equal(const struct netdev_flow_key *a,
|
2014-10-17 09:37:11 -07:00
|
|
|
|
const struct netdev_flow_key *b)
|
|
|
|
|
{
|
2014-10-17 17:03:13 -07:00
|
|
|
|
/* 'b->len' may be not set yet. */
|
|
|
|
|
return a->hash == b->hash && !memcmp(&a->mf, &b->mf, a->len);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Used to compare 'netdev_flow_key' in the exact match cache to a miniflow.
|
|
|
|
|
* The maps are compared bitwise, so both 'key->mf' 'mf' must have been
|
|
|
|
|
* generated by miniflow_extract. */
|
|
|
|
|
static inline bool
|
|
|
|
|
netdev_flow_key_equal_mf(const struct netdev_flow_key *key,
|
|
|
|
|
const struct miniflow *mf)
|
2014-09-06 08:10:42 +00:00
|
|
|
|
{
|
2014-10-17 17:03:13 -07:00
|
|
|
|
return !memcmp(&key->mf, mf, key->len);
|
2014-09-06 08:10:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
netdev_flow_key_clone(struct netdev_flow_key *dst,
|
2014-10-17 09:37:11 -07:00
|
|
|
|
const struct netdev_flow_key *src)
|
|
|
|
|
{
|
2014-10-17 17:03:13 -07:00
|
|
|
|
memcpy(dst, src,
|
|
|
|
|
offsetof(struct netdev_flow_key, mf) + src->len);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Slow. */
|
|
|
|
|
static void
|
|
|
|
|
netdev_flow_key_from_flow(struct netdev_flow_key *dst,
|
|
|
|
|
const struct flow *src)
|
|
|
|
|
{
|
|
|
|
|
struct ofpbuf packet;
|
|
|
|
|
uint64_t buf_stub[512 / 8];
|
|
|
|
|
struct pkt_metadata md = pkt_metadata_from_flow(src);
|
|
|
|
|
|
|
|
|
|
miniflow_initialize(&dst->mf, dst->buf);
|
|
|
|
|
|
|
|
|
|
ofpbuf_use_stub(&packet, buf_stub, sizeof buf_stub);
|
|
|
|
|
flow_compose(&packet, src);
|
|
|
|
|
miniflow_extract(&packet, &md, &dst->mf);
|
|
|
|
|
ofpbuf_uninit(&packet);
|
|
|
|
|
|
|
|
|
|
dst->len = netdev_flow_key_size(count_1bits(dst->mf.map));
|
|
|
|
|
dst->hash = 0; /* Not computed yet. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initialize a netdev_flow_key 'mask' from 'match'. */
|
|
|
|
|
static inline void
|
|
|
|
|
netdev_flow_mask_init(struct netdev_flow_key *mask,
|
|
|
|
|
const struct match *match)
|
|
|
|
|
{
|
|
|
|
|
const uint32_t *mask_u32 = (const uint32_t *) &match->wc.masks;
|
|
|
|
|
uint32_t *dst = mask->mf.inline_values;
|
|
|
|
|
uint64_t map, mask_map = 0;
|
|
|
|
|
uint32_t hash = 0;
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
/* Only check masks that make sense for the flow. */
|
|
|
|
|
map = flow_wc_map(&match->flow);
|
|
|
|
|
|
|
|
|
|
while (map) {
|
|
|
|
|
uint64_t rm1bit = rightmost_1bit(map);
|
|
|
|
|
int i = raw_ctz(map);
|
|
|
|
|
|
|
|
|
|
if (mask_u32[i]) {
|
|
|
|
|
mask_map |= rm1bit;
|
|
|
|
|
*dst++ = mask_u32[i];
|
|
|
|
|
hash = hash_add(hash, mask_u32[i]);
|
|
|
|
|
}
|
|
|
|
|
map -= rm1bit;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mask->mf.values_inline = true;
|
|
|
|
|
mask->mf.map = mask_map;
|
|
|
|
|
|
|
|
|
|
hash = hash_add(hash, mask_map);
|
|
|
|
|
hash = hash_add(hash, mask_map >> 32);
|
|
|
|
|
|
|
|
|
|
n = dst - mask->mf.inline_values;
|
|
|
|
|
|
|
|
|
|
mask->hash = hash_finish(hash, n * 4);
|
|
|
|
|
mask->len = netdev_flow_key_size(n);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initializes 'dst' as a copy of 'src' masked with 'mask'. */
|
|
|
|
|
static inline void
|
|
|
|
|
netdev_flow_key_init_masked(struct netdev_flow_key *dst,
|
|
|
|
|
const struct flow *flow,
|
|
|
|
|
const struct netdev_flow_key *mask)
|
2014-09-06 08:10:42 +00:00
|
|
|
|
{
|
2014-10-17 09:37:11 -07:00
|
|
|
|
uint32_t *dst_u32 = dst->mf.inline_values;
|
|
|
|
|
const uint32_t *mask_u32 = mask->mf.inline_values;
|
|
|
|
|
uint32_t hash = 0;
|
|
|
|
|
uint32_t value;
|
|
|
|
|
|
|
|
|
|
dst->len = mask->len;
|
|
|
|
|
dst->mf.values_inline = true;
|
|
|
|
|
dst->mf.map = mask->mf.map;
|
|
|
|
|
|
|
|
|
|
FLOW_FOR_EACH_IN_MAP(value, flow, mask->mf.map) {
|
|
|
|
|
*dst_u32 = value & *mask_u32++;
|
|
|
|
|
hash = hash_add(hash, *dst_u32++);
|
|
|
|
|
}
|
|
|
|
|
dst->hash = hash_finish(hash, (dst_u32 - dst->mf.inline_values) * 4);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Iterate through all netdev_flow_key u32 values specified by 'MAP' */
|
|
|
|
|
#define NETDEV_FLOW_KEY_FOR_EACH_IN_MAP(VALUE, KEY, MAP) \
|
|
|
|
|
for (struct mf_for_each_in_map_aux aux__ \
|
|
|
|
|
= { (KEY)->mf.inline_values, (KEY)->mf.map, MAP }; \
|
|
|
|
|
mf_get_next_in_map(&aux__, &(VALUE)); \
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
/* Returns a hash value for the bits of 'key' where there are 1-bits in
|
|
|
|
|
* 'mask'. */
|
|
|
|
|
static inline uint32_t
|
|
|
|
|
netdev_flow_key_hash_in_mask(const struct netdev_flow_key *key,
|
|
|
|
|
const struct netdev_flow_key *mask)
|
|
|
|
|
{
|
|
|
|
|
const uint32_t *p = mask->mf.inline_values;
|
|
|
|
|
uint32_t hash = 0;
|
|
|
|
|
uint32_t key_u32;
|
|
|
|
|
|
|
|
|
|
NETDEV_FLOW_KEY_FOR_EACH_IN_MAP(key_u32, key, mask->mf.map) {
|
|
|
|
|
hash = hash_add(hash, key_u32 & *p++);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return hash_finish(hash, (p - mask->mf.inline_values) * 4);
|
2014-09-06 08:10:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-29 16:06:43 -07:00
|
|
|
|
static inline bool
|
|
|
|
|
emc_entry_alive(struct emc_entry *ce)
|
|
|
|
|
{
|
|
|
|
|
return ce->flow && !ce->flow->dead;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
emc_clear_entry(struct emc_entry *ce)
|
|
|
|
|
{
|
|
|
|
|
if (ce->flow) {
|
|
|
|
|
dp_netdev_flow_unref(ce->flow);
|
|
|
|
|
ce->flow = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
emc_change_entry(struct emc_entry *ce, struct dp_netdev_flow *flow,
|
2014-10-17 09:37:11 -07:00
|
|
|
|
const struct netdev_flow_key *key)
|
2014-08-29 16:06:43 -07:00
|
|
|
|
{
|
|
|
|
|
if (ce->flow != flow) {
|
|
|
|
|
if (ce->flow) {
|
|
|
|
|
dp_netdev_flow_unref(ce->flow);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dp_netdev_flow_ref(flow)) {
|
|
|
|
|
ce->flow = flow;
|
|
|
|
|
} else {
|
|
|
|
|
ce->flow = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-10-17 09:37:11 -07:00
|
|
|
|
if (key) {
|
|
|
|
|
netdev_flow_key_clone(&ce->key, key);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
2014-10-17 09:37:11 -07:00
|
|
|
|
emc_insert(struct emc_cache *cache, const struct netdev_flow_key *key,
|
2014-08-29 16:06:43 -07:00
|
|
|
|
struct dp_netdev_flow *flow)
|
|
|
|
|
{
|
|
|
|
|
struct emc_entry *to_be_replaced = NULL;
|
|
|
|
|
struct emc_entry *current_entry;
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
EMC_FOR_EACH_POS_WITH_HASH(cache, current_entry, key->hash) {
|
|
|
|
|
if (netdev_flow_key_equal(¤t_entry->key, key)) {
|
2014-08-29 16:06:43 -07:00
|
|
|
|
/* We found the entry with the 'mf' miniflow */
|
2014-10-17 09:37:11 -07:00
|
|
|
|
emc_change_entry(current_entry, flow, NULL);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Replacement policy: put the flow in an empty (not alive) entry, or
|
|
|
|
|
* in the first entry where it can be */
|
|
|
|
|
if (!to_be_replaced
|
|
|
|
|
|| (emc_entry_alive(to_be_replaced)
|
|
|
|
|
&& !emc_entry_alive(current_entry))
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|| current_entry->key.hash < to_be_replaced->key.hash) {
|
2014-08-29 16:06:43 -07:00
|
|
|
|
to_be_replaced = current_entry;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* We didn't find the miniflow in the cache.
|
|
|
|
|
* The 'to_be_replaced' entry is where the new flow will be stored */
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
emc_change_entry(to_be_replaced, flow, key);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct dp_netdev_flow *
|
2014-10-17 09:37:11 -07:00
|
|
|
|
emc_lookup(struct emc_cache *cache, const struct netdev_flow_key *key)
|
2014-08-29 16:06:43 -07:00
|
|
|
|
{
|
|
|
|
|
struct emc_entry *current_entry;
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
EMC_FOR_EACH_POS_WITH_HASH(cache, current_entry, key->hash) {
|
|
|
|
|
if (current_entry->key.hash == key->hash
|
|
|
|
|
&& emc_entry_alive(current_entry)
|
|
|
|
|
&& netdev_flow_key_equal_mf(¤t_entry->key, &key->mf)) {
|
2014-08-29 16:06:43 -07:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
/* We found the entry with the 'key->mf' miniflow */
|
2014-08-29 16:06:43 -07:00
|
|
|
|
return current_entry->flow;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static struct dp_netdev_flow *
|
2014-10-17 09:37:11 -07:00
|
|
|
|
dp_netdev_lookup_flow(const struct dp_netdev *dp,
|
|
|
|
|
const struct netdev_flow_key *key)
|
2013-11-04 06:23:54 -08:00
|
|
|
|
{
|
2014-01-08 15:58:11 -08:00
|
|
|
|
struct dp_netdev_flow *netdev_flow;
|
2014-10-17 09:37:11 -07:00
|
|
|
|
struct dpcls_rule *rule;
|
2013-11-04 06:23:54 -08:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
dpcls_lookup(&dp->cls, key, &rule, 1);
|
2014-04-18 08:26:57 -07:00
|
|
|
|
netdev_flow = dp_netdev_flow_cast(rule);
|
2013-11-04 06:23:54 -08:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
return netdev_flow;
|
2013-11-04 06:23:54 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct dp_netdev_flow *
|
|
|
|
|
dp_netdev_find_flow(const struct dp_netdev *dp, const struct flow *flow)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2013-10-29 02:34:15 -07:00
|
|
|
|
struct dp_netdev_flow *netdev_flow;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-07-04 06:38:47 -07:00
|
|
|
|
CMAP_FOR_EACH_WITH_HASH (netdev_flow, node, flow_hash(flow, 0),
|
2013-10-29 02:34:15 -07:00
|
|
|
|
&dp->flow_table) {
|
2013-11-04 06:23:54 -08:00
|
|
|
|
if (flow_equal(&netdev_flow->flow, flow)) {
|
2014-03-05 22:41:30 -08:00
|
|
|
|
return netdev_flow;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2014-08-13 09:55:54 +12:00
|
|
|
|
get_dpif_flow_stats(const struct dp_netdev_flow *netdev_flow,
|
2013-10-29 02:34:15 -07:00
|
|
|
|
struct dpif_flow_stats *stats)
|
2011-01-26 07:03:39 -08:00
|
|
|
|
{
|
2014-01-22 16:03:10 -08:00
|
|
|
|
struct dp_netdev_flow_stats *bucket;
|
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
memset(stats, 0, sizeof *stats);
|
|
|
|
|
OVSTHREAD_STATS_FOR_EACH_BUCKET (bucket, i, &netdev_flow->stats) {
|
|
|
|
|
ovs_mutex_lock(&bucket->mutex);
|
|
|
|
|
stats->n_packets += bucket->packet_count;
|
|
|
|
|
stats->n_bytes += bucket->byte_count;
|
|
|
|
|
stats->used = MAX(stats->used, bucket->used);
|
|
|
|
|
stats->tcp_flags |= bucket->tcp_flags;
|
|
|
|
|
ovs_mutex_unlock(&bucket->mutex);
|
|
|
|
|
}
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-13 09:55:54 +12:00
|
|
|
|
static void
|
|
|
|
|
dp_netdev_flow_to_dpif_flow(const struct dp_netdev_flow *netdev_flow,
|
|
|
|
|
struct ofpbuf *buffer, struct dpif_flow *flow)
|
|
|
|
|
{
|
|
|
|
|
struct flow_wildcards wc;
|
|
|
|
|
struct dp_netdev_actions *actions;
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
miniflow_expand(&netdev_flow->cr.mask->mf, &wc.masks);
|
2014-08-13 09:55:54 +12:00
|
|
|
|
odp_flow_key_from_mask(buffer, &wc.masks, &netdev_flow->flow,
|
|
|
|
|
odp_to_u32(wc.masks.in_port.odp_port),
|
|
|
|
|
SIZE_MAX, true);
|
|
|
|
|
flow->mask = ofpbuf_data(buffer);
|
|
|
|
|
flow->mask_len = ofpbuf_size(buffer);
|
|
|
|
|
|
|
|
|
|
actions = dp_netdev_flow_get_actions(netdev_flow);
|
|
|
|
|
flow->actions = actions->actions;
|
|
|
|
|
flow->actions_len = actions->size;
|
|
|
|
|
|
|
|
|
|
get_dpif_flow_stats(netdev_flow, &flow->stats);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-23 18:44:44 -08:00
|
|
|
|
static int
|
2013-12-11 11:07:01 -08:00
|
|
|
|
dpif_netdev_mask_from_nlattrs(const struct nlattr *key, uint32_t key_len,
|
|
|
|
|
const struct nlattr *mask_key,
|
|
|
|
|
uint32_t mask_key_len, const struct flow *flow,
|
|
|
|
|
struct flow *mask)
|
|
|
|
|
{
|
|
|
|
|
if (mask_key_len) {
|
2014-02-04 08:07:45 -08:00
|
|
|
|
enum odp_key_fitness fitness;
|
|
|
|
|
|
|
|
|
|
fitness = odp_flow_key_to_mask(mask_key, mask_key_len, mask, flow);
|
|
|
|
|
if (fitness) {
|
2013-12-11 11:07:01 -08:00
|
|
|
|
/* This should not happen: it indicates that
|
|
|
|
|
* odp_flow_key_from_mask() and odp_flow_key_to_mask()
|
|
|
|
|
* disagree on the acceptable form of a mask. Log the problem
|
|
|
|
|
* as an error, with enough details to enable debugging. */
|
|
|
|
|
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
|
|
|
|
|
|
|
|
|
|
if (!VLOG_DROP_ERR(&rl)) {
|
|
|
|
|
struct ds s;
|
|
|
|
|
|
|
|
|
|
ds_init(&s);
|
|
|
|
|
odp_flow_format(key, key_len, mask_key, mask_key_len, NULL, &s,
|
|
|
|
|
true);
|
2014-02-04 08:07:45 -08:00
|
|
|
|
VLOG_ERR("internal error parsing flow mask %s (%s)",
|
|
|
|
|
ds_cstr(&s), odp_key_fitness_to_string(fitness));
|
2013-12-11 11:07:01 -08:00
|
|
|
|
ds_destroy(&s);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
enum mf_field_id id;
|
|
|
|
|
/* No mask key, unwildcard everything except fields whose
|
|
|
|
|
* prerequisities are not met. */
|
|
|
|
|
memset(mask, 0x0, sizeof *mask);
|
|
|
|
|
|
|
|
|
|
for (id = 0; id < MFF_N_IDS; ++id) {
|
|
|
|
|
/* Skip registers and metadata. */
|
|
|
|
|
if (!(id >= MFF_REG0 && id < MFF_REG0 + FLOW_N_REGS)
|
|
|
|
|
&& id != MFF_METADATA) {
|
|
|
|
|
const struct mf_field *mf = mf_from_id(id);
|
|
|
|
|
if (mf_are_prereqs_ok(mf, flow)) {
|
|
|
|
|
mf_mask_field(mf, mask);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-05 10:27:05 -07:00
|
|
|
|
/* Force unwildcard the in_port.
|
|
|
|
|
*
|
|
|
|
|
* We need to do this even in the case where we unwildcard "everything"
|
|
|
|
|
* above because "everything" only includes the 16-bit OpenFlow port number
|
|
|
|
|
* mask->in_port.ofp_port, which only covers half of the 32-bit datapath
|
|
|
|
|
* port number mask->in_port.odp_port. */
|
|
|
|
|
mask->in_port.odp_port = u32_to_odp(UINT32_MAX);
|
|
|
|
|
|
2013-12-11 11:07:01 -08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len,
|
|
|
|
|
struct flow *flow)
|
2011-01-23 18:44:44 -08:00
|
|
|
|
{
|
2013-07-09 09:23:02 -07:00
|
|
|
|
odp_port_t in_port;
|
|
|
|
|
|
2013-12-11 11:07:01 -08:00
|
|
|
|
if (odp_flow_key_to_flow(key, key_len, flow)) {
|
2011-01-23 18:44:44 -08:00
|
|
|
|
/* This should not happen: it indicates that odp_flow_key_from_flow()
|
2013-12-11 11:07:01 -08:00
|
|
|
|
* and odp_flow_key_to_flow() disagree on the acceptable form of a
|
|
|
|
|
* flow. Log the problem as an error, with enough details to enable
|
|
|
|
|
* debugging. */
|
2011-01-23 18:44:44 -08:00
|
|
|
|
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
|
|
|
|
|
|
|
|
|
|
if (!VLOG_DROP_ERR(&rl)) {
|
|
|
|
|
struct ds s;
|
|
|
|
|
|
|
|
|
|
ds_init(&s);
|
2013-12-11 11:07:01 -08:00
|
|
|
|
odp_flow_format(key, key_len, NULL, 0, NULL, &s, true);
|
2011-01-23 18:44:44 -08:00
|
|
|
|
VLOG_ERR("internal error parsing flow key %s", ds_cstr(&s));
|
|
|
|
|
ds_destroy(&s);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2013-07-09 09:23:02 -07:00
|
|
|
|
in_port = flow->in_port.odp_port;
|
|
|
|
|
if (!is_valid_port_number(in_port) && in_port != ODPP_NONE) {
|
2011-09-08 16:30:20 -07:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-23 18:44:44 -08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static int
|
2014-08-13 09:55:54 +12:00
|
|
|
|
dpif_netdev_flow_get(const struct dpif *dpif, const struct dpif_flow_get *get)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2013-10-29 02:34:15 -07:00
|
|
|
|
struct dp_netdev_flow *netdev_flow;
|
2011-01-17 14:40:58 -08:00
|
|
|
|
struct flow key;
|
|
|
|
|
int error;
|
2011-01-23 18:44:44 -08:00
|
|
|
|
|
2014-08-13 09:55:54 +12:00
|
|
|
|
error = dpif_netdev_flow_from_nlattrs(get->key, get->key_len, &key);
|
2011-01-17 14:40:58 -08:00
|
|
|
|
if (error) {
|
|
|
|
|
return error;
|
|
|
|
|
}
|
2010-10-11 13:31:35 -07:00
|
|
|
|
|
2013-11-04 06:23:54 -08:00
|
|
|
|
netdev_flow = dp_netdev_find_flow(dp, &key);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
2013-10-29 02:34:15 -07:00
|
|
|
|
if (netdev_flow) {
|
2014-08-13 09:55:54 +12:00
|
|
|
|
dp_netdev_flow_to_dpif_flow(netdev_flow, get->buffer, get->flow);
|
2014-03-05 22:41:30 -08:00
|
|
|
|
} else {
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = ENOENT;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
2011-01-17 14:40:58 -08:00
|
|
|
|
|
2013-07-23 16:56:26 -07:00
|
|
|
|
return error;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
static struct dp_netdev_flow *
|
2014-07-27 18:56:45 -07:00
|
|
|
|
dp_netdev_flow_add(struct dp_netdev *dp, struct match *match,
|
|
|
|
|
const struct nlattr *actions, size_t actions_len)
|
2014-01-08 15:58:11 -08:00
|
|
|
|
OVS_REQUIRES(dp->flow_mutex)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2014-10-17 09:37:11 -07:00
|
|
|
|
struct dp_netdev_flow *flow;
|
|
|
|
|
struct netdev_flow_key mask;
|
2014-08-11 17:25:50 -07:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
netdev_flow_mask_init(&mask, match);
|
|
|
|
|
/* Make sure wc does not have metadata. */
|
|
|
|
|
ovs_assert(!(mask.mf.map & (MINIFLOW_MAP(metadata) | MINIFLOW_MAP(regs))));
|
2014-01-22 16:03:10 -08:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
/* Do not allocate extra space. */
|
2014-10-17 17:03:13 -07:00
|
|
|
|
flow = xmalloc(sizeof *flow - sizeof flow->cr.flow.mf + mask.len);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
flow->dead = false;
|
|
|
|
|
*CONST_CAST(struct flow *, &flow->flow) = match->flow;
|
|
|
|
|
ovs_refcount_init(&flow->ref_cnt);
|
|
|
|
|
ovsthread_stats_init(&flow->stats);
|
|
|
|
|
ovsrcu_set(&flow->actions, dp_netdev_actions_create(actions, actions_len));
|
2013-11-04 06:23:54 -08:00
|
|
|
|
|
2014-07-04 06:38:47 -07:00
|
|
|
|
cmap_insert(&dp->flow_table,
|
2014-10-17 09:37:11 -07:00
|
|
|
|
CONST_CAST(struct cmap_node *, &flow->node),
|
|
|
|
|
flow_hash(&flow->flow, 0));
|
|
|
|
|
netdev_flow_key_init_masked(&flow->cr.flow, &match->flow, &mask);
|
|
|
|
|
dpcls_insert(&dp->cls, &flow->cr, &mask);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
if (OVS_UNLIKELY(VLOG_IS_DBG_ENABLED())) {
|
2014-10-17 09:37:11 -07:00
|
|
|
|
struct match match;
|
2014-07-26 15:39:58 -07:00
|
|
|
|
struct ds ds = DS_EMPTY_INITIALIZER;
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
match.flow = flow->flow;
|
|
|
|
|
miniflow_expand(&flow->cr.mask->mf, &match.wc.masks);
|
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
ds_put_cstr(&ds, "flow_add: ");
|
2014-10-17 09:37:11 -07:00
|
|
|
|
match_format(&match, &ds, OFP_DEFAULT_PRIORITY);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
ds_put_cstr(&ds, ", actions:");
|
|
|
|
|
format_odp_actions(&ds, actions, actions_len);
|
|
|
|
|
|
|
|
|
|
VLOG_DBG_RL(&upcall_rl, "%s", ds_cstr(&ds));
|
|
|
|
|
|
|
|
|
|
ds_destroy(&ds);
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
return flow;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2013-10-29 02:34:15 -07:00
|
|
|
|
clear_stats(struct dp_netdev_flow *netdev_flow)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2014-01-22 16:03:10 -08:00
|
|
|
|
struct dp_netdev_flow_stats *bucket;
|
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
OVSTHREAD_STATS_FOR_EACH_BUCKET (bucket, i, &netdev_flow->stats) {
|
|
|
|
|
ovs_mutex_lock(&bucket->mutex);
|
|
|
|
|
bucket->used = 0;
|
|
|
|
|
bucket->packet_count = 0;
|
|
|
|
|
bucket->byte_count = 0;
|
|
|
|
|
bucket->tcp_flags = 0;
|
|
|
|
|
ovs_mutex_unlock(&bucket->mutex);
|
|
|
|
|
}
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2011-12-26 14:39:03 -08:00
|
|
|
|
dpif_netdev_flow_put(struct dpif *dpif, const struct dpif_flow_put *put)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2013-10-29 02:34:15 -07:00
|
|
|
|
struct dp_netdev_flow *netdev_flow;
|
2014-10-17 09:37:11 -07:00
|
|
|
|
struct netdev_flow_key key;
|
2014-07-27 18:56:45 -07:00
|
|
|
|
struct match match;
|
2011-01-23 18:44:44 -08:00
|
|
|
|
int error;
|
|
|
|
|
|
2014-07-27 18:56:45 -07:00
|
|
|
|
error = dpif_netdev_flow_from_nlattrs(put->key, put->key_len, &match.flow);
|
2013-12-11 11:07:01 -08:00
|
|
|
|
if (error) {
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
error = dpif_netdev_mask_from_nlattrs(put->key, put->key_len,
|
|
|
|
|
put->mask, put->mask_len,
|
2014-07-27 18:56:45 -07:00
|
|
|
|
&match.flow, &match.wc.masks);
|
2011-01-23 18:44:44 -08:00
|
|
|
|
if (error) {
|
|
|
|
|
return error;
|
|
|
|
|
}
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
|
|
|
|
/* Must produce a netdev_flow_key for lookup.
|
|
|
|
|
* This interface is no longer performance critical, since it is not used
|
|
|
|
|
* for upcall processing any more. */
|
|
|
|
|
netdev_flow_key_from_flow(&key, &match.flow);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
ovs_mutex_lock(&dp->flow_mutex);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
netdev_flow = dp_netdev_lookup_flow(dp, &key);
|
2013-10-29 02:34:15 -07:00
|
|
|
|
if (!netdev_flow) {
|
2011-12-26 14:39:03 -08:00
|
|
|
|
if (put->flags & DPIF_FP_CREATE) {
|
2014-07-04 06:38:47 -07:00
|
|
|
|
if (cmap_count(&dp->flow_table) < MAX_FLOWS) {
|
2011-12-26 14:39:03 -08:00
|
|
|
|
if (put->stats) {
|
|
|
|
|
memset(put->stats, 0, sizeof *put->stats);
|
2011-01-26 07:03:39 -08:00
|
|
|
|
}
|
2014-10-17 09:37:11 -07:00
|
|
|
|
dp_netdev_flow_add(dp, &match, put->actions, put->actions_len);
|
|
|
|
|
error = 0;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
} else {
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = EFBIG;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
} else {
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = ENOENT;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
} else {
|
2013-11-04 06:23:54 -08:00
|
|
|
|
if (put->flags & DPIF_FP_MODIFY
|
2014-07-27 18:56:45 -07:00
|
|
|
|
&& flow_equal(&match.flow, &netdev_flow->flow)) {
|
2014-01-08 15:58:11 -08:00
|
|
|
|
struct dp_netdev_actions *new_actions;
|
|
|
|
|
struct dp_netdev_actions *old_actions;
|
|
|
|
|
|
|
|
|
|
new_actions = dp_netdev_actions_create(put->actions,
|
|
|
|
|
put->actions_len);
|
|
|
|
|
|
2014-03-05 22:41:30 -08:00
|
|
|
|
old_actions = dp_netdev_flow_get_actions(netdev_flow);
|
|
|
|
|
ovsrcu_set(&netdev_flow->actions, new_actions);
|
2014-01-22 16:03:10 -08:00
|
|
|
|
|
2014-01-08 14:37:13 -08:00
|
|
|
|
if (put->stats) {
|
|
|
|
|
get_dpif_flow_stats(netdev_flow, put->stats);
|
|
|
|
|
}
|
|
|
|
|
if (put->flags & DPIF_FP_ZERO_STATS) {
|
|
|
|
|
clear_stats(netdev_flow);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
2014-03-05 22:41:30 -08:00
|
|
|
|
ovsrcu_postpone(dp_netdev_actions_free, old_actions);
|
2013-11-04 06:23:54 -08:00
|
|
|
|
} else if (put->flags & DPIF_FP_CREATE) {
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = EEXIST;
|
2013-11-04 06:23:54 -08:00
|
|
|
|
} else {
|
|
|
|
|
/* Overlapping flow. */
|
|
|
|
|
error = EINVAL;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
2014-01-08 15:58:11 -08:00
|
|
|
|
ovs_mutex_unlock(&dp->flow_mutex);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
|
|
|
|
return error;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2012-04-17 21:52:10 -07:00
|
|
|
|
dpif_netdev_flow_del(struct dpif *dpif, const struct dpif_flow_del *del)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2013-10-29 02:34:15 -07:00
|
|
|
|
struct dp_netdev_flow *netdev_flow;
|
2010-10-11 13:31:35 -07:00
|
|
|
|
struct flow key;
|
2011-01-23 18:44:44 -08:00
|
|
|
|
int error;
|
|
|
|
|
|
2012-04-17 21:52:10 -07:00
|
|
|
|
error = dpif_netdev_flow_from_nlattrs(del->key, del->key_len, &key);
|
2011-01-23 18:44:44 -08:00
|
|
|
|
if (error) {
|
|
|
|
|
return error;
|
|
|
|
|
}
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
ovs_mutex_lock(&dp->flow_mutex);
|
2013-11-04 06:23:54 -08:00
|
|
|
|
netdev_flow = dp_netdev_find_flow(dp, &key);
|
2013-10-29 02:34:15 -07:00
|
|
|
|
if (netdev_flow) {
|
2012-04-17 21:52:10 -07:00
|
|
|
|
if (del->stats) {
|
2013-10-29 02:34:15 -07:00
|
|
|
|
get_dpif_flow_stats(netdev_flow, del->stats);
|
2011-01-26 07:03:39 -08:00
|
|
|
|
}
|
2014-01-08 15:58:11 -08:00
|
|
|
|
dp_netdev_remove_flow(dp, netdev_flow);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
} else {
|
2013-07-23 16:56:26 -07:00
|
|
|
|
error = ENOENT;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
2014-01-08 15:58:11 -08:00
|
|
|
|
ovs_mutex_unlock(&dp->flow_mutex);
|
2013-07-23 16:56:26 -07:00
|
|
|
|
|
|
|
|
|
return error;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
struct dpif_netdev_flow_dump {
|
|
|
|
|
struct dpif_flow_dump up;
|
2014-07-04 06:38:47 -07:00
|
|
|
|
struct cmap_position pos;
|
2014-02-27 14:13:08 -08:00
|
|
|
|
int status;
|
|
|
|
|
struct ovs_mutex mutex;
|
2014-02-27 14:13:07 -08:00
|
|
|
|
};
|
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
static struct dpif_netdev_flow_dump *
|
|
|
|
|
dpif_netdev_flow_dump_cast(struct dpif_flow_dump *dump)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2014-05-20 11:37:02 -07:00
|
|
|
|
return CONTAINER_OF(dump, struct dpif_netdev_flow_dump, up);
|
2014-02-27 14:13:07 -08:00
|
|
|
|
}
|
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
static struct dpif_flow_dump *
|
|
|
|
|
dpif_netdev_flow_dump_create(const struct dpif *dpif_)
|
2014-02-27 14:13:07 -08:00
|
|
|
|
{
|
2014-05-20 11:37:02 -07:00
|
|
|
|
struct dpif_netdev_flow_dump *dump;
|
2014-02-27 14:13:07 -08:00
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
dump = xmalloc(sizeof *dump);
|
|
|
|
|
dpif_flow_dump_init(&dump->up, dpif_);
|
2014-07-04 06:38:47 -07:00
|
|
|
|
memset(&dump->pos, 0, sizeof dump->pos);
|
2014-05-20 11:37:02 -07:00
|
|
|
|
dump->status = 0;
|
|
|
|
|
ovs_mutex_init(&dump->mutex);
|
|
|
|
|
|
|
|
|
|
return &dump->up;
|
2014-02-27 14:13:07 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2014-05-20 11:37:02 -07:00
|
|
|
|
dpif_netdev_flow_dump_destroy(struct dpif_flow_dump *dump_)
|
2014-02-27 14:13:07 -08:00
|
|
|
|
{
|
2014-05-20 11:37:02 -07:00
|
|
|
|
struct dpif_netdev_flow_dump *dump = dpif_netdev_flow_dump_cast(dump_);
|
2014-02-27 14:13:07 -08:00
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
ovs_mutex_destroy(&dump->mutex);
|
|
|
|
|
free(dump);
|
datapath: Change listing flows to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to change
the kernel's idea of the flow key separately from the userspace version.
In turn, that means that flow keys must become variable-length. This does
not, however, fit in well with the ODP_FLOW_LIST ioctl in its current form,
because that would require userspace to know how much space to allocate
for each flow's key in advance, or to allocate as much space as could
possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_FLOW_LIST
by a new ioctl ODP_FLOW_DUMP that retrieves a single flow from the datapath
on each call. It is much cleaner to allocate the maximum amount of space
for a single flow key than to do so for possibly a very large number of
flow keys.
As a side effect, this patch also fixes a race condition that sometimes
made "ovs-dpctl dump-flows" print an error: previously, flows were listed
and then their actions were retrieved, which left a window in which
ovs-vswitchd could delete the flow. Now dumping a flow and its actions is
a single step, closing that window.
Dumping all of the flows in a datapath is no longer an atomic step, so now
it is possible to miss some flows or see a single flow twice during
iteration, if the flow table is modified by another process. It doesn't
look like this should be a problem for ovs-vswitchd.
It would be faster to retrieve a number of flows in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2010-12-28 10:39:52 -08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
struct dpif_netdev_flow_dump_thread {
|
|
|
|
|
struct dpif_flow_dump_thread up;
|
|
|
|
|
struct dpif_netdev_flow_dump *dump;
|
2014-06-23 12:36:11 -07:00
|
|
|
|
struct odputil_keybuf keybuf[FLOW_DUMP_MAX_BATCH];
|
|
|
|
|
struct odputil_keybuf maskbuf[FLOW_DUMP_MAX_BATCH];
|
2014-05-20 11:37:02 -07:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct dpif_netdev_flow_dump_thread *
|
|
|
|
|
dpif_netdev_flow_dump_thread_cast(struct dpif_flow_dump_thread *thread)
|
|
|
|
|
{
|
|
|
|
|
return CONTAINER_OF(thread, struct dpif_netdev_flow_dump_thread, up);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct dpif_flow_dump_thread *
|
|
|
|
|
dpif_netdev_flow_dump_thread_create(struct dpif_flow_dump *dump_)
|
|
|
|
|
{
|
|
|
|
|
struct dpif_netdev_flow_dump *dump = dpif_netdev_flow_dump_cast(dump_);
|
|
|
|
|
struct dpif_netdev_flow_dump_thread *thread;
|
|
|
|
|
|
|
|
|
|
thread = xmalloc(sizeof *thread);
|
|
|
|
|
dpif_flow_dump_thread_init(&thread->up, &dump->up);
|
|
|
|
|
thread->dump = dump;
|
|
|
|
|
return &thread->up;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dpif_netdev_flow_dump_thread_destroy(struct dpif_flow_dump_thread *thread_)
|
|
|
|
|
{
|
|
|
|
|
struct dpif_netdev_flow_dump_thread *thread
|
|
|
|
|
= dpif_netdev_flow_dump_thread_cast(thread_);
|
|
|
|
|
|
|
|
|
|
free(thread);
|
|
|
|
|
}
|
|
|
|
|
|
datapath: Change listing flows to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to change
the kernel's idea of the flow key separately from the userspace version.
In turn, that means that flow keys must become variable-length. This does
not, however, fit in well with the ODP_FLOW_LIST ioctl in its current form,
because that would require userspace to know how much space to allocate
for each flow's key in advance, or to allocate as much space as could
possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_FLOW_LIST
by a new ioctl ODP_FLOW_DUMP that retrieves a single flow from the datapath
on each call. It is much cleaner to allocate the maximum amount of space
for a single flow key than to do so for possibly a very large number of
flow keys.
As a side effect, this patch also fixes a race condition that sometimes
made "ovs-dpctl dump-flows" print an error: previously, flows were listed
and then their actions were retrieved, which left a window in which
ovs-vswitchd could delete the flow. Now dumping a flow and its actions is
a single step, closing that window.
Dumping all of the flows in a datapath is no longer an atomic step, so now
it is possible to miss some flows or see a single flow twice during
iteration, if the flow table is modified by another process. It doesn't
look like this should be a problem for ovs-vswitchd.
It would be faster to retrieve a number of flows in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2010-12-28 10:39:52 -08:00
|
|
|
|
static int
|
2014-05-20 11:37:02 -07:00
|
|
|
|
dpif_netdev_flow_dump_next(struct dpif_flow_dump_thread *thread_,
|
2014-06-23 12:36:11 -07:00
|
|
|
|
struct dpif_flow *flows, int max_flows)
|
2014-05-20 11:37:02 -07:00
|
|
|
|
{
|
|
|
|
|
struct dpif_netdev_flow_dump_thread *thread
|
|
|
|
|
= dpif_netdev_flow_dump_thread_cast(thread_);
|
|
|
|
|
struct dpif_netdev_flow_dump *dump = thread->dump;
|
|
|
|
|
struct dpif_netdev *dpif = dpif_netdev_cast(thread->up.dpif);
|
2014-06-23 12:36:11 -07:00
|
|
|
|
struct dp_netdev_flow *netdev_flows[FLOW_DUMP_MAX_BATCH];
|
2014-05-20 11:37:02 -07:00
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(&dpif->dpif);
|
2014-06-23 12:36:11 -07:00
|
|
|
|
int n_flows = 0;
|
|
|
|
|
int i;
|
2010-10-11 13:31:35 -07:00
|
|
|
|
|
2014-05-20 11:37:02 -07:00
|
|
|
|
ovs_mutex_lock(&dump->mutex);
|
2014-06-23 12:36:11 -07:00
|
|
|
|
if (!dump->status) {
|
|
|
|
|
for (n_flows = 0; n_flows < MIN(max_flows, FLOW_DUMP_MAX_BATCH);
|
|
|
|
|
n_flows++) {
|
2014-07-04 06:38:47 -07:00
|
|
|
|
struct cmap_node *node;
|
2014-06-23 12:36:11 -07:00
|
|
|
|
|
2014-07-04 06:38:47 -07:00
|
|
|
|
node = cmap_next_position(&dp->flow_table, &dump->pos);
|
2014-06-23 12:36:11 -07:00
|
|
|
|
if (!node) {
|
|
|
|
|
dump->status = EOF;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
netdev_flows[n_flows] = CONTAINER_OF(node, struct dp_netdev_flow,
|
|
|
|
|
node);
|
2014-02-27 14:13:08 -08:00
|
|
|
|
}
|
2014-01-08 15:58:11 -08:00
|
|
|
|
}
|
2014-05-20 11:37:02 -07:00
|
|
|
|
ovs_mutex_unlock(&dump->mutex);
|
|
|
|
|
|
2014-06-23 12:36:11 -07:00
|
|
|
|
for (i = 0; i < n_flows; i++) {
|
|
|
|
|
struct odputil_keybuf *maskbuf = &thread->maskbuf[i];
|
|
|
|
|
struct odputil_keybuf *keybuf = &thread->keybuf[i];
|
|
|
|
|
struct dp_netdev_flow *netdev_flow = netdev_flows[i];
|
|
|
|
|
struct dpif_flow *f = &flows[i];
|
|
|
|
|
struct dp_netdev_actions *dp_actions;
|
|
|
|
|
struct flow_wildcards wc;
|
|
|
|
|
struct ofpbuf buf;
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
miniflow_expand(&netdev_flow->cr.mask->mf, &wc.masks);
|
2014-06-23 12:36:11 -07:00
|
|
|
|
|
|
|
|
|
/* Key. */
|
|
|
|
|
ofpbuf_use_stack(&buf, keybuf, sizeof *keybuf);
|
|
|
|
|
odp_flow_key_from_flow(&buf, &netdev_flow->flow, &wc.masks,
|
|
|
|
|
netdev_flow->flow.in_port.odp_port, true);
|
|
|
|
|
f->key = ofpbuf_data(&buf);
|
|
|
|
|
f->key_len = ofpbuf_size(&buf);
|
|
|
|
|
|
|
|
|
|
/* Mask. */
|
|
|
|
|
ofpbuf_use_stack(&buf, maskbuf, sizeof *maskbuf);
|
|
|
|
|
odp_flow_key_from_mask(&buf, &wc.masks, &netdev_flow->flow,
|
|
|
|
|
odp_to_u32(wc.masks.in_port.odp_port),
|
|
|
|
|
SIZE_MAX, true);
|
|
|
|
|
f->mask = ofpbuf_data(&buf);
|
|
|
|
|
f->mask_len = ofpbuf_size(&buf);
|
|
|
|
|
|
|
|
|
|
/* Actions. */
|
|
|
|
|
dp_actions = dp_netdev_flow_get_actions(netdev_flow);
|
|
|
|
|
f->actions = dp_actions->actions;
|
|
|
|
|
f->actions_len = dp_actions->size;
|
|
|
|
|
|
|
|
|
|
/* Stats. */
|
|
|
|
|
get_dpif_flow_stats(netdev_flow, &f->stats);
|
|
|
|
|
}
|
2011-01-26 07:03:39 -08:00
|
|
|
|
|
2014-06-23 12:36:11 -07:00
|
|
|
|
return n_flows;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2013-12-30 15:58:58 -08:00
|
|
|
|
dpif_netdev_execute(struct dpif *dpif, struct dpif_execute *execute)
|
2014-09-05 14:14:20 -07:00
|
|
|
|
OVS_NO_THREAD_SAFETY_ANALYSIS
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2014-09-05 14:14:20 -07:00
|
|
|
|
struct dp_netdev_pmd_thread *pmd;
|
2014-06-23 11:43:59 -07:00
|
|
|
|
struct dpif_packet packet, *pp;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-03-30 01:31:50 -07:00
|
|
|
|
if (ofpbuf_size(execute->packet) < ETH_HEADER_LEN ||
|
|
|
|
|
ofpbuf_size(execute->packet) > UINT16_MAX) {
|
2009-06-19 14:09:39 -07:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-23 11:43:57 -07:00
|
|
|
|
packet.ofpbuf = *execute->packet;
|
2014-10-03 20:23:58 -07:00
|
|
|
|
packet.md = execute->md;
|
2014-06-23 11:43:59 -07:00
|
|
|
|
pp = &packet;
|
2014-06-23 11:43:57 -07:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
/* Tries finding the 'pmd'. If NULL is returned, that means
|
|
|
|
|
* the current thread is a non-pmd thread and should use
|
|
|
|
|
* dp_netdev_get_nonpmd(). */
|
|
|
|
|
pmd = ovsthread_getspecific(dp->per_pmd_key);
|
|
|
|
|
if (!pmd) {
|
|
|
|
|
pmd = dp_netdev_get_nonpmd(dp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the current thread is non-pmd thread, acquires
|
|
|
|
|
* the 'non_pmd_mutex'. */
|
|
|
|
|
if (pmd->core_id == NON_PMD_CORE_ID) {
|
|
|
|
|
ovs_mutex_lock(&dp->non_pmd_mutex);
|
|
|
|
|
}
|
2014-10-03 20:23:58 -07:00
|
|
|
|
dp_netdev_execute_actions(pmd, &pp, 1, false, execute->actions,
|
2014-08-29 16:06:43 -07:00
|
|
|
|
execute->actions_len);
|
2014-09-05 14:14:20 -07:00
|
|
|
|
if (pmd->core_id == NON_PMD_CORE_ID) {
|
|
|
|
|
ovs_mutex_unlock(&dp->non_pmd_mutex);
|
|
|
|
|
}
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
2014-06-23 11:43:57 -07:00
|
|
|
|
/* Even though may_steal is set to false, some actions could modify or
|
|
|
|
|
* reallocate the ofpbuf memory. We need to pass those changes to the
|
|
|
|
|
* caller */
|
|
|
|
|
*execute->packet = packet.ofpbuf;
|
2014-10-03 20:23:58 -07:00
|
|
|
|
execute->md = packet.md;
|
2013-12-30 15:58:58 -08:00
|
|
|
|
return 0;
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-15 16:09:40 -07:00
|
|
|
|
static void
|
|
|
|
|
dpif_netdev_operate(struct dpif *dpif, struct dpif_op **ops, size_t n_ops)
|
|
|
|
|
{
|
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < n_ops; i++) {
|
|
|
|
|
struct dpif_op *op = ops[i];
|
|
|
|
|
|
|
|
|
|
switch (op->type) {
|
|
|
|
|
case DPIF_OP_FLOW_PUT:
|
|
|
|
|
op->error = dpif_netdev_flow_put(dpif, &op->u.flow_put);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DPIF_OP_FLOW_DEL:
|
|
|
|
|
op->error = dpif_netdev_flow_del(dpif, &op->u.flow_del);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DPIF_OP_EXECUTE:
|
|
|
|
|
op->error = dpif_netdev_execute(dpif, &op->u.execute);
|
|
|
|
|
break;
|
2014-08-13 09:55:54 +12:00
|
|
|
|
|
|
|
|
|
case DPIF_OP_FLOW_GET:
|
|
|
|
|
op->error = dpif_netdev_flow_get(dpif, &op->u.flow_get);
|
|
|
|
|
break;
|
2014-07-15 16:09:40 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-08 15:22:26 -07:00
|
|
|
|
/* Returns true if the configuration for rx queues or cpu mask
|
|
|
|
|
* is changed. */
|
|
|
|
|
static bool
|
|
|
|
|
pmd_config_changed(const struct dp_netdev *dp, size_t rxqs, const char *cmask)
|
|
|
|
|
{
|
|
|
|
|
if (dp->n_dpdk_rxqs != rxqs) {
|
|
|
|
|
return true;
|
|
|
|
|
} else {
|
|
|
|
|
if (dp->pmd_cmask != NULL && cmask != NULL) {
|
|
|
|
|
return strcmp(dp->pmd_cmask, cmask);
|
|
|
|
|
} else {
|
|
|
|
|
return (dp->pmd_cmask != NULL || cmask != NULL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Resets pmd threads if the configuration for 'rxq's or cpu mask changes. */
|
|
|
|
|
static int
|
|
|
|
|
dpif_netdev_pmd_set(struct dpif *dpif, unsigned int n_rxqs, const char *cmask)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
|
|
|
|
|
|
|
|
|
if (pmd_config_changed(dp, n_rxqs, cmask)) {
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
|
|
|
|
|
dp_netdev_destroy_all_pmds(dp);
|
|
|
|
|
|
|
|
|
|
CMAP_FOR_EACH (port, node, &dp->ports) {
|
|
|
|
|
if (netdev_is_pmd(port->netdev)) {
|
|
|
|
|
int i, err;
|
|
|
|
|
|
|
|
|
|
/* Closes the existing 'rxq's. */
|
|
|
|
|
for (i = 0; i < netdev_n_rxq(port->netdev); i++) {
|
|
|
|
|
netdev_rxq_close(port->rxq[i]);
|
|
|
|
|
port->rxq[i] = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sets the new rx queue config. */
|
|
|
|
|
err = netdev_set_multiq(port->netdev, ovs_numa_get_n_cores(),
|
|
|
|
|
n_rxqs);
|
2014-10-14 19:01:49 +02:00
|
|
|
|
if (err && (err != EOPNOTSUPP)) {
|
2014-09-08 15:22:26 -07:00
|
|
|
|
VLOG_ERR("Failed to set dpdk interface %s rx_queue to:"
|
|
|
|
|
" %u", netdev_get_name(port->netdev),
|
|
|
|
|
n_rxqs);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the set_multiq() above succeeds, reopens the 'rxq's. */
|
|
|
|
|
port->rxq = xrealloc(port->rxq, sizeof *port->rxq
|
|
|
|
|
* netdev_n_rxq(port->netdev));
|
|
|
|
|
for (i = 0; i < netdev_n_rxq(port->netdev); i++) {
|
|
|
|
|
netdev_rxq_open(port->netdev, &port->rxq[i], i);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
dp->n_dpdk_rxqs = n_rxqs;
|
|
|
|
|
|
|
|
|
|
/* Reconfigures the cpu mask. */
|
|
|
|
|
ovs_numa_set_cpu_mask(cmask);
|
|
|
|
|
free(dp->pmd_cmask);
|
|
|
|
|
dp->pmd_cmask = cmask ? xstrdup(cmask) : NULL;
|
|
|
|
|
|
|
|
|
|
/* Restores the non-pmd. */
|
|
|
|
|
dp_netdev_set_nonpmd(dp);
|
|
|
|
|
/* Restores all pmd threads. */
|
|
|
|
|
dp_netdev_reset_pmd_threads(dp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-21 13:36:17 -08:00
|
|
|
|
static int
|
|
|
|
|
dpif_netdev_queue_to_priority(const struct dpif *dpif OVS_UNUSED,
|
|
|
|
|
uint32_t queue_id, uint32_t *priority)
|
|
|
|
|
{
|
|
|
|
|
*priority = queue_id;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
|
2014-01-08 14:37:13 -08:00
|
|
|
|
/* Creates and returns a new 'struct dp_netdev_actions', with a reference count
|
|
|
|
|
* of 1, whose actions are a copy of from the 'ofpacts_len' bytes of
|
|
|
|
|
* 'ofpacts'. */
|
|
|
|
|
struct dp_netdev_actions *
|
|
|
|
|
dp_netdev_actions_create(const struct nlattr *actions, size_t size)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_actions *netdev_actions;
|
|
|
|
|
|
|
|
|
|
netdev_actions = xmalloc(sizeof *netdev_actions);
|
|
|
|
|
netdev_actions->actions = xmemdup(actions, size);
|
|
|
|
|
netdev_actions->size = size;
|
|
|
|
|
|
|
|
|
|
return netdev_actions;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct dp_netdev_actions *
|
2014-03-05 22:41:30 -08:00
|
|
|
|
dp_netdev_flow_get_actions(const struct dp_netdev_flow *flow)
|
2014-01-08 14:37:13 -08:00
|
|
|
|
{
|
2014-03-05 22:41:30 -08:00
|
|
|
|
return ovsrcu_get(struct dp_netdev_actions *, &flow->actions);
|
2014-01-08 14:37:13 -08:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-05 22:41:30 -08:00
|
|
|
|
static void
|
|
|
|
|
dp_netdev_actions_free(struct dp_netdev_actions *actions)
|
2014-01-08 14:37:13 -08:00
|
|
|
|
{
|
2014-03-05 22:41:30 -08:00
|
|
|
|
free(actions->actions);
|
|
|
|
|
free(actions);
|
2014-01-08 14:37:13 -08:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
2014-03-28 12:20:00 -07:00
|
|
|
|
static void
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_process_rxq_port(struct dp_netdev_pmd_thread *pmd,
|
2014-08-29 16:06:43 -07:00
|
|
|
|
struct dp_netdev_port *port,
|
|
|
|
|
struct netdev_rxq *rxq)
|
2014-03-20 10:57:41 -07:00
|
|
|
|
{
|
2014-06-23 11:43:59 -07:00
|
|
|
|
struct dpif_packet *packets[NETDEV_MAX_RX_BATCH];
|
|
|
|
|
int error, cnt;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
2014-06-23 11:43:59 -07:00
|
|
|
|
error = netdev_rxq_recv(rxq, packets, &cnt);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
if (!error) {
|
2014-10-03 20:23:58 -07:00
|
|
|
|
int i;
|
2014-09-08 15:33:00 -07:00
|
|
|
|
|
|
|
|
|
*recirc_depth_get() = 0;
|
2014-10-03 20:23:58 -07:00
|
|
|
|
|
|
|
|
|
/* XXX: initialize md in netdev implementation. */
|
|
|
|
|
for (i = 0; i < cnt; i++) {
|
|
|
|
|
packets[i]->md = PKT_METADATA_INITIALIZER(port->port_no);
|
|
|
|
|
}
|
|
|
|
|
dp_netdev_input(pmd, packets, cnt);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
} else if (error != EAGAIN && error != EOPNOTSUPP) {
|
2014-09-08 15:33:00 -07:00
|
|
|
|
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
|
|
|
|
VLOG_ERR_RL(&rl, "error receiving data from %s: %s",
|
2014-09-08 15:33:00 -07:00
|
|
|
|
netdev_get_name(port->netdev), ovs_strerror(error));
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-11 11:53:47 -08:00
|
|
|
|
/* Return true if needs to revalidate datapath flows. */
|
|
|
|
|
static bool
|
2014-03-20 10:57:41 -07:00
|
|
|
|
dpif_netdev_run(struct dpif *dpif)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2014-09-05 14:14:20 -07:00
|
|
|
|
struct dp_netdev_pmd_thread *non_pmd = dp_netdev_get_nonpmd(dp);
|
2014-11-11 11:53:47 -08:00
|
|
|
|
uint64_t new_tnl_seq;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
ovs_mutex_lock(&dp->non_pmd_mutex);
|
2014-06-11 11:07:43 -07:00
|
|
|
|
CMAP_FOR_EACH (port, node, &dp->ports) {
|
2014-03-20 20:52:06 -07:00
|
|
|
|
if (!netdev_is_pmd(port->netdev)) {
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < netdev_n_rxq(port->netdev); i++) {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_process_rxq_port(non_pmd, port, port->rxq[i]);
|
2014-03-20 20:52:06 -07:00
|
|
|
|
}
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
2014-09-05 14:14:20 -07:00
|
|
|
|
ovs_mutex_unlock(&dp->non_pmd_mutex);
|
2014-11-11 11:53:47 -08:00
|
|
|
|
tnl_arp_cache_run();
|
|
|
|
|
new_tnl_seq = seq_read(tnl_conf_seq);
|
|
|
|
|
|
|
|
|
|
if (dp->last_tnl_conf_seq != new_tnl_seq) {
|
|
|
|
|
dp->last_tnl_conf_seq = new_tnl_seq;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dpif_netdev_wait(struct dpif *dpif)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_lock(&dp_netdev_mutex);
|
2014-06-11 11:07:43 -07:00
|
|
|
|
CMAP_FOR_EACH (port, node, &dp->ports) {
|
2014-03-20 20:52:06 -07:00
|
|
|
|
if (!netdev_is_pmd(port->netdev)) {
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < netdev_n_rxq(port->netdev); i++) {
|
|
|
|
|
netdev_rxq_wait(port->rxq[i]);
|
|
|
|
|
}
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_unlock(&dp_netdev_mutex);
|
2014-11-11 11:53:47 -08:00
|
|
|
|
seq_wait(tnl_conf_seq, dp->last_tnl_conf_seq);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-20 19:38:14 -07:00
|
|
|
|
struct rxq_poll {
|
2014-03-20 10:57:41 -07:00
|
|
|
|
struct dp_netdev_port *port;
|
2014-03-20 20:52:06 -07:00
|
|
|
|
struct netdev_rxq *rx;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int
|
2014-09-05 14:14:20 -07:00
|
|
|
|
pmd_load_queues(struct dp_netdev_pmd_thread *pmd,
|
2014-03-20 19:38:14 -07:00
|
|
|
|
struct rxq_poll **ppoll_list, int poll_cnt)
|
2014-03-20 10:57:41 -07:00
|
|
|
|
{
|
2014-03-20 19:38:14 -07:00
|
|
|
|
struct rxq_poll *poll_list = *ppoll_list;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
struct dp_netdev_port *port;
|
2014-09-05 14:14:20 -07:00
|
|
|
|
int n_pmds_on_numa, index, i;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
|
|
|
|
/* Simple scheduler for netdev rx polling. */
|
|
|
|
|
for (i = 0; i < poll_cnt; i++) {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
port_unref(poll_list[i].port);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
poll_cnt = 0;
|
2014-09-05 14:14:20 -07:00
|
|
|
|
n_pmds_on_numa = get_n_pmd_threads_on_numa(pmd->dp, pmd->numa_id);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
index = 0;
|
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
CMAP_FOR_EACH (port, node, &pmd->dp->ports) {
|
2014-08-21 15:54:07 -07:00
|
|
|
|
/* Calls port_try_ref() to prevent the main thread
|
|
|
|
|
* from deleting the port. */
|
|
|
|
|
if (port_try_ref(port)) {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
if (netdev_is_pmd(port->netdev)
|
|
|
|
|
&& netdev_get_numa_id(port->netdev) == pmd->numa_id) {
|
2014-08-21 15:54:07 -07:00
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < netdev_n_rxq(port->netdev); i++) {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
if ((index % n_pmds_on_numa) == pmd->index) {
|
2014-08-21 15:54:07 -07:00
|
|
|
|
poll_list = xrealloc(poll_list,
|
|
|
|
|
sizeof *poll_list * (poll_cnt + 1));
|
|
|
|
|
|
|
|
|
|
port_ref(port);
|
|
|
|
|
poll_list[poll_cnt].port = port;
|
|
|
|
|
poll_list[poll_cnt].rx = port->rxq[i];
|
|
|
|
|
poll_cnt++;
|
|
|
|
|
}
|
|
|
|
|
index++;
|
2014-03-20 20:52:06 -07:00
|
|
|
|
}
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
2014-08-21 15:54:07 -07:00
|
|
|
|
/* Unrefs the port_try_ref(). */
|
|
|
|
|
port_unref(port);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*ppoll_list = poll_list;
|
|
|
|
|
return poll_cnt;
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-27 17:00:30 -08:00
|
|
|
|
static void *
|
2014-03-20 10:57:41 -07:00
|
|
|
|
pmd_thread_main(void *f_)
|
2013-12-27 17:00:30 -08:00
|
|
|
|
{
|
2014-09-05 14:14:20 -07:00
|
|
|
|
struct dp_netdev_pmd_thread *pmd = f_;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
unsigned int lc = 0;
|
2014-03-20 19:38:14 -07:00
|
|
|
|
struct rxq_poll *poll_list;
|
2014-08-15 15:09:38 -07:00
|
|
|
|
unsigned int port_seq = PMD_INITIAL_SEQ;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
int poll_cnt;
|
|
|
|
|
int i;
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-03-20 10:57:41 -07:00
|
|
|
|
poll_cnt = 0;
|
|
|
|
|
poll_list = NULL;
|
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
/* Stores the pmd thread's 'pmd' to 'per_pmd_key'. */
|
|
|
|
|
ovsthread_setspecific(pmd->dp->per_pmd_key, pmd);
|
|
|
|
|
pmd_thread_setaffinity_cpu(pmd->core_id);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
reload:
|
2014-09-05 14:14:20 -07:00
|
|
|
|
emc_cache_init(&pmd->flow_cache);
|
|
|
|
|
poll_cnt = pmd_load_queues(pmd, &poll_list, poll_cnt);
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-03-20 10:57:41 -07:00
|
|
|
|
for (;;) {
|
2013-12-27 17:00:30 -08:00
|
|
|
|
int i;
|
|
|
|
|
|
2014-03-20 10:57:41 -07:00
|
|
|
|
for (i = 0; i < poll_cnt; i++) {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_process_rxq_port(pmd, poll_list[i].port, poll_list[i].rx);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (lc++ > 1024) {
|
2014-08-15 15:09:38 -07:00
|
|
|
|
unsigned int seq;
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-03-20 10:57:41 -07:00
|
|
|
|
lc = 0;
|
2014-08-15 15:09:38 -07:00
|
|
|
|
|
|
|
|
|
ovsrcu_quiesce();
|
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
atomic_read_relaxed(&pmd->change_seq, &seq);
|
2014-08-15 15:09:38 -07:00
|
|
|
|
if (seq != port_seq) {
|
|
|
|
|
port_seq = seq;
|
2013-12-27 17:00:30 -08:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-03-20 10:57:41 -07:00
|
|
|
|
}
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
emc_cache_uninit(&pmd->flow_cache);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
if (!latch_is_set(&pmd->exit_latch)){
|
2014-03-20 10:57:41 -07:00
|
|
|
|
goto reload;
|
|
|
|
|
}
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-03-20 10:57:41 -07:00
|
|
|
|
for (i = 0; i < poll_cnt; i++) {
|
|
|
|
|
port_unref(poll_list[i].port);
|
2013-12-27 17:00:30 -08:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-20 10:57:41 -07:00
|
|
|
|
free(poll_list);
|
2013-12-27 17:00:30 -08:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-26 06:51:55 +00:00
|
|
|
|
static void
|
|
|
|
|
dp_netdev_disable_upcall(struct dp_netdev *dp)
|
|
|
|
|
OVS_ACQUIRES(dp->upcall_rwlock)
|
|
|
|
|
{
|
|
|
|
|
fat_rwlock_wrlock(&dp->upcall_rwlock);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dpif_netdev_disable_upcall(struct dpif *dpif)
|
|
|
|
|
OVS_NO_THREAD_SAFETY_ANALYSIS
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
|
|
|
|
dp_netdev_disable_upcall(dp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dp_netdev_enable_upcall(struct dp_netdev *dp)
|
|
|
|
|
OVS_RELEASES(dp->upcall_rwlock)
|
|
|
|
|
{
|
|
|
|
|
fat_rwlock_unlock(&dp->upcall_rwlock);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dpif_netdev_enable_upcall(struct dpif *dpif)
|
|
|
|
|
OVS_NO_THREAD_SAFETY_ANALYSIS
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
|
|
|
|
dp_netdev_enable_upcall(dp);
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
/* Returns the pointer to the dp_netdev_pmd_thread for non-pmd threads. */
|
|
|
|
|
static struct dp_netdev_pmd_thread *
|
|
|
|
|
dp_netdev_get_nonpmd(struct dp_netdev *dp)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_pmd_thread *pmd;
|
2014-09-24 10:39:20 -07:00
|
|
|
|
const struct cmap_node *pnode;
|
2014-09-05 14:14:20 -07:00
|
|
|
|
|
|
|
|
|
pnode = cmap_find(&dp->poll_threads, hash_int(NON_PMD_CORE_ID, 0));
|
|
|
|
|
ovs_assert(pnode);
|
|
|
|
|
pmd = CONTAINER_OF(pnode, struct dp_netdev_pmd_thread, node);
|
|
|
|
|
|
|
|
|
|
return pmd;
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-08 15:22:26 -07:00
|
|
|
|
/* Sets the 'struct dp_netdev_pmd_thread' for non-pmd threads. */
|
|
|
|
|
static void
|
|
|
|
|
dp_netdev_set_nonpmd(struct dp_netdev *dp)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_pmd_thread *non_pmd;
|
|
|
|
|
|
|
|
|
|
non_pmd = xzalloc(sizeof *non_pmd);
|
|
|
|
|
dp_netdev_configure_pmd(non_pmd, dp, 0, NON_PMD_CORE_ID,
|
|
|
|
|
OVS_NUMA_UNSPEC);
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
/* Configures the 'pmd' based on the input argument. */
|
2013-12-27 17:00:30 -08:00
|
|
|
|
static void
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_configure_pmd(struct dp_netdev_pmd_thread *pmd, struct dp_netdev *dp,
|
|
|
|
|
int index, int core_id, int numa_id)
|
|
|
|
|
{
|
|
|
|
|
pmd->dp = dp;
|
|
|
|
|
pmd->index = index;
|
|
|
|
|
pmd->core_id = core_id;
|
|
|
|
|
pmd->numa_id = numa_id;
|
|
|
|
|
latch_init(&pmd->exit_latch);
|
|
|
|
|
atomic_init(&pmd->change_seq, PMD_INITIAL_SEQ);
|
|
|
|
|
/* init the 'flow_cache' since there is no
|
|
|
|
|
* actual thread created for NON_PMD_CORE_ID. */
|
|
|
|
|
if (core_id == NON_PMD_CORE_ID) {
|
|
|
|
|
emc_cache_init(&pmd->flow_cache);
|
|
|
|
|
}
|
|
|
|
|
cmap_insert(&dp->poll_threads, CONST_CAST(struct cmap_node *, &pmd->node),
|
|
|
|
|
hash_int(core_id, 0));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Stops the pmd thread, removes it from the 'dp->poll_threads'
|
|
|
|
|
* and destroys the struct. */
|
|
|
|
|
static void
|
|
|
|
|
dp_netdev_del_pmd(struct dp_netdev_pmd_thread *pmd)
|
2013-12-27 17:00:30 -08:00
|
|
|
|
{
|
2014-09-05 14:14:20 -07:00
|
|
|
|
/* Uninit the 'flow_cache' since there is
|
|
|
|
|
* no actual thread uninit it. */
|
|
|
|
|
if (pmd->core_id == NON_PMD_CORE_ID) {
|
|
|
|
|
emc_cache_uninit(&pmd->flow_cache);
|
|
|
|
|
} else {
|
|
|
|
|
latch_set(&pmd->exit_latch);
|
|
|
|
|
dp_netdev_reload_pmd__(pmd);
|
|
|
|
|
ovs_numa_unpin_core(pmd->core_id);
|
|
|
|
|
xpthread_join(pmd->thread, NULL);
|
|
|
|
|
}
|
|
|
|
|
cmap_remove(&pmd->dp->poll_threads, &pmd->node, hash_int(pmd->core_id, 0));
|
|
|
|
|
latch_destroy(&pmd->exit_latch);
|
|
|
|
|
free(pmd);
|
|
|
|
|
}
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
/* Destroys all pmd threads. */
|
|
|
|
|
static void
|
|
|
|
|
dp_netdev_destroy_all_pmds(struct dp_netdev *dp)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_pmd_thread *pmd;
|
|
|
|
|
|
|
|
|
|
CMAP_FOR_EACH (pmd, node, &dp->poll_threads) {
|
|
|
|
|
dp_netdev_del_pmd(pmd);
|
2013-12-27 17:00:30 -08:00
|
|
|
|
}
|
2014-09-05 14:14:20 -07:00
|
|
|
|
}
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
/* Deletes all pmd threads on numa node 'numa_id'. */
|
|
|
|
|
static void
|
|
|
|
|
dp_netdev_del_pmds_on_numa(struct dp_netdev *dp, int numa_id)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_pmd_thread *pmd;
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
CMAP_FOR_EACH (pmd, node, &dp->poll_threads) {
|
|
|
|
|
if (pmd->numa_id == numa_id) {
|
|
|
|
|
dp_netdev_del_pmd(pmd);
|
|
|
|
|
}
|
2013-12-27 17:00:30 -08:00
|
|
|
|
}
|
2014-09-05 14:14:20 -07:00
|
|
|
|
}
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
/* Checks the numa node id of 'netdev' and starts pmd threads for
|
|
|
|
|
* the numa node. */
|
|
|
|
|
static void
|
|
|
|
|
dp_netdev_set_pmds_on_numa(struct dp_netdev *dp, int numa_id)
|
|
|
|
|
{
|
|
|
|
|
int n_pmds;
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
if (!ovs_numa_numa_id_is_valid(numa_id)) {
|
|
|
|
|
VLOG_ERR("Cannot create pmd threads due to numa id (%d)"
|
|
|
|
|
"invalid", numa_id);
|
|
|
|
|
return ;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
n_pmds = get_n_pmd_threads_on_numa(dp, numa_id);
|
|
|
|
|
|
|
|
|
|
/* If there are already pmd threads created for the numa node
|
|
|
|
|
* in which 'netdev' is on, do nothing. Else, creates the
|
|
|
|
|
* pmd threads for the numa node. */
|
|
|
|
|
if (!n_pmds) {
|
|
|
|
|
int can_have, n_unpinned, i;
|
|
|
|
|
|
|
|
|
|
n_unpinned = ovs_numa_get_n_unpinned_cores_on_numa(numa_id);
|
|
|
|
|
if (!n_unpinned) {
|
|
|
|
|
VLOG_ERR("Cannot create pmd threads due to out of unpinned "
|
|
|
|
|
"cores on numa node");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-09-08 15:22:26 -07:00
|
|
|
|
/* If cpu mask is specified, uses all unpinned cores, otherwise
|
|
|
|
|
* tries creating NR_PMD_THREADS pmd threads. */
|
|
|
|
|
can_have = dp->pmd_cmask ? n_unpinned : MIN(n_unpinned, NR_PMD_THREADS);
|
2014-09-05 14:14:20 -07:00
|
|
|
|
for (i = 0; i < can_have; i++) {
|
|
|
|
|
struct dp_netdev_pmd_thread *pmd = xzalloc(sizeof *pmd);
|
|
|
|
|
int core_id = ovs_numa_get_unpinned_core_on_numa(numa_id);
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_configure_pmd(pmd, dp, i, core_id, numa_id);
|
|
|
|
|
/* Each thread will distribute all devices rx-queues among
|
|
|
|
|
* themselves. */
|
|
|
|
|
pmd->thread = ovs_thread_create("pmd", pmd_thread_main, pmd);
|
|
|
|
|
}
|
|
|
|
|
VLOG_INFO("Created %d pmd threads on numa node %d", can_have, numa_id);
|
2013-12-27 17:00:30 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
2014-03-20 10:57:41 -07:00
|
|
|
|
|
2013-12-27 17:00:30 -08:00
|
|
|
|
|
2014-01-22 16:03:10 -08:00
|
|
|
|
static void *
|
|
|
|
|
dp_netdev_flow_stats_new_cb(void)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_flow_stats *bucket = xzalloc_cacheline(sizeof *bucket);
|
|
|
|
|
ovs_mutex_init(&bucket->mutex);
|
|
|
|
|
return bucket;
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-08 15:22:26 -07:00
|
|
|
|
/* Called after pmd threads config change. Restarts pmd threads with
|
|
|
|
|
* new configuration. */
|
|
|
|
|
static void
|
|
|
|
|
dp_netdev_reset_pmd_threads(struct dp_netdev *dp)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
|
|
|
|
|
CMAP_FOR_EACH (port, node, &dp->ports) {
|
|
|
|
|
if (netdev_is_pmd(port->netdev)) {
|
|
|
|
|
int numa_id = netdev_get_numa_id(port->netdev);
|
|
|
|
|
|
|
|
|
|
dp_netdev_set_pmds_on_numa(dp, numa_id);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-16 15:23:11 -07:00
|
|
|
|
static char *
|
|
|
|
|
dpif_netdev_get_datapath_version(void)
|
|
|
|
|
{
|
|
|
|
|
return xstrdup("<built-in>");
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-19 14:09:39 -07:00
|
|
|
|
static void
|
2013-10-29 02:34:15 -07:00
|
|
|
|
dp_netdev_flow_used(struct dp_netdev_flow *netdev_flow,
|
2014-06-23 11:43:59 -07:00
|
|
|
|
int cnt, int size,
|
|
|
|
|
uint16_t tcp_flags)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2014-01-22 16:03:10 -08:00
|
|
|
|
long long int now = time_msec();
|
|
|
|
|
struct dp_netdev_flow_stats *bucket;
|
|
|
|
|
|
|
|
|
|
bucket = ovsthread_stats_bucket_get(&netdev_flow->stats,
|
|
|
|
|
dp_netdev_flow_stats_new_cb);
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&bucket->mutex);
|
|
|
|
|
bucket->used = MAX(now, bucket->used);
|
2014-06-23 11:43:59 -07:00
|
|
|
|
bucket->packet_count += cnt;
|
|
|
|
|
bucket->byte_count += size;
|
2014-01-22 16:03:10 -08:00
|
|
|
|
bucket->tcp_flags |= tcp_flags;
|
|
|
|
|
ovs_mutex_unlock(&bucket->mutex);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-19 07:47:12 -07:00
|
|
|
|
static void *
|
|
|
|
|
dp_netdev_stats_new_cb(void)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_stats *bucket = xzalloc_cacheline(sizeof *bucket);
|
|
|
|
|
ovs_mutex_init(&bucket->mutex);
|
|
|
|
|
return bucket;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2014-06-23 11:43:59 -07:00
|
|
|
|
dp_netdev_count_packet(struct dp_netdev *dp, enum dp_stat_type type, int cnt)
|
2014-03-19 07:47:12 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_stats *bucket;
|
|
|
|
|
|
|
|
|
|
bucket = ovsthread_stats_bucket_get(&dp->stats, dp_netdev_stats_new_cb);
|
|
|
|
|
ovs_mutex_lock(&bucket->mutex);
|
2014-06-23 11:43:59 -07:00
|
|
|
|
bucket->n[type] += cnt;
|
2014-03-19 07:47:12 -07:00
|
|
|
|
ovs_mutex_unlock(&bucket->mutex);
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
static int
|
|
|
|
|
dp_netdev_upcall(struct dp_netdev *dp, struct dpif_packet *packet_,
|
|
|
|
|
struct flow *flow, struct flow_wildcards *wc,
|
|
|
|
|
enum dpif_upcall_type type, const struct nlattr *userdata,
|
|
|
|
|
struct ofpbuf *actions, struct ofpbuf *put_actions)
|
|
|
|
|
{
|
|
|
|
|
struct ofpbuf *packet = &packet_->ofpbuf;
|
|
|
|
|
|
|
|
|
|
if (type == DPIF_UC_MISS) {
|
|
|
|
|
dp_netdev_count_packet(dp, DP_STAT_MISS, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (OVS_UNLIKELY(!dp->upcall_cb)) {
|
|
|
|
|
return ENODEV;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (OVS_UNLIKELY(!VLOG_DROP_DBG(&upcall_rl))) {
|
|
|
|
|
struct ds ds = DS_EMPTY_INITIALIZER;
|
|
|
|
|
struct ofpbuf key;
|
|
|
|
|
char *packet_str;
|
|
|
|
|
|
|
|
|
|
ofpbuf_init(&key, 0);
|
|
|
|
|
odp_flow_key_from_flow(&key, flow, &wc->masks, flow->in_port.odp_port,
|
|
|
|
|
true);
|
|
|
|
|
|
|
|
|
|
packet_str = ofp_packet_to_string(ofpbuf_data(packet),
|
|
|
|
|
ofpbuf_size(packet));
|
|
|
|
|
|
|
|
|
|
odp_flow_key_format(ofpbuf_data(&key), ofpbuf_size(&key), &ds);
|
|
|
|
|
|
|
|
|
|
VLOG_DBG("%s: %s upcall:\n%s\n%s", dp->name,
|
|
|
|
|
dpif_upcall_type_to_string(type), ds_cstr(&ds), packet_str);
|
|
|
|
|
|
|
|
|
|
ofpbuf_uninit(&key);
|
|
|
|
|
free(packet_str);
|
|
|
|
|
ds_destroy(&ds);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dp->upcall_cb(packet, flow, type, userdata, actions, wc,
|
|
|
|
|
put_actions, dp->upcall_aux);
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-29 16:06:43 -07:00
|
|
|
|
static inline uint32_t
|
|
|
|
|
dpif_netdev_packet_get_dp_hash(struct dpif_packet *packet,
|
|
|
|
|
const struct miniflow *mf)
|
|
|
|
|
{
|
|
|
|
|
uint32_t hash;
|
|
|
|
|
|
|
|
|
|
hash = dpif_packet_get_dp_hash(packet);
|
|
|
|
|
if (OVS_UNLIKELY(!hash)) {
|
|
|
|
|
hash = miniflow_hash_5tuple(mf, 0);
|
|
|
|
|
dpif_packet_set_dp_hash(packet, hash);
|
|
|
|
|
}
|
|
|
|
|
return hash;
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-23 18:22:03 -07:00
|
|
|
|
struct packet_batch {
|
2014-06-23 11:43:59 -07:00
|
|
|
|
unsigned int packet_count;
|
|
|
|
|
unsigned int byte_count;
|
|
|
|
|
uint16_t tcp_flags;
|
|
|
|
|
|
|
|
|
|
struct dp_netdev_flow *flow;
|
|
|
|
|
|
|
|
|
|
struct dpif_packet *packets[NETDEV_MAX_RX_BATCH];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static inline void
|
2014-08-29 16:06:43 -07:00
|
|
|
|
packet_batch_update(struct packet_batch *batch, struct dpif_packet *packet,
|
|
|
|
|
const struct miniflow *mf)
|
2014-06-23 11:43:59 -07:00
|
|
|
|
{
|
|
|
|
|
batch->tcp_flags |= miniflow_get_tcp_flags(mf);
|
|
|
|
|
batch->packets[batch->packet_count++] = packet;
|
|
|
|
|
batch->byte_count += ofpbuf_size(&packet->ofpbuf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
2014-10-03 20:23:58 -07:00
|
|
|
|
packet_batch_init(struct packet_batch *batch, struct dp_netdev_flow *flow)
|
2014-06-23 11:43:59 -07:00
|
|
|
|
{
|
|
|
|
|
batch->flow = flow;
|
|
|
|
|
|
|
|
|
|
batch->packet_count = 0;
|
|
|
|
|
batch->byte_count = 0;
|
|
|
|
|
batch->tcp_flags = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
2014-09-05 14:14:20 -07:00
|
|
|
|
packet_batch_execute(struct packet_batch *batch,
|
|
|
|
|
struct dp_netdev_pmd_thread *pmd)
|
2014-06-23 11:43:59 -07:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_actions *actions;
|
|
|
|
|
struct dp_netdev_flow *flow = batch->flow;
|
|
|
|
|
|
|
|
|
|
dp_netdev_flow_used(batch->flow, batch->packet_count, batch->byte_count,
|
|
|
|
|
batch->tcp_flags);
|
|
|
|
|
|
|
|
|
|
actions = dp_netdev_flow_get_actions(flow);
|
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_execute_actions(pmd, batch->packets, batch->packet_count, true,
|
2014-10-03 20:23:58 -07:00
|
|
|
|
actions->actions, actions->size);
|
2014-06-23 11:43:59 -07:00
|
|
|
|
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_count_packet(pmd->dp, DP_STAT_HIT, batch->packet_count);
|
2014-06-23 11:43:59 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-29 16:06:43 -07:00
|
|
|
|
static inline bool
|
2014-10-03 20:23:58 -07:00
|
|
|
|
dp_netdev_queue_batches(struct dpif_packet *pkt,
|
2014-08-29 16:06:43 -07:00
|
|
|
|
struct dp_netdev_flow *flow, const struct miniflow *mf,
|
|
|
|
|
struct packet_batch *batches, size_t *n_batches,
|
|
|
|
|
size_t max_batches)
|
|
|
|
|
{
|
|
|
|
|
struct packet_batch *batch = NULL;
|
|
|
|
|
int j;
|
|
|
|
|
|
|
|
|
|
if (OVS_UNLIKELY(!flow)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
/* XXX: This O(n^2) algortihm makes sense if we're operating under the
|
|
|
|
|
* assumption that the number of distinct flows (and therefore the
|
|
|
|
|
* number of distinct batches) is quite small. If this turns out not
|
|
|
|
|
* to be the case, it may make sense to pre sort based on the
|
|
|
|
|
* netdev_flow pointer. That done we can get the appropriate batching
|
|
|
|
|
* in O(n * log(n)) instead. */
|
|
|
|
|
for (j = *n_batches - 1; j >= 0; j--) {
|
|
|
|
|
if (batches[j].flow == flow) {
|
|
|
|
|
batch = &batches[j];
|
|
|
|
|
packet_batch_update(batch, pkt, mf);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (OVS_UNLIKELY(*n_batches >= max_batches)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
batch = &batches[(*n_batches)++];
|
2014-10-03 20:23:58 -07:00
|
|
|
|
packet_batch_init(batch, flow);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
packet_batch_update(batch, pkt, mf);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
dpif_packet_swap(struct dpif_packet **a, struct dpif_packet **b)
|
|
|
|
|
{
|
|
|
|
|
struct dpif_packet *tmp = *a;
|
|
|
|
|
*a = *b;
|
|
|
|
|
*b = tmp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Try to process all ('cnt') the 'packets' using only the exact match cache
|
|
|
|
|
* 'flow_cache'. If a flow is not found for a packet 'packets[i]', or if there
|
|
|
|
|
* is no matching batch for a packet's flow, the miniflow is copied into 'keys'
|
|
|
|
|
* and the packet pointer is moved at the beginning of the 'packets' array.
|
|
|
|
|
*
|
|
|
|
|
* The function returns the number of packets that needs to be processed in the
|
|
|
|
|
* 'packets' array (they have been moved to the beginning of the vector).
|
|
|
|
|
*/
|
|
|
|
|
static inline size_t
|
2014-09-05 14:14:20 -07:00
|
|
|
|
emc_processing(struct dp_netdev_pmd_thread *pmd, struct dpif_packet **packets,
|
2014-10-03 20:23:58 -07:00
|
|
|
|
size_t cnt, struct netdev_flow_key *keys)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2014-08-29 16:06:43 -07:00
|
|
|
|
struct netdev_flow_key key;
|
|
|
|
|
struct packet_batch batches[4];
|
2014-09-05 14:14:20 -07:00
|
|
|
|
struct emc_cache *flow_cache = &pmd->flow_cache;
|
2014-06-23 18:28:43 -07:00
|
|
|
|
size_t n_batches, i;
|
2014-08-29 16:06:43 -07:00
|
|
|
|
size_t notfound_cnt = 0;
|
2014-06-23 11:43:59 -07:00
|
|
|
|
|
2014-08-29 16:06:43 -07:00
|
|
|
|
n_batches = 0;
|
2014-10-17 09:37:11 -07:00
|
|
|
|
miniflow_initialize(&key.mf, key.buf);
|
2014-06-23 18:28:43 -07:00
|
|
|
|
for (i = 0; i < cnt; i++) {
|
2014-08-29 16:06:43 -07:00
|
|
|
|
struct dp_netdev_flow *flow;
|
|
|
|
|
|
2014-06-23 18:28:43 -07:00
|
|
|
|
if (OVS_UNLIKELY(ofpbuf_size(&packets[i]->ofpbuf) < ETH_HEADER_LEN)) {
|
|
|
|
|
dpif_packet_delete(packets[i]);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2014-06-23 11:43:59 -07:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
miniflow_extract(&packets[i]->ofpbuf, &packets[i]->md, &key.mf);
|
|
|
|
|
key.len = 0; /* Not computed yet. */
|
|
|
|
|
key.hash = dpif_netdev_packet_get_dp_hash(packets[i], &key.mf);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
flow = emc_lookup(flow_cache, &key);
|
|
|
|
|
if (OVS_UNLIKELY(!dp_netdev_queue_batches(packets[i], flow, &key.mf,
|
2014-08-29 16:06:43 -07:00
|
|
|
|
batches, &n_batches,
|
|
|
|
|
ARRAY_SIZE(batches)))) {
|
|
|
|
|
if (i != notfound_cnt) {
|
|
|
|
|
dpif_packet_swap(&packets[i], &packets[notfound_cnt]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
keys[notfound_cnt++] = key;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < n_batches; i++) {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
packet_batch_execute(&batches[i], pmd);
|
2014-06-23 18:28:43 -07:00
|
|
|
|
}
|
2014-04-18 08:26:57 -07:00
|
|
|
|
|
2014-08-29 16:06:43 -07:00
|
|
|
|
return notfound_cnt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
2014-09-05 14:14:20 -07:00
|
|
|
|
fast_path_processing(struct dp_netdev_pmd_thread *pmd,
|
2014-08-29 16:06:43 -07:00
|
|
|
|
struct dpif_packet **packets, size_t cnt,
|
2014-10-03 20:23:58 -07:00
|
|
|
|
struct netdev_flow_key *keys)
|
2014-08-29 16:06:43 -07:00
|
|
|
|
{
|
2014-09-01 20:11:54 +00:00
|
|
|
|
#if !defined(__CHECKER__) && !defined(_WIN32)
|
2014-08-29 16:06:43 -07:00
|
|
|
|
const size_t PKT_ARRAY_SIZE = cnt;
|
|
|
|
|
#else
|
2014-09-01 20:11:54 +00:00
|
|
|
|
/* Sparse or MSVC doesn't like variable length array. */
|
2014-08-29 16:06:43 -07:00
|
|
|
|
enum { PKT_ARRAY_SIZE = NETDEV_MAX_RX_BATCH };
|
|
|
|
|
#endif
|
|
|
|
|
struct packet_batch batches[PKT_ARRAY_SIZE];
|
2014-10-17 09:37:11 -07:00
|
|
|
|
struct dpcls_rule *rules[PKT_ARRAY_SIZE];
|
2014-09-05 14:14:20 -07:00
|
|
|
|
struct dp_netdev *dp = pmd->dp;
|
|
|
|
|
struct emc_cache *flow_cache = &pmd->flow_cache;
|
2014-08-29 16:06:43 -07:00
|
|
|
|
size_t n_batches, i;
|
|
|
|
|
bool any_miss;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < cnt; i++) {
|
2014-10-17 09:37:11 -07:00
|
|
|
|
/* Key length is needed in all the cases, hash computed on demand. */
|
|
|
|
|
keys[i].len = netdev_flow_key_size(count_1bits(keys[i].mf.map));
|
2014-08-29 16:06:43 -07:00
|
|
|
|
}
|
2014-10-17 09:37:11 -07:00
|
|
|
|
any_miss = !dpcls_lookup(&dp->cls, keys, rules, cnt);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
if (OVS_UNLIKELY(any_miss) && !fat_rwlock_tryrdlock(&dp->upcall_rwlock)) {
|
|
|
|
|
uint64_t actions_stub[512 / 8], slow_stub[512 / 8];
|
|
|
|
|
struct ofpbuf actions, put_actions;
|
|
|
|
|
|
|
|
|
|
ofpbuf_use_stub(&actions, actions_stub, sizeof actions_stub);
|
|
|
|
|
ofpbuf_use_stub(&put_actions, slow_stub, sizeof slow_stub);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < cnt; i++) {
|
2014-10-17 09:37:11 -07:00
|
|
|
|
struct dp_netdev_flow *netdev_flow;
|
2014-07-26 15:39:58 -07:00
|
|
|
|
struct ofpbuf *add_actions;
|
2014-10-17 09:37:11 -07:00
|
|
|
|
struct match match;
|
2014-07-26 15:39:58 -07:00
|
|
|
|
int error;
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
if (OVS_LIKELY(rules[i])) {
|
2014-07-26 15:39:58 -07:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* It's possible that an earlier slow path execution installed
|
2014-10-17 09:37:11 -07:00
|
|
|
|
* a rule covering this flow. In this case, it's a lot cheaper
|
2014-07-26 15:39:58 -07:00
|
|
|
|
* to catch it here than execute a miss. */
|
2014-10-17 09:37:11 -07:00
|
|
|
|
netdev_flow = dp_netdev_lookup_flow(dp, &keys[i]);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
if (netdev_flow) {
|
2014-10-17 09:37:11 -07:00
|
|
|
|
rules[i] = &netdev_flow->cr;
|
2014-07-26 15:39:58 -07:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
miniflow_expand(&keys[i].mf, &match.flow);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
|
|
|
|
|
ofpbuf_clear(&actions);
|
|
|
|
|
ofpbuf_clear(&put_actions);
|
|
|
|
|
|
|
|
|
|
error = dp_netdev_upcall(dp, packets[i], &match.flow, &match.wc,
|
2014-10-17 09:37:11 -07:00
|
|
|
|
DPIF_UC_MISS, NULL, &actions,
|
|
|
|
|
&put_actions);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
if (OVS_UNLIKELY(error && error != ENOSPC)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We can't allow the packet batching in the next loop to execute
|
|
|
|
|
* the actions. Otherwise, if there are any slow path actions,
|
|
|
|
|
* we'll send the packet up twice. */
|
2014-10-03 20:23:58 -07:00
|
|
|
|
dp_netdev_execute_actions(pmd, &packets[i], 1, true,
|
2014-09-05 14:14:20 -07:00
|
|
|
|
ofpbuf_data(&actions),
|
2014-07-26 15:39:58 -07:00
|
|
|
|
ofpbuf_size(&actions));
|
|
|
|
|
|
|
|
|
|
add_actions = ofpbuf_size(&put_actions)
|
|
|
|
|
? &put_actions
|
|
|
|
|
: &actions;
|
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
if (OVS_LIKELY(error != ENOSPC)) {
|
|
|
|
|
/* XXX: There's a race window where a flow covering this packet
|
|
|
|
|
* could have already been installed since we last did the flow
|
|
|
|
|
* lookup before upcall. This could be solved by moving the
|
|
|
|
|
* mutex lock outside the loop, but that's an awful long time
|
|
|
|
|
* to be locking everyone out of making flow installs. If we
|
|
|
|
|
* move to a per-core classifier, it would be reasonable. */
|
|
|
|
|
ovs_mutex_lock(&dp->flow_mutex);
|
|
|
|
|
netdev_flow = dp_netdev_lookup_flow(dp, &keys[i]);
|
|
|
|
|
if (OVS_LIKELY(!netdev_flow)) {
|
|
|
|
|
netdev_flow = dp_netdev_flow_add(dp, &match,
|
|
|
|
|
ofpbuf_data(add_actions),
|
|
|
|
|
ofpbuf_size(add_actions));
|
|
|
|
|
}
|
|
|
|
|
ovs_mutex_unlock(&dp->flow_mutex);
|
|
|
|
|
|
|
|
|
|
emc_insert(flow_cache, &keys[i], netdev_flow);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ofpbuf_uninit(&actions);
|
|
|
|
|
ofpbuf_uninit(&put_actions);
|
|
|
|
|
fat_rwlock_unlock(&dp->upcall_rwlock);
|
2014-09-19 16:20:01 -07:00
|
|
|
|
} else if (OVS_UNLIKELY(any_miss)) {
|
|
|
|
|
int dropped_cnt = 0;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < cnt; i++) {
|
2014-10-17 09:37:11 -07:00
|
|
|
|
if (OVS_UNLIKELY(!rules[i])) {
|
2014-09-19 16:20:01 -07:00
|
|
|
|
dpif_packet_delete(packets[i]);
|
|
|
|
|
dropped_cnt++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dp_netdev_count_packet(dp, DP_STAT_LOST, dropped_cnt);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
}
|
2014-06-23 18:28:43 -07:00
|
|
|
|
|
|
|
|
|
n_batches = 0;
|
2014-06-23 11:43:59 -07:00
|
|
|
|
for (i = 0; i < cnt; i++) {
|
2014-08-29 16:06:43 -07:00
|
|
|
|
struct dpif_packet *packet = packets[i];
|
2014-06-23 18:28:43 -07:00
|
|
|
|
struct dp_netdev_flow *flow;
|
2014-06-23 11:43:59 -07:00
|
|
|
|
|
2014-10-17 09:37:11 -07:00
|
|
|
|
if (OVS_UNLIKELY(!rules[i])) {
|
2014-06-23 18:28:43 -07:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
flow = dp_netdev_flow_cast(rules[i]);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
|
|
|
|
emc_insert(flow_cache, &keys[i], flow);
|
|
|
|
|
dp_netdev_queue_batches(packet, flow, &keys[i].mf, batches,
|
|
|
|
|
&n_batches, ARRAY_SIZE(batches));
|
2014-06-23 11:43:59 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-23 18:28:43 -07:00
|
|
|
|
for (i = 0; i < n_batches; i++) {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
packet_batch_execute(&batches[i], pmd);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-05 15:27:31 -08:00
|
|
|
|
static void
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_input(struct dp_netdev_pmd_thread *pmd,
|
2014-10-03 20:23:58 -07:00
|
|
|
|
struct dpif_packet **packets, int cnt)
|
2014-08-29 16:06:43 -07:00
|
|
|
|
{
|
2014-09-01 20:11:54 +00:00
|
|
|
|
#if !defined(__CHECKER__) && !defined(_WIN32)
|
2014-08-29 16:06:43 -07:00
|
|
|
|
const size_t PKT_ARRAY_SIZE = cnt;
|
|
|
|
|
#else
|
2014-09-01 20:11:54 +00:00
|
|
|
|
/* Sparse or MSVC doesn't like variable length array. */
|
2014-08-29 16:06:43 -07:00
|
|
|
|
enum { PKT_ARRAY_SIZE = NETDEV_MAX_RX_BATCH };
|
|
|
|
|
#endif
|
|
|
|
|
struct netdev_flow_key keys[PKT_ARRAY_SIZE];
|
|
|
|
|
size_t newcnt;
|
|
|
|
|
|
2014-10-03 20:23:58 -07:00
|
|
|
|
newcnt = emc_processing(pmd, packets, cnt, keys);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
if (OVS_UNLIKELY(newcnt)) {
|
2014-10-03 20:23:58 -07:00
|
|
|
|
fast_path_processing(pmd, packets, newcnt, keys);
|
2014-08-29 16:06:43 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-14 14:35:58 -08:00
|
|
|
|
struct dp_netdev_execute_aux {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
struct dp_netdev_pmd_thread *pmd;
|
2013-11-14 14:35:58 -08:00
|
|
|
|
};
|
|
|
|
|
|
2014-07-26 06:51:55 +00:00
|
|
|
|
static void
|
2014-07-26 15:39:58 -07:00
|
|
|
|
dpif_netdev_register_upcall_cb(struct dpif *dpif, upcall_callback *cb,
|
|
|
|
|
void *aux)
|
2014-07-26 06:51:55 +00:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev *dp = get_dp_netdev(dpif);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
dp->upcall_aux = aux;
|
2014-07-26 06:51:55 +00:00
|
|
|
|
dp->upcall_cb = cb;
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-19 16:20:01 -07:00
|
|
|
|
static void
|
|
|
|
|
dp_netdev_drop_packets(struct dpif_packet ** packets, int cnt, bool may_steal)
|
|
|
|
|
{
|
|
|
|
|
if (may_steal) {
|
2014-11-11 11:53:47 -08:00
|
|
|
|
int i;
|
|
|
|
|
|
2014-09-19 16:20:01 -07:00
|
|
|
|
for (i = 0; i < cnt; i++) {
|
|
|
|
|
dpif_packet_delete(packets[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-11 11:53:47 -08:00
|
|
|
|
static int
|
|
|
|
|
push_tnl_action(const struct dp_netdev *dp,
|
|
|
|
|
const struct nlattr *attr,
|
|
|
|
|
struct dpif_packet **packets, int cnt)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_port *tun_port;
|
|
|
|
|
const struct ovs_action_push_tnl *data;
|
|
|
|
|
|
|
|
|
|
data = nl_attr_get(attr);
|
|
|
|
|
|
|
|
|
|
tun_port = dp_netdev_lookup_port(dp, u32_to_odp(data->tnl_port));
|
|
|
|
|
if (!tun_port) {
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
netdev_push_header(tun_port->netdev, packets, cnt, data);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dp_netdev_clone_pkt_batch(struct dpif_packet **tnl_pkt,
|
|
|
|
|
struct dpif_packet **packets, int cnt)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < cnt; i++) {
|
|
|
|
|
tnl_pkt[i] = dpif_packet_clone(packets[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-14 14:35:58 -08:00
|
|
|
|
static void
|
2014-06-23 11:43:59 -07:00
|
|
|
|
dp_execute_cb(void *aux_, struct dpif_packet **packets, int cnt,
|
2013-12-30 15:58:58 -08:00
|
|
|
|
const struct nlattr *a, bool may_steal)
|
2014-01-08 15:58:11 -08:00
|
|
|
|
OVS_NO_THREAD_SAFETY_ANALYSIS
|
2013-11-14 14:35:58 -08:00
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_execute_aux *aux = aux_;
|
2014-07-26 15:39:58 -07:00
|
|
|
|
uint32_t *depth = recirc_depth_get();
|
2014-09-05 14:14:20 -07:00
|
|
|
|
struct dp_netdev_pmd_thread *pmd= aux->pmd;
|
|
|
|
|
struct dp_netdev *dp= pmd->dp;
|
2013-12-30 15:58:58 -08:00
|
|
|
|
int type = nl_attr_type(a);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
struct dp_netdev_port *p;
|
2014-06-23 11:43:59 -07:00
|
|
|
|
int i;
|
2013-11-14 14:35:58 -08:00
|
|
|
|
|
2013-12-30 15:58:58 -08:00
|
|
|
|
switch ((enum ovs_action_attr)type) {
|
|
|
|
|
case OVS_ACTION_ATTR_OUTPUT:
|
2014-07-26 15:39:58 -07:00
|
|
|
|
p = dp_netdev_lookup_port(dp, u32_to_odp(nl_attr_get_u32(a)));
|
2014-06-25 11:39:34 -07:00
|
|
|
|
if (OVS_LIKELY(p)) {
|
2014-09-05 14:14:20 -07:00
|
|
|
|
netdev_send(p->netdev, pmd->core_id, packets, cnt, may_steal);
|
2014-09-19 16:20:01 -07:00
|
|
|
|
return;
|
2014-01-08 15:58:11 -08:00
|
|
|
|
}
|
2013-12-30 15:58:58 -08:00
|
|
|
|
break;
|
|
|
|
|
|
2014-11-11 11:53:47 -08:00
|
|
|
|
case OVS_ACTION_ATTR_TUNNEL_PUSH:
|
|
|
|
|
if (*depth < MAX_RECIRC_DEPTH) {
|
|
|
|
|
struct dpif_packet *tnl_pkt[NETDEV_MAX_RX_BATCH];
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
if (!may_steal) {
|
|
|
|
|
dp_netdev_clone_pkt_batch(tnl_pkt, packets, cnt);
|
|
|
|
|
packets = tnl_pkt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = push_tnl_action(dp, a, packets, cnt);
|
|
|
|
|
if (!err) {
|
|
|
|
|
(*depth)++;
|
|
|
|
|
dp_netdev_input(pmd, packets, cnt);
|
|
|
|
|
(*depth)--;
|
|
|
|
|
} else {
|
|
|
|
|
dp_netdev_drop_packets(tnl_pkt, cnt, !may_steal);
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OVS_ACTION_ATTR_TUNNEL_POP:
|
|
|
|
|
if (*depth < MAX_RECIRC_DEPTH) {
|
|
|
|
|
odp_port_t portno = u32_to_odp(nl_attr_get_u32(a));
|
|
|
|
|
|
|
|
|
|
p = dp_netdev_lookup_port(dp, portno);
|
|
|
|
|
if (p) {
|
|
|
|
|
struct dpif_packet *tnl_pkt[NETDEV_MAX_RX_BATCH];
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
if (!may_steal) {
|
|
|
|
|
dp_netdev_clone_pkt_batch(tnl_pkt, packets, cnt);
|
|
|
|
|
packets = tnl_pkt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = netdev_pop_header(p->netdev, packets, cnt);
|
|
|
|
|
if (!err) {
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < cnt; i++) {
|
|
|
|
|
packets[i]->md.in_port.odp_port = portno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
(*depth)++;
|
|
|
|
|
dp_netdev_input(pmd, packets, cnt);
|
|
|
|
|
(*depth)--;
|
|
|
|
|
} else {
|
|
|
|
|
dp_netdev_drop_packets(tnl_pkt, cnt, !may_steal);
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
case OVS_ACTION_ATTR_USERSPACE:
|
|
|
|
|
if (!fat_rwlock_tryrdlock(&dp->upcall_rwlock)) {
|
|
|
|
|
const struct nlattr *userdata;
|
|
|
|
|
struct ofpbuf actions;
|
|
|
|
|
struct flow flow;
|
2013-09-20 12:47:33 -07:00
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA);
|
|
|
|
|
ofpbuf_init(&actions, 0);
|
2014-06-23 11:43:59 -07:00
|
|
|
|
|
2014-07-26 15:39:58 -07:00
|
|
|
|
for (i = 0; i < cnt; i++) {
|
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
ofpbuf_clear(&actions);
|
|
|
|
|
|
2014-10-03 20:23:58 -07:00
|
|
|
|
flow_extract(&packets[i]->ofpbuf, &packets[i]->md, &flow);
|
2014-07-26 15:39:58 -07:00
|
|
|
|
error = dp_netdev_upcall(dp, packets[i], &flow, NULL,
|
|
|
|
|
DPIF_UC_ACTION, userdata, &actions,
|
|
|
|
|
NULL);
|
|
|
|
|
if (!error || error == ENOSPC) {
|
2014-09-19 16:20:01 -07:00
|
|
|
|
dp_netdev_execute_actions(pmd, &packets[i], 1, may_steal,
|
2014-10-03 20:23:58 -07:00
|
|
|
|
ofpbuf_data(&actions),
|
2014-07-26 15:39:58 -07:00
|
|
|
|
ofpbuf_size(&actions));
|
2014-09-19 16:20:01 -07:00
|
|
|
|
} else if (may_steal) {
|
2014-07-26 15:39:58 -07:00
|
|
|
|
dpif_packet_delete(packets[i]);
|
|
|
|
|
}
|
netdev-dpdk: Fix race condition with DPDK mempools in non pmd threads
DPDK mempools rely on rte_lcore_id() to implement a thread-local cache.
Our non pmd threads had rte_lcore_id() == 0. This allowed concurrent access to
the "thread-local" cache, causing crashes.
This commit resolves the issue with the following changes:
- Every non pmd thread has the same lcore_id (0, for management reasons), which
is not shared with any pmd thread (lcore_id for pmd threads now start from 1)
- DPDK mbufs must be allocated/freed in pmd threads. When there is the need to
use mempools in non pmd threads, like in dpdk_do_tx_copy(), a mutex must be
held.
- The previous change does not allow us anymore to pass DPDK mbufs to handler
threads: therefore this commit partially revert 143859ec63d45e. Now packets
are copied for upcall processing. We can remove the extra memcpy by
processing upcalls in the pmd thread itself.
With the introduction of the extra locking, the packet throughput will be lower
in the following cases:
- When using internal (tap) devices with DPDK devices on the same datapath.
Anyway, to support internal devices efficiently, we needed DPDK KNI devices,
which will be proper pmd devices and will not need this locking.
- When packets are processed in the slow path by non pmd threads. This overhead
can be avoided by handling the upcalls directly in pmd threads (a change that
has already been proposed by Ryan Wilson)
Also, the following two fixes have been introduced:
- In dpdk_free_buf() use rte_pktmbuf_free_seg() instead of rte_mempool_put().
This allows OVS to run properly with CONFIG_RTE_LIBRTE_MBUF_DEBUG DPDK option
- Do not bulk free mbufs in a transmission queue. They may belong to different
mempools
Signed-off-by: Daniele Di Proietto <ddiproietto@vmware.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
2014-07-17 14:29:36 -07:00
|
|
|
|
}
|
2014-07-26 15:39:58 -07:00
|
|
|
|
ofpbuf_uninit(&actions);
|
|
|
|
|
fat_rwlock_unlock(&dp->upcall_rwlock);
|
2014-07-26 06:51:55 +00:00
|
|
|
|
|
2014-09-19 16:20:01 -07:00
|
|
|
|
return;
|
|
|
|
|
}
|
2013-12-30 15:58:58 -08:00
|
|
|
|
break;
|
2014-03-04 15:36:03 -08:00
|
|
|
|
|
2014-04-08 18:42:39 -07:00
|
|
|
|
case OVS_ACTION_ATTR_HASH: {
|
|
|
|
|
const struct ovs_action_hash *hash_act;
|
|
|
|
|
uint32_t hash;
|
|
|
|
|
|
|
|
|
|
hash_act = nl_attr_get(a);
|
2014-06-23 11:43:59 -07:00
|
|
|
|
|
|
|
|
|
for (i = 0; i < cnt; i++) {
|
|
|
|
|
|
|
|
|
|
if (hash_act->hash_alg == OVS_HASH_ALG_L4) {
|
|
|
|
|
/* Hash need not be symmetric, nor does it need to include
|
|
|
|
|
* L2 fields. */
|
2014-08-29 16:06:43 -07:00
|
|
|
|
hash = hash_2words(dpif_packet_get_dp_hash(packets[i]),
|
|
|
|
|
hash_act->hash_basis);
|
2014-06-23 11:43:59 -07:00
|
|
|
|
} else {
|
|
|
|
|
VLOG_WARN("Unknown hash algorithm specified "
|
|
|
|
|
"for the hash action.");
|
|
|
|
|
hash = 2;
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-08 18:42:39 -07:00
|
|
|
|
if (!hash) {
|
|
|
|
|
hash = 1; /* 0 is not valid */
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-29 16:06:43 -07:00
|
|
|
|
dpif_packet_set_dp_hash(packets[i], hash);
|
2014-04-08 18:42:39 -07:00
|
|
|
|
}
|
2014-09-19 16:20:01 -07:00
|
|
|
|
return;
|
2014-04-08 18:42:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-05 15:27:31 -08:00
|
|
|
|
case OVS_ACTION_ATTR_RECIRC:
|
|
|
|
|
if (*depth < MAX_RECIRC_DEPTH) {
|
2014-03-04 15:36:03 -08:00
|
|
|
|
|
2014-03-05 15:27:31 -08:00
|
|
|
|
(*depth)++;
|
2014-06-23 11:43:59 -07:00
|
|
|
|
for (i = 0; i < cnt; i++) {
|
|
|
|
|
struct dpif_packet *recirc_pkt;
|
|
|
|
|
|
|
|
|
|
recirc_pkt = (may_steal) ? packets[i]
|
|
|
|
|
: dpif_packet_clone(packets[i]);
|
|
|
|
|
|
2014-10-03 20:23:58 -07:00
|
|
|
|
recirc_pkt->md.recirc_id = nl_attr_get_u32(a);
|
2014-06-23 11:43:59 -07:00
|
|
|
|
|
|
|
|
|
/* Hash is private to each packet */
|
2014-10-03 20:23:58 -07:00
|
|
|
|
recirc_pkt->md.dp_hash = dpif_packet_get_dp_hash(packets[i]);
|
2014-06-23 11:43:59 -07:00
|
|
|
|
|
2014-10-03 20:23:58 -07:00
|
|
|
|
dp_netdev_input(pmd, &recirc_pkt, 1);
|
2014-06-23 11:43:59 -07:00
|
|
|
|
}
|
2014-03-05 15:27:31 -08:00
|
|
|
|
(*depth)--;
|
|
|
|
|
|
2014-09-19 16:20:01 -07:00
|
|
|
|
return;
|
2014-03-05 15:27:31 -08:00
|
|
|
|
}
|
2014-09-19 16:20:01 -07:00
|
|
|
|
|
|
|
|
|
VLOG_WARN("Packet dropped. Max recirculation depth exceeded.");
|
2014-03-04 15:36:03 -08:00
|
|
|
|
break;
|
|
|
|
|
|
2013-12-30 15:58:58 -08:00
|
|
|
|
case OVS_ACTION_ATTR_PUSH_VLAN:
|
|
|
|
|
case OVS_ACTION_ATTR_POP_VLAN:
|
|
|
|
|
case OVS_ACTION_ATTR_PUSH_MPLS:
|
|
|
|
|
case OVS_ACTION_ATTR_POP_MPLS:
|
|
|
|
|
case OVS_ACTION_ATTR_SET:
|
2014-09-05 15:44:19 -07:00
|
|
|
|
case OVS_ACTION_ATTR_SET_MASKED:
|
2013-12-30 15:58:58 -08:00
|
|
|
|
case OVS_ACTION_ATTR_SAMPLE:
|
|
|
|
|
case OVS_ACTION_ATTR_UNSPEC:
|
|
|
|
|
case __OVS_ACTION_ATTR_MAX:
|
|
|
|
|
OVS_NOT_REACHED();
|
2013-12-16 08:14:52 -08:00
|
|
|
|
}
|
2014-09-19 16:20:01 -07:00
|
|
|
|
|
|
|
|
|
dp_netdev_drop_packets(packets, cnt, may_steal);
|
2011-10-12 16:24:54 -07:00
|
|
|
|
}
|
|
|
|
|
|
2011-10-21 14:38:54 -07:00
|
|
|
|
static void
|
2014-09-05 14:14:20 -07:00
|
|
|
|
dp_netdev_execute_actions(struct dp_netdev_pmd_thread *pmd,
|
2014-06-23 11:43:59 -07:00
|
|
|
|
struct dpif_packet **packets, int cnt,
|
2014-10-03 20:23:58 -07:00
|
|
|
|
bool may_steal,
|
2013-11-14 14:35:58 -08:00
|
|
|
|
const struct nlattr *actions, size_t actions_len)
|
2009-06-19 14:09:39 -07:00
|
|
|
|
{
|
2014-10-03 20:23:58 -07:00
|
|
|
|
struct dp_netdev_execute_aux aux = { pmd };
|
2013-11-14 14:35:58 -08:00
|
|
|
|
|
2014-10-03 20:23:58 -07:00
|
|
|
|
odp_execute_actions(&aux, packets, cnt, may_steal, actions,
|
2014-06-23 11:43:59 -07:00
|
|
|
|
actions_len, dp_execute_cb);
|
2009-06-19 14:09:39 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const struct dpif_class dpif_netdev_class = {
|
|
|
|
|
"netdev",
|
2012-05-09 12:17:15 +02:00
|
|
|
|
dpif_netdev_enumerate,
|
2012-11-14 15:50:20 -08:00
|
|
|
|
dpif_netdev_port_open_type,
|
2009-06-19 14:09:39 -07:00
|
|
|
|
dpif_netdev_open,
|
|
|
|
|
dpif_netdev_close,
|
2010-02-08 13:22:41 -05:00
|
|
|
|
dpif_netdev_destroy,
|
2014-03-20 10:57:41 -07:00
|
|
|
|
dpif_netdev_run,
|
|
|
|
|
dpif_netdev_wait,
|
2009-06-19 14:09:39 -07:00
|
|
|
|
dpif_netdev_get_stats,
|
|
|
|
|
dpif_netdev_port_add,
|
|
|
|
|
dpif_netdev_port_del,
|
|
|
|
|
dpif_netdev_port_query_by_number,
|
|
|
|
|
dpif_netdev_port_query_by_name,
|
2011-10-12 16:24:54 -07:00
|
|
|
|
NULL, /* port_get_pid */
|
datapath: Change listing ports to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to add new
features to the kernel vport layer without changing userspace software. In
turn, that means that the odp_port structure must become variable-length.
This does not, however, fit in well with the ODP_PORT_LIST ioctl in its
current form, because that would require userspace to know how much space
to allocate for each port in advance, or to allocate as much space as
could possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_PORT_LIST
by a new ioctl ODP_VPORT_DUMP that retrieves information about a single
vport from the datapath on each call. It is much cleaner to allocate the
maximum amount of space for a single vport than to do so for possibly a
large number of vports.
It would be faster to retrieve a number of vports in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
The Netlink version won't need to take the starting port number from
userspace, since Netlink sockets can keep track of that state as part
of their "dump" feature.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2011-01-10 13:12:12 -08:00
|
|
|
|
dpif_netdev_port_dump_start,
|
|
|
|
|
dpif_netdev_port_dump_next,
|
|
|
|
|
dpif_netdev_port_dump_done,
|
2009-06-19 14:09:39 -07:00
|
|
|
|
dpif_netdev_port_poll,
|
|
|
|
|
dpif_netdev_port_poll_wait,
|
|
|
|
|
dpif_netdev_flow_flush,
|
2014-05-20 11:37:02 -07:00
|
|
|
|
dpif_netdev_flow_dump_create,
|
|
|
|
|
dpif_netdev_flow_dump_destroy,
|
|
|
|
|
dpif_netdev_flow_dump_thread_create,
|
|
|
|
|
dpif_netdev_flow_dump_thread_destroy,
|
datapath: Change listing flows to use an iterator concept.
One of the goals for Open vSwitch is to decouple kernel and userspace
software, so that either one can be upgraded or rolled back independent of
the other. To do this in full generality, it must be possible to change
the kernel's idea of the flow key separately from the userspace version.
In turn, that means that flow keys must become variable-length. This does
not, however, fit in well with the ODP_FLOW_LIST ioctl in its current form,
because that would require userspace to know how much space to allocate
for each flow's key in advance, or to allocate as much space as could
possibly be needed. Neither choice is very attractive.
This commit prepares for a different solution, by replacing ODP_FLOW_LIST
by a new ioctl ODP_FLOW_DUMP that retrieves a single flow from the datapath
on each call. It is much cleaner to allocate the maximum amount of space
for a single flow key than to do so for possibly a very large number of
flow keys.
As a side effect, this patch also fixes a race condition that sometimes
made "ovs-dpctl dump-flows" print an error: previously, flows were listed
and then their actions were retrieved, which left a window in which
ovs-vswitchd could delete the flow. Now dumping a flow and its actions is
a single step, closing that window.
Dumping all of the flows in a datapath is no longer an atomic step, so now
it is possible to miss some flows or see a single flow twice during
iteration, if the flow table is modified by another process. It doesn't
look like this should be a problem for ovs-vswitchd.
It would be faster to retrieve a number of flows in batch instead of just
one at a time, but that will naturally happen later when the kernel
datapath interface is changed to use Netlink, so this patch does not bother
with it.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2010-12-28 10:39:52 -08:00
|
|
|
|
dpif_netdev_flow_dump_next,
|
2014-07-15 16:09:40 -07:00
|
|
|
|
dpif_netdev_operate,
|
2014-07-26 06:51:55 +00:00
|
|
|
|
NULL, /* recv_set */
|
|
|
|
|
NULL, /* handlers_set */
|
2014-09-08 15:22:26 -07:00
|
|
|
|
dpif_netdev_pmd_set,
|
2011-11-21 13:36:17 -08:00
|
|
|
|
dpif_netdev_queue_to_priority,
|
2014-07-26 06:51:55 +00:00
|
|
|
|
NULL, /* recv */
|
|
|
|
|
NULL, /* recv_wait */
|
|
|
|
|
NULL, /* recv_purge */
|
|
|
|
|
dpif_netdev_register_upcall_cb,
|
|
|
|
|
dpif_netdev_enable_upcall,
|
|
|
|
|
dpif_netdev_disable_upcall,
|
2014-10-16 15:23:11 -07:00
|
|
|
|
dpif_netdev_get_datapath_version,
|
2009-06-19 14:09:39 -07:00
|
|
|
|
};
|
2010-11-29 12:21:08 -08:00
|
|
|
|
|
2013-07-29 15:11:49 -07:00
|
|
|
|
static void
|
|
|
|
|
dpif_dummy_change_port_number(struct unixctl_conn *conn, int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[], void *aux OVS_UNUSED)
|
|
|
|
|
{
|
2014-05-20 13:21:09 -07:00
|
|
|
|
struct dp_netdev_port *old_port;
|
|
|
|
|
struct dp_netdev_port *new_port;
|
2013-07-29 15:11:49 -07:00
|
|
|
|
struct dp_netdev *dp;
|
2013-12-24 16:08:57 -08:00
|
|
|
|
odp_port_t port_no;
|
2013-07-29 15:11:49 -07:00
|
|
|
|
|
2014-01-08 15:58:11 -08:00
|
|
|
|
ovs_mutex_lock(&dp_netdev_mutex);
|
2013-07-29 15:11:49 -07:00
|
|
|
|
dp = shash_find_data(&dp_netdevs, argv[1]);
|
|
|
|
|
if (!dp || !dpif_netdev_class_is_dummy(dp->class)) {
|
2014-01-08 15:58:11 -08:00
|
|
|
|
ovs_mutex_unlock(&dp_netdev_mutex);
|
2013-07-29 15:11:49 -07:00
|
|
|
|
unixctl_command_reply_error(conn, "unknown datapath or not a dummy");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2014-01-08 15:58:11 -08:00
|
|
|
|
ovs_refcount_ref(&dp->ref_cnt);
|
|
|
|
|
ovs_mutex_unlock(&dp_netdev_mutex);
|
2013-07-29 15:11:49 -07:00
|
|
|
|
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_lock(&dp->port_mutex);
|
|
|
|
|
if (get_port_by_name(dp, argv[2], &old_port)) {
|
2013-07-29 15:11:49 -07:00
|
|
|
|
unixctl_command_reply_error(conn, "unknown port");
|
2014-01-08 15:58:11 -08:00
|
|
|
|
goto exit;
|
2013-07-29 15:11:49 -07:00
|
|
|
|
}
|
|
|
|
|
|
2013-12-24 16:08:57 -08:00
|
|
|
|
port_no = u32_to_odp(atoi(argv[3]));
|
|
|
|
|
if (!port_no || port_no == ODPP_NONE) {
|
2013-07-29 15:11:49 -07:00
|
|
|
|
unixctl_command_reply_error(conn, "bad port number");
|
2014-01-08 15:58:11 -08:00
|
|
|
|
goto exit;
|
2013-07-29 15:11:49 -07:00
|
|
|
|
}
|
2013-12-24 16:08:57 -08:00
|
|
|
|
if (dp_netdev_lookup_port(dp, port_no)) {
|
2013-07-29 15:11:49 -07:00
|
|
|
|
unixctl_command_reply_error(conn, "port number already in use");
|
2014-01-08 15:58:11 -08:00
|
|
|
|
goto exit;
|
2013-07-29 15:11:49 -07:00
|
|
|
|
}
|
2014-05-20 13:21:09 -07:00
|
|
|
|
|
|
|
|
|
/* Remove old port. */
|
|
|
|
|
cmap_remove(&dp->ports, &old_port->node, hash_port_no(old_port->port_no));
|
|
|
|
|
ovsrcu_postpone(free, old_port);
|
|
|
|
|
|
|
|
|
|
/* Insert new port (cmap semantics mean we cannot re-insert 'old_port'). */
|
|
|
|
|
new_port = xmemdup(old_port, sizeof *old_port);
|
|
|
|
|
new_port->port_no = port_no;
|
|
|
|
|
cmap_insert(&dp->ports, &new_port->node, hash_port_no(port_no));
|
|
|
|
|
|
2013-08-07 13:29:54 -07:00
|
|
|
|
seq_change(dp->port_seq);
|
2013-07-29 15:11:49 -07:00
|
|
|
|
unixctl_command_reply(conn, NULL);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
|
|
|
|
|
exit:
|
2014-05-20 13:21:09 -07:00
|
|
|
|
ovs_mutex_unlock(&dp->port_mutex);
|
2014-01-08 15:58:11 -08:00
|
|
|
|
dp_netdev_unref(dp);
|
2013-07-29 15:11:49 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-05-22 09:36:00 -07:00
|
|
|
|
static void
|
|
|
|
|
dpif_dummy_delete_port(struct unixctl_conn *conn, int argc OVS_UNUSED,
|
|
|
|
|
const char *argv[], void *aux OVS_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
struct dp_netdev_port *port;
|
|
|
|
|
struct dp_netdev *dp;
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&dp_netdev_mutex);
|
|
|
|
|
dp = shash_find_data(&dp_netdevs, argv[1]);
|
|
|
|
|
if (!dp || !dpif_netdev_class_is_dummy(dp->class)) {
|
|
|
|
|
ovs_mutex_unlock(&dp_netdev_mutex);
|
|
|
|
|
unixctl_command_reply_error(conn, "unknown datapath or not a dummy");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
ovs_refcount_ref(&dp->ref_cnt);
|
|
|
|
|
ovs_mutex_unlock(&dp_netdev_mutex);
|
|
|
|
|
|
|
|
|
|
ovs_mutex_lock(&dp->port_mutex);
|
|
|
|
|
if (get_port_by_name(dp, argv[2], &port)) {
|
|
|
|
|
unixctl_command_reply_error(conn, "unknown port");
|
|
|
|
|
} else if (port->port_no == ODPP_LOCAL) {
|
|
|
|
|
unixctl_command_reply_error(conn, "can't delete local port");
|
|
|
|
|
} else {
|
|
|
|
|
do_del_port(dp, port);
|
|
|
|
|
unixctl_command_reply(conn, NULL);
|
|
|
|
|
}
|
|
|
|
|
ovs_mutex_unlock(&dp->port_mutex);
|
|
|
|
|
|
|
|
|
|
dp_netdev_unref(dp);
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-19 10:24:46 -08:00
|
|
|
|
static void
|
|
|
|
|
dpif_dummy_register__(const char *type)
|
|
|
|
|
{
|
|
|
|
|
struct dpif_class *class;
|
|
|
|
|
|
|
|
|
|
class = xmalloc(sizeof *class);
|
|
|
|
|
*class = dpif_netdev_class;
|
|
|
|
|
class->type = xstrdup(type);
|
|
|
|
|
dp_register_provider(class);
|
|
|
|
|
}
|
|
|
|
|
|
2010-11-29 12:21:08 -08:00
|
|
|
|
void
|
2012-01-19 10:24:46 -08:00
|
|
|
|
dpif_dummy_register(bool override)
|
2010-11-29 12:21:08 -08:00
|
|
|
|
{
|
2012-01-19 10:24:46 -08:00
|
|
|
|
if (override) {
|
|
|
|
|
struct sset types;
|
|
|
|
|
const char *type;
|
|
|
|
|
|
|
|
|
|
sset_init(&types);
|
|
|
|
|
dp_enumerate_types(&types);
|
|
|
|
|
SSET_FOR_EACH (type, &types) {
|
|
|
|
|
if (!dp_unregister_provider(type)) {
|
|
|
|
|
dpif_dummy_register__(type);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
sset_destroy(&types);
|
2010-11-29 12:21:08 -08:00
|
|
|
|
}
|
2012-01-19 10:24:46 -08:00
|
|
|
|
|
|
|
|
|
dpif_dummy_register__("dummy");
|
2013-07-29 15:11:49 -07:00
|
|
|
|
|
|
|
|
|
unixctl_command_register("dpif-dummy/change-port-number",
|
2014-08-22 16:27:22 -07:00
|
|
|
|
"dp port new-number",
|
2013-07-29 15:11:49 -07:00
|
|
|
|
3, 3, dpif_dummy_change_port_number, NULL);
|
2014-08-22 16:27:22 -07:00
|
|
|
|
unixctl_command_register("dpif-dummy/delete-port", "dp port",
|
2014-05-22 09:36:00 -07:00
|
|
|
|
2, 2, dpif_dummy_delete_port, NULL);
|
2010-11-29 12:21:08 -08:00
|
|
|
|
}
|
2014-10-17 09:37:11 -07:00
|
|
|
|
|
|
|
|
|
/* Datapath Classifier. */
|
|
|
|
|
|
|
|
|
|
/* A set of rules that all have the same fields wildcarded. */
|
|
|
|
|
struct dpcls_subtable {
|
|
|
|
|
/* The fields are only used by writers. */
|
|
|
|
|
struct cmap_node cmap_node OVS_GUARDED; /* Within dpcls 'subtables_map'. */
|
|
|
|
|
|
|
|
|
|
/* These fields are accessed by readers. */
|
|
|
|
|
struct cmap rules; /* Contains "struct dpcls_rule"s. */
|
|
|
|
|
struct netdev_flow_key mask; /* Wildcards for fields (const). */
|
|
|
|
|
/* 'mask' must be the last field, additional space is allocated here. */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Initializes 'cls' as a classifier that initially contains no classification
|
|
|
|
|
* rules. */
|
|
|
|
|
static void
|
|
|
|
|
dpcls_init(struct dpcls *cls)
|
|
|
|
|
{
|
|
|
|
|
cmap_init(&cls->subtables_map);
|
|
|
|
|
pvector_init(&cls->subtables);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dpcls_destroy_subtable(struct dpcls *cls, struct dpcls_subtable *subtable)
|
|
|
|
|
{
|
|
|
|
|
pvector_remove(&cls->subtables, subtable);
|
|
|
|
|
cmap_remove(&cls->subtables_map, &subtable->cmap_node,
|
|
|
|
|
subtable->mask.hash);
|
|
|
|
|
cmap_destroy(&subtable->rules);
|
|
|
|
|
ovsrcu_postpone(free, subtable);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Destroys 'cls'. Rules within 'cls', if any, are not freed; this is the
|
|
|
|
|
* caller's responsibility.
|
|
|
|
|
* May only be called after all the readers have been terminated. */
|
|
|
|
|
static void
|
|
|
|
|
dpcls_destroy(struct dpcls *cls)
|
|
|
|
|
{
|
|
|
|
|
if (cls) {
|
|
|
|
|
struct dpcls_subtable *subtable;
|
|
|
|
|
|
|
|
|
|
CMAP_FOR_EACH (subtable, cmap_node, &cls->subtables_map) {
|
|
|
|
|
dpcls_destroy_subtable(cls, subtable);
|
|
|
|
|
}
|
|
|
|
|
cmap_destroy(&cls->subtables_map);
|
|
|
|
|
pvector_destroy(&cls->subtables);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct dpcls_subtable *
|
|
|
|
|
dpcls_create_subtable(struct dpcls *cls, const struct netdev_flow_key *mask)
|
|
|
|
|
{
|
|
|
|
|
struct dpcls_subtable *subtable;
|
|
|
|
|
|
|
|
|
|
/* Need to add one. */
|
2014-10-17 17:03:13 -07:00
|
|
|
|
subtable = xmalloc(sizeof *subtable
|
|
|
|
|
- sizeof subtable->mask.mf + mask->len);
|
2014-10-17 09:37:11 -07:00
|
|
|
|
cmap_init(&subtable->rules);
|
|
|
|
|
netdev_flow_key_clone(&subtable->mask, mask);
|
|
|
|
|
cmap_insert(&cls->subtables_map, &subtable->cmap_node, mask->hash);
|
|
|
|
|
pvector_insert(&cls->subtables, subtable, 0);
|
|
|
|
|
|
|
|
|
|
return subtable;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct dpcls_subtable *
|
|
|
|
|
dpcls_find_subtable(struct dpcls *cls, const struct netdev_flow_key *mask)
|
|
|
|
|
{
|
|
|
|
|
struct dpcls_subtable *subtable;
|
|
|
|
|
|
|
|
|
|
CMAP_FOR_EACH_WITH_HASH (subtable, cmap_node, mask->hash,
|
|
|
|
|
&cls->subtables_map) {
|
|
|
|
|
if (netdev_flow_key_equal(&subtable->mask, mask)) {
|
|
|
|
|
return subtable;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return dpcls_create_subtable(cls, mask);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Insert 'rule' into 'cls'. */
|
|
|
|
|
static void
|
|
|
|
|
dpcls_insert(struct dpcls *cls, struct dpcls_rule *rule,
|
|
|
|
|
const struct netdev_flow_key *mask)
|
|
|
|
|
{
|
|
|
|
|
struct dpcls_subtable *subtable = dpcls_find_subtable(cls, mask);
|
|
|
|
|
|
|
|
|
|
rule->mask = &subtable->mask;
|
|
|
|
|
cmap_insert(&subtable->rules, &rule->cmap_node, rule->flow.hash);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Removes 'rule' from 'cls', also destructing the 'rule'. */
|
|
|
|
|
static void
|
|
|
|
|
dpcls_remove(struct dpcls *cls, struct dpcls_rule *rule)
|
|
|
|
|
{
|
|
|
|
|
struct dpcls_subtable *subtable;
|
|
|
|
|
|
|
|
|
|
ovs_assert(rule->mask);
|
|
|
|
|
|
|
|
|
|
INIT_CONTAINER(subtable, rule->mask, mask);
|
|
|
|
|
|
|
|
|
|
if (cmap_remove(&subtable->rules, &rule->cmap_node, rule->flow.hash)
|
|
|
|
|
== 0) {
|
|
|
|
|
dpcls_destroy_subtable(cls, subtable);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns true if 'target' satisifies 'key' in 'mask', that is, if each 1-bit
|
|
|
|
|
* in 'mask' the values in 'key' and 'target' are the same.
|
|
|
|
|
*
|
|
|
|
|
* Note: 'key' and 'mask' have the same mask, and 'key' is already masked. */
|
|
|
|
|
static inline bool
|
|
|
|
|
dpcls_rule_matches_key(const struct dpcls_rule *rule,
|
|
|
|
|
const struct netdev_flow_key *target)
|
|
|
|
|
{
|
|
|
|
|
const uint32_t *keyp = rule->flow.mf.inline_values;
|
|
|
|
|
const uint32_t *maskp = rule->mask->mf.inline_values;
|
|
|
|
|
uint32_t target_u32;
|
|
|
|
|
|
|
|
|
|
NETDEV_FLOW_KEY_FOR_EACH_IN_MAP(target_u32, target, rule->flow.mf.map) {
|
|
|
|
|
if (OVS_UNLIKELY((target_u32 & *maskp++) != *keyp++)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* For each miniflow in 'flows' performs a classifier lookup writing the result
|
|
|
|
|
* into the corresponding slot in 'rules'. If a particular entry in 'flows' is
|
|
|
|
|
* NULL it is skipped.
|
|
|
|
|
*
|
|
|
|
|
* This function is optimized for use in the userspace datapath and therefore
|
|
|
|
|
* does not implement a lot of features available in the standard
|
|
|
|
|
* classifier_lookup() function. Specifically, it does not implement
|
|
|
|
|
* priorities, instead returning any rule which matches the flow.
|
|
|
|
|
*
|
|
|
|
|
* Returns true if all flows found a corresponding rule. */
|
|
|
|
|
static bool
|
|
|
|
|
dpcls_lookup(const struct dpcls *cls, const struct netdev_flow_key keys[],
|
|
|
|
|
struct dpcls_rule **rules, const size_t cnt)
|
|
|
|
|
{
|
|
|
|
|
/* The batch size 16 was experimentally found faster than 8 or 32. */
|
|
|
|
|
typedef uint16_t map_type;
|
|
|
|
|
#define MAP_BITS (sizeof(map_type) * CHAR_BIT)
|
|
|
|
|
|
|
|
|
|
#if !defined(__CHECKER__) && !defined(_WIN32)
|
|
|
|
|
const int N_MAPS = DIV_ROUND_UP(cnt, MAP_BITS);
|
|
|
|
|
#else
|
|
|
|
|
enum { N_MAPS = DIV_ROUND_UP(NETDEV_MAX_RX_BATCH, MAP_BITS) };
|
|
|
|
|
#endif
|
|
|
|
|
map_type maps[N_MAPS];
|
|
|
|
|
struct dpcls_subtable *subtable;
|
|
|
|
|
|
|
|
|
|
memset(maps, 0xff, sizeof maps);
|
|
|
|
|
if (cnt % MAP_BITS) {
|
|
|
|
|
maps[N_MAPS - 1] >>= MAP_BITS - cnt % MAP_BITS; /* Clear extra bits. */
|
|
|
|
|
}
|
|
|
|
|
memset(rules, 0, cnt * sizeof *rules);
|
|
|
|
|
|
|
|
|
|
PVECTOR_FOR_EACH (subtable, &cls->subtables) {
|
|
|
|
|
const struct netdev_flow_key *mkeys = keys;
|
|
|
|
|
struct dpcls_rule **mrules = rules;
|
|
|
|
|
map_type remains = 0;
|
|
|
|
|
int m;
|
|
|
|
|
|
|
|
|
|
BUILD_ASSERT_DECL(sizeof remains == sizeof *maps);
|
|
|
|
|
|
|
|
|
|
for (m = 0; m < N_MAPS; m++, mkeys += MAP_BITS, mrules += MAP_BITS) {
|
|
|
|
|
uint32_t hashes[MAP_BITS];
|
|
|
|
|
const struct cmap_node *nodes[MAP_BITS];
|
|
|
|
|
unsigned long map = maps[m];
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (!map) {
|
|
|
|
|
continue; /* Skip empty maps. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Compute hashes for the remaining keys. */
|
|
|
|
|
ULONG_FOR_EACH_1(i, map) {
|
|
|
|
|
hashes[i] = netdev_flow_key_hash_in_mask(&mkeys[i],
|
|
|
|
|
&subtable->mask);
|
|
|
|
|
}
|
|
|
|
|
/* Lookup. */
|
|
|
|
|
map = cmap_find_batch(&subtable->rules, map, hashes, nodes);
|
|
|
|
|
/* Check results. */
|
|
|
|
|
ULONG_FOR_EACH_1(i, map) {
|
|
|
|
|
struct dpcls_rule *rule;
|
|
|
|
|
|
|
|
|
|
CMAP_NODE_FOR_EACH (rule, cmap_node, nodes[i]) {
|
|
|
|
|
if (OVS_LIKELY(dpcls_rule_matches_key(rule, &mkeys[i]))) {
|
|
|
|
|
mrules[i] = rule;
|
|
|
|
|
goto next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ULONG_SET0(map, i); /* Did not match. */
|
|
|
|
|
next:
|
|
|
|
|
; /* Keep Sparse happy. */
|
|
|
|
|
}
|
|
|
|
|
maps[m] &= ~map; /* Clear the found rules. */
|
|
|
|
|
remains |= maps[m];
|
|
|
|
|
}
|
|
|
|
|
if (!remains) {
|
|
|
|
|
return true; /* All found. */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return false; /* Some misses. */
|
|
|
|
|
}
|