mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-03 07:45:30 +00:00
Code Issues Releases Wiki Activity

dpif-linux.c: Let the kernel pick a port number if one not requested.

Browse Source 
With the single datapath change, we no longer depend on the kernel to
make sure that we don't reuse OpenFlow port numbers, since the ofproto
library now picks them.  Remove the code that contained that logic.

Suggested-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Justin Pettit <jpettit@nicira.com>
This commit is contained in:
Justin Pettit
2012-11-14 15:58:19 -08:00
parent 29c743b672
commit 78a2d59c1c
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/dpif-linux.c
View File

@@ -198,9 +198,6 @@ struct dpif_linux {
struct sset changed_ports; /* Ports that have changed. */ struct sset changed_ports; /* Ports that have changed. */
struct nln_notifier *port_notifier; struct nln_notifier *port_notifier;
bool change_error; bool change_error;
/* Port number allocation. */
uint32_t alloc_port_no;
}; };
static struct vlog_rate_limit error_rl = VLOG_RATE_LIMIT_INIT(9999, 5); static struct vlog_rate_limit error_rl = VLOG_RATE_LIMIT_INIT(9999, 5);
@@ -399,8 +396,9 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev,
const char *type = netdev_get_type(netdev); const char *type = netdev_get_type(netdev);
struct dpif_linux_vport request, reply; struct dpif_linux_vport request, reply;
const struct ofpbuf *options; const struct ofpbuf *options;
uint32_t upcall_pid;
struct ofpbuf *buf; struct ofpbuf *buf;
int error, i = 0, max_ports = MAX_PORTS; int error;
dpif_linux_vport_init(&request); dpif_linux_vport_init(&request);
request.cmd = OVS_VPORT_CMD_NEW; request.cmd = OVS_VPORT_CMD_NEW;
@@ -424,33 +422,22 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev,
netdev_linux_ethtool_set_flag(netdev, ETH_FLAG_LRO, "LRO", false); netdev_linux_ethtool_set_flag(netdev, ETH_FLAG_LRO, "LRO", false);
} }
/* Unless a specific port was requested, loop until we find a port request.port_no = *port_nop;
* that isn't used. */ upcall_pid = dpif_linux_port_get_pid(dpif_, request.port_no);
do { request.upcall_pid = &upcall_pid;
uint32_t upcall_pid;
request.port_no = *port_nop != UINT32_MAX ? *port_nop error = dpif_linux_vport_transact(&request, &reply, &buf);
: ++dpif->alloc_port_no;
upcall_pid = dpif_linux_port_get_pid(dpif_, request.port_no);
request.upcall_pid = &upcall_pid;
error = dpif_linux_vport_transact(&request, &reply, &buf);
if (!error) { if (!error) {
*port_nop = reply.port_no; *port_nop = reply.port_no;
VLOG_DBG("%s: assigning port %"PRIu32" to netlink pid %"PRIu32, VLOG_DBG("%s: assigning port %"PRIu32" to netlink pid %"PRIu32,
dpif_name(dpif_), request.port_no, upcall_pid); dpif_name(dpif_), request.port_no, upcall_pid);
} else if (error == EFBIG) { } else if (error == EBUSY && *port_nop != UINT32_MAX) {
/* Older datapath has lower limit. */ VLOG_INFO("%s: requested port %"PRIu32" is in use",
max_ports = dpif->alloc_port_no; dpif_name(dpif_), *port_nop);
dpif->alloc_port_no = 0; }
} else if (error == EBUSY && *port_nop != UINT32_MAX) {
VLOG_INFO("%s: requested port %"PRIu32" is in use",
dpif_name(dpif_), *port_nop);
}
ofpbuf_delete(buf); ofpbuf_delete(buf);
} while ((*port_nop == UINT32_MAX) && (i++ < max_ports)
&& (error == EBUSY || error == EFBIG));
return error; return error;
} }