#include <linux/compat.h>
#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;
-
+/* List of statically compiled vport implementations. Don't forget to also
+ * add yours to the list at the bottom of vport.h. */
static struct vport_ops *base_vport_ops_list[] = {
&netdev_vport_ops,
&internal_vport_ops,
+ &patch_vport_ops,
&gre_vport_ops,
};
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;
- }
-
if (new_ops->init)
err = new_ops->init();
else
struct hlist_node *node, *next;
hlist_for_each_entry_safe(vport, node, next, bucket, hash_node)
- __vport_del(vport);
+ vport_del(vport);
}
vport_unlock();
kfree(dev_table);
}
-/**
- * vport_add - add 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)
{
}
vport_lock();
- vport = __vport_add(vport_config->devname, vport_config->port_type,
- vport_config->config);
+ vport = vport_add(vport_config->devname, vport_config->port_type,
+ vport_config->config);
vport_unlock();
if (IS_ERR(vport))
return err;
}
+/**
+ * vport_user_add - add 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.
+ */
int
-vport_add(const struct odp_vport_add __user *uvport_config)
+vport_user_add(const struct odp_vport_add __user *uvport_config)
{
struct odp_vport_add vport_config;
#ifdef CONFIG_COMPAT
int
-compat_vport_add(struct compat_odp_vport_add *ucompat)
+compat_vport_user_add(struct compat_odp_vport_add *ucompat)
{
struct compat_odp_vport_add compat;
struct odp_vport_add vport_config;
}
#endif
-/**
- * vport_mod - modify existing vport device (for userspace callers)
- *
- * @uvport_config: 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)
{
}
vport_lock();
- err = __vport_mod(vport, vport_config->config);
+ err = vport_mod(vport, vport_config->config);
vport_unlock();
out:
return err;
}
+/**
+ * vport_user_mod - modify existing vport device (for userspace callers)
+ *
+ * @uvport_config: 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_mod(const struct odp_vport_mod __user *uvport_config)
+vport_user_mod(const struct odp_vport_mod __user *uvport_config)
{
struct odp_vport_mod vport_config;
#ifdef CONFIG_COMPAT
int
-compat_vport_mod(struct compat_odp_vport_mod *ucompat)
+compat_vport_user_mod(struct compat_odp_vport_mod *ucompat)
{
struct compat_odp_vport_mod compat;
struct odp_vport_mod vport_config;
#endif
/**
- * vport_del - delete existing vport device (for userspace callers)
+ * vport_user_del - delete existing vport device (for userspace callers)
*
* @udevname: Name of device to delete
*
* assumes no locks are held.
*/
int
-vport_del(const char __user *udevname)
+vport_user_del(const char __user *udevname)
{
char devname[IFNAMSIZ];
struct vport *vport;
}
vport_lock();
- err = __vport_del(vport);
+ err = vport_del(vport);
vport_unlock();
out:
}
/**
- * vport_stats_get - retrieve device stats (for userspace callers)
+ * vport_user_stats_get - retrieve device stats (for userspace callers)
*
* @ustats_req: Stats request parameters.
*
* function is for userspace callers and assumes no locks are held.
*/
int
-vport_stats_get(struct odp_vport_stats_req __user *ustats_req)
+vport_user_stats_get(struct odp_vport_stats_req __user *ustats_req)
{
struct odp_vport_stats_req stats_req;
struct vport *vport;
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;
+ err = vport_get_stats(vport, &stats_req.stats);
- memset(&stats_req.stats, 0, sizeof(struct odp_vport_stats));
+out:
+ vport_unlock();
- for_each_possible_cpu(i) {
- const struct vport_percpu_stats *percpu_stats;
+ if (!err)
+ if (copy_to_user(ustats_req, &stats_req, sizeof(struct odp_vport_stats_req)))
+ err = -EFAULT;
- 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;
- }
+ return err;
+}
- spin_lock_bh(&vport->err_stats.lock);
+/**
+ * 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;
- 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;
+ if (copy_from_user(&stats_req, ustats_req, sizeof(struct odp_vport_stats_req)))
+ return -EFAULT;
- spin_unlock_bh(&vport->err_stats.lock);
+ stats_req.devname[IFNAMSIZ - 1] = '\0';
- err = 0;
- } else
- err = -EOPNOTSUPP;
+ rtnl_lock();
+ vport_lock();
-out:
- vport_unlock();
+ vport = vport_locate(stats_req.devname);
+ if (!vport) {
+ err = -ENODEV;
+ goto out;
+ }
- if (!err)
- if (copy_to_user(ustats_req, &stats_req, sizeof(struct odp_vport_stats_req)))
- err = -EFAULT;
+ err = vport_set_stats(vport, &stats_req.stats);
+out:
+ vport_unlock();
+ 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.
*
* userspace callers and assumes no locks are held.
*/
int
-vport_ether_get(struct odp_vport_ether __user *uvport_ether)
+vport_user_ether_get(struct odp_vport_ether __user *uvport_ether)
{
struct odp_vport_ether vport_ether;
struct vport *vport;
goto out;
}
+ rcu_read_lock();
memcpy(vport_ether.ether_addr, vport_get_addr(vport), ETH_ALEN);
+ rcu_read_unlock();
out:
vport_unlock();
}
/**
- * 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.
*
* are held.
*/
int
-vport_ether_set(struct odp_vport_ether __user *uvport_ether)
+vport_user_ether_set(struct odp_vport_ether __user *uvport_ether)
{
struct odp_vport_ether vport_ether;
struct vport *vport;
}
/**
- * vport_mut_get - retrieve device MTU (for userspace callers)
+ * vport_user_mtu_get - retrieve device MTU (for userspace callers)
*
* @uvport_mtu: MTU request parameters.
*
* callers and assumes no locks are held.
*/
int
-vport_mtu_get(struct odp_vport_mtu __user *uvport_mtu)
+vport_user_mtu_get(struct odp_vport_mtu __user *uvport_mtu)
{
struct odp_vport_mtu vport_mtu;
struct vport *vport;
}
/**
- * vport_mtu_set - set device MTU (for userspace callers)
+ * vport_user_mtu_set - set device MTU (for userspace callers)
*
* @uvport_mtu: MTU request parameters.
*
* for userspace callers and assumes no locks are held.
*/
int
-vport_mtu_set(struct odp_vport_mtu __user *uvport_mtu)
+vport_user_mtu_set(struct odp_vport_mtu __user *uvport_mtu)
{
struct odp_vport_mtu vport_mtu;
struct vport *vport;
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
if (!vport->percpu_stats)
return ERR_PTR(-ENOMEM);
- spin_lock_init(&vport->err_stats.lock);
+ spin_lock_init(&vport->stats_lock);
}
return vport;
}
/**
- * __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
* on device type). Both RTNL and vport locks must be held.
*/
struct vport *
-__vport_add(const char *name, const char *type, const void __user *config)
+vport_add(const char *name, const char *type, const void __user *config)
{
struct vport *vport;
int err = 0;
}
/**
- * __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.
* dependent on device type). Both RTNL and vport locks must be held.
*/
int
-__vport_mod(struct vport *vport, const void __user *config)
+vport_mod(struct vport *vport, const void __user *config)
{
ASSERT_RTNL();
ASSERT_VPORT();
}
/**
- * __vport_del - delete existing vport device (for kernel callers)
+ * vport_del - delete existing vport device (for kernel callers)
*
* @vport: vport to delete.
*
* Both RTNL and vport locks must be held.
*/
int
-__vport_del(struct vport *vport)
+vport_del(struct vport *vport)
{
ASSERT_RTNL();
ASSERT_VPORT();
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)) {
+ struct dp_port *dp_port = vport_get_dp_port(vport);
+
+ if (dp_port)
+ set_internal_devs_mtu(dp_port->dp);
+ }
+
+ return ret;
+ } else
return -EOPNOTSUPP;
}
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 odp_vport_stats *stats)
+{
+ ASSERT_RTNL();
+
+ if (vport->ops->flags & VPORT_F_GEN_STATS) {
+ spin_lock_bh(&vport->stats_lock);
+ memcpy(&vport->offset_stats, stats, sizeof(struct odp_vport_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
*
return NULL;
}
+/**
+ * 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 odp_vport_stats *stats)
+{
+ struct odp_vport_stats dev_stats;
+ struct odp_vport_stats *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();
+
+ if (err)
+ goto out;
+ }
+
+ 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). */
+
+ spin_lock_bh(&vport->stats_lock);
+
+ memcpy(stats, &vport->offset_stats, sizeof(struct odp_vport_stats));
+
+ 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->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_over_err += vport->err_stats.rx_over_err;
+ stats->rx_crc_err += vport->err_stats.rx_crc_err;
+ stats->rx_frame_err += vport->err_stats.rx_frame_err;
+ stats->collisions += vport->err_stats.collisions;
+
+ spin_unlock_bh(&vport->stats_lock);
+
+ if (dev_statsp) {
+ 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->rx_over_err += dev_statsp->rx_over_err;
+ stats->rx_crc_err += dev_statsp->rx_crc_err;
+ stats->rx_frame_err += dev_statsp->rx_frame_err;
+ stats->collisions += dev_statsp->collisions;
+ }
+
+ for_each_possible_cpu(i) {
+ const struct vport_percpu_stats *percpu_stats;
+
+ percpu_stats = per_cpu_ptr(vport->percpu_stats, i);
+ stats->rx_bytes += percpu_stats->rx_bytes;
+ stats->rx_packets += percpu_stats->rx_packets;
+ stats->tx_bytes += percpu_stats->tx_bytes;
+ stats->tx_packets += percpu_stats->tx_packets;
+ }
+
+ err = 0;
+ } else
+ err = -EOPNOTSUPP;
+
+out:
+ return err;
+}
+
/**
* vport_get_flags - retrieve device flags
*
* @vport: vport that received the packet
* @skb: skb that was received
*
- * Must be called with rcu_read_lock and bottom halves disabled. The packet
- * cannot be shared and skb->data should point to the Ethernet header. The
- * caller must have already called compute_ip_summed() to initialize the
- * checksumming fields.
+ * Must be called with rcu_read_lock. The packet cannot be shared and
+ * 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)
{
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:
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;
-}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff