X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=14602152cb80b9f8ff57a4fc47f8b65fb86c6b39;hb=bd193a0abafc249745ceb1a14165b54abbf6497c;hp=cfe660ff494af8a9fb59abbd4599fc24e953e835;hpb=2e7dd8eca88d131112a76301da24709b0472e381;p=openvswitch diff --git a/datapath/datapath.c b/datapath/datapath.c index cfe660ff..14602152 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -171,6 +171,16 @@ errout: rtnl_set_sk_err(net, RTNLGRP_LINK, err); } +static void release_dp(struct kobject *kobj) +{ + struct datapath *dp = container_of(kobj, struct datapath, ifobj); + kfree(dp); +} + +struct kobj_type dp_ktype = { + .release = release_dp +}; + static int create_dp(int dp_idx, const char __user *devnamep) { struct net_device *dp_dev; @@ -212,6 +222,13 @@ static int create_dp(int dp_idx, const char __user *devnamep) skb_queue_head_init(&dp->queues[i]); init_waitqueue_head(&dp->waitqueue); + /* Initialize kobject for bridge. This will be added as + * /sys/class/net//brif later, if sysfs is enabled. */ + kobject_set_name(&dp->ifobj, SYSFS_BRIDGE_PORT_SUBDIR); /* "brif" */ + dp->ifobj.kset = NULL; + dp->ifobj.parent = NULL; + kobject_init(&dp->ifobj, &dp_ktype); + /* Allocate table. */ err = -ENOMEM; rcu_assign_pointer(dp->table, dp_table_create(DP_L1_SIZE)); @@ -240,7 +257,7 @@ static int create_dp(int dp_idx, const char __user *devnamep) rtnl_unlock(); #ifdef SUPPORT_SYSFS - brc_sysfs_add_dp(dp); + dp_sysfs_add_dp(dp); #endif return 0; @@ -270,7 +287,7 @@ static void do_destroy_dp(struct datapath *dp) dp_del_port(p); #ifdef SUPPORT_SYSFS - brc_sysfs_del_dp(dp); + dp_sysfs_del_dp(dp); #endif rcu_assign_pointer(dps[dp->dp_idx], NULL); @@ -284,7 +301,7 @@ static void do_destroy_dp(struct datapath *dp) for (i = 0; i < DP_MAX_GROUPS; i++) kfree(dp->groups[i]); free_percpu(dp->stats_percpu); - kfree(dp); + kobject_put(&dp->ifobj); module_put(THIS_MODULE); } @@ -309,6 +326,19 @@ err_unlock: return err; } +static void release_nbp(struct kobject *kobj) +{ + struct net_bridge_port *p = container_of(kobj, struct net_bridge_port, kobj); + kfree(p); +} + +struct kobj_type brport_ktype = { +#ifdef SUPPORT_SYSFS + .sysfs_ops = &brport_sysfs_ops, +#endif + .release = release_nbp +}; + /* Called with RTNL lock and dp_mutex. */ static int new_nbp(struct datapath *dp, struct net_device *dev, int port_no) { @@ -338,6 +368,13 @@ static int new_nbp(struct datapath *dp, struct net_device *dev, int port_no) list_add_rcu(&p->node, &dp->port_list); dp->n_ports++; + /* Initialize kobject for bridge. This will be added as + * /sys/class/net//brport later, if sysfs is enabled. */ + kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR); /* "brport" */ + p->kobj.kset = NULL; + p->kobj.parent = &p->dev->NETDEV_DEV_MEMBER.kobj; + kobject_init(&p->kobj, &brport_ktype); + dp_ifinfo_notify(RTM_NEWLINK, p); return 0; @@ -394,7 +431,7 @@ static int add_port(int dp_idx, struct odp_port __user *portp) goto out_put; #ifdef SUPPORT_SYSFS - brc_sysfs_add_if(dp->ports[port_no]); + dp_sysfs_add_if(dp->ports[port_no]); #endif out_put: @@ -413,7 +450,7 @@ int dp_del_port(struct net_bridge_port *p) #ifdef SUPPORT_SYSFS if (p->port_no != ODPP_LOCAL) - sysfs_remove_link(&p->dp->ifobj, p->dev->name); + dp_sysfs_del_if(p); #endif dp_ifinfo_notify(RTM_DELLINK, p); @@ -435,15 +472,10 @@ int dp_del_port(struct net_bridge_port *p) /* Then wait until no one is still using it, and destroy it. */ synchronize_rcu(); - if (is_dp_dev(p->dev)) { + if (is_dp_dev(p->dev)) dp_dev_destroy(p->dev); - } - if (p->port_no != ODPP_LOCAL) { - brc_sysfs_del_if(p); - } else { - dev_put(p->dev); - kfree(p); - } + dev_put(p->dev); + kobject_put(&p->kobj); return 0; } @@ -818,7 +850,7 @@ static void clear_stats(struct sw_flow *flow) static int put_flow(struct datapath *dp, struct odp_flow_put __user *ufp) { struct odp_flow_put uf; - struct sw_flow *flow, **bucket; + struct sw_flow *flow; struct dp_table *table; struct odp_flow_stats stats; int error; @@ -828,15 +860,10 @@ static int put_flow(struct datapath *dp, struct odp_flow_put __user *ufp) goto error; uf.flow.key.reserved = 0; -retry: table = rcu_dereference(dp->table); - bucket = dp_table_lookup_for_insert(table, &uf.flow.key); - if (!bucket) { - /* No such flow, and the slots where it could go are full. */ - error = uf.flags & ODPPF_CREATE ? -EXFULL : -ENOENT; - goto error; - } else if (!*bucket) { - /* No such flow, but we found an available slot for it. */ + flow = dp_table_lookup(table, &uf.flow.key); + if (!flow) { + /* No such flow. */ struct sw_flow_actions *acts; error = -ENOENT; @@ -844,14 +871,15 @@ retry: goto error; /* Expand table, if necessary, to make room. */ - if (dp->n_flows * 4 >= table->n_buckets && - table->n_buckets < DP_MAX_BUCKETS) { + if (dp->n_flows >= table->n_buckets) { + error = -ENOSPC; + if (table->n_buckets >= DP_MAX_BUCKETS) + goto error; + error = dp_table_expand(dp); if (error) goto error; - - /* The bucket's location has changed. Try again. */ - goto retry; + table = rcu_dereference(dp->table); } /* Allocate flow. */ @@ -871,12 +899,13 @@ retry: rcu_assign_pointer(flow->sf_acts, acts); /* Put flow in bucket. */ - rcu_assign_pointer(*bucket, flow); + error = dp_table_insert(table, flow); + if (error) + goto error_free_flow_acts; dp->n_flows++; memset(&stats, 0, sizeof(struct odp_flow_stats)); } else { /* We found a matching flow. */ - struct sw_flow *flow = *rcu_dereference(bucket); struct sw_flow_actions *old_acts, *new_acts; unsigned long int flags; @@ -914,6 +943,8 @@ retry: return -EFAULT; return 0; +error_free_flow_acts: + kfree(flow->sf_acts); error_free_flow: kmem_cache_free(flow_cache, flow); error: @@ -1156,8 +1187,8 @@ get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp) int i; stats.n_flows = dp->n_flows; - stats.cur_capacity = rcu_dereference(dp->table)->n_buckets * 2; - stats.max_capacity = DP_MAX_BUCKETS * 2; + stats.cur_capacity = rcu_dereference(dp->table)->n_buckets; + stats.max_capacity = DP_MAX_BUCKETS; stats.n_ports = dp->n_ports; stats.max_ports = DP_MAX_PORTS; stats.max_groups = DP_MAX_GROUPS;