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

dpif-netdev: Use hmap instead of list+array for tracking ports.

Browse Source 
The goal is to make it easy to divide the ports into groups for handling
by threads.  It seems easy enough to do that by hash value, and a little
harder otherwise.

This commit has the side effect of raising the maximum number of ports from
256 to UINT32_MAX-1.  That is why some tests need to be updated:
previously, internally generated port names like "ovs_vxlan_4341" were
ignored because 4341 is bigger than the previous limit of 256.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
This commit is contained in:
Ben Pfaff
2013-12-24 16:08:57 -08:00
parent ed27e010b9
commit ff073a71f9
2 changed files with 69 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
lib/dpif-netdev.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -65,7 +65,6 @@ VLOG_DEFINE_THIS_MODULE(dpif_netdev);
#define NETDEV_RULE_PRIORITY 0x8000 #define NETDEV_RULE_PRIORITY 0x8000
/* Configuration parameters. */ /* Configuration parameters. */
enum { MAX_PORTS = 256 }; /* Maximum number of ports. */
enum { MAX_FLOWS = 65536 }; /* Maximum number of flows in flow table. */ enum { MAX_FLOWS = 65536 }; /* Maximum number of flows in flow table. */
/* Enough headroom to add a vlan tag, plus an extra 2 bytes to allow IP /* Enough headroom to add a vlan tag, plus an extra 2 bytes to allow IP
@@ -107,15 +106,17 @@ struct dp_netdev {
struct ovsthread_counter *n_lost; /* Number of misses not passed up. */ struct ovsthread_counter *n_lost; /* Number of misses not passed up. */
/* Ports. */ /* Ports. */
struct dp_netdev_port *ports[MAX_PORTS]; struct hmap ports;
struct list port_list;
struct seq *port_seq; /* Incremented whenever a port changes. */ struct seq *port_seq; /* Incremented whenever a port changes. */
}; };
static struct dp_netdev_port *dp_netdev_lookup_port(const struct dp_netdev *,
odp_port_t);
/* A port in a netdev-based datapath. */ /* A port in a netdev-based datapath. */
struct dp_netdev_port { struct dp_netdev_port {
odp_port_t port_no; /* Index into dp_netdev's 'ports'. */ struct hmap_node node; /* Node in dp_netdev's 'ports'. */
struct list node; /* Element in dp_netdev's 'port_list'. */ odp_port_t port_no;
struct netdev *netdev; struct netdev *netdev;
struct netdev_saved_flags *sf; struct netdev_saved_flags *sf;
struct netdev_rx *rx; struct netdev_rx *rx;
@@ -256,8 +257,8 @@ choose_port(struct dp_netdev *dp, const char *name)
for (p = name; *p != '\0'; p++) { for (p = name; *p != '\0'; p++) {
if (isdigit((unsigned char) *p)) { if (isdigit((unsigned char) *p)) {
port_no = start_no + strtol(p, NULL, 10); port_no = start_no + strtol(p, NULL, 10);
if (port_no > 0 && port_no < MAX_PORTS if (port_no > 0 && port_no != odp_to_u32(ODPP_NONE)
&& !dp->ports[port_no]) { && !dp_netdev_lookup_port(dp, u32_to_odp(port_no))) {
return u32_to_odp(port_no); return u32_to_odp(port_no);
} }
break; break;
@@ -265,8 +266,8 @@ choose_port(struct dp_netdev *dp, const char *name)
} }
} }
for (port_no = 1; port_no < MAX_PORTS; port_no++) { for (port_no = 1; port_no <= UINT16_MAX; port_no++) {
if (!dp->ports[port_no]) { if (!dp_netdev_lookup_port(dp, u32_to_odp(port_no))) {
return u32_to_odp(port_no); return u32_to_odp(port_no);
} }
} }
@@ -298,7 +299,7 @@ create_dp_netdev(const char *name, const struct dpif_class *class,
dp->n_missed = ovsthread_counter_create(); dp->n_missed = ovsthread_counter_create();
dp->n_lost = ovsthread_counter_create(); dp->n_lost = ovsthread_counter_create();
list_init(&dp->port_list); hmap_init(&dp->ports);
dp->port_seq = seq_create(); dp->port_seq = seq_create();
error = do_add_port(dp, name, "internal", ODPP_LOCAL); error = do_add_port(dp, name, "internal", ODPP_LOCAL);
@@ -359,7 +360,7 @@ dp_netdev_free(struct dp_netdev *dp)
struct dp_netdev_port *port, *next; struct dp_netdev_port *port, *next;
dp_netdev_flow_flush(dp); dp_netdev_flow_flush(dp);
LIST_FOR_EACH_SAFE (port, next, node, &dp->port_list) { HMAP_FOR_EACH_SAFE (port, next, node, &dp->ports) {
do_del_port(dp, port->port_no); do_del_port(dp, port->port_no);
} }
ovsthread_counter_destroy(dp->n_hit); ovsthread_counter_destroy(dp->n_hit);
@@ -370,6 +371,7 @@ dp_netdev_free(struct dp_netdev *dp)
classifier_destroy(&dp->cls); classifier_destroy(&dp->cls);
hmap_destroy(&dp->flow_table); hmap_destroy(&dp->flow_table);
seq_destroy(dp->port_seq); seq_destroy(dp->port_seq);
hmap_destroy(&dp->ports);
free(dp->name); free(dp->name);
free(dp); free(dp);
} }
@@ -478,8 +480,7 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
dp->max_mtu = mtu; dp->max_mtu = mtu;
} }
list_push_back(&dp->port_list, &port->node); hmap_insert(&dp->ports, &port->node, hash_int(odp_to_u32(port_no), 0));
dp->ports[odp_to_u32(port_no)] = port;
seq_change(dp->port_seq); seq_change(dp->port_seq);
return 0; return 0;
@@ -498,15 +499,8 @@ dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev,
ovs_mutex_lock(&dp_netdev_mutex); ovs_mutex_lock(&dp_netdev_mutex);
dpif_port = netdev_vport_get_dpif_port(netdev, namebuf, sizeof namebuf); dpif_port = netdev_vport_get_dpif_port(netdev, namebuf, sizeof namebuf);
if (*port_nop != ODPP_NONE) { if (*port_nop != ODPP_NONE) {
uint32_t port_idx = odp_to_u32(*port_nop);
if (port_idx >= MAX_PORTS) {
error = EFBIG;
} else if (dp->ports[port_idx]) {
error = EBUSY;
} else {
error = 0;
port_no = *port_nop; port_no = *port_nop;
} error = dp_netdev_lookup_port(dp, *port_nop) ? EBUSY : 0;
} else { } else {
port_no = choose_port(dp, dpif_port); port_no = choose_port(dp, dpif_port);
error = port_no == ODPP_NONE ? EFBIG : 0; error = port_no == ODPP_NONE ? EFBIG : 0;
@@ -536,7 +530,21 @@ dpif_netdev_port_del(struct dpif *dpif, odp_port_t port_no)
static bool static bool
is_valid_port_number(odp_port_t port_no) is_valid_port_number(odp_port_t port_no)
{ {
return odp_to_u32(port_no) < MAX_PORTS; return port_no != ODPP_NONE;
}
static struct dp_netdev_port *
dp_netdev_lookup_port(const struct dp_netdev *dp, odp_port_t port_no)
{
struct dp_netdev_port *port;
HMAP_FOR_EACH_IN_BUCKET (port, node, hash_int(odp_to_u32(port_no), 0),
&dp->ports) {
if (port->port_no == port_no) {
return port;
}
}
return NULL;
} }
static int static int
@@ -547,7 +555,7 @@ get_port_by_number(struct dp_netdev *dp,
*portp = NULL; *portp = NULL;
return EINVAL; return EINVAL;
} else { } else {
*portp = dp->ports[odp_to_u32(port_no)]; *portp = dp_netdev_lookup_port(dp, port_no);
return *portp ? 0 : ENOENT; return *portp ? 0 : ENOENT;
} }
} }
@@ -558,7 +566,7 @@ get_port_by_name(struct dp_netdev *dp,
{ {
struct dp_netdev_port *port; struct dp_netdev_port *port;
LIST_FOR_EACH (port, node, &dp->port_list) { HMAP_FOR_EACH (port, node, &dp->ports) {
if (!strcmp(netdev_get_name(port->netdev), devname)) { if (!strcmp(netdev_get_name(port->netdev), devname)) {
*portp = port; *portp = port;
return 0; return 0;
@@ -578,8 +586,7 @@ do_del_port(struct dp_netdev *dp, odp_port_t port_no)
return error; return error;
} }
list_remove(&port->node); hmap_remove(&dp->ports, &port->node);
dp->ports[odp_to_u32(port_no)] = NULL;
seq_change(dp->port_seq); seq_change(dp->port_seq);
netdev_close(port->netdev); netdev_close(port->netdev);
@@ -672,7 +679,8 @@ dpif_netdev_flow_flush(struct dpif *dpif)
} }
struct dp_netdev_port_state { struct dp_netdev_port_state {
odp_port_t port_no; uint32_t bucket;
uint32_t offset;
char *name; char *name;
}; };
@@ -689,27 +697,29 @@ dpif_netdev_port_dump_next(const struct dpif *dpif, void *state_,
{ {
struct dp_netdev_port_state *state = state_; struct dp_netdev_port_state *state = state_;
struct dp_netdev *dp = get_dp_netdev(dpif); struct dp_netdev *dp = get_dp_netdev(dpif);
uint32_t port_idx; struct hmap_node *node;
int retval;
ovs_mutex_lock(&dp_netdev_mutex); ovs_mutex_lock(&dp_netdev_mutex);
for (port_idx = odp_to_u32(state->port_no); node = hmap_at_position(&dp->ports, &state->bucket, &state->offset);
port_idx < MAX_PORTS; port_idx++) { if (node) {
struct dp_netdev_port *port = dp->ports[port_idx]; struct dp_netdev_port *port;
if (port) {
port = CONTAINER_OF(node, struct dp_netdev_port, node);
free(state->name); free(state->name);
state->name = xstrdup(netdev_get_name(port->netdev)); state->name = xstrdup(netdev_get_name(port->netdev));
dpif_port->name = state->name; dpif_port->name = state->name;
dpif_port->type = port->type; dpif_port->type = port->type;
dpif_port->port_no = port->port_no; dpif_port->port_no = port->port_no;
state->port_no = u32_to_odp(port_idx + 1);
ovs_mutex_unlock(&dp_netdev_mutex);
return 0; retval = 0;
} } else {
retval = EOF;
} }
ovs_mutex_unlock(&dp_netdev_mutex); ovs_mutex_unlock(&dp_netdev_mutex);
return EOF; return retval;
} }
static int static int
@@ -1291,7 +1301,7 @@ dpif_netdev_run(struct dpif *dpif)
buf_size = DP_NETDEV_HEADROOM + VLAN_ETH_HEADER_LEN + dp->max_mtu; buf_size = DP_NETDEV_HEADROOM + VLAN_ETH_HEADER_LEN + dp->max_mtu;
LIST_FOR_EACH (port, node, &dp->port_list) { HMAP_FOR_EACH (port, node, &dp->ports) {
int error; int error;
/* Reset packet contents. Packet data may have been stolen. */ /* Reset packet contents. Packet data may have been stolen. */
@@ -1332,7 +1342,7 @@ dpif_netdev_wait(struct dpif *dpif)
* that is harmless. */ * that is harmless. */
ovs_mutex_lock(&dp_netdev_mutex); ovs_mutex_lock(&dp_netdev_mutex);
LIST_FOR_EACH (port, node, &get_dp_netdev(dpif)->port_list) { HMAP_FOR_EACH (port, node, &get_dp_netdev(dpif)->ports) {
if (port->rx) { if (port->rx) {
netdev_rx_wait(port->rx); netdev_rx_wait(port->rx);
} }
@@ -1344,7 +1354,7 @@ static void
dp_netdev_output_port(struct dp_netdev *dp, struct ofpbuf *packet, dp_netdev_output_port(struct dp_netdev *dp, struct ofpbuf *packet,
odp_port_t out_port) odp_port_t out_port)
{ {
struct dp_netdev_port *p = dp->ports[odp_to_u32(out_port)]; struct dp_netdev_port *p = dp_netdev_lookup_port(dp, out_port);
if (p) { if (p) {
netdev_send(p->netdev, packet); netdev_send(p->netdev, packet);
} }
@@ -1494,7 +1504,7 @@ dpif_dummy_change_port_number(struct unixctl_conn *conn, int argc OVS_UNUSED,
{ {
struct dp_netdev_port *port; struct dp_netdev_port *port;
struct dp_netdev *dp; struct dp_netdev *dp;
int port_no; odp_port_t port_no;
dp = shash_find_data(&dp_netdevs, argv[1]); dp = shash_find_data(&dp_netdevs, argv[1]);
if (!dp || !dpif_netdev_class_is_dummy(dp->class)) { if (!dp || !dpif_netdev_class_is_dummy(dp->class)) {
@@ -1507,18 +1517,18 @@ dpif_dummy_change_port_number(struct unixctl_conn *conn, int argc OVS_UNUSED,
return; return;
} }
port_no = atoi(argv[3]); port_no = u32_to_odp(atoi(argv[3]));
if (port_no <= 0 || port_no >= MAX_PORTS) { if (!port_no || port_no == ODPP_NONE) {
unixctl_command_reply_error(conn, "bad port number"); unixctl_command_reply_error(conn, "bad port number");
return; return;
} }
if (dp->ports[port_no]) { if (dp_netdev_lookup_port(dp, port_no)) {
unixctl_command_reply_error(conn, "port number already in use"); unixctl_command_reply_error(conn, "port number already in use");
return; return;
} }
dp->ports[odp_to_u32(port->port_no)] = NULL; hmap_remove(&dp->ports, &port->node);
dp->ports[port_no] = port; port->port_no = port_no;
port->port_no = u32_to_odp(port_no); hmap_insert(&dp->ports, &port->node, hash_int(odp_to_u32(port_no), 0));
seq_change(dp->port_seq); seq_change(dp->port_seq);
unixctl_command_reply(conn, NULL); unixctl_command_reply(conn, NULL);
} }

10
tests/tunnel.at
View File

@@ -312,7 +312,7 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=vxlan \
AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
br0 65534/100: (dummy) br0 65534/100: (dummy)
p1 1/1: (vxlan: remote_ip=1.1.1.1) p1 1/4789: (vxlan: remote_ip=1.1.1.1)
]) ])
OVS_VSWITCHD_STOP OVS_VSWITCHD_STOP
@@ -324,7 +324,7 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=lisp \
AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
br0 65534/100: (dummy) br0 65534/100: (dummy)
p1 1/1: (lisp: remote_ip=1.1.1.1) p1 1/4341: (lisp: remote_ip=1.1.1.1)
]) ])
OVS_VSWITCHD_STOP OVS_VSWITCHD_STOP
@@ -336,7 +336,7 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=vxlan \
AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
br0 65534/100: (dummy) br0 65534/100: (dummy)
p1 1/1: (vxlan: dst_port=4341, remote_ip=1.1.1.1) p1 1/4341: (vxlan: dst_port=4341, remote_ip=1.1.1.1)
]) ])
dnl change UDP port dnl change UDP port
@@ -345,7 +345,7 @@ AT_CHECK([ovs-vsctl -- set Interface p1 options:dst_port=5000])
AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
br0 65534/100: (dummy) br0 65534/100: (dummy)
p1 1/2: (vxlan: dst_port=5000, remote_ip=1.1.1.1) p1 1/5000: (vxlan: dst_port=5000, remote_ip=1.1.1.1)
]) ])
dnl change UDP port to default dnl change UDP port to default
@@ -354,7 +354,7 @@ AT_CHECK([ovs-vsctl -- set Interface p1 options:dst_port=4789])
AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
br0 65534/100: (dummy) br0 65534/100: (dummy)
p1 1/1: (vxlan: remote_ip=1.1.1.1) p1 1/4789: (vxlan: remote_ip=1.1.1.1)
]) ])
OVS_VSWITCHD_STOP OVS_VSWITCHD_STOP
AT_CLEANUP AT_CLEANUP