X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport.c;h=a6b686c85928c1ea389b447f8a997d1fa2a02310;hb=7229a773ead96f891b621cd5f3e1219af5f24dd7;hp=1416ed0cbbbecea01ce0eddffc4b22f99d1ce6d1;hpb=a80a9fbd061fe9023cd669d6fe0a4faea7e31af3;p=openvswitch diff --git a/datapath/vport.c b/datapath/vport.c index 1416ed0c..a6b686c8 100644 --- a/datapath/vport.c +++ b/datapath/vport.c @@ -6,8 +6,6 @@ * kernel, by Linus Torvalds and others. */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include #include #include @@ -16,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -38,55 +37,10 @@ static const struct vport_ops *base_vport_ops_list[] = { static const struct vport_ops **vport_ops_list; static int n_vport_types; +/* Protected by RCU read lock for reading, RTNL lock for writing. */ static struct hlist_head *dev_table; #define VPORT_HASH_BUCKETS 1024 -/* Both RTNL lock and vport_mutex need to be held when updating dev_table. - * - * If you use vport_locate and then perform some operations, you need to hold - * 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 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: - * 1. RTNL - * 2. DP - * 3. vport - */ -static DEFINE_MUTEX(vport_mutex); - -/** - * vport_lock - acquire vport lock - * - * Acquire global vport lock. See above comment about locking requirements - * and specific function definitions. May sleep. - */ -void vport_lock(void) -{ - mutex_lock(&vport_mutex); -} - -/** - * vport_unlock - release vport lock - * - * Release lock acquired with vport_lock. - */ -void vport_unlock(void) -{ - mutex_unlock(&vport_mutex); -} - -#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 * @@ -155,277 +109,6 @@ void vport_exit(void) kfree(dev_table); } -/** - * vport_user_mod - modify existing vport device (for userspace callers) - * - * @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. - */ -int vport_user_mod(const struct odp_port __user *uport) -{ - struct odp_port port; - struct vport *vport; - int err; - - if (copy_from_user(&port, uport, sizeof(port))) - return -EFAULT; - - port.devname[IFNAMSIZ - 1] = '\0'; - - rtnl_lock(); - - vport = vport_locate(port.devname); - if (!vport) { - err = -ENODEV; - goto out; - } - - vport_lock(); - err = vport_mod(vport, &port); - vport_unlock(); - -out: - rtnl_unlock(); - return err; -} - -/** - * vport_user_stats_get - retrieve device stats (for userspace callers) - * - * @ustats_req: Stats request parameters. - * - * Retrieves transmit, receive, and error stats for the given device. This - * function is for userspace callers and assumes no locks are held. - */ -int vport_user_stats_get(struct odp_vport_stats_req __user *ustats_req) -{ - struct odp_vport_stats_req stats_req; - struct vport *vport; - int err; - - if (copy_from_user(&stats_req, ustats_req, sizeof(struct odp_vport_stats_req))) - return -EFAULT; - - stats_req.devname[IFNAMSIZ - 1] = '\0'; - - vport_lock(); - - vport = vport_locate(stats_req.devname); - if (!vport) { - err = -ENODEV; - goto out; - } - - err = vport_get_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; - - return err; -} - -/** - * vport_user_stats_set - sets offset device stats (for userspace callers) - * - * @ustats_req: Stats set parameters. - * - * 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_user_stats_set(struct odp_vport_stats_req __user *ustats_req) -{ - struct odp_vport_stats_req stats_req; - struct vport *vport; - int err; - - if (copy_from_user(&stats_req, ustats_req, sizeof(struct odp_vport_stats_req))) - return -EFAULT; - - stats_req.devname[IFNAMSIZ - 1] = '\0'; - - rtnl_lock(); - vport_lock(); - - vport = vport_locate(stats_req.devname); - if (!vport) { - err = -ENODEV; - goto out; - } - - err = vport_set_stats(vport, &stats_req.stats); - -out: - vport_unlock(); - rtnl_unlock(); - return err; -} - - -/** - * 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_user_ether_get(struct odp_vport_ether __user *uvport_ether) -{ - struct odp_vport_ether vport_ether; - struct vport *vport; - int err = 0; - - if (copy_from_user(&vport_ether, uvport_ether, sizeof(struct odp_vport_ether))) - return -EFAULT; - - vport_ether.devname[IFNAMSIZ - 1] = '\0'; - - vport_lock(); - - vport = vport_locate(vport_ether.devname); - if (!vport) { - err = -ENODEV; - goto out; - } - - rcu_read_lock(); - memcpy(vport_ether.ether_addr, vport_get_addr(vport), ETH_ALEN); - rcu_read_unlock(); - -out: - vport_unlock(); - - if (!err) - if (copy_to_user(uvport_ether, &vport_ether, sizeof(struct odp_vport_ether))) - err = -EFAULT; - - return err; -} - -/** - * vport_user_ether_set - set device Ethernet address (for userspace callers) - * - * @uvport_ether: Ethernet address request parameters. - * - * Sets the Ethernet address of the given device. Some devices may not support - * setting the Ethernet address, in which case the result will always be - * -EOPNOTSUPP. This function is for userspace callers and assumes no locks - * are held. - */ -int vport_user_ether_set(struct odp_vport_ether __user *uvport_ether) -{ - struct odp_vport_ether vport_ether; - struct vport *vport; - int err; - - if (copy_from_user(&vport_ether, uvport_ether, sizeof(struct odp_vport_ether))) - return -EFAULT; - - vport_ether.devname[IFNAMSIZ - 1] = '\0'; - - rtnl_lock(); - vport_lock(); - - vport = vport_locate(vport_ether.devname); - if (!vport) { - err = -ENODEV; - goto out; - } - - err = vport_set_addr(vport, vport_ether.ether_addr); - -out: - vport_unlock(); - rtnl_unlock(); - return err; -} - -/** - * 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_user_mtu_get(struct odp_vport_mtu __user *uvport_mtu) -{ - struct odp_vport_mtu vport_mtu; - struct vport *vport; - int err = 0; - - if (copy_from_user(&vport_mtu, uvport_mtu, sizeof(struct odp_vport_mtu))) - return -EFAULT; - - vport_mtu.devname[IFNAMSIZ - 1] = '\0'; - - vport_lock(); - - vport = vport_locate(vport_mtu.devname); - if (!vport) { - err = -ENODEV; - goto out; - } - - vport_mtu.mtu = vport_get_mtu(vport); - -out: - vport_unlock(); - - if (!err) - if (copy_to_user(uvport_mtu, &vport_mtu, sizeof(struct odp_vport_mtu))) - err = -EFAULT; - - return err; -} - -/** - * vport_user_mtu_set - set device MTU (for userspace callers) - * - * @uvport_mtu: MTU request parameters. - * - * Sets the MTU of the given device. Some devices may not support setting the - * MTU, in which case the result will always be -EOPNOTSUPP. This function is - * for userspace callers and assumes no locks are held. - */ -int vport_user_mtu_set(struct odp_vport_mtu __user *uvport_mtu) -{ - struct odp_vport_mtu vport_mtu; - struct vport *vport; - int err; - - if (copy_from_user(&vport_mtu, uvport_mtu, sizeof(struct odp_vport_mtu))) - return -EFAULT; - - vport_mtu.devname[IFNAMSIZ - 1] = '\0'; - - rtnl_lock(); - vport_lock(); - - vport = vport_locate(vport_mtu.devname); - if (!vport) { - err = -ENODEV; - goto out; - } - - err = vport_set_mtu(vport, vport_mtu.mtu); - -out: - vport_unlock(); - rtnl_unlock(); - return err; -} - static struct hlist_head *hash_bucket(const char *name) { unsigned int hash = full_name_hash(name, strlen(name)); @@ -437,9 +120,7 @@ static struct hlist_head *hash_bucket(const char *name) * * @name: name of port to find * - * Either RTNL or vport lock must be acquired before calling this function - * and held while using the found port. See the locking comments at the - * top of the file. + * Must be called with RTNL or RCU read lock. */ struct vport *vport_locate(const char *name) { @@ -447,32 +128,11 @@ struct vport *vport_locate(const char *name) struct vport *vport; struct hlist_node *node; - if (unlikely(!mutex_is_locked(&vport_mutex) && !rtnl_is_locked())) { - 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))) - goto out; - - vport = NULL; - -out: - rcu_read_unlock(); - return vport; -} - -static void register_vport(struct vport *vport) -{ - hlist_add_head(&vport->hash_node, hash_bucket(vport_get_name(vport))); -} + hlist_for_each_entry_rcu(vport, node, bucket, hash_node) + if (!strcmp(name, vport->ops->get_name(vport))) + return vport; -static void unregister_vport(struct vport *vport) -{ - hlist_del(&vport->hash_node); + return NULL; } static void release_vport(struct kobject *kobj) @@ -499,7 +159,8 @@ static struct kobj_type brport_ktype = { * 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, const struct vport_parms *parms) +struct vport *vport_alloc(int priv_size, const struct vport_ops *ops, + const struct vport_parms *parms) { struct vport *vport; size_t alloc_size; @@ -516,7 +177,7 @@ struct vport *vport_alloc(int priv_size, const struct vport_ops *ops, const stru vport->dp = parms->dp; vport->port_no = parms->port_no; - atomic_set(&vport->sflow_pool, 0); + vport->upcall_pid = parms->upcall_pid; vport->ops = ops; /* Initialize kobject for bridge. This will be added as @@ -524,13 +185,11 @@ struct vport *vport_alloc(int priv_size, const struct vport_ops *ops, const stru 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); + vport->percpu_stats = alloc_percpu(struct vport_percpu_stats); + if (!vport->percpu_stats) + return ERR_PTR(-ENOMEM); - spin_lock_init(&vport->stats_lock); - } + spin_lock_init(&vport->stats_lock); return vport; } @@ -541,11 +200,13 @@ struct vport *vport_alloc(int priv_size, const struct vport_ops *ops, const stru * @vport: vport to free * * Frees a vport allocated with vport_alloc() when it is no longer needed. + * + * The caller must ensure that an RCU grace period has passed since the last + * time @vport was in a datapath. */ void vport_free(struct vport *vport) { - if (vport->ops->flags & VPORT_F_GEN_STATS) - free_percpu(vport->percpu_stats); + free_percpu(vport->percpu_stats); kobject_put(&vport->kobj); } @@ -556,8 +217,7 @@ void vport_free(struct vport *vport) * @parms: Information about new vport. * * 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. + * device type). RTNL lock must be held. */ struct vport *vport_add(const struct vport_parms *parms) { @@ -566,17 +226,17 @@ struct vport *vport_add(const struct vport_parms *parms) int i; ASSERT_RTNL(); - ASSERT_VPORT(); for (i = 0; i < n_vport_types; i++) { - if (!strcmp(vport_ops_list[i]->type, parms->type)) { + if (vport_ops_list[i]->type == parms->type) { vport = vport_ops_list[i]->create(parms); if (IS_ERR(vport)) { err = PTR_ERR(vport); goto out; } - register_vport(vport); + hlist_add_head_rcu(&vport->hash_node, + hash_bucket(vport->ops->get_name(vport))); return vport; } } @@ -588,71 +248,38 @@ out: } /** - * vport_mod - modify existing vport device (for kernel callers) + * vport_set_options - modify existing vport device (for kernel callers) * * @vport: vport to modify. * @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. + * dependent on device type). RTNL lock must be held. */ -int vport_mod(struct vport *vport, struct odp_port *port) +int vport_set_options(struct vport *vport, struct nlattr *options) { ASSERT_RTNL(); - ASSERT_VPORT(); - if (vport->ops->modify) - return vport->ops->modify(vport, port); - else + if (!vport->ops->set_options) return -EOPNOTSUPP; + return vport->ops->set_options(vport, options); } /** - * vport_del - delete existing vport device (for kernel callers) + * vport_del - delete existing vport device * * @vport: vport to delete. * * 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. + * for reasons such as lack of memory. RTNL lock must be held. */ -int vport_del(struct vport *vport) +void vport_del(struct vport *vport) { ASSERT_RTNL(); - ASSERT_VPORT(); - unregister_vport(vport); + hlist_del_rcu(&vport->hash_node); - return vport->ops->destroy(vport); -} - -/** - * vport_set_mtu - set device MTU (for kernel callers) - * - * @vport: vport on which to set MTU. - * @mtu: New MTU. - * - * Sets the MTU of the given device. Some devices may not support setting the - * MTU, in which case the result will always be -EOPNOTSUPP. RTNL lock must - * be held. - */ -int vport_set_mtu(struct vport *vport, int mtu) -{ - ASSERT_RTNL(); - - if (mtu < 68) - return -EINVAL; - - 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; + vport->ops->destroy(vport); } /** @@ -679,7 +306,7 @@ int vport_set_addr(struct vport *vport, const unsigned char *addr) } /** - * vport_set_stats - sets offset device stats (for kernel callers) + * vport_set_stats - sets offset device stats * * @vport: vport on which to set stats * @stats: stats to set @@ -687,112 +314,43 @@ int vport_set_addr(struct vport *vport, const unsigned char *addr) * 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 if (vport->ops->set_stats) - return vport->ops->set_stats(vport, stats); - else - return -EOPNOTSUPP; -} - -/** - * vport_get_name - retrieve device name - * - * @vport: vport from which to retrieve the name. - * - * 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) -{ - return vport->ops->get_name(vport); -} - -/** - * vport_get_type - retrieve device type - * - * @vport: vport from which to retrieve the type. - * - * 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) -{ - return vport->ops->type; -} - -/** - * vport_get_addr - retrieve device Ethernet address (for kernel callers) - * - * @vport: vport from which to retrieve the Ethernet address. + * -EOPNOTSUPP. * - * Retrieves the Ethernet address of the given device. Either RTNL lock or - * rcu_read_lock must be held for the entire duration that the Ethernet address - * is in use. + * Must be called with RTNL lock. */ -const unsigned char *vport_get_addr(const struct vport *vport) +void vport_set_stats(struct vport *vport, struct ovs_vport_stats *stats) { - return vport->ops->get_addr(vport); -} - -/** - * vport_get_kobj - retrieve associated kobj - * - * @vport: vport from which to retrieve the associated kobj - * - * 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) -{ - if (vport->ops->get_kobj) - return vport->ops->get_kobj(vport); - else - 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(); + ASSERT_RTNL(); - return err; + spin_lock_bh(&vport->stats_lock); + vport->offset_stats = *stats; + spin_unlock_bh(&vport->stats_lock); } /** - * vport_get_stats - retrieve device stats (for kernel callers) + * vport_get_stats - retrieve device stats * * @vport: vport from which to retrieve the stats * @stats: location to store stats * * Retrieves transmit, receive, and error stats for the given device. + * + * Must be called with RTNL lock or rcu_read_lock. */ -int vport_get_stats(struct vport *vport, struct rtnl_link_stats64 *stats) +void vport_get_stats(struct vport *vport, struct ovs_vport_stats *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 + * error stats from netdev->get_stats() (for errors that happen * downstream and therefore aren't reported through our - * vport_record_error() function). */ + * vport_record_error() function). + * Stats from first two sources are merged and reported by ovs over + * OVS_VPORT_ATTR_STATS. + * netdev-stats can be directly read over netlink-ioctl. + */ spin_lock_bh(&vport->stats_lock); @@ -805,35 +363,6 @@ int vport_get_stats(struct vport *vport, struct rtnl_link_stats64 *stats) 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; @@ -851,115 +380,42 @@ int vport_get_stats(struct vport *vport, struct rtnl_link_stats64 *stats) stats->tx_bytes += local_stats.tx_bytes; stats->tx_packets += local_stats.tx_packets; } - - return 0; -} - -/** - * vport_get_flags - retrieve device flags - * - * @vport: vport from which to retrieve the flags - * - * 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) -{ - return vport->ops->get_dev_flags(vport); } /** - * vport_get_flags - check whether device is running + * vport_get_options - retrieve device options * - * @vport: vport on which to check status. + * @vport: vport from which to retrieve the options. + * @skb: sk_buff where options should be appended. * - * 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) -{ - return vport->ops->is_running(vport); -} - -/** - * vport_get_flags - retrieve device operating state - * - * @vport: vport from which to check status - * - * 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) -{ - return vport->ops->get_operstate(vport); -} - -/** - * vport_get_ifindex - retrieve device system interface index - * - * @vport: vport from which to retrieve index - * - * 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) -{ - if (vport->ops->get_ifindex) - return vport->ops->get_ifindex(vport); - else - return 0; -} - -/** - * vport_get_iflink - retrieve device system link index + * Retrieves the configuration of the given device, appending an + * %OVS_VPORT_ATTR_OPTIONS attribute that in turn contains nested + * vport-specific attributes to @skb. * - * @vport: vport from which to retrieve index + * Returns 0 if successful, -EMSGSIZE if @skb has insufficient room, or another + * negative error code if a real error occurred. If an error occurs, @skb is + * left unmodified. * - * Retrieves the system link index of the given device. The link is the index - * of the interface on which the packet will actually be sent. In most cases - * this is the same as the ifindex but may be different for tunnel devices. - * Returns a negative index on error. Either RTNL lock or rcu_read_lock must - * be held. + * Must be called with RTNL lock or rcu_read_lock. */ -int vport_get_iflink(const struct vport *vport) +int vport_get_options(const struct vport *vport, struct sk_buff *skb) { - if (vport->ops->get_iflink) - return vport->ops->get_iflink(vport); + struct nlattr *nla; - /* If we don't have an iflink, use the ifindex. In most cases they - * are the same. */ - return vport_get_ifindex(vport); -} + nla = nla_nest_start(skb, OVS_VPORT_ATTR_OPTIONS); + if (!nla) + return -EMSGSIZE; -/** - * vport_get_mtu - retrieve device MTU (for kernel callers) - * - * @vport: vport from which to retrieve MTU - * - * 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) -{ - return vport->ops->get_mtu(vport); -} + if (vport->ops->get_options) { + int err = vport->ops->get_options(vport, skb); + if (err) { + nla_nest_cancel(skb, nla); + return err; + } + } -/** - * 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); + nla_nest_end(skb, nla); + return 0; } /** @@ -974,19 +430,14 @@ void vport_get_config(const struct vport *vport, void *config) */ void vport_receive(struct vport *vport, struct sk_buff *skb) { - 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()); + struct vport_percpu_stats *stats; - write_seqcount_begin(&stats->seqlock); - stats->rx_packets++; - stats->rx_bytes += skb->len; - write_seqcount_end(&stats->seqlock); + stats = per_cpu_ptr(vport->percpu_stats, smp_processor_id()); - local_bh_enable(); - } + write_seqcount_begin(&stats->seqlock); + stats->rx_packets++; + stats->rx_bytes += skb->len; + write_seqcount_end(&stats->seqlock); if (!(vport->ops->flags & VPORT_F_FLOW)) OVS_CB(skb)->flow = NULL; @@ -997,16 +448,6 @@ void vport_receive(struct vport *vport, struct sk_buff *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; -} - /** * vport_send - send a packet on a device * @@ -1018,39 +459,19 @@ static inline unsigned packet_length(const 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); + int sent = vport->ops->send(vport, skb); - if (vport->ops->flags & VPORT_F_GEN_STATS && sent > 0) { + if (likely(sent)) { 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; } /** @@ -1064,28 +485,25 @@ error: */ void vport_record_error(struct vport *vport, enum vport_err_type err_type) { - if (vport->ops->flags & VPORT_F_GEN_STATS) { + spin_lock(&vport->stats_lock); - spin_lock_bh(&vport->stats_lock); + switch (err_type) { + case VPORT_E_RX_DROPPED: + vport->err_stats.rx_dropped++; + break; - switch (err_type) { - case VPORT_E_RX_DROPPED: - vport->err_stats.rx_dropped++; - break; + case VPORT_E_RX_ERROR: + vport->err_stats.rx_errors++; + break; - case VPORT_E_RX_ERROR: - vport->err_stats.rx_errors++; - break; + case VPORT_E_TX_DROPPED: + vport->err_stats.tx_dropped++; + break; - case VPORT_E_TX_DROPPED: - vport->err_stats.tx_dropped++; - break; + case VPORT_E_TX_ERROR: + vport->err_stats.tx_errors++; + break; + }; - case VPORT_E_TX_ERROR: - vport->err_stats.tx_errors++; - break; - }; - - spin_unlock_bh(&vport->stats_lock); - } + spin_unlock(&vport->stats_lock); }