From: Ben Pfaff Date: Wed, 5 Aug 2009 19:56:23 +0000 (-0700) Subject: datapath: Rename brc_sysfs_* to dp_sysfs_*. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ba9026e2fc114fa50ae923312340e9f08a1f513;p=openvswitch datapath: Rename brc_sysfs_* to dp_sysfs_*. These files and names are now part of the datapath, not brcompat, so name them appropriately so as not to confuse anyone. --- diff --git a/datapath/Modules.mk b/datapath/Modules.mk index b7d54d1a..211f96fc 100644 --- a/datapath/Modules.mk +++ b/datapath/Modules.mk @@ -11,20 +11,20 @@ dist_modules = $(both_modules) # Modules to distribute openvswitch_sources = \ actions.c \ - brc_sysfs_dp.c \ - brc_sysfs_if.c \ datapath.c \ dp_dev.c \ dp_notify.c \ + dp_sysfs_dp.c \ + dp_sysfs_if.c \ flow.c \ table.c openvswitch_headers = \ actions.h \ - brc_sysfs.h \ compat.h \ datapath.h \ dp_dev.h \ + dp_sysfs.h \ flow.h dist_sources = $(foreach module,$(dist_modules),$($(module)_sources)) diff --git a/datapath/brc_sysfs.h b/datapath/brc_sysfs.h deleted file mode 100644 index 526f5fae..00000000 --- a/datapath/brc_sysfs.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2009 Nicira Networks. - * 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. - */ - -#ifndef BRC_SYSFS_H -#define BRC_SYSFS_H 1 - -struct datapath; -struct net_bridge_port; - -/* brc_sysfs_dp.c */ -int brc_sysfs_add_dp(struct datapath *dp); -int brc_sysfs_del_dp(struct datapath *dp); - -/* brc_sysfs_if.c */ -int brc_sysfs_add_if(struct net_bridge_port *p); -int brc_sysfs_del_if(struct net_bridge_port *p); - -#include -#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,18) -#define SUPPORT_SYSFS 1 -#else -/* We only support sysfs on Linux 2.6.18 because that's the only place we - * really need it (on Xen, for brcompat) and it's a big pain to try to support - * multiple versions. */ -#endif - -#endif /* brc_sysfs.h */ - diff --git a/datapath/brc_sysfs_dp.c b/datapath/brc_sysfs_dp.c deleted file mode 100644 index d5c4fc2f..00000000 --- a/datapath/brc_sysfs_dp.c +++ /dev/null @@ -1,541 +0,0 @@ -/* - * Copyright (c) 2009 Nicira Networks. - * 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. - */ - -#include - -/* - * Sysfs attributes of bridge for Open vSwitch - * - * This has been shamelessly copied from the kernel sources. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "brc_sysfs.h" -#include "datapath.h" -#include "dp_dev.h" - -#ifdef SUPPORT_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 to_kobj(d) &(d)->class_dev.kobj -#define BRC_DEVICE_ATTR CLASS_DEVICE_ATTR -#else -#define to_kobj(d) &(d)->dev.kobj -#define BRC_DEVICE_ATTR DEVICE_ATTR -#endif - -/* - * Common code for storing bridge parameters. - */ -static ssize_t store_bridge_parm(struct class_device *d, - 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; - - if (!capable(CAP_NET_ADMIN)) - return -EPERM; - - val = simple_strtoul(buf, &endp, 0); - 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. - */ - if (val != 0) { - printk("%s: xxx writing dp parms not supported yet!\n", - dp_name(dp)); - } -#endif - return len; -} - - -static ssize_t show_forward_delay(struct class_device *d, - 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 -} - -static ssize_t store_forward_delay(struct class_device *d, - const char *buf, size_t len) -{ - return store_bridge_parm(d, buf, len, set_forward_delay); -} -static BRC_DEVICE_ATTR(forward_delay, S_IRUGO | S_IWUSR, - show_forward_delay, store_forward_delay); - -static ssize_t show_hello_time(struct class_device *d, 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 -} - -static ssize_t store_hello_time(struct class_device *d, - const char *buf, - size_t len) -{ - return store_bridge_parm(d, buf, len, set_hello_time); -} -static BRC_DEVICE_ATTR(hello_time, S_IRUGO | S_IWUSR, show_hello_time, - store_hello_time); - -static ssize_t show_max_age(struct class_device *d, - 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 -} - -static ssize_t store_max_age(struct class_device *d, - const char *buf, size_t len) -{ - return store_bridge_parm(d, buf, len, set_max_age); -} -static BRC_DEVICE_ATTR(max_age, S_IRUGO | S_IWUSR, show_max_age, store_max_age); - -static ssize_t show_ageing_time(struct class_device *d, - 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 -} - -static ssize_t store_ageing_time(struct class_device *d, - const char *buf, size_t len) -{ - return store_bridge_parm(d, buf, len, set_ageing_time); -} -static BRC_DEVICE_ATTR(ageing_time, S_IRUGO | S_IWUSR, show_ageing_time, - store_ageing_time); - -static ssize_t show_stp_state(struct class_device *d, - 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 -} - - -static ssize_t store_stp_state(struct class_device *d, - const char *buf, - size_t len) -{ - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); -#if 0 - char *endp; - unsigned long val; - - if (!capable(CAP_NET_ADMIN)) - return -EPERM; - - val = simple_strtoul(buf, &endp, 0); - if (endp == buf) - return -EINVAL; - - rtnl_lock(); - br_stp_set_enabled(br, val); - rtnl_unlock(); -#else - printk("%s: xxx attempt to set_stp_state()\n", dp_name(dp)); -#endif - - return len; -} -static BRC_DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state, - store_stp_state); - -static ssize_t show_priority(struct class_device *d, - 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 -} - -static ssize_t store_priority(struct class_device *d, - const char *buf, size_t len) -{ - return store_bridge_parm(d, buf, len, set_priority); -} -static BRC_DEVICE_ATTR(priority, S_IRUGO | S_IWUSR, show_priority, store_priority); - -static ssize_t show_root_id(struct class_device *d, - char *buf) -{ -#if 0 - return br_show_bridge_id(buf, &to_bridge(d)->designated_root); -#else - return sprintf(buf, "0000.010203040506\n"); -#endif -} -static BRC_DEVICE_ATTR(root_id, S_IRUGO, show_root_id, NULL); - -static ssize_t show_bridge_id(struct class_device *d, - char *buf) -{ - struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); - const unsigned char *addr = dp->ports[ODPP_LOCAL]->dev->dev_addr; - - /* 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]); -} -static BRC_DEVICE_ATTR(bridge_id, S_IRUGO, show_bridge_id, NULL); - -static ssize_t show_root_port(struct class_device *d, - char *buf) -{ -#if 0 - return sprintf(buf, "%d\n", to_bridge(d)->root_port); -#else - return sprintf(buf, "%d\n", 0); -#endif -} -static BRC_DEVICE_ATTR(root_port, S_IRUGO, show_root_port, NULL); - -static ssize_t show_root_path_cost(struct class_device *d, - char *buf) -{ -#if 0 - return sprintf(buf, "%d\n", to_bridge(d)->root_path_cost); -#else - return sprintf(buf, "%d\n", 0); -#endif -} -static BRC_DEVICE_ATTR(root_path_cost, S_IRUGO, show_root_path_cost, NULL); - -static ssize_t show_topology_change(struct class_device *d, - char *buf) -{ -#if 0 - return sprintf(buf, "%d\n", to_bridge(d)->topology_change); -#else - return sprintf(buf, "%d\n", 0); -#endif -} -static BRC_DEVICE_ATTR(topology_change, S_IRUGO, show_topology_change, NULL); - -static ssize_t show_topology_change_detected(struct class_device *d, - 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 BRC_DEVICE_ATTR(topology_change_detected, S_IRUGO, - show_topology_change_detected, NULL); - -static ssize_t show_hello_timer(struct class_device *d, - 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 BRC_DEVICE_ATTR(hello_timer, S_IRUGO, show_hello_timer, NULL); - -static ssize_t show_tcn_timer(struct class_device *d, - 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 BRC_DEVICE_ATTR(tcn_timer, S_IRUGO, show_tcn_timer, NULL); - -static ssize_t show_topology_change_timer(struct class_device *d, - 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 BRC_DEVICE_ATTR(topology_change_timer, S_IRUGO, show_topology_change_timer, - NULL); - -static ssize_t show_gc_timer(struct class_device *d, - 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 BRC_DEVICE_ATTR(gc_timer, S_IRUGO, show_gc_timer, NULL); - -static ssize_t show_group_addr(struct class_device *d, - 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(struct class_device *d, - 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; - - if (!capable(CAP_NET_ADMIN)) - return -EPERM; - - 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; - - /* Must be 01:80:c2:00:00:0X */ - for (i = 0; i < 5; i++) - if (new_addr[i] != br_group_address[i]) - return -EINVAL; - - 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; -} - -static BRC_DEVICE_ATTR(group_addr, S_IRUGO | S_IWUSR, - show_group_addr, store_group_addr); - -static struct attribute *bridge_attrs[] = { - &class_device_attr_forward_delay.attr, - &class_device_attr_hello_time.attr, - &class_device_attr_max_age.attr, - &class_device_attr_ageing_time.attr, - &class_device_attr_stp_state.attr, - &class_device_attr_priority.attr, - &class_device_attr_bridge_id.attr, - &class_device_attr_root_id.attr, - &class_device_attr_root_path_cost.attr, - &class_device_attr_root_port.attr, - &class_device_attr_topology_change.attr, - &class_device_attr_topology_change_detected.attr, - &class_device_attr_hello_timer.attr, - &class_device_attr_tcn_timer.attr, - &class_device_attr_topology_change_timer.attr, - &class_device_attr_gc_timer.attr, - &class_device_attr_group_addr.attr, - NULL -}; - -static struct attribute_group bridge_group = { - .name = SYSFS_BRIDGE_ATTR, - .attrs = bridge_attrs, -}; - -/* - * Add entries in sysfs onto the existing network class device - * for the bridge. - * Adds a attribute group "bridge" containing tuning parameters. - * Sub directory to hold links to interfaces. - * - * Note: the ifobj exists only to be a subdirectory - * to hold links. The ifobj exists in the same data structure - * as its parent the bridge so reference counting works. - */ -int brc_sysfs_add_dp(struct datapath *dp) -{ - struct kobject *kobj = to_kobj(dp->ports[ODPP_LOCAL]->dev); - int err; - - 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); - goto out1; - } - - /* Create /sys/class/net//bridge directory. */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) - kobject_set_name(&dp->ifobj, SYSFS_BRIDGE_PORT_SUBDIR); /* "bridge" */ - dp->ifobj.ktype = NULL; - dp->ifobj.kset = NULL; - dp->ifobj.parent = kobj; - - err = kobject_register(&dp->ifobj); - if (err) { - pr_info("%s: can't add kobject (directory) %s/%s\n", - __FUNCTION__, dp_name(dp), dp->ifobj.name); - goto out2; - } -#else - br->ifobj = kobject_create_and_add(SYSFS_BRIDGE_PORT_SUBDIR, kobj); - if (!br->ifobj) { - pr_info("%s: can't add kobject (directory) %s/%s\n", - __func__, dp_name(dp), SYSFS_BRIDGE_PORT_SUBDIR); - goto out2; - } -#endif - return 0; - - out2: - sysfs_remove_group(kobj, &bridge_group); - out1: - return err; -} - -int brc_sysfs_del_dp(struct datapath *dp) -{ - struct kobject *kobj = to_kobj(dp->ports[ODPP_LOCAL]->dev); - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) - kobject_unregister(&dp->ifobj); -#else - kobject_put(dp->ifobj); -#endif - sysfs_remove_group(kobj, &bridge_group); - - return 0; -} -#else /* !SUPPORT_SYSFS */ -int brc_sysfs_add_dp(struct datapath *dp) { return 0; } -int brc_sysfs_del_dp(struct datapath *dp) { return 0; } -int brc_sysfs_add_if(struct net_bridge_port *p) { return 0; } -int brc_sysfs_del_if(struct net_bridge_port *p) -{ - dev_put(p->dev); - kfree(p); - return 0; -} -#endif /* !SUPPORT_SYSFS */ diff --git a/datapath/brc_sysfs_if.c b/datapath/brc_sysfs_if.c deleted file mode 100644 index 5cae6a9f..00000000 --- a/datapath/brc_sysfs_if.c +++ /dev/null @@ -1,348 +0,0 @@ -/* - * Copyright (c) 2009 Nicira Networks. - * 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. - */ - -/* - * Sysfs attributes of bridge ports for Open vSwitch - * - * This has been shamelessly copied from the kernel sources. - */ - -#include -#include -#include -#include -#include -#include -#include "brc_sysfs.h" -#include "datapath.h" - -#ifdef SUPPORT_SYSFS - -struct brport_attribute { - struct attribute attr; - ssize_t (*show)(struct net_bridge_port *, char *); - ssize_t (*store)(struct net_bridge_port *, unsigned long); -}; - -#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, \ -}; - -static ssize_t show_path_cost(struct net_bridge_port *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) -{ -#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) -{ -#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) -{ -#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) -{ -#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) -{ -#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) -{ -#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) -{ -#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) -{ -#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) -{ - 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) -{ -#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) -{ -#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) -{ -#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) -{ -#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) -{ -#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) -{ -#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); - -static struct brport_attribute *brport_attrs[] = { - &brport_attr_path_cost, - &brport_attr_priority, - &brport_attr_port_id, - &brport_attr_port_no, - &brport_attr_designated_root, - &brport_attr_designated_bridge, - &brport_attr_designated_port, - &brport_attr_designated_cost, - &brport_attr_state, - &brport_attr_change_ack, - &brport_attr_config_pending, - &brport_attr_message_age_timer, - &brport_attr_forward_delay_timer, - &brport_attr_hold_timer, - 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) - -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); - - return brport_attr->show(p, buf); -} - -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 - 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 - return ret; -} - -struct sysfs_ops brport_sysfs_ops = { - .show = brport_show, - .store = brport_store, -}; - -static void release_nbp(struct kobject *kobj) -{ - struct net_bridge_port *p - = container_of(kobj, struct net_bridge_port, kobj); - kfree(p); -} - -struct kobj_type brport_ktype = { - .sysfs_ops = &brport_sysfs_ops, - .release = release_nbp -}; - -/* - * Add sysfs entries to ethernet device added to a bridge. - * Creates a brport subdirectory with bridge attributes. - * Puts symlink in bridge's brport subdirectory - */ -int brc_sysfs_add_if(struct net_bridge_port *p) -{ - struct datapath *dp = p->dp; - struct brport_attribute **a; - int err; - - /* Create /sys/class/net//brport directory. */ - kobject_init(&p->kobj); - kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR); /* "brport" */ - p->kobj.ktype = &brport_ktype; - p->kobj.kset = NULL; - p->kobj.parent = &(p->dev->class_dev.kobj); - - err = kobject_add(&p->kobj); - if (err) - goto err_put; - - /* Create symlink from /sys/class/net//brport/bridge to - * /sys/class/net/. */ - err = sysfs_create_link(&p->kobj, - &dp->ports[ODPP_LOCAL]->dev->class_dev.kobj, - SYSFS_BRIDGE_PORT_LINK); /* "bridge" */ - if (err) - goto err_del; - - /* Populate /sys/class/net//brport directory with files. */ - for (a = brport_attrs; *a; ++a) { - err = sysfs_create_file(&p->kobj, &((*a)->attr)); - if (err) - goto err_del; - } - - /* Create symlink from /sys/class/net//brif/ to - * /sys/class/net//brport. */ - err = sysfs_create_link(&dp->ifobj, &p->kobj, p->dev->name); - if (err) - goto err_del; - - kobject_uevent(&p->kobj, KOBJ_ADD); - - return err; - -err_del: - kobject_del(&p->kobj); -err_put: - kobject_put(&p->kobj); - return err; -} - -int brc_sysfs_del_if(struct net_bridge_port *p) -{ - struct net_device *dev = p->dev; - - kobject_uevent(&p->kobj, KOBJ_REMOVE); - kobject_del(&p->kobj); - - dev_put(dev); - - kobject_put(&p->kobj); - - return 0; -} -#endif /* SUPPORT_SYSFS */ diff --git a/datapath/brcompat.c b/datapath/brcompat.c index 46e7f2b0..be361ece 100644 --- a/datapath/brcompat.c +++ b/datapath/brcompat.c @@ -20,7 +20,6 @@ #include "compat.h" #include "openvswitch/brcompat-netlink.h" #include "brc_procfs.h" -#include "brc_sysfs.h" #include "datapath.h" #include "dp_dev.h" diff --git a/datapath/datapath.c b/datapath/datapath.c index cfe660ff..d8bd245a 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -240,7 +240,7 @@ static int create_dp(int dp_idx, const char __user *devnamep) rtnl_unlock(); #ifdef SUPPORT_SYSFS - brc_sysfs_add_dp(dp); + dp_sysfs_add_dp(dp); #endif return 0; @@ -270,7 +270,7 @@ static void do_destroy_dp(struct datapath *dp) dp_del_port(p); #ifdef SUPPORT_SYSFS - brc_sysfs_del_dp(dp); + dp_sysfs_del_dp(dp); #endif rcu_assign_pointer(dps[dp->dp_idx], NULL); @@ -394,7 +394,7 @@ static int add_port(int dp_idx, struct odp_port __user *portp) goto out_put; #ifdef SUPPORT_SYSFS - brc_sysfs_add_if(dp->ports[port_no]); + dp_sysfs_add_if(dp->ports[port_no]); #endif out_put: @@ -439,7 +439,7 @@ int dp_del_port(struct net_bridge_port *p) dp_dev_destroy(p->dev); } if (p->port_no != ODPP_LOCAL) { - brc_sysfs_del_if(p); + dp_sysfs_del_if(p); } else { dev_put(p->dev); kfree(p); diff --git a/datapath/datapath.h b/datapath/datapath.h index 6ff8d210..e778a70a 100644 --- a/datapath/datapath.h +++ b/datapath/datapath.h @@ -19,7 +19,7 @@ #include #include #include "flow.h" -#include "brc_sysfs.h" +#include "dp_sysfs.h" /* Mask for the priority bits in a vlan header. If we ever merge upstream * then this should go into include/linux/if_vlan.h. */ diff --git a/datapath/dp_sysfs.h b/datapath/dp_sysfs.h new file mode 100644 index 00000000..d98fdf32 --- /dev/null +++ b/datapath/dp_sysfs.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2009 Nicira Networks. + * 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. + */ + +#ifndef DP_SYSFS_H +#define DP_SYSFS_H 1 + +struct datapath; +struct net_bridge_port; + +/* dp_sysfs_dp.c */ +int dp_sysfs_add_dp(struct datapath *dp); +int dp_sysfs_del_dp(struct datapath *dp); + +/* dp_sysfs_if.c */ +int dp_sysfs_add_if(struct net_bridge_port *p); +int dp_sysfs_del_if(struct net_bridge_port *p); + +#include +#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,18) +#define SUPPORT_SYSFS 1 +#else +/* We only support sysfs on Linux 2.6.18 because that's the only place we + * really need it (on Xen, for brcompat) and it's a big pain to try to support + * multiple versions. */ +#endif + +#endif /* dp_sysfs.h */ + diff --git a/datapath/dp_sysfs_dp.c b/datapath/dp_sysfs_dp.c new file mode 100644 index 00000000..714a4b2e --- /dev/null +++ b/datapath/dp_sysfs_dp.c @@ -0,0 +1,541 @@ +/* + * Copyright (c) 2009 Nicira Networks. + * 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. + */ + +#include + +/* + * Sysfs attributes of bridge for Open vSwitch + * + * This has been shamelessly copied from the kernel sources. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dp_sysfs.h" +#include "datapath.h" +#include "dp_dev.h" + +#ifdef SUPPORT_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 to_kobj(d) &(d)->class_dev.kobj +#define DP_DEVICE_ATTR CLASS_DEVICE_ATTR +#else +#define to_kobj(d) &(d)->dev.kobj +#define DP_DEVICE_ATTR DEVICE_ATTR +#endif + +/* + * Common code for storing bridge parameters. + */ +static ssize_t store_bridge_parm(struct class_device *d, + 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; + + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + + val = simple_strtoul(buf, &endp, 0); + 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. + */ + if (val != 0) { + printk("%s: xxx writing dp parms not supported yet!\n", + dp_name(dp)); + } +#endif + return len; +} + + +static ssize_t show_forward_delay(struct class_device *d, + 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 +} + +static ssize_t store_forward_delay(struct class_device *d, + const char *buf, size_t len) +{ + return store_bridge_parm(d, buf, len, set_forward_delay); +} +static DP_DEVICE_ATTR(forward_delay, S_IRUGO | S_IWUSR, + show_forward_delay, store_forward_delay); + +static ssize_t show_hello_time(struct class_device *d, 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 +} + +static ssize_t store_hello_time(struct class_device *d, + const char *buf, + size_t len) +{ + return store_bridge_parm(d, buf, len, set_hello_time); +} +static DP_DEVICE_ATTR(hello_time, S_IRUGO | S_IWUSR, show_hello_time, + store_hello_time); + +static ssize_t show_max_age(struct class_device *d, + 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 +} + +static ssize_t store_max_age(struct class_device *d, + const char *buf, size_t len) +{ + return store_bridge_parm(d, buf, len, set_max_age); +} +static DP_DEVICE_ATTR(max_age, S_IRUGO | S_IWUSR, show_max_age, store_max_age); + +static ssize_t show_ageing_time(struct class_device *d, + 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 +} + +static ssize_t store_ageing_time(struct class_device *d, + const char *buf, size_t len) +{ + return store_bridge_parm(d, buf, len, set_ageing_time); +} +static DP_DEVICE_ATTR(ageing_time, S_IRUGO | S_IWUSR, show_ageing_time, + store_ageing_time); + +static ssize_t show_stp_state(struct class_device *d, + 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 +} + + +static ssize_t store_stp_state(struct class_device *d, + const char *buf, + size_t len) +{ + struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); +#if 0 + char *endp; + unsigned long val; + + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + + val = simple_strtoul(buf, &endp, 0); + if (endp == buf) + return -EINVAL; + + rtnl_lock(); + br_stp_set_enabled(br, val); + rtnl_unlock(); +#else + printk("%s: xxx attempt to set_stp_state()\n", dp_name(dp)); +#endif + + return len; +} +static DP_DEVICE_ATTR(stp_state, S_IRUGO | S_IWUSR, show_stp_state, + store_stp_state); + +static ssize_t show_priority(struct class_device *d, + 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 +} + +static ssize_t store_priority(struct class_device *d, + const char *buf, size_t len) +{ + return store_bridge_parm(d, buf, len, set_priority); +} +static DP_DEVICE_ATTR(priority, S_IRUGO | S_IWUSR, show_priority, store_priority); + +static ssize_t show_root_id(struct class_device *d, + 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 ssize_t show_bridge_id(struct class_device *d, + char *buf) +{ + struct datapath *dp = dp_dev_get_dp(to_net_dev(d)); + const unsigned char *addr = dp->ports[ODPP_LOCAL]->dev->dev_addr; + + /* 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]); +} +static DP_DEVICE_ATTR(bridge_id, S_IRUGO, show_bridge_id, NULL); + +static ssize_t show_root_port(struct class_device *d, + 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 ssize_t show_root_path_cost(struct class_device *d, + 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 ssize_t show_topology_change(struct class_device *d, + 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 ssize_t show_topology_change_detected(struct class_device *d, + 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, + show_topology_change_detected, NULL); + +static ssize_t show_hello_timer(struct class_device *d, + 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 ssize_t show_tcn_timer(struct class_device *d, + 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 ssize_t show_topology_change_timer(struct class_device *d, + 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, + NULL); + +static ssize_t show_gc_timer(struct class_device *d, + 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 ssize_t show_group_addr(struct class_device *d, + 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(struct class_device *d, + 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; + + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + + 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; + + /* Must be 01:80:c2:00:00:0X */ + for (i = 0; i < 5; i++) + if (new_addr[i] != br_group_address[i]) + return -EINVAL; + + 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; +} + +static DP_DEVICE_ATTR(group_addr, S_IRUGO | S_IWUSR, + show_group_addr, store_group_addr); + +static struct attribute *bridge_attrs[] = { + &class_device_attr_forward_delay.attr, + &class_device_attr_hello_time.attr, + &class_device_attr_max_age.attr, + &class_device_attr_ageing_time.attr, + &class_device_attr_stp_state.attr, + &class_device_attr_priority.attr, + &class_device_attr_bridge_id.attr, + &class_device_attr_root_id.attr, + &class_device_attr_root_path_cost.attr, + &class_device_attr_root_port.attr, + &class_device_attr_topology_change.attr, + &class_device_attr_topology_change_detected.attr, + &class_device_attr_hello_timer.attr, + &class_device_attr_tcn_timer.attr, + &class_device_attr_topology_change_timer.attr, + &class_device_attr_gc_timer.attr, + &class_device_attr_group_addr.attr, + NULL +}; + +static struct attribute_group bridge_group = { + .name = SYSFS_BRIDGE_ATTR, + .attrs = bridge_attrs, +}; + +/* + * Add entries in sysfs onto the existing network class device + * for the bridge. + * Adds a attribute group "bridge" containing tuning parameters. + * Sub directory to hold links to interfaces. + * + * Note: the ifobj exists only to be a subdirectory + * 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) +{ + struct kobject *kobj = to_kobj(dp->ports[ODPP_LOCAL]->dev); + int err; + + 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); + goto out1; + } + + /* Create /sys/class/net//bridge directory. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) + kobject_set_name(&dp->ifobj, SYSFS_BRIDGE_PORT_SUBDIR); /* "bridge" */ + dp->ifobj.ktype = NULL; + dp->ifobj.kset = NULL; + dp->ifobj.parent = kobj; + + err = kobject_register(&dp->ifobj); + if (err) { + pr_info("%s: can't add kobject (directory) %s/%s\n", + __FUNCTION__, dp_name(dp), dp->ifobj.name); + goto out2; + } +#else + br->ifobj = kobject_create_and_add(SYSFS_BRIDGE_PORT_SUBDIR, kobj); + if (!br->ifobj) { + pr_info("%s: can't add kobject (directory) %s/%s\n", + __func__, dp_name(dp), SYSFS_BRIDGE_PORT_SUBDIR); + goto out2; + } +#endif + return 0; + + out2: + sysfs_remove_group(kobj, &bridge_group); + out1: + return err; +} + +int dp_sysfs_del_dp(struct datapath *dp) +{ + struct kobject *kobj = to_kobj(dp->ports[ODPP_LOCAL]->dev); + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) + kobject_unregister(&dp->ifobj); +#else + kobject_put(dp->ifobj); +#endif + sysfs_remove_group(kobj, &bridge_group); + + return 0; +} +#else /* !SUPPORT_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) +{ + dev_put(p->dev); + kfree(p); + return 0; +} +#endif /* !SUPPORT_SYSFS */ diff --git a/datapath/dp_sysfs_if.c b/datapath/dp_sysfs_if.c new file mode 100644 index 00000000..f118818b --- /dev/null +++ b/datapath/dp_sysfs_if.c @@ -0,0 +1,348 @@ +/* + * Copyright (c) 2009 Nicira Networks. + * 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. + */ + +/* + * Sysfs attributes of bridge ports for Open vSwitch + * + * This has been shamelessly copied from the kernel sources. + */ + +#include +#include +#include +#include +#include +#include +#include "dp_sysfs.h" +#include "datapath.h" + +#ifdef SUPPORT_SYSFS + +struct brport_attribute { + struct attribute attr; + ssize_t (*show)(struct net_bridge_port *, char *); + ssize_t (*store)(struct net_bridge_port *, unsigned long); +}; + +#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, \ +}; + +static ssize_t show_path_cost(struct net_bridge_port *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) +{ +#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) +{ +#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) +{ +#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) +{ +#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) +{ +#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) +{ +#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) +{ +#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) +{ +#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) +{ + 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) +{ +#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) +{ +#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) +{ +#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) +{ +#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) +{ +#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) +{ +#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); + +static struct brport_attribute *brport_attrs[] = { + &brport_attr_path_cost, + &brport_attr_priority, + &brport_attr_port_id, + &brport_attr_port_no, + &brport_attr_designated_root, + &brport_attr_designated_bridge, + &brport_attr_designated_port, + &brport_attr_designated_cost, + &brport_attr_state, + &brport_attr_change_ack, + &brport_attr_config_pending, + &brport_attr_message_age_timer, + &brport_attr_forward_delay_timer, + &brport_attr_hold_timer, + 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) + +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); + + return brport_attr->show(p, buf); +} + +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 + 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 + return ret; +} + +struct sysfs_ops brport_sysfs_ops = { + .show = brport_show, + .store = brport_store, +}; + +static void release_nbp(struct kobject *kobj) +{ + struct net_bridge_port *p + = container_of(kobj, struct net_bridge_port, kobj); + kfree(p); +} + +struct kobj_type brport_ktype = { + .sysfs_ops = &brport_sysfs_ops, + .release = release_nbp +}; + +/* + * Add sysfs entries to ethernet device added to a bridge. + * Creates a brport subdirectory with bridge attributes. + * Puts symlink in bridge's brport subdirectory + */ +int dp_sysfs_add_if(struct net_bridge_port *p) +{ + struct datapath *dp = p->dp; + struct brport_attribute **a; + int err; + + /* Create /sys/class/net//brport directory. */ + kobject_init(&p->kobj); + kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR); /* "brport" */ + p->kobj.ktype = &brport_ktype; + p->kobj.kset = NULL; + p->kobj.parent = &(p->dev->class_dev.kobj); + + err = kobject_add(&p->kobj); + if (err) + goto err_put; + + /* Create symlink from /sys/class/net//brport/bridge to + * /sys/class/net/. */ + err = sysfs_create_link(&p->kobj, + &dp->ports[ODPP_LOCAL]->dev->class_dev.kobj, + SYSFS_BRIDGE_PORT_LINK); /* "bridge" */ + if (err) + goto err_del; + + /* Populate /sys/class/net//brport directory with files. */ + for (a = brport_attrs; *a; ++a) { + err = sysfs_create_file(&p->kobj, &((*a)->attr)); + if (err) + goto err_del; + } + + /* Create symlink from /sys/class/net//brif/ to + * /sys/class/net//brport. */ + err = sysfs_create_link(&dp->ifobj, &p->kobj, p->dev->name); + if (err) + goto err_del; + + kobject_uevent(&p->kobj, KOBJ_ADD); + + return err; + +err_del: + kobject_del(&p->kobj); +err_put: + kobject_put(&p->kobj); + return err; +} + +int dp_sysfs_del_if(struct net_bridge_port *p) +{ + struct net_device *dev = p->dev; + + kobject_uevent(&p->kobj, KOBJ_REMOVE); + kobject_del(&p->kobj); + + dev_put(dev); + + kobject_put(&p->kobj); + + return 0; +} +#endif /* SUPPORT_SYSFS */ diff --git a/datapath/linux-2.6/.gitignore b/datapath/linux-2.6/.gitignore index af5821a2..aa10e66a 100644 --- a/datapath/linux-2.6/.gitignore +++ b/datapath/linux-2.6/.gitignore @@ -3,8 +3,8 @@ /Makefile.main /actions.c /brcompat.c -/brc_sysfs_dp.c -/brc_sysfs_if.c +/dp_sysfs_dp.c +/dp_sysfs_if.c /datapath.c /dp_dev.c /dp_notify.c