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

dpif-netdev: Store pkt_metadata structure in dp_netdev_port.

Browse Source 
Initializing a struct pkt_metadata for every packet can be surprisingly
expensive.  It's much faster to keep a copy for each port and copying it
on each packet.

Suggested-by: Pravin Shelar <pshelar@nicira.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
This commit is contained in:
Daniele Di Proietto
2015-05-18 10:47:49 -07:00
committed by Pravin B Shelar
parent 5a07c6e177
commit efa2bcbb35
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/dpif-netdev.c
View File

@@ -235,9 +235,9 @@ enum pmd_cycles_counter_type {
/* A port in a netdev-based datapath. */ /* A port in a netdev-based datapath. */
struct dp_netdev_port { struct dp_netdev_port {
struct cmap_node node; /* Node in dp_netdev's 'ports'. */ struct pkt_metadata md;
odp_port_t port_no;
struct netdev *netdev; struct netdev *netdev;
struct cmap_node node; /* Node in dp_netdev's 'ports'. */
struct netdev_saved_flags *sf; struct netdev_saved_flags *sf;
struct netdev_rxq **rxq; struct netdev_rxq **rxq;
struct ovs_refcount ref_cnt; struct ovs_refcount ref_cnt;
@@ -1071,7 +1071,7 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
} }
} }
port = xzalloc(sizeof *port); port = xzalloc(sizeof *port);
port->port_no = port_no; port->md = PKT_METADATA_INITIALIZER(port_no);
port->netdev = netdev; port->netdev = netdev;
port->rxq = xmalloc(sizeof *port->rxq * netdev_n_rxq(netdev)); port->rxq = xmalloc(sizeof *port->rxq * netdev_n_rxq(netdev));
port->type = xstrdup(type); port->type = xstrdup(type);
@@ -1176,7 +1176,7 @@ dp_netdev_lookup_port(const struct dp_netdev *dp, odp_port_t port_no)
struct dp_netdev_port *port; struct dp_netdev_port *port;
CMAP_FOR_EACH_WITH_HASH (port, node, hash_port_no(port_no), &dp->ports) { CMAP_FOR_EACH_WITH_HASH (port, node, hash_port_no(port_no), &dp->ports) {
if (port->port_no == port_no) { if (port->md.in_port.odp_port == port_no) {
return port; return port;
} }
} }
@@ -1286,7 +1286,8 @@ static void
do_del_port(struct dp_netdev *dp, struct dp_netdev_port *port) do_del_port(struct dp_netdev *dp, struct dp_netdev_port *port)
OVS_REQUIRES(dp->port_mutex) OVS_REQUIRES(dp->port_mutex)
{ {
cmap_remove(&dp->ports, &port->node, hash_odp_port(port->port_no)); cmap_remove(&dp->ports, &port->node,
hash_odp_port(port->md.in_port.odp_port));
seq_change(dp->port_seq); seq_change(dp->port_seq);
if (netdev_is_pmd(port->netdev)) { if (netdev_is_pmd(port->netdev)) {
int numa_id = netdev_get_numa_id(port->netdev); int numa_id = netdev_get_numa_id(port->netdev);
@@ -1308,7 +1309,7 @@ answer_port_query(const struct dp_netdev_port *port,
{ {
dpif_port->name = xstrdup(netdev_get_name(port->netdev)); dpif_port->name = xstrdup(netdev_get_name(port->netdev));
dpif_port->type = xstrdup(port->type); dpif_port->type = xstrdup(port->type);
dpif_port->port_no = port->port_no; dpif_port->port_no = port->md.in_port.odp_port;
} }
static int static int
@@ -1435,7 +1436,7 @@ dpif_netdev_port_dump_next(const struct dpif *dpif, void *state_,
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->md.in_port.odp_port;
retval = 0; retval = 0;
} else { } else {
@@ -2513,7 +2514,7 @@ dp_netdev_process_rxq_port(struct dp_netdev_pmd_thread *pmd,
/* XXX: initialize md in netdev implementation. */ /* XXX: initialize md in netdev implementation. */
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
packets[i]->md = PKT_METADATA_INITIALIZER(port->port_no); packets[i]->md = port->md;
} }
cycles_count_start(pmd); cycles_count_start(pmd);
dp_netdev_input(pmd, packets, cnt); dp_netdev_input(pmd, packets, cnt);
@@ -3611,12 +3612,12 @@ dpif_dummy_change_port_number(struct unixctl_conn *conn, int argc OVS_UNUSED,
} }
/* Remove old port. */ /* Remove old port. */
cmap_remove(&dp->ports, &old_port->node, hash_port_no(old_port->port_no)); cmap_remove(&dp->ports, &old_port->node, hash_port_no(old_port->md.in_port.odp_port));
ovsrcu_postpone(free, old_port); ovsrcu_postpone(free, old_port);
/* Insert new port (cmap semantics mean we cannot re-insert 'old_port'). */ /* Insert new port (cmap semantics mean we cannot re-insert 'old_port'). */
new_port = xmemdup(old_port, sizeof *old_port); new_port = xmemdup(old_port, sizeof *old_port);
new_port->port_no = port_no; new_port->md.in_port.odp_port = port_no;
cmap_insert(&dp->ports, &new_port->node, hash_port_no(port_no)); cmap_insert(&dp->ports, &new_port->node, hash_port_no(port_no));
seq_change(dp->port_seq); seq_change(dp->port_seq);
@@ -3647,7 +3648,7 @@ dpif_dummy_delete_port(struct unixctl_conn *conn, int argc OVS_UNUSED,
ovs_mutex_lock(&dp->port_mutex); ovs_mutex_lock(&dp->port_mutex);
if (get_port_by_name(dp, argv[2], &port)) { if (get_port_by_name(dp, argv[2], &port)) {
unixctl_command_reply_error(conn, "unknown port"); unixctl_command_reply_error(conn, "unknown port");
} else if (port->port_no == ODPP_LOCAL) { } else if (port->md.in_port.odp_port == ODPP_LOCAL) {
unixctl_command_reply_error(conn, "can't delete local port"); unixctl_command_reply_error(conn, "can't delete local port");
} else { } else {
do_del_port(dp, port); do_del_port(dp, port);