2009-07-08 13:19:16 -07:00
|
|
|
/*
|
2011-01-12 10:44:43 -08:00
|
|
|
* Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
|
2009-06-15 15:11:30 -07:00
|
|
|
* Distributed under the terms of the GNU GPL version 2.
|
|
|
|
*
|
|
|
|
* Significant portions of this file may be copied from parts of the Linux
|
|
|
|
* kernel, by Linus Torvalds and others.
|
2009-07-08 13:19:16 -07:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* Functions for managing the dp interface/device. */
|
|
|
|
|
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/system.h>
|
|
|
|
#include <asm/div64.h>
|
|
|
|
#include <asm/bug.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>
|
|
|
|
#include <linux/rculist.h>
|
|
|
|
#include <linux/dmi.h>
|
2010-03-12 16:05:25 -05:00
|
|
|
#include <net/inet_ecn.h>
|
2011-01-23 18:44:44 -08:00
|
|
|
#include <net/genetlink.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
#include "openvswitch/datapath-protocol.h"
|
2010-11-22 14:17:24 -08:00
|
|
|
#include "checksum.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
#include "datapath.h"
|
|
|
|
#include "actions.h"
|
|
|
|
#include "flow.h"
|
2010-04-02 16:46:18 -04:00
|
|
|
#include "table.h"
|
2011-02-07 15:57:09 -08:00
|
|
|
#include "vlan.h"
|
2010-04-12 15:53:39 -04:00
|
|
|
#include "vport-internal_dev.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-06-13 11:36:19 -07:00
|
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) || \
|
2011-06-29 16:24:44 +09:00
|
|
|
LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
|
|
|
|
#error Kernels before 2.6.18 or after 3.0 are not supported by this version of Open vSwitch.
|
2011-06-13 11:36:19 -07:00
|
|
|
#endif
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
|
|
|
|
EXPORT_SYMBOL(dp_ioctl_hook);
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/**
|
|
|
|
* DOC: Locking:
|
2009-07-08 13:19:16 -07:00
|
|
|
*
|
2011-01-26 12:49:06 -08:00
|
|
|
* Writes to device state (add/remove datapath, port, set operations on vports,
|
|
|
|
* etc.) are protected by RTNL.
|
2009-07-08 13:19:16 -07:00
|
|
|
*
|
2011-01-26 12:49:06 -08:00
|
|
|
* Writes to other state (flow table modifications, set miscellaneous datapath
|
|
|
|
* parameters such as drop frags, etc.) are protected by genl_mutex. The RTNL
|
|
|
|
* lock nests inside genl_mutex.
|
|
|
|
*
|
|
|
|
* 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.
|
2009-07-08 13:19:16 -07:00
|
|
|
*/
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2011-01-21 17:01:56 -08:00
|
|
|
/* Global list of datapaths to enable dumping them all out.
|
|
|
|
* Protected by genl_mutex.
|
|
|
|
*/
|
|
|
|
static LIST_HEAD(dps);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
static struct vport *new_vport(const struct vport_parms *);
|
2011-07-28 09:05:25 -07:00
|
|
|
static int queue_userspace_packets(struct datapath *, struct sk_buff *,
|
2011-01-28 18:18:25 -08:00
|
|
|
const struct dp_upcall_info *);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Must be called with rcu_read_lock, genl_mutex, or RTNL lock. */
|
2011-01-21 17:01:56 -08:00
|
|
|
struct datapath *get_dp(int dp_ifindex)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-01-21 17:01:56 -08:00
|
|
|
struct datapath *dp = NULL;
|
|
|
|
struct net_device *dev;
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2011-01-21 17:01:56 -08:00
|
|
|
rcu_read_lock();
|
|
|
|
dev = dev_get_by_index_rcu(&init_net, dp_ifindex);
|
|
|
|
if (dev) {
|
|
|
|
struct vport *vport = internal_dev_get_vport(dev);
|
|
|
|
if (vport)
|
|
|
|
dp = vport->dp;
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return dp;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(get_dp);
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Must be called with genl_mutex. */
|
2010-12-29 11:42:13 -08:00
|
|
|
static struct tbl *get_table_protected(struct datapath *dp)
|
2010-12-08 11:32:05 -08:00
|
|
|
{
|
2011-01-26 12:49:06 -08:00
|
|
|
return rcu_dereference_protected(dp->table, lockdep_genl_is_held());
|
2010-12-24 19:53:26 -08:00
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Must be called with rcu_read_lock or RTNL lock. */
|
2010-12-29 11:42:13 -08:00
|
|
|
static struct vport *get_vport_protected(struct datapath *dp, u16 port_no)
|
2010-12-24 19:53:26 -08:00
|
|
|
{
|
2011-01-26 12:49:06 -08:00
|
|
|
return rcu_dereference_rtnl(dp->ports[port_no]);
|
2010-12-08 11:32:05 -08:00
|
|
|
}
|
|
|
|
|
2010-04-12 15:53:39 -04:00
|
|
|
/* Must be called with rcu_read_lock or RTNL lock. */
|
|
|
|
const char *dp_name(const struct datapath *dp)
|
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
return vport_get_name(rcu_dereference_rtnl(dp->ports[OVSP_LOCAL]));
|
2010-04-12 15:53:39 -04:00
|
|
|
}
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
static inline size_t br_nlmsg_size(void)
|
|
|
|
{
|
|
|
|
return NLMSG_ALIGN(sizeof(struct ifinfomsg))
|
|
|
|
+ nla_total_size(IFNAMSIZ) /* IFLA_IFNAME */
|
|
|
|
+ nla_total_size(MAX_ADDR_LEN) /* IFLA_ADDRESS */
|
|
|
|
+ nla_total_size(4) /* IFLA_MASTER */
|
|
|
|
+ nla_total_size(4) /* IFLA_MTU */
|
|
|
|
+ nla_total_size(4) /* IFLA_LINK */
|
|
|
|
+ nla_total_size(1); /* IFLA_OPERSTATE */
|
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Caller must hold RTNL lock. */
|
2009-07-08 13:19:16 -07:00
|
|
|
static int dp_fill_ifinfo(struct sk_buff *skb,
|
2010-12-03 13:09:26 -08:00
|
|
|
const struct vport *port,
|
2009-07-08 13:19:16 -07:00
|
|
|
int event, unsigned int flags)
|
|
|
|
{
|
2010-12-29 11:42:13 -08:00
|
|
|
struct datapath *dp = port->dp;
|
2010-12-03 13:09:26 -08:00
|
|
|
int ifindex = vport_get_ifindex(port);
|
|
|
|
int iflink = vport_get_iflink(port);
|
2009-07-08 13:19:16 -07:00
|
|
|
struct ifinfomsg *hdr;
|
|
|
|
struct nlmsghdr *nlh;
|
|
|
|
|
2010-04-12 15:53:39 -04:00
|
|
|
if (ifindex < 0)
|
|
|
|
return ifindex;
|
|
|
|
|
|
|
|
if (iflink < 0)
|
|
|
|
return iflink;
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
nlh = nlmsg_put(skb, 0, 0, event, sizeof(*hdr), flags);
|
|
|
|
if (nlh == NULL)
|
|
|
|
return -EMSGSIZE;
|
|
|
|
|
|
|
|
hdr = nlmsg_data(nlh);
|
|
|
|
hdr->ifi_family = AF_BRIDGE;
|
|
|
|
hdr->__ifi_pad = 0;
|
2010-04-12 15:53:39 -04:00
|
|
|
hdr->ifi_type = ARPHRD_ETHER;
|
|
|
|
hdr->ifi_index = ifindex;
|
2010-12-03 13:09:26 -08:00
|
|
|
hdr->ifi_flags = vport_get_flags(port);
|
2009-07-08 13:19:16 -07:00
|
|
|
hdr->ifi_change = 0;
|
|
|
|
|
2010-12-03 13:09:26 -08:00
|
|
|
NLA_PUT_STRING(skb, IFLA_IFNAME, vport_get_name(port));
|
2010-12-05 11:22:04 -08:00
|
|
|
NLA_PUT_U32(skb, IFLA_MASTER,
|
2011-08-18 10:35:40 -07:00
|
|
|
vport_get_ifindex(get_vport_protected(dp, OVSP_LOCAL)));
|
2010-12-03 13:09:26 -08:00
|
|
|
NLA_PUT_U32(skb, IFLA_MTU, vport_get_mtu(port));
|
2009-07-08 13:19:16 -07:00
|
|
|
#ifdef IFLA_OPERSTATE
|
|
|
|
NLA_PUT_U8(skb, IFLA_OPERSTATE,
|
2010-12-03 13:09:26 -08:00
|
|
|
vport_is_running(port)
|
|
|
|
? vport_get_operstate(port)
|
2010-04-12 15:53:39 -04:00
|
|
|
: IF_OPER_DOWN);
|
2009-07-08 13:19:16 -07:00
|
|
|
#endif
|
|
|
|
|
2010-12-03 13:09:26 -08:00
|
|
|
NLA_PUT(skb, IFLA_ADDRESS, ETH_ALEN, vport_get_addr(port));
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2010-04-12 15:53:39 -04:00
|
|
|
if (ifindex != iflink)
|
|
|
|
NLA_PUT_U32(skb, IFLA_LINK,iflink);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
return nlmsg_end(skb, nlh);
|
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
nlmsg_cancel(skb, nlh);
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Caller must hold RTNL lock. */
|
2010-12-03 13:09:26 -08:00
|
|
|
static void dp_ifinfo_notify(int event, struct vport *port)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int err = -ENOBUFS;
|
|
|
|
|
|
|
|
skb = nlmsg_new(br_nlmsg_size(), GFP_KERNEL);
|
|
|
|
if (skb == NULL)
|
|
|
|
goto errout;
|
|
|
|
|
|
|
|
err = dp_fill_ifinfo(skb, port, event, 0);
|
|
|
|
if (err < 0) {
|
|
|
|
/* -EMSGSIZE implies BUG in br_nlmsg_size() */
|
|
|
|
WARN_ON(err == -EMSGSIZE);
|
|
|
|
kfree_skb(skb);
|
|
|
|
goto errout;
|
|
|
|
}
|
2010-04-12 15:53:39 -04:00
|
|
|
rtnl_notify(skb, &init_net, 0, RTNLGRP_LINK, NULL, GFP_KERNEL);
|
2009-06-24 14:58:57 -07:00
|
|
|
return;
|
2009-07-08 13:19:16 -07:00
|
|
|
errout:
|
|
|
|
if (err < 0)
|
2010-04-12 15:53:39 -04:00
|
|
|
rtnl_set_sk_err(&init_net, RTNLGRP_LINK, err);
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
datapath: Fix OOPS when dp_sysfs_add_if() fails.
Until now, when dp_sysfs_add_if() failed, the caller ignored the failure.
This is a minor problem, because everything else should continue working,
without sysfs entries for the interface, in theory anyhow. In actual
practice, the error exit path of dp_sysfs_add_if() does a kobject_put(),
and that kobject_put() calls release_nbp(), so that the new port gets
freed. The next reference to the new port (usually in an ovs-vswitchd call
to the ODP_PORT_LIST ioctl) will then use the freed data and probably OOPS.
The fix is to make the datapath code, as opposed to the sysfs code,
responsible for creating and destroying the net_bridge_port kobject. The
dp_sysfs_{add,del}_if() functions then just attach and detach the kobject
to sysfs and their cleanup routines no longer need to destroy the kobject
and indeed we don't care whether dp_sysfs_add_if() really succeeds.
This commit also makes the same transformation to the datapath's ifobj,
for consistency.
It is easy to trigger the OOPS fixed by this commit by adding a network
device A to a datapath, then renaming network device A to B, then renaming
network device C to A, then adding A to the datapath. The last attempt to
add A will fail because a file named /sys/class/net/<datapath>/brif/A
already exists from the time that C was added to the datapath under the
name A.
This commit also adds some compatibility infrastructure, because it moves
code out of #ifdef SUPPORT_SYSFS and it otherwise wouldn't build.
2009-08-05 15:22:25 -07:00
|
|
|
static void release_dp(struct kobject *kobj)
|
|
|
|
{
|
|
|
|
struct datapath *dp = container_of(kobj, struct datapath, ifobj);
|
|
|
|
kfree(dp);
|
|
|
|
}
|
|
|
|
|
2010-02-10 16:50:51 -08:00
|
|
|
static struct kobj_type dp_ktype = {
|
datapath: Fix OOPS when dp_sysfs_add_if() fails.
Until now, when dp_sysfs_add_if() failed, the caller ignored the failure.
This is a minor problem, because everything else should continue working,
without sysfs entries for the interface, in theory anyhow. In actual
practice, the error exit path of dp_sysfs_add_if() does a kobject_put(),
and that kobject_put() calls release_nbp(), so that the new port gets
freed. The next reference to the new port (usually in an ovs-vswitchd call
to the ODP_PORT_LIST ioctl) will then use the freed data and probably OOPS.
The fix is to make the datapath code, as opposed to the sysfs code,
responsible for creating and destroying the net_bridge_port kobject. The
dp_sysfs_{add,del}_if() functions then just attach and detach the kobject
to sysfs and their cleanup routines no longer need to destroy the kobject
and indeed we don't care whether dp_sysfs_add_if() really succeeds.
This commit also makes the same transformation to the datapath's ifobj,
for consistency.
It is easy to trigger the OOPS fixed by this commit by adding a network
device A to a datapath, then renaming network device A to B, then renaming
network device C to A, then adding A to the datapath. The last attempt to
add A will fail because a file named /sys/class/net/<datapath>/brif/A
already exists from the time that C was added to the datapath under the
name A.
This commit also adds some compatibility infrastructure, because it moves
code out of #ifdef SUPPORT_SYSFS and it otherwise wouldn't build.
2009-08-05 15:22:25 -07:00
|
|
|
.release = release_dp
|
|
|
|
};
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
tbl_destroy((struct tbl __force *)dp->table, flow_free_tbl);
|
|
|
|
free_percpu(dp->stats_percpu);
|
|
|
|
kobject_put(&dp->ifobj);
|
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Called with RTNL lock and genl_lock. */
|
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-01-26 12:28:59 -08:00
|
|
|
vport = vport_add(parms);
|
|
|
|
if (!IS_ERR(vport)) {
|
|
|
|
struct datapath *dp = parms->dp;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
rcu_assign_pointer(dp->ports[parms->port_no], vport);
|
2011-01-26 12:49:06 -08:00
|
|
|
list_add(&vport->node, &dp->port_list);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
dp_ifinfo_notify(RTM_NEWLINK, vport);
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
return vport;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Called with RTNL lock. */
|
2010-12-03 13:09:26 -08:00
|
|
|
int dp_detach_port(struct vport *p)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
if (p->port_no != OVSP_LOCAL)
|
2009-08-05 14:36:21 -07:00
|
|
|
dp_sysfs_del_if(p);
|
2009-07-08 13:19:16 -07:00
|
|
|
dp_ifinfo_notify(RTM_DELLINK, p);
|
|
|
|
|
|
|
|
/* First drop references to device. */
|
2011-01-26 12:49:06 -08:00
|
|
|
list_del(&p->node);
|
2009-07-08 13:19:16 -07:00
|
|
|
rcu_assign_pointer(p->dp->ports[p->port_no], NULL);
|
2010-04-12 15:53:39 -04:00
|
|
|
|
2010-12-03 15:44:51 -08:00
|
|
|
/* Then destroy it. */
|
2011-01-26 09:42:28 -08:00
|
|
|
return vport_del(p);
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2010-05-12 12:40:45 -07:00
|
|
|
/* Must be called with rcu_read_lock. */
|
2010-12-03 13:09:26 -08:00
|
|
|
void dp_process_received_packet(struct vport *p, struct sk_buff *skb)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
|
|
|
struct datapath *dp = p->dp;
|
|
|
|
struct dp_stats_percpu *stats;
|
2010-05-12 12:40:45 -07:00
|
|
|
int stats_counter_off;
|
2010-08-27 12:32:05 -07:00
|
|
|
int error;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2010-12-03 13:09:26 -08:00
|
|
|
OVS_CB(skb)->vport = p;
|
2010-02-28 12:17:16 -05:00
|
|
|
|
2010-08-29 10:49:11 -07:00
|
|
|
if (!OVS_CB(skb)->flow) {
|
2011-01-23 18:44:44 -08:00
|
|
|
struct sw_flow_key key;
|
2010-08-29 10:49:11 -07:00
|
|
|
struct tbl_node *flow_node;
|
2011-05-18 11:30:07 -07:00
|
|
|
int key_len;
|
2010-08-29 14:28:58 -07:00
|
|
|
bool is_frag;
|
2010-08-27 12:32:05 -07:00
|
|
|
|
2010-08-29 10:49:11 -07:00
|
|
|
/* Extract flow from 'skb' into 'key'. */
|
2011-05-18 11:30:07 -07:00
|
|
|
error = flow_extract(skb, p->port_no, &key, &key_len, &is_frag);
|
2010-08-29 10:49:11 -07:00
|
|
|
if (unlikely(error)) {
|
|
|
|
kfree_skb(skb);
|
|
|
|
return;
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2010-08-29 14:28:58 -07:00
|
|
|
if (is_frag && dp->drop_frags) {
|
2011-06-16 15:32:26 -07:00
|
|
|
consume_skb(skb);
|
2010-08-29 10:49:11 -07:00
|
|
|
stats_counter_off = offsetof(struct dp_stats_percpu, n_frags);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look up flow. */
|
2011-05-18 11:30:07 -07:00
|
|
|
flow_node = tbl_lookup(rcu_dereference(dp->table), &key, key_len,
|
|
|
|
flow_hash(&key, key_len), flow_cmp);
|
2010-08-29 10:49:11 -07:00
|
|
|
if (unlikely(!flow_node)) {
|
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
|
|
|
struct dp_upcall_info upcall;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
upcall.cmd = OVS_PACKET_CMD_MISS;
|
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
|
|
|
upcall.key = &key;
|
|
|
|
upcall.userdata = 0;
|
|
|
|
upcall.sample_pool = 0;
|
|
|
|
upcall.actions = NULL;
|
|
|
|
upcall.actions_len = 0;
|
|
|
|
dp_upcall(dp, skb, &upcall);
|
2010-08-29 10:49:11 -07:00
|
|
|
stats_counter_off = offsetof(struct dp_stats_percpu, n_missed);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
OVS_CB(skb)->flow = flow_cast(flow_node);
|
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-12-09 16:40:15 -08:00
|
|
|
stats_counter_off = offsetof(struct dp_stats_percpu, n_hit);
|
2010-08-29 10:49:11 -07:00
|
|
|
flow_used(OVS_CB(skb)->flow, skb);
|
2011-04-29 10:49:06 -07:00
|
|
|
execute_actions(dp, skb);
|
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. */
|
2010-05-12 12:40:45 -07:00
|
|
|
local_bh_disable();
|
|
|
|
stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id());
|
2010-07-28 18:20:43 -07:00
|
|
|
|
|
|
|
write_seqcount_begin(&stats->seqlock);
|
2010-05-12 12:40:45 -07:00
|
|
|
(*(u64 *)((u8 *)stats + stats_counter_off))++;
|
2010-07-28 18:20:43 -07:00
|
|
|
write_seqcount_end(&stats->seqlock);
|
|
|
|
|
2010-05-12 12:40:45 -07:00
|
|
|
local_bh_enable();
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
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
|
|
|
static void copy_and_csum_skb(struct sk_buff *skb, void *to)
|
|
|
|
{
|
|
|
|
u16 csum_start, csum_offset;
|
|
|
|
__wsum csum;
|
|
|
|
|
|
|
|
get_skb_csum_pointers(skb, &csum_start, &csum_offset);
|
|
|
|
csum_start -= skb_headroom(skb);
|
|
|
|
|
|
|
|
skb_copy_bits(skb, 0, to, csum_start);
|
|
|
|
|
|
|
|
csum = skb_copy_and_csum_bits(skb, csum_start, to + csum_start,
|
|
|
|
skb->len - csum_start, 0);
|
|
|
|
*(__sum16 *)(to + csum_start + csum_offset) = csum_fold(csum);
|
|
|
|
}
|
|
|
|
|
2011-01-28 18:18:25 -08:00
|
|
|
static struct genl_family dp_packet_genl_family = {
|
|
|
|
.id = GENL_ID_GENERATE,
|
2011-08-18 10:35:40 -07:00
|
|
|
.hdrsize = sizeof(struct ovs_header),
|
|
|
|
.name = OVS_PACKET_FAMILY,
|
2011-01-28 18:18:25 -08:00
|
|
|
.version = 1,
|
2011-08-18 10:35:40 -07:00
|
|
|
.maxattr = OVS_PACKET_ATTR_MAX
|
2011-01-28 18:18:25 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Generic Netlink multicast groups for upcalls.
|
|
|
|
*
|
|
|
|
* We really want three unique multicast groups per datapath, but we can't even
|
|
|
|
* get one, because genl_register_mc_group() takes genl_lock, which is also
|
|
|
|
* held during Generic Netlink message processing, so trying to acquire
|
2011-08-18 10:35:40 -07:00
|
|
|
* multicast groups during OVS_DP_NEW processing deadlocks. Instead, we
|
2011-01-28 18:18:25 -08:00
|
|
|
* preallocate a few groups and use them round-robin for datapaths. Collision
|
|
|
|
* isn't fatal--multicast listeners should check that the family is the one
|
|
|
|
* that they want and discard others--but it wastes time and memory to receive
|
|
|
|
* unwanted messages.
|
|
|
|
*/
|
2011-01-26 13:41:54 -08:00
|
|
|
#define PACKET_N_MC_GROUPS 16
|
2011-01-28 18:18:25 -08:00
|
|
|
static struct genl_multicast_group packet_mc_groups[PACKET_N_MC_GROUPS];
|
2011-01-26 13:41:54 -08:00
|
|
|
|
2011-01-28 18:18:25 -08:00
|
|
|
static u32 packet_mc_group(struct datapath *dp, u8 cmd)
|
2011-01-26 13:41:54 -08:00
|
|
|
{
|
2011-01-28 18:18:25 -08:00
|
|
|
u32 idx;
|
2011-01-26 13:41:54 -08:00
|
|
|
BUILD_BUG_ON_NOT_POWER_OF_2(PACKET_N_MC_GROUPS);
|
2011-01-28 18:18:25 -08:00
|
|
|
|
|
|
|
idx = jhash_2words(dp->dp_ifindex, cmd, 0) & (PACKET_N_MC_GROUPS - 1);
|
|
|
|
return packet_mc_groups[idx].id;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int packet_register_mc_groups(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < PACKET_N_MC_GROUPS; i++) {
|
|
|
|
struct genl_multicast_group *group = &packet_mc_groups[i];
|
|
|
|
int error;
|
|
|
|
|
|
|
|
sprintf(group->name, "packet%d", i);
|
|
|
|
error = genl_register_mc_group(&dp_packet_genl_family, group);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int dp_upcall(struct datapath *dp, struct sk_buff *skb, const struct dp_upcall_info *upcall_info)
|
|
|
|
{
|
|
|
|
struct dp_stats_percpu *stats;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
WARN_ON_ONCE(skb_shared(skb));
|
|
|
|
|
2011-05-27 15:53:49 -07:00
|
|
|
forward_ip_summed(skb, true);
|
2011-01-28 18:18:25 -08:00
|
|
|
|
|
|
|
/* Break apart GSO packets into their component pieces. Otherwise
|
|
|
|
* userspace may try to stuff a 64kB packet into a 1500-byte MTU. */
|
|
|
|
if (skb_is_gso(skb)) {
|
|
|
|
struct sk_buff *nskb = skb_gso_segment(skb, NETIF_F_SG | NETIF_F_HW_CSUM);
|
|
|
|
|
2011-06-16 15:32:26 -07:00
|
|
|
if (IS_ERR(nskb)) {
|
|
|
|
kfree_skb(skb);
|
|
|
|
err = PTR_ERR(nskb);
|
2011-01-28 18:18:25 -08:00
|
|
|
goto err;
|
|
|
|
}
|
2011-06-16 15:32:26 -07:00
|
|
|
consume_skb(skb);
|
|
|
|
skb = nskb;
|
2011-01-28 18:18:25 -08:00
|
|
|
}
|
|
|
|
|
2011-07-28 09:05:25 -07:00
|
|
|
err = queue_userspace_packets(dp, skb, upcall_info);
|
2011-02-28 14:26:39 -08:00
|
|
|
if (err)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
return 0;
|
2011-01-28 18:18:25 -08:00
|
|
|
|
|
|
|
err:
|
|
|
|
local_bh_disable();
|
|
|
|
stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id());
|
|
|
|
|
|
|
|
write_seqcount_begin(&stats->seqlock);
|
|
|
|
stats->n_lost++;
|
|
|
|
write_seqcount_end(&stats->seqlock);
|
|
|
|
|
|
|
|
local_bh_enable();
|
|
|
|
|
|
|
|
return err;
|
2011-01-26 13:41:54 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Send each packet in the 'skb' list to userspace for 'dp' as directed by
|
|
|
|
* 'upcall_info'. There will be only one packet unless we broke up a GSO
|
|
|
|
* packet.
|
|
|
|
*/
|
2011-07-28 09:05:25 -07:00
|
|
|
static int queue_userspace_packets(struct datapath *dp, struct sk_buff *skb,
|
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
|
|
|
const struct dp_upcall_info *upcall_info)
|
2009-09-14 09:20:58 -07:00
|
|
|
{
|
2011-01-26 13:41:54 -08:00
|
|
|
u32 group = packet_mc_group(dp, upcall_info->cmd);
|
2009-09-14 09:20:58 -07:00
|
|
|
struct sk_buff *nskb;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
do {
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *upcall;
|
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
|
|
|
struct sk_buff *user_skb; /* to be queued to userspace */
|
|
|
|
struct nlattr *nla;
|
|
|
|
unsigned int len;
|
2009-09-14 09:20:58 -07:00
|
|
|
|
|
|
|
nskb = skb->next;
|
|
|
|
skb->next = NULL;
|
|
|
|
|
2011-02-07 15:57:09 -08:00
|
|
|
err = vlan_deaccel_tag(skb);
|
|
|
|
if (unlikely(err))
|
|
|
|
goto err_kfree_skbs;
|
2010-12-29 22:13:15 -08:00
|
|
|
|
2011-02-28 14:32:33 -08:00
|
|
|
if (nla_attr_size(skb->len) > USHRT_MAX)
|
|
|
|
goto err_kfree_skbs;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
len = sizeof(struct ovs_header);
|
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
|
|
|
len += nla_total_size(skb->len);
|
|
|
|
len += nla_total_size(FLOW_BUFSIZE);
|
|
|
|
if (upcall_info->userdata)
|
|
|
|
len += nla_total_size(8);
|
|
|
|
if (upcall_info->sample_pool)
|
|
|
|
len += nla_total_size(4);
|
|
|
|
if (upcall_info->actions_len)
|
|
|
|
len += nla_total_size(upcall_info->actions_len);
|
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
user_skb = genlmsg_new(len, GFP_ATOMIC);
|
|
|
|
if (!user_skb) {
|
|
|
|
netlink_set_err(INIT_NET_GENL_SOCK, 0, group, -ENOBUFS);
|
2009-09-14 09:20:58 -07:00
|
|
|
goto err_kfree_skbs;
|
2011-01-26 13:41:54 -08:00
|
|
|
}
|
2009-09-14 09:20:58 -07:00
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
upcall = genlmsg_put(user_skb, 0, 0, &dp_packet_genl_family, 0, upcall_info->cmd);
|
2011-01-21 17:01:56 -08:00
|
|
|
upcall->dp_ifindex = dp->dp_ifindex;
|
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-08-18 10:35:40 -07:00
|
|
|
nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_KEY);
|
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
|
|
|
flow_to_nlattrs(upcall_info->key, user_skb);
|
|
|
|
nla_nest_end(user_skb, nla);
|
2009-09-14 09:20:58 -07:00
|
|
|
|
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
|
|
|
if (upcall_info->userdata)
|
2011-08-18 10:35:40 -07:00
|
|
|
nla_put_u64(user_skb, OVS_PACKET_ATTR_USERDATA, upcall_info->userdata);
|
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
|
|
|
if (upcall_info->sample_pool)
|
2011-08-18 10:35:40 -07:00
|
|
|
nla_put_u32(user_skb, OVS_PACKET_ATTR_SAMPLE_POOL, upcall_info->sample_pool);
|
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
|
|
|
if (upcall_info->actions_len) {
|
|
|
|
const struct nlattr *actions = upcall_info->actions;
|
|
|
|
u32 actions_len = upcall_info->actions_len;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_ACTIONS);
|
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
|
|
|
memcpy(__skb_put(user_skb, actions_len), actions, actions_len);
|
|
|
|
nla_nest_end(user_skb, nla);
|
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
nla = __nla_reserve(user_skb, OVS_PACKET_ATTR_PACKET, skb->len);
|
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
|
|
|
if (skb->ip_summed == CHECKSUM_PARTIAL)
|
|
|
|
copy_and_csum_skb(skb, nla_data(nla));
|
|
|
|
else
|
|
|
|
skb_copy_bits(skb, 0, nla_data(nla), skb->len);
|
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
err = genlmsg_multicast(user_skb, 0, group, GFP_ATOMIC);
|
|
|
|
if (err)
|
|
|
|
goto err_kfree_skbs;
|
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-06-16 15:32:26 -07:00
|
|
|
consume_skb(skb);
|
2009-09-14 09:20:58 -07:00
|
|
|
skb = nskb;
|
|
|
|
} while (skb);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_kfree_skbs:
|
|
|
|
kfree_skb(skb);
|
|
|
|
while ((skb = nskb) != NULL) {
|
|
|
|
nskb = skb->next;
|
|
|
|
kfree_skb(skb);
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Called with genl_mutex. */
|
2011-01-21 17:01:56 -08:00
|
|
|
static int flush_flows(int dp_ifindex)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-01-18 16:54:27 -08:00
|
|
|
struct tbl *old_table;
|
2010-04-02 16:46:18 -04:00
|
|
|
struct tbl *new_table;
|
2011-01-18 16:54:27 -08:00
|
|
|
struct datapath *dp;
|
|
|
|
|
2011-01-21 17:01:56 -08:00
|
|
|
dp = get_dp(dp_ifindex);
|
2011-01-18 16:54:27 -08:00
|
|
|
if (!dp)
|
2011-01-26 12:49:06 -08:00
|
|
|
return -ENODEV;
|
2010-04-02 16:46:18 -04:00
|
|
|
|
2011-01-18 16:54:27 -08:00
|
|
|
old_table = get_table_protected(dp);
|
2010-12-27 16:06:08 -08:00
|
|
|
new_table = tbl_create(TBL_MIN_BUCKETS);
|
2010-04-02 16:46:18 -04:00
|
|
|
if (!new_table)
|
2011-01-26 12:49:06 -08:00
|
|
|
return -ENOMEM;
|
2010-04-02 16:46:18 -04:00
|
|
|
|
|
|
|
rcu_assign_pointer(dp->table, new_table);
|
|
|
|
|
|
|
|
tbl_deferred_destroy(old_table, flow_free_tbl);
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
return 0;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
static int validate_actions(const struct nlattr *attr)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-01-17 16:59:18 -08:00
|
|
|
const struct nlattr *a;
|
|
|
|
int rem;
|
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
nla_for_each_nested(a, attr, rem) {
|
2011-08-18 10:35:40 -07:00
|
|
|
static const u32 action_lens[OVS_ACTION_ATTR_MAX + 1] = {
|
|
|
|
[OVS_ACTION_ATTR_OUTPUT] = 4,
|
|
|
|
[OVS_ACTION_ATTR_USERSPACE] = 8,
|
|
|
|
[OVS_ACTION_ATTR_SET_DL_TCI] = 2,
|
|
|
|
[OVS_ACTION_ATTR_STRIP_VLAN] = 0,
|
|
|
|
[OVS_ACTION_ATTR_SET_DL_SRC] = ETH_ALEN,
|
|
|
|
[OVS_ACTION_ATTR_SET_DL_DST] = ETH_ALEN,
|
|
|
|
[OVS_ACTION_ATTR_SET_NW_SRC] = 4,
|
|
|
|
[OVS_ACTION_ATTR_SET_NW_DST] = 4,
|
|
|
|
[OVS_ACTION_ATTR_SET_NW_TOS] = 1,
|
|
|
|
[OVS_ACTION_ATTR_SET_TP_SRC] = 2,
|
|
|
|
[OVS_ACTION_ATTR_SET_TP_DST] = 2,
|
|
|
|
[OVS_ACTION_ATTR_SET_TUNNEL] = 8,
|
|
|
|
[OVS_ACTION_ATTR_SET_PRIORITY] = 4,
|
|
|
|
[OVS_ACTION_ATTR_POP_PRIORITY] = 0,
|
2011-01-17 16:59:18 -08:00
|
|
|
};
|
|
|
|
int type = nla_type(a);
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
if (type > OVS_ACTION_ATTR_MAX || nla_len(a) != action_lens[type])
|
2011-01-17 16:59:18 -08:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
switch (type) {
|
2011-08-18 10:35:40 -07:00
|
|
|
case OVS_ACTION_ATTR_UNSPEC:
|
2010-12-10 10:40:58 -08:00
|
|
|
return -EINVAL;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
case OVS_ACTION_ATTR_USERSPACE:
|
|
|
|
case OVS_ACTION_ATTR_STRIP_VLAN:
|
|
|
|
case OVS_ACTION_ATTR_SET_DL_SRC:
|
|
|
|
case OVS_ACTION_ATTR_SET_DL_DST:
|
|
|
|
case OVS_ACTION_ATTR_SET_NW_SRC:
|
|
|
|
case OVS_ACTION_ATTR_SET_NW_DST:
|
|
|
|
case OVS_ACTION_ATTR_SET_TP_SRC:
|
|
|
|
case OVS_ACTION_ATTR_SET_TP_DST:
|
|
|
|
case OVS_ACTION_ATTR_SET_TUNNEL:
|
|
|
|
case OVS_ACTION_ATTR_SET_PRIORITY:
|
|
|
|
case OVS_ACTION_ATTR_POP_PRIORITY:
|
2011-01-17 16:59:18 -08:00
|
|
|
/* No validation needed. */
|
|
|
|
break;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
case OVS_ACTION_ATTR_OUTPUT:
|
2011-01-17 16:59:18 -08:00
|
|
|
if (nla_get_u32(a) >= DP_MAX_PORTS)
|
|
|
|
return -EINVAL;
|
2011-01-17 16:58:35 -08:00
|
|
|
break;
|
2010-12-10 10:40:58 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
case OVS_ACTION_ATTR_SET_DL_TCI:
|
2010-12-10 10:40:58 -08:00
|
|
|
if (nla_get_be16(a) & htons(VLAN_CFI_MASK))
|
2009-07-08 13:19:16 -07:00
|
|
|
return -EINVAL;
|
2011-01-17 16:59:18 -08:00
|
|
|
break;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
case OVS_ACTION_ATTR_SET_NW_TOS:
|
2011-01-17 16:59:18 -08:00
|
|
|
if (nla_get_u8(a) & INET_ECN_MASK)
|
|
|
|
return -EINVAL;
|
|
|
|
break;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-17 16:59:18 -08:00
|
|
|
default:
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
}
|
2010-03-12 16:05:25 -05:00
|
|
|
|
2011-01-17 16:59:18 -08:00
|
|
|
if (rem > 0)
|
|
|
|
return -EINVAL;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-17 16:59:18 -08:00
|
|
|
return 0;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
static void clear_stats(struct sw_flow *flow)
|
|
|
|
{
|
2010-07-15 19:22:07 -07:00
|
|
|
flow->used = 0;
|
2009-07-08 13:19:16 -07:00
|
|
|
flow->tcp_flags = 0;
|
|
|
|
flow->packet_count = 0;
|
|
|
|
flow->byte_count = 0;
|
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Called with genl_mutex. */
|
2010-04-02 16:46:18 -04:00
|
|
|
static int expand_table(struct datapath *dp)
|
|
|
|
{
|
2010-12-08 11:32:05 -08:00
|
|
|
struct tbl *old_table = get_table_protected(dp);
|
2010-04-02 16:46:18 -04:00
|
|
|
struct tbl *new_table;
|
|
|
|
|
|
|
|
new_table = tbl_expand(old_table);
|
2011-08-03 11:19:47 +09:00
|
|
|
if (IS_ERR(new_table)) {
|
|
|
|
if (PTR_ERR(new_table) != -ENOSPC)
|
|
|
|
return PTR_ERR(new_table);
|
|
|
|
} else {
|
|
|
|
rcu_assign_pointer(dp->table, new_table);
|
|
|
|
tbl_deferred_destroy(old_table, NULL);
|
|
|
|
}
|
2010-04-02 16:46:18 -04:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
return 0;
|
2010-04-02 16:46:18 -04: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;
|
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;
|
2011-01-23 19:08:06 -08:00
|
|
|
struct datapath *dp;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct ethhdr *eth;
|
|
|
|
bool is_frag;
|
2011-03-30 14:54:26 -07:00
|
|
|
int len;
|
2011-01-26 15:42:00 -08:00
|
|
|
int err;
|
2011-05-18 11:30:07 -07:00
|
|
|
int key_len;
|
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] ||
|
|
|
|
!a[OVS_PACKET_ATTR_ACTIONS] ||
|
|
|
|
nla_len(a[OVS_PACKET_ATTR_PACKET]) < ETH_HLEN)
|
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
|
|
|
err = validate_actions(a[OVS_PACKET_ATTR_ACTIONS]);
|
2011-01-23 19:08:06 -08:00
|
|
|
if (err)
|
2011-03-24 17:06:58 -07:00
|
|
|
goto err;
|
2011-01-23 19:08:06 -08: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);
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
memcpy(__skb_put(packet, len), nla_data(a[OVS_PACKET_ATTR_PACKET]), len);
|
2010-04-02 16:46:18 -04:00
|
|
|
|
2011-01-23 19:08:06 -08:00
|
|
|
skb_reset_mac_header(packet);
|
|
|
|
eth = eth_hdr(packet);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
/* Normally, setting the skb 'protocol' field would be handled by a
|
|
|
|
* call to eth_type_trans(), but it assumes there's a sending
|
|
|
|
* device, which we may not have. */
|
|
|
|
if (ntohs(eth->h_proto) >= 1536)
|
2011-01-23 19:08:06 -08:00
|
|
|
packet->protocol = eth->h_proto;
|
2011-01-26 15:42:00 -08:00
|
|
|
else
|
2011-01-23 19:08:06 -08:00
|
|
|
packet->protocol = htons(ETH_P_802_2);
|
2010-12-08 11:36:57 -08:00
|
|
|
|
2011-04-28 16:54:07 -07:00
|
|
|
/* Build an sw_flow for sending this packet. */
|
|
|
|
flow = flow_alloc();
|
|
|
|
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
|
|
|
|
2011-05-18 11:30:07 -07:00
|
|
|
err = flow_extract(packet, -1, &flow->key, &key_len, &is_frag);
|
2011-04-28 16:54:07 -07:00
|
|
|
if (err)
|
|
|
|
goto err_flow_put;
|
2011-05-18 11:30:07 -07:00
|
|
|
flow->tbl_node.hash = flow_hash(&flow->key, key_len);
|
2011-04-28 16:54:07 -07:00
|
|
|
|
2011-06-01 13:39:51 -07:00
|
|
|
err = flow_metadata_from_nlattrs(&flow->key.eth.in_port,
|
|
|
|
&flow->key.eth.tun_id,
|
2011-08-18 10:35:40 -07:00
|
|
|
a[OVS_PACKET_ATTR_KEY]);
|
2011-06-01 13:39:51 -07:00
|
|
|
if (err)
|
|
|
|
goto err_flow_put;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
acts = flow_actions_alloc(a[OVS_PACKET_ATTR_ACTIONS]);
|
2011-04-28 16:54:07 -07:00
|
|
|
err = PTR_ERR(acts);
|
|
|
|
if (IS_ERR(acts))
|
|
|
|
goto err_flow_put;
|
|
|
|
rcu_assign_pointer(flow->sf_acts, acts);
|
|
|
|
|
|
|
|
OVS_CB(packet)->flow = flow;
|
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
rcu_read_lock();
|
2011-08-18 10:35:40 -07:00
|
|
|
dp = get_dp(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-04-29 10:49:06 -07:00
|
|
|
err = execute_actions(dp, packet);
|
2011-01-26 15:42:00 -08:00
|
|
|
rcu_read_unlock();
|
2011-04-28 16:54:07 -07:00
|
|
|
|
|
|
|
flow_put(flow);
|
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();
|
2011-04-28 16:54:07 -07:00
|
|
|
err_flow_put:
|
|
|
|
flow_put(flow);
|
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] = {
|
|
|
|
[OVS_PACKET_ATTR_PACKET] = { .type = NLA_UNSPEC },
|
|
|
|
[OVS_PACKET_ATTR_KEY] = { .type = NLA_NESTED },
|
|
|
|
[OVS_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED },
|
2011-01-26 13:41:54 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct genl_ops dp_packet_genl_ops[] = {
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_PACKET_CMD_EXECUTE,
|
2011-01-26 13:41:54 -08:00
|
|
|
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
|
|
|
.policy = packet_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_packet_cmd_execute
|
2011-01-26 13:41:54 -08:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static void get_dp_stats(struct datapath *dp, struct ovs_dp_stats *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
|
|
|
struct tbl *table = get_table_protected(dp);
|
|
|
|
|
|
|
|
stats->n_flows = tbl_count(table);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
stats->n_frags = stats->n_hit = stats->n_missed = stats->n_lost = 0;
|
|
|
|
for_each_possible_cpu(i) {
|
|
|
|
const struct dp_stats_percpu *percpu_stats;
|
|
|
|
struct dp_stats_percpu local_stats;
|
|
|
|
unsigned seqcount;
|
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 {
|
|
|
|
seqcount = read_seqcount_begin(&percpu_stats->seqlock);
|
|
|
|
local_stats = *percpu_stats;
|
|
|
|
} while (read_seqcount_retry(&percpu_stats->seqlock, seqcount));
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
stats->n_frags += local_stats.n_frags;
|
|
|
|
stats->n_hit += local_stats.n_hit;
|
|
|
|
stats->n_missed += local_stats.n_missed;
|
|
|
|
stats->n_lost += local_stats.n_lost;
|
|
|
|
}
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* MTU of the dp pseudo-device: ETH_DATA_LEN or the minimum of the ports.
|
|
|
|
* Called with RTNL lock.
|
|
|
|
*/
|
2011-01-26 15:42:00 -08:00
|
|
|
int dp_min_mtu(const struct datapath *dp)
|
|
|
|
{
|
|
|
|
struct vport *p;
|
|
|
|
int mtu = 0;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
list_for_each_entry (p, &dp->port_list, node) {
|
2011-01-26 15:42:00 -08:00
|
|
|
int dev_mtu;
|
|
|
|
|
|
|
|
/* Skip any internal ports, since that's what we're trying to
|
|
|
|
* set. */
|
|
|
|
if (is_internal_vport(p))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
dev_mtu = vport_get_mtu(p);
|
datapath: Consider tunnels to have no MTU, fixing jumbo frame support.
Until now, tunnel vports have had a specific MTU, in the same way that
ordinary network devices have an MTU, but treating them this way does not
always make sense. For example, consider a datapath that has three ports:
the local port, a GRE tunnel to another host, and a physical port. If
the physical port is configured with a jumbo MTU, it should be possible to
send jumbo packets across the tunnel: the tunnel can do fragmentation or
the physical port traversed by the tunnel might have a jumbo MTU.
However, until now, tunnels always had a 1500-byte MTU by default. It
could be adjusted using ODP_VPORT_MTU_SET, but nothing actually did this.
One alternative would be to make ovs-vswitchd able to set the vport's MTU.
This commit, however, takes a different approach, of dropping the concept
of MTU entirely for tunnel vports. This also solves the problem described
above, without making any additional work for anyone.
I tested that, without this change, I could not send 1600-byte "pings"
between two machines whose NICs had 2000-byte MTUs that were connected to
vswitches that were in turn connected over GRE tunnels with the default
1500-byte MTU. With this change, it worked OK, regardless of the MTU of
the network traversed by the GRE tunnel.
This patch also makes "patch" ports MTU-less.
It might make sense to remove vport_set_mtu() and the associated callback
now, since ordinary network devices are the only vports that support it
now.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Suggested-by: Jesse Gross <jesse@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Bug #3728.
2011-02-01 11:32:06 -08:00
|
|
|
if (!dev_mtu)
|
|
|
|
continue;
|
2011-01-26 15:42:00 -08:00
|
|
|
if (!mtu || dev_mtu < mtu)
|
|
|
|
mtu = dev_mtu;
|
|
|
|
}
|
|
|
|
|
|
|
|
return mtu ? mtu : ETH_DATA_LEN;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Sets the MTU of all datapath devices to the minimum of the ports
|
|
|
|
* Called with RTNL lock.
|
|
|
|
*/
|
2011-01-26 15:42:00 -08:00
|
|
|
void set_internal_devs_mtu(const struct datapath *dp)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-01-26 15:42:00 -08:00
|
|
|
struct vport *p;
|
|
|
|
int mtu;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
mtu = dp_min_mtu(dp);
|
2010-05-13 13:21:33 -07:00
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
list_for_each_entry (p, &dp->port_list, node) {
|
2011-01-26 15:42:00 -08:00
|
|
|
if (is_internal_vport(p))
|
|
|
|
vport_set_mtu(p, mtu);
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static const struct nla_policy flow_policy[OVS_FLOW_ATTR_MAX + 1] = {
|
|
|
|
[OVS_FLOW_ATTR_KEY] = { .type = NLA_NESTED },
|
|
|
|
[OVS_FLOW_ATTR_ACTIONS] = { .type = NLA_NESTED },
|
|
|
|
[OVS_FLOW_ATTR_CLEAR] = { .type = NLA_FLAG },
|
2011-01-26 15:42:00 -08:00
|
|
|
};
|
2011-01-23 18:44:44 -08:00
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
static struct genl_family dp_flow_genl_family = {
|
|
|
|
.id = GENL_ID_GENERATE,
|
2011-08-18 10:35:40 -07:00
|
|
|
.hdrsize = sizeof(struct ovs_header),
|
|
|
|
.name = OVS_FLOW_FAMILY,
|
2011-01-28 14:00:51 -08:00
|
|
|
.version = 1,
|
2011-08-18 10:35:40 -07:00
|
|
|
.maxattr = OVS_FLOW_ATTR_MAX
|
2011-01-28 14:00:51 -08:00
|
|
|
};
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
static struct genl_multicast_group dp_flow_multicast_group = {
|
2011-08-18 10:35:40 -07:00
|
|
|
.name = OVS_FLOW_MCGROUP
|
2011-01-28 14:00:51 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Called with genl_lock. */
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
|
2011-01-28 14:00:51 -08:00
|
|
|
struct sk_buff *skb, u32 pid, u32 seq, u32 flags, u8 cmd)
|
2011-01-26 15:42:00 -08:00
|
|
|
{
|
2011-01-28 14:00:51 -08:00
|
|
|
const int skb_orig_len = skb->len;
|
2011-01-26 15:42:00 -08:00
|
|
|
const struct sw_flow_actions *sf_acts;
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_flow_stats stats;
|
|
|
|
struct ovs_header *ovs_header;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct nlattr *nla;
|
|
|
|
unsigned long used;
|
|
|
|
u8 tcp_flags;
|
|
|
|
int err;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
sf_acts = rcu_dereference_protected(flow->sf_acts,
|
2011-01-26 12:49:06 -08:00
|
|
|
lockdep_genl_is_held());
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
ovs_header = genlmsg_put(skb, pid, seq, &dp_flow_genl_family, flags, cmd);
|
|
|
|
if (!ovs_header)
|
2011-01-28 14:00:51 -08:00
|
|
|
return -EMSGSIZE;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
ovs_header->dp_ifindex = dp->dp_ifindex;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
nla = nla_nest_start(skb, OVS_FLOW_ATTR_KEY);
|
2011-01-26 15:42:00 -08:00
|
|
|
if (!nla)
|
|
|
|
goto nla_put_failure;
|
|
|
|
err = flow_to_nlattrs(&flow->key, skb);
|
|
|
|
if (err)
|
2011-01-28 14:00:51 -08:00
|
|
|
goto error;
|
2011-01-26 15:42:00 -08:00
|
|
|
nla_nest_end(skb, nla);
|
|
|
|
|
|
|
|
spin_lock_bh(&flow->lock);
|
|
|
|
used = flow->used;
|
|
|
|
stats.n_packets = flow->packet_count;
|
|
|
|
stats.n_bytes = flow->byte_count;
|
|
|
|
tcp_flags = flow->tcp_flags;
|
|
|
|
spin_unlock_bh(&flow->lock);
|
|
|
|
|
|
|
|
if (used)
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT_U64(skb, OVS_FLOW_ATTR_USED, flow_used_time(used));
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
if (stats.n_packets)
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT(skb, OVS_FLOW_ATTR_STATS, sizeof(struct ovs_flow_stats), &stats);
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
if (tcp_flags)
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT_U8(skb, OVS_FLOW_ATTR_TCP_FLAGS, tcp_flags);
|
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.
|
|
|
|
*/
|
2011-08-18 10:35:40 -07:00
|
|
|
err = nla_put(skb, OVS_FLOW_ATTR_ACTIONS, sf_acts->actions_len,
|
2011-02-01 09:25:26 -08:00
|
|
|
sf_acts->actions);
|
|
|
|
if (err < 0 && skb_orig_len)
|
|
|
|
goto error;
|
2011-01-28 14:00:51 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
return genlmsg_end(skb, ovs_header);
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
err = -EMSGSIZE;
|
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
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static struct sk_buff *ovs_flow_cmd_alloc_info(struct sw_flow *flow)
|
2010-05-13 13:21:33 -07:00
|
|
|
{
|
2011-01-28 14:00:51 -08:00
|
|
|
const struct sw_flow_actions *sf_acts;
|
|
|
|
int len;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
sf_acts = rcu_dereference_protected(flow->sf_acts,
|
|
|
|
lockdep_genl_is_held());
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
len = nla_total_size(FLOW_BUFSIZE); /* OVS_FLOW_ATTR_KEY */
|
|
|
|
len += nla_total_size(sf_acts->actions_len); /* OVS_FLOW_ATTR_ACTIONS */
|
|
|
|
len += nla_total_size(sizeof(struct ovs_flow_stats)); /* OVS_FLOW_ATTR_STATS */
|
|
|
|
len += nla_total_size(1); /* OVS_FLOW_ATTR_TCP_FLAGS */
|
|
|
|
len += nla_total_size(8); /* OVS_FLOW_ATTR_USED */
|
|
|
|
return genlmsg_new(NLMSG_ALIGN(sizeof(struct ovs_header)) + len, GFP_KERNEL);
|
2011-01-28 14:00:51 -08:00
|
|
|
}
|
2010-04-02 16:46:18 -04:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static struct sk_buff *ovs_flow_cmd_build_info(struct sw_flow *flow, struct datapath *dp,
|
2011-01-28 14:00:51 -08:00
|
|
|
u32 pid, u32 seq, u8 cmd)
|
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
int retval;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
skb = ovs_flow_cmd_alloc_info(flow);
|
2011-01-28 14:00:51 -08:00
|
|
|
if (!skb)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
retval = ovs_flow_cmd_fill_info(flow, dp, skb, pid, seq, 0, cmd);
|
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
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
|
2009-07-08 13:19:16 -07: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;
|
2011-01-17 14:40:58 -08:00
|
|
|
struct tbl_node *flow_node;
|
2011-01-28 14:00:51 -08:00
|
|
|
struct sw_flow_key key;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct sw_flow *flow;
|
2011-01-28 14:00:51 -08:00
|
|
|
struct sk_buff *reply;
|
2011-01-18 16:54:27 -08:00
|
|
|
struct datapath *dp;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct tbl *table;
|
|
|
|
u32 hash;
|
2011-01-17 14:40:58 -08:00
|
|
|
int error;
|
2011-05-18 11:30:07 -07:00
|
|
|
int key_len;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
/* Extract key. */
|
|
|
|
error = -EINVAL;
|
2011-08-18 10:35:40 -07:00
|
|
|
if (!a[OVS_FLOW_ATTR_KEY])
|
2011-01-28 14:00:51 -08:00
|
|
|
goto error;
|
2011-08-18 10:35:40 -07:00
|
|
|
error = flow_from_nlattrs(&key, &key_len, a[OVS_FLOW_ATTR_KEY]);
|
2011-01-28 14:00:51 -08:00
|
|
|
if (error)
|
|
|
|
goto error;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
/* Validate actions. */
|
2011-08-18 10:35:40 -07:00
|
|
|
if (a[OVS_FLOW_ATTR_ACTIONS]) {
|
|
|
|
error = validate_actions(a[OVS_FLOW_ATTR_ACTIONS]);
|
2011-01-28 14:00:51 -08:00
|
|
|
if (error)
|
|
|
|
goto error;
|
2011-08-18 10:35:40 -07:00
|
|
|
} else if (info->genlhdr->cmd == OVS_FLOW_CMD_NEW) {
|
2011-01-28 14:00:51 -08:00
|
|
|
error = -EINVAL;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
dp = get_dp(ovs_header->dp_ifindex);
|
2011-01-26 15:42:00 -08:00
|
|
|
error = -ENODEV;
|
2011-01-18 16:54:27 -08:00
|
|
|
if (!dp)
|
2011-01-28 14:00:51 -08:00
|
|
|
goto 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-05-18 11:30:07 -07:00
|
|
|
hash = flow_hash(&key, key_len);
|
2011-01-26 15:42:00 -08:00
|
|
|
table = get_table_protected(dp);
|
2011-05-18 11:30:07 -07:00
|
|
|
flow_node = tbl_lookup(table, &key, key_len, hash, flow_cmp);
|
2011-01-26 15:42:00 -08:00
|
|
|
if (!flow_node) {
|
|
|
|
struct sw_flow_actions *acts;
|
|
|
|
|
|
|
|
/* Bail out if we're not allowed to create a new flow. */
|
|
|
|
error = -ENOENT;
|
2011-08-18 10:35:40 -07:00
|
|
|
if (info->genlhdr->cmd == OVS_FLOW_CMD_SET)
|
2011-01-28 14:00:51 -08:00
|
|
|
goto error;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
/* Expand table, if necessary, to make room. */
|
|
|
|
if (tbl_count(table) >= tbl_n_buckets(table)) {
|
|
|
|
error = expand_table(dp);
|
|
|
|
if (error)
|
2011-01-28 14:00:51 -08:00
|
|
|
goto error;
|
2011-01-26 15:42:00 -08:00
|
|
|
table = get_table_protected(dp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate flow. */
|
|
|
|
flow = flow_alloc();
|
|
|
|
if (IS_ERR(flow)) {
|
|
|
|
error = PTR_ERR(flow);
|
2011-01-28 14:00:51 -08:00
|
|
|
goto error;
|
2011-01-26 15:42:00 -08:00
|
|
|
}
|
2011-01-28 14:00:51 -08:00
|
|
|
flow->key = key;
|
2011-01-26 15:42:00 -08:00
|
|
|
clear_stats(flow);
|
|
|
|
|
|
|
|
/* Obtain actions. */
|
2011-08-18 10:35:40 -07:00
|
|
|
acts = flow_actions_alloc(a[OVS_FLOW_ATTR_ACTIONS]);
|
2011-01-26 15:42:00 -08:00
|
|
|
error = PTR_ERR(acts);
|
|
|
|
if (IS_ERR(acts))
|
|
|
|
goto error_free_flow;
|
|
|
|
rcu_assign_pointer(flow->sf_acts, acts);
|
|
|
|
|
|
|
|
/* Put flow in bucket. */
|
|
|
|
error = tbl_insert(table, &flow->tbl_node, hash);
|
|
|
|
if (error)
|
|
|
|
goto error_free_flow;
|
2011-01-28 14:00:51 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_flow_cmd_build_info(flow, dp, info->snd_pid,
|
|
|
|
info->snd_seq, OVS_FLOW_CMD_NEW);
|
2011-01-26 15:42:00 -08:00
|
|
|
} else {
|
|
|
|
/* We found a matching flow. */
|
|
|
|
struct sw_flow_actions *old_acts;
|
|
|
|
|
|
|
|
/* 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.
|
|
|
|
*/
|
|
|
|
error = -EEXIST;
|
2011-08-18 10:35:40 -07:00
|
|
|
if (info->genlhdr->cmd == OVS_FLOW_CMD_NEW &&
|
2011-01-28 14:00:51 -08:00
|
|
|
info->nlhdr->nlmsg_flags & (NLM_F_CREATE | NLM_F_EXCL))
|
|
|
|
goto error;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
/* Update actions. */
|
|
|
|
flow = flow_cast(flow_node);
|
|
|
|
old_acts = rcu_dereference_protected(flow->sf_acts,
|
2011-01-26 12:49:06 -08:00
|
|
|
lockdep_genl_is_held());
|
2011-08-18 10:35:40 -07:00
|
|
|
if (a[OVS_FLOW_ATTR_ACTIONS] &&
|
|
|
|
(old_acts->actions_len != nla_len(a[OVS_FLOW_ATTR_ACTIONS]) ||
|
|
|
|
memcmp(old_acts->actions, nla_data(a[OVS_FLOW_ATTR_ACTIONS]),
|
2011-01-28 14:00:51 -08:00
|
|
|
old_acts->actions_len))) {
|
2011-01-26 15:42:00 -08:00
|
|
|
struct sw_flow_actions *new_acts;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
new_acts = flow_actions_alloc(a[OVS_FLOW_ATTR_ACTIONS]);
|
2011-01-26 15:42:00 -08:00
|
|
|
error = PTR_ERR(new_acts);
|
|
|
|
if (IS_ERR(new_acts))
|
2011-01-28 14:00:51 -08:00
|
|
|
goto error;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
rcu_assign_pointer(flow->sf_acts, new_acts);
|
|
|
|
flow_deferred_free_acts(old_acts);
|
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_flow_cmd_build_info(flow, dp, info->snd_pid,
|
|
|
|
info->snd_seq, OVS_FLOW_CMD_NEW);
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
/* Clear stats. */
|
2011-08-18 10:35:40 -07:00
|
|
|
if (a[OVS_FLOW_ATTR_CLEAR]) {
|
2011-01-26 15:42:00 -08:00
|
|
|
spin_lock_bh(&flow->lock);
|
|
|
|
clear_stats(flow);
|
|
|
|
spin_unlock_bh(&flow->lock);
|
|
|
|
}
|
2011-01-18 16:54:27 -08:00
|
|
|
}
|
2011-01-28 14:00:51 -08:00
|
|
|
|
|
|
|
if (!IS_ERR(reply))
|
|
|
|
genl_notify(reply, genl_info_net(info), info->snd_pid,
|
|
|
|
dp_flow_multicast_group.id, info->nlhdr, GFP_KERNEL);
|
|
|
|
else
|
|
|
|
netlink_set_err(INIT_NET_GENL_SOCK, 0,
|
|
|
|
dp_flow_multicast_group.id, PTR_ERR(reply));
|
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
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
error_free_flow:
|
|
|
|
flow_put(flow);
|
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;
|
2011-01-28 14:00:51 -08:00
|
|
|
struct sw_flow_key key;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct tbl_node *flow_node;
|
2011-01-28 14:00:51 -08:00
|
|
|
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;
|
|
|
|
struct tbl *table;
|
|
|
|
int err;
|
2011-05-18 11:30:07 -07:00
|
|
|
int key_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
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
if (!a[OVS_FLOW_ATTR_KEY])
|
2011-01-28 14:00:51 -08:00
|
|
|
return -EINVAL;
|
2011-08-18 10:35:40 -07:00
|
|
|
err = flow_from_nlattrs(&key, &key_len, a[OVS_FLOW_ATTR_KEY]);
|
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
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
dp = get_dp(ovs_header->dp_ifindex);
|
2011-01-18 16:54:27 -08:00
|
|
|
if (!dp)
|
2011-01-26 12:49:06 -08:00
|
|
|
return -ENODEV;
|
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-18 16:54:27 -08:00
|
|
|
table = get_table_protected(dp);
|
2011-05-18 11:30:07 -07:00
|
|
|
flow_node = tbl_lookup(table, &key, key_len, flow_hash(&key, key_len),
|
|
|
|
flow_cmp);
|
2011-01-26 15:42:00 -08:00
|
|
|
if (!flow_node)
|
2011-01-26 12:49:06 -08:00
|
|
|
return -ENOENT;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
flow = flow_cast(flow_node);
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_flow_cmd_build_info(flow, dp, info->snd_pid, info->snd_seq, OVS_FLOW_CMD_NEW);
|
2011-01-28 14:00:51 -08:00
|
|
|
if (IS_ERR(reply))
|
|
|
|
return PTR_ERR(reply);
|
2011-01-23 18:44:44 -08:00
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
return genlmsg_reply(reply, info);
|
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;
|
2011-01-28 14:00:51 -08:00
|
|
|
struct sw_flow_key key;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct tbl_node *flow_node;
|
2011-01-28 14:00:51 -08:00
|
|
|
struct sk_buff *reply;
|
2011-01-26 15:42:00 -08:00
|
|
|
struct sw_flow *flow;
|
|
|
|
struct datapath *dp;
|
2011-01-28 14:00:51 -08:00
|
|
|
struct tbl *table;
|
2011-01-26 15:42:00 -08:00
|
|
|
int err;
|
2011-05-18 11:30:07 -07:00
|
|
|
int key_len;
|
2011-01-23 18:44:44 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
if (!a[OVS_FLOW_ATTR_KEY])
|
|
|
|
return flush_flows(ovs_header->dp_ifindex);
|
|
|
|
err = flow_from_nlattrs(&key, &key_len, a[OVS_FLOW_ATTR_KEY]);
|
2011-01-28 14:00:51 -08:00
|
|
|
if (err)
|
|
|
|
return err;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
dp = get_dp(ovs_header->dp_ifindex);
|
2011-01-26 15:42:00 -08:00
|
|
|
if (!dp)
|
2011-01-28 14:00:51 -08:00
|
|
|
return -ENODEV;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
table = get_table_protected(dp);
|
2011-05-18 11:30:07 -07:00
|
|
|
flow_node = tbl_lookup(table, &key, key_len, flow_hash(&key, key_len),
|
|
|
|
flow_cmp);
|
2011-01-26 15:42:00 -08:00
|
|
|
if (!flow_node)
|
2011-01-28 14:00:51 -08:00
|
|
|
return -ENOENT;
|
2011-01-26 15:42:00 -08:00
|
|
|
flow = flow_cast(flow_node);
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_flow_cmd_alloc_info(flow);
|
2011-01-28 14:00:51 -08:00
|
|
|
if (!reply)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
err = tbl_remove(table, flow_node);
|
|
|
|
if (err) {
|
|
|
|
kfree_skb(reply);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
err = ovs_flow_cmd_fill_info(flow, dp, reply, info->snd_pid,
|
|
|
|
info->snd_seq, 0, OVS_FLOW_CMD_DEL);
|
2011-01-28 14:00:51 -08:00
|
|
|
BUG_ON(err < 0);
|
|
|
|
|
|
|
|
flow_deferred_free(flow);
|
|
|
|
|
|
|
|
genl_notify(reply, genl_info_net(info), info->snd_pid,
|
|
|
|
dp_flow_multicast_group.id, info->nlhdr, GFP_KERNEL);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
struct ovs_header *ovs_header = genlmsg_data(nlmsg_data(cb->nlh));
|
2011-01-28 14:00:51 -08:00
|
|
|
struct datapath *dp;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
dp = get_dp(ovs_header->dp_ifindex);
|
2011-01-28 14:00:51 -08:00
|
|
|
if (!dp)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
struct tbl_node *flow_node;
|
|
|
|
struct sw_flow *flow;
|
|
|
|
u32 bucket, obj;
|
|
|
|
|
|
|
|
bucket = cb->args[0];
|
|
|
|
obj = cb->args[1];
|
|
|
|
flow_node = tbl_next(get_table_protected(dp), &bucket, &obj);
|
|
|
|
if (!flow_node)
|
|
|
|
break;
|
|
|
|
|
|
|
|
flow = flow_cast(flow_node);
|
2011-08-18 10:35:40 -07:00
|
|
|
if (ovs_flow_cmd_fill_info(flow, dp, skb, NETLINK_CB(cb->skb).pid,
|
2011-01-28 14:00:51 -08:00
|
|
|
cb->nlh->nlmsg_seq, NLM_F_MULTI,
|
2011-08-18 10:35:40 -07:00
|
|
|
OVS_FLOW_CMD_NEW) < 0)
|
2011-01-28 14:00:51 -08:00
|
|
|
break;
|
|
|
|
|
|
|
|
cb->args[0] = bucket;
|
|
|
|
cb->args[1] = obj;
|
|
|
|
}
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2011-01-28 14:00:51 -08:00
|
|
|
static struct genl_ops dp_flow_genl_ops[] = {
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_FLOW_CMD_NEW,
|
2011-01-28 14:00:51 -08:00
|
|
|
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
|
|
|
.policy = flow_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_flow_cmd_new_or_set
|
2011-01-28 14:00:51 -08:00
|
|
|
},
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_FLOW_CMD_DEL,
|
2011-01-28 14:00:51 -08:00
|
|
|
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
|
|
|
.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,
|
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,
|
2011-01-28 14:00:51 -08:00
|
|
|
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
|
|
|
.policy = flow_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_flow_cmd_new_or_set,
|
2011-01-28 14:00:51 -08:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static const struct nla_policy datapath_policy[OVS_DP_ATTR_MAX + 1] = {
|
2011-01-28 13:55:04 -08:00
|
|
|
#ifdef HAVE_NLA_NUL_STRING
|
2011-08-18 10:35:40 -07:00
|
|
|
[OVS_DP_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
|
2011-01-28 13:55:04 -08:00
|
|
|
#endif
|
2011-08-18 10:35:40 -07:00
|
|
|
[OVS_DP_ATTR_IPV4_FRAGS] = { .type = NLA_U32 },
|
|
|
|
[OVS_DP_ATTR_SAMPLING] = { .type = NLA_U32 },
|
2011-01-26 15:42:00 -08:00
|
|
|
};
|
|
|
|
|
2011-01-28 13:55:04 -08:00
|
|
|
static struct genl_family dp_datapath_genl_family = {
|
|
|
|
.id = GENL_ID_GENERATE,
|
2011-08-18 10:35:40 -07:00
|
|
|
.hdrsize = sizeof(struct ovs_header),
|
|
|
|
.name = OVS_DATAPATH_FAMILY,
|
2011-01-28 13:55:04 -08:00
|
|
|
.version = 1,
|
2011-08-18 10:35:40 -07:00
|
|
|
.maxattr = OVS_DP_ATTR_MAX
|
2011-01-28 13:55:04 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct genl_multicast_group dp_datapath_multicast_group = {
|
2011-08-18 10:35:40 -07:00
|
|
|
.name = OVS_DATAPATH_MCGROUP
|
2011-01-28 13:55:04 -08:00
|
|
|
};
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_dp_cmd_fill_info(struct datapath *dp, struct sk_buff *skb,
|
2011-01-28 13:55:04 -08:00
|
|
|
u32 pid, 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-01-26 15:42:00 -08:00
|
|
|
struct nlattr *nla;
|
2009-07-08 13:19:16 -07:00
|
|
|
int err;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
ovs_header = genlmsg_put(skb, pid, 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-08-18 10:35:40 -07:00
|
|
|
ovs_header->dp_ifindex = dp->dp_ifindex;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
rcu_read_lock();
|
2011-08-18 10:35:40 -07:00
|
|
|
err = nla_put_string(skb, OVS_DP_ATTR_NAME, dp_name(dp));
|
2011-01-26 15:42:00 -08:00
|
|
|
rcu_read_unlock();
|
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
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
nla = nla_reserve(skb, OVS_DP_ATTR_STATS, sizeof(struct ovs_dp_stats));
|
2011-01-26 15:42:00 -08:00
|
|
|
if (!nla)
|
|
|
|
goto nla_put_failure;
|
|
|
|
get_dp_stats(dp, nla_data(nla));
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT_U32(skb, OVS_DP_ATTR_IPV4_FRAGS,
|
|
|
|
dp->drop_frags ? OVS_DP_FRAG_DROP : OVS_DP_FRAG_ZERO);
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
if (dp->sflow_probability)
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT_U32(skb, OVS_DP_ATTR_SAMPLING, dp->sflow_probability);
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
nla = nla_nest_start(skb, OVS_DP_ATTR_MCGROUPS);
|
2011-01-26 13:41:54 -08:00
|
|
|
if (!nla)
|
|
|
|
goto nla_put_failure;
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT_U32(skb, OVS_PACKET_CMD_MISS, packet_mc_group(dp, OVS_PACKET_CMD_MISS));
|
|
|
|
NLA_PUT_U32(skb, OVS_PACKET_CMD_ACTION, packet_mc_group(dp, OVS_PACKET_CMD_ACTION));
|
|
|
|
NLA_PUT_U32(skb, OVS_PACKET_CMD_SAMPLE, packet_mc_group(dp, OVS_PACKET_CMD_SAMPLE));
|
2011-01-26 13:41:54 -08:00
|
|
|
nla_nest_end(skb, nla);
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
return genlmsg_end(skb, ovs_header);
|
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
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static struct sk_buff *ovs_dp_cmd_build_info(struct datapath *dp, u32 pid,
|
2011-01-28 13:55:04 -08:00
|
|
|
u32 seq, u8 cmd)
|
2011-01-26 15:42:00 -08:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
2011-01-28 13:55:04 -08:00
|
|
|
int retval;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-01-28 13:55:04 -08:00
|
|
|
skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
2009-07-08 13:19:16 -07:00
|
|
|
if (!skb)
|
2011-01-26 15:42:00 -08:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2010-04-12 11:49:16 -04:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
retval = ovs_dp_cmd_fill_info(dp, skb, pid, seq, 0, cmd);
|
2011-01-28 13:55:04 -08:00
|
|
|
if (retval < 0) {
|
|
|
|
kfree_skb(skb);
|
|
|
|
return ERR_PTR(retval);
|
|
|
|
}
|
|
|
|
return skb;
|
|
|
|
}
|
2010-05-12 13:45:49 -07:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_dp_cmd_validate(struct nlattr *a[OVS_DP_ATTR_MAX + 1])
|
2011-01-28 13:55:04 -08:00
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
if (a[OVS_DP_ATTR_IPV4_FRAGS]) {
|
|
|
|
u32 frags = nla_get_u32(a[OVS_DP_ATTR_IPV4_FRAGS]);
|
2010-05-12 13:45:49 -07:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
if (frags != OVS_DP_FRAG_ZERO && frags != OVS_DP_FRAG_DROP)
|
2011-01-28 13:55:04 -08:00
|
|
|
return -EINVAL;
|
2011-01-26 15:42:00 -08:00
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
return CHECK_NUL_STRING(a[OVS_DP_ATTR_NAME], IFNAMSIZ - 1);
|
2011-01-26 15:42:00 -08:00
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Called with genl_mutex and optionally with RTNL lock also. */
|
2011-08-18 10:35:40 -07:00
|
|
|
static struct datapath *lookup_datapath(struct ovs_header *ovs_header, 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])
|
|
|
|
dp = get_dp(ovs_header->dp_ifindex);
|
2011-01-21 17:01:56 -08:00
|
|
|
else {
|
2011-01-26 15:42:00 -08:00
|
|
|
struct vport *vport;
|
|
|
|
|
2011-01-26 09:42:28 -08:00
|
|
|
rcu_read_lock();
|
2011-08-18 10:35:40 -07:00
|
|
|
vport = vport_locate(nla_data(a[OVS_DP_ATTR_NAME]));
|
|
|
|
dp = vport && vport->port_no == OVSP_LOCAL ? vport->dp : NULL;
|
2011-01-26 09:42:28 -08:00
|
|
|
rcu_read_unlock();
|
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
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Called with genl_mutex. */
|
2011-08-18 10:35:40 -07:00
|
|
|
static void change_datapath(struct datapath *dp, struct nlattr *a[OVS_DP_ATTR_MAX + 1])
|
2011-01-26 15:42:00 -08:00
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
if (a[OVS_DP_ATTR_IPV4_FRAGS])
|
|
|
|
dp->drop_frags = nla_get_u32(a[OVS_DP_ATTR_IPV4_FRAGS]) == OVS_DP_FRAG_DROP;
|
|
|
|
if (a[OVS_DP_ATTR_SAMPLING])
|
|
|
|
dp->sflow_probability = nla_get_u32(a[OVS_DP_ATTR_SAMPLING]);
|
2011-01-26 15:42:00 -08:00
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = -EINVAL;
|
2011-08-18 10:35:40 -07:00
|
|
|
if (!a[OVS_DP_ATTR_NAME])
|
2011-01-28 13:55:04 -08:00
|
|
|
goto err;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
err = ovs_dp_cmd_validate(a);
|
2011-01-28 13:55:04 -08:00
|
|
|
if (err)
|
|
|
|
goto err;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
rtnl_lock();
|
|
|
|
err = -ENODEV;
|
|
|
|
if (!try_module_get(THIS_MODULE))
|
2011-01-26 12:49:06 -08:00
|
|
|
goto err_unlock_rtnl;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
err = -ENOMEM;
|
|
|
|
dp = kzalloc(sizeof(*dp), GFP_KERNEL);
|
|
|
|
if (dp == NULL)
|
|
|
|
goto err_put_module;
|
|
|
|
INIT_LIST_HEAD(&dp->port_list);
|
|
|
|
|
|
|
|
/* Initialize kobject for bridge. This will be added as
|
|
|
|
* /sys/class/net/<devname>/brif later, if sysfs is enabled. */
|
|
|
|
dp->ifobj.kset = NULL;
|
|
|
|
kobject_init(&dp->ifobj, &dp_ktype);
|
|
|
|
|
|
|
|
/* Allocate table. */
|
|
|
|
err = -ENOMEM;
|
|
|
|
rcu_assign_pointer(dp->table, tbl_create(TBL_MIN_BUCKETS));
|
|
|
|
if (!dp->table)
|
|
|
|
goto err_free_dp;
|
|
|
|
|
|
|
|
/* 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;
|
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;
|
|
|
|
|
|
|
|
goto err_destroy_table;
|
|
|
|
}
|
2011-01-21 17:01:56 -08:00
|
|
|
dp->dp_ifindex = vport_get_ifindex(vport);
|
2011-01-26 15:42:00 -08:00
|
|
|
|
|
|
|
dp->drop_frags = 0;
|
|
|
|
dp->stats_percpu = alloc_percpu(struct dp_stats_percpu);
|
|
|
|
if (!dp->stats_percpu) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto err_destroy_local_port;
|
|
|
|
}
|
|
|
|
|
|
|
|
change_datapath(dp, a);
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_dp_cmd_build_info(dp, info->snd_pid, info->snd_seq, OVS_DP_CMD_NEW);
|
2011-01-28 13:55:04 -08:00
|
|
|
err = PTR_ERR(reply);
|
|
|
|
if (IS_ERR(reply))
|
|
|
|
goto err_destroy_local_port;
|
|
|
|
|
2011-01-21 17:01:56 -08:00
|
|
|
list_add_tail(&dp->list_node, &dps);
|
2011-01-26 15:42:00 -08:00
|
|
|
dp_sysfs_add_dp(dp);
|
|
|
|
|
|
|
|
rtnl_unlock();
|
|
|
|
|
2011-01-28 13:55:04 -08:00
|
|
|
genl_notify(reply, genl_info_net(info), info->snd_pid,
|
|
|
|
dp_datapath_multicast_group.id, info->nlhdr, GFP_KERNEL);
|
2011-01-26 15:42:00 -08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_destroy_local_port:
|
2011-08-18 10:35:40 -07:00
|
|
|
dp_detach_port(get_vport_protected(dp, OVSP_LOCAL));
|
2011-01-26 15:42:00 -08:00
|
|
|
err_destroy_table:
|
|
|
|
tbl_destroy(get_table_protected(dp), NULL);
|
|
|
|
err_free_dp:
|
|
|
|
kfree(dp);
|
|
|
|
err_put_module:
|
|
|
|
module_put(THIS_MODULE);
|
2011-01-26 12:49:06 -08:00
|
|
|
err_unlock_rtnl:
|
2011-01-26 15:42:00 -08:00
|
|
|
rtnl_unlock();
|
|
|
|
err:
|
2009-07-08 13:19:16 -07:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_dp_cmd_del(struct sk_buff *skb, struct genl_info *info)
|
2010-05-13 13:21:33 -07:00
|
|
|
{
|
2011-01-26 12:49:06 -08:00
|
|
|
struct vport *vport, *next_vport;
|
2011-01-28 13:55:04 -08:00
|
|
|
struct sk_buff *reply;
|
2011-01-18 16:54:27 -08:00
|
|
|
struct datapath *dp;
|
2011-01-26 15:42:00 -08:00
|
|
|
int err;
|
2010-05-13 13:21:33 -07:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
err = ovs_dp_cmd_validate(info->attrs);
|
2011-01-28 13:55:04 -08:00
|
|
|
if (err)
|
2011-01-26 15:42:00 -08:00
|
|
|
goto exit;
|
2010-05-13 13:21:33 -07:00
|
|
|
|
2011-01-26 15:42:00 -08:00
|
|
|
rtnl_lock();
|
2011-01-28 13:55:04 -08:00
|
|
|
dp = lookup_datapath(info->userhdr, info->attrs);
|
2011-01-26 15:42:00 -08:00
|
|
|
err = PTR_ERR(dp);
|
|
|
|
if (IS_ERR(dp))
|
2011-01-28 13:55:04 -08:00
|
|
|
goto exit_unlock;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_dp_cmd_build_info(dp, info->snd_pid, info->snd_seq, OVS_DP_CMD_DEL);
|
2011-01-28 13:55:04 -08:00
|
|
|
err = PTR_ERR(reply);
|
|
|
|
if (IS_ERR(reply))
|
|
|
|
goto exit_unlock;
|
2011-01-18 16:54:27 -08:00
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
list_for_each_entry_safe (vport, next_vport, &dp->port_list, node)
|
2011-08-18 10:35:40 -07:00
|
|
|
if (vport->port_no != OVSP_LOCAL)
|
2011-01-26 12:49:06 -08:00
|
|
|
dp_detach_port(vport);
|
|
|
|
|
|
|
|
dp_sysfs_del_dp(dp);
|
2011-01-21 17:01:56 -08:00
|
|
|
list_del(&dp->list_node);
|
2011-08-18 10:35:40 -07:00
|
|
|
dp_detach_port(get_vport_protected(dp, OVSP_LOCAL));
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2011-02-24 14:07:29 -08:00
|
|
|
/* rtnl_unlock() will wait until all the references to devices that
|
|
|
|
* are pending unregistration have been dropped. We do it here to
|
|
|
|
* ensure that any internal devices (which contain DP pointers) are
|
|
|
|
* fully destroyed before freeing the datapath.
|
|
|
|
*/
|
|
|
|
rtnl_unlock();
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
call_rcu(&dp->rcu, destroy_dp_rcu);
|
|
|
|
module_put(THIS_MODULE);
|
|
|
|
|
2011-01-28 13:55:04 -08:00
|
|
|
genl_notify(reply, genl_info_net(info), info->snd_pid,
|
|
|
|
dp_datapath_multicast_group.id, info->nlhdr, GFP_KERNEL);
|
2011-02-24 14:07:29 -08:00
|
|
|
|
|
|
|
return 0;
|
2011-01-26 15:42:00 -08:00
|
|
|
|
2011-01-28 13:55:04 -08:00
|
|
|
exit_unlock:
|
2011-01-26 15:42:00 -08:00
|
|
|
rtnl_unlock();
|
|
|
|
exit:
|
|
|
|
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
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
err = ovs_dp_cmd_validate(info->attrs);
|
2011-01-28 13:55:04 -08:00
|
|
|
if (err)
|
|
|
|
return err;
|
2010-07-28 18:20:43 -07:00
|
|
|
|
2011-01-28 13:55:04 -08:00
|
|
|
dp = lookup_datapath(info->userhdr, info->attrs);
|
2011-01-26 15:42:00 -08:00
|
|
|
if (IS_ERR(dp))
|
2011-01-28 13:55:04 -08:00
|
|
|
return PTR_ERR(dp);
|
2010-07-28 18:20:43 -07:00
|
|
|
|
2011-01-28 13:55:04 -08:00
|
|
|
change_datapath(dp, info->attrs);
|
2010-07-28 18:20:43 -07:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_dp_cmd_build_info(dp, info->snd_pid, info->snd_seq, OVS_DP_CMD_NEW);
|
2011-01-28 13:55:04 -08:00
|
|
|
if (IS_ERR(reply)) {
|
|
|
|
err = PTR_ERR(reply);
|
|
|
|
netlink_set_err(INIT_NET_GENL_SOCK, 0,
|
|
|
|
dp_datapath_multicast_group.id, err);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
genl_notify(reply, genl_info_net(info), info->snd_pid,
|
|
|
|
dp_datapath_multicast_group.id, info->nlhdr, GFP_KERNEL);
|
|
|
|
return 0;
|
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
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
err = ovs_dp_cmd_validate(info->attrs);
|
2011-01-28 13:55:04 -08:00
|
|
|
if (err)
|
|
|
|
return err;
|
2009-08-01 00:09:56 -07:00
|
|
|
|
2011-01-28 13:55:04 -08:00
|
|
|
dp = lookup_datapath(info->userhdr, info->attrs);
|
2011-01-26 15:42:00 -08:00
|
|
|
if (IS_ERR(dp))
|
2011-01-28 13:55:04 -08:00
|
|
|
return PTR_ERR(dp);
|
2009-08-01 00:09:56 -07:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_dp_cmd_build_info(dp, info->snd_pid, info->snd_seq, OVS_DP_CMD_NEW);
|
2011-01-28 13:55:04 -08:00
|
|
|
if (IS_ERR(reply))
|
|
|
|
return PTR_ERR(reply);
|
|
|
|
|
|
|
|
return genlmsg_reply(reply, info);
|
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
|
|
|
{
|
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
|
|
|
|
2011-01-21 17:01:56 -08:00
|
|
|
list_for_each_entry (dp, &dps, list_node) {
|
|
|
|
if (i < skip)
|
2011-01-26 15:42:00 -08:00
|
|
|
continue;
|
2011-08-18 10:35:40 -07:00
|
|
|
if (ovs_dp_cmd_fill_info(dp, skb, NETLINK_CB(cb->skb).pid,
|
2011-01-28 13:55:04 -08:00
|
|
|
cb->nlh->nlmsg_seq, NLM_F_MULTI,
|
2011-08-18 10:35:40 -07:00
|
|
|
OVS_DP_CMD_NEW) < 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
|
|
|
}
|
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
|
|
|
}
|
|
|
|
|
2011-01-28 13:55:04 -08:00
|
|
|
static struct genl_ops dp_datapath_genl_ops[] = {
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_DP_CMD_NEW,
|
2011-01-28 13:55:04 -08:00
|
|
|
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
|
|
|
.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,
|
2011-01-28 13:55:04 -08:00
|
|
|
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
|
|
|
.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,
|
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,
|
2011-01-28 13:55:04 -08:00
|
|
|
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
|
|
|
.policy = datapath_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_dp_cmd_set,
|
2011-01-28 13:55:04 -08:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static const struct nla_policy vport_policy[OVS_VPORT_ATTR_MAX + 1] = {
|
2011-01-28 13:59:03 -08:00
|
|
|
#ifdef HAVE_NLA_NUL_STRING
|
2011-08-18 10:35:40 -07:00
|
|
|
[OVS_VPORT_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
|
|
|
|
[OVS_VPORT_ATTR_PORT_NO] = { .type = NLA_U32 },
|
|
|
|
[OVS_VPORT_ATTR_TYPE] = { .type = NLA_U32 },
|
|
|
|
[OVS_VPORT_ATTR_STATS] = { .len = sizeof(struct rtnl_link_stats64) },
|
|
|
|
[OVS_VPORT_ATTR_ADDRESS] = { .len = ETH_ALEN },
|
2011-01-28 13:59:03 -08:00
|
|
|
#else
|
2011-08-18 10:35:40 -07:00
|
|
|
[OVS_VPORT_ATTR_STATS] = { .minlen = sizeof(struct rtnl_link_stats64) },
|
|
|
|
[OVS_VPORT_ATTR_ADDRESS] = { .minlen = ETH_ALEN },
|
2011-01-28 13:59:03 -08:00
|
|
|
#endif
|
2011-08-18 10:35:40 -07:00
|
|
|
[OVS_VPORT_ATTR_MTU] = { .type = NLA_U32 },
|
|
|
|
[OVS_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED },
|
2011-01-26 12:28:59 -08:00
|
|
|
};
|
|
|
|
|
2011-01-28 13:59:03 -08:00
|
|
|
static struct genl_family dp_vport_genl_family = {
|
|
|
|
.id = GENL_ID_GENERATE,
|
2011-08-18 10:35:40 -07:00
|
|
|
.hdrsize = sizeof(struct ovs_header),
|
|
|
|
.name = OVS_VPORT_FAMILY,
|
2011-01-28 13:59:03 -08:00
|
|
|
.version = 1,
|
2011-08-18 10:35:40 -07:00
|
|
|
.maxattr = OVS_VPORT_ATTR_MAX
|
2011-01-28 13:59:03 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct genl_multicast_group dp_vport_multicast_group = {
|
2011-08-18 10:35:40 -07:00
|
|
|
.name = OVS_VPORT_MCGROUP
|
2011-01-28 13:59:03 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Called with RTNL lock 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,
|
2011-01-28 13:59:03 -08:00
|
|
|
u32 pid, 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-01-26 12:28:59 -08:00
|
|
|
struct nlattr *nla;
|
|
|
|
int ifindex, iflink;
|
datapath: Consider tunnels to have no MTU, fixing jumbo frame support.
Until now, tunnel vports have had a specific MTU, in the same way that
ordinary network devices have an MTU, but treating them this way does not
always make sense. For example, consider a datapath that has three ports:
the local port, a GRE tunnel to another host, and a physical port. If
the physical port is configured with a jumbo MTU, it should be possible to
send jumbo packets across the tunnel: the tunnel can do fragmentation or
the physical port traversed by the tunnel might have a jumbo MTU.
However, until now, tunnels always had a 1500-byte MTU by default. It
could be adjusted using ODP_VPORT_MTU_SET, but nothing actually did this.
One alternative would be to make ovs-vswitchd able to set the vport's MTU.
This commit, however, takes a different approach, of dropping the concept
of MTU entirely for tunnel vports. This also solves the problem described
above, without making any additional work for anyone.
I tested that, without this change, I could not send 1600-byte "pings"
between two machines whose NICs had 2000-byte MTUs that were connected to
vswitches that were in turn connected over GRE tunnels with the default
1500-byte MTU. With this change, it worked OK, regardless of the MTU of
the network traversed by the GRE tunnel.
This patch also makes "patch" ports MTU-less.
It might make sense to remove vport_set_mtu() and the associated callback
now, since ordinary network devices are the only vports that support it
now.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Suggested-by: Jesse Gross <jesse@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Bug #3728.
2011-02-01 11:32:06 -08:00
|
|
|
int mtu;
|
2011-01-26 12:28:59 -08:00
|
|
|
int err;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
ovs_header = genlmsg_put(skb, pid, 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-08-18 10:35:40 -07:00
|
|
|
ovs_header->dp_ifindex = vport->dp->dp_ifindex;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT_U32(skb, OVS_VPORT_ATTR_PORT_NO, vport->port_no);
|
|
|
|
NLA_PUT_U32(skb, OVS_VPORT_ATTR_TYPE, vport_get_type(vport));
|
|
|
|
NLA_PUT_STRING(skb, OVS_VPORT_ATTR_NAME, vport_get_name(vport));
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
nla = nla_reserve(skb, OVS_VPORT_ATTR_STATS, sizeof(struct rtnl_link_stats64));
|
2011-01-26 12:28:59 -08:00
|
|
|
if (!nla)
|
|
|
|
goto nla_put_failure;
|
|
|
|
if (vport_get_stats(vport, nla_data(nla)))
|
|
|
|
__skb_trim(skb, skb->len - nla->nla_len);
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT(skb, OVS_VPORT_ATTR_ADDRESS, ETH_ALEN, vport_get_addr(vport));
|
2011-01-26 12:28:59 -08:00
|
|
|
|
datapath: Consider tunnels to have no MTU, fixing jumbo frame support.
Until now, tunnel vports have had a specific MTU, in the same way that
ordinary network devices have an MTU, but treating them this way does not
always make sense. For example, consider a datapath that has three ports:
the local port, a GRE tunnel to another host, and a physical port. If
the physical port is configured with a jumbo MTU, it should be possible to
send jumbo packets across the tunnel: the tunnel can do fragmentation or
the physical port traversed by the tunnel might have a jumbo MTU.
However, until now, tunnels always had a 1500-byte MTU by default. It
could be adjusted using ODP_VPORT_MTU_SET, but nothing actually did this.
One alternative would be to make ovs-vswitchd able to set the vport's MTU.
This commit, however, takes a different approach, of dropping the concept
of MTU entirely for tunnel vports. This also solves the problem described
above, without making any additional work for anyone.
I tested that, without this change, I could not send 1600-byte "pings"
between two machines whose NICs had 2000-byte MTUs that were connected to
vswitches that were in turn connected over GRE tunnels with the default
1500-byte MTU. With this change, it worked OK, regardless of the MTU of
the network traversed by the GRE tunnel.
This patch also makes "patch" ports MTU-less.
It might make sense to remove vport_set_mtu() and the associated callback
now, since ordinary network devices are the only vports that support it
now.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Suggested-by: Jesse Gross <jesse@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Bug #3728.
2011-02-01 11:32:06 -08:00
|
|
|
mtu = vport_get_mtu(vport);
|
|
|
|
if (mtu)
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT_U32(skb, OVS_VPORT_ATTR_MTU, mtu);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
err = 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
|
|
|
|
|
|
|
ifindex = vport_get_ifindex(vport);
|
|
|
|
if (ifindex > 0)
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT_U32(skb, OVS_VPORT_ATTR_IFINDEX, ifindex);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
iflink = vport_get_iflink(vport);
|
|
|
|
if (iflink > 0)
|
2011-08-18 10:35:40 -07:00
|
|
|
NLA_PUT_U32(skb, OVS_VPORT_ATTR_IFLINK, iflink);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
return genlmsg_end(skb, ovs_header);
|
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
|
|
|
}
|
|
|
|
|
2011-01-28 13:59:03 -08:00
|
|
|
/* Called with RTNL lock or RCU read lock. */
|
2011-08-18 10:35:40 -07:00
|
|
|
static struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, u32 pid,
|
2011-01-28 13:59:03 -08:00
|
|
|
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);
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
retval = ovs_vport_cmd_fill_info(vport, skb, pid, seq, 0, cmd);
|
2011-01-28 13:59:03 -08:00
|
|
|
if (retval < 0) {
|
|
|
|
kfree_skb(skb);
|
|
|
|
return ERR_PTR(retval);
|
|
|
|
}
|
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
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
static int ovs_vport_cmd_validate(struct nlattr *a[OVS_VPORT_ATTR_MAX + 1])
|
2011-01-28 13:59:03 -08:00
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
return CHECK_NUL_STRING(a[OVS_VPORT_ATTR_NAME], IFNAMSIZ - 1);
|
2011-01-26 12:28:59 -08:00
|
|
|
}
|
2010-12-29 15:04:36 -08:00
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Called with RTNL lock or RCU read lock. */
|
2011-08-18 10:35:40 -07:00
|
|
|
static struct vport *lookup_vport(struct ovs_header *ovs_header,
|
|
|
|
struct nlattr *a[OVS_VPORT_ATTR_MAX + 1])
|
2011-01-26 12:28:59 -08:00
|
|
|
{
|
|
|
|
struct datapath *dp;
|
|
|
|
struct vport *vport;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
if (a[OVS_VPORT_ATTR_NAME]) {
|
|
|
|
vport = vport_locate(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);
|
|
|
|
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
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
dp = get_dp(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
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
vport = get_vport_protected(dp, port_no);
|
2011-01-26 12:49:06 -08:00
|
|
|
if (!vport)
|
2011-01-26 12:28:59 -08:00
|
|
|
return ERR_PTR(-ENOENT);
|
|
|
|
return vport;
|
|
|
|
} else
|
|
|
|
return ERR_PTR(-EINVAL);
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
/* Called with RTNL lock. */
|
2011-08-18 10:35:40 -07:00
|
|
|
static int change_vport(struct vport *vport, struct nlattr *a[OVS_VPORT_ATTR_MAX + 1])
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-01-26 12:28:59 -08:00
|
|
|
int err = 0;
|
2011-08-18 10:35:40 -07:00
|
|
|
if (a[OVS_VPORT_ATTR_STATS])
|
|
|
|
err = vport_set_stats(vport, nla_data(a[OVS_VPORT_ATTR_STATS]));
|
|
|
|
if (!err && a[OVS_VPORT_ATTR_ADDRESS])
|
|
|
|
err = vport_set_addr(vport, nla_data(a[OVS_VPORT_ATTR_ADDRESS]));
|
|
|
|
if (!err && a[OVS_VPORT_ATTR_MTU])
|
|
|
|
err = vport_set_mtu(vport, nla_get_u32(a[OVS_VPORT_ATTR_MTU]));
|
2011-01-26 12:28:59 -08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
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-01-26 12:28:59 -08:00
|
|
|
err = -EINVAL;
|
2011-08-18 10:35:40 -07:00
|
|
|
if (!a[OVS_VPORT_ATTR_NAME] || !a[OVS_VPORT_ATTR_TYPE])
|
2011-01-28 13:59:03 -08:00
|
|
|
goto exit;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
err = ovs_vport_cmd_validate(a);
|
2011-01-28 13:59:03 -08:00
|
|
|
if (err)
|
|
|
|
goto exit;
|
2010-12-29 15:04:36 -08:00
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
rtnl_lock();
|
2011-08-18 10:35:40 -07:00
|
|
|
dp = get_dp(ovs_header->dp_ifindex);
|
2011-01-26 12:28:59 -08:00
|
|
|
err = -ENODEV;
|
|
|
|
if (!dp)
|
2011-01-26 12:49:06 -08:00
|
|
|
goto exit_unlock;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
if (a[OVS_VPORT_ATTR_PORT_NO]) {
|
|
|
|
port_no = nla_get_u32(a[OVS_VPORT_ATTR_PORT_NO]);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
err = -EFBIG;
|
|
|
|
if (port_no >= DP_MAX_PORTS)
|
2011-01-26 12:49:06 -08:00
|
|
|
goto exit_unlock;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
vport = get_vport_protected(dp, port_no);
|
|
|
|
err = -EBUSY;
|
|
|
|
if (vport)
|
2011-01-26 12:49:06 -08:00
|
|
|
goto exit_unlock;
|
2011-01-26 12:28:59 -08:00
|
|
|
} else {
|
|
|
|
for (port_no = 1; ; port_no++) {
|
|
|
|
if (port_no >= DP_MAX_PORTS) {
|
|
|
|
err = -EFBIG;
|
2011-01-26 12:49:06 -08:00
|
|
|
goto exit_unlock;
|
2011-01-26 12:28:59 -08:00
|
|
|
}
|
|
|
|
vport = get_vport_protected(dp, port_no);
|
|
|
|
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;
|
|
|
|
|
|
|
|
vport = new_vport(&parms);
|
|
|
|
err = PTR_ERR(vport);
|
|
|
|
if (IS_ERR(vport))
|
2011-01-26 12:49:06 -08:00
|
|
|
goto exit_unlock;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
set_internal_devs_mtu(dp);
|
|
|
|
dp_sysfs_add_if(vport);
|
|
|
|
|
|
|
|
err = change_vport(vport, a);
|
2011-01-28 13:59:03 -08:00
|
|
|
if (!err) {
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_vport_cmd_build_info(vport, info->snd_pid,
|
|
|
|
info->snd_seq, OVS_VPORT_CMD_NEW);
|
2011-01-28 13:59:03 -08:00
|
|
|
if (IS_ERR(reply))
|
|
|
|
err = PTR_ERR(reply);
|
|
|
|
}
|
2011-01-26 12:28:59 -08:00
|
|
|
if (err) {
|
|
|
|
dp_detach_port(vport);
|
2011-01-26 12:49:06 -08:00
|
|
|
goto exit_unlock;
|
2011-01-26 12:28:59 -08:00
|
|
|
}
|
2011-01-28 13:59:03 -08:00
|
|
|
genl_notify(reply, genl_info_net(info), info->snd_pid,
|
|
|
|
dp_vport_multicast_group.id, info->nlhdr, GFP_KERNEL);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
exit_unlock:
|
2011-01-26 12:28:59 -08:00
|
|
|
rtnl_unlock();
|
|
|
|
exit:
|
|
|
|
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
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
err = ovs_vport_cmd_validate(a);
|
2011-01-28 13:59:03 -08:00
|
|
|
if (err)
|
2011-01-26 12:28:59 -08:00
|
|
|
goto exit;
|
|
|
|
|
|
|
|
rtnl_lock();
|
2011-01-28 13:59:03 -08:00
|
|
|
vport = lookup_vport(info->userhdr, a);
|
2011-01-26 12:28:59 -08:00
|
|
|
err = PTR_ERR(vport);
|
|
|
|
if (IS_ERR(vport))
|
2011-01-28 13:59:03 -08:00
|
|
|
goto exit_unlock;
|
2010-05-13 13:21:33 -07:00
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
err = 0;
|
2011-08-18 10:35:40 -07:00
|
|
|
if (a[OVS_VPORT_ATTR_OPTIONS])
|
|
|
|
err = vport_set_options(vport, a[OVS_VPORT_ATTR_OPTIONS]);
|
2011-01-26 12:28:59 -08:00
|
|
|
if (!err)
|
|
|
|
err = change_vport(vport, a);
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_vport_cmd_build_info(vport, info->snd_pid, info->snd_seq,
|
|
|
|
OVS_VPORT_CMD_NEW);
|
2011-01-28 13:59:03 -08:00
|
|
|
if (IS_ERR(reply)) {
|
|
|
|
err = PTR_ERR(reply);
|
|
|
|
netlink_set_err(INIT_NET_GENL_SOCK, 0,
|
|
|
|
dp_vport_multicast_group.id, err);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
genl_notify(reply, genl_info_net(info), info->snd_pid,
|
|
|
|
dp_vport_multicast_group.id, info->nlhdr, GFP_KERNEL);
|
|
|
|
|
|
|
|
exit_unlock:
|
2011-01-26 12:28:59 -08:00
|
|
|
rtnl_unlock();
|
|
|
|
exit:
|
|
|
|
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
|
|
|
{
|
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;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
err = ovs_vport_cmd_validate(a);
|
2011-01-28 13:59:03 -08:00
|
|
|
if (err)
|
2011-01-26 12:28:59 -08:00
|
|
|
goto exit;
|
|
|
|
|
|
|
|
rtnl_lock();
|
2011-01-28 13:59:03 -08:00
|
|
|
vport = lookup_vport(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))
|
|
|
|
goto exit_unlock;
|
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;
|
|
|
|
goto exit_unlock;
|
|
|
|
}
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_vport_cmd_build_info(vport, info->snd_pid, info->snd_seq,
|
|
|
|
OVS_VPORT_CMD_DEL);
|
2011-01-28 13:59:03 -08:00
|
|
|
err = PTR_ERR(reply);
|
|
|
|
if (IS_ERR(reply))
|
|
|
|
goto exit_unlock;
|
|
|
|
|
|
|
|
err = dp_detach_port(vport);
|
|
|
|
|
|
|
|
genl_notify(reply, genl_info_net(info), info->snd_pid,
|
|
|
|
dp_vport_multicast_group.id, info->nlhdr, GFP_KERNEL);
|
|
|
|
|
|
|
|
exit_unlock:
|
2011-01-26 12:28:59 -08:00
|
|
|
rtnl_unlock();
|
|
|
|
exit:
|
|
|
|
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;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
err = ovs_vport_cmd_validate(a);
|
2011-01-28 13:59:03 -08:00
|
|
|
if (err)
|
|
|
|
goto exit;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-01-26 12:49:06 -08:00
|
|
|
rcu_read_lock();
|
2011-08-18 10:35:40 -07:00
|
|
|
vport = lookup_vport(ovs_header, a);
|
2011-01-26 12:28:59 -08:00
|
|
|
err = PTR_ERR(vport);
|
|
|
|
if (IS_ERR(vport))
|
2011-01-28 13:59:03 -08:00
|
|
|
goto exit_unlock;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
reply = ovs_vport_cmd_build_info(vport, info->snd_pid, info->snd_seq,
|
|
|
|
OVS_VPORT_CMD_NEW);
|
2011-01-26 12:49:06 -08:00
|
|
|
err = PTR_ERR(reply);
|
|
|
|
if (IS_ERR(reply))
|
2011-01-28 13:59:03 -08:00
|
|
|
goto exit_unlock;
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2011-05-27 15:57:28 -07:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return genlmsg_reply(reply, info);
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2011-01-28 13:59:03 -08:00
|
|
|
exit_unlock:
|
2011-01-26 12:49:06 -08:00
|
|
|
rcu_read_unlock();
|
2011-01-28 13:59:03 -08:00
|
|
|
exit:
|
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;
|
|
|
|
u32 port_no;
|
2011-01-28 13:59:03 -08:00
|
|
|
int retval;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
dp = get_dp(ovs_header->dp_ifindex);
|
2011-01-26 12:28:59 -08:00
|
|
|
if (!dp)
|
2011-01-28 13:59:03 -08:00
|
|
|
return -ENODEV;
|
2011-01-26 12:49:06 -08:00
|
|
|
|
|
|
|
rcu_read_lock();
|
2011-01-28 13:59:03 -08:00
|
|
|
for (port_no = cb->args[0]; port_no < DP_MAX_PORTS; port_no++) {
|
2011-01-26 12:49:06 -08:00
|
|
|
struct vport *vport;
|
|
|
|
|
|
|
|
vport = get_vport_protected(dp, port_no);
|
|
|
|
if (!vport)
|
|
|
|
continue;
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
if (ovs_vport_cmd_fill_info(vport, skb, NETLINK_CB(cb->skb).pid,
|
2011-01-28 13:59:03 -08:00
|
|
|
cb->nlh->nlmsg_seq, NLM_F_MULTI,
|
2011-08-18 10:35:40 -07:00
|
|
|
OVS_VPORT_CMD_NEW) < 0)
|
2011-01-28 13:59:03 -08:00
|
|
|
break;
|
2011-01-26 12:28:59 -08:00
|
|
|
}
|
2011-01-26 12:49:06 -08:00
|
|
|
rcu_read_unlock();
|
2011-01-26 12:28:59 -08:00
|
|
|
|
2011-01-28 13:59:03 -08:00
|
|
|
cb->args[0] = port_no;
|
|
|
|
retval = skb->len;
|
|
|
|
|
|
|
|
return retval;
|
2009-10-12 10:34:10 -07:00
|
|
|
}
|
|
|
|
|
2011-01-28 13:59:03 -08:00
|
|
|
static struct genl_ops dp_vport_genl_ops[] = {
|
2011-08-18 10:35:40 -07:00
|
|
|
{ .cmd = OVS_VPORT_CMD_NEW,
|
2011-01-28 13:59:03 -08:00
|
|
|
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
|
|
|
.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,
|
2011-01-28 13:59:03 -08:00
|
|
|
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
|
|
|
.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,
|
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,
|
2011-01-28 13:59:03 -08:00
|
|
|
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
|
|
|
|
.policy = vport_policy,
|
2011-08-18 10:35:40 -07:00
|
|
|
.doit = ovs_vport_cmd_set,
|
2011-01-28 13:59:03 -08:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
struct genl_family_and_ops {
|
|
|
|
struct genl_family *family;
|
|
|
|
struct genl_ops *ops;
|
|
|
|
int n_ops;
|
|
|
|
struct genl_multicast_group *group;
|
|
|
|
};
|
2011-01-26 12:49:06 -08:00
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
static const struct genl_family_and_ops dp_genl_families[] = {
|
2011-01-28 13:55:04 -08:00
|
|
|
{ &dp_datapath_genl_family,
|
|
|
|
dp_datapath_genl_ops, ARRAY_SIZE(dp_datapath_genl_ops),
|
|
|
|
&dp_datapath_multicast_group },
|
2011-01-28 13:59:03 -08:00
|
|
|
{ &dp_vport_genl_family,
|
|
|
|
dp_vport_genl_ops, ARRAY_SIZE(dp_vport_genl_ops),
|
|
|
|
&dp_vport_multicast_group },
|
2011-01-28 14:00:51 -08:00
|
|
|
{ &dp_flow_genl_family,
|
|
|
|
dp_flow_genl_ops, ARRAY_SIZE(dp_flow_genl_ops),
|
|
|
|
&dp_flow_multicast_group },
|
2011-01-26 13:41:54 -08:00
|
|
|
{ &dp_packet_genl_family,
|
|
|
|
dp_packet_genl_ops, ARRAY_SIZE(dp_packet_genl_ops),
|
|
|
|
NULL },
|
|
|
|
};
|
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++)
|
2011-01-26 13:41:54 -08:00
|
|
|
genl_unregister_family(dp_genl_families[i].family);
|
2011-01-26 12:49:06 -08:00
|
|
|
}
|
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
static int dp_register_genl(void)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-01-26 13:41:54 -08:00
|
|
|
int n_registered;
|
|
|
|
int err;
|
|
|
|
int i;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
n_registered = 0;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(dp_genl_families); i++) {
|
|
|
|
const struct genl_family_and_ops *f = &dp_genl_families[i];
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
err = genl_register_family_with_ops(f->family, f->ops,
|
|
|
|
f->n_ops);
|
|
|
|
if (err)
|
|
|
|
goto error;
|
|
|
|
n_registered++;
|
2010-12-08 13:19:05 -08:00
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
if (f->group) {
|
|
|
|
err = genl_register_mc_group(f->family, f->group);
|
|
|
|
if (err)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
2010-06-17 15:20:16 -07:00
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
err = packet_register_mc_groups();
|
|
|
|
if (err)
|
|
|
|
goto error;
|
|
|
|
return 0;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
error:
|
2011-01-26 13:41:54 -08:00
|
|
|
dp_unregister_genl(n_registered);
|
|
|
|
return err;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2009-09-11 15:49:37 -07:00
|
|
|
static int __init dp_init(void)
|
|
|
|
{
|
2010-04-12 15:53:39 -04:00
|
|
|
struct sk_buff *dummy_skb;
|
2009-09-11 15:49:37 -07:00
|
|
|
int err;
|
|
|
|
|
2010-04-12 15:53:39 -04:00
|
|
|
BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > sizeof(dummy_skb->cb));
|
2009-09-11 15:49:37 -07:00
|
|
|
|
2010-04-12 15:53:39 -04:00
|
|
|
printk("Open vSwitch %s, built "__DATE__" "__TIME__"\n", VERSION BUILDNR);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
err = flow_init();
|
|
|
|
if (err)
|
|
|
|
goto error;
|
|
|
|
|
2010-04-12 15:53:39 -04:00
|
|
|
err = vport_init();
|
2009-07-08 13:19:16 -07:00
|
|
|
if (err)
|
|
|
|
goto error_flow_exit;
|
|
|
|
|
2010-04-12 15:53:39 -04:00
|
|
|
err = register_netdevice_notifier(&dp_device_notifier);
|
|
|
|
if (err)
|
|
|
|
goto error_vport_exit;
|
|
|
|
|
2011-01-26 13:41:54 -08:00
|
|
|
err = dp_register_genl();
|
|
|
|
if (err < 0)
|
2011-01-28 14:00:51 -08:00
|
|
|
goto error_unreg_notifier;
|
2011-01-26 13:41:54 -08:00
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
error_unreg_notifier:
|
|
|
|
unregister_netdevice_notifier(&dp_device_notifier);
|
2010-04-12 15:53:39 -04:00
|
|
|
error_vport_exit:
|
|
|
|
vport_exit();
|
2009-07-08 13:19:16 -07:00
|
|
|
error_flow_exit:
|
|
|
|
flow_exit();
|
|
|
|
error:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void dp_cleanup(void)
|
|
|
|
{
|
|
|
|
rcu_barrier();
|
2011-01-26 13:41:54 -08:00
|
|
|
dp_unregister_genl(ARRAY_SIZE(dp_genl_families));
|
2009-07-08 13:19:16 -07:00
|
|
|
unregister_netdevice_notifier(&dp_device_notifier);
|
2010-04-12 15:53:39 -04:00
|
|
|
vport_exit();
|
2009-07-08 13:19:16 -07:00
|
|
|
flow_exit();
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(dp_init);
|
|
|
|
module_exit(dp_cleanup);
|
|
|
|
|
|
|
|
MODULE_DESCRIPTION("Open vSwitch switching datapath");
|
|
|
|
MODULE_LICENSE("GPL");
|