X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport.c;h=9ac216c88c9dd410ae6bb55cf4650c86ecddd897;hb=f632c8fc817ff5597007a795b51574bddd32563a;hp=272324430b36254d6e83fca66230e8f88ff0e55f;hpb=c3827f619a38d3d202020838e1f92860046a3dbe;p=openvswitch diff --git a/datapath/vport.c b/datapath/vport.c index 27232443..9ac216c8 100644 --- a/datapath/vport.c +++ b/datapath/vport.c @@ -1,5 +1,5 @@ /* - * 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 @@ -47,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: @@ -497,6 +497,19 @@ 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 * @@ -508,7 +521,7 @@ static void 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; @@ -523,8 +536,16 @@ struct vport *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) @@ -548,7 +569,7 @@ 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); } /** @@ -556,8 +577,9 @@ 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). 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 struct vport_parms *parms) { @@ -612,78 +634,19 @@ int vport_mod(struct vport *vport, struct odp_port *port) * * @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) { 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 (vport_get_dp_port(vport)) - return -EBUSY; - - if (vport->ops->attach) { - int err; - - err = vport->ops->attach(vport); - if (err) - return err; - } - - 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; - - 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) * @@ -706,12 +669,8 @@ int vport_set_mtu(struct vport *vport, int mtu) ret = vport->ops->set_mtu(vport, mtu); - if (!ret && !is_internal_vport(vport)) { - struct dp_port *dp_port = vport_get_dp_port(vport); - - if (dp_port) - set_internal_devs_mtu(dp_port->dp); - } + if (!ret && !is_internal_vport(vport)) + set_internal_devs_mtu(vport->dp); return ret; } else @@ -808,20 +767,6 @@ 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 * @@ -838,6 +783,17 @@ struct kobject *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) * @@ -848,95 +804,77 @@ struct kobject *vport_get_kobj(const struct vport *vport) */ int vport_get_stats(struct vport *vport, struct rtnl_link_stats64 *stats) { - struct rtnl_link_stats64 dev_stats; - struct rtnl_link_stats64 *dev_statsp = NULL; - int err; - - if (vport->ops->get_stats) { - if (vport->ops->flags & VPORT_F_GEN_STATS) - dev_statsp = &dev_stats; - else - dev_statsp = stats; - - rcu_read_lock(); - err = vport->ops->get_stats(vport, dev_statsp); - rcu_read_unlock(); + int i; - if (err) - goto out; - } + if (!(vport->ops->flags & VPORT_F_GEN_STATS)) + return vport_call_get_stats(vport, stats); - if (vport->ops->flags & VPORT_F_GEN_STATS) { - int i; + /* 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). */ - /* 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); - spin_lock_bh(&vport->stats_lock); + *stats = vport->offset_stats; - *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; - 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); - spin_unlock_bh(&vport->stats_lock); + if (vport->ops->get_stats) { + struct rtnl_link_stats64 dev_stats; + int err; - if (dev_statsp) { - stats->rx_packets += dev_statsp->rx_packets; - stats->tx_packets += dev_statsp->tx_packets; - stats->rx_bytes += dev_statsp->rx_bytes; - stats->tx_bytes += dev_statsp->tx_bytes; - stats->rx_errors += dev_statsp->rx_errors; - stats->tx_errors += dev_statsp->tx_errors; - stats->rx_dropped += dev_statsp->rx_dropped; - stats->tx_dropped += dev_statsp->tx_dropped; - stats->multicast += dev_statsp->multicast; - stats->collisions += dev_statsp->collisions; - stats->rx_length_errors += dev_statsp->rx_length_errors; - stats->rx_over_errors += dev_statsp->rx_over_errors; - stats->rx_crc_errors += dev_statsp->rx_crc_errors; - stats->rx_frame_errors += dev_statsp->rx_frame_errors; - stats->rx_fifo_errors += dev_statsp->rx_fifo_errors; - stats->rx_missed_errors += dev_statsp->rx_missed_errors; - stats->tx_aborted_errors += dev_statsp->tx_aborted_errors; - stats->tx_carrier_errors += dev_statsp->tx_carrier_errors; - stats->tx_fifo_errors += dev_statsp->tx_fifo_errors; - stats->tx_heartbeat_errors += dev_statsp->tx_heartbeat_errors; - stats->tx_window_errors += dev_statsp->tx_window_errors; - stats->rx_compressed += dev_statsp->rx_compressed; - stats->tx_compressed += dev_statsp->tx_compressed; - } + err = vport_call_get_stats(vport, &dev_stats); + if (err) + return err; - for_each_possible_cpu(i) { - const struct vport_percpu_stats *percpu_stats; - struct vport_percpu_stats local_stats; - unsigned seqcount; + 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; + } - percpu_stats = per_cpu_ptr(vport->percpu_stats, i); + for_each_possible_cpu(i) { + const struct vport_percpu_stats *percpu_stats; + struct vport_percpu_stats local_stats; + unsigned seqcount; - do { - seqcount = read_seqcount_begin(&percpu_stats->seqlock); - local_stats = *percpu_stats; - } while (read_seqcount_retry(&percpu_stats->seqlock, seqcount)); + percpu_stats = per_cpu_ptr(vport->percpu_stats, i); - 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; - } + do { + seqcount = read_seqcount_begin(&percpu_stats->seqlock); + local_stats = *percpu_stats; + } while (read_seqcount_retry(&percpu_stats->seqlock, seqcount)); - err = 0; - } else - err = -EOPNOTSUPP; + 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; + } -out: - return err; + return 0; } /** @@ -983,25 +921,17 @@ unsigned char 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) { - 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; } /** @@ -1038,6 +968,22 @@ 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 * @@ -1050,15 +996,6 @@ int vport_get_mtu(const struct vport *vport) */ 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; @@ -1079,7 +1016,7 @@ void vport_receive(struct vport *vport, struct sk_buff *skb) 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) @@ -1110,8 +1047,7 @@ int vport_send(struct vport *vport, struct sk_buff *skb) 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_get_dp_port(vport)->dp), - packet_length(skb), mtu); + dp_name(vport->dp), packet_length(skb), mtu); goto error; }