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

dpif-netdev: Remove max_mtu tracking.

Browse Source 
Normally all the ports have the same mtu anyhow, so there is little
advantage in keeping track of the maximum mtu on a per-bridge basis.  In
upcoming commits, tracking mtu will require more locking and present
even less advantage (because the packet buffer will become per-thread, so
that reallocating once per thread becomes essentially a null cost).

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
This commit is contained in:
Ben Pfaff
2013-12-23 15:46:22 -08:00
parent ff073a71f9
commit 5c8d2fcad0
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/dpif-netdev.c
View File

@@ -93,7 +93,6 @@ 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 classifier cls; /* Classifier. */ struct classifier cls; /* Classifier. */
@@ -287,7 +286,6 @@ 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;
} }
@@ -432,7 +430,6 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
struct netdev_rx *rx; struct netdev_rx *rx;
enum netdev_flags flags; enum netdev_flags flags;
const char *open_type; const char *open_type;
int mtu;
int error; int error;
/* XXX reject devices already in some dp_netdev. */ /* XXX reject devices already in some dp_netdev. */
@@ -475,11 +472,6 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
port->rx = rx; port->rx = rx;
port->type = xstrdup(type); port->type = xstrdup(type);
error = netdev_get_mtu(netdev, &mtu);
if (!error && mtu > dp->max_mtu) {
dp->max_mtu = mtu;
}
hmap_insert(&dp->ports, &port->node, hash_int(odp_to_u32(port_no), 0)); hmap_insert(&dp->ports, &port->node, hash_int(odp_to_u32(port_no), 0));
seq_change(dp->port_seq); seq_change(dp->port_seq);
@@ -1293,18 +1285,22 @@ dpif_netdev_run(struct dpif *dpif)
struct dp_netdev_port *port; struct dp_netdev_port *port;
struct dp_netdev *dp; struct dp_netdev *dp;
struct ofpbuf packet; struct ofpbuf packet;
size_t buf_size;
ovs_mutex_lock(&dp_netdev_mutex); ovs_mutex_lock(&dp_netdev_mutex);
dp = get_dp_netdev(dpif); dp = get_dp_netdev(dpif);
ofpbuf_init(&packet, 0); ofpbuf_init(&packet, 0);
buf_size = DP_NETDEV_HEADROOM + VLAN_ETH_HEADER_LEN + dp->max_mtu;
HMAP_FOR_EACH (port, node, &dp->ports) { HMAP_FOR_EACH (port, node, &dp->ports) {
int buf_size;
int error; int error;
int mtu;
error = netdev_get_mtu(port->netdev, &mtu);
if (error) {
mtu = ETH_PAYLOAD_MAX;
}
buf_size = DP_NETDEV_HEADROOM + VLAN_ETH_HEADER_LEN + mtu;
/* Reset packet contents. Packet data may have been stolen. */
ofpbuf_clear(&packet); ofpbuf_clear(&packet);
ofpbuf_reserve_with_tailroom(&packet, DP_NETDEV_HEADROOM, buf_size); ofpbuf_reserve_with_tailroom(&packet, DP_NETDEV_HEADROOM, buf_size);