2009-07-08 13:19:16 -07:00
|
|
|
/*
|
2015-12-03 11:40:53 -08:00
|
|
|
* Copyright (c) 2007-2015 Nicira, Inc.
|
2009-06-15 15:11:30 -07:00
|
|
|
*
|
2011-11-16 13:39:40 -08:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of version 2 of the GNU General Public
|
|
|
|
* License as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
* 02110-1301, USA
|
2009-07-08 13:19:16 -07:00
|
|
|
*/
|
|
|
|
|
2010-08-30 00:24:54 -07:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/if_arp.h>
|
|
|
|
#include <linux/if_vlan.h>
|
|
|
|
#include <linux/in.h>
|
|
|
|
#include <linux/ip.h>
|
2011-01-26 13:41:54 -08:00
|
|
|
#include <linux/jhash.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/etherdevice.h>
|
2011-01-26 12:49:06 -08:00
|
|
|
#include <linux/genetlink.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/kthread.h>
|
|
|
|
#include <linux/mutex.h>
|
|
|
|
#include <linux/percpu.h>
|
|
|
|
#include <linux/rcupdate.h>
|
|
|
|
#include <linux/tcp.h>
|
|
|
|
#include <linux/udp.h>
|
|
|
|
#include <linux/version.h>
|
|
|
|
#include <linux/ethtool.h>
|
|
|
|
#include <linux/wait.h>
|
|
|
|
#include <asm/div64.h>
|
2010-06-25 17:33:07 +08:00
|
|
|
#include <linux/highmem.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
#include <linux/netfilter_bridge.h>
|
|
|
|
#include <linux/netfilter_ipv4.h>
|
|
|
|
#include <linux/inetdevice.h>
|
|
|
|
#include <linux/list.h>
|
2011-10-05 10:50:58 -07:00
|
|
|
#include <linux/openvswitch.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
#include <linux/rculist.h>
|
|
|
|
#include <linux/dmi.h>
|
2011-01-23 18:44:44 -08:00
|
|
|
#include <net/genetlink.h>
|
2012-01-30 06:56:54 -08:00
|
|
|
#include <net/net_namespace.h>
|
|
|
|
#include <net/netns/generic.h>
|
2018-01-31 21:53:05 +08:00
|
|
|
#include <net/nsh.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
#include "datapath.h"
|
2015-12-02 23:53:52 -08:00
|
|
|
#include "conntrack.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
#include "flow.h"
|
2014-01-10 15:57:04 -08:00
|
|
|
#include "flow_table.h"
|
2013-09-11 20:26:11 -07:00
|
|
|
#include "flow_netlink.h"
|
2018-02-13 15:48:24 -08:00
|
|
|
#include "meter.h"
|
2015-12-03 11:40:53 -08:00
|
|
|
#include "gso.h"
|
2010-04-12 15:53:39 -04:00
|
|
|
#include "vport-internal_dev.h"
|
2013-04-30 08:47:42 -07:00
|
|
|
#include "vport-netdev.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
|
datapath: netns: make struct pernet_operations::id unsigned int.
Upstream commit:
commit c7d03a00b56fc23c3a01a8353789ad257363e281
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date: Thu Nov 17 04:58:21 2016 +0300
netns: make struct pernet_operations::id unsigned int
Make struct pernet_operations::id unsigned.
There are 2 reasons to do so:
1)
This field is really an index into an zero based array and
thus is unsigned entity. Using negative value is out-of-bound
access by definition.
2)
On x86_64 unsigned 32-bit data which are mixed with pointers
via array indexing or offsets added or subtracted to pointers
are preffered to signed 32-bit data.
"int" being used as an array index needs to be sign-extended
to 64-bit before being used.
void f(long *p, int i)
{
g(p[i]);
}
roughly translates to
movsx rsi, esi
mov rdi, [rsi+...]
call g
MOVSX is 3 byte instruction which isn't necessary if the variable is
unsigned because x86_64 is zero extending by default.
Now, there is net_generic() function which, you guessed it right, uses
"int" as an array index:
static inline void *net_generic(const struct net *net, int id)
{
...
ptr = ng->ptr[id - 1];
...
}
And this function is used a lot, so those sign extensions add up.
Patch snipes ~1730 bytes on allyesconfig kernel (without all junk
messing with code generation):
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
Unfortunately some functions actually grow bigger.
This is a semmingly random artefact of code generation with register
allocator being used differently. gcc decides that some variable
needs to live in new r8+ registers and every access now requires REX
prefix. Or it is shifted into r12, so [r12+0] addressing mode has to be
used which is longer than [r8]
However, overall balance is in negative direction:
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
function old new delta
nfsd4_lock 3886 3959 +73
tipc_link_build_proto_msg 1096 1140 +44
mac80211_hwsim_new_radio 2776 2808 +32
tipc_mon_rcv 1032 1058 +26
svcauth_gss_legacy_init 1413 1429 +16
tipc_bcbase_select_primary 379 392 +13
nfsd4_exchange_id 1247 1260 +13
nfsd4_setclientid_confirm 782 793 +11
...
put_client_renew_locked 494 480 -14
ip_set_sockfn_get 730 716 -14
geneve_sock_add 829 813 -16
nfsd4_sequence_done 721 703 -18
nlmclnt_lookup_host 708 686 -22
nfsd4_lockt 1085 1063 -22
nfs_get_client 1077 1050 -27
tcf_bpf_init 1106 1076 -30
nfsd4_encode_fattr 5997 5930 -67
Total: Before=154856051, After=154854321, chg -0.00%
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[Committer notes]
It looks like changing the type of this doesn't affect the build on older
kernels, so we can just make the change. I didn't go through all of the
compat code to update the net_id variables there as none of that code should
be enabled on kernels with this patch.
Upstream: c7d03a00b56f ("netns: make struct pernet_operations::id unsigned int")
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
2017-02-28 17:35:07 -08:00
|
|
|
unsigned int ovs_net_id __read_mostly;
|
2012-01-30 06:56:54 -08:00
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
static struct genl_family dp_packet_genl_family;
|
|
|
|
static struct genl_family dp_flow_genl_family;
|
|
|
|
static struct genl_family dp_datapath_genl_family;
|
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
static const struct nla_policy flow_policy[];
|
|
|
|
|
2019-11-25 14:20:44 -08:00
|
|
|
static const struct genl_multicast_group ovs_dp_flow_multicast_group = {
|
|
|
|
.name = OVS_FLOW_MCGROUP,
|
2014-04-01 20:55:21 -07:00
|
|
|
};
|
|
|
|
|
2019-11-25 14:20:44 -08:00
|
|
|
static const struct genl_multicast_group ovs_dp_datapath_multicast_group = {
|
|
|
|
.name = OVS_DATAPATH_MCGROUP,
|
2014-04-01 20:55:21 -07:00
|
|
|
};
|
|
|
|
|
2019-11-25 14:20:44 -08:00
|
|
|
const struct genl_multicast_group ovs_dp_vport_multicast_group = {
|
|
|
|
.name = OVS_VPORT_MCGROUP,
|
2014-04-01 20:55:21 -07:00
|
|
|
};
|
|
|
|
|
2014-03-29 15:52:32 -07:00
|
|
|
/* Check if need to build a reply message.
|
2014-10-20 15:19:10 -07:00
|
|
|
* OVS userspace sets the NLM_F_ECHO flag if it needs the reply.
|
|
|
|
*/
|
2014-09-20 06:25:23 -07:00
|
|
|
static bool ovs_must_notify(struct genl_family *family, struct genl_info *info,
|
|
|
|
unsigned int group)
|
2014-03-29 15:52:32 -07:00
|
|
|
{
|
|
|
|
return info->nlhdr->nlmsg_flags & NLM_F_ECHO ||
|
2015-02-03 21:53:36 +01:00
|
|
|
genl_has_listeners(family, genl_info_net(info), group);
|
2014-03-29 15:52:32 -07:00
|
|
|
}
|
|
|
|
|
2019-11-25 14:20:44 -08:00
|
|
|
static void ovs_notify(struct genl_family *family,
|
|
|
|
const struct genl_multicast_group *grp,
|
2014-04-01 20:55:21 -07:00
|
|
|
struct sk_buff *skb, struct genl_info *info)
|
2013-03-29 18:24:06 -07:00
|
|
|
{
|
2016-07-18 15:13:15 -07:00
|
|
|
genl_notify(family, skb, info, GROUP_ID(grp), GFP_KERNEL);
|
2013-03-29 18:24:06 -07:00
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/**
|
|
|
|
* DOC: Locking:
|
2009-07-08 13:19:16 -07:00
|
|
|
*
|
2013-04-12 15:57:09 -07:00
|
|
|
* All writes e.g. Writes to device state (add/remove datapath, port, set
|
|
|
|
* operations on vports, etc.), Writes to other state (flow table
|
|
|
|
* modifications, set miscellaneous datapath parameters, etc.) are protected
|
|
|
|
* by ovs_lock.
|
2011-01-26 12:49:06 -08:00
|
|
|
*
|
|
|
|
* Reads are protected by RCU.
|
|
|
|
*
|
|
|
|
* There are a few special cases (mostly stats) that have their own
|
|
|
|
* synchronization but they nest under all of above and don't interact with
|
|
|
|
* each other.
|
2013-04-12 15:57:09 -07:00
|
|
|
*
|
|
|
|
* The RTNL lock nests inside ovs_mutex.
|
2009-07-08 13:19:16 -07:00
|
|
|
*/
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
static DEFINE_MUTEX(ovs_mutex);
|
|
|
|
|
|
|
|
void ovs_lock(void)
|
|
|
|
{
|
|
|
|
mutex_lock(&ovs_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ovs_unlock(void)
|
|
|
|
{
|
|
|
|
mutex_unlock(&ovs_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_LOCKDEP
|
|
|
|
int lockdep_ovsl_is_held(void)
|
|
|
|
{
|
|
|
|
if (debug_locks)
|
|
|
|
return lockdep_is_held(&ovs_mutex);
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-12-16 16:51:07 -08:00
|
|
|
static int queue_gso_packets(struct datapath *dp, struct sk_buff *,
|
2014-09-23 16:02:35 +02:00
|
|
|
const struct sw_flow_key *,
|
2016-06-24 07:42:29 -07:00
|
|
|
const struct dp_upcall_info *,
|
|
|
|
uint32_t cutlen);
|
2013-12-16 16:51:07 -08:00
|
|
|
static int queue_userspace_packet(struct datapath *dp, struct sk_buff *,
|
2014-11-08 07:24:42 -08:00
|
|
|
const struct sw_flow_key *,
|
2016-06-24 07:42:29 -07:00
|
|
|
const struct dp_upcall_info *,
|
|
|
|
uint32_t cutlen);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
/* Must be called with rcu_read_lock or ovs_mutex. */
|
2011-11-21 17:15:20 -08:00
|
|
|
const char *ovs_dp_name(const struct datapath *dp)
|
2010-04-12 15:53:39 -04:00
|
|
|
{
|
2013-04-12 15:57:09 -07:00
|
|
|
struct vport *vport = ovs_vport_ovsl_rcu(dp, OVSP_LOCAL);
|
2015-12-03 11:40:53 -08:00
|
|
|
return ovs_vport_name(vport);
|
2010-04-12 15:53:39 -04:00
|
|
|
}
|
|
|
|
|
2014-09-23 16:02:35 +02:00
|
|
|
static int get_dpifindex(const struct datapath *dp)
|
2011-09-15 16:41:36 -07:00
|
|
|
{
|
|
|
|
struct vport *local;
|
|
|
|
int ifindex;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
|
2012-02-16 17:12:36 -08:00
|
|
|
local = ovs_vport_rcu(dp, OVSP_LOCAL);
|
2011-09-15 16:41:36 -07:00
|
|
|
if (local)
|
2015-12-03 11:40:53 -08:00
|
|
|
ifindex = local->dev->ifindex;
|
2011-09-15 16:41:36 -07:00
|
|
|
else
|
|
|
|
ifindex = 0;
|
|
|
|
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return ifindex;
|
|
|
|
}
|
|
|
|
|
2011-01-05 12:39:57 -08:00
|
|
|
static void destroy_dp_rcu(struct rcu_head *rcu)
|
|
|
|
{
|
|
|
|
struct datapath *dp = container_of(rcu, struct datapath, rcu);
|
|
|
|
|
2014-04-23 08:33:38 -07:00
|
|
|
ovs_flow_tbl_destroy(&dp->table);
|
2011-01-05 12:39:57 -08:00
|
|
|
free_percpu(dp->stats_percpu);
|
2012-02-16 17:12:36 -08:00
|
|
|
kfree(dp->ports);
|
2018-02-13 15:48:24 -08:00
|
|
|
ovs_meters_exit(dp);
|
2012-12-27 13:48:51 -08:00
|
|
|
kfree(dp);
|
2011-01-05 12:39:57 -08:00
|
|
|
}
|
|
|
|
|
2012-02-16 17:12:36 -08:00
|
|
|
static struct hlist_head *vport_hash_bucket(const struct datapath *dp,
|
|
|
|
u16 port_no)
|
|
|
|
{
|
|
|
|
return &dp->ports[port_no & (DP_VPORT_HASH_BUCKETS - 1)];
|
|
|
|
}
|
|
|
|
|
2014-03-25 09:12:44 -07:00
|
|
|
/* Called with ovs_mutex or RCU read lock. */
|
2012-02-16 17:12:36 -08:00
|
|
|
struct vport *ovs_lookup_vport(const struct datapath *dp, u16 port_no)
|
|
|
|
{
|
|
|
|
struct vport *vport;
|
|
|
|
struct hlist_head *head;
|
|
|
|
|
|
|
|
head = vport_hash_bucket(dp, port_no);
|
datapath: hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jesse Gross <jesse@nicira.com>
2013-03-14 18:40:32 -07:00
|
|
|
hlist_for_each_entry_rcu(vport, head, dp_hash_node) {
|
2012-02-16 17:12:36 -08:00
|
|
|
if (vport->port_no == port_no)
|
|
|
|
return vport;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
/* Called with ovs_mutex. */
|
2011-01-26 12:28:59 -08:00
|
|
|
static struct vport *new_vport(const struct vport_parms *parms)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2010-04-12 15:53:39 -04:00
|
|
|
struct vport *vport;
|
|
|
|
|
2011-11-21 17:15:20 -08:00
|
|
|
vport = ovs_vport_add(parms);
|
2011-01-26 12:28:59 -08:00
|
|
|
if (!IS_ERR(vport)) {
|
|
|
|
struct datapath *dp = parms->dp;
|
2012-02-16 17:12:36 -08:00
|
|
|
struct hlist_head *head = vport_hash_bucket(dp, vport->port_no);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2012-02-16 17:12:36 -08:00
|
|
|
hlist_add_head_rcu(&vport->dp_hash_node, head);
|
2011-01-26 12:28:59 -08:00
|
|
|
}
|
|
|
|
return vport;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-11-21 17:15:20 -08:00
|
|
|
void ovs_dp_detach_port(struct vport *p)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2013-04-12 15:57:09 -07:00
|
|
|
ASSERT_OVSL();
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
/* First drop references to device. */
|
2012-02-16 17:12:36 -08:00
|
|
|
hlist_del_rcu(&p->dp_hash_node);
|
2010-04-12 15:53:39 -04:00
|
|
|
|
2010-12-03 15:44:51 -08:00
|
|
|
/* Then destroy it. */
|
2011-11-21 17:15:20 -08:00
|
|
|
ovs_vport_del(p);
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2014-08-05 13:49:57 -07:00
|
|
|
/* Must be called with rcu_read_lock. */
|
2014-09-17 18:58:44 -07:00
|
|
|
void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2014-04-08 11:13:42 +00:00
|
|
|
const struct vport *p = OVS_CB(skb)->input_vport;
|
2009-07-08 13:19:16 -07:00
|
|
|
struct datapath *dp = p->dp;
|
2011-09-09 19:09:47 -07:00
|
|
|
struct sw_flow *flow;
|
2014-08-21 20:25:47 +03:00
|
|
|
struct sw_flow_actions *sf_acts;
|
2009-07-08 13:19:16 -07:00
|
|
|
struct dp_stats_percpu *stats;
|
2011-10-06 21:52:39 -07:00
|
|
|
u64 *stats_counter;
|
2013-10-21 14:37:33 -07:00
|
|
|
u32 n_mask_hit;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2012-11-16 13:21:36 -08:00
|
|
|
stats = this_cpu_ptr(dp->stats_percpu);
|
2010-02-28 12:17:16 -05:00
|
|
|
|
2013-03-18 14:03:59 -07:00
|
|
|
/* Look up flow. */
|
2014-09-17 18:58:44 -07:00
|
|
|
flow = ovs_flow_tbl_lookup_stats(&dp->table, key, skb_get_hash(skb),
|
2014-04-23 08:34:08 -07:00
|
|
|
&n_mask_hit);
|
2013-03-18 14:03:59 -07:00
|
|
|
if (unlikely(!flow)) {
|
|
|
|
struct dp_upcall_info upcall;
|
2014-09-07 14:49:02 -07:00
|
|
|
int error;
|
2013-03-18 14:03:59 -07:00
|
|
|
|
2015-06-11 09:43:58 -07:00
|
|
|
memset(&upcall, 0, sizeof(upcall));
|
2013-03-18 14:03:59 -07:00
|
|
|
upcall.cmd = OVS_PACKET_CMD_MISS;
|
2014-04-14 23:37:10 -07:00
|
|
|
upcall.portid = ovs_vport_find_upcall_portid(p, skb);
|
2015-12-02 23:53:50 -08:00
|
|
|
upcall.mru = OVS_CB(skb)->mru;
|
2016-06-24 07:42:29 -07:00
|
|
|
error = ovs_dp_upcall(dp, skb, key, &upcall, 0);
|
2014-09-07 14:49:02 -07:00
|
|
|
if (unlikely(error))
|
|
|
|
kfree_skb(skb);
|
|
|
|
else
|
|
|
|
consume_skb(skb);
|
2013-03-18 14:03:59 -07:00
|
|
|
stats_counter = &stats->n_missed;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2014-09-17 18:58:44 -07:00
|
|
|
ovs_flow_stats_update(flow, key->tp.flags, skb);
|
2014-08-21 20:25:47 +03:00
|
|
|
sf_acts = rcu_dereference(flow->sf_acts);
|
2014-11-08 07:24:42 -08:00
|
|
|
ovs_execute_actions(dp, skb, sf_acts, key);
|
|
|
|
|
2013-10-23 14:34:39 -07:00
|
|
|
stats_counter = &stats->n_hit;
|
datapath: Detect and suppress flows that are implicated in loops.
In-kernel loops need to be suppressed; otherwise, they cause high CPU
consumption, even to the point that the machine becomes unusable. Ideally
these flows should never be added to the Open vSwitch flow table, but it
is fairly easy for a buggy controller to create them given the menagerie
of tunnels, patches, etc. that OVS makes available.
Commit ecbb6953b "datapath: Add loop checking" did the initial work
toward suppressing loops, by dropping packets that recursed more than 5
times. This at least prevented the kernel stack from overflowing and
thereby OOPSing the machine. But even with this commit, it is still
possible to waste a lot of CPU time due to loops. The problem is not
limited to 5 recursive calls per packet: any packet can be sent to
multiple destinations, which in turn can themselves be sent to multiple
destinations, and so on. We have actually seen in practice a case where
each packet was, apparently, sent to at least 2 destinations per hop, so
that each packet actually consumed CPU time for 2**5 == 32 packets,
possibly more.
This commit takes loop suppression a step further, by clearing the actions
of flows that are implicated in loops. Thus, after the first packet in
such a flow, later packets for either the "root" flow or for flows that
it ends up looping through are simply discarded, saving a huge amount of
CPU time.
This version of the commit just clears the actions from the flows that a
part of the loop. Probably, there should be some additional action to tell
ovs-vswitchd that a loop has been detected, so that it can in turn inform
the controller one way or another.
My test case was this:
ovs-controller -H --max-idle=permanent punix:/tmp/controller
ovs-vsctl -- \
set-controller br0 unix:/tmp/controller -- \
add-port br0 patch00 -- \
add-port br0 patch01 -- \
add-port br0 patch10 -- \
add-port br0 patch11 -- \
add-port br0 patch20 -- \
add-port br0 patch21 -- \
add-port br0 patch30 -- \
add-port br0 patch31 -- \
set Interface patch00 type=patch options:peer=patch01 -- \
set Interface patch01 type=patch options:peer=patch00 -- \
set Interface patch10 type=patch options:peer=patch11 -- \
set Interface patch11 type=patch options:peer=patch10 -- \
set Interface patch20 type=patch options:peer=patch21 -- \
set Interface patch21 type=patch options:peer=patch20 -- \
set Interface patch30 type=patch options:peer=patch31 -- \
set Interface patch31 type=patch options:peer=patch30
followed by sending a single "ping" packet from an attached Ethernet
port into the bridge. After this, without this commit the vswitch
userspace and kernel consume 50-75% of the machine's CPU (in my KVM
test setup on a single physical host); with this commit, some CPU is
consumed initially but it converges on 0% quickly.
A more challenging test sends a series of packets in multiple flows;
I used "hping3" with its default options. Without this commit, the
vswitch consumes 100% of the machine's CPU, most of which is in the
kernel. With this commit, the vswitch consumes "only" 33-50% CPU,
most of which is in userspace, so the machine is more responsive.
A refinement on this commit would be to pass the loop counter down to
userspace as part of the odp_msg struct and then back up as part of
the ODP_EXECUTE command arguments. This would, presumably, reduce
the CPU requirements, since it would allow loop detection to happen
earlier, during initial setup of flows, instead of just on the second
and subsequent packets of flows.
2010-08-03 14:40:29 -07:00
|
|
|
|
2010-05-12 12:40:45 -07:00
|
|
|
out:
|
datapath: Detect and suppress flows that are implicated in loops.
In-kernel loops need to be suppressed; otherwise, they cause high CPU
consumption, even to the point that the machine becomes unusable. Ideally
these flows should never be added to the Open vSwitch flow table, but it
is fairly easy for a buggy controller to create them given the menagerie
of tunnels, patches, etc. that OVS makes available.
Commit ecbb6953b "datapath: Add loop checking" did the initial work
toward suppressing loops, by dropping packets that recursed more than 5
times. This at least prevented the kernel stack from overflowing and
thereby OOPSing the machine. But even with this commit, it is still
possible to waste a lot of CPU time due to loops. The problem is not
limited to 5 recursive calls per packet: any packet can be sent to
multiple destinations, which in turn can themselves be sent to multiple
destinations, and so on. We have actually seen in practice a case where
each packet was, apparently, sent to at least 2 destinations per hop, so
that each packet actually consumed CPU time for 2**5 == 32 packets,
possibly more.
This commit takes loop suppression a step further, by clearing the actions
of flows that are implicated in loops. Thus, after the first packet in
such a flow, later packets for either the "root" flow or for flows that
it ends up looping through are simply discarded, saving a huge amount of
CPU time.
This version of the commit just clears the actions from the flows that a
part of the loop. Probably, there should be some additional action to tell
ovs-vswitchd that a loop has been detected, so that it can in turn inform
the controller one way or another.
My test case was this:
ovs-controller -H --max-idle=permanent punix:/tmp/controller
ovs-vsctl -- \
set-controller br0 unix:/tmp/controller -- \
add-port br0 patch00 -- \
add-port br0 patch01 -- \
add-port br0 patch10 -- \
add-port br0 patch11 -- \
add-port br0 patch20 -- \
add-port br0 patch21 -- \
add-port br0 patch30 -- \
add-port br0 patch31 -- \
set Interface patch00 type=patch options:peer=patch01 -- \
set Interface patch01 type=patch options:peer=patch00 -- \
set Interface patch10 type=patch options:peer=patch11 -- \
set Interface patch11 type=patch options:peer=patch10 -- \
set Interface patch20 type=patch options:peer=patch21 -- \
set Interface patch21 type=patch options:peer=patch20 -- \
set Interface patch30 type=patch options:peer=patch31 -- \
set Interface patch31 type=patch options:peer=patch30
followed by sending a single "ping" packet from an attached Ethernet
port into the bridge. After this, without this commit the vswitch
userspace and kernel consume 50-75% of the machine's CPU (in my KVM
test setup on a single physical host); with this commit, some CPU is
consumed initially but it converges on 0% quickly.
A more challenging test sends a series of packets in multiple flows;
I used "hping3" with its default options. Without this commit, the
vswitch consumes 100% of the machine's CPU, most of which is in the
kernel. With this commit, the vswitch consumes "only" 33-50% CPU,
most of which is in userspace, so the machine is more responsive.
A refinement on this commit would be to pass the loop counter down to
userspace as part of the odp_msg struct and then back up as part of
the ODP_EXECUTE command arguments. This would, presumably, reduce
the CPU requirements, since it would allow loop detection to happen
earlier, during initial setup of flows, instead of just on the second
and subsequent packets of flows.
2010-08-03 14:40:29 -07:00
|
|
|
/* Update datapath statistics. */
|
2014-09-12 14:12:24 -07:00
|
|
|
u64_stats_update_begin(&stats->syncp);
|
2011-10-06 21:52:39 -07:00
|
|
|
(*stats_counter)++;
|
2013-10-21 14:37:33 -07:00
|
|
|
stats->n_mask_hit += n_mask_hit;
|
2014-09-12 14:12:24 -07:00
|
|
|
u64_stats_update_end(&stats->syncp);
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-11-21 17:15:20 -08:00
|
|
|
int ovs_dp_upcall(struct datapath *dp, struct sk_buff *skb,
|
2014-09-23 16:02:35 +02:00
|
|
|
const struct sw_flow_key *key,
|
2016-06-24 07:42:29 -07:00
|
|
|
const struct dp_upcall_info *upcall_info,
|
|
|
|
uint32_t cutlen)
|
2011-01-28 18:18:25 -08:00
|
|
|
{
|
|
|
|
struct dp_stats_percpu *stats;
|
|
|
|
int err;
|
|
|
|
|
2012-12-19 17:43:09 +09:00
|
|
|
if (upcall_info->portid == 0) {
|
2011-09-14 13:05:09 -07:00
|
|
|
err = -ENOTCONN;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
if (!skb_is_gso(skb))
|
2016-06-24 07:42:29 -07:00
|
|
|
err = queue_userspace_packet(dp, skb, key, upcall_info, cutlen);
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
else
|
2016-06-24 07:42:29 -07:00
|
|
|
err = queue_gso_packets(dp, skb, key, upcall_info, cutlen);
|
2011-02-28 14:26:39 -08:00
|
|
|
if (err)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
return 0;
|
2011-01-28 18:18:25 -08:00
|
|
|
|
|
|
|
err:
|
2012-11-16 13:21:36 -08:00
|
|
|
stats = this_cpu_ptr(dp->stats_percpu);
|
2011-01-28 18:18:25 -08:00
|
|
|
|
2014-09-12 14:12:24 -07:00
|
|
|
u64_stats_update_begin(&stats->syncp);
|
2011-01-28 18:18:25 -08:00
|
|
|
stats->n_lost++;
|
2014-09-12 14:12:24 -07:00
|
|
|
u64_stats_update_end(&stats->syncp);
|
2011-01-28 18:18:25 -08:00
|
|
|
|
|
|
|
return err;
|
2011-01-26 13:41:54 -08:00
|
|
|
}
|
|
|
|
|
2013-12-16 16:51:07 -08:00
|
|
|
static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb,
|
2014-09-23 16:02:35 +02:00
|
|
|
const struct sw_flow_key *key,
|
2016-06-24 07:42:29 -07:00
|
|
|
const struct dp_upcall_info *upcall_info,
|
|
|
|
uint32_t cutlen)
|
2009-09-14 09:20:58 -07:00
|
|
|
{
|
2018-02-07 07:30:05 -08:00
|
|
|
#ifdef HAVE_SKB_GSO_UDP
|
2018-02-07 07:30:08 -08:00
|
|
|
unsigned int gso_type = skb_shinfo(skb)->gso_type;
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
struct sw_flow_key later_key;
|
2018-02-07 07:30:05 -08:00
|
|
|
#endif
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
struct sk_buff *segs, *nskb;
|
2014-09-20 21:10:49 -07:00
|
|
|
struct ovs_skb_cb ovs_cb;
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
int err;
|
2009-09-14 09:20:58 -07:00
|
|
|
|
2014-09-20 21:10:49 -07:00
|
|
|
ovs_cb = *OVS_CB(skb);
|
2013-12-16 17:03:45 -08:00
|
|
|
segs = __skb_gso_segment(skb, NETIF_F_SG, false);
|
2014-09-20 21:10:49 -07:00
|
|
|
*OVS_CB(skb) = ovs_cb;
|
2012-06-12 11:19:16 -07:00
|
|
|
if (IS_ERR(segs))
|
|
|
|
return PTR_ERR(segs);
|
2014-10-21 14:10:41 -07:00
|
|
|
if (segs == NULL)
|
|
|
|
return -EINVAL;
|
2018-02-07 07:30:05 -08:00
|
|
|
#ifdef HAVE_SKB_GSO_UDP
|
2014-07-29 10:04:52 -07:00
|
|
|
if (gso_type & SKB_GSO_UDP) {
|
2014-07-29 15:25:02 -07:00
|
|
|
/* The initial flow key extracted by ovs_flow_key_extract()
|
2014-07-29 10:04:52 -07:00
|
|
|
* in this case is for a first fragment, so we need to
|
|
|
|
* properly mark later fragments.
|
|
|
|
*/
|
2014-09-17 18:58:44 -07:00
|
|
|
later_key = *key;
|
2014-07-29 10:04:52 -07:00
|
|
|
later_key.ip.frag = OVS_FRAG_TYPE_LATER;
|
|
|
|
}
|
2018-02-07 07:30:05 -08:00
|
|
|
#endif
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
/* Queue all of the segments. */
|
|
|
|
skb = segs;
|
2009-09-14 09:20:58 -07:00
|
|
|
do {
|
2014-09-20 21:10:49 -07:00
|
|
|
*OVS_CB(skb) = ovs_cb;
|
2018-02-07 07:30:05 -08:00
|
|
|
#ifdef HAVE_SKB_GSO_UDP
|
2014-07-29 10:04:52 -07:00
|
|
|
if (gso_type & SKB_GSO_UDP && skb != segs)
|
2014-09-17 18:58:44 -07:00
|
|
|
key = &later_key;
|
2018-02-07 07:30:05 -08:00
|
|
|
#endif
|
2016-06-24 07:42:29 -07:00
|
|
|
err = queue_userspace_packet(dp, skb, key, upcall_info, cutlen);
|
2011-01-26 13:41:54 -08:00
|
|
|
if (err)
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
break;
|
datapath: Report kernel's flow key when passing packets up to userspace.
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.
This commit takes one step in that direction by making the kernel report
its idea of the flow that a packet belongs to whenever it passes a packet
up to userspace. This means that userspace can intelligently figure out
what to do:
- If userspace's notion of the flow for the packet matches the kernel's,
then nothing special is necessary.
- If the kernel has a more specific notion for the flow than userspace,
for example if the kernel decoded IPv6 headers but userspace stopped
at the Ethernet type (because it does not understand IPv6), then again
nothing special is necessary: userspace can still set up the flow in
the usual way.
- If userspace has a more specific notion for the flow than the kernel,
for example if userspace decoded an IPv6 header but the kernel
stopped at the Ethernet type, then userspace can forward the packet
manually, without setting up a flow in the kernel. (This case is
bad from a performance point of view, but at least it is correct.)
This commit does not actually make userspace flexible enough to handle
changes in the kernel flow key structure, although userspace does now
have enough information to do that intelligently. This will have to wait
for later commits.
This commit is bigger than it would otherwise be because it is rolled
together with changing "struct odp_msg" to a sequence of Netlink
attributes. The alternative, to do each of those changes in a separate
patch, seemed like overkill because it meant that either we would have to
introduce and then kill off Netlink attributes for in_port and tun_id, if
Netlink conversion went first, or shove yet another variable-length header
into the stuff already after odp_msg, if adding the flow key to odp_msg
went first.
This commit will slow down performance of checksumming packets sent up to
userspace. I'm not entirely pleased with how I did it. I considered a
couple of alternatives, but none of them seemed that much better.
Suggestions welcome. Not changing anything wasn't an option,
unfortunately. At any rate some slowdown will become unavoidable when OVS
actually starts using Netlink instead of just Netlink framing.
(Actually, I thought of one option where we could avoid that: make
userspace do the checksum instead, by passing csum_start and csum_offset as
part of what goes to userspace. But that's not perfect either.)
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
2011-01-24 14:59:57 -08:00
|
|
|
|
2011-09-29 16:33:06 -07:00
|
|
|
} while ((skb = skb->next));
|
2009-09-14 09:20:58 -07:00
|
|
|
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
/* Free all of the segments. */
|
|
|
|
skb = segs;
|
|
|
|
do {
|
|
|
|
nskb = skb->next;
|
|
|
|
if (err)
|
|
|
|
kfree_skb(skb);
|
|
|
|
else
|
|
|
|
consume_skb(skb);
|
|
|
|
} while ((skb = nskb));
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2014-08-17 20:19:36 -07:00
|
|
|
static size_t upcall_msg_size(const struct dp_upcall_info *upcall_info,
|
datapath: fix skb_panic due to the incorrect actions attrlen
Upstream commit:
commit 494bea39f3201776cdfddc232705f54a0bd210c4
Author: Liping Zhang <zlpnobody@gmail.com>
Date: Wed Aug 16 13:30:07 2017 +0800
openvswitch: fix skb_panic due to the incorrect actions attrlen
For sw_flow_actions, the actions_len only represents the kernel part's
size, and when we dump the actions to the userspace, we will do the
convertions, so it's true size may become bigger than the actions_len.
But unfortunately, for OVS_PACKET_ATTR_ACTIONS, we use the actions_len
to alloc the skbuff, so the user_skb's size may become insufficient and
oops will happen like this:
skbuff: skb_over_panic: text:ffffffff8148fabf len:1749 put:157 head:
ffff881300f39000 data:ffff881300f39000 tail:0x6d5 end:0x6c0 dev:<NULL>
------------[ cut here ]------------
kernel BUG at net/core/skbuff.c:129!
[...]
Call Trace:
<IRQ>
[<ffffffff8148be82>] skb_put+0x43/0x44
[<ffffffff8148fabf>] skb_zerocopy+0x6c/0x1f4
[<ffffffffa0290d36>] queue_userspace_packet+0x3a3/0x448 [openvswitch]
[<ffffffffa0292023>] ovs_dp_upcall+0x30/0x5c [openvswitch]
[<ffffffffa028d435>] output_userspace+0x132/0x158 [openvswitch]
[<ffffffffa01e6890>] ? ip6_rcv_finish+0x74/0x77 [ipv6]
[<ffffffffa028e277>] do_execute_actions+0xcc1/0xdc8 [openvswitch]
[<ffffffffa028e3f2>] ovs_execute_actions+0x74/0x106 [openvswitch]
[<ffffffffa0292130>] ovs_dp_process_packet+0xe1/0xfd [openvswitch]
[<ffffffffa0292b77>] ? key_extract+0x63c/0x8d5 [openvswitch]
[<ffffffffa029848b>] ovs_vport_receive+0xa1/0xc3 [openvswitch]
[...]
Also we can find that the actions_len is much little than the orig_len:
crash> struct sw_flow_actions 0xffff8812f539d000
struct sw_flow_actions {
rcu = {
next = 0xffff8812f5398800,
func = 0xffffe3b00035db32
},
orig_len = 1384,
actions_len = 592,
actions = 0xffff8812f539d01c
}
So as a quick fix, use the orig_len instead of the actions_len to alloc
the user_skb.
Last, this oops happened on our system running a relative old kernel, but
the same risk still exists on the mainline, since we use the wrong
actions_len from the beginning.
Fixes: ccea74457bbd ("openvswitch: include datapath actions with sampled-pac
Cc: Neil McKee <neil.mckee@inmon.com>
Signed-off-by: Liping Zhang <zlpnobody@gmail.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Fixes: 0e469d3b380c ("datapath: Include datapath actions with sampled-packet upcall to userspace.")
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Andy Zhou <azhou@ovn.org>
2017-09-11 14:10:59 -07:00
|
|
|
unsigned int hdrlen, int actions_attrlen)
|
2013-03-29 18:18:58 -07:00
|
|
|
{
|
|
|
|
size_t size = NLMSG_ALIGN(sizeof(struct ovs_header))
|
2013-12-16 16:56:03 -08:00
|
|
|
+ nla_total_size(hdrlen) /* OVS_PACKET_ATTR_PACKET */
|
2016-06-24 15:50:58 -07:00
|
|
|
+ nla_total_size(ovs_key_attr_size()) /* OVS_PACKET_ATTR_KEY */
|
|
|
|
+ nla_total_size(sizeof(unsigned int)); /* OVS_PACKET_ATTR_LEN */
|
2013-03-29 18:18:58 -07:00
|
|
|
|
|
|
|
/* OVS_PACKET_ATTR_USERDATA */
|
2014-08-17 20:19:36 -07:00
|
|
|
if (upcall_info->userdata)
|
|
|
|
size += NLA_ALIGN(upcall_info->userdata->nla_len);
|
|
|
|
|
|
|
|
/* OVS_PACKET_ATTR_EGRESS_TUN_KEY */
|
|
|
|
if (upcall_info->egress_tun_info)
|
|
|
|
size += nla_total_size(ovs_tun_key_attr_size());
|
2013-03-29 18:18:58 -07:00
|
|
|
|
2015-06-11 09:43:58 -07:00
|
|
|
/* OVS_PACKET_ATTR_ACTIONS */
|
|
|
|
if (upcall_info->actions_len)
|
datapath: fix skb_panic due to the incorrect actions attrlen
Upstream commit:
commit 494bea39f3201776cdfddc232705f54a0bd210c4
Author: Liping Zhang <zlpnobody@gmail.com>
Date: Wed Aug 16 13:30:07 2017 +0800
openvswitch: fix skb_panic due to the incorrect actions attrlen
For sw_flow_actions, the actions_len only represents the kernel part's
size, and when we dump the actions to the userspace, we will do the
convertions, so it's true size may become bigger than the actions_len.
But unfortunately, for OVS_PACKET_ATTR_ACTIONS, we use the actions_len
to alloc the skbuff, so the user_skb's size may become insufficient and
oops will happen like this:
skbuff: skb_over_panic: text:ffffffff8148fabf len:1749 put:157 head:
ffff881300f39000 data:ffff881300f39000 tail:0x6d5 end:0x6c0 dev:<NULL>
------------[ cut here ]------------
kernel BUG at net/core/skbuff.c:129!
[...]
Call Trace:
<IRQ>
[<ffffffff8148be82>] skb_put+0x43/0x44
[<ffffffff8148fabf>] skb_zerocopy+0x6c/0x1f4
[<ffffffffa0290d36>] queue_userspace_packet+0x3a3/0x448 [openvswitch]
[<ffffffffa0292023>] ovs_dp_upcall+0x30/0x5c [openvswitch]
[<ffffffffa028d435>] output_userspace+0x132/0x158 [openvswitch]
[<ffffffffa01e6890>] ? ip6_rcv_finish+0x74/0x77 [ipv6]
[<ffffffffa028e277>] do_execute_actions+0xcc1/0xdc8 [openvswitch]
[<ffffffffa028e3f2>] ovs_execute_actions+0x74/0x106 [openvswitch]
[<ffffffffa0292130>] ovs_dp_process_packet+0xe1/0xfd [openvswitch]
[<ffffffffa0292b77>] ? key_extract+0x63c/0x8d5 [openvswitch]
[<ffffffffa029848b>] ovs_vport_receive+0xa1/0xc3 [openvswitch]
[...]
Also we can find that the actions_len is much little than the orig_len:
crash> struct sw_flow_actions 0xffff8812f539d000
struct sw_flow_actions {
rcu = {
next = 0xffff8812f5398800,
func = 0xffffe3b00035db32
},
orig_len = 1384,
actions_len = 592,
actions = 0xffff8812f539d01c
}
So as a quick fix, use the orig_len instead of the actions_len to alloc
the user_skb.
Last, this oops happened on our system running a relative old kernel, but
the same risk still exists on the mainline, since we use the wrong
actions_len from the beginning.
Fixes: ccea74457bbd ("openvswitch: include datapath actions with sampled-pac
Cc: Neil McKee <neil.mckee@inmon.com>
Signed-off-by: Liping Zhang <zlpnobody@gmail.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Fixes: 0e469d3b380c ("datapath: Include datapath actions with sampled-packet upcall to userspace.")
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Andy Zhou <azhou@ovn.org>
2017-09-11 14:10:59 -07:00
|
|
|
size += nla_total_size(actions_attrlen);
|
2015-06-11 09:43:58 -07:00
|
|
|
|
2015-12-02 23:53:50 -08:00
|
|
|
/* OVS_PACKET_ATTR_MRU */
|
|
|
|
if (upcall_info->mru)
|
|
|
|
size += nla_total_size(sizeof(upcall_info->mru));
|
|
|
|
|
2013-03-29 18:18:58 -07:00
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2015-12-02 23:53:50 -08:00
|
|
|
static void pad_packet(struct datapath *dp, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
if (!(dp->user_features & OVS_DP_F_UNALIGNED)) {
|
|
|
|
size_t plen = NLA_ALIGN(skb->len) - skb->len;
|
|
|
|
|
|
|
|
if (plen > 0)
|
compat: convert many more places to skb_put_zero().
Upstream commit:
commit de77b966ce8adcb4c58d50e2f087320d5479812a
Author: Johannes Berg <johannes.berg@intel.com>
Date: Fri Jun 16 14:29:19 2017 +0200
networking: convert many more places to skb_put_zero()
There were many places that my previous spatch didn't find,
as pointed out by yuan linyu in various patches.
The following spatch found many more and also removes the
now unnecessary casts:
@@
identifier p, p2;
expression len;
expression skb;
type t, t2;
@@
(
-p = skb_put(skb, len);
+p = skb_put_zero(skb, len);
|
-p = (t)skb_put(skb, len);
+p = skb_put_zero(skb, len);
)
... when != p
(
p2 = (t2)p;
-memset(p2, 0, len);
|
-memset(p, 0, len);
)
@@
type t, t2;
identifier p, p2;
expression skb;
@@
t *p;
...
(
-p = skb_put(skb, sizeof(t));
+p = skb_put_zero(skb, sizeof(t));
|
-p = (t *)skb_put(skb, sizeof(t));
+p = skb_put_zero(skb, sizeof(t));
)
... when != p
(
p2 = (t2)p;
-memset(p2, 0, sizeof(*p));
|
-memset(p, 0, sizeof(*p));
)
@@
expression skb, len;
@@
-memset(skb_put(skb, len), 0, len);
+skb_put_zero(skb, len);
Apply it to the tree (with one manual fixup to keep the
comment in vxlan.c, which spatch removed.)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Use e45a79da863c ("skbuff/mac80211: introduce and use skb_put_zero()")
as the basis for the backported function.
Upstream: de77b966ce8a ("networking: convert many more places to skb_put_zero()")
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Greg Rose <gvrose8192@gmail.com>
2017-07-21 16:46:07 -07:00
|
|
|
skb_put_zero(skb, plen);
|
2015-12-02 23:53:50 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-16 16:51:07 -08:00
|
|
|
static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
|
2014-09-23 16:02:35 +02:00
|
|
|
const struct sw_flow_key *key,
|
2016-06-24 07:42:29 -07:00
|
|
|
const struct dp_upcall_info *upcall_info,
|
|
|
|
uint32_t cutlen)
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
{
|
|
|
|
struct ovs_header *upcall;
|
2011-11-17 15:54:10 -08:00
|
|
|
struct sk_buff *nskb = NULL;
|
2014-09-02 13:31:12 -07:00
|
|
|
struct sk_buff *user_skb = NULL; /* to be queued to userspace */
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
struct nlattr *nla;
|
2014-02-04 21:58:03 -08:00
|
|
|
size_t len;
|
2013-12-16 16:56:03 -08:00
|
|
|
unsigned int hlen;
|
2013-12-16 16:51:07 -08:00
|
|
|
int err, dp_ifindex;
|
|
|
|
|
|
|
|
dp_ifindex = get_dpifindex(dp);
|
|
|
|
if (!dp_ifindex)
|
|
|
|
return -ENODEV;
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
2015-02-03 21:53:35 +01:00
|
|
|
if (skb_vlan_tag_present(skb)) {
|
2011-11-17 15:54:10 -08:00
|
|
|
nskb = skb_clone(skb, GFP_ATOMIC);
|
|
|
|
if (!nskb)
|
|
|
|
return -ENOMEM;
|
2013-09-04 11:35:13 -07:00
|
|
|
|
2016-02-29 09:54:15 -08:00
|
|
|
nskb = __vlan_hwaccel_push_inside(nskb);
|
2013-09-04 11:35:13 -07:00
|
|
|
if (!nskb)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2011-11-17 15:54:10 -08:00
|
|
|
skb = nskb;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nla_attr_size(skb->len) > USHRT_MAX) {
|
|
|
|
err = -EFBIG;
|
|
|
|
goto out;
|
|
|
|
}
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
2013-12-16 16:56:03 -08:00
|
|
|
/* Complete checksum if needed */
|
|
|
|
if (skb->ip_summed == CHECKSUM_PARTIAL &&
|
2017-07-21 16:46:05 -07:00
|
|
|
(err = skb_csum_hwoffload_help(skb, 0)))
|
2013-12-16 16:56:03 -08:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Older versions of OVS user space enforce alignment of the last
|
|
|
|
* Netlink attribute to NLA_ALIGNTO which would require extensive
|
|
|
|
* padding logic. Only perform zerocopy if padding is not required.
|
|
|
|
*/
|
|
|
|
if (dp->user_features & OVS_DP_F_UNALIGNED)
|
|
|
|
hlen = skb_zerocopy_headlen(skb);
|
|
|
|
else
|
|
|
|
hlen = skb->len;
|
|
|
|
|
datapath: fix skb_panic due to the incorrect actions attrlen
Upstream commit:
commit 494bea39f3201776cdfddc232705f54a0bd210c4
Author: Liping Zhang <zlpnobody@gmail.com>
Date: Wed Aug 16 13:30:07 2017 +0800
openvswitch: fix skb_panic due to the incorrect actions attrlen
For sw_flow_actions, the actions_len only represents the kernel part's
size, and when we dump the actions to the userspace, we will do the
convertions, so it's true size may become bigger than the actions_len.
But unfortunately, for OVS_PACKET_ATTR_ACTIONS, we use the actions_len
to alloc the skbuff, so the user_skb's size may become insufficient and
oops will happen like this:
skbuff: skb_over_panic: text:ffffffff8148fabf len:1749 put:157 head:
ffff881300f39000 data:ffff881300f39000 tail:0x6d5 end:0x6c0 dev:<NULL>
------------[ cut here ]------------
kernel BUG at net/core/skbuff.c:129!
[...]
Call Trace:
<IRQ>
[<ffffffff8148be82>] skb_put+0x43/0x44
[<ffffffff8148fabf>] skb_zerocopy+0x6c/0x1f4
[<ffffffffa0290d36>] queue_userspace_packet+0x3a3/0x448 [openvswitch]
[<ffffffffa0292023>] ovs_dp_upcall+0x30/0x5c [openvswitch]
[<ffffffffa028d435>] output_userspace+0x132/0x158 [openvswitch]
[<ffffffffa01e6890>] ? ip6_rcv_finish+0x74/0x77 [ipv6]
[<ffffffffa028e277>] do_execute_actions+0xcc1/0xdc8 [openvswitch]
[<ffffffffa028e3f2>] ovs_execute_actions+0x74/0x106 [openvswitch]
[<ffffffffa0292130>] ovs_dp_process_packet+0xe1/0xfd [openvswitch]
[<ffffffffa0292b77>] ? key_extract+0x63c/0x8d5 [openvswitch]
[<ffffffffa029848b>] ovs_vport_receive+0xa1/0xc3 [openvswitch]
[...]
Also we can find that the actions_len is much little than the orig_len:
crash> struct sw_flow_actions 0xffff8812f539d000
struct sw_flow_actions {
rcu = {
next = 0xffff8812f5398800,
func = 0xffffe3b00035db32
},
orig_len = 1384,
actions_len = 592,
actions = 0xffff8812f539d01c
}
So as a quick fix, use the orig_len instead of the actions_len to alloc
the user_skb.
Last, this oops happened on our system running a relative old kernel, but
the same risk still exists on the mainline, since we use the wrong
actions_len from the beginning.
Fixes: ccea74457bbd ("openvswitch: include datapath actions with sampled-pac
Cc: Neil McKee <neil.mckee@inmon.com>
Signed-off-by: Liping Zhang <zlpnobody@gmail.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Fixes: 0e469d3b380c ("datapath: Include datapath actions with sampled-packet upcall to userspace.")
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Andy Zhou <azhou@ovn.org>
2017-09-11 14:10:59 -07:00
|
|
|
len = upcall_msg_size(upcall_info, hlen - cutlen,
|
|
|
|
OVS_CB(skb)->acts_origlen);
|
2016-07-18 13:53:29 -07:00
|
|
|
user_skb = genlmsg_new(len, GFP_ATOMIC);
|
2011-11-17 15:54:10 -08:00
|
|
|
if (!user_skb) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
|
|
|
upcall = genlmsg_put(user_skb, 0, 0, &dp_packet_genl_family,
|
|
|
|
0, upcall_info->cmd);
|
2019-03-27 08:32:17 -07:00
|
|
|
if (!upcall) {
|
|
|
|
err = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
upcall->dp_ifindex = dp_ifindex;
|
|
|
|
|
2015-01-21 16:42:48 -08:00
|
|
|
err = ovs_nla_put_key(key, key, OVS_PACKET_ATTR_KEY, false, user_skb);
|
2014-06-12 13:19:25 -07:00
|
|
|
BUG_ON(err);
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
|
|
|
if (upcall_info->userdata)
|
2013-02-15 16:48:32 -08:00
|
|
|
__nla_put(user_skb, OVS_PACKET_ATTR_USERDATA,
|
2013-02-19 11:01:33 -08:00
|
|
|
nla_len(upcall_info->userdata),
|
2013-02-15 16:48:32 -08:00
|
|
|
nla_data(upcall_info->userdata));
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
2015-12-03 11:40:53 -08:00
|
|
|
|
2014-08-17 20:19:36 -07:00
|
|
|
if (upcall_info->egress_tun_info) {
|
2019-10-15 10:27:47 -07:00
|
|
|
nla = nla_nest_start_noflag(user_skb,
|
|
|
|
OVS_PACKET_ATTR_EGRESS_TUN_KEY);
|
2019-03-27 08:32:18 -07:00
|
|
|
if (!nla) {
|
|
|
|
err = -EMSGSIZE;
|
|
|
|
goto out;
|
|
|
|
}
|
2016-07-07 19:35:33 -07:00
|
|
|
err = ovs_nla_put_tunnel_info(user_skb,
|
|
|
|
upcall_info->egress_tun_info);
|
2014-08-17 20:19:36 -07:00
|
|
|
BUG_ON(err);
|
|
|
|
nla_nest_end(user_skb, nla);
|
|
|
|
}
|
|
|
|
|
2015-06-11 09:43:58 -07:00
|
|
|
if (upcall_info->actions_len) {
|
2019-10-15 10:27:47 -07:00
|
|
|
nla = nla_nest_start_noflag(user_skb, OVS_PACKET_ATTR_ACTIONS);
|
2019-03-27 08:32:18 -07:00
|
|
|
if (!nla) {
|
|
|
|
err = -EMSGSIZE;
|
|
|
|
goto out;
|
|
|
|
}
|
2015-06-11 09:43:58 -07:00
|
|
|
err = ovs_nla_put_actions(upcall_info->actions,
|
|
|
|
upcall_info->actions_len,
|
|
|
|
user_skb);
|
|
|
|
if (!err)
|
|
|
|
nla_nest_end(user_skb, nla);
|
|
|
|
else
|
|
|
|
nla_nest_cancel(user_skb, nla);
|
|
|
|
}
|
|
|
|
|
2015-12-02 23:53:50 -08:00
|
|
|
/* Add OVS_PACKET_ATTR_MRU */
|
|
|
|
if (upcall_info->mru) {
|
|
|
|
if (nla_put_u16(user_skb, OVS_PACKET_ATTR_MRU,
|
|
|
|
upcall_info->mru)) {
|
|
|
|
err = -ENOBUFS;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
pad_packet(dp, user_skb);
|
|
|
|
}
|
|
|
|
|
2016-06-24 15:50:58 -07:00
|
|
|
/* Add OVS_PACKET_ATTR_LEN when packet is truncated */
|
|
|
|
if (cutlen > 0) {
|
|
|
|
if (nla_put_u32(user_skb, OVS_PACKET_ATTR_LEN,
|
|
|
|
skb->len)) {
|
|
|
|
err = -ENOBUFS;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
pad_packet(dp, user_skb);
|
|
|
|
}
|
|
|
|
|
2013-12-16 16:56:03 -08:00
|
|
|
/* Only reserve room for attribute header, packet data is added
|
2014-10-20 15:19:10 -07:00
|
|
|
* in skb_zerocopy()
|
|
|
|
*/
|
2013-12-16 16:56:03 -08:00
|
|
|
if (!(nla = nla_reserve(user_skb, OVS_PACKET_ATTR_PACKET, 0))) {
|
|
|
|
err = -ENOBUFS;
|
|
|
|
goto out;
|
|
|
|
}
|
2016-06-24 07:42:29 -07:00
|
|
|
nla->nla_len = nla_attr_size(skb->len - cutlen);
|
2011-11-10 19:31:24 -08:00
|
|
|
|
2016-06-24 07:42:29 -07:00
|
|
|
err = skb_zerocopy(user_skb, skb, skb->len - cutlen, hlen);
|
2014-04-11 17:16:48 +01:00
|
|
|
if (err)
|
|
|
|
goto out;
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
2014-01-14 01:27:02 -08:00
|
|
|
/* Pad OVS_PACKET_ATTR_PACKET if linear copy was performed */
|
2015-12-02 23:53:50 -08:00
|
|
|
pad_packet(dp, user_skb);
|
2014-01-14 01:27:02 -08:00
|
|
|
|
2013-12-16 16:56:03 -08:00
|
|
|
((struct nlmsghdr *) user_skb->data)->nlmsg_len = user_skb->len;
|
2011-11-17 15:54:10 -08:00
|
|
|
|
2013-12-16 16:56:03 -08:00
|
|
|
err = genlmsg_unicast(ovs_dp_get_net(dp), user_skb, upcall_info->portid);
|
2014-09-02 13:31:12 -07:00
|
|
|
user_skb = NULL;
|
2011-11-17 15:54:10 -08:00
|
|
|
out:
|
2014-04-11 17:16:48 +01:00
|
|
|
if (err)
|
|
|
|
skb_tx_error(skb);
|
2014-09-02 13:31:12 -07:00
|
|
|
kfree_skb(user_skb);
|
2011-11-17 15:54:10 -08:00
|
|
|
kfree_skb(nskb);
|
|
|
|
return err;
|
2009-09-14 09:20:58 -07:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header = info->userhdr;
|
2015-12-02 23:53:50 -08:00
|
|
|
struct net *net = sock_net(skb->sk);
|
2011-01-26 13:41:54 -08:00
|
|
|
struct nlattr **a = info->attrs;
|
2011-04-28 16:54:07 -07:00
|
|
|
struct sw_flow_actions *acts;
|
2011-01-26 13:41:54 -08:00
|
|
|
struct sk_buff *packet;
|
2011-04-28 16:54:07 -07:00
|
|
|
struct sw_flow *flow;
|
2014-08-21 20:25:47 +03:00
|
|
|
struct sw_flow_actions *sf_acts;
|
2011-01-23 19:08:06 -08:00
|
|
|
struct datapath *dp;
|
2014-04-08 11:13:42 +00:00
|
|
|
struct vport *input_vport;
|
2015-12-02 23:53:50 -08:00
|
|
|
u16 mru = 0;
|
2011-03-30 14:54:26 -07:00
|
|
|
int len;
|
2011-01-26 15:42:00 -08:00
|
|
|
int err;
|
2015-01-15 00:17:31 +01:00
|
|
|
bool log = !a[OVS_PACKET_ATTR_PROBE];
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-23 19:08:06 -08:00
|
|
|
err = -EINVAL;
|
2011-08-18 10:35:40 -07:00
|
|
|
if (!a[OVS_PACKET_ATTR_PACKET] || !a[OVS_PACKET_ATTR_KEY] ||
|
2013-03-29 18:03:05 -07:00
|
|
|
!a[OVS_PACKET_ATTR_ACTIONS])
|
2011-03-24 17:06:58 -07:00
|
|
|
goto err;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
len = nla_len(a[OVS_PACKET_ATTR_PACKET]);
|
2011-03-30 14:54:26 -07:00
|
|
|
packet = __dev_alloc_skb(NET_IP_ALIGN + len, GFP_KERNEL);
|
2011-01-23 19:08:06 -08:00
|
|
|
err = -ENOMEM;
|
|
|
|
if (!packet)
|
2011-03-24 17:06:58 -07:00
|
|
|
goto err;
|
2011-03-30 14:54:26 -07:00
|
|
|
skb_reserve(packet, NET_IP_ALIGN);
|
|
|
|
|
2013-03-29 18:10:31 -07:00
|
|
|
nla_memcpy(__skb_put(packet, len), a[OVS_PACKET_ATTR_PACKET], len);
|
2010-04-02 16:46:18 -04:00
|
|
|
|
2015-12-02 23:53:50 -08:00
|
|
|
/* Set packet's mru */
|
|
|
|
if (a[OVS_PACKET_ATTR_MRU]) {
|
|
|
|
mru = nla_get_u16(a[OVS_PACKET_ATTR_MRU]);
|
|
|
|
packet->ignore_df = 1;
|
|
|
|
}
|
|
|
|
OVS_CB(packet)->mru = mru;
|
|
|
|
|
2011-04-28 16:54:07 -07:00
|
|
|
/* Build an sw_flow for sending this packet. */
|
2014-02-18 09:07:03 -08:00
|
|
|
flow = ovs_flow_alloc();
|
2011-04-28 16:54:07 -07:00
|
|
|
err = PTR_ERR(flow);
|
|
|
|
if (IS_ERR(flow))
|
2011-03-24 17:06:58 -07:00
|
|
|
goto err_kfree_skb;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2015-12-02 23:53:52 -08:00
|
|
|
err = ovs_flow_key_extract_userspace(net, a[OVS_PACKET_ATTR_KEY],
|
|
|
|
packet, &flow->key, log);
|
2011-04-28 16:54:07 -07:00
|
|
|
if (err)
|
2012-10-30 16:34:50 -07:00
|
|
|
goto err_flow_free;
|
2011-04-28 16:54:07 -07:00
|
|
|
|
2015-12-02 23:53:50 -08:00
|
|
|
err = ovs_nla_copy_actions(net, a[OVS_PACKET_ATTR_ACTIONS],
|
2014-09-12 11:20:13 -07:00
|
|
|
&flow->key, &acts, log);
|
2013-01-18 18:10:59 -08:00
|
|
|
if (err)
|
|
|
|
goto err_flow_free;
|
2011-04-28 16:54:07 -07:00
|
|
|
|
2014-08-07 12:51:14 -07:00
|
|
|
rcu_assign_pointer(flow->sf_acts, acts);
|
2011-11-01 10:13:16 -07:00
|
|
|
packet->priority = flow->key.phy.priority;
|
2013-08-26 13:27:02 -07:00
|
|
|
packet->mark = flow->key.phy.skb_mark;
|
2011-04-28 16:54:07 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
rcu_read_lock();
|
2015-12-02 23:53:50 -08:00
|
|
|
dp = get_dp_rcu(net, ovs_header->dp_ifindex);
|
2011-01-23 19:08:06 -08:00
|
|
|
err = -ENODEV;
|
2011-03-24 17:06:58 -07:00
|
|
|
if (!dp)
|
|
|
|
goto err_unlock;
|
2011-08-01 00:35:20 -07:00
|
|
|
|
2014-04-08 11:13:42 +00:00
|
|
|
input_vport = ovs_vport_rcu(dp, flow->key.phy.in_port);
|
|
|
|
if (!input_vport)
|
|
|
|
input_vport = ovs_vport_rcu(dp, OVSP_LOCAL);
|
|
|
|
|
|
|
|
if (!input_vport)
|
|
|
|
goto err_unlock;
|
|
|
|
|
2015-12-03 11:40:53 -08:00
|
|
|
packet->dev = input_vport->dev;
|
2014-04-08 11:13:42 +00:00
|
|
|
OVS_CB(packet)->input_vport = input_vport;
|
2014-08-21 20:25:47 +03:00
|
|
|
sf_acts = rcu_dereference(flow->sf_acts);
|
2014-04-08 11:13:42 +00:00
|
|
|
|
2011-10-06 21:52:39 -07:00
|
|
|
local_bh_disable();
|
2014-11-08 07:24:42 -08:00
|
|
|
err = ovs_execute_actions(dp, packet, sf_acts, &flow->key);
|
2011-10-06 21:52:39 -07:00
|
|
|
local_bh_enable();
|
2011-01-26 15:42:00 -08:00
|
|
|
rcu_read_unlock();
|
2011-04-28 16:54:07 -07:00
|
|
|
|
2013-06-17 07:51:00 -07:00
|
|
|
ovs_flow_free(flow, false);
|
2011-03-24 17:06:58 -07:00
|
|
|
return err;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-03-24 17:06:58 -07:00
|
|
|
err_unlock:
|
|
|
|
rcu_read_unlock();
|
2012-10-30 16:34:50 -07:00
|
|
|
err_flow_free:
|
2013-06-17 07:51:00 -07:00
|
|
|
ovs_flow_free(flow, false);
|
2011-03-24 17:06:58 -07:00
|
|
|
err_kfree_skb:
|
|
|
|
kfree_skb(packet);
|
|
|
|
err:
|
2011-01-26 15:42:00 -08:00
|
|
|
return err;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static const struct nla_policy packet_policy[OVS_PACKET_ATTR_MAX + 1] = {
|
2013-03-29 18:03:05 -07:00
|
|
|
[OVS_PACKET_ATTR_PACKET] = { .len = ETH_HLEN },
|
2011-08-18 10:35:40 -07:00
|
|
|
[OVS_PACKET_ATTR_KEY] = { .type = NLA_NESTED },
|
|
|
|
[OVS_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED },
|
2015-01-15 00:17:31 +01:00
|
|
|
[OVS_PACKET_ATTR_PROBE] = { .type = NLA_FLAG },
|
2015-12-02 23:53:50 -08:00
|
|
|
[OVS_PACKET_ATTR_MRU] = { .type = NLA_U16 },
|
2011-01-26 13:41:54 -08:00
|
|
|
};
|
|
|
|
|
2015-08-04 18:07:27 -07:00
|
|
|
static struct genl_ops dp_packet_genl_ops[] = {
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_PACKET_CMD_EXECUTE,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2016-07-17 09:52:06 -07:00
|
|
|
.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
2011-01-26 13:41:54 -08:00
|
|
|
.policy = packet_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_packet_cmd_execute
|
2011-01-26 13:41:54 -08:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2016-12-09 17:22:42 -08:00
|
|
|
static struct genl_family dp_packet_genl_family __ro_after_init = {
|
2014-04-01 20:55:21 -07:00
|
|
|
.hdrsize = sizeof(struct ovs_header),
|
|
|
|
.name = OVS_PACKET_FAMILY,
|
|
|
|
.version = OVS_PACKET_VERSION,
|
|
|
|
.maxattr = OVS_PACKET_ATTR_MAX,
|
|
|
|
.netnsok = true,
|
|
|
|
.parallel_ops = true,
|
|
|
|
.ops = dp_packet_genl_ops,
|
|
|
|
.n_ops = ARRAY_SIZE(dp_packet_genl_ops),
|
2016-12-09 17:22:42 -08:00
|
|
|
.module = THIS_MODULE,
|
2014-04-01 20:55:21 -07:00
|
|
|
};
|
|
|
|
|
2014-09-23 16:02:35 +02:00
|
|
|
static void get_dp_stats(const struct datapath *dp, struct ovs_dp_stats *stats,
|
2013-10-21 14:37:33 -07:00
|
|
|
struct ovs_dp_megaflow_stats *mega_stats)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-01-26 15:42:00 -08:00
|
|
|
int i;
|
2011-08-04 08:04:10 +09:00
|
|
|
|
2013-10-21 14:37:33 -07:00
|
|
|
memset(mega_stats, 0, sizeof(*mega_stats));
|
|
|
|
|
2013-10-03 13:49:31 -07:00
|
|
|
stats->n_flows = ovs_flow_tbl_count(&dp->table);
|
2013-10-21 14:37:33 -07:00
|
|
|
mega_stats->n_masks = ovs_flow_tbl_num_masks(&dp->table);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
stats->n_hit = stats->n_missed = stats->n_lost = 0;
|
2013-10-21 14:37:33 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
for_each_possible_cpu(i) {
|
|
|
|
const struct dp_stats_percpu *percpu_stats;
|
|
|
|
struct dp_stats_percpu local_stats;
|
2011-11-19 09:08:56 -08:00
|
|
|
unsigned int start;
|
2010-05-13 13:21:33 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
percpu_stats = per_cpu_ptr(dp->stats_percpu, i);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
do {
|
2014-09-12 14:12:24 -07:00
|
|
|
start = u64_stats_fetch_begin_irq(&percpu_stats->syncp);
|
2011-01-26 15:42:00 -08:00
|
|
|
local_stats = *percpu_stats;
|
2014-09-12 14:12:24 -07:00
|
|
|
} while (u64_stats_fetch_retry_irq(&percpu_stats->syncp, start));
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
stats->n_hit += local_stats.n_hit;
|
|
|
|
stats->n_missed += local_stats.n_missed;
|
|
|
|
stats->n_lost += local_stats.n_lost;
|
2013-10-21 14:37:33 -07:00
|
|
|
mega_stats->n_mask_hit += local_stats.n_mask_hit;
|
2011-01-26 15:42:00 -08:00
|
|
|
}
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
static bool should_fill_key(const struct sw_flow_id *sfid, uint32_t ufid_flags)
|
|
|
|
{
|
|
|
|
return ovs_identifier_is_ufid(sfid) &&
|
|
|
|
!(ufid_flags & OVS_UFID_F_OMIT_KEY);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool should_fill_mask(uint32_t ufid_flags)
|
|
|
|
{
|
|
|
|
return !(ufid_flags & OVS_UFID_F_OMIT_MASK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool should_fill_actions(uint32_t ufid_flags)
|
2013-03-29 18:18:58 -07:00
|
|
|
{
|
2015-01-21 16:42:52 -08:00
|
|
|
return !(ufid_flags & OVS_UFID_F_OMIT_ACTIONS);
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t ovs_flow_cmd_msg_size(const struct sw_flow_actions *acts,
|
|
|
|
const struct sw_flow_id *sfid,
|
|
|
|
uint32_t ufid_flags)
|
|
|
|
{
|
|
|
|
size_t len = NLMSG_ALIGN(sizeof(struct ovs_header));
|
|
|
|
|
|
|
|
/* OVS_FLOW_ATTR_UFID */
|
|
|
|
if (sfid && ovs_identifier_is_ufid(sfid))
|
|
|
|
len += nla_total_size(sfid->ufid_len);
|
|
|
|
|
|
|
|
/* OVS_FLOW_ATTR_KEY */
|
|
|
|
if (!sfid || should_fill_key(sfid, ufid_flags))
|
|
|
|
len += nla_total_size(ovs_key_attr_size());
|
|
|
|
|
|
|
|
/* OVS_FLOW_ATTR_MASK */
|
|
|
|
if (should_fill_mask(ufid_flags))
|
|
|
|
len += nla_total_size(ovs_key_attr_size());
|
|
|
|
|
|
|
|
/* OVS_FLOW_ATTR_ACTIONS */
|
|
|
|
if (should_fill_actions(ufid_flags))
|
2015-12-02 23:53:49 -08:00
|
|
|
len += nla_total_size(acts->orig_len);
|
2015-01-21 16:42:52 -08:00
|
|
|
|
|
|
|
return len
|
2016-07-17 09:52:10 -07:00
|
|
|
+ nla_total_size_64bit(sizeof(struct ovs_flow_stats)) /* OVS_FLOW_ATTR_STATS */
|
2013-03-29 18:18:58 -07:00
|
|
|
+ nla_total_size(1) /* OVS_FLOW_ATTR_TCP_FLAGS */
|
2016-07-17 09:52:10 -07:00
|
|
|
+ nla_total_size_64bit(8); /* OVS_FLOW_ATTR_USED */
|
2013-03-29 18:18:58 -07:00
|
|
|
}
|
|
|
|
|
2014-06-26 12:10:37 +12:00
|
|
|
/* Called with ovs_mutex or RCU read lock. */
|
|
|
|
static int ovs_flow_cmd_fill_stats(const struct sw_flow *flow,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct ovs_flow_stats stats;
|
|
|
|
__be16 tcp_flags;
|
|
|
|
unsigned long used;
|
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
ovs_flow_stats_get(flow, &stats, &used, &tcp_flags);
|
2014-04-02 11:14:58 -07:00
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
if (used &&
|
2016-07-17 09:52:11 -07:00
|
|
|
nla_put_u64_64bit(skb, OVS_FLOW_ATTR_USED, ovs_flow_used_time(used),
|
|
|
|
OVS_FLOW_ATTR_PAD))
|
2014-06-26 12:10:37 +12:00
|
|
|
return -EMSGSIZE;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
if (stats.n_packets &&
|
2016-07-17 09:52:10 -07:00
|
|
|
nla_put_64bit(skb, OVS_FLOW_ATTR_STATS,
|
|
|
|
sizeof(struct ovs_flow_stats), &stats,
|
|
|
|
OVS_FLOW_ATTR_PAD))
|
2014-06-26 12:10:37 +12:00
|
|
|
return -EMSGSIZE;
|
2013-10-23 14:34:39 -07:00
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
if ((u8)ntohs(tcp_flags) &&
|
|
|
|
nla_put_u8(skb, OVS_FLOW_ATTR_TCP_FLAGS, (u8)ntohs(tcp_flags)))
|
2014-06-26 12:10:37 +12:00
|
|
|
return -EMSGSIZE;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called with ovs_mutex or RCU read lock. */
|
|
|
|
static int ovs_flow_cmd_fill_actions(const struct sw_flow *flow,
|
|
|
|
struct sk_buff *skb, int skb_orig_len)
|
|
|
|
{
|
|
|
|
struct nlattr *start;
|
|
|
|
int err;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
/* If OVS_FLOW_ATTR_ACTIONS doesn't fit, skip dumping the actions if
|
2011-02-01 09:25:26 -08:00
|
|
|
* this is the first flow to be dumped into 'skb'. This is unusual for
|
|
|
|
* Netlink but individual action lists can be longer than
|
|
|
|
* NLMSG_GOODSIZE and thus entirely undumpable if we didn't do this.
|
|
|
|
* The userspace caller can always fetch the actions separately if it
|
|
|
|
* really wants them. (Most userspace callers in fact don't care.)
|
|
|
|
*
|
|
|
|
* This can only fail for dump operations because the skb is always
|
|
|
|
* properly sized for single flows.
|
|
|
|
*/
|
2019-10-15 10:27:47 -07:00
|
|
|
start = nla_nest_start_noflag(skb, OVS_FLOW_ATTR_ACTIONS);
|
2013-01-20 23:14:36 -08:00
|
|
|
if (start) {
|
2013-07-02 15:44:51 -07:00
|
|
|
const struct sw_flow_actions *sf_acts;
|
|
|
|
|
2013-12-02 18:56:32 -08:00
|
|
|
sf_acts = rcu_dereference_ovsl(flow->sf_acts);
|
2013-09-11 20:26:11 -07:00
|
|
|
err = ovs_nla_put_actions(sf_acts->actions,
|
|
|
|
sf_acts->actions_len, skb);
|
2014-04-02 11:14:58 -07:00
|
|
|
|
2013-01-21 03:59:16 -08:00
|
|
|
if (!err)
|
|
|
|
nla_nest_end(skb, start);
|
|
|
|
else {
|
|
|
|
if (skb_orig_len)
|
2014-06-26 12:10:37 +12:00
|
|
|
return err;
|
2013-01-21 03:59:16 -08:00
|
|
|
|
|
|
|
nla_nest_cancel(skb, start);
|
|
|
|
}
|
2014-06-26 12:10:37 +12:00
|
|
|
} else if (skb_orig_len) {
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called with ovs_mutex or RCU read lock. */
|
2014-09-08 12:46:03 -07:00
|
|
|
static int ovs_flow_cmd_fill_info(const struct sw_flow *flow, int dp_ifindex,
|
2014-06-26 12:10:37 +12:00
|
|
|
struct sk_buff *skb, u32 portid,
|
2015-01-21 16:42:52 -08:00
|
|
|
u32 seq, u32 flags, u8 cmd, u32 ufid_flags)
|
2014-06-26 12:10:37 +12:00
|
|
|
{
|
|
|
|
const int skb_orig_len = skb->len;
|
|
|
|
struct ovs_header *ovs_header;
|
|
|
|
int err;
|
|
|
|
|
2014-11-08 07:24:42 -08:00
|
|
|
ovs_header = genlmsg_put(skb, portid, seq, &dp_flow_genl_family,
|
|
|
|
flags, cmd);
|
2014-06-26 12:10:37 +12:00
|
|
|
if (!ovs_header)
|
|
|
|
return -EMSGSIZE;
|
2014-11-08 07:24:42 -08:00
|
|
|
|
2014-06-26 12:10:37 +12:00
|
|
|
ovs_header->dp_ifindex = dp_ifindex;
|
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
err = ovs_nla_put_identifier(flow, skb);
|
2015-01-21 16:42:48 -08:00
|
|
|
if (err)
|
|
|
|
goto error;
|
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
if (should_fill_key(&flow->id, ufid_flags)) {
|
|
|
|
err = ovs_nla_put_masked_key(flow, skb);
|
|
|
|
if (err)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (should_fill_mask(ufid_flags)) {
|
|
|
|
err = ovs_nla_put_mask(flow, skb);
|
|
|
|
if (err)
|
|
|
|
goto error;
|
|
|
|
}
|
2014-06-26 12:10:37 +12:00
|
|
|
|
|
|
|
err = ovs_flow_cmd_fill_stats(flow, skb);
|
|
|
|
if (err)
|
|
|
|
goto error;
|
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
if (should_fill_actions(ufid_flags)) {
|
|
|
|
err = ovs_flow_cmd_fill_actions(flow, skb, skb_orig_len);
|
|
|
|
if (err)
|
|
|
|
goto error;
|
|
|
|
}
|
2011-01-28 14:00:51 -08:00
|
|
|
|
2015-02-03 21:53:36 +01:00
|
|
|
genlmsg_end(skb, ovs_header);
|
|
|
|
return 0;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
error:
|
2011-08-18 10:35:40 -07:00
|
|
|
genlmsg_cancel(skb, ovs_header);
|
2011-01-26 15:42:00 -08:00
|
|
|
return err;
|
2010-05-13 13:21:33 -07:00
|
|
|
}
|
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
/* May not be called with RCU read lock. */
|
|
|
|
static struct sk_buff *ovs_flow_cmd_alloc_info(const struct sw_flow_actions *acts,
|
2015-01-21 16:42:52 -08:00
|
|
|
const struct sw_flow_id *sfid,
|
2014-03-29 15:52:32 -07:00
|
|
|
struct genl_info *info,
|
2015-01-21 16:42:52 -08:00
|
|
|
bool always,
|
|
|
|
uint32_t ufid_flags)
|
2010-05-13 13:21:33 -07:00
|
|
|
{
|
2014-03-29 15:52:32 -07:00
|
|
|
struct sk_buff *skb;
|
2015-01-21 16:42:52 -08:00
|
|
|
size_t len;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2014-09-20 06:25:23 -07:00
|
|
|
if (!always && !ovs_must_notify(&dp_flow_genl_family, info,
|
|
|
|
GROUP_ID(&ovs_dp_flow_multicast_group)))
|
2014-03-29 15:52:32 -07:00
|
|
|
return NULL;
|
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
len = ovs_flow_cmd_msg_size(acts, sfid, ufid_flags);
|
2016-07-18 13:53:29 -07:00
|
|
|
skb = genlmsg_new(len, GFP_KERNEL);
|
2014-03-29 15:52:32 -07:00
|
|
|
if (!skb)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
|
|
|
return skb;
|
2011-01-28 14:00:51 -08:00
|
|
|
}
|
2010-04-02 16:46:18 -04:00
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
/* Called with ovs_mutex. */
|
2014-11-08 07:24:42 -08:00
|
|
|
static struct sk_buff *ovs_flow_cmd_build_info(const struct sw_flow *flow,
|
2014-04-02 11:14:58 -07:00
|
|
|
int dp_ifindex,
|
|
|
|
struct genl_info *info, u8 cmd,
|
2015-01-21 16:42:52 -08:00
|
|
|
bool always, u32 ufid_flags)
|
2011-01-28 14:00:51 -08:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int retval;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
skb = ovs_flow_cmd_alloc_info(ovsl_dereference(flow->sf_acts),
|
|
|
|
&flow->id, info, always, ufid_flags);
|
2014-09-12 11:34:04 -07:00
|
|
|
if (IS_ERR_OR_NULL(skb))
|
2014-03-29 15:52:32 -07:00
|
|
|
return skb;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2014-09-08 12:46:03 -07:00
|
|
|
retval = ovs_flow_cmd_fill_info(flow, dp_ifindex, skb,
|
2014-04-02 11:14:58 -07:00
|
|
|
info->snd_portid, info->snd_seq, 0,
|
2015-01-21 16:42:52 -08:00
|
|
|
cmd, ufid_flags);
|
2011-01-28 14:00:51 -08:00
|
|
|
BUG_ON(retval < 0);
|
2011-01-26 15:42:00 -08:00
|
|
|
return skb;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2015-12-02 23:53:50 -08:00
|
|
|
struct net *net = sock_net(skb->sk);
|
2011-01-28 14:00:51 -08:00
|
|
|
struct nlattr **a = info->attrs;
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header = info->userhdr;
|
2015-01-21 16:42:52 -08:00
|
|
|
struct sw_flow *flow = NULL, *new_flow;
|
2013-06-17 07:51:00 -07:00
|
|
|
struct sw_flow_mask mask;
|
2011-01-28 14:00:51 -08:00
|
|
|
struct sk_buff *reply;
|
2011-01-18 16:54:27 -08:00
|
|
|
struct datapath *dp;
|
2014-04-02 11:14:58 -07:00
|
|
|
struct sw_flow_actions *acts;
|
2013-06-17 07:51:00 -07:00
|
|
|
struct sw_flow_match match;
|
2015-01-21 16:42:52 -08:00
|
|
|
u32 ufid_flags = ovs_nla_get_ufid_flags(a[OVS_FLOW_ATTR_UFID_FLAGS]);
|
2011-01-17 14:40:58 -08:00
|
|
|
int error;
|
2014-09-12 11:20:13 -07:00
|
|
|
bool log = !a[OVS_FLOW_ATTR_PROBE];
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
/* Must have key and actions. */
|
2011-01-28 14:00:51 -08:00
|
|
|
error = -EINVAL;
|
2014-07-01 17:41:51 -07:00
|
|
|
if (!a[OVS_FLOW_ATTR_KEY]) {
|
2014-11-08 07:24:42 -08:00
|
|
|
OVS_NLERR(log, "Flow key attr not present in new flow.");
|
2011-01-28 14:00:51 -08:00
|
|
|
goto error;
|
2014-07-01 17:41:51 -07:00
|
|
|
}
|
|
|
|
if (!a[OVS_FLOW_ATTR_ACTIONS]) {
|
2014-11-08 07:24:42 -08:00
|
|
|
OVS_NLERR(log, "Flow actions attr not present in new flow.");
|
2014-04-02 11:14:58 -07:00
|
|
|
goto error;
|
2014-07-01 17:41:51 -07:00
|
|
|
}
|
2013-06-17 07:51:00 -07:00
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
/* Most of the time we need to allocate a new flow, do it before
|
2014-10-20 15:19:10 -07:00
|
|
|
* locking.
|
|
|
|
*/
|
2014-04-02 11:14:58 -07:00
|
|
|
new_flow = ovs_flow_alloc();
|
|
|
|
if (IS_ERR(new_flow)) {
|
|
|
|
error = PTR_ERR(new_flow);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Extract key. */
|
2017-02-15 17:34:16 -08:00
|
|
|
ovs_match_init(&match, &new_flow->key, false, &mask);
|
2015-12-02 23:53:52 -08:00
|
|
|
error = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY],
|
2014-09-12 11:20:13 -07:00
|
|
|
a[OVS_FLOW_ATTR_MASK], log);
|
2011-01-28 14:00:51 -08:00
|
|
|
if (error)
|
2014-04-02 11:14:58 -07:00
|
|
|
goto err_kfree_flow;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
/* Extract flow identifier. */
|
|
|
|
error = ovs_nla_get_identifier(&new_flow->id, a[OVS_FLOW_ATTR_UFID],
|
2017-02-15 17:34:15 -08:00
|
|
|
&new_flow->key, log);
|
2015-01-21 16:42:52 -08:00
|
|
|
if (error)
|
|
|
|
goto err_kfree_flow;
|
2013-01-18 18:10:59 -08:00
|
|
|
|
2017-02-15 17:34:15 -08:00
|
|
|
/* unmasked key is needed to match when ufid is not used. */
|
|
|
|
if (ovs_identifier_is_key(&new_flow->id))
|
|
|
|
match.key = new_flow->id.unmasked_key;
|
|
|
|
|
|
|
|
ovs_flow_mask_key(&new_flow->key, &new_flow->key, true, &mask);
|
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
/* Validate actions. */
|
2015-12-02 23:53:50 -08:00
|
|
|
error = ovs_nla_copy_actions(net, a[OVS_FLOW_ATTR_ACTIONS],
|
|
|
|
&new_flow->key, &acts, log);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (error) {
|
2014-11-08 07:24:42 -08:00
|
|
|
OVS_NLERR(log, "Flow actions may not be safe on all matching packets.");
|
2014-09-23 19:59:56 +02:00
|
|
|
goto err_kfree_flow;
|
2014-04-02 11:14:58 -07:00
|
|
|
}
|
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
reply = ovs_flow_cmd_alloc_info(acts, &new_flow->id, info, false,
|
|
|
|
ufid_flags);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (IS_ERR(reply)) {
|
|
|
|
error = PTR_ERR(reply);
|
|
|
|
goto err_kfree_acts;
|
2011-01-28 14:00:51 -08:00
|
|
|
}
|
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_lock();
|
2015-12-02 23:53:50 -08:00
|
|
|
dp = get_dp(net, ovs_header->dp_ifindex);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (unlikely(!dp)) {
|
|
|
|
error = -ENODEV;
|
2013-04-12 15:57:09 -07:00
|
|
|
goto err_unlock_ovs;
|
2014-04-02 11:14:58 -07:00
|
|
|
}
|
2015-01-21 16:42:52 -08:00
|
|
|
|
2013-06-17 07:51:00 -07:00
|
|
|
/* Check if this is a duplicate flow */
|
2015-01-21 16:42:52 -08:00
|
|
|
if (ovs_identifier_is_ufid(&new_flow->id))
|
|
|
|
flow = ovs_flow_tbl_lookup_ufid(&dp->table, &new_flow->id);
|
|
|
|
if (!flow)
|
2017-02-15 17:34:15 -08:00
|
|
|
flow = ovs_flow_tbl_lookup(&dp->table, &new_flow->key);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (likely(!flow)) {
|
|
|
|
rcu_assign_pointer(new_flow->sf_acts, acts);
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
/* Put flow in bucket. */
|
2014-04-02 11:14:58 -07:00
|
|
|
error = ovs_flow_tbl_insert(&dp->table, new_flow, &mask);
|
|
|
|
if (unlikely(error)) {
|
2013-10-03 13:54:51 -07:00
|
|
|
acts = NULL;
|
2014-04-02 11:14:58 -07:00
|
|
|
goto err_unlock_ovs;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(reply)) {
|
2014-09-08 12:46:03 -07:00
|
|
|
error = ovs_flow_cmd_fill_info(new_flow,
|
2014-04-02 11:14:58 -07:00
|
|
|
ovs_header->dp_ifindex,
|
|
|
|
reply, info->snd_portid,
|
|
|
|
info->snd_seq, 0,
|
2015-01-21 16:42:52 -08:00
|
|
|
OVS_FLOW_CMD_NEW,
|
|
|
|
ufid_flags);
|
2014-04-02 11:14:58 -07:00
|
|
|
BUG_ON(error < 0);
|
2013-10-03 13:54:51 -07:00
|
|
|
}
|
2014-04-02 11:14:58 -07:00
|
|
|
ovs_unlock();
|
2011-01-26 15:42:00 -08:00
|
|
|
} else {
|
2014-04-02 11:14:58 -07:00
|
|
|
struct sw_flow_actions *old_acts;
|
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
/* Bail out if we're not allowed to modify an existing flow.
|
|
|
|
* We accept NLM_F_CREATE in place of the intended NLM_F_EXCL
|
|
|
|
* because Generic Netlink treats the latter as a dump
|
|
|
|
* request. We also accept NLM_F_EXCL in case that bug ever
|
|
|
|
* gets fixed.
|
|
|
|
*/
|
2014-04-02 11:14:58 -07:00
|
|
|
if (unlikely(info->nlhdr->nlmsg_flags & (NLM_F_CREATE
|
|
|
|
| NLM_F_EXCL))) {
|
|
|
|
error = -EEXIST;
|
2013-04-12 15:57:09 -07:00
|
|
|
goto err_unlock_ovs;
|
2014-04-02 11:14:58 -07:00
|
|
|
}
|
2015-01-21 16:42:52 -08:00
|
|
|
/* The flow identifier has to be the same for flow updates.
|
|
|
|
* Look for any overlapping flow.
|
|
|
|
*/
|
|
|
|
if (unlikely(!ovs_flow_cmp(flow, &match))) {
|
|
|
|
if (ovs_identifier_is_key(&flow->id))
|
|
|
|
flow = ovs_flow_tbl_lookup_exact(&dp->table,
|
|
|
|
&match);
|
|
|
|
else /* UFID matches but key is different */
|
|
|
|
flow = NULL;
|
2014-06-30 14:51:02 -07:00
|
|
|
if (!flow) {
|
|
|
|
error = -ENOENT;
|
|
|
|
goto err_unlock_ovs;
|
|
|
|
}
|
2014-04-02 11:14:58 -07:00
|
|
|
}
|
2014-04-02 11:14:58 -07:00
|
|
|
/* Update actions. */
|
|
|
|
old_acts = ovsl_dereference(flow->sf_acts);
|
|
|
|
rcu_assign_pointer(flow->sf_acts, acts);
|
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
if (unlikely(reply)) {
|
2014-09-08 12:46:03 -07:00
|
|
|
error = ovs_flow_cmd_fill_info(flow,
|
2014-04-02 11:14:58 -07:00
|
|
|
ovs_header->dp_ifindex,
|
|
|
|
reply, info->snd_portid,
|
|
|
|
info->snd_seq, 0,
|
2015-01-21 16:42:52 -08:00
|
|
|
OVS_FLOW_CMD_NEW,
|
|
|
|
ufid_flags);
|
2014-04-02 11:14:58 -07:00
|
|
|
BUG_ON(error < 0);
|
|
|
|
}
|
|
|
|
ovs_unlock();
|
2014-04-02 11:14:58 -07:00
|
|
|
|
2015-12-03 11:40:53 -08:00
|
|
|
ovs_nla_free_flow_actions_rcu(old_acts);
|
2014-04-02 11:14:58 -07:00
|
|
|
ovs_flow_free(new_flow, false);
|
2014-04-02 11:14:58 -07:00
|
|
|
}
|
2014-04-02 11:14:58 -07:00
|
|
|
|
|
|
|
if (reply)
|
2014-04-01 20:55:21 -07:00
|
|
|
ovs_notify(&dp_flow_genl_family, &ovs_dp_flow_multicast_group, reply, info);
|
2014-04-02 11:14:58 -07:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_unlock_ovs:
|
|
|
|
ovs_unlock();
|
2014-04-02 11:14:58 -07:00
|
|
|
kfree_skb(reply);
|
|
|
|
err_kfree_acts:
|
2015-12-03 11:40:53 -08:00
|
|
|
ovs_nla_free_flow_actions(acts);
|
2014-04-02 11:14:58 -07:00
|
|
|
err_kfree_flow:
|
|
|
|
ovs_flow_free(new_flow, false);
|
2014-04-02 11:14:58 -07:00
|
|
|
error:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2014-08-07 20:34:20 -07:00
|
|
|
/* Factor out action copy to avoid "Wframe-larger-than=1024" warning. */
|
2019-10-09 14:22:10 -07:00
|
|
|
static noinline_for_stack struct sw_flow_actions *get_flow_actions(struct net *net,
|
2015-12-02 23:53:50 -08:00
|
|
|
const struct nlattr *a,
|
2014-08-07 20:34:20 -07:00
|
|
|
const struct sw_flow_key *key,
|
2014-09-12 11:20:13 -07:00
|
|
|
const struct sw_flow_mask *mask,
|
|
|
|
bool log)
|
2014-08-07 20:34:20 -07:00
|
|
|
{
|
|
|
|
struct sw_flow_actions *acts;
|
|
|
|
struct sw_flow_key masked_key;
|
|
|
|
int error;
|
|
|
|
|
2015-09-22 18:13:00 -07:00
|
|
|
ovs_flow_mask_key(&masked_key, key, true, mask);
|
2015-12-02 23:53:50 -08:00
|
|
|
error = ovs_nla_copy_actions(net, a, &masked_key, &acts, log);
|
2014-08-07 20:34:20 -07:00
|
|
|
if (error) {
|
2014-09-12 11:20:13 -07:00
|
|
|
OVS_NLERR(log,
|
2014-11-08 07:24:42 -08:00
|
|
|
"Actions may not be safe on all matching packets");
|
2014-08-07 20:34:20 -07:00
|
|
|
return ERR_PTR(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
return acts;
|
|
|
|
}
|
|
|
|
|
2017-07-21 16:46:11 -07:00
|
|
|
/* Factor out match-init and action-copy to avoid
|
|
|
|
* "Wframe-larger-than=1024" warning. Because mask is only
|
|
|
|
* used to get actions, we new a function to save some
|
|
|
|
* stack space.
|
|
|
|
*
|
|
|
|
* If there are not key and action attrs, we return 0
|
|
|
|
* directly. In the case, the caller will also not use the
|
|
|
|
* match as before. If there is action attr, we try to get
|
|
|
|
* actions and save them to *acts. Before returning from
|
|
|
|
* the function, we reset the match->mask pointer. Because
|
|
|
|
* we should not to return match object with dangling reference
|
|
|
|
* to mask.
|
|
|
|
* */
|
2019-10-09 14:22:10 -07:00
|
|
|
static noinline_for_stack int
|
|
|
|
ovs_nla_init_match_and_action(struct net *net,
|
|
|
|
struct sw_flow_match *match,
|
|
|
|
struct sw_flow_key *key,
|
|
|
|
struct nlattr **a,
|
|
|
|
struct sw_flow_actions **acts,
|
|
|
|
bool log)
|
2017-07-21 16:46:11 -07:00
|
|
|
{
|
|
|
|
struct sw_flow_mask mask;
|
|
|
|
int error = 0;
|
|
|
|
|
|
|
|
if (a[OVS_FLOW_ATTR_KEY]) {
|
|
|
|
ovs_match_init(match, key, true, &mask);
|
|
|
|
error = ovs_nla_get_match(net, match, a[OVS_FLOW_ATTR_KEY],
|
|
|
|
a[OVS_FLOW_ATTR_MASK], log);
|
|
|
|
if (error)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (a[OVS_FLOW_ATTR_ACTIONS]) {
|
|
|
|
if (!a[OVS_FLOW_ATTR_KEY]) {
|
|
|
|
OVS_NLERR(log,
|
|
|
|
"Flow key attribute not present in set flow.");
|
2018-02-07 07:30:07 -08:00
|
|
|
error = -EINVAL;
|
|
|
|
goto error;
|
2017-07-21 16:46:11 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
*acts = get_flow_actions(net, a[OVS_FLOW_ATTR_ACTIONS], key,
|
|
|
|
&mask, log);
|
|
|
|
if (IS_ERR(*acts)) {
|
|
|
|
error = PTR_ERR(*acts);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* On success, error is 0. */
|
|
|
|
error:
|
|
|
|
match->mask = NULL;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
2015-12-02 23:53:50 -08:00
|
|
|
struct net *net = sock_net(skb->sk);
|
2014-04-02 11:14:58 -07:00
|
|
|
struct nlattr **a = info->attrs;
|
|
|
|
struct ovs_header *ovs_header = info->userhdr;
|
2014-06-05 18:36:19 -07:00
|
|
|
struct sw_flow_key key;
|
2014-04-02 11:14:58 -07:00
|
|
|
struct sw_flow *flow;
|
|
|
|
struct sk_buff *reply = NULL;
|
|
|
|
struct datapath *dp;
|
2014-04-02 11:14:58 -07:00
|
|
|
struct sw_flow_actions *old_acts = NULL, *acts = NULL;
|
2014-04-02 11:14:58 -07:00
|
|
|
struct sw_flow_match match;
|
2015-01-21 16:42:52 -08:00
|
|
|
struct sw_flow_id sfid;
|
|
|
|
u32 ufid_flags = ovs_nla_get_ufid_flags(a[OVS_FLOW_ATTR_UFID_FLAGS]);
|
2016-07-17 09:52:08 -07:00
|
|
|
int error = 0;
|
2014-09-12 11:20:13 -07:00
|
|
|
bool log = !a[OVS_FLOW_ATTR_PROBE];
|
2015-01-21 16:42:52 -08:00
|
|
|
bool ufid_present;
|
2014-04-02 11:14:58 -07:00
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
ufid_present = ovs_nla_get_ufid(&sfid, a[OVS_FLOW_ATTR_UFID], log);
|
2017-07-21 16:46:11 -07:00
|
|
|
if (!a[OVS_FLOW_ATTR_KEY] && !ufid_present) {
|
2016-07-17 09:52:08 -07:00
|
|
|
OVS_NLERR(log,
|
|
|
|
"Flow set message rejected, Key attribute missing.");
|
2017-07-21 16:46:11 -07:00
|
|
|
return -EINVAL;
|
2016-07-17 09:52:08 -07:00
|
|
|
}
|
2017-07-21 16:46:11 -07:00
|
|
|
|
|
|
|
error = ovs_nla_init_match_and_action(net, &match, &key, a,
|
|
|
|
&acts, log);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (error)
|
|
|
|
goto error;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2017-07-21 16:46:11 -07:00
|
|
|
if (acts) {
|
2014-08-07 12:51:14 -07:00
|
|
|
/* Can allocate before locking if have acts. */
|
2015-01-21 16:42:52 -08:00
|
|
|
reply = ovs_flow_cmd_alloc_info(acts, &sfid, info, false,
|
|
|
|
ufid_flags);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (IS_ERR(reply)) {
|
|
|
|
error = PTR_ERR(reply);
|
|
|
|
goto err_kfree_acts;
|
2014-03-24 17:34:48 -07:00
|
|
|
}
|
2014-04-02 11:14:58 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
ovs_lock();
|
2015-12-02 23:53:50 -08:00
|
|
|
dp = get_dp(net, ovs_header->dp_ifindex);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (unlikely(!dp)) {
|
|
|
|
error = -ENODEV;
|
2014-04-02 11:14:58 -07:00
|
|
|
goto err_unlock_ovs;
|
2014-04-02 11:14:58 -07:00
|
|
|
}
|
2014-04-02 11:14:58 -07:00
|
|
|
/* Check that the flow exists. */
|
2015-01-21 16:42:52 -08:00
|
|
|
if (ufid_present)
|
|
|
|
flow = ovs_flow_tbl_lookup_ufid(&dp->table, &sfid);
|
|
|
|
else
|
|
|
|
flow = ovs_flow_tbl_lookup_exact(&dp->table, &match);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (unlikely(!flow)) {
|
|
|
|
error = -ENOENT;
|
2014-04-02 11:14:58 -07:00
|
|
|
goto err_unlock_ovs;
|
2014-04-02 11:14:58 -07:00
|
|
|
}
|
2014-06-30 14:51:02 -07:00
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
/* Update actions, if present. */
|
2014-04-02 11:14:58 -07:00
|
|
|
if (likely(acts)) {
|
2014-04-02 11:14:58 -07:00
|
|
|
old_acts = ovsl_dereference(flow->sf_acts);
|
|
|
|
rcu_assign_pointer(flow->sf_acts, acts);
|
2014-04-02 11:14:58 -07:00
|
|
|
|
|
|
|
if (unlikely(reply)) {
|
2014-09-08 12:46:03 -07:00
|
|
|
error = ovs_flow_cmd_fill_info(flow,
|
2014-04-02 11:14:58 -07:00
|
|
|
ovs_header->dp_ifindex,
|
|
|
|
reply, info->snd_portid,
|
|
|
|
info->snd_seq, 0,
|
2018-10-17 12:25:47 -07:00
|
|
|
OVS_FLOW_CMD_SET,
|
2015-01-21 16:42:52 -08:00
|
|
|
ufid_flags);
|
2014-04-02 11:14:58 -07:00
|
|
|
BUG_ON(error < 0);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Could not alloc without acts before locking. */
|
2014-11-08 07:24:42 -08:00
|
|
|
reply = ovs_flow_cmd_build_info(flow, ovs_header->dp_ifindex,
|
2018-10-17 12:25:47 -07:00
|
|
|
info, OVS_FLOW_CMD_SET, false,
|
2015-01-21 16:42:52 -08:00
|
|
|
ufid_flags);
|
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
if (unlikely(IS_ERR(reply))) {
|
|
|
|
error = PTR_ERR(reply);
|
|
|
|
goto err_unlock_ovs;
|
|
|
|
}
|
2011-01-18 16:54:27 -08:00
|
|
|
}
|
2014-04-02 11:14:58 -07:00
|
|
|
|
|
|
|
/* Clear stats. */
|
|
|
|
if (a[OVS_FLOW_ATTR_CLEAR])
|
|
|
|
ovs_flow_stats_clear(flow);
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
2011-01-28 14:00:51 -08:00
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
if (reply)
|
2014-04-01 20:55:21 -07:00
|
|
|
ovs_notify(&dp_flow_genl_family, &ovs_dp_flow_multicast_group, reply, info);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (old_acts)
|
2015-12-03 11:40:53 -08:00
|
|
|
ovs_nla_free_flow_actions_rcu(old_acts);
|
2014-11-08 07:24:42 -08:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
return 0;
|
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
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
err_unlock_ovs:
|
|
|
|
ovs_unlock();
|
2014-04-02 11:14:58 -07:00
|
|
|
kfree_skb(reply);
|
|
|
|
err_kfree_acts:
|
2015-12-03 11:40:53 -08:00
|
|
|
ovs_nla_free_flow_actions(acts);
|
2011-01-28 14:00:51 -08:00
|
|
|
error:
|
2011-01-18 16:54:27 -08:00
|
|
|
return error;
|
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
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
|
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
|
|
|
{
|
2011-01-28 14:00:51 -08:00
|
|
|
struct nlattr **a = info->attrs;
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header = info->userhdr;
|
2015-12-02 23:53:52 -08:00
|
|
|
struct net *net = sock_net(skb->sk);
|
2011-01-28 14:00:51 -08:00
|
|
|
struct sw_flow_key key;
|
|
|
|
struct sk_buff *reply;
|
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
|
|
|
struct sw_flow *flow;
|
2011-01-18 16:54:27 -08:00
|
|
|
struct datapath *dp;
|
2013-06-17 07:51:00 -07:00
|
|
|
struct sw_flow_match match;
|
2015-01-21 16:42:52 -08:00
|
|
|
struct sw_flow_id ufid;
|
|
|
|
u32 ufid_flags = ovs_nla_get_ufid_flags(a[OVS_FLOW_ATTR_UFID_FLAGS]);
|
|
|
|
int err = 0;
|
2014-09-12 11:20:13 -07:00
|
|
|
bool log = !a[OVS_FLOW_ATTR_PROBE];
|
2015-01-21 16:42:52 -08:00
|
|
|
bool ufid_present;
|
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
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
ufid_present = ovs_nla_get_ufid(&ufid, a[OVS_FLOW_ATTR_UFID], log);
|
|
|
|
if (a[OVS_FLOW_ATTR_KEY]) {
|
2017-02-15 17:34:16 -08:00
|
|
|
ovs_match_init(&match, &key, true, NULL);
|
2015-12-02 23:53:52 -08:00
|
|
|
err = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY], NULL,
|
2015-01-21 16:42:52 -08:00
|
|
|
log);
|
|
|
|
} else if (!ufid_present) {
|
2014-09-12 11:20:13 -07:00
|
|
|
OVS_NLERR(log,
|
|
|
|
"Flow get message rejected, Key attribute missing.");
|
2015-01-21 16:42:52 -08:00
|
|
|
err = -EINVAL;
|
2013-07-03 09:18:27 -07:00
|
|
|
}
|
2011-01-28 14:00:51 -08:00
|
|
|
if (err)
|
|
|
|
return err;
|
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
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_lock();
|
2012-01-30 06:56:54 -08:00
|
|
|
dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
|
2013-04-12 15:57:09 -07:00
|
|
|
if (!dp) {
|
|
|
|
err = -ENODEV;
|
|
|
|
goto unlock;
|
|
|
|
}
|
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
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
if (ufid_present)
|
|
|
|
flow = ovs_flow_tbl_lookup_ufid(&dp->table, &ufid);
|
|
|
|
else
|
|
|
|
flow = ovs_flow_tbl_lookup_exact(&dp->table, &match);
|
2014-06-30 14:51:02 -07:00
|
|
|
if (!flow) {
|
2013-04-12 15:57:09 -07:00
|
|
|
err = -ENOENT;
|
|
|
|
goto unlock;
|
|
|
|
}
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2014-11-08 07:24:42 -08:00
|
|
|
reply = ovs_flow_cmd_build_info(flow, ovs_header->dp_ifindex, info,
|
2018-10-17 12:25:47 -07:00
|
|
|
OVS_FLOW_CMD_GET, true, ufid_flags);
|
2013-04-12 15:57:09 -07:00
|
|
|
if (IS_ERR(reply)) {
|
|
|
|
err = PTR_ERR(reply);
|
|
|
|
goto unlock;
|
|
|
|
}
|
2011-01-23 18:44:44 -08:00
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
2011-01-28 14:00:51 -08:00
|
|
|
return genlmsg_reply(reply, info);
|
2013-04-12 15:57:09 -07:00
|
|
|
unlock:
|
|
|
|
ovs_unlock();
|
|
|
|
return err;
|
2011-01-26 15:42:00 -08:00
|
|
|
}
|
2011-01-18 16:54:27 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
|
2011-01-26 15:42:00 -08:00
|
|
|
{
|
2011-01-28 14:00:51 -08:00
|
|
|
struct nlattr **a = info->attrs;
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header = info->userhdr;
|
2015-12-02 23:53:52 -08:00
|
|
|
struct net *net = sock_net(skb->sk);
|
2011-01-28 14:00:51 -08:00
|
|
|
struct sw_flow_key key;
|
|
|
|
struct sk_buff *reply;
|
2015-01-21 16:42:52 -08:00
|
|
|
struct sw_flow *flow = NULL;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct datapath *dp;
|
2013-06-17 07:51:00 -07:00
|
|
|
struct sw_flow_match match;
|
2015-01-21 16:42:52 -08:00
|
|
|
struct sw_flow_id ufid;
|
|
|
|
u32 ufid_flags = ovs_nla_get_ufid_flags(a[OVS_FLOW_ATTR_UFID_FLAGS]);
|
2011-01-26 15:42:00 -08:00
|
|
|
int err;
|
2014-09-12 11:20:13 -07:00
|
|
|
bool log = !a[OVS_FLOW_ATTR_PROBE];
|
2015-01-21 16:42:52 -08:00
|
|
|
bool ufid_present;
|
2011-01-23 18:44:44 -08:00
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
ufid_present = ovs_nla_get_ufid(&ufid, a[OVS_FLOW_ATTR_UFID], log);
|
|
|
|
if (a[OVS_FLOW_ATTR_KEY]) {
|
2017-02-15 17:34:16 -08:00
|
|
|
ovs_match_init(&match, &key, true, NULL);
|
2015-12-02 23:53:52 -08:00
|
|
|
err = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY],
|
|
|
|
NULL, log);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (unlikely(err))
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_lock();
|
2012-01-30 06:56:54 -08:00
|
|
|
dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
|
2014-04-02 11:14:58 -07:00
|
|
|
if (unlikely(!dp)) {
|
2013-04-12 15:57:09 -07:00
|
|
|
err = -ENODEV;
|
|
|
|
goto unlock;
|
|
|
|
}
|
2014-11-08 07:24:42 -08:00
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
if (unlikely(!a[OVS_FLOW_ATTR_KEY] && !ufid_present)) {
|
2013-10-03 13:49:31 -07:00
|
|
|
err = ovs_flow_tbl_flush(&dp->table);
|
2013-04-12 15:57:09 -07:00
|
|
|
goto unlock;
|
|
|
|
}
|
2014-11-08 07:24:42 -08:00
|
|
|
|
2015-01-21 16:42:52 -08:00
|
|
|
if (ufid_present)
|
|
|
|
flow = ovs_flow_tbl_lookup_ufid(&dp->table, &ufid);
|
|
|
|
else
|
|
|
|
flow = ovs_flow_tbl_lookup_exact(&dp->table, &match);
|
2014-06-30 14:51:02 -07:00
|
|
|
if (unlikely(!flow)) {
|
2013-04-12 15:57:09 -07:00
|
|
|
err = -ENOENT;
|
|
|
|
goto unlock;
|
|
|
|
}
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2013-10-03 13:49:31 -07:00
|
|
|
ovs_flow_tbl_remove(&dp->table, flow);
|
2014-04-02 11:14:58 -07:00
|
|
|
ovs_unlock();
|
2011-01-28 14:00:51 -08:00
|
|
|
|
2014-10-20 15:05:56 -07:00
|
|
|
reply = ovs_flow_cmd_alloc_info(rcu_dereference_raw(flow->sf_acts),
|
2015-01-21 16:42:52 -08:00
|
|
|
&flow->id, info, false, ufid_flags);
|
2014-04-02 11:14:58 -07:00
|
|
|
|
|
|
|
if (likely(reply)) {
|
|
|
|
if (likely(!IS_ERR(reply))) {
|
2014-11-08 07:24:42 -08:00
|
|
|
rcu_read_lock(); /*To keep RCU checker happy. */
|
|
|
|
err = ovs_flow_cmd_fill_info(flow, ovs_header->dp_ifindex,
|
2014-04-02 11:14:58 -07:00
|
|
|
reply, info->snd_portid,
|
|
|
|
info->snd_seq, 0,
|
2015-01-21 16:42:52 -08:00
|
|
|
OVS_FLOW_CMD_DEL,
|
|
|
|
ufid_flags);
|
2014-04-02 11:14:58 -07:00
|
|
|
rcu_read_unlock();
|
|
|
|
BUG_ON(err < 0);
|
2014-04-01 20:55:21 -07:00
|
|
|
ovs_notify(&dp_flow_genl_family, &ovs_dp_flow_multicast_group, reply, info);
|
2014-04-02 11:14:58 -07:00
|
|
|
} else {
|
2014-04-01 20:55:21 -07:00
|
|
|
genl_set_err(&dp_flow_genl_family, sock_net(skb->sk), 0,
|
|
|
|
GROUP_ID(&ovs_dp_flow_multicast_group), PTR_ERR(reply));
|
|
|
|
|
2014-04-02 11:14:58 -07:00
|
|
|
}
|
2014-03-29 15:52:32 -07:00
|
|
|
}
|
2011-01-28 14:00:51 -08:00
|
|
|
|
2013-06-17 07:51:00 -07:00
|
|
|
ovs_flow_free(flow, true);
|
2011-01-28 14:00:51 -08:00
|
|
|
return 0;
|
2013-04-12 15:57:09 -07:00
|
|
|
unlock:
|
|
|
|
ovs_unlock();
|
|
|
|
return err;
|
2011-01-28 14:00:51 -08:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_flow_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
|
2011-01-28 14:00:51 -08:00
|
|
|
{
|
2015-01-21 16:42:52 -08:00
|
|
|
struct nlattr *a[__OVS_FLOW_ATTR_MAX];
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header = genlmsg_data(nlmsg_data(cb->nlh));
|
2013-10-03 13:49:31 -07:00
|
|
|
struct table_instance *ti;
|
2011-01-28 14:00:51 -08:00
|
|
|
struct datapath *dp;
|
2015-01-21 16:42:52 -08:00
|
|
|
u32 ufid_flags;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = genlmsg_parse(cb->nlh, &dp_flow_genl_family, a,
|
2017-04-20 18:16:46 -07:00
|
|
|
OVS_FLOW_ATTR_MAX, flow_policy, NULL);
|
2015-01-21 16:42:52 -08:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
ufid_flags = ovs_nla_get_ufid_flags(a[OVS_FLOW_ATTR_UFID_FLAGS]);
|
2011-01-28 14:00:51 -08:00
|
|
|
|
2013-07-02 15:44:51 -07:00
|
|
|
rcu_read_lock();
|
2014-07-15 14:38:29 -07:00
|
|
|
dp = get_dp_rcu(sock_net(skb->sk), ovs_header->dp_ifindex);
|
2013-04-12 15:57:09 -07:00
|
|
|
if (!dp) {
|
2013-07-02 15:44:51 -07:00
|
|
|
rcu_read_unlock();
|
2011-01-28 14:00:51 -08:00
|
|
|
return -ENODEV;
|
2013-04-12 15:57:09 -07:00
|
|
|
}
|
2011-01-28 14:00:51 -08:00
|
|
|
|
2013-10-03 13:49:31 -07:00
|
|
|
ti = rcu_dereference(dp->table.ti);
|
2011-01-28 14:00:51 -08:00
|
|
|
for (;;) {
|
|
|
|
struct sw_flow *flow;
|
|
|
|
u32 bucket, obj;
|
|
|
|
|
|
|
|
bucket = cb->args[0];
|
|
|
|
obj = cb->args[1];
|
2013-10-03 13:49:31 -07:00
|
|
|
flow = ovs_flow_tbl_dump_next(ti, &bucket, &obj);
|
2011-09-09 19:09:47 -07:00
|
|
|
if (!flow)
|
2011-01-28 14:00:51 -08:00
|
|
|
break;
|
|
|
|
|
2014-09-08 12:46:03 -07:00
|
|
|
if (ovs_flow_cmd_fill_info(flow, ovs_header->dp_ifindex, skb,
|
2012-12-19 17:43:09 +09:00
|
|
|
NETLINK_CB(cb->skb).portid,
|
2011-01-28 14:00:51 -08:00
|
|
|
cb->nlh->nlmsg_seq, NLM_F_MULTI,
|
2018-10-17 12:25:47 -07:00
|
|
|
OVS_FLOW_CMD_GET, ufid_flags) < 0)
|
2011-01-28 14:00:51 -08:00
|
|
|
break;
|
|
|
|
|
|
|
|
cb->args[0] = bucket;
|
|
|
|
cb->args[1] = obj;
|
|
|
|
}
|
2013-07-02 15:44:51 -07:00
|
|
|
rcu_read_unlock();
|
2011-01-28 14:00:51 -08:00
|
|
|
return skb->len;
|
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
|
|
|
}
|
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
static const struct nla_policy flow_policy[OVS_FLOW_ATTR_MAX + 1] = {
|
|
|
|
[OVS_FLOW_ATTR_KEY] = { .type = NLA_NESTED },
|
2014-09-12 11:20:13 -07:00
|
|
|
[OVS_FLOW_ATTR_MASK] = { .type = NLA_NESTED },
|
2014-04-01 20:55:21 -07:00
|
|
|
[OVS_FLOW_ATTR_ACTIONS] = { .type = NLA_NESTED },
|
|
|
|
[OVS_FLOW_ATTR_CLEAR] = { .type = NLA_FLAG },
|
2014-09-12 11:20:13 -07:00
|
|
|
[OVS_FLOW_ATTR_PROBE] = { .type = NLA_FLAG },
|
2015-01-21 16:42:52 -08:00
|
|
|
[OVS_FLOW_ATTR_UFID] = { .type = NLA_UNSPEC, .len = 1 },
|
|
|
|
[OVS_FLOW_ATTR_UFID_FLAGS] = { .type = NLA_U32 },
|
2014-04-01 20:55:21 -07:00
|
|
|
};
|
|
|
|
|
2019-11-25 14:20:44 -08:00
|
|
|
static const struct genl_ops dp_flow_genl_ops[] = {
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_FLOW_CMD_NEW,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2016-07-17 09:52:06 -07:00
|
|
|
.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
2011-01-28 14:00:51 -08:00
|
|
|
.policy = flow_policy,
|
2014-04-02 11:14:58 -07:00
|
|
|
.doit = ovs_flow_cmd_new
|
2011-01-28 14:00:51 -08:00
|
|
|
},
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_FLOW_CMD_DEL,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2016-07-17 09:52:06 -07:00
|
|
|
.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
2011-01-28 14:00:51 -08:00
|
|
|
.policy = flow_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_flow_cmd_del
|
2011-01-28 14:00:51 -08:00
|
|
|
},
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_FLOW_CMD_GET,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2011-01-28 14:00:51 -08:00
|
|
|
.flags = 0, /* OK for unprivileged users. */
|
|
|
|
.policy = flow_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_flow_cmd_get,
|
|
|
|
.dumpit = ovs_flow_cmd_dump
|
2011-01-28 14:00:51 -08:00
|
|
|
},
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_FLOW_CMD_SET,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2016-07-17 09:52:06 -07:00
|
|
|
.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
2011-01-28 14:00:51 -08:00
|
|
|
.policy = flow_policy,
|
2014-04-02 11:14:58 -07:00
|
|
|
.doit = ovs_flow_cmd_set,
|
2011-01-28 14:00:51 -08:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2016-12-09 17:22:42 -08:00
|
|
|
static struct genl_family dp_flow_genl_family __ro_after_init = {
|
2011-08-18 10:35:40 -07:00
|
|
|
.hdrsize = sizeof(struct ovs_header),
|
2014-04-01 20:55:21 -07:00
|
|
|
.name = OVS_FLOW_FAMILY,
|
|
|
|
.version = OVS_FLOW_VERSION,
|
|
|
|
.maxattr = OVS_FLOW_ATTR_MAX,
|
2013-08-26 23:53:17 -07:00
|
|
|
.netnsok = true,
|
2014-04-01 20:55:21 -07:00
|
|
|
.parallel_ops = true,
|
|
|
|
.ops = dp_flow_genl_ops,
|
|
|
|
.n_ops = ARRAY_SIZE(dp_flow_genl_ops),
|
|
|
|
.mcgrps = &ovs_dp_flow_multicast_group,
|
|
|
|
.n_mcgrps = 1,
|
2016-12-09 17:22:42 -08:00
|
|
|
.module = THIS_MODULE,
|
2011-01-28 13:55:04 -08:00
|
|
|
};
|
|
|
|
|
2013-03-29 18:18:58 -07:00
|
|
|
static size_t ovs_dp_cmd_msg_size(void)
|
|
|
|
{
|
|
|
|
size_t msgsize = NLMSG_ALIGN(sizeof(struct ovs_header));
|
|
|
|
|
|
|
|
msgsize += nla_total_size(IFNAMSIZ);
|
2016-07-17 09:52:10 -07:00
|
|
|
msgsize += nla_total_size_64bit(sizeof(struct ovs_dp_stats));
|
|
|
|
msgsize += nla_total_size_64bit(sizeof(struct ovs_dp_megaflow_stats));
|
2014-01-23 17:18:59 +01:00
|
|
|
msgsize += nla_total_size(sizeof(u32)); /* OVS_DP_ATTR_USER_FEATURES */
|
2013-03-29 18:18:58 -07:00
|
|
|
|
|
|
|
return msgsize;
|
|
|
|
}
|
|
|
|
|
2014-10-29 02:45:48 -07:00
|
|
|
/* Called with ovs_mutex. */
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_dp_cmd_fill_info(struct datapath *dp, struct sk_buff *skb,
|
2012-12-19 17:43:09 +09:00
|
|
|
u32 portid, u32 seq, u32 flags, u8 cmd)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header;
|
2011-11-18 10:54:12 -08:00
|
|
|
struct ovs_dp_stats dp_stats;
|
2013-10-21 14:37:33 -07:00
|
|
|
struct ovs_dp_megaflow_stats dp_megaflow_stats;
|
2009-07-08 13:19:16 -07:00
|
|
|
int err;
|
|
|
|
|
2012-12-19 17:43:09 +09:00
|
|
|
ovs_header = genlmsg_put(skb, portid, seq, &dp_datapath_genl_family,
|
2011-01-28 13:55:04 -08:00
|
|
|
flags, cmd);
|
2011-08-18 10:35:40 -07:00
|
|
|
if (!ovs_header)
|
2011-01-28 13:55:04 -08:00
|
|
|
goto error;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-09-14 13:05:09 -07:00
|
|
|
ovs_header->dp_ifindex = get_dpifindex(dp);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-11-21 17:15:20 -08:00
|
|
|
err = nla_put_string(skb, OVS_DP_ATTR_NAME, ovs_dp_name(dp));
|
2009-07-08 13:19:16 -07:00
|
|
|
if (err)
|
2011-01-26 15:42:00 -08:00
|
|
|
goto nla_put_failure;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2013-10-21 14:37:33 -07:00
|
|
|
get_dp_stats(dp, &dp_stats, &dp_megaflow_stats);
|
2016-07-17 09:52:10 -07:00
|
|
|
if (nla_put_64bit(skb, OVS_DP_ATTR_STATS, sizeof(struct ovs_dp_stats),
|
|
|
|
&dp_stats, OVS_DP_ATTR_PAD))
|
2013-10-21 14:37:33 -07:00
|
|
|
goto nla_put_failure;
|
|
|
|
|
2016-07-17 09:52:10 -07:00
|
|
|
if (nla_put_64bit(skb, OVS_DP_ATTR_MEGAFLOW_STATS,
|
|
|
|
sizeof(struct ovs_dp_megaflow_stats),
|
|
|
|
&dp_megaflow_stats, OVS_DP_ATTR_PAD))
|
2012-04-02 13:25:21 -07:00
|
|
|
goto nla_put_failure;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2013-12-03 20:47:24 -08:00
|
|
|
if (nla_put_u32(skb, OVS_DP_ATTR_USER_FEATURES, dp->user_features))
|
|
|
|
goto nla_put_failure;
|
|
|
|
|
2015-02-03 21:53:36 +01:00
|
|
|
genlmsg_end(skb, ovs_header);
|
|
|
|
return 0;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
nla_put_failure:
|
2011-08-18 10:35:40 -07:00
|
|
|
genlmsg_cancel(skb, ovs_header);
|
2011-01-28 13:55:04 -08:00
|
|
|
error:
|
|
|
|
return -EMSGSIZE;
|
2011-01-26 15:42:00 -08:00
|
|
|
}
|
|
|
|
|
2016-07-18 13:53:29 -07:00
|
|
|
static struct sk_buff *ovs_dp_cmd_alloc_info(void)
|
2011-01-26 15:42:00 -08:00
|
|
|
{
|
2016-07-18 13:53:29 -07:00
|
|
|
return genlmsg_new(ovs_dp_cmd_msg_size(), GFP_KERNEL);
|
2011-01-28 13:55:04 -08:00
|
|
|
}
|
2010-05-12 13:45:49 -07:00
|
|
|
|
2014-03-25 09:12:44 -07:00
|
|
|
/* Called with rcu_read_lock or ovs_mutex. */
|
2012-01-30 06:56:54 -08:00
|
|
|
static struct datapath *lookup_datapath(struct net *net,
|
2014-09-23 16:02:35 +02:00
|
|
|
const struct ovs_header *ovs_header,
|
2011-11-07 15:53:01 -08:00
|
|
|
struct nlattr *a[OVS_DP_ATTR_MAX + 1])
|
2011-01-26 15:42:00 -08:00
|
|
|
{
|
2011-01-21 17:01:56 -08:00
|
|
|
struct datapath *dp;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
if (!a[OVS_DP_ATTR_NAME])
|
2012-01-30 06:56:54 -08:00
|
|
|
dp = get_dp(net, ovs_header->dp_ifindex);
|
2011-01-21 17:01:56 -08:00
|
|
|
else {
|
2011-01-26 15:42:00 -08:00
|
|
|
struct vport *vport;
|
|
|
|
|
2012-01-30 06:56:54 -08:00
|
|
|
vport = ovs_vport_locate(net, nla_data(a[OVS_DP_ATTR_NAME]));
|
2011-08-18 10:35:40 -07:00
|
|
|
dp = vport && vport->port_no == OVSP_LOCAL ? vport->dp : NULL;
|
2011-01-26 15:42:00 -08:00
|
|
|
}
|
2011-01-21 17:01:56 -08:00
|
|
|
return dp ? dp : ERR_PTR(-ENODEV);
|
2011-01-26 15:42:00 -08:00
|
|
|
}
|
|
|
|
|
2013-12-03 20:56:22 -08:00
|
|
|
static void ovs_dp_reset_user_features(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
|
|
|
struct datapath *dp;
|
|
|
|
|
|
|
|
dp = lookup_datapath(sock_net(skb->sk), info->userhdr, info->attrs);
|
2014-02-15 17:30:23 -08:00
|
|
|
if (IS_ERR(dp))
|
2013-12-03 20:56:22 -08:00
|
|
|
return;
|
|
|
|
|
|
|
|
WARN(dp->user_features, "Dropping previously announced user features\n");
|
|
|
|
dp->user_features = 0;
|
|
|
|
}
|
|
|
|
|
2014-09-23 16:02:35 +02:00
|
|
|
static void ovs_dp_change(struct datapath *dp, struct nlattr *a[])
|
2013-12-03 20:47:24 -08:00
|
|
|
{
|
|
|
|
if (a[OVS_DP_ATTR_USER_FEATURES])
|
|
|
|
dp->user_features = nla_get_u32(a[OVS_DP_ATTR_USER_FEATURES]);
|
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
|
2011-01-26 15:42:00 -08:00
|
|
|
{
|
2011-01-28 13:55:04 -08:00
|
|
|
struct nlattr **a = info->attrs;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct vport_parms parms;
|
2011-01-28 13:55:04 -08:00
|
|
|
struct sk_buff *reply;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct datapath *dp;
|
|
|
|
struct vport *vport;
|
2012-01-30 06:56:54 -08:00
|
|
|
struct ovs_net *ovs_net;
|
2012-02-16 17:12:36 -08:00
|
|
|
int err, i;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
err = -EINVAL;
|
2011-10-12 11:04:10 -07:00
|
|
|
if (!a[OVS_DP_ATTR_NAME] || !a[OVS_DP_ATTR_UPCALL_PID])
|
2011-01-28 13:55:04 -08:00
|
|
|
goto err;
|
|
|
|
|
2016-07-18 13:53:29 -07:00
|
|
|
reply = ovs_dp_cmd_alloc_info();
|
2014-03-28 13:44:23 -07:00
|
|
|
if (!reply)
|
|
|
|
return -ENOMEM;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
err = -ENOMEM;
|
|
|
|
dp = kzalloc(sizeof(*dp), GFP_KERNEL);
|
|
|
|
if (dp == NULL)
|
2014-03-28 13:44:23 -07:00
|
|
|
goto err_free_reply;
|
2012-01-30 06:56:54 -08:00
|
|
|
|
2015-09-09 14:34:48 -07:00
|
|
|
ovs_dp_set_net(dp, sock_net(skb->sk));
|
2012-08-21 17:48:54 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
/* Allocate table. */
|
2013-10-03 13:49:31 -07:00
|
|
|
err = ovs_flow_tbl_init(&dp->table);
|
|
|
|
if (err)
|
2011-01-26 15:42:00 -08:00
|
|
|
goto err_free_dp;
|
|
|
|
|
2014-09-12 14:05:11 -07:00
|
|
|
dp->stats_percpu = netdev_alloc_pcpu_stats(struct dp_stats_percpu);
|
2011-09-15 16:41:36 -07:00
|
|
|
if (!dp->stats_percpu) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto err_destroy_table;
|
|
|
|
}
|
|
|
|
|
datapath: kmalloc() -> kmalloc_array()
Upstream commit:
commit 6da2ec56059c3c7a7e5f729e6349e74ace1e5c57
Author: Kees Cook <keescook@chromium.org>
Date: Tue Jun 12 13:55:00 2018 -0700
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
CC: Kees Cook <keescook@chromium.org>
Acked-by: William Tu <u9012063@gmail.com>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2018-12-13 15:08:18 -08:00
|
|
|
dp->ports = kmalloc_array(DP_VPORT_HASH_BUCKETS,
|
|
|
|
sizeof(struct hlist_head),
|
|
|
|
GFP_KERNEL);
|
2012-02-16 17:12:36 -08:00
|
|
|
if (!dp->ports) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto err_destroy_percpu;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++)
|
|
|
|
INIT_HLIST_HEAD(&dp->ports[i]);
|
|
|
|
|
2018-02-13 15:48:24 -08:00
|
|
|
err = ovs_meters_init(dp);
|
|
|
|
if (err)
|
|
|
|
goto err_destroy_ports_array;
|
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
/* Set up our datapath device. */
|
2011-08-18 10:35:40 -07:00
|
|
|
parms.name = nla_data(a[OVS_DP_ATTR_NAME]);
|
|
|
|
parms.type = OVS_VPORT_TYPE_INTERNAL;
|
2011-01-26 15:42:00 -08:00
|
|
|
parms.options = NULL;
|
|
|
|
parms.dp = dp;
|
2011-08-18 10:35:40 -07:00
|
|
|
parms.port_no = OVSP_LOCAL;
|
2014-04-14 23:37:10 -07:00
|
|
|
parms.upcall_portids = a[OVS_DP_ATTR_UPCALL_PID];
|
2011-09-14 13:05:09 -07:00
|
|
|
|
2013-12-03 20:47:24 -08:00
|
|
|
ovs_dp_change(dp, a);
|
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
/* So far only local changes have been made, now need the lock. */
|
|
|
|
ovs_lock();
|
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
vport = new_vport(&parms);
|
|
|
|
if (IS_ERR(vport)) {
|
|
|
|
err = PTR_ERR(vport);
|
|
|
|
if (err == -EBUSY)
|
|
|
|
err = -EEXIST;
|
|
|
|
|
2013-12-03 20:56:22 -08:00
|
|
|
if (err == -EEXIST) {
|
|
|
|
/* An outdated user space instance that does not understand
|
|
|
|
* the concept of user_features has attempted to create a new
|
|
|
|
* datapath and is likely to reuse it. Drop all user features.
|
|
|
|
*/
|
|
|
|
if (info->genlhdr->version < OVS_DP_VER_FEATURES)
|
|
|
|
ovs_dp_reset_user_features(skb, info);
|
|
|
|
}
|
|
|
|
|
2018-02-13 15:48:24 -08:00
|
|
|
goto err_destroy_meters;
|
2011-01-26 15:42:00 -08:00
|
|
|
}
|
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
|
|
|
|
info->snd_seq, 0, OVS_DP_CMD_NEW);
|
|
|
|
BUG_ON(err < 0);
|
2011-01-28 13:55:04 -08:00
|
|
|
|
2012-01-30 06:56:54 -08:00
|
|
|
ovs_net = net_generic(ovs_dp_get_net(dp), ovs_net_id);
|
2013-07-15 12:58:41 -07:00
|
|
|
list_add_tail_rcu(&dp->list_node, &ovs_net->dps);
|
2015-07-16 15:38:13 -07:00
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
ovs_notify(&dp_datapath_genl_family, &ovs_dp_datapath_multicast_group, reply, info);
|
2011-01-26 15:42:00 -08:00
|
|
|
return 0;
|
|
|
|
|
2018-02-13 15:48:24 -08:00
|
|
|
err_destroy_meters:
|
2014-03-28 13:44:23 -07:00
|
|
|
ovs_unlock();
|
2018-02-13 15:48:24 -08:00
|
|
|
ovs_meters_exit(dp);
|
|
|
|
err_destroy_ports_array:
|
2012-02-16 17:12:36 -08:00
|
|
|
kfree(dp->ports);
|
2011-09-15 16:41:36 -07:00
|
|
|
err_destroy_percpu:
|
|
|
|
free_percpu(dp->stats_percpu);
|
2011-01-26 15:42:00 -08:00
|
|
|
err_destroy_table:
|
2014-04-23 08:33:38 -07:00
|
|
|
ovs_flow_tbl_destroy(&dp->table);
|
2011-01-26 15:42:00 -08:00
|
|
|
err_free_dp:
|
|
|
|
kfree(dp);
|
2014-03-28 13:44:23 -07:00
|
|
|
err_free_reply:
|
|
|
|
kfree_skb(reply);
|
2011-01-26 15:42:00 -08:00
|
|
|
err:
|
2009-07-08 13:19:16 -07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
/* Called with ovs_mutex. */
|
2012-01-30 06:56:54 -08:00
|
|
|
static void __dp_destroy(struct datapath *dp)
|
2010-05-13 13:21:33 -07:00
|
|
|
{
|
2012-02-16 17:12:36 -08:00
|
|
|
int i;
|
2010-05-13 13:21:33 -07:00
|
|
|
|
2012-02-16 17:12:36 -08:00
|
|
|
for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) {
|
|
|
|
struct vport *vport;
|
datapath: hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jesse Gross <jesse@nicira.com>
2013-03-14 18:40:32 -07:00
|
|
|
struct hlist_node *n;
|
2012-02-16 17:12:36 -08:00
|
|
|
|
datapath: hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jesse Gross <jesse@nicira.com>
2013-03-14 18:40:32 -07:00
|
|
|
hlist_for_each_entry_safe(vport, n, &dp->ports[i], dp_hash_node)
|
2012-02-16 17:12:36 -08:00
|
|
|
if (vport->port_no != OVSP_LOCAL)
|
|
|
|
ovs_dp_detach_port(vport);
|
|
|
|
}
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2013-07-15 12:58:41 -07:00
|
|
|
list_del_rcu(&dp->list_node);
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
/* OVSP_LOCAL is datapath internal port. We need to make sure that
|
2014-01-10 15:57:04 -08:00
|
|
|
* all ports in datapath are destroyed first before freeing datapath.
|
|
|
|
*/
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_dp_detach_port(ovs_vport_ovsl(dp, OVSP_LOCAL));
|
2011-02-24 14:07:29 -08:00
|
|
|
|
2014-01-10 15:57:04 -08:00
|
|
|
/* RCU destroy the flow table */
|
2011-01-26 12:49:06 -08:00
|
|
|
call_rcu(&dp->rcu, destroy_dp_rcu);
|
2012-01-30 06:56:54 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int ovs_dp_cmd_del(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
|
|
|
struct sk_buff *reply;
|
|
|
|
struct datapath *dp;
|
|
|
|
int err;
|
|
|
|
|
2016-07-18 13:53:29 -07:00
|
|
|
reply = ovs_dp_cmd_alloc_info();
|
2014-03-28 13:44:23 -07:00
|
|
|
if (!reply)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_lock();
|
2012-01-30 06:56:54 -08:00
|
|
|
dp = lookup_datapath(sock_net(skb->sk), info->userhdr, info->attrs);
|
|
|
|
err = PTR_ERR(dp);
|
|
|
|
if (IS_ERR(dp))
|
2014-03-28 13:44:23 -07:00
|
|
|
goto err_unlock_free;
|
2012-01-30 06:56:54 -08:00
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
|
|
|
|
info->snd_seq, 0, OVS_DP_CMD_DEL);
|
|
|
|
BUG_ON(err < 0);
|
2012-01-30 06:56:54 -08:00
|
|
|
|
|
|
|
__dp_destroy(dp);
|
2014-03-28 13:44:23 -07:00
|
|
|
ovs_unlock();
|
2014-11-08 07:24:42 -08:00
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
ovs_notify(&dp_datapath_genl_family, &ovs_dp_datapath_multicast_group, reply, info);
|
2011-02-24 14:07:29 -08:00
|
|
|
return 0;
|
2014-03-28 13:44:23 -07:00
|
|
|
|
|
|
|
err_unlock_free:
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
2014-03-28 13:44:23 -07:00
|
|
|
kfree_skb(reply);
|
2013-04-12 15:57:09 -07:00
|
|
|
return err;
|
2010-05-13 13:21:33 -07:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_dp_cmd_set(struct sk_buff *skb, struct genl_info *info)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-01-28 13:55:04 -08:00
|
|
|
struct sk_buff *reply;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct datapath *dp;
|
|
|
|
int err;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2016-07-18 13:53:29 -07:00
|
|
|
reply = ovs_dp_cmd_alloc_info();
|
2014-03-28 13:44:23 -07:00
|
|
|
if (!reply)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_lock();
|
2012-01-30 06:56:54 -08:00
|
|
|
dp = lookup_datapath(sock_net(skb->sk), info->userhdr, info->attrs);
|
2013-04-12 15:57:09 -07:00
|
|
|
err = PTR_ERR(dp);
|
2011-01-26 15:42:00 -08:00
|
|
|
if (IS_ERR(dp))
|
2014-03-28 13:44:23 -07:00
|
|
|
goto err_unlock_free;
|
2010-07-28 18:20:43 -07:00
|
|
|
|
2013-12-03 20:47:24 -08:00
|
|
|
ovs_dp_change(dp, info->attrs);
|
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
|
2018-10-17 12:25:47 -07:00
|
|
|
info->snd_seq, 0, OVS_DP_CMD_GET);
|
2014-03-28 13:44:23 -07:00
|
|
|
BUG_ON(err < 0);
|
2015-07-16 15:38:13 -07:00
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
2014-11-08 07:24:42 -08:00
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
ovs_notify(&dp_datapath_genl_family, &ovs_dp_datapath_multicast_group, reply, info);
|
2011-01-28 13:55:04 -08:00
|
|
|
return 0;
|
2014-03-28 13:44:23 -07:00
|
|
|
|
|
|
|
err_unlock_free:
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
2014-03-28 13:44:23 -07:00
|
|
|
kfree_skb(reply);
|
2013-04-12 15:57:09 -07:00
|
|
|
return err;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_dp_cmd_get(struct sk_buff *skb, struct genl_info *info)
|
2009-08-01 00:09:56 -07:00
|
|
|
{
|
2011-01-28 13:55:04 -08:00
|
|
|
struct sk_buff *reply;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct datapath *dp;
|
|
|
|
int err;
|
2009-08-01 00:09:56 -07:00
|
|
|
|
2016-07-18 13:53:29 -07:00
|
|
|
reply = ovs_dp_cmd_alloc_info();
|
2014-03-28 13:44:23 -07:00
|
|
|
if (!reply)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2014-10-29 02:45:48 -07:00
|
|
|
ovs_lock();
|
2012-01-30 06:56:54 -08:00
|
|
|
dp = lookup_datapath(sock_net(skb->sk), info->userhdr, info->attrs);
|
2013-04-12 15:57:09 -07:00
|
|
|
if (IS_ERR(dp)) {
|
|
|
|
err = PTR_ERR(dp);
|
2014-03-28 13:44:23 -07:00
|
|
|
goto err_unlock_free;
|
2013-04-12 15:57:09 -07:00
|
|
|
}
|
2014-03-28 13:44:23 -07:00
|
|
|
err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
|
2018-10-17 12:25:47 -07:00
|
|
|
info->snd_seq, 0, OVS_DP_CMD_GET);
|
2014-03-28 13:44:23 -07:00
|
|
|
BUG_ON(err < 0);
|
2014-10-29 02:45:48 -07:00
|
|
|
ovs_unlock();
|
2011-01-28 13:55:04 -08:00
|
|
|
|
|
|
|
return genlmsg_reply(reply, info);
|
2013-04-12 15:57:09 -07:00
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
err_unlock_free:
|
2014-10-29 02:45:48 -07:00
|
|
|
ovs_unlock();
|
2014-03-28 13:44:23 -07:00
|
|
|
kfree_skb(reply);
|
2013-04-12 15:57:09 -07:00
|
|
|
return err;
|
2009-08-01 00:09:56 -07:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_dp_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
|
2010-02-01 16:43:44 -05:00
|
|
|
{
|
2012-01-30 06:56:54 -08:00
|
|
|
struct ovs_net *ovs_net = net_generic(sock_net(skb->sk), ovs_net_id);
|
2011-01-21 17:01:56 -08:00
|
|
|
struct datapath *dp;
|
|
|
|
int skip = cb->args[0];
|
|
|
|
int i = 0;
|
2010-02-01 16:43:44 -05:00
|
|
|
|
2014-10-29 02:45:48 -07:00
|
|
|
ovs_lock();
|
|
|
|
list_for_each_entry(dp, &ovs_net->dps, list_node) {
|
2012-01-11 09:58:17 -08:00
|
|
|
if (i >= skip &&
|
2012-12-19 17:43:09 +09:00
|
|
|
ovs_dp_cmd_fill_info(dp, skb, NETLINK_CB(cb->skb).portid,
|
2011-01-28 13:55:04 -08:00
|
|
|
cb->nlh->nlmsg_seq, NLM_F_MULTI,
|
2018-10-17 12:25:47 -07:00
|
|
|
OVS_DP_CMD_GET) < 0)
|
2011-01-28 13:55:04 -08:00
|
|
|
break;
|
2011-01-21 17:01:56 -08:00
|
|
|
i++;
|
2010-02-01 16:43:44 -05:00
|
|
|
}
|
2014-10-29 02:45:48 -07:00
|
|
|
ovs_unlock();
|
2011-01-28 13:55:04 -08:00
|
|
|
|
2011-01-21 17:01:56 -08:00
|
|
|
cb->args[0] = i;
|
|
|
|
|
2011-01-28 13:55:04 -08:00
|
|
|
return skb->len;
|
2011-01-26 12:28:59 -08:00
|
|
|
}
|
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
static const struct nla_policy datapath_policy[OVS_DP_ATTR_MAX + 1] = {
|
|
|
|
[OVS_DP_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
|
|
|
|
[OVS_DP_ATTR_UPCALL_PID] = { .type = NLA_U32 },
|
|
|
|
[OVS_DP_ATTR_USER_FEATURES] = { .type = NLA_U32 },
|
|
|
|
};
|
|
|
|
|
2019-11-25 14:20:44 -08:00
|
|
|
static const struct genl_ops dp_datapath_genl_ops[] = {
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_DP_CMD_NEW,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2016-07-17 09:52:06 -07:00
|
|
|
.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
2011-01-28 13:55:04 -08:00
|
|
|
.policy = datapath_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_dp_cmd_new
|
2011-01-28 13:55:04 -08:00
|
|
|
},
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_DP_CMD_DEL,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2016-07-17 09:52:06 -07:00
|
|
|
.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
2011-01-28 13:55:04 -08:00
|
|
|
.policy = datapath_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_dp_cmd_del
|
2011-01-28 13:55:04 -08:00
|
|
|
},
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_DP_CMD_GET,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2011-01-28 13:55:04 -08:00
|
|
|
.flags = 0, /* OK for unprivileged users. */
|
|
|
|
.policy = datapath_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_dp_cmd_get,
|
|
|
|
.dumpit = ovs_dp_cmd_dump
|
2011-01-28 13:55:04 -08:00
|
|
|
},
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_DP_CMD_SET,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2016-07-17 09:52:06 -07:00
|
|
|
.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
2011-01-28 13:55:04 -08:00
|
|
|
.policy = datapath_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_dp_cmd_set,
|
2011-01-28 13:55:04 -08:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2016-12-09 17:22:42 -08:00
|
|
|
static struct genl_family dp_datapath_genl_family __ro_after_init = {
|
2011-08-18 10:35:40 -07:00
|
|
|
.hdrsize = sizeof(struct ovs_header),
|
2014-04-01 20:55:21 -07:00
|
|
|
.name = OVS_DATAPATH_FAMILY,
|
|
|
|
.version = OVS_DATAPATH_VERSION,
|
|
|
|
.maxattr = OVS_DP_ATTR_MAX,
|
2013-08-26 23:53:17 -07:00
|
|
|
.netnsok = true,
|
2014-04-01 20:55:21 -07:00
|
|
|
.parallel_ops = true,
|
|
|
|
.ops = dp_datapath_genl_ops,
|
|
|
|
.n_ops = ARRAY_SIZE(dp_datapath_genl_ops),
|
|
|
|
.mcgrps = &ovs_dp_datapath_multicast_group,
|
|
|
|
.n_mcgrps = 1,
|
2016-12-09 17:22:42 -08:00
|
|
|
.module = THIS_MODULE,
|
2011-01-28 13:59:03 -08:00
|
|
|
};
|
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
/* Called with ovs_mutex or RCU read lock. */
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
|
2018-02-07 07:49:52 -08:00
|
|
|
struct net *net, u32 portid, u32 seq,
|
|
|
|
u32 flags, u8 cmd)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header;
|
2011-11-18 10:54:12 -08:00
|
|
|
struct ovs_vport_stats vport_stats;
|
2011-01-26 12:28:59 -08:00
|
|
|
int err;
|
|
|
|
|
2012-12-19 17:43:09 +09:00
|
|
|
ovs_header = genlmsg_put(skb, portid, seq, &dp_vport_genl_family,
|
2011-01-28 13:59:03 -08:00
|
|
|
flags, cmd);
|
2011-08-18 10:35:40 -07:00
|
|
|
if (!ovs_header)
|
2011-01-28 13:59:03 -08:00
|
|
|
return -EMSGSIZE;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-09-15 16:41:36 -07:00
|
|
|
ovs_header->dp_ifindex = get_dpifindex(vport->dp);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2012-04-02 13:25:21 -07:00
|
|
|
if (nla_put_u32(skb, OVS_VPORT_ATTR_PORT_NO, vport->port_no) ||
|
|
|
|
nla_put_u32(skb, OVS_VPORT_ATTR_TYPE, vport->ops->type) ||
|
2015-12-03 11:40:53 -08:00
|
|
|
nla_put_string(skb, OVS_VPORT_ATTR_NAME,
|
2018-02-07 07:49:52 -08:00
|
|
|
ovs_vport_name(vport)) ||
|
|
|
|
nla_put_u32(skb, OVS_VPORT_ATTR_IFINDEX, vport->dev->ifindex))
|
2012-04-02 13:25:21 -07:00
|
|
|
goto nla_put_failure;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2018-02-07 07:49:52 -08:00
|
|
|
#ifdef HAVE_PEERNET2ID_ALLOC
|
|
|
|
if (!net_eq(net, dev_net(vport->dev))) {
|
|
|
|
int id = peernet2id_alloc(net, dev_net(vport->dev));
|
|
|
|
|
|
|
|
if (nla_put_s32(skb, OVS_VPORT_ATTR_NETNSID, id))
|
|
|
|
goto nla_put_failure;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
2011-11-21 17:15:20 -08:00
|
|
|
ovs_vport_get_stats(vport, &vport_stats);
|
2016-07-17 09:52:10 -07:00
|
|
|
if (nla_put_64bit(skb, OVS_VPORT_ATTR_STATS,
|
|
|
|
sizeof(struct ovs_vport_stats), &vport_stats,
|
|
|
|
OVS_VPORT_ATTR_PAD))
|
2012-04-02 13:25:21 -07:00
|
|
|
goto nla_put_failure;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2014-04-14 23:37:10 -07:00
|
|
|
if (ovs_vport_get_upcall_portids(vport, skb))
|
|
|
|
goto nla_put_failure;
|
|
|
|
|
2011-11-21 17:15:20 -08:00
|
|
|
err = ovs_vport_get_options(vport, skb);
|
2011-01-28 13:59:03 -08:00
|
|
|
if (err == -EMSGSIZE)
|
|
|
|
goto error;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2015-02-03 21:53:36 +01:00
|
|
|
genlmsg_end(skb, ovs_header);
|
|
|
|
return 0;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
err = -EMSGSIZE;
|
2011-01-28 13:59:03 -08:00
|
|
|
error:
|
2011-08-18 10:35:40 -07:00
|
|
|
genlmsg_cancel(skb, ovs_header);
|
2011-01-28 13:59:03 -08:00
|
|
|
return err;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
static struct sk_buff *ovs_vport_cmd_alloc_info(void)
|
|
|
|
{
|
|
|
|
return nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called with ovs_mutex, only via ovs_dp_notify_wq(). */
|
2018-02-07 07:49:52 -08:00
|
|
|
struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, struct net *net,
|
|
|
|
u32 portid, u32 seq, u8 cmd)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-01-26 12:28:59 -08:00
|
|
|
struct sk_buff *skb;
|
2011-01-28 13:59:03 -08:00
|
|
|
int retval;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-01-28 13:59:03 -08:00
|
|
|
skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
|
2011-01-26 12:28:59 -08:00
|
|
|
if (!skb)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
2018-02-07 07:49:52 -08:00
|
|
|
retval = ovs_vport_cmd_fill_info(vport, skb, net, portid, seq, 0, cmd);
|
2013-03-20 16:14:58 -07:00
|
|
|
BUG_ON(retval < 0);
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
return skb;
|
2011-01-28 13:59:03 -08:00
|
|
|
}
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
/* Called with ovs_mutex or RCU read lock. */
|
2012-01-30 06:56:54 -08:00
|
|
|
static struct vport *lookup_vport(struct net *net,
|
2014-09-23 16:02:35 +02:00
|
|
|
const struct ovs_header *ovs_header,
|
2011-08-18 10:35:40 -07:00
|
|
|
struct nlattr *a[OVS_VPORT_ATTR_MAX + 1])
|
2011-01-26 12:28:59 -08:00
|
|
|
{
|
|
|
|
struct datapath *dp;
|
|
|
|
struct vport *vport;
|
|
|
|
|
2018-02-07 07:49:52 -08:00
|
|
|
if (a[OVS_VPORT_ATTR_IFINDEX])
|
|
|
|
return ERR_PTR(-EOPNOTSUPP);
|
2011-08-18 10:35:40 -07:00
|
|
|
if (a[OVS_VPORT_ATTR_NAME]) {
|
2012-01-30 06:56:54 -08:00
|
|
|
vport = ovs_vport_locate(net, nla_data(a[OVS_VPORT_ATTR_NAME]));
|
2011-01-26 12:49:06 -08:00
|
|
|
if (!vport)
|
2011-01-26 12:28:59 -08:00
|
|
|
return ERR_PTR(-ENODEV);
|
2012-03-07 14:11:09 -08:00
|
|
|
if (ovs_header->dp_ifindex &&
|
|
|
|
ovs_header->dp_ifindex != get_dpifindex(vport->dp))
|
|
|
|
return ERR_PTR(-ENODEV);
|
2011-01-26 12:28:59 -08:00
|
|
|
return vport;
|
2011-08-18 10:35:40 -07:00
|
|
|
} else if (a[OVS_VPORT_ATTR_PORT_NO]) {
|
|
|
|
u32 port_no = nla_get_u32(a[OVS_VPORT_ATTR_PORT_NO]);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
if (port_no >= DP_MAX_PORTS)
|
2011-01-28 13:59:03 -08:00
|
|
|
return ERR_PTR(-EFBIG);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2012-01-30 06:56:54 -08:00
|
|
|
dp = get_dp(net, ovs_header->dp_ifindex);
|
2011-01-26 12:28:59 -08:00
|
|
|
if (!dp)
|
|
|
|
return ERR_PTR(-ENODEV);
|
2010-04-12 15:53:39 -04:00
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
vport = ovs_vport_ovsl_rcu(dp, port_no);
|
2011-01-26 12:49:06 -08:00
|
|
|
if (!vport)
|
2013-01-08 13:41:00 +02:00
|
|
|
return ERR_PTR(-ENODEV);
|
2011-01-26 12:28:59 -08:00
|
|
|
return vport;
|
|
|
|
} else
|
|
|
|
return ERR_PTR(-EINVAL);
|
2018-02-07 07:49:52 -08:00
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2016-07-17 09:52:11 -07:00
|
|
|
/* Called with ovs_mutex */
|
|
|
|
static void update_headroom(struct datapath *dp)
|
|
|
|
{
|
|
|
|
unsigned dev_headroom, max_headroom = 0;
|
|
|
|
struct net_device *dev;
|
|
|
|
struct vport *vport;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) {
|
|
|
|
hlist_for_each_entry_rcu(vport, &dp->ports[i], dp_hash_node) {
|
|
|
|
dev = vport->dev;
|
|
|
|
dev_headroom = netdev_get_fwd_headroom(dev);
|
|
|
|
if (dev_headroom > max_headroom)
|
|
|
|
max_headroom = dev_headroom;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
dp->max_headroom = max_headroom;
|
|
|
|
for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++)
|
|
|
|
hlist_for_each_entry_rcu(vport, &dp->ports[i], dp_hash_node)
|
|
|
|
netdev_set_rx_headroom(vport->dev, max_headroom);
|
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
|
2011-01-26 12:28:59 -08:00
|
|
|
{
|
2011-01-28 13:59:03 -08:00
|
|
|
struct nlattr **a = info->attrs;
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header = info->userhdr;
|
2011-01-26 12:28:59 -08:00
|
|
|
struct vport_parms parms;
|
2011-01-26 12:49:06 -08:00
|
|
|
struct sk_buff *reply;
|
2011-01-26 12:28:59 -08:00
|
|
|
struct vport *vport;
|
|
|
|
struct datapath *dp;
|
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
|
|
|
u32 port_no;
|
2011-01-26 12:28:59 -08:00
|
|
|
int err;
|
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-10-12 11:04:10 -07:00
|
|
|
if (!a[OVS_VPORT_ATTR_NAME] || !a[OVS_VPORT_ATTR_TYPE] ||
|
|
|
|
!a[OVS_VPORT_ATTR_UPCALL_PID])
|
2014-03-28 13:44:23 -07:00
|
|
|
return -EINVAL;
|
2018-02-07 07:49:52 -08:00
|
|
|
if (a[OVS_VPORT_ATTR_IFINDEX])
|
|
|
|
return -EOPNOTSUPP;
|
2014-03-28 13:44:23 -07:00
|
|
|
|
|
|
|
port_no = a[OVS_VPORT_ATTR_PORT_NO]
|
|
|
|
? nla_get_u32(a[OVS_VPORT_ATTR_PORT_NO]) : 0;
|
|
|
|
if (port_no >= DP_MAX_PORTS)
|
|
|
|
return -EFBIG;
|
|
|
|
|
|
|
|
reply = ovs_vport_cmd_alloc_info();
|
|
|
|
if (!reply)
|
|
|
|
return -ENOMEM;
|
2011-01-28 13:59:03 -08:00
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_lock();
|
2015-04-04 08:24:13 +02:00
|
|
|
restart:
|
2012-01-30 06:56:54 -08:00
|
|
|
dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
|
2011-01-26 12:28:59 -08:00
|
|
|
err = -ENODEV;
|
|
|
|
if (!dp)
|
2014-03-28 13:44:23 -07:00
|
|
|
goto exit_unlock_free;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
if (port_no) {
|
2013-04-12 15:57:09 -07:00
|
|
|
vport = ovs_vport_ovsl(dp, port_no);
|
2011-01-26 12:28:59 -08:00
|
|
|
err = -EBUSY;
|
|
|
|
if (vport)
|
2014-03-28 13:44:23 -07:00
|
|
|
goto exit_unlock_free;
|
2011-01-26 12:28:59 -08:00
|
|
|
} else {
|
|
|
|
for (port_no = 1; ; port_no++) {
|
|
|
|
if (port_no >= DP_MAX_PORTS) {
|
|
|
|
err = -EFBIG;
|
2014-03-28 13:44:23 -07:00
|
|
|
goto exit_unlock_free;
|
2011-01-26 12:28:59 -08:00
|
|
|
}
|
2013-04-12 15:57:09 -07:00
|
|
|
vport = ovs_vport_ovsl(dp, port_no);
|
2011-01-26 12:28:59 -08:00
|
|
|
if (!vport)
|
|
|
|
break;
|
2010-12-29 15:04:36 -08:00
|
|
|
}
|
2009-07-08 13:19:16 -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
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
parms.name = nla_data(a[OVS_VPORT_ATTR_NAME]);
|
|
|
|
parms.type = nla_get_u32(a[OVS_VPORT_ATTR_TYPE]);
|
|
|
|
parms.options = a[OVS_VPORT_ATTR_OPTIONS];
|
2011-01-26 12:28:59 -08:00
|
|
|
parms.dp = dp;
|
|
|
|
parms.port_no = port_no;
|
2014-04-14 23:37:10 -07:00
|
|
|
parms.upcall_portids = a[OVS_VPORT_ATTR_UPCALL_PID];
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
vport = new_vport(&parms);
|
|
|
|
err = PTR_ERR(vport);
|
2015-04-04 08:24:13 +02:00
|
|
|
if (IS_ERR(vport)) {
|
|
|
|
if (err == -EAGAIN)
|
|
|
|
goto restart;
|
2014-03-28 13:44:23 -07:00
|
|
|
goto exit_unlock_free;
|
2015-04-04 08:24:13 +02:00
|
|
|
}
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2018-02-07 07:49:52 -08:00
|
|
|
err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
|
|
|
|
info->snd_portid, info->snd_seq, 0,
|
|
|
|
OVS_VPORT_CMD_NEW);
|
2014-03-28 13:44:23 -07:00
|
|
|
BUG_ON(err < 0);
|
2016-07-17 09:52:11 -07:00
|
|
|
|
|
|
|
if (netdev_get_fwd_headroom(vport->dev) > dp->max_headroom)
|
|
|
|
update_headroom(dp);
|
|
|
|
else
|
|
|
|
netdev_set_rx_headroom(vport->dev, dp->max_headroom);
|
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
ovs_unlock();
|
2013-03-29 18:24:06 -07:00
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
ovs_notify(&dp_vport_genl_family, &ovs_dp_vport_multicast_group, reply, info);
|
2014-03-28 13:44:23 -07:00
|
|
|
return 0;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
exit_unlock_free:
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
2014-03-28 13:44:23 -07:00
|
|
|
kfree_skb(reply);
|
2011-01-26 12:28:59 -08:00
|
|
|
return err;
|
2010-05-13 13:21:33 -07:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
|
2010-05-13 13:21:33 -07:00
|
|
|
{
|
2011-01-28 13:59:03 -08:00
|
|
|
struct nlattr **a = info->attrs;
|
|
|
|
struct sk_buff *reply;
|
2011-01-26 12:28:59 -08:00
|
|
|
struct vport *vport;
|
|
|
|
int err;
|
2010-05-13 13:21:33 -07:00
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
reply = ovs_vport_cmd_alloc_info();
|
|
|
|
if (!reply)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_lock();
|
2012-01-30 06:56:54 -08:00
|
|
|
vport = lookup_vport(sock_net(skb->sk), info->userhdr, a);
|
2011-01-26 12:28:59 -08:00
|
|
|
err = PTR_ERR(vport);
|
|
|
|
if (IS_ERR(vport))
|
2014-03-28 13:44:23 -07:00
|
|
|
goto exit_unlock_free;
|
2010-05-13 13:21:33 -07:00
|
|
|
|
2011-11-07 15:53:01 -08:00
|
|
|
if (a[OVS_VPORT_ATTR_TYPE] &&
|
2013-05-02 10:14:54 -07:00
|
|
|
nla_get_u32(a[OVS_VPORT_ATTR_TYPE]) != vport->ops->type) {
|
2011-10-17 11:03:22 -07:00
|
|
|
err = -EINVAL;
|
2014-03-28 13:44:23 -07:00
|
|
|
goto exit_unlock_free;
|
2013-03-20 16:14:58 -07:00
|
|
|
}
|
|
|
|
|
2013-05-02 10:14:54 -07:00
|
|
|
if (a[OVS_VPORT_ATTR_OPTIONS]) {
|
2011-11-21 17:15:20 -08:00
|
|
|
err = ovs_vport_set_options(vport, a[OVS_VPORT_ATTR_OPTIONS]);
|
2013-05-02 10:14:54 -07:00
|
|
|
if (err)
|
2014-03-28 13:44:23 -07:00
|
|
|
goto exit_unlock_free;
|
2013-05-02 10:14:54 -07:00
|
|
|
}
|
2013-01-25 13:42:01 -08:00
|
|
|
|
2014-04-14 23:37:10 -07:00
|
|
|
if (a[OVS_VPORT_ATTR_UPCALL_PID]) {
|
2014-11-08 07:24:42 -08:00
|
|
|
struct nlattr *ids = a[OVS_VPORT_ATTR_UPCALL_PID];
|
|
|
|
|
|
|
|
err = ovs_vport_set_upcall_portids(vport, ids);
|
2014-04-14 23:37:10 -07:00
|
|
|
if (err)
|
|
|
|
goto exit_unlock_free;
|
|
|
|
}
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2018-02-07 07:49:52 -08:00
|
|
|
err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
|
|
|
|
info->snd_portid, info->snd_seq, 0,
|
2018-10-17 12:25:47 -07:00
|
|
|
OVS_VPORT_CMD_SET);
|
2013-03-20 16:14:58 -07:00
|
|
|
BUG_ON(err < 0);
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
2014-03-28 13:44:23 -07:00
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
ovs_notify(&dp_vport_genl_family, &ovs_dp_vport_multicast_group, reply, info);
|
2013-03-20 16:14:58 -07:00
|
|
|
return 0;
|
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
exit_unlock_free:
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
2014-03-28 13:44:23 -07:00
|
|
|
kfree_skb(reply);
|
2011-01-26 12:28:59 -08:00
|
|
|
return err;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_vport_cmd_del(struct sk_buff *skb, struct genl_info *info)
|
2009-10-12 10:34:10 -07:00
|
|
|
{
|
2016-07-17 09:52:11 -07:00
|
|
|
bool must_update_headroom = false;
|
2011-01-28 13:59:03 -08:00
|
|
|
struct nlattr **a = info->attrs;
|
|
|
|
struct sk_buff *reply;
|
2016-07-17 09:52:11 -07:00
|
|
|
struct datapath *dp;
|
2011-01-26 12:28:59 -08:00
|
|
|
struct vport *vport;
|
|
|
|
int err;
|
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
reply = ovs_vport_cmd_alloc_info();
|
|
|
|
if (!reply)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_lock();
|
2012-01-30 06:56:54 -08:00
|
|
|
vport = lookup_vport(sock_net(skb->sk), info->userhdr, a);
|
2011-01-26 12:28:59 -08:00
|
|
|
err = PTR_ERR(vport);
|
2011-01-28 13:59:03 -08:00
|
|
|
if (IS_ERR(vport))
|
2014-03-28 13:44:23 -07:00
|
|
|
goto exit_unlock_free;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
if (vport->port_no == OVSP_LOCAL) {
|
2011-01-28 13:59:03 -08:00
|
|
|
err = -EINVAL;
|
2014-03-28 13:44:23 -07:00
|
|
|
goto exit_unlock_free;
|
2011-01-28 13:59:03 -08:00
|
|
|
}
|
|
|
|
|
2018-02-07 07:49:52 -08:00
|
|
|
err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
|
|
|
|
info->snd_portid, info->snd_seq, 0,
|
|
|
|
OVS_VPORT_CMD_DEL);
|
2014-03-28 13:44:23 -07:00
|
|
|
BUG_ON(err < 0);
|
2016-07-17 09:52:11 -07:00
|
|
|
|
|
|
|
/* the vport deletion may trigger dp headroom update */
|
|
|
|
dp = vport->dp;
|
|
|
|
if (netdev_get_fwd_headroom(vport->dev) == dp->max_headroom)
|
|
|
|
must_update_headroom = true;
|
|
|
|
netdev_reset_rx_headroom(vport->dev);
|
2011-11-21 17:15:20 -08:00
|
|
|
ovs_dp_detach_port(vport);
|
2016-07-17 09:52:11 -07:00
|
|
|
|
|
|
|
if (must_update_headroom)
|
|
|
|
update_headroom(dp);
|
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
ovs_unlock();
|
2011-01-28 13:59:03 -08:00
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
ovs_notify(&dp_vport_genl_family, &ovs_dp_vport_multicast_group, reply, info);
|
2014-03-28 13:44:23 -07:00
|
|
|
return 0;
|
2011-01-28 13:59:03 -08:00
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
exit_unlock_free:
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
2014-03-28 13:44:23 -07:00
|
|
|
kfree_skb(reply);
|
2011-01-26 12:28:59 -08:00
|
|
|
return err;
|
2009-10-12 10:34:10 -07:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
|
2009-10-12 10:34:10 -07:00
|
|
|
{
|
2011-01-28 13:59:03 -08:00
|
|
|
struct nlattr **a = info->attrs;
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header = info->userhdr;
|
2011-01-26 12:49:06 -08:00
|
|
|
struct sk_buff *reply;
|
2011-01-26 12:28:59 -08:00
|
|
|
struct vport *vport;
|
|
|
|
int err;
|
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
reply = ovs_vport_cmd_alloc_info();
|
|
|
|
if (!reply)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
rcu_read_lock();
|
2012-01-30 06:56:54 -08:00
|
|
|
vport = lookup_vport(sock_net(skb->sk), ovs_header, a);
|
2011-01-26 12:28:59 -08:00
|
|
|
err = PTR_ERR(vport);
|
|
|
|
if (IS_ERR(vport))
|
2014-03-28 13:44:23 -07:00
|
|
|
goto exit_unlock_free;
|
2018-02-07 07:49:52 -08:00
|
|
|
err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info),
|
|
|
|
info->snd_portid, info->snd_seq, 0,
|
2018-10-17 12:25:47 -07:00
|
|
|
OVS_VPORT_CMD_GET);
|
2014-03-28 13:44:23 -07:00
|
|
|
BUG_ON(err < 0);
|
2011-05-27 15:57:28 -07:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return genlmsg_reply(reply, info);
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2014-03-28 13:44:23 -07:00
|
|
|
exit_unlock_free:
|
2011-01-26 12:49:06 -08:00
|
|
|
rcu_read_unlock();
|
2014-03-28 13:44:23 -07:00
|
|
|
kfree_skb(reply);
|
2011-01-26 12:28:59 -08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_vport_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
|
2011-01-26 12:28:59 -08:00
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header = genlmsg_data(nlmsg_data(cb->nlh));
|
2011-01-26 12:28:59 -08:00
|
|
|
struct datapath *dp;
|
2012-02-16 17:12:36 -08:00
|
|
|
int bucket = cb->args[0], skip = cb->args[1];
|
|
|
|
int i, j = 0;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2014-02-11 15:34:39 -08:00
|
|
|
rcu_read_lock();
|
2014-07-15 14:38:29 -07:00
|
|
|
dp = get_dp_rcu(sock_net(skb->sk), ovs_header->dp_ifindex);
|
2014-02-11 15:34:39 -08:00
|
|
|
if (!dp) {
|
|
|
|
rcu_read_unlock();
|
2011-01-28 13:59:03 -08:00
|
|
|
return -ENODEV;
|
2014-02-11 15:34:39 -08:00
|
|
|
}
|
2012-02-16 17:12:36 -08:00
|
|
|
for (i = bucket; i < DP_VPORT_HASH_BUCKETS; i++) {
|
2011-01-26 12:49:06 -08:00
|
|
|
struct vport *vport;
|
2012-02-16 17:12:36 -08:00
|
|
|
|
|
|
|
j = 0;
|
datapath: hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jesse Gross <jesse@nicira.com>
2013-03-14 18:40:32 -07:00
|
|
|
hlist_for_each_entry_rcu(vport, &dp->ports[i], dp_hash_node) {
|
2012-02-16 17:12:36 -08:00
|
|
|
if (j >= skip &&
|
|
|
|
ovs_vport_cmd_fill_info(vport, skb,
|
2018-02-07 07:49:52 -08:00
|
|
|
sock_net(skb->sk),
|
2012-12-19 17:43:09 +09:00
|
|
|
NETLINK_CB(cb->skb).portid,
|
2012-02-16 17:12:36 -08:00
|
|
|
cb->nlh->nlmsg_seq,
|
|
|
|
NLM_F_MULTI,
|
2018-10-17 12:25:47 -07:00
|
|
|
OVS_VPORT_CMD_GET) < 0)
|
2012-02-16 17:12:36 -08:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
skip = 0;
|
2011-01-26 12:28:59 -08:00
|
|
|
}
|
2012-02-16 17:12:36 -08:00
|
|
|
out:
|
2011-01-26 12:49:06 -08:00
|
|
|
rcu_read_unlock();
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2012-02-16 17:12:36 -08:00
|
|
|
cb->args[0] = i;
|
|
|
|
cb->args[1] = j;
|
2011-01-28 13:59:03 -08:00
|
|
|
|
2012-02-16 17:12:36 -08:00
|
|
|
return skb->len;
|
2009-10-12 10:34:10 -07:00
|
|
|
}
|
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
static const struct nla_policy vport_policy[OVS_VPORT_ATTR_MAX + 1] = {
|
|
|
|
[OVS_VPORT_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
|
|
|
|
[OVS_VPORT_ATTR_STATS] = { .len = sizeof(struct ovs_vport_stats) },
|
|
|
|
[OVS_VPORT_ATTR_PORT_NO] = { .type = NLA_U32 },
|
|
|
|
[OVS_VPORT_ATTR_TYPE] = { .type = NLA_U32 },
|
2019-10-09 14:22:11 -07:00
|
|
|
[OVS_VPORT_ATTR_UPCALL_PID] = { .type = NLA_UNSPEC },
|
2014-04-01 20:55:21 -07:00
|
|
|
[OVS_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED },
|
2018-02-07 07:49:52 -08:00
|
|
|
[OVS_VPORT_ATTR_IFINDEX] = { .type = NLA_U32 },
|
|
|
|
[OVS_VPORT_ATTR_NETNSID] = { .type = NLA_S32 },
|
2014-04-01 20:55:21 -07:00
|
|
|
};
|
|
|
|
|
2019-11-25 14:20:44 -08:00
|
|
|
static const struct genl_ops dp_vport_genl_ops[] = {
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_VPORT_CMD_NEW,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2016-07-17 09:52:06 -07:00
|
|
|
.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
2011-01-28 13:59:03 -08:00
|
|
|
.policy = vport_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_vport_cmd_new
|
2011-01-28 13:59:03 -08:00
|
|
|
},
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_VPORT_CMD_DEL,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2016-07-17 09:52:06 -07:00
|
|
|
.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
2011-01-28 13:59:03 -08:00
|
|
|
.policy = vport_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_vport_cmd_del
|
2011-01-28 13:59:03 -08:00
|
|
|
},
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_VPORT_CMD_GET,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2011-01-28 13:59:03 -08:00
|
|
|
.flags = 0, /* OK for unprivileged users. */
|
|
|
|
.policy = vport_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_vport_cmd_get,
|
|
|
|
.dumpit = ovs_vport_cmd_dump
|
2011-01-28 13:59:03 -08:00
|
|
|
},
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_VPORT_CMD_SET,
|
2019-10-15 10:27:48 -07:00
|
|
|
#ifdef HAVE_GENL_VALIDATE_FLAGS
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
#endif
|
2016-07-17 09:52:06 -07:00
|
|
|
.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
2011-01-28 13:59:03 -08:00
|
|
|
.policy = vport_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_vport_cmd_set,
|
2011-01-28 13:59:03 -08:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2016-12-09 17:22:42 -08:00
|
|
|
struct genl_family dp_vport_genl_family __ro_after_init = {
|
2014-04-01 20:55:21 -07:00
|
|
|
.hdrsize = sizeof(struct ovs_header),
|
|
|
|
.name = OVS_VPORT_FAMILY,
|
|
|
|
.version = OVS_VPORT_VERSION,
|
|
|
|
.maxattr = OVS_VPORT_ATTR_MAX,
|
|
|
|
.netnsok = true,
|
|
|
|
.parallel_ops = true,
|
|
|
|
.ops = dp_vport_genl_ops,
|
|
|
|
.n_ops = ARRAY_SIZE(dp_vport_genl_ops),
|
|
|
|
.mcgrps = &ovs_dp_vport_multicast_group,
|
|
|
|
.n_mcgrps = 1,
|
2016-12-09 17:22:42 -08:00
|
|
|
.module = THIS_MODULE,
|
2011-01-26 13:41:54 -08:00
|
|
|
};
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2015-08-04 18:07:27 -07:00
|
|
|
static struct genl_family *dp_genl_families[] = {
|
2014-04-01 20:55:21 -07:00
|
|
|
&dp_datapath_genl_family,
|
|
|
|
&dp_vport_genl_family,
|
|
|
|
&dp_flow_genl_family,
|
|
|
|
&dp_packet_genl_family,
|
2018-02-13 15:48:24 -08:00
|
|
|
&dp_meter_genl_family,
|
datapath: conntrack: Support conntrack zone limit
Upstream commit:
commit 11efd5cb04a184eea4f57b68ea63dddd463158d1
Author: Yi-Hung Wei <yihung.wei@gmail.com>
Date: Thu May 24 17:56:43 2018 -0700
openvswitch: Support conntrack zone limit
Currently, nf_conntrack_max is used to limit the maximum number of
conntrack entries in the conntrack table for every network namespace.
For the VMs and containers that reside in the same namespace,
they share the same conntrack table, and the total # of conntrack entries
for all the VMs and containers are limited by nf_conntrack_max. In this
case, if one of the VM/container abuses the usage the conntrack entries,
it blocks the others from committing valid conntrack entries into the
conntrack table. Even if we can possibly put the VM in different network
namespace, the current nf_conntrack_max configuration is kind of rigid
that we cannot limit different VM/container to have different # conntrack
entries.
To address the aforementioned issue, this patch proposes to have a
fine-grained mechanism that could further limit the # of conntrack entries
per-zone. For example, we can designate different zone to different VM,
and set conntrack limit to each zone. By providing this isolation, a
mis-behaved VM only consumes the conntrack entries in its own zone, and
it will not influence other well-behaved VMs. Moreover, the users can
set various conntrack limit to different zone based on their preference.
The proposed implementation utilizes Netfilter's nf_conncount backend
to count the number of connections in a particular zone. If the number of
connection is above a configured limitation, ovs will return ENOMEM to the
userspace. If userspace does not configure the zone limit, the limit
defaults to zero that is no limitation, which is backward compatible to
the behavior without this patch.
The following high leve APIs are provided to the userspace:
- OVS_CT_LIMIT_CMD_SET:
* set default connection limit for all zones
* set the connection limit for a particular zone
- OVS_CT_LIMIT_CMD_DEL:
* remove the connection limit for a particular zone
- OVS_CT_LIMIT_CMD_GET:
* get the default connection limit for all zones
* get the connection limit for a particular zone
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Justin Pettit <jpettit@ovn.org>
2018-08-17 02:05:06 -07:00
|
|
|
#if IS_ENABLED(CONFIG_NETFILTER_CONNCOUNT)
|
|
|
|
&dp_ct_limit_genl_family,
|
|
|
|
#endif
|
2011-01-26 13:41:54 -08:00
|
|
|
};
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
static void dp_unregister_genl(int n_families)
|
|
|
|
{
|
|
|
|
int i;
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2011-08-19 15:43:06 -07:00
|
|
|
for (i = 0; i < n_families; i++)
|
2014-04-01 20:55:21 -07:00
|
|
|
genl_unregister_family(dp_genl_families[i]);
|
2011-01-26 12:49:06 -08:00
|
|
|
}
|
|
|
|
|
2016-12-09 17:22:42 -08:00
|
|
|
static int __init dp_register_genl(void)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-01-26 13:41:54 -08:00
|
|
|
int err;
|
|
|
|
int i;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
for (i = 0; i < ARRAY_SIZE(dp_genl_families); i++) {
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2014-04-01 20:55:21 -07:00
|
|
|
err = genl_register_family(dp_genl_families[i]);
|
2011-01-26 13:41:54 -08:00
|
|
|
if (err)
|
|
|
|
goto error;
|
|
|
|
}
|
2010-06-17 15:20:16 -07:00
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
return 0;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
error:
|
2014-04-01 20:55:21 -07:00
|
|
|
dp_unregister_genl(i);
|
2011-01-26 13:41:54 -08:00
|
|
|
return err;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2012-01-30 06:56:54 -08:00
|
|
|
static int __net_init ovs_init_net(struct net *net)
|
|
|
|
{
|
|
|
|
struct ovs_net *ovs_net = net_generic(net, ovs_net_id);
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&ovs_net->dps);
|
2013-04-12 15:57:09 -07:00
|
|
|
INIT_WORK(&ovs_net->dp_notify_work, ovs_dp_notify_wq);
|
2017-07-06 13:57:34 -07:00
|
|
|
ovs_netns_frags_init(net);
|
|
|
|
ovs_netns_frags6_init(net);
|
datapath: conntrack: Support conntrack zone limit
Upstream commit:
commit 11efd5cb04a184eea4f57b68ea63dddd463158d1
Author: Yi-Hung Wei <yihung.wei@gmail.com>
Date: Thu May 24 17:56:43 2018 -0700
openvswitch: Support conntrack zone limit
Currently, nf_conntrack_max is used to limit the maximum number of
conntrack entries in the conntrack table for every network namespace.
For the VMs and containers that reside in the same namespace,
they share the same conntrack table, and the total # of conntrack entries
for all the VMs and containers are limited by nf_conntrack_max. In this
case, if one of the VM/container abuses the usage the conntrack entries,
it blocks the others from committing valid conntrack entries into the
conntrack table. Even if we can possibly put the VM in different network
namespace, the current nf_conntrack_max configuration is kind of rigid
that we cannot limit different VM/container to have different # conntrack
entries.
To address the aforementioned issue, this patch proposes to have a
fine-grained mechanism that could further limit the # of conntrack entries
per-zone. For example, we can designate different zone to different VM,
and set conntrack limit to each zone. By providing this isolation, a
mis-behaved VM only consumes the conntrack entries in its own zone, and
it will not influence other well-behaved VMs. Moreover, the users can
set various conntrack limit to different zone based on their preference.
The proposed implementation utilizes Netfilter's nf_conncount backend
to count the number of connections in a particular zone. If the number of
connection is above a configured limitation, ovs will return ENOMEM to the
userspace. If userspace does not configure the zone limit, the limit
defaults to zero that is no limitation, which is backward compatible to
the behavior without this patch.
The following high leve APIs are provided to the userspace:
- OVS_CT_LIMIT_CMD_SET:
* set default connection limit for all zones
* set the connection limit for a particular zone
- OVS_CT_LIMIT_CMD_DEL:
* remove the connection limit for a particular zone
- OVS_CT_LIMIT_CMD_GET:
* get the default connection limit for all zones
* get the connection limit for a particular zone
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Justin Pettit <jpettit@ovn.org>
2018-08-17 02:05:06 -07:00
|
|
|
return ovs_ct_init(net);
|
2012-01-30 06:56:54 -08:00
|
|
|
}
|
|
|
|
|
2015-02-20 14:59:47 -08:00
|
|
|
static void __net_exit list_vports_from_net(struct net *net, struct net *dnet,
|
|
|
|
struct list_head *head)
|
2012-01-30 06:56:54 -08:00
|
|
|
{
|
|
|
|
struct ovs_net *ovs_net = net_generic(net, ovs_net_id);
|
2015-02-20 14:59:47 -08:00
|
|
|
struct datapath *dp;
|
|
|
|
|
|
|
|
list_for_each_entry(dp, &ovs_net->dps, list_node) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) {
|
|
|
|
struct vport *vport;
|
|
|
|
|
|
|
|
hlist_for_each_entry(vport, &dp->ports[i], dp_hash_node) {
|
|
|
|
|
|
|
|
if (vport->ops->type != OVS_VPORT_TYPE_INTERNAL)
|
|
|
|
continue;
|
|
|
|
|
2015-12-03 11:40:53 -08:00
|
|
|
if (dev_net(vport->dev) == dnet)
|
2015-02-20 14:59:47 -08:00
|
|
|
list_add(&vport->detach_list, head);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __net_exit ovs_exit_net(struct net *dnet)
|
|
|
|
{
|
|
|
|
struct datapath *dp, *dp_next;
|
|
|
|
struct ovs_net *ovs_net = net_generic(dnet, ovs_net_id);
|
|
|
|
struct vport *vport, *vport_next;
|
|
|
|
struct net *net;
|
|
|
|
LIST_HEAD(head);
|
2012-01-30 06:56:54 -08:00
|
|
|
|
2017-07-06 13:57:34 -07:00
|
|
|
ovs_netns_frags6_exit(dnet);
|
|
|
|
ovs_netns_frags_exit(dnet);
|
2015-12-02 23:53:52 -08:00
|
|
|
ovs_ct_exit(dnet);
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_lock();
|
|
|
|
list_for_each_entry_safe(dp, dp_next, &ovs_net->dps, list_node)
|
|
|
|
__dp_destroy(dp);
|
2015-02-20 14:59:47 -08:00
|
|
|
|
datapath: Introduce net_rwsem and remove rtnl_lock()
This patch backports the following two upstream commits and
add a new symbol HAVE_NET_RWSEM in acinclude.m4 to determine
whether to use new introduced rw_semaphore, net_rwsem.
Upstream commit:
commit f0b07bb151b098d291fd1fd71ef7a2df56fb124a
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date: Thu Mar 29 19:20:32 2018 +0300
net: Introduce net_rwsem to protect net_namespace_list
rtnl_lock() is used everywhere, and contention is very high.
When someone wants to iterate over alive net namespaces,
he/she has no a possibility to do that without exclusive lock.
But the exclusive rtnl_lock() in such places is overkill,
and it just increases the contention. Yes, there is already
for_each_net_rcu() in kernel, but it requires rcu_read_lock(),
and this can't be sleepable. Also, sometimes it may be need
really prevent net_namespace_list growth, so for_each_net_rcu()
is not fit there.
This patch introduces new rw_semaphore, which will be used
instead of rtnl_mutex to protect net_namespace_list. It is
sleepable and allows not-exclusive iterations over net
namespaces list. It allows to stop using rtnl_lock()
in several places (what is made in next patches) and makes
less the time, we keep rtnl_mutex. Here we just add new lock,
while the explanation of we can remove rtnl_lock() there are
in next patches.
Fine grained locks generally are better, then one big lock,
so let's do that with net_namespace_list, while the situation
allows that.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Upstream commit:
commit ec9c780925c57588637e1dbd8650d294107311c0
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date: Thu Mar 29 19:21:09 2018 +0300
ovs: Remove rtnl_lock() from ovs_exit_net()
Here we iterate for_each_net() and removes
vport from alive net to the exiting net.
ovs_net::dps are protected by ovs_mutex(),
and the others, who change it (ovs_dp_cmd_new(),
__dp_destroy()) also take it.
The same with datapath::ports list.
So, we remove rtnl_lock() here.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Justin Pettit <jpettit@ovn.org>
2018-07-16 17:55:59 -07:00
|
|
|
#ifdef HAVE_NET_RWSEM
|
|
|
|
down_read(&net_rwsem);
|
|
|
|
#else
|
2015-02-20 14:59:47 -08:00
|
|
|
rtnl_lock();
|
datapath: Introduce net_rwsem and remove rtnl_lock()
This patch backports the following two upstream commits and
add a new symbol HAVE_NET_RWSEM in acinclude.m4 to determine
whether to use new introduced rw_semaphore, net_rwsem.
Upstream commit:
commit f0b07bb151b098d291fd1fd71ef7a2df56fb124a
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date: Thu Mar 29 19:20:32 2018 +0300
net: Introduce net_rwsem to protect net_namespace_list
rtnl_lock() is used everywhere, and contention is very high.
When someone wants to iterate over alive net namespaces,
he/she has no a possibility to do that without exclusive lock.
But the exclusive rtnl_lock() in such places is overkill,
and it just increases the contention. Yes, there is already
for_each_net_rcu() in kernel, but it requires rcu_read_lock(),
and this can't be sleepable. Also, sometimes it may be need
really prevent net_namespace_list growth, so for_each_net_rcu()
is not fit there.
This patch introduces new rw_semaphore, which will be used
instead of rtnl_mutex to protect net_namespace_list. It is
sleepable and allows not-exclusive iterations over net
namespaces list. It allows to stop using rtnl_lock()
in several places (what is made in next patches) and makes
less the time, we keep rtnl_mutex. Here we just add new lock,
while the explanation of we can remove rtnl_lock() there are
in next patches.
Fine grained locks generally are better, then one big lock,
so let's do that with net_namespace_list, while the situation
allows that.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Upstream commit:
commit ec9c780925c57588637e1dbd8650d294107311c0
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date: Thu Mar 29 19:21:09 2018 +0300
ovs: Remove rtnl_lock() from ovs_exit_net()
Here we iterate for_each_net() and removes
vport from alive net to the exiting net.
ovs_net::dps are protected by ovs_mutex(),
and the others, who change it (ovs_dp_cmd_new(),
__dp_destroy()) also take it.
The same with datapath::ports list.
So, we remove rtnl_lock() here.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Justin Pettit <jpettit@ovn.org>
2018-07-16 17:55:59 -07:00
|
|
|
#endif
|
2015-02-20 14:59:47 -08:00
|
|
|
for_each_net(net)
|
|
|
|
list_vports_from_net(net, dnet, &head);
|
datapath: Introduce net_rwsem and remove rtnl_lock()
This patch backports the following two upstream commits and
add a new symbol HAVE_NET_RWSEM in acinclude.m4 to determine
whether to use new introduced rw_semaphore, net_rwsem.
Upstream commit:
commit f0b07bb151b098d291fd1fd71ef7a2df56fb124a
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date: Thu Mar 29 19:20:32 2018 +0300
net: Introduce net_rwsem to protect net_namespace_list
rtnl_lock() is used everywhere, and contention is very high.
When someone wants to iterate over alive net namespaces,
he/she has no a possibility to do that without exclusive lock.
But the exclusive rtnl_lock() in such places is overkill,
and it just increases the contention. Yes, there is already
for_each_net_rcu() in kernel, but it requires rcu_read_lock(),
and this can't be sleepable. Also, sometimes it may be need
really prevent net_namespace_list growth, so for_each_net_rcu()
is not fit there.
This patch introduces new rw_semaphore, which will be used
instead of rtnl_mutex to protect net_namespace_list. It is
sleepable and allows not-exclusive iterations over net
namespaces list. It allows to stop using rtnl_lock()
in several places (what is made in next patches) and makes
less the time, we keep rtnl_mutex. Here we just add new lock,
while the explanation of we can remove rtnl_lock() there are
in next patches.
Fine grained locks generally are better, then one big lock,
so let's do that with net_namespace_list, while the situation
allows that.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Upstream commit:
commit ec9c780925c57588637e1dbd8650d294107311c0
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date: Thu Mar 29 19:21:09 2018 +0300
ovs: Remove rtnl_lock() from ovs_exit_net()
Here we iterate for_each_net() and removes
vport from alive net to the exiting net.
ovs_net::dps are protected by ovs_mutex(),
and the others, who change it (ovs_dp_cmd_new(),
__dp_destroy()) also take it.
The same with datapath::ports list.
So, we remove rtnl_lock() here.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Justin Pettit <jpettit@ovn.org>
2018-07-16 17:55:59 -07:00
|
|
|
#ifdef HAVE_NET_RWSEM
|
|
|
|
up_read(&net_rwsem);
|
|
|
|
#else
|
2015-02-20 14:59:47 -08:00
|
|
|
rtnl_unlock();
|
datapath: Introduce net_rwsem and remove rtnl_lock()
This patch backports the following two upstream commits and
add a new symbol HAVE_NET_RWSEM in acinclude.m4 to determine
whether to use new introduced rw_semaphore, net_rwsem.
Upstream commit:
commit f0b07bb151b098d291fd1fd71ef7a2df56fb124a
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date: Thu Mar 29 19:20:32 2018 +0300
net: Introduce net_rwsem to protect net_namespace_list
rtnl_lock() is used everywhere, and contention is very high.
When someone wants to iterate over alive net namespaces,
he/she has no a possibility to do that without exclusive lock.
But the exclusive rtnl_lock() in such places is overkill,
and it just increases the contention. Yes, there is already
for_each_net_rcu() in kernel, but it requires rcu_read_lock(),
and this can't be sleepable. Also, sometimes it may be need
really prevent net_namespace_list growth, so for_each_net_rcu()
is not fit there.
This patch introduces new rw_semaphore, which will be used
instead of rtnl_mutex to protect net_namespace_list. It is
sleepable and allows not-exclusive iterations over net
namespaces list. It allows to stop using rtnl_lock()
in several places (what is made in next patches) and makes
less the time, we keep rtnl_mutex. Here we just add new lock,
while the explanation of we can remove rtnl_lock() there are
in next patches.
Fine grained locks generally are better, then one big lock,
so let's do that with net_namespace_list, while the situation
allows that.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Upstream commit:
commit ec9c780925c57588637e1dbd8650d294107311c0
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date: Thu Mar 29 19:21:09 2018 +0300
ovs: Remove rtnl_lock() from ovs_exit_net()
Here we iterate for_each_net() and removes
vport from alive net to the exiting net.
ovs_net::dps are protected by ovs_mutex(),
and the others, who change it (ovs_dp_cmd_new(),
__dp_destroy()) also take it.
The same with datapath::ports list.
So, we remove rtnl_lock() here.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Justin Pettit <jpettit@ovn.org>
2018-07-16 17:55:59 -07:00
|
|
|
#endif
|
2015-02-20 14:59:47 -08:00
|
|
|
|
|
|
|
/* Detach all vports from given namespace. */
|
|
|
|
list_for_each_entry_safe(vport, vport_next, &head, detach_list) {
|
|
|
|
list_del(&vport->detach_list);
|
|
|
|
ovs_dp_detach_port(vport);
|
|
|
|
}
|
|
|
|
|
2013-04-12 15:57:09 -07:00
|
|
|
ovs_unlock();
|
|
|
|
|
|
|
|
cancel_work_sync(&ovs_net->dp_notify_work);
|
2012-01-30 06:56:54 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct pernet_operations ovs_net_ops = {
|
|
|
|
.init = ovs_init_net,
|
|
|
|
.exit = ovs_exit_net,
|
|
|
|
.id = &ovs_net_id,
|
|
|
|
.size = sizeof(struct ovs_net),
|
|
|
|
};
|
|
|
|
|
2009-09-11 15:49:37 -07:00
|
|
|
static int __init dp_init(void)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2013-01-10 09:41:16 -08:00
|
|
|
BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb));
|
2009-09-11 15:49:37 -07:00
|
|
|
|
2015-04-27 12:28:55 -07:00
|
|
|
pr_info("Open vSwitch switching datapath %s\n", VERSION);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2018-01-31 21:53:05 +08:00
|
|
|
ovs_nsh_init();
|
2015-12-02 23:53:45 -08:00
|
|
|
err = action_fifos_init();
|
|
|
|
if (err)
|
2017-07-06 13:57:34 -07:00
|
|
|
goto error;
|
2015-12-02 23:53:45 -08:00
|
|
|
|
2015-01-07 12:55:49 +01:00
|
|
|
err = ovs_internal_dev_rtnl_link_register();
|
2014-08-11 00:14:05 -07:00
|
|
|
if (err)
|
|
|
|
goto error_action_fifos_exit;
|
|
|
|
|
2015-01-07 12:55:49 +01:00
|
|
|
err = ovs_flow_init();
|
|
|
|
if (err)
|
|
|
|
goto error_unreg_rtnl_link;
|
|
|
|
|
2011-11-21 17:15:20 -08:00
|
|
|
err = ovs_vport_init();
|
2009-07-08 13:19:16 -07:00
|
|
|
if (err)
|
|
|
|
goto error_flow_exit;
|
|
|
|
|
2012-01-30 06:56:54 -08:00
|
|
|
err = register_pernet_device(&ovs_net_ops);
|
2010-04-12 15:53:39 -04:00
|
|
|
if (err)
|
|
|
|
goto error_vport_exit;
|
|
|
|
|
2017-07-06 13:57:34 -07:00
|
|
|
err = compat_init();
|
2012-01-30 06:56:54 -08:00
|
|
|
if (err)
|
|
|
|
goto error_netns_exit;
|
|
|
|
|
2017-07-06 13:57:34 -07:00
|
|
|
err = register_netdevice_notifier(&ovs_dp_device_notifier);
|
|
|
|
if (err)
|
|
|
|
goto error_compat_exit;
|
|
|
|
|
2015-04-04 08:24:13 +02:00
|
|
|
err = ovs_netdev_init();
|
|
|
|
if (err)
|
|
|
|
goto error_unreg_notifier;
|
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
err = dp_register_genl();
|
|
|
|
if (err < 0)
|
2015-04-04 08:24:13 +02:00
|
|
|
goto error_unreg_netdev;
|
2011-01-26 13:41:54 -08:00
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
return 0;
|
|
|
|
|
2015-04-04 08:24:13 +02:00
|
|
|
error_unreg_netdev:
|
|
|
|
ovs_netdev_exit();
|
2009-07-08 13:19:16 -07:00
|
|
|
error_unreg_notifier:
|
2011-11-21 17:15:20 -08:00
|
|
|
unregister_netdevice_notifier(&ovs_dp_device_notifier);
|
2017-07-06 13:57:34 -07:00
|
|
|
error_compat_exit:
|
|
|
|
compat_exit();
|
2012-01-30 06:56:54 -08:00
|
|
|
error_netns_exit:
|
|
|
|
unregister_pernet_device(&ovs_net_ops);
|
2010-04-12 15:53:39 -04:00
|
|
|
error_vport_exit:
|
2011-11-21 17:15:20 -08:00
|
|
|
ovs_vport_exit();
|
2009-07-08 13:19:16 -07:00
|
|
|
error_flow_exit:
|
2011-11-21 17:15:20 -08:00
|
|
|
ovs_flow_exit();
|
2015-01-07 12:55:49 +01:00
|
|
|
error_unreg_rtnl_link:
|
|
|
|
ovs_internal_dev_rtnl_link_unregister();
|
2014-08-11 00:14:05 -07:00
|
|
|
error_action_fifos_exit:
|
|
|
|
action_fifos_exit();
|
2009-07-08 13:19:16 -07:00
|
|
|
error:
|
2018-01-31 21:53:05 +08:00
|
|
|
ovs_nsh_cleanup();
|
2009-07-08 13:19:16 -07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dp_cleanup(void)
|
|
|
|
{
|
2011-01-26 13:41:54 -08:00
|
|
|
dp_unregister_genl(ARRAY_SIZE(dp_genl_families));
|
2015-04-04 08:24:13 +02:00
|
|
|
ovs_netdev_exit();
|
2011-11-21 17:15:20 -08:00
|
|
|
unregister_netdevice_notifier(&ovs_dp_device_notifier);
|
2017-07-06 13:57:34 -07:00
|
|
|
compat_exit();
|
2012-01-30 06:56:54 -08:00
|
|
|
unregister_pernet_device(&ovs_net_ops);
|
|
|
|
rcu_barrier();
|
2011-11-21 17:15:20 -08:00
|
|
|
ovs_vport_exit();
|
|
|
|
ovs_flow_exit();
|
2015-01-07 12:55:49 +01:00
|
|
|
ovs_internal_dev_rtnl_link_unregister();
|
2014-08-11 00:14:05 -07:00
|
|
|
action_fifos_exit();
|
2018-01-31 21:53:05 +08:00
|
|
|
ovs_nsh_cleanup();
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
module_init(dp_init);
|
|
|
|
module_exit(dp_cleanup);
|
|
|
|
|
|
|
|
MODULE_DESCRIPTION("Open vSwitch switching datapath");
|
|
|
|
MODULE_LICENSE("GPL");
|
2012-09-17 18:32:57 -07:00
|
|
|
MODULE_VERSION(VERSION);
|
2016-09-16 15:52:48 -03:00
|
|
|
MODULE_ALIAS_GENL_FAMILY(OVS_DATAPATH_FAMILY);
|
|
|
|
MODULE_ALIAS_GENL_FAMILY(OVS_VPORT_FAMILY);
|
|
|
|
MODULE_ALIAS_GENL_FAMILY(OVS_FLOW_FAMILY);
|
|
|
|
MODULE_ALIAS_GENL_FAMILY(OVS_PACKET_FAMILY);
|
2018-02-13 15:48:24 -08:00
|
|
|
MODULE_ALIAS_GENL_FAMILY(OVS_METER_FAMILY);
|
datapath: conntrack: Support conntrack zone limit
Upstream commit:
commit 11efd5cb04a184eea4f57b68ea63dddd463158d1
Author: Yi-Hung Wei <yihung.wei@gmail.com>
Date: Thu May 24 17:56:43 2018 -0700
openvswitch: Support conntrack zone limit
Currently, nf_conntrack_max is used to limit the maximum number of
conntrack entries in the conntrack table for every network namespace.
For the VMs and containers that reside in the same namespace,
they share the same conntrack table, and the total # of conntrack entries
for all the VMs and containers are limited by nf_conntrack_max. In this
case, if one of the VM/container abuses the usage the conntrack entries,
it blocks the others from committing valid conntrack entries into the
conntrack table. Even if we can possibly put the VM in different network
namespace, the current nf_conntrack_max configuration is kind of rigid
that we cannot limit different VM/container to have different # conntrack
entries.
To address the aforementioned issue, this patch proposes to have a
fine-grained mechanism that could further limit the # of conntrack entries
per-zone. For example, we can designate different zone to different VM,
and set conntrack limit to each zone. By providing this isolation, a
mis-behaved VM only consumes the conntrack entries in its own zone, and
it will not influence other well-behaved VMs. Moreover, the users can
set various conntrack limit to different zone based on their preference.
The proposed implementation utilizes Netfilter's nf_conncount backend
to count the number of connections in a particular zone. If the number of
connection is above a configured limitation, ovs will return ENOMEM to the
userspace. If userspace does not configure the zone limit, the limit
defaults to zero that is no limitation, which is backward compatible to
the behavior without this patch.
The following high leve APIs are provided to the userspace:
- OVS_CT_LIMIT_CMD_SET:
* set default connection limit for all zones
* set the connection limit for a particular zone
- OVS_CT_LIMIT_CMD_DEL:
* remove the connection limit for a particular zone
- OVS_CT_LIMIT_CMD_GET:
* get the default connection limit for all zones
* get the connection limit for a particular zone
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Justin Pettit <jpettit@ovn.org>
2018-08-17 02:05:06 -07:00
|
|
|
MODULE_ALIAS_GENL_FAMILY(OVS_CT_LIMIT_FAMILY);
|