mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

dpif-netdev: Make 'max_mtu' a per-dp feature, for thread safety.

Browse Source 
This ensures that an external lock around a dpif_netdev will allow
thread-safe access to it.

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2013-06-19 11:10:57 -07:00
parent dc0d542d52
commit 3b0aab9343
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/dpif-netdev.c
View File

@@ -87,6 +87,7 @@ struct dp_netdev {
char *name; char *name;
int open_cnt; int open_cnt;
bool destroyed; bool destroyed;
int max_mtu; /* Maximum MTU of any port added so far. */
struct dp_netdev_queue queues[N_QUEUES]; struct dp_netdev_queue queues[N_QUEUES];
struct hmap flow_table; /* Flow table. */ struct hmap flow_table; /* Flow table. */
@@ -138,9 +139,6 @@ struct dpif_netdev {
/* All netdev-based datapaths. */ /* All netdev-based datapaths. */
static struct shash dp_netdevs = SHASH_INITIALIZER(&dp_netdevs); static struct shash dp_netdevs = SHASH_INITIALIZER(&dp_netdevs);
/* Maximum port MTU seen so far. */
static int max_mtu = ETH_PAYLOAD_MAX;
static int get_port_by_number(struct dp_netdev *, odp_port_t port_no, static int get_port_by_number(struct dp_netdev *, odp_port_t port_no,
struct dp_netdev_port **portp); struct dp_netdev_port **portp);
static int get_port_by_name(struct dp_netdev *, const char *devname, static int get_port_by_name(struct dp_netdev *, const char *devname,
@@ -271,6 +269,7 @@ create_dp_netdev(const char *name, const struct dpif_class *class,
dp->class = class; dp->class = class;
dp->name = xstrdup(name); dp->name = xstrdup(name);
dp->open_cnt = 0; dp->open_cnt = 0;
dp->max_mtu = ETH_PAYLOAD_MAX;
for (i = 0; i < N_QUEUES; i++) { for (i = 0; i < N_QUEUES; i++) {
dp->queues[i].head = dp->queues[i].tail = 0; dp->queues[i].head = dp->queues[i].tail = 0;
} }
@@ -426,8 +425,8 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
port->type = xstrdup(type); port->type = xstrdup(type);
error = netdev_get_mtu(netdev, &mtu); error = netdev_get_mtu(netdev, &mtu);
if (!error && mtu > max_mtu) { if (!error && mtu > dp->max_mtu) {
max_mtu = mtu; dp->max_mtu = mtu;
} }
list_push_back(&dp->port_list, &port->node); list_push_back(&dp->port_list, &port->node);
@@ -1081,7 +1080,8 @@ dpif_netdev_run(struct dpif *dpif)
struct dp_netdev_port *port; struct dp_netdev_port *port;
struct ofpbuf packet; struct ofpbuf packet;
ofpbuf_init(&packet, DP_NETDEV_HEADROOM + VLAN_ETH_HEADER_LEN + max_mtu); ofpbuf_init(&packet,
DP_NETDEV_HEADROOM + VLAN_ETH_HEADER_LEN + dp->max_mtu);
LIST_FOR_EACH (port, node, &dp->port_list) { LIST_FOR_EACH (port, node, &dp->port_list) {
int error; int error;