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 <b...@nicira.com>
---
lib/dpif-netdev.c | 116 +++++++++++++++++++++++++++++------------------------
tests/tunnel.at | 10 ++---
2 files changed, 68 insertions(+), 58 deletions(-)
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index bd01716..03121ec 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -65,7 +65,6 @@ VLOG_DEFINE_THIS_MODULE(dpif_netdev);
#define NETDEV_RULE_PRIORITY 0x8000
/* Configuration parameters. */
-enum { MAX_PORTS = 256 }; /* Maximum number of ports. */
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
@@ -107,15 +106,17 @@ struct dp_netdev {
struct ovsthread_counter *n_lost; /* Number of misses not passed up. */
/* Ports. */
- struct dp_netdev_port *ports[MAX_PORTS];
- struct list port_list;
+ struct hmap ports;
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. */
struct dp_netdev_port {
- odp_port_t port_no; /* Index into dp_netdev's 'ports'. */
- struct list node; /* Element in dp_netdev's 'port_list'. */
+ struct hmap_node node; /* Node in dp_netdev's 'ports'. */
+ odp_port_t port_no;
struct netdev *netdev;
struct netdev_saved_flags *sf;
struct netdev_rx *rx;
@@ -257,8 +258,8 @@ choose_port(struct dp_netdev *dp, const char *name)
for (p = name; *p != '\0'; p++) {
if (isdigit((unsigned char) *p)) {
port_no = start_no + strtol(p, NULL, 10);
- if (port_no > 0 && port_no < MAX_PORTS
- && !dp->ports[port_no]) {
+ if (port_no > 0 && port_no != odp_to_u32(ODPP_NONE)
+ && !dp_netdev_lookup_port(dp, u32_to_odp(port_no))) {
return u32_to_odp(port_no);
}
break;
@@ -266,8 +267,8 @@ choose_port(struct dp_netdev *dp, const char *name)
}
}
- for (port_no = 1; port_no < MAX_PORTS; port_no++) {
- if (!dp->ports[port_no]) {
+ for (port_no = 1; port_no <= UINT16_MAX; port_no++) {
+ if (!dp_netdev_lookup_port(dp, u32_to_odp(port_no))) {
return u32_to_odp(port_no);
}
}
@@ -299,7 +300,7 @@ create_dp_netdev(const char *name, const struct dpif_class
*class,
dp->n_missed = ovsthread_counter_create();
dp->n_lost = ovsthread_counter_create();
- list_init(&dp->port_list);
+ hmap_init(&dp->ports);
dp->port_seq = seq_create();
error = do_add_port(dp, name, "internal", ODPP_LOCAL);
@@ -360,7 +361,7 @@ dp_netdev_free(struct dp_netdev *dp)
struct dp_netdev_port *port, *next;
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);
}
ovsthread_counter_destroy(dp->n_hit);
@@ -371,6 +372,7 @@ dp_netdev_free(struct dp_netdev *dp)
classifier_destroy(&dp->cls);
hmap_destroy(&dp->flow_table);
seq_destroy(dp->port_seq);
+ hmap_destroy(&dp->ports);
free(dp->name);
free(dp);
}
@@ -479,8 +481,7 @@ do_add_port(struct dp_netdev *dp, const char *devname,
const char *type,
dp->max_mtu = mtu;
}
- list_push_back(&dp->port_list, &port->node);
- dp->ports[odp_to_u32(port_no)] = port;
+ hmap_insert(&dp->ports, &port->node, hash_int(odp_to_u32(port_no), 0));
seq_change(dp->port_seq);
return 0;
@@ -499,15 +500,8 @@ dpif_netdev_port_add(struct dpif *dpif, struct netdev
*netdev,
ovs_mutex_lock(&dp_netdev_mutex);
dpif_port = netdev_vport_get_dpif_port(netdev, namebuf, sizeof namebuf);
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 {
port_no = choose_port(dp, dpif_port);
error = port_no == ODPP_NONE ? EFBIG : 0;
@@ -537,7 +531,21 @@ dpif_netdev_port_del(struct dpif *dpif, odp_port_t port_no)
static bool
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
@@ -548,7 +556,7 @@ get_port_by_number(struct dp_netdev *dp,
*portp = NULL;
return EINVAL;
} else {
- *portp = dp->ports[odp_to_u32(port_no)];
+ *portp = dp_netdev_lookup_port(dp, port_no);
return *portp ? 0 : ENOENT;
}
}
@@ -559,7 +567,7 @@ get_port_by_name(struct dp_netdev *dp,
{
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)) {
*portp = port;
return 0;
@@ -579,8 +587,7 @@ do_del_port(struct dp_netdev *dp, odp_port_t port_no)
return error;
}
- list_remove(&port->node);
- dp->ports[odp_to_u32(port_no)] = NULL;
+ hmap_remove(&dp->ports, &port->node);
seq_change(dp->port_seq);
netdev_close(port->netdev);
@@ -673,7 +680,8 @@ dpif_netdev_flow_flush(struct dpif *dpif)
}
struct dp_netdev_port_state {
- odp_port_t port_no;
+ uint32_t bucket;
+ uint32_t offset;
char *name;
};
@@ -690,27 +698,29 @@ dpif_netdev_port_dump_next(const struct dpif *dpif, void
*state_,
{
struct dp_netdev_port_state *state = state_;
struct dp_netdev *dp = get_dp_netdev(dpif);
- uint32_t port_idx;
+ struct hmap_node *node;
+ int retval;
ovs_mutex_lock(&dp_netdev_mutex);
- for (port_idx = odp_to_u32(state->port_no);
- port_idx < MAX_PORTS; port_idx++) {
- struct dp_netdev_port *port = dp->ports[port_idx];
- if (port) {
- free(state->name);
- state->name = xstrdup(netdev_get_name(port->netdev));
- dpif_port->name = state->name;
- dpif_port->type = port->type;
- dpif_port->port_no = port->port_no;
- state->port_no = u32_to_odp(port_idx + 1);
- ovs_mutex_unlock(&dp_netdev_mutex);
+ node = hmap_at_position(&dp->ports, &state->bucket, &state->offset);
+ if (node) {
+ struct dp_netdev_port *port;
- return 0;
- }
+ port = CONTAINER_OF(node, struct dp_netdev_port, node);
+
+ free(state->name);
+ state->name = xstrdup(netdev_get_name(port->netdev));
+ dpif_port->name = state->name;
+ dpif_port->type = port->type;
+ dpif_port->port_no = port->port_no;
+
+ retval = 0;
+ } else {
+ retval = EOF;
}
ovs_mutex_unlock(&dp_netdev_mutex);
- return EOF;
+ return retval;
}
static int
@@ -1299,7 +1309,7 @@ dpif_netdev_run(struct dpif *dpif)
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;
/* Reset packet contents. Packet data may have been stolen. */
@@ -1339,7 +1349,7 @@ dpif_netdev_wait(struct dpif *dpif)
* that is harmless. */
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) {
netdev_rx_wait(port->rx);
}
@@ -1404,7 +1414,7 @@ dp_netdev_action_output(void *aux_, struct ofpbuf *packet,
odp_port_t out_port)
{
struct dp_netdev_execute_aux *aux = aux_;
- struct dp_netdev_port *p = aux->dp->ports[odp_to_u32(out_port)];
+ struct dp_netdev_port *p = dp_netdev_lookup_port(aux->dp, out_port);
if (p) {
netdev_send(p->netdev, packet);
}
@@ -1485,7 +1495,7 @@ dpif_dummy_change_port_number(struct unixctl_conn *conn,
int argc OVS_UNUSED,
{
struct dp_netdev_port *port;
struct dp_netdev *dp;
- int port_no;
+ odp_port_t port_no;
dp = shash_find_data(&dp_netdevs, argv[1]);
if (!dp || !dpif_netdev_class_is_dummy(dp->class)) {
@@ -1498,18 +1508,18 @@ dpif_dummy_change_port_number(struct unixctl_conn
*conn, int argc OVS_UNUSED,
return;
}
- port_no = atoi(argv[3]);
- if (port_no <= 0 || port_no >= MAX_PORTS) {
+ port_no = u32_to_odp(atoi(argv[3]));
+ if (!port_no || port_no == ODPP_NONE) {
unixctl_command_reply_error(conn, "bad port number");
return;
}
- if (dp->ports[port_no]) {
+ if (dp_netdev_lookup_port(dp, port_no)) {
unixctl_command_reply_error(conn, "port number already in use");
return;
}
- dp->ports[odp_to_u32(port->port_no)] = NULL;
- dp->ports[port_no] = port;
- port->port_no = u32_to_odp(port_no);
+ hmap_remove(&dp->ports, &port->node);
+ port->port_no = port_no;
+ hmap_insert(&dp->ports, &port->node, hash_int(odp_to_u32(port_no), 0));
seq_change(dp->port_seq);
unixctl_command_reply(conn, NULL);
}
diff --git a/tests/tunnel.at b/tests/tunnel.at
index 4f22b3f..8bfa94c 100644
--- a/tests/tunnel.at
+++ b/tests/tunnel.at
@@ -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
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
@@ -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
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
@@ -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
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
@@ -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
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
@@ -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
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
AT_CLEANUP
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
