X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_sysfs_dp.c;h=3ecacd779a869489007260518b0dc525eac034e7;hb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;hp=3cd6d1af0f70594c64624221217f3ea0058e5c1b;hpb=e8b52a913a8fc3d2ef0dae82eda5905668ebfae1;p=sliver-openvswitch.git diff --git a/datapath/dp_sysfs_dp.c b/datapath/dp_sysfs_dp.c index 3cd6d1af0..3ecacd779 100644 --- a/datapath/dp_sysfs_dp.c +++ b/datapath/dp_sysfs_dp.c @@ -1,11 +1,23 @@ /* - * Copyright (c) 2009 Nicira Networks. - * Distributed under the terms of the GNU GPL version 2. + * Copyright (c) 2007-2012 Nicira, Inc. * - * Significant portions of this file may be copied from parts of the Linux - * kernel, by Linus Torvalds and others. + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include /* @@ -20,30 +32,32 @@ #include #include #include -#include -#include #include #include "dp_sysfs.h" #include "datapath.h" -#include "dp_dev.h" +#include "vport-internal_dev.h" #ifdef CONFIG_SYSFS -#define to_dev(obj) container_of(obj, struct device, kobj) /* Hack to attempt to build on more platforms. */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21) -#define DP_DEVICE_ATTR CLASS_DEVICE_ATTR +#define INTERNAL_DEVICE_ATTR CLASS_DEVICE_ATTR #define DEVICE_PARAMS struct class_device *d #define DEVICE_ARGS d #define DEV_ATTR(NAME) class_device_attr_##NAME #else -#define DP_DEVICE_ATTR DEVICE_ATTR +#define INTERNAL_DEVICE_ATTR DEVICE_ATTR #define DEVICE_PARAMS struct device *d, struct device_attribute *attr #define DEVICE_ARGS d, attr #define DEV_ATTR(NAME) dev_attr_##NAME #endif +static struct datapath *sysfs_get_dp(struct net_device *netdev) +{ + struct vport *vport = ovs_internal_dev_get_vport(netdev); + return vport ? vport->dp : NULL; +} /* * Common code for storing bridge parameters. */ @@ -51,9 +65,9 @@ static ssize_t store_bridge_parm(DEVICE_PARAMS, const char *buf, size_t len, void (*set)(struct datapath *, unsigned long)) { - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); char *endp; unsigned long val; + ssize_t result = len; if (!capable(CAP_NET_ADMIN)) return -EPERM; @@ -62,44 +76,37 @@ static ssize_t store_bridge_parm(DEVICE_PARAMS, if (endp == buf) return -EINVAL; -#if 0 - spin_lock_bh(&br->lock); - (*set)(br, val); - spin_unlock_bh(&br->lock); -#else /* xxx We use a default value of 0 for all fields. If the caller is * xxx attempting to set the value to our default, just silently - * xxx ignore the request. + * xxx ignore the request. */ if (val != 0) { - printk("%s: xxx writing dp parms not supported yet!\n", - dp_name(dp)); + struct datapath *dp; + + rcu_read_lock(); + + dp = sysfs_get_dp(to_net_dev(d)); + if (dp) + pr_warning("%s: xxx writing dp parms not supported yet!\n", + ovs_dp_name(dp)); + else + result = -ENODEV; + + rcu_read_unlock(); } -#endif - return len; + + return result; } static ssize_t show_forward_delay(DEVICE_PARAMS, char *buf) { -#if 0 - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->forward_delay)); -#else return sprintf(buf, "%d\n", 0); -#endif } static void set_forward_delay(struct datapath *dp, unsigned long val) { -#if 0 - unsigned long delay = clock_t_to_jiffies(val); - br->forward_delay = delay; - if (br_is_root_bridge(br)) - br->bridge_forward_delay = delay; -#else - printk("%s: xxx attempt to set_forward_delay()\n", dp_name(dp)); -#endif + pr_info("%s: xxx attempt to set_forward_delay()\n", ovs_dp_name(dp)); } static ssize_t store_forward_delay(DEVICE_PARAMS, @@ -107,29 +114,17 @@ static ssize_t store_forward_delay(DEVICE_PARAMS, { return store_bridge_parm(DEVICE_ARGS, buf, len, set_forward_delay); } -static DP_DEVICE_ATTR(forward_delay, S_IRUGO | S_IWUSR, +static INTERNAL_DEVICE_ATTR(forward_delay, S_IRUGO | S_IWUSR, show_forward_delay, store_forward_delay); static ssize_t show_hello_time(DEVICE_PARAMS, char *buf) { -#if 0 - return sprintf(buf, "%lu\n", - jiffies_to_clock_t(to_bridge(d)->hello_time)); -#else return sprintf(buf, "%d\n", 0); -#endif } static void set_hello_time(struct datapath *dp, unsigned long val) { -#if 0 - unsigned long t = clock_t_to_jiffies(val); - br->hello_time = t; - if (br_is_root_bridge(br)) - br->bridge_hello_time = t; -#else - printk("%s: xxx attempt to set_hello_time()\n", dp_name(dp)); -#endif + pr_info("%s: xxx attempt to set_hello_time()\n", ovs_dp_name(dp)); } static ssize_t store_hello_time(DEVICE_PARAMS, @@ -138,29 +133,17 @@ static ssize_t store_hello_time(DEVICE_PARAMS, { return store_bridge_parm(DEVICE_ARGS, buf, len, set_hello_time); } -static DP_DEVICE_ATTR(hello_time, S_IRUGO | S_IWUSR, show_hello_time, +static INTERNAL_DEVICE_ATTR(hello_time, S_IRUGO | S_IWUSR, show_hello_time, store_hello_time); static ssize_t show_max_age(DEVICE_PARAMS, char *buf) { -#if 0 - return sprintf(buf, "%lu\n", - jiffies_to_clock_t(to_bridge(d)->max_age)); -#else return sprintf(buf, "%d\n", 0); -#endif } static void set_max_age(struct datapath *dp, unsigned long val) { -#if 0 - unsigned long t = clock_t_to_jiffies(val); - br->max_age = t; - if (br_is_root_bridge(br)) - br->bridge_max_age = t; -#else - printk("%s: xxx attempt to set_max_age()\n", dp_name(dp)); -#endif + pr_info("%s: xxx attempt to set_max_age()\n", ovs_dp_name(dp)); } static ssize_t store_max_age(DEVICE_PARAMS, @@ -168,25 +151,16 @@ static ssize_t store_max_age(DEVICE_PARAMS, { return store_bridge_parm(DEVICE_ARGS, buf, len, set_max_age); } -static DP_DEVICE_ATTR(max_age, S_IRUGO | S_IWUSR, show_max_age, store_max_age); +static INTERNAL_DEVICE_ATTR(max_age, S_IRUGO | S_IWUSR, show_max_age, store_max_age); static ssize_t show_ageing_time(DEVICE_PARAMS, char *buf) { -#if 0 - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->ageing_time)); -#else return sprintf(buf, "%d\n", 0); -#endif } static void set_ageing_time(struct datapath *dp, unsigned long val) { -#if 0 - br->ageing_time = clock_t_to_jiffies(val); -#else - printk("%s: xxx attempt to set_ageing_time()\n", dp_name(dp)); -#endif + pr_info("%s: xxx attempt to set_ageing_time()\n", ovs_dp_name(dp)); } static ssize_t store_ageing_time(DEVICE_PARAMS, @@ -194,17 +168,12 @@ static ssize_t store_ageing_time(DEVICE_PARAMS, { return store_bridge_parm(DEVICE_ARGS, buf, len, set_ageing_time); } -static DP_DEVICE_ATTR(ageing_time, S_IRUGO | S_IWUSR, show_ageing_time, +static INTERNAL_DEVICE_ATTR(ageing_time, S_IRUGO | S_IWUSR, show_ageing_time, store_ageing_time); static ssize_t show_stp_state(DEVICE_PARAMS, char *buf) { -#if 0 - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - return sprintf(buf, "%d\n", br->stp_enabled); -#else return sprintf(buf, "%d\n", 0); -#endif } @@ -212,48 +181,32 @@ static ssize_t store_stp_state(DEVICE_PARAMS, const char *buf, size_t len) { - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); -#if 0 - char *endp; - unsigned long val; + struct datapath *dp; + ssize_t result = len; - if (!capable(CAP_NET_ADMIN)) - return -EPERM; + rcu_read_lock(); - val = simple_strtoul(buf, &endp, 0); - if (endp == buf) - return -EINVAL; + dp = sysfs_get_dp(to_net_dev(d)); + if (dp) + pr_info("%s: xxx attempt to set_stp_state()\n", ovs_dp_name(dp)); + else + result = -ENODEV; - rtnl_lock(); - br_stp_set_enabled(br, val); - rtnl_unlock(); -#else - printk("%s: xxx attempt to set_stp_state()\n", dp_name(dp)); -#endif + rcu_read_unlock(); - return len; + return result; } -static DP_DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state, +static INTERNAL_DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state, store_stp_state); static ssize_t show_priority(DEVICE_PARAMS, char *buf) { -#if 0 - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - return sprintf(buf, "%d\n", - (br->bridge_id.prio[0] << 8) | br->bridge_id.prio[1]); -#else return sprintf(buf, "%d\n", 0); -#endif } static void set_priority(struct datapath *dp, unsigned long val) { -#if 0 - br_stp_set_bridge_priority(br, (u16) val); -#else - printk("%s: xxx attempt to set_priority()\n", dp_name(dp)); -#endif + pr_info("%s: xxx attempt to set_priority()\n", ovs_dp_name(dp)); } static ssize_t store_priority(DEVICE_PARAMS, @@ -261,169 +214,114 @@ static ssize_t store_priority(DEVICE_PARAMS, { return store_bridge_parm(DEVICE_ARGS, buf, len, set_priority); } -static DP_DEVICE_ATTR(priority, S_IRUGO | S_IWUSR, show_priority, store_priority); +static INTERNAL_DEVICE_ATTR(priority, S_IRUGO | S_IWUSR, show_priority, store_priority); static ssize_t show_root_id(DEVICE_PARAMS, char *buf) { -#if 0 - return br_show_bridge_id(buf, &to_bridge(d)->designated_root); -#else return sprintf(buf, "0000.010203040506\n"); -#endif } -static DP_DEVICE_ATTR(root_id, S_IRUGO, show_root_id, NULL); +static INTERNAL_DEVICE_ATTR(root_id, S_IRUGO, show_root_id, NULL); static ssize_t show_bridge_id(DEVICE_PARAMS, char *buf) { - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - const unsigned char *addr = dp->ports[ODPP_LOCAL]->dev->dev_addr; + struct vport *vport; + ssize_t result; - /* xxx Do we need a lock of some sort? */ - return sprintf(buf, "%.2x%.2x.%.2x%.2x%.2x%.2x%.2x%.2x\n", - 0, 0, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); + rcu_read_lock(); + + vport = ovs_internal_dev_get_vport(to_net_dev(d)); + if (vport) { + const unsigned char *addr; + + addr = vport->ops->get_addr(vport); + result = sprintf(buf, "%.2x%.2x.%.2x%.2x%.2x%.2x%.2x%.2x\n", + 0, 0, addr[0], addr[1], addr[2], addr[3], + addr[4], addr[5]); + } else + result = -ENODEV; + + rcu_read_unlock(); + + return result; } -static DP_DEVICE_ATTR(bridge_id, S_IRUGO, show_bridge_id, NULL); +static INTERNAL_DEVICE_ATTR(bridge_id, S_IRUGO, show_bridge_id, NULL); static ssize_t show_root_port(DEVICE_PARAMS, char *buf) { -#if 0 - return sprintf(buf, "%d\n", to_bridge(d)->root_port); -#else return sprintf(buf, "%d\n", 0); -#endif } -static DP_DEVICE_ATTR(root_port, S_IRUGO, show_root_port, NULL); +static INTERNAL_DEVICE_ATTR(root_port, S_IRUGO, show_root_port, NULL); static ssize_t show_root_path_cost(DEVICE_PARAMS, char *buf) { -#if 0 - return sprintf(buf, "%d\n", to_bridge(d)->root_path_cost); -#else return sprintf(buf, "%d\n", 0); -#endif } -static DP_DEVICE_ATTR(root_path_cost, S_IRUGO, show_root_path_cost, NULL); +static INTERNAL_DEVICE_ATTR(root_path_cost, S_IRUGO, show_root_path_cost, NULL); static ssize_t show_topology_change(DEVICE_PARAMS, char *buf) { -#if 0 - return sprintf(buf, "%d\n", to_bridge(d)->topology_change); -#else return sprintf(buf, "%d\n", 0); -#endif } -static DP_DEVICE_ATTR(topology_change, S_IRUGO, show_topology_change, NULL); +static INTERNAL_DEVICE_ATTR(topology_change, S_IRUGO, show_topology_change, NULL); static ssize_t show_topology_change_detected(DEVICE_PARAMS, char *buf) { -#if 0 - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - return sprintf(buf, "%d\n", br->topology_change_detected); -#else return sprintf(buf, "%d\n", 0); -#endif } -static DP_DEVICE_ATTR(topology_change_detected, S_IRUGO, +static INTERNAL_DEVICE_ATTR(topology_change_detected, S_IRUGO, show_topology_change_detected, NULL); static ssize_t show_hello_timer(DEVICE_PARAMS, char *buf) { -#if 0 - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - return sprintf(buf, "%ld\n", br_timer_value(&br->hello_timer)); -#else return sprintf(buf, "%d\n", 0); -#endif } -static DP_DEVICE_ATTR(hello_timer, S_IRUGO, show_hello_timer, NULL); +static INTERNAL_DEVICE_ATTR(hello_timer, S_IRUGO, show_hello_timer, NULL); static ssize_t show_tcn_timer(DEVICE_PARAMS, char *buf) { -#if 0 - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - return sprintf(buf, "%ld\n", br_timer_value(&br->tcn_timer)); -#else return sprintf(buf, "%d\n", 0); -#endif } -static DP_DEVICE_ATTR(tcn_timer, S_IRUGO, show_tcn_timer, NULL); +static INTERNAL_DEVICE_ATTR(tcn_timer, S_IRUGO, show_tcn_timer, NULL); static ssize_t show_topology_change_timer(DEVICE_PARAMS, char *buf) { -#if 0 - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - return sprintf(buf, "%ld\n", br_timer_value(&br->topology_change_timer)); -#else return sprintf(buf, "%d\n", 0); -#endif } -static DP_DEVICE_ATTR(topology_change_timer, S_IRUGO, show_topology_change_timer, +static INTERNAL_DEVICE_ATTR(topology_change_timer, S_IRUGO, show_topology_change_timer, NULL); static ssize_t show_gc_timer(DEVICE_PARAMS, char *buf) { -#if 0 - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - return sprintf(buf, "%ld\n", br_timer_value(&br->gc_timer)); -#else return sprintf(buf, "%d\n", 0); -#endif } -static DP_DEVICE_ATTR(gc_timer, S_IRUGO, show_gc_timer, NULL); +static INTERNAL_DEVICE_ATTR(gc_timer, S_IRUGO, show_gc_timer, NULL); static ssize_t show_group_addr(DEVICE_PARAMS, char *buf) { -#if 0 - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - return sprintf(buf, "%x:%x:%x:%x:%x:%x\n", - br->group_addr[0], br->group_addr[1], - br->group_addr[2], br->group_addr[3], - br->group_addr[4], br->group_addr[5]); -#else return sprintf(buf, "00:01:02:03:04:05\n"); -#endif } static ssize_t store_group_addr(DEVICE_PARAMS, const char *buf, size_t len) { - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); -#if 0 - unsigned new_addr[6]; - int i; + struct datapath *dp; + ssize_t result = len; - if (!capable(CAP_NET_ADMIN)) - return -EPERM; + rcu_read_lock(); - if (sscanf(buf, "%x:%x:%x:%x:%x:%x", - &new_addr[0], &new_addr[1], &new_addr[2], - &new_addr[3], &new_addr[4], &new_addr[5]) != 6) - return -EINVAL; + dp = sysfs_get_dp(to_net_dev(d)); + if (dp) + pr_info("%s: xxx attempt to store_group_addr()\n", + ovs_dp_name(dp)); + else + result = -ENODEV; - /* Must be 01:80:c2:00:00:0X */ - for (i = 0; i < 5; i++) - if (new_addr[i] != br_group_address[i]) - return -EINVAL; + rcu_read_unlock(); - if (new_addr[5] & ~0xf) - return -EINVAL; - - if (new_addr[5] == 1 /* 802.3x Pause address */ - || new_addr[5] == 2 /* 802.3ad Slow protocols */ - || new_addr[5] == 3) /* 802.1X PAE address */ - return -EINVAL; - - spin_lock_bh(&br->lock); - for (i = 0; i < 6; i++) - br->group_addr[i] = new_addr[i]; - spin_unlock_bh(&br->lock); -#else - printk("%s: xxx attempt to store_group_addr()\n", dp_name(dp)); -#endif - return len; + return result; } -static DP_DEVICE_ATTR(group_addr, S_IRUGO | S_IWUSR, +static INTERNAL_DEVICE_ATTR(group_addr, S_IRUGO | S_IWUSR, show_group_addr, store_group_addr); static struct attribute *bridge_attrs[] = { @@ -462,16 +360,23 @@ static struct attribute_group bridge_group = { * to hold links. The ifobj exists in the same data structure * as its parent the bridge so reference counting works. */ -int dp_sysfs_add_dp(struct datapath *dp) +int ovs_dp_sysfs_add_dp(struct datapath *dp) { - struct kobject *kobj = &dp->ports[ODPP_LOCAL]->dev->NETDEV_DEV_MEMBER.kobj; + struct vport *vport = ovs_vport_rtnl(dp, OVSP_LOCAL); + struct kobject *kobj = vport->ops->get_kobj(vport); int err; +#ifdef CONFIG_NET_NS + /* Due to bug in 2.6.32 kernel, sysfs_create_group() could panic + * in other namespace than init_net. Following check is to avoid it. */ + if (!kobj->sd) + return -ENOENT; +#endif /* Create /sys/class/net//bridge directory. */ err = sysfs_create_group(kobj, &bridge_group); if (err) { pr_info("%s: can't create group %s/%s\n", - __func__, dp_name(dp), bridge_group.name); + __func__, ovs_dp_name(dp), bridge_group.name); goto out1; } @@ -479,7 +384,7 @@ int dp_sysfs_add_dp(struct datapath *dp) err = kobject_add(&dp->ifobj, kobj, SYSFS_BRIDGE_PORT_SUBDIR); if (err) { pr_info("%s: can't add kobject (directory) %s/%s\n", - __FUNCTION__, dp_name(dp), kobject_name(&dp->ifobj)); + __func__, ovs_dp_name(dp), kobject_name(&dp->ifobj)); goto out2; } kobject_uevent(&dp->ifobj, KOBJ_ADD); @@ -491,9 +396,15 @@ int dp_sysfs_add_dp(struct datapath *dp) return err; } -int dp_sysfs_del_dp(struct datapath *dp) +int ovs_dp_sysfs_del_dp(struct datapath *dp) { - struct kobject *kobj = &dp->ports[ODPP_LOCAL]->dev->NETDEV_DEV_MEMBER.kobj; + struct vport *vport = ovs_vport_rtnl(dp, OVSP_LOCAL); + struct kobject *kobj = vport->ops->get_kobj(vport); + +#ifdef CONFIG_NET_NS + if (!kobj->sd) + return 0; +#endif kobject_del(&dp->ifobj); sysfs_remove_group(kobj, &bridge_group); @@ -501,8 +412,8 @@ int dp_sysfs_del_dp(struct datapath *dp) return 0; } #else /* !CONFIG_SYSFS */ -int dp_sysfs_add_dp(struct datapath *dp) { return 0; } -int dp_sysfs_del_dp(struct datapath *dp) { return 0; } -int dp_sysfs_add_if(struct net_bridge_port *p) { return 0; } -int dp_sysfs_del_if(struct net_bridge_port *p) { return 0; } +int ovs_dp_sysfs_add_dp(struct datapath *dp) { return 0; } +int ovs_dp_sysfs_del_dp(struct datapath *dp) { return 0; } +int dp_sysfs_add_if(struct vport *p) { return 0; } +int dp_sysfs_del_if(struct vport *p) { return 0; } #endif /* !CONFIG_SYSFS */