X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_sysfs_if.c;h=219a260683902c16265e255b8b5eab41380a8cd2;hb=a8643e447601201aabd1159966bd716e48378f97;hp=95c26dc420bf8b325662d8b1b572530effddd497;hpb=4d678233e981fa319a338f6b0949e9dc625941a4;p=sliver-openvswitch.git diff --git a/datapath/dp_sysfs_if.c b/datapath/dp_sysfs_if.c index 95c26dc42..219a26068 100644 --- a/datapath/dp_sysfs_if.c +++ b/datapath/dp_sysfs_if.c @@ -1,198 +1,152 @@ /* - * 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. - */ - -/* - * Sysfs attributes of bridge ports for Open vSwitch + * 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. * - * This has been shamelessly copied from the kernel sources. + * 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 #include #include #include #include -#include -#include "dp_sysfs.h" + #include "datapath.h" +#include "dp_sysfs.h" +#include "vport.h" #ifdef CONFIG_SYSFS struct brport_attribute { struct attribute attr; - ssize_t (*show)(struct net_bridge_port *, char *); - ssize_t (*store)(struct net_bridge_port *, unsigned long); + ssize_t (*show)(struct vport *, char *); + ssize_t (*store)(struct vport *, unsigned long); }; -#define BRPORT_ATTR(_name,_mode,_show,_store) \ -struct brport_attribute brport_attr_##_name = { \ - .attr = {.name = __stringify(_name), \ - .mode = _mode, \ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +#define BRPORT_ATTR(_name, _mode, _show, _store) \ +struct brport_attribute brport_attr_##_name = { \ + .attr = {.name = __stringify(_name), \ + .mode = _mode }, \ + .show = _show, \ + .store = _store, \ +}; +#else +#define BRPORT_ATTR(_name, _mode, _show, _store) \ +struct brport_attribute brport_attr_##_name = { \ + .attr = {.name = __stringify(_name), \ + .mode = _mode, \ .owner = THIS_MODULE, }, \ .show = _show, \ .store = _store, \ }; +#endif -static ssize_t show_path_cost(struct net_bridge_port *p, char *buf) +static ssize_t show_path_cost(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "%d\n", p->path_cost); -#else return sprintf(buf, "%d\n", 0); -#endif } -static ssize_t store_path_cost(struct net_bridge_port *p, unsigned long v) +static ssize_t store_path_cost(struct vport *p, unsigned long v) { -#if 0 - br_stp_set_path_cost(p, v); -#endif return 0; } static BRPORT_ATTR(path_cost, S_IRUGO | S_IWUSR, show_path_cost, store_path_cost); -static ssize_t show_priority(struct net_bridge_port *p, char *buf) +static ssize_t show_priority(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "%d\n", p->priority); -#else return sprintf(buf, "%d\n", 0); -#endif } -static ssize_t store_priority(struct net_bridge_port *p, unsigned long v) +static ssize_t store_priority(struct vport *p, unsigned long v) { -#if 0 - if (v >= (1<<(16-BR_PORT_BITS))) - return -ERANGE; - br_stp_set_port_priority(p, v); -#endif return 0; } static BRPORT_ATTR(priority, S_IRUGO | S_IWUSR, show_priority, store_priority); -static ssize_t show_designated_root(struct net_bridge_port *p, char *buf) +static ssize_t show_designated_root(struct vport *p, char *buf) { -#if 0 - return br_show_bridge_id(buf, &p->designated_root); -#else return sprintf(buf, "0000.010203040506\n"); -#endif } static BRPORT_ATTR(designated_root, S_IRUGO, show_designated_root, NULL); -static ssize_t show_designated_bridge(struct net_bridge_port *p, char *buf) +static ssize_t show_designated_bridge(struct vport *p, char *buf) { -#if 0 - return br_show_bridge_id(buf, &p->designated_bridge); -#else return sprintf(buf, "0000.060504030201\n"); -#endif } static BRPORT_ATTR(designated_bridge, S_IRUGO, show_designated_bridge, NULL); -static ssize_t show_designated_port(struct net_bridge_port *p, char *buf) +static ssize_t show_designated_port(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "%d\n", p->designated_port); -#else return sprintf(buf, "%d\n", 0); -#endif } static BRPORT_ATTR(designated_port, S_IRUGO, show_designated_port, NULL); -static ssize_t show_designated_cost(struct net_bridge_port *p, char *buf) +static ssize_t show_designated_cost(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "%d\n", p->designated_cost); -#else return sprintf(buf, "%d\n", 0); -#endif } static BRPORT_ATTR(designated_cost, S_IRUGO, show_designated_cost, NULL); -static ssize_t show_port_id(struct net_bridge_port *p, char *buf) +static ssize_t show_port_id(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "0x%x\n", p->port_id); -#else return sprintf(buf, "0x%x\n", 0); -#endif } static BRPORT_ATTR(port_id, S_IRUGO, show_port_id, NULL); -static ssize_t show_port_no(struct net_bridge_port *p, char *buf) +static ssize_t show_port_no(struct vport *p, char *buf) { return sprintf(buf, "0x%x\n", p->port_no); } static BRPORT_ATTR(port_no, S_IRUGO, show_port_no, NULL); -static ssize_t show_change_ack(struct net_bridge_port *p, char *buf) +static ssize_t show_change_ack(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "%d\n", p->topology_change_ack); -#else return sprintf(buf, "%d\n", 0); -#endif } static BRPORT_ATTR(change_ack, S_IRUGO, show_change_ack, NULL); -static ssize_t show_config_pending(struct net_bridge_port *p, char *buf) +static ssize_t show_config_pending(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "%d\n", p->config_pending); -#else return sprintf(buf, "%d\n", 0); -#endif } static BRPORT_ATTR(config_pending, S_IRUGO, show_config_pending, NULL); -static ssize_t show_port_state(struct net_bridge_port *p, char *buf) +static ssize_t show_port_state(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "%d\n", p->state); -#else return sprintf(buf, "%d\n", 0); -#endif } static BRPORT_ATTR(state, S_IRUGO, show_port_state, NULL); -static ssize_t show_message_age_timer(struct net_bridge_port *p, - char *buf) +static ssize_t show_message_age_timer(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "%ld\n", br_timer_value(&p->message_age_timer)); -#else return sprintf(buf, "%d\n", 0); -#endif } static BRPORT_ATTR(message_age_timer, S_IRUGO, show_message_age_timer, NULL); -static ssize_t show_forward_delay_timer(struct net_bridge_port *p, - char *buf) +static ssize_t show_forward_delay_timer(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "%ld\n", br_timer_value(&p->forward_delay_timer)); -#else return sprintf(buf, "%d\n", 0); -#endif } static BRPORT_ATTR(forward_delay_timer, S_IRUGO, show_forward_delay_timer, NULL); -static ssize_t show_hold_timer(struct net_bridge_port *p, - char *buf) +static ssize_t show_hold_timer(struct vport *p, char *buf) { -#if 0 - return sprintf(buf, "%ld\n", br_timer_value(&p->hold_timer)); -#else return sprintf(buf, "%d\n", 0); -#endif } static BRPORT_ATTR(hold_timer, S_IRUGO, show_hold_timer, NULL); @@ -214,54 +168,35 @@ static struct brport_attribute *brport_attrs[] = { NULL }; -#define to_brport_attr(_at) container_of(_at, struct brport_attribute, attr) -#define to_brport(obj) container_of(obj, struct net_bridge_port, kobj) +#define to_vport_attr(_at) container_of(_at, struct brport_attribute, attr) +#define to_vport(obj) container_of(obj, struct vport, kobj) -static ssize_t brport_show(struct kobject * kobj, - struct attribute * attr, char * buf) +static ssize_t brport_show(struct kobject *kobj, + struct attribute *attr, char *buf) { - struct brport_attribute * brport_attr = to_brport_attr(attr); - struct net_bridge_port * p = to_brport(kobj); + struct brport_attribute *brport_attr = to_vport_attr(attr); + struct vport *p = to_vport(kobj); return brport_attr->show(p, buf); } -static ssize_t brport_store(struct kobject * kobj, - struct attribute * attr, - const char * buf, size_t count) +static ssize_t brport_store(struct kobject *kobj, + struct attribute *attr, + const char *buf, size_t count) { - struct net_bridge_port * p = to_brport(kobj); -#if 0 - struct brport_attribute * brport_attr = to_brport_attr(attr); - char *endp; - unsigned long val; -#endif + struct vport *p = to_vport(kobj); ssize_t ret = -EINVAL; if (!capable(CAP_NET_ADMIN)) return -EPERM; -#if 0 - val = simple_strtoul(buf, &endp, 0); - if (endp != buf) { - rtnl_lock(); - if (p->dev && p->br && brport_attr->store) { - spin_lock_bh(&p->br->lock); - ret = brport_attr->store(p, val); - spin_unlock_bh(&p->br->lock); - if (ret == 0) - ret = count; - } - rtnl_unlock(); - } -#else - printk("%s: xxx writing port parms not supported yet!\n", - dp_name(p->dp)); -#endif + pr_warning("%s: xxx writing port parms not supported yet!\n", + ovs_dp_name(p->dp)); + return ret; } -struct sysfs_ops brport_sysfs_ops = { +struct sysfs_ops ovs_brport_sysfs_ops = { .show = brport_show, .store = brport_store, }; @@ -271,23 +206,34 @@ struct sysfs_ops brport_sysfs_ops = { * Creates a brport subdirectory with bridge attributes. * Puts symlink in bridge's brport subdirectory */ -int dp_sysfs_add_if(struct net_bridge_port *p) +int ovs_dp_sysfs_add_if(struct vport *p) { struct datapath *dp = p->dp; + struct vport *local_port = ovs_vport_rtnl(dp, OVSP_LOCAL); struct brport_attribute **a; int err; /* Create /sys/class/net//brport directory. */ - err = kobject_add(&p->kobj, &p->dev->NETDEV_DEV_MEMBER.kobj, + if (!p->ops->get_kobj) + return -ENOENT; + +#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 (!p->kobj.sd) + return -ENOENT; +#endif + + err = kobject_add(&p->kobj, p->ops->get_kobj(p), SYSFS_BRIDGE_PORT_ATTR); if (err) goto err; /* Create symlink from /sys/class/net//brport/bridge to * /sys/class/net/. */ - err = sysfs_create_link(&p->kobj, - &dp->ports[ODPP_LOCAL]->dev->NETDEV_DEV_MEMBER.kobj, - SYSFS_BRIDGE_PORT_LINK); /* "bridge" */ + err = sysfs_create_link(&p->kobj, local_port->ops->get_kobj(local_port), + SYSFS_BRIDGE_PORT_LINK); /* "bridge" */ if (err) goto err_del; @@ -300,10 +246,10 @@ int dp_sysfs_add_if(struct net_bridge_port *p) /* Create symlink from /sys/class/net//brif/ to * /sys/class/net//brport. */ - err = sysfs_create_link(&dp->ifobj, &p->kobj, p->dev->name); + err = sysfs_create_link(&dp->ifobj, &p->kobj, p->ops->get_name(p)); if (err) goto err_del; - strcpy(p->linkname, p->dev->name); + strcpy(p->linkname, p->ops->get_name(p)); kobject_uevent(&p->kobj, KOBJ_ADD); @@ -316,7 +262,7 @@ err: return err; } -int dp_sysfs_del_if(struct net_bridge_port *p) +int ovs_dp_sysfs_del_if(struct vport *p) { if (p->linkname[0]) { sysfs_remove_link(&p->dp->ifobj, p->linkname);