X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport.c;h=acb480bb3ccc4a67213b923d5b8bfe3cc1ed26da;hb=9fe3b9a2eeace9689def807e78e35c79e4b1814b;hp=cc20959372eb3f86a1d0b8c0b8dc5074a06e5f4e;hpb=8819fac72b9888bec99aae656bcdb1631b99d01b;p=openvswitch diff --git a/datapath/vport.c b/datapath/vport.c index cc209593..acb480bb 100644 --- a/datapath/vport.c +++ b/datapath/vport.c @@ -1,31 +1,38 @@ /* - * Copyright (c) 2010 Nicira Networks. + * Copyright (c) 2010, 2011 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. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include +#include #include #include #include #include #include #include +#include #include "vport.h" +#include "vport-internal_dev.h" -extern struct vport_ops netdev_vport_ops; -extern struct vport_ops internal_vport_ops; -extern struct vport_ops gre_vport_ops; - -static struct vport_ops *base_vport_ops_list[] = { +/* List of statically compiled vport implementations. Don't forget to also + * add yours to the list at the bottom of vport.h. */ +static const struct vport_ops *base_vport_ops_list[] = { &netdev_vport_ops, &internal_vport_ops, + &patch_vport_ops, &gre_vport_ops, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) + &capwap_vport_ops, +#endif }; static const struct vport_ops **vport_ops_list; @@ -40,7 +47,7 @@ static struct hlist_head *dev_table; * one of these locks if you don't want the vport to be deleted out from under * you. * - * If you get a reference to a vport through a dp_port, it is protected + * If you get a reference to a vport through a datapath, it is protected * by RCU and you need to hold rcu_read_lock instead when reading. * * If multiple locks are taken, the hierarchy is: @@ -56,8 +63,7 @@ static DEFINE_MUTEX(vport_mutex); * Acquire global vport lock. See above comment about locking requirements * and specific function definitions. May sleep. */ -void -vport_lock(void) +void vport_lock(void) { mutex_lock(&vport_mutex); } @@ -67,19 +73,19 @@ vport_lock(void) * * Release lock acquired with vport_lock. */ -void -vport_unlock(void) +void vport_unlock(void) { mutex_unlock(&vport_mutex); } -#define ASSERT_VPORT() do { \ - if (unlikely(!mutex_is_locked(&vport_mutex))) { \ - printk(KERN_ERR "openvswitch: vport lock not held at %s (%d)\n", \ - __FILE__, __LINE__); \ - dump_stack(); \ - } \ -} while(0) +#define ASSERT_VPORT() \ +do { \ + if (unlikely(!mutex_is_locked(&vport_mutex))) { \ + pr_err("vport lock not held at %s (%d)\n", \ + __FILE__, __LINE__); \ + dump_stack(); \ + } \ +} while (0) /** * vport_init - initialize vport subsystem @@ -87,8 +93,7 @@ vport_unlock(void) * Called at module load time to initialize the vport subsystem and any * compiled in vport types. */ -int -vport_init(void) +int vport_init(void) { int err; int i; @@ -108,12 +113,7 @@ vport_init(void) } for (i = 0; i < ARRAY_SIZE(base_vport_ops_list); i++) { - struct vport_ops *new_ops = base_vport_ops_list[i]; - - if (new_ops->get_stats && new_ops->flags & VPORT_F_GEN_STATS) { - printk(KERN_INFO "openvswitch: both get_stats() and VPORT_F_GEN_STATS defined on vport %s, dropping VPORT_F_GEN_STATS\n", new_ops->type); - new_ops->flags &= ~VPORT_F_GEN_STATS; - } + const struct vport_ops *new_ops = base_vport_ops_list[i]; if (new_ops->init) err = new_ops->init(); @@ -136,40 +136,16 @@ error: return err; } -static void -vport_del_all(void) -{ - int i; - - rtnl_lock(); - vport_lock(); - - for (i = 0; i < VPORT_HASH_BUCKETS; i++) { - struct hlist_head *bucket = &dev_table[i]; - struct vport *vport; - struct hlist_node *node, *next; - - hlist_for_each_entry_safe(vport, node, next, bucket, hash_node) - __vport_del(vport); - } - - vport_unlock(); - rtnl_unlock(); -} - /** * vport_exit - shutdown vport subsystem * * Called at module exit time to shutdown the vport subsystem and any * initialized vport types. */ -void -vport_exit(void) +void vport_exit(void) { int i; - vport_del_all(); - for (i = 0; i < n_vport_types; i++) { if (vport_ops_list[i]->exit) vport_ops_list[i]->exit(); @@ -180,100 +156,35 @@ vport_exit(void) } /** - * vport_add - add vport device (for userspace callers) + * vport_user_mod - modify existing vport device (for userspace callers) * - * @uvport_config: New port configuration. - * - * Creates a new vport with the specified configuration (which is dependent - * on device type). This function is for userspace callers and assumes no - * locks are held. - */ -static int -do_vport_add(struct odp_vport_add *vport_config) -{ - struct vport *vport; - int err = 0; - - vport_config->port_type[VPORT_TYPE_SIZE - 1] = '\0'; - vport_config->devname[IFNAMSIZ - 1] = '\0'; - - rtnl_lock(); - - vport = vport_locate(vport_config->devname); - if (vport) { - err = -EEXIST; - goto out; - } - - vport_lock(); - vport = __vport_add(vport_config->devname, vport_config->port_type, - vport_config->config); - vport_unlock(); - - if (IS_ERR(vport)) - err = PTR_ERR(vport); - -out: - rtnl_unlock(); - return err; -} - -int -vport_add(const struct odp_vport_add __user *uvport_config) -{ - struct odp_vport_add vport_config; - - if (copy_from_user(&vport_config, uvport_config, sizeof(struct odp_vport_add))) - return -EFAULT; - - return do_vport_add(&vport_config); -} - -#ifdef CONFIG_COMPAT -int -compat_vport_add(struct compat_odp_vport_add *ucompat) -{ - struct compat_odp_vport_add compat; - struct odp_vport_add vport_config; - - if (copy_from_user(&compat, ucompat, sizeof(struct compat_odp_vport_add))) - return -EFAULT; - - memcpy(vport_config.port_type, compat.port_type, VPORT_TYPE_SIZE); - memcpy(vport_config.devname, compat.devname, IFNAMSIZ); - vport_config.config = compat_ptr(compat.config); - - return do_vport_add(&vport_config); -} -#endif - -/** - * vport_mod - modify existing vport device (for userspace callers) - * - * @uvport_config: New configuration for vport + * @uport: New configuration for vport * * Modifies an existing device with the specified configuration (which is * dependent on device type). This function is for userspace callers and * assumes no locks are held. */ -static int -do_vport_mod(struct odp_vport_mod *vport_config) +int vport_user_mod(const struct odp_port __user *uport) { + struct odp_port port; struct vport *vport; int err; - vport_config->devname[IFNAMSIZ - 1] = '\0'; + if (copy_from_user(&port, uport, sizeof(port))) + return -EFAULT; + + port.devname[IFNAMSIZ - 1] = '\0'; rtnl_lock(); - vport = vport_locate(vport_config->devname); + vport = vport_locate(port.devname); if (!vport) { err = -ENODEV; goto out; } vport_lock(); - err = __vport_mod(vport, vport_config->config); + err = vport_mod(vport, &port); vport_unlock(); out: @@ -281,107 +192,57 @@ out: return err; } -int -vport_mod(const struct odp_vport_mod __user *uvport_config) -{ - struct odp_vport_mod vport_config; - - if (copy_from_user(&vport_config, uvport_config, sizeof(struct odp_vport_mod))) - return -EFAULT; - - return do_vport_mod(&vport_config); -} - -#ifdef CONFIG_COMPAT -int -compat_vport_mod(struct compat_odp_vport_mod *ucompat) -{ - struct compat_odp_vport_mod compat; - struct odp_vport_mod vport_config; - - if (copy_from_user(&compat, ucompat, sizeof(struct compat_odp_vport_mod))) - return -EFAULT; - - memcpy(vport_config.devname, compat.devname, IFNAMSIZ); - vport_config.config = compat_ptr(compat.config); - - return do_vport_mod(&vport_config); -} -#endif - /** - * vport_del - delete existing vport device (for userspace callers) + * vport_user_stats_get - retrieve device stats (for userspace callers) * - * @udevname: Name of device to delete + * @ustats_req: Stats request parameters. * - * Deletes the specified device. Detaches the device from a datapath first - * if it is attached. Deleting the device will fail if it does not exist or it - * is the datapath local port. It is also possible to fail for less obvious - * reasons, such as lack of memory. This function is for userspace callers and - * assumes no locks are held. + * Retrieves transmit, receive, and error stats for the given device. This + * function is for userspace callers and assumes no locks are held. */ -int -vport_del(const char __user *udevname) +int vport_user_stats_get(struct odp_vport_stats_req __user *ustats_req) { - char devname[IFNAMSIZ]; + struct odp_vport_stats_req stats_req; struct vport *vport; - struct dp_port *dp_port; - int err = 0; - int retval; + int err; - retval = strncpy_from_user(devname, udevname, IFNAMSIZ); - if (retval < 0) + if (copy_from_user(&stats_req, ustats_req, sizeof(struct odp_vport_stats_req))) return -EFAULT; - else if (retval >= IFNAMSIZ) - return -ENAMETOOLONG; - rtnl_lock(); + stats_req.devname[IFNAMSIZ - 1] = '\0'; - vport = vport_locate(devname); + vport_lock(); + + vport = vport_locate(stats_req.devname); if (!vport) { err = -ENODEV; goto out; } - dp_port = vport_get_dp_port(vport); - if (dp_port) { - struct datapath *dp = dp_port->dp; - - mutex_lock(&dp->mutex); - - if (!strcmp(dp_name(dp), devname)) { - err = -EINVAL; - goto dp_port_out; - } - - err = dp_detach_port(dp_port, 0); + err = vport_get_stats(vport, &stats_req.stats); -dp_port_out: - mutex_unlock(&dp->mutex); - - if (err) - goto out; - } - - vport_lock(); - err = __vport_del(vport); +out: vport_unlock(); -out: - rtnl_unlock(); + if (!err) + if (copy_to_user(ustats_req, &stats_req, sizeof(struct odp_vport_stats_req))) + err = -EFAULT; + return err; } /** - * vport_stats_get - retrieve device stats (for userspace callers) + * vport_user_stats_set - sets offset device stats (for userspace callers) * - * @ustats_req: Stats request parameters. + * @ustats_req: Stats set parameters. * - * Retrieves transmit, receive, and error stats for the given device. This - * function is for userspace callers and assumes no locks are held. + * Provides a set of transmit, receive, and error stats to be added as an + * offset to the collect data when stats are retreived. Some devices may not + * support setting the stats, in which case the result will always be + * -EOPNOTSUPP. This function is for userspace callers and assumes no locks + * are held. */ -int -vport_stats_get(struct odp_vport_stats_req __user *ustats_req) +int vport_user_stats_set(struct odp_vport_stats_req __user *ustats_req) { struct odp_vport_stats_req stats_req; struct vport *vport; @@ -392,6 +253,7 @@ vport_stats_get(struct odp_vport_stats_req __user *ustats_req) stats_req.devname[IFNAMSIZ - 1] = '\0'; + rtnl_lock(); vport_lock(); vport = vport_locate(stats_req.devname); @@ -400,63 +262,24 @@ vport_stats_get(struct odp_vport_stats_req __user *ustats_req) goto out; } - if (vport->ops->get_stats) - err = vport->ops->get_stats(vport, &stats_req.stats); - else if (vport->ops->flags & VPORT_F_GEN_STATS) { - int i; - - memset(&stats_req.stats, 0, sizeof(struct odp_vport_stats)); - - for_each_possible_cpu(i) { - const struct vport_percpu_stats *percpu_stats; - - percpu_stats = per_cpu_ptr(vport->percpu_stats, i); - stats_req.stats.rx_bytes += percpu_stats->rx_bytes; - stats_req.stats.rx_packets += percpu_stats->rx_packets; - stats_req.stats.tx_bytes += percpu_stats->tx_bytes; - stats_req.stats.tx_packets += percpu_stats->tx_packets; - } - - spin_lock_bh(&vport->err_stats.lock); - - stats_req.stats.rx_dropped = vport->err_stats.rx_dropped; - stats_req.stats.rx_errors = vport->err_stats.rx_errors - + vport->err_stats.rx_frame_err - + vport->err_stats.rx_over_err - + vport->err_stats.rx_crc_err; - stats_req.stats.rx_frame_err = vport->err_stats.rx_frame_err; - stats_req.stats.rx_over_err = vport->err_stats.rx_over_err; - stats_req.stats.rx_crc_err = vport->err_stats.rx_crc_err; - stats_req.stats.tx_dropped = vport->err_stats.tx_dropped; - stats_req.stats.tx_errors = vport->err_stats.tx_errors; - stats_req.stats.collisions = vport->err_stats.collisions; - - spin_unlock_bh(&vport->err_stats.lock); - - err = 0; - } else - err = -EOPNOTSUPP; + err = vport_set_stats(vport, &stats_req.stats); out: vport_unlock(); - - if (!err) - if (copy_to_user(ustats_req, &stats_req, sizeof(struct odp_vport_stats_req))) - err = -EFAULT; - + rtnl_unlock(); return err; } + /** - * vport_ether_get - retrieve device Ethernet address (for userspace callers) + * vport_user_ether_get - retrieve device Ethernet address (for userspace callers) * * @uvport_ether: Ethernet address request parameters. * * Retrieves the Ethernet address of the given device. This function is for * userspace callers and assumes no locks are held. */ -int -vport_ether_get(struct odp_vport_ether __user *uvport_ether) +int vport_user_ether_get(struct odp_vport_ether __user *uvport_ether) { struct odp_vport_ether vport_ether; struct vport *vport; @@ -475,7 +298,9 @@ vport_ether_get(struct odp_vport_ether __user *uvport_ether) goto out; } + rcu_read_lock(); memcpy(vport_ether.ether_addr, vport_get_addr(vport), ETH_ALEN); + rcu_read_unlock(); out: vport_unlock(); @@ -488,7 +313,7 @@ out: } /** - * vport_ether_set - set device Ethernet address (for userspace callers) + * vport_user_ether_set - set device Ethernet address (for userspace callers) * * @uvport_ether: Ethernet address request parameters. * @@ -497,8 +322,7 @@ out: * -EOPNOTSUPP. This function is for userspace callers and assumes no locks * are held. */ -int -vport_ether_set(struct odp_vport_ether __user *uvport_ether) +int vport_user_ether_set(struct odp_vport_ether __user *uvport_ether) { struct odp_vport_ether vport_ether; struct vport *vport; @@ -527,15 +351,14 @@ out: } /** - * vport_mut_get - retrieve device MTU (for userspace callers) + * vport_user_mtu_get - retrieve device MTU (for userspace callers) * * @uvport_mtu: MTU request parameters. * * Retrieves the MTU of the given device. This function is for userspace * callers and assumes no locks are held. */ -int -vport_mtu_get(struct odp_vport_mtu __user *uvport_mtu) +int vport_user_mtu_get(struct odp_vport_mtu __user *uvport_mtu) { struct odp_vport_mtu vport_mtu; struct vport *vport; @@ -567,7 +390,7 @@ out: } /** - * vport_mtu_set - set device MTU (for userspace callers) + * vport_user_mtu_set - set device MTU (for userspace callers) * * @uvport_mtu: MTU request parameters. * @@ -575,8 +398,7 @@ out: * MTU, in which case the result will always be -EOPNOTSUPP. This function is * for userspace callers and assumes no locks are held. */ -int -vport_mtu_set(struct odp_vport_mtu __user *uvport_mtu) +int vport_user_mtu_set(struct odp_vport_mtu __user *uvport_mtu) { struct odp_vport_mtu vport_mtu; struct vport *vport; @@ -604,8 +426,7 @@ out: return err; } -static struct hlist_head * -hash_bucket(const char *name) +static struct hlist_head *hash_bucket(const char *name) { unsigned int hash = full_name_hash(name, strlen(name)); return &dev_table[hash & (VPORT_HASH_BUCKETS - 1)]; @@ -620,37 +441,53 @@ hash_bucket(const char *name) * and held while using the found port. See the locking comments at the * top of the file. */ -struct vport * -vport_locate(const char *name) +struct vport *vport_locate(const char *name) { struct hlist_head *bucket = hash_bucket(name); struct vport *vport; struct hlist_node *node; if (unlikely(!mutex_is_locked(&vport_mutex) && !rtnl_is_locked())) { - printk(KERN_ERR "openvswitch: neither RTNL nor vport lock held in vport_locate\n"); + pr_err("neither RTNL nor vport lock held in vport_locate\n"); dump_stack(); } + rcu_read_lock(); + hlist_for_each_entry(vport, node, bucket, hash_node) if (!strcmp(name, vport_get_name(vport))) - return vport; + goto out; + + vport = NULL; - return NULL; +out: + rcu_read_unlock(); + return vport; } -static void -register_vport(struct vport *vport) +static void register_vport(struct vport *vport) { hlist_add_head(&vport->hash_node, hash_bucket(vport_get_name(vport))); } -static void -unregister_vport(struct vport *vport) +static void unregister_vport(struct vport *vport) { hlist_del(&vport->hash_node); } +static void release_vport(struct kobject *kobj) +{ + struct vport *p = container_of(kobj, struct vport, kobj); + kfree(p); +} + +static struct kobj_type brport_ktype = { +#ifdef CONFIG_SYSFS + .sysfs_ops = &brport_sysfs_ops, +#endif + .release = release_vport +}; + /** * vport_alloc - allocate and initialize new vport * @@ -662,8 +499,7 @@ unregister_vport(struct vport *vport) * vport_priv(). vports that are no longer needed should be released with * vport_free(). */ -struct vport * -vport_alloc(int priv_size, const struct vport_ops *ops) +struct vport *vport_alloc(int priv_size, const struct vport_ops *ops, const struct vport_parms *parms) { struct vport *vport; size_t alloc_size; @@ -678,14 +514,22 @@ vport_alloc(int priv_size, const struct vport_ops *ops) if (!vport) return ERR_PTR(-ENOMEM); + vport->dp = parms->dp; + vport->port_no = parms->port_no; + atomic_set(&vport->sflow_pool, 0); vport->ops = ops; + /* Initialize kobject for bridge. This will be added as + * /sys/class/net//brport later, if sysfs is enabled. */ + vport->kobj.kset = NULL; + kobject_init(&vport->kobj, &brport_ktype); + if (vport->ops->flags & VPORT_F_GEN_STATS) { vport->percpu_stats = alloc_percpu(struct vport_percpu_stats); if (!vport->percpu_stats) return ERR_PTR(-ENOMEM); - spin_lock_init(&vport->err_stats.lock); + spin_lock_init(&vport->stats_lock); } return vport; @@ -698,28 +542,24 @@ vport_alloc(int priv_size, const struct vport_ops *ops) * * Frees a vport allocated with vport_alloc() when it is no longer needed. */ -void -vport_free(struct vport *vport) +void vport_free(struct vport *vport) { if (vport->ops->flags & VPORT_F_GEN_STATS) free_percpu(vport->percpu_stats); - kfree(vport); + kobject_put(&vport->kobj); } /** - * __vport_add - add vport device (for kernel callers) + * vport_add - add vport device (for kernel callers) * - * @name: Name of new device. - * @type: Type of new device (to be matched against types in registered vport - * ops). - * @config: Device type specific configuration. Userspace pointer. + * @parms: Information about new vport. * - * Creates a new vport with the specified configuration (which is dependent - * on device type). Both RTNL and vport locks must be held. + * Creates a new vport with the specified configuration (which is dependent on + * device type) and attaches it to a datapath. Both RTNL and vport locks must + * be held. */ -struct vport * -__vport_add(const char *name, const char *type, const void __user *config) +struct vport *vport_add(const struct vport_parms *parms) { struct vport *vport; int err = 0; @@ -729,8 +569,8 @@ __vport_add(const char *name, const char *type, const void __user *config) ASSERT_VPORT(); for (i = 0; i < n_vport_types; i++) { - if (!strcmp(vport_ops_list[i]->type, type)) { - vport = vport_ops_list[i]->create(name, config); + if (!strcmp(vport_ops_list[i]->type, parms->type)) { + vport = vport_ops_list[i]->create(parms); if (IS_ERR(vport)) { err = PTR_ERR(vport); goto out; @@ -748,111 +588,43 @@ out: } /** - * __vport_mod - modify existing vport device (for kernel callers) + * vport_mod - modify existing vport device (for kernel callers) * * @vport: vport to modify. - * @config: Device type specific configuration. Userspace pointer. + * @port: New configuration. * * Modifies an existing device with the specified configuration (which is * dependent on device type). Both RTNL and vport locks must be held. */ -int -__vport_mod(struct vport *vport, const void __user *config) +int vport_mod(struct vport *vport, struct odp_port *port) { ASSERT_RTNL(); ASSERT_VPORT(); if (vport->ops->modify) - return vport->ops->modify(vport, config); + return vport->ops->modify(vport, port); else return -EOPNOTSUPP; } /** - * __vport_del - delete existing vport device (for kernel callers) + * vport_del - delete existing vport device (for kernel callers) * * @vport: vport to delete. * - * Deletes the specified device. The device must not be currently attached to - * a datapath. It is possible to fail for reasons such as lack of memory. - * Both RTNL and vport locks must be held. + * Detaches @vport from its datapath and destroys it. It is possible to fail + * for reasons such as lack of memory. Both RTNL and vport locks must be held. */ -int -__vport_del(struct vport *vport) +int vport_del(struct vport *vport) { ASSERT_RTNL(); ASSERT_VPORT(); - BUG_ON(vport_get_dp_port(vport)); unregister_vport(vport); return vport->ops->destroy(vport); } -/** - * vport_attach - attach a vport to a datapath - * - * @vport: vport to attach. - * @dp_port: Datapath port to attach the vport to. - * - * Attaches a vport to a specific datapath so that packets may be exchanged. - * Both ports must be currently unattached. @dp_port must be successfully - * attached to a vport before it is connected to a datapath and must not be - * modified while connected. RTNL lock and the appropriate DP mutex must be held. - */ -int -vport_attach(struct vport *vport, struct dp_port *dp_port) -{ - ASSERT_RTNL(); - - if (dp_port->vport) - return -EBUSY; - - if (vport_get_dp_port(vport)) - return -EBUSY; - - if (vport->ops->attach) { - int err; - - err = vport->ops->attach(vport); - if (err) - return err; - } - - dp_port->vport = vport; - rcu_assign_pointer(vport->dp_port, dp_port); - - return 0; -} - -/** - * vport_detach - detach a vport from a datapath - * - * @vport: vport to detach. - * - * Detaches a vport from a datapath. May fail for a variety of reasons, - * including lack of memory. RTNL lock and the appropriate DP mutex must be held. - */ -int -vport_detach(struct vport *vport) -{ - struct dp_port *dp_port; - - ASSERT_RTNL(); - - dp_port = vport_get_dp_port(vport); - if (!dp_port) - return -EINVAL; - - dp_port->vport = NULL; - rcu_assign_pointer(vport->dp_port, NULL); - - if (vport->ops->detach) - return vport->ops->detach(vport); - else - return 0; -} - /** * vport_set_mtu - set device MTU (for kernel callers) * @@ -863,17 +635,23 @@ vport_detach(struct vport *vport) * MTU, in which case the result will always be -EOPNOTSUPP. RTNL lock must * be held. */ -int -vport_set_mtu(struct vport *vport, int mtu) +int vport_set_mtu(struct vport *vport, int mtu) { ASSERT_RTNL(); if (mtu < 68) return -EINVAL; - if (vport->ops->set_mtu) - return vport->ops->set_mtu(vport, mtu); - else + if (vport->ops->set_mtu) { + int ret; + + ret = vport->ops->set_mtu(vport, mtu); + + if (!ret && !is_internal_vport(vport)) + set_internal_devs_mtu(vport->dp); + + return ret; + } else return -EOPNOTSUPP; } @@ -887,8 +665,7 @@ vport_set_mtu(struct vport *vport, int mtu) * setting the Ethernet address, in which case the result will always be * -EOPNOTSUPP. RTNL lock must be held. */ -int -vport_set_addr(struct vport *vport, const unsigned char *addr) +int vport_set_addr(struct vport *vport, const unsigned char *addr) { ASSERT_RTNL(); @@ -901,6 +678,31 @@ vport_set_addr(struct vport *vport, const unsigned char *addr) return -EOPNOTSUPP; } +/** + * vport_set_stats - sets offset device stats (for kernel callers) + * + * @vport: vport on which to set stats + * @stats: stats to set + * + * Provides a set of transmit, receive, and error stats to be added as an + * offset to the collect data when stats are retreived. Some devices may not + * support setting the stats, in which case the result will always be + * -EOPNOTSUPP. RTNL lock must be held. + */ +int vport_set_stats(struct vport *vport, struct rtnl_link_stats64 *stats) +{ + ASSERT_RTNL(); + + if (vport->ops->flags & VPORT_F_GEN_STATS) { + spin_lock_bh(&vport->stats_lock); + vport->offset_stats = *stats; + spin_unlock_bh(&vport->stats_lock); + + return 0; + } else + return -EOPNOTSUPP; +} + /** * vport_get_name - retrieve device name * @@ -909,8 +711,7 @@ vport_set_addr(struct vport *vport, const unsigned char *addr) * Retrieves the name of the given device. Either RTNL lock or rcu_read_lock * must be held for the entire duration that the name is in use. */ -const char * -vport_get_name(const struct vport *vport) +const char *vport_get_name(const struct vport *vport) { return vport->ops->get_name(vport); } @@ -923,8 +724,7 @@ vport_get_name(const struct vport *vport) * Retrieves the type of the given device. Either RTNL lock or rcu_read_lock * must be held for the entire duration that the type is in use. */ -const char * -vport_get_type(const struct vport *vport) +const char *vport_get_type(const struct vport *vport) { return vport->ops->type; } @@ -938,27 +738,11 @@ vport_get_type(const struct vport *vport) * rcu_read_lock must be held for the entire duration that the Ethernet address * is in use. */ -const unsigned char * -vport_get_addr(const struct vport *vport) +const unsigned char *vport_get_addr(const struct vport *vport) { return vport->ops->get_addr(vport); } -/** - * vport_get_dp_port - retrieve attached datapath port - * - * @vport: vport from which to retrieve the datapath port. - * - * Retrieves the attached datapath port or null if not attached. Either RTNL - * lock or rcu_read_lock must be held for the entire duration that the datapath - * port is being accessed. - */ -struct dp_port * -vport_get_dp_port(const struct vport *vport) -{ - return rcu_dereference(vport->dp_port); -} - /** * vport_get_kobj - retrieve associated kobj * @@ -967,8 +751,7 @@ vport_get_dp_port(const struct vport *vport) * Retrieves the associated kobj or null if no kobj. The returned kobj is * valid for as long as the vport exists. */ -struct kobject * -vport_get_kobj(const struct vport *vport) +struct kobject *vport_get_kobj(const struct vport *vport) { if (vport->ops->get_kobj) return vport->ops->get_kobj(vport); @@ -976,6 +759,100 @@ vport_get_kobj(const struct vport *vport) return NULL; } +static int vport_call_get_stats(struct vport *vport, struct rtnl_link_stats64 *stats) +{ + int err; + + rcu_read_lock(); + err = vport->ops->get_stats(vport, stats); + rcu_read_unlock(); + + return err; +} + +/** + * vport_get_stats - retrieve device stats (for kernel callers) + * + * @vport: vport from which to retrieve the stats + * @stats: location to store stats + * + * Retrieves transmit, receive, and error stats for the given device. + */ +int vport_get_stats(struct vport *vport, struct rtnl_link_stats64 *stats) +{ + int i; + + if (!(vport->ops->flags & VPORT_F_GEN_STATS)) + return vport_call_get_stats(vport, stats); + + /* We potentially have 3 sources of stats that need to be + * combined: those we have collected (split into err_stats and + * percpu_stats), offset_stats from set_stats(), and device + * error stats from get_stats() (for errors that happen + * downstream and therefore aren't reported through our + * vport_record_error() function). */ + + spin_lock_bh(&vport->stats_lock); + + *stats = vport->offset_stats; + + stats->rx_errors += vport->err_stats.rx_errors; + stats->tx_errors += vport->err_stats.tx_errors; + stats->tx_dropped += vport->err_stats.tx_dropped; + stats->rx_dropped += vport->err_stats.rx_dropped; + + spin_unlock_bh(&vport->stats_lock); + + if (vport->ops->get_stats) { + struct rtnl_link_stats64 dev_stats; + int err; + + err = vport_call_get_stats(vport, &dev_stats); + if (err) + return err; + + stats->rx_errors += dev_stats.rx_errors; + stats->tx_errors += dev_stats.tx_errors; + stats->rx_dropped += dev_stats.rx_dropped; + stats->tx_dropped += dev_stats.tx_dropped; + stats->multicast += dev_stats.multicast; + stats->collisions += dev_stats.collisions; + stats->rx_length_errors += dev_stats.rx_length_errors; + stats->rx_over_errors += dev_stats.rx_over_errors; + stats->rx_crc_errors += dev_stats.rx_crc_errors; + stats->rx_frame_errors += dev_stats.rx_frame_errors; + stats->rx_fifo_errors += dev_stats.rx_fifo_errors; + stats->rx_missed_errors += dev_stats.rx_missed_errors; + stats->tx_aborted_errors += dev_stats.tx_aborted_errors; + stats->tx_carrier_errors += dev_stats.tx_carrier_errors; + stats->tx_fifo_errors += dev_stats.tx_fifo_errors; + stats->tx_heartbeat_errors += dev_stats.tx_heartbeat_errors; + stats->tx_window_errors += dev_stats.tx_window_errors; + stats->rx_compressed += dev_stats.rx_compressed; + stats->tx_compressed += dev_stats.tx_compressed; + } + + for_each_possible_cpu(i) { + const struct vport_percpu_stats *percpu_stats; + struct vport_percpu_stats local_stats; + unsigned seqcount; + + percpu_stats = per_cpu_ptr(vport->percpu_stats, i); + + do { + seqcount = read_seqcount_begin(&percpu_stats->seqlock); + local_stats = *percpu_stats; + } while (read_seqcount_retry(&percpu_stats->seqlock, seqcount)); + + stats->rx_bytes += local_stats.rx_bytes; + stats->rx_packets += local_stats.rx_packets; + stats->tx_bytes += local_stats.tx_bytes; + stats->tx_packets += local_stats.tx_packets; + } + + return 0; +} + /** * vport_get_flags - retrieve device flags * @@ -984,8 +861,7 @@ vport_get_kobj(const struct vport *vport) * Retrieves the flags of the given device. Either RTNL lock or rcu_read_lock * must be held. */ -unsigned -vport_get_flags(const struct vport *vport) +unsigned vport_get_flags(const struct vport *vport) { return vport->ops->get_dev_flags(vport); } @@ -998,8 +874,7 @@ vport_get_flags(const struct vport *vport) * Checks whether the given device is running. Either RTNL lock or * rcu_read_lock must be held. */ -int -vport_is_running(const struct vport *vport) +int vport_is_running(const struct vport *vport) { return vport->ops->is_running(vport); } @@ -1012,8 +887,7 @@ vport_is_running(const struct vport *vport) * Retrieves the RFC2863 operstate of the given device. Either RTNL lock or * rcu_read_lock must be held. */ -unsigned char -vport_get_operstate(const struct vport *vport) +unsigned char vport_get_operstate(const struct vport *vport) { return vport->ops->get_operstate(vport); } @@ -1023,26 +897,17 @@ vport_get_operstate(const struct vport *vport) * * @vport: vport from which to retrieve index * - * Retrieves the system interface index of the given device. Not all devices - * will have system indexes, in which case the index of the datapath local - * port is returned. Returns a negative index on error. Either RTNL lock or + * Retrieves the system interface index of the given device or 0 if + * the device does not have one (in the case of virtual ports). + * Returns a negative index on error. Either RTNL lock or * rcu_read_lock must be held. */ -int -vport_get_ifindex(const struct vport *vport) +int vport_get_ifindex(const struct vport *vport) { - const struct dp_port *dp_port; - if (vport->ops->get_ifindex) return vport->ops->get_ifindex(vport); - - /* If we don't actually have an ifindex, use the local port's. - * Userspace doesn't check it anyways. */ - dp_port = vport_get_dp_port(vport); - if (!dp_port) - return -EAGAIN; - - return vport_get_ifindex(dp_port->dp->ports[ODPP_LOCAL]->vport); + else + return 0; } /** @@ -1056,8 +921,7 @@ vport_get_ifindex(const struct vport *vport) * Returns a negative index on error. Either RTNL lock or rcu_read_lock must * be held. */ -int -vport_get_iflink(const struct vport *vport) +int vport_get_iflink(const struct vport *vport) { if (vport->ops->get_iflink) return vport->ops->get_iflink(vport); @@ -1075,12 +939,27 @@ vport_get_iflink(const struct vport *vport) * Retrieves the MTU of the given device. Either RTNL lock or rcu_read_lock * must be held. */ -int -vport_get_mtu(const struct vport *vport) +int vport_get_mtu(const struct vport *vport) { return vport->ops->get_mtu(vport); } +/** + * vport_get_config - retrieve device configuration + * + * @vport: vport from which to retrieve the configuration. + * @config: buffer to store config, which must be at least the length + * of VPORT_CONFIG_SIZE. + * + * Retrieves the configuration of the given device. Either RTNL lock or + * rcu_read_lock must be held. + */ +void vport_get_config(const struct vport *vport, void *config) +{ + if (vport->ops->get_config) + vport->ops->get_config(vport, config); +} + /** * vport_receive - pass up received packet to the datapath for processing * @@ -1091,34 +970,39 @@ vport_get_mtu(const struct vport *vport) * skb->data should point to the Ethernet header. The caller must have already * called compute_ip_summed() to initialize the checksumming fields. */ -void -vport_receive(struct vport *vport, struct sk_buff *skb) +void vport_receive(struct vport *vport, struct sk_buff *skb) { - struct dp_port *dp_port = vport_get_dp_port(vport); - - if (!dp_port) { - vport_record_error(vport, VPORT_E_RX_DROPPED); - kfree_skb(skb); - - return; - } - if (vport->ops->flags & VPORT_F_GEN_STATS) { struct vport_percpu_stats *stats; local_bh_disable(); - stats = per_cpu_ptr(vport->percpu_stats, smp_processor_id()); + + write_seqcount_begin(&stats->seqlock); stats->rx_packets++; stats->rx_bytes += skb->len; + write_seqcount_end(&stats->seqlock); local_bh_enable(); } + if (!(vport->ops->flags & VPORT_F_FLOW)) + OVS_CB(skb)->flow = NULL; + if (!(vport->ops->flags & VPORT_F_TUN_ID)) OVS_CB(skb)->tun_id = 0; - dp_process_received_packet(dp_port, skb); + dp_process_received_packet(vport, skb); +} + +static inline unsigned packet_length(const struct sk_buff *skb) +{ + unsigned length = skb->len - ETH_HLEN; + + if (skb->protocol == htons(ETH_P_8021Q)) + length -= VLAN_HLEN; + + return length; } /** @@ -1130,26 +1014,41 @@ vport_receive(struct vport *vport, struct sk_buff *skb) * Sends the given packet and returns the length of data sent. Either RTNL * lock or rcu_read_lock must be held. */ -int -vport_send(struct vport *vport, struct sk_buff *skb) +int vport_send(struct vport *vport, struct sk_buff *skb) { + int mtu; int sent; + mtu = vport_get_mtu(vport); + if (unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) { + if (net_ratelimit()) + pr_warn("%s: dropped over-mtu packet: %d > %d\n", + dp_name(vport->dp), packet_length(skb), mtu); + goto error; + } + sent = vport->ops->send(vport, skb); if (vport->ops->flags & VPORT_F_GEN_STATS && sent > 0) { struct vport_percpu_stats *stats; local_bh_disable(); - stats = per_cpu_ptr(vport->percpu_stats, smp_processor_id()); + + write_seqcount_begin(&stats->seqlock); stats->tx_packets++; stats->tx_bytes += sent; + write_seqcount_end(&stats->seqlock); local_bh_enable(); } return sent; + +error: + kfree_skb(skb); + vport_record_error(vport, VPORT_E_TX_DROPPED); + return 0; } /** @@ -1161,12 +1060,11 @@ vport_send(struct vport *vport, struct sk_buff *skb) * If using the vport generic stats layer indicate that an error of the given * type has occured. */ -void -vport_record_error(struct vport *vport, enum vport_err_type err_type) +void vport_record_error(struct vport *vport, enum vport_err_type err_type) { if (vport->ops->flags & VPORT_F_GEN_STATS) { - spin_lock_bh(&vport->err_stats.lock); + spin_lock_bh(&vport->stats_lock); switch (err_type) { case VPORT_E_RX_DROPPED: @@ -1177,18 +1075,6 @@ vport_record_error(struct vport *vport, enum vport_err_type err_type) vport->err_stats.rx_errors++; break; - case VPORT_E_RX_FRAME: - vport->err_stats.rx_frame_err++; - break; - - case VPORT_E_RX_OVER: - vport->err_stats.rx_over_err++; - break; - - case VPORT_E_RX_CRC: - vport->err_stats.rx_crc_err++; - break; - case VPORT_E_TX_DROPPED: vport->err_stats.tx_dropped++; break; @@ -1196,34 +1082,8 @@ vport_record_error(struct vport *vport, enum vport_err_type err_type) case VPORT_E_TX_ERROR: vport->err_stats.tx_errors++; break; - - case VPORT_E_COLLISION: - vport->err_stats.collisions++; - break; }; - spin_unlock_bh(&vport->err_stats.lock); + spin_unlock_bh(&vport->stats_lock); } } - -/** - * vport_gen_ether_addr - generate an Ethernet address - * - * @addr: location to store generated address - * - * Generates a random Ethernet address for use when creating a device that - * has no natural address. - */ -void -vport_gen_ether_addr(u8 *addr) -{ - random_ether_addr(addr); - - /* Set the OUI to the Nicira one. */ - addr[0] = 0x00; - addr[1] = 0x23; - addr[2] = 0x20; - - /* Set the top bit to indicate random address. */ - addr[3] |= 0x80; -}