projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Replace "struct odp_action" by Netlink attributes.
[openvswitch]
/
datapath
/
vport-patch.c
diff --git
a/datapath/vport-patch.c
b/datapath/vport-patch.c
index b0ae3a070f6713c38c3761d1a65bc73653bda191..d27509a16a963fcc27252ba82fac616daa5e8ef4 100644
(file)
--- a/
datapath/vport-patch.c
+++ b/
datapath/vport-patch.c
@@
-22,6
+22,8
@@
struct device_config {
};
struct patch_vport {
};
struct patch_vport {
+ struct rcu_head rcu;
+
char name[IFNAMSIZ];
/* Protected by RTNL lock. */
char name[IFNAMSIZ];
/* Protected by RTNL lock. */
@@
-128,8
+130,8
@@
static struct vport *patch_create(const struct vport_parms *parms)
vport_gen_rand_ether_addr(patch_vport->devconf->eth_addr);
vport_gen_rand_ether_addr(patch_vport->devconf->eth_addr);
- /* Make the default MTU fairly large so that it doesn't become the
- * bottleneck on systems using jumbo frames. */
+
/* Make the default MTU fairly large so that it doesn't become the
+
* bottleneck on systems using jumbo frames. */
patch_vport->devconf->mtu = 65535;
hlist_add_head(&patch_vport->hash_node, hash_bucket(patch_vport->peer_name));
patch_vport->devconf->mtu = 65535;
hlist_add_head(&patch_vport->hash_node, hash_bucket(patch_vport->peer_name));
@@
-158,19
+160,22
@@
static int patch_modify(struct vport *vport, struct odp_port *port)
return err;
}
return err;
}
+static void free_port_rcu(struct rcu_head *rcu)
+{
+ struct patch_vport *patch_vport = container_of(rcu,
+ struct patch_vport, rcu);
+
+ kfree(patch_vport->devconf);
+ vport_free(vport_from_priv(patch_vport));
+}
+
static int patch_destroy(struct vport *vport)
{
struct patch_vport *patch_vport = patch_vport_priv(vport);
update_peers(patch_vport->name, NULL);
static int patch_destroy(struct vport *vport)
{
struct patch_vport *patch_vport = patch_vport_priv(vport);
update_peers(patch_vport->name, NULL);
- rcu_assign_pointer(patch_vport->peer, NULL);
-
hlist_del(&patch_vport->hash_node);
hlist_del(&patch_vport->hash_node);
-
- synchronize_rcu();
-
- kfree(patch_vport->devconf);
- vport_free(vport);
+ call_rcu(&patch_vport->rcu, free_port_rcu);
return 0;
}
return 0;
}