* 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:
kfree(dev_table);
}
-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 = -EBUSY;
- 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;
-}
-
-/**
- * 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_user_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_user_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
-
-static int do_vport_mod(struct odp_vport_mod *vport_config)
-{
- struct vport *vport;
- int err;
-
- vport_config->devname[IFNAMSIZ - 1] = '\0';
-
- rtnl_lock();
-
- vport = vport_locate(vport_config->devname);
- if (!vport) {
- err = -ENODEV;
- goto out;
- }
-
- vport_lock();
- err = vport_mod(vport, vport_config->config);
- vport_unlock();
-
-out:
- rtnl_unlock();
- return err;
-}
-
/**
* vport_user_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.
*/
-int vport_user_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_user_mod(struct compat_odp_vport_mod *ucompat)
+int vport_user_mod(const struct odp_port __user *uport)
{
- 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_user_del - delete existing vport device (for userspace callers)
- *
- * @udevname: Name of device to delete
- *
- * 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.
- */
-int vport_user_del(const char __user *udevname)
-{
- char devname[IFNAMSIZ];
+ struct odp_port port;
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(&port, uport, sizeof(port)))
return -EFAULT;
- else if (retval >= IFNAMSIZ)
- return -ENAMETOOLONG;
+
+ port.devname[IFNAMSIZ - 1] = '\0';
rtnl_lock();
- vport = vport_locate(devname);
+ vport = vport_locate(port.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);
-
-dp_port_out:
- mutex_unlock(&dp->mutex);
-
- if (err)
- goto out;
- }
-
vport_lock();
- err = vport_del(vport);
+ err = vport_mod(vport, &port);
vport_unlock();
out:
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
*
* 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;
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/<devname>/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)
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)
*
- * @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;
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;
* 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: 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)
*
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
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
*
*/
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);
+ return vport_get_ifindex(vport->dp->ports[ODPP_LOCAL]);
}
/**
*/
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;
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)
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;
}
projects / openvswitch / blobdiff