X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=55712dde1674beb117e1ea70db81d3aec82a2a07;hb=27bbe15dec4e1862396b5c4d265f0ced71b49930;hp=daa78838ad85e93c5b1a7fe0a6c586a5e229803b;hpb=24b7e19469dbd2cb3fdf8db70ef0c7b4bc851f17;p=sliver-openvswitch.git diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index daa78838a..55712dde1 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -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"); * you may not use this file except in compliance with the License. @@ -39,14 +39,18 @@ #include "dynamic-string.h" #include "flow.h" #include "hmap.h" +#include "latch.h" #include "list.h" +#include "meta-flow.h" #include "netdev.h" +#include "netdev-dpdk.h" #include "netdev-vport.h" #include "netlink.h" #include "odp-execute.h" #include "odp-util.h" #include "ofp-print.h" #include "ofpbuf.h" +#include "ovs-rcu.h" #include "packets.h" #include "poll-loop.h" #include "random.h" @@ -63,82 +67,262 @@ VLOG_DEFINE_THIS_MODULE(dpif_netdev); /* By default, choose a priority in the middle. */ #define NETDEV_RULE_PRIORITY 0x8000 +#define NR_THREADS 1 +/* Use per thread recirc_depth to prevent recirculation loop. */ +#define MAX_RECIRC_DEPTH 5 +DEFINE_STATIC_PER_THREAD_DATA(uint32_t, recirc_depth, 0) + /* 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 - * headers to be aligned on a 4-byte boundary. */ -enum { DP_NETDEV_HEADROOM = 2 + VLAN_HEADER_LEN }; - /* Queues. */ -enum { N_QUEUES = 2 }; /* Number of queues for dpif_recv(). */ enum { MAX_QUEUE_LEN = 128 }; /* Maximum number of packets per queue. */ enum { QUEUE_MASK = MAX_QUEUE_LEN - 1 }; BUILD_ASSERT_DECL(IS_POW2(MAX_QUEUE_LEN)); +/* Protects against changes to 'dp_netdevs'. */ +static struct ovs_mutex dp_netdev_mutex = OVS_MUTEX_INITIALIZER; + +/* Contains all 'struct dp_netdev's. */ +static struct shash dp_netdevs OVS_GUARDED_BY(dp_netdev_mutex) + = SHASH_INITIALIZER(&dp_netdevs); + struct dp_netdev_upcall { struct dpif_upcall upcall; /* Queued upcall information. */ struct ofpbuf buf; /* ofpbuf instance for upcall.packet. */ }; +/* A queue passing packets from a struct dp_netdev to its clients (handlers). + * + * + * Thread-safety + * ============= + * + * Any access at all requires the owning 'dp_netdev''s queue_rwlock and + * its own mutex. */ struct dp_netdev_queue { - struct dp_netdev_upcall upcalls[MAX_QUEUE_LEN]; - unsigned int head, tail; + struct ovs_mutex mutex; + struct seq *seq; /* Incremented whenever a packet is queued. */ + struct dp_netdev_upcall upcalls[MAX_QUEUE_LEN] OVS_GUARDED; + unsigned int head OVS_GUARDED; + unsigned int tail OVS_GUARDED; }; -/* Datapath based on the network device interface from netdev.h. */ +/* Datapath based on the network device interface from netdev.h. + * + * + * Thread-safety + * ============= + * + * Some members, marked 'const', are immutable. Accessing other members + * requires synchronization, as noted in more detail below. + * + * Acquisition order is, from outermost to innermost: + * + * dp_netdev_mutex (global) + * port_rwlock + * flow_mutex + * cls.rwlock + * queue_rwlock + */ struct dp_netdev { - const struct dpif_class *class; - char *name; - int open_cnt; - bool destroyed; - int max_mtu; /* Maximum MTU of any port added so far. */ - - struct dp_netdev_queue queues[N_QUEUES]; - struct classifier cls; /* Classifier. */ - struct hmap flow_table; /* Flow table. */ - struct seq *queue_seq; /* Incremented whenever a packet is queued. */ - - /* Statistics. */ - long long int n_hit; /* Number of flow table matches. */ - long long int n_missed; /* Number of flow table misses. */ - long long int n_lost; /* Number of misses not passed to client. */ - - /* Ports. */ - struct dp_netdev_port *ports[MAX_PORTS]; - struct list port_list; + const struct dpif_class *const class; + const char *const name; + struct ovs_refcount ref_cnt; + atomic_flag destroyed; + + /* Flows. + * + * Readers of 'cls' and 'flow_table' must take a 'cls->rwlock' read lock. + * + * Writers of 'cls' and 'flow_table' must take the 'flow_mutex' and then + * the 'cls->rwlock' write lock. (The outer 'flow_mutex' allows writers to + * atomically perform multiple operations on 'cls' and 'flow_table'.) + */ + struct ovs_mutex flow_mutex; + struct classifier cls; /* Classifier. Protected by cls.rwlock. */ + struct hmap flow_table OVS_GUARDED; /* Flow table. */ + + /* Queues. + * + * 'queue_rwlock' protects the modification of 'handler_queues' and + * 'n_handlers'. The queue elements are protected by its + * 'handler_queues''s mutex. */ + struct fat_rwlock queue_rwlock; + struct dp_netdev_queue *handler_queues; + uint32_t n_handlers; + + /* Statistics. + * + * ovsthread_stats is internally synchronized. */ + struct ovsthread_stats stats; /* Contains 'struct dp_netdev_stats *'. */ + + /* Ports. + * + * Any lookup into 'ports' or any access to the dp_netdev_ports found + * through 'ports' requires taking 'port_rwlock'. */ + struct ovs_rwlock port_rwlock; + struct hmap ports OVS_GUARDED; struct seq *port_seq; /* Incremented whenever a port changes. */ + + /* Forwarding threads. */ + struct latch exit_latch; + struct pmd_thread *pmd_threads; + size_t n_pmd_threads; + int pmd_count; +}; + +static struct dp_netdev_port *dp_netdev_lookup_port(const struct dp_netdev *dp, + odp_port_t) + OVS_REQ_RDLOCK(dp->port_rwlock); + +enum dp_stat_type { + DP_STAT_HIT, /* Packets that matched in the flow table. */ + DP_STAT_MISS, /* Packets that did not match. */ + DP_STAT_LOST, /* Packets not passed up to the client. */ + DP_N_STATS +}; + +/* Contained by struct dp_netdev's 'stats' member. */ +struct dp_netdev_stats { + struct ovs_mutex mutex; /* Protects 'n'. */ + + /* Indexed by DP_STAT_*, protected by 'mutex'. */ + unsigned long long int n[DP_N_STATS] OVS_GUARDED; }; + /* 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; + struct netdev_rxq **rxq; + struct ovs_refcount ref_cnt; char *type; /* Port type as requested by user. */ }; -/* A flow in dp_netdev's 'flow_table'. */ +/* A flow in dp_netdev's 'flow_table'. + * + * + * Thread-safety + * ============= + * + * Except near the beginning or ending of its lifespan, rule 'rule' belongs to + * its dp_netdev's classifier. The text below calls this classifier 'cls'. + * + * Motivation + * ---------- + * + * The thread safety rules described here for "struct dp_netdev_flow" are + * motivated by two goals: + * + * - Prevent threads that read members of "struct dp_netdev_flow" from + * reading bad data due to changes by some thread concurrently modifying + * those members. + * + * - Prevent two threads making changes to members of a given "struct + * dp_netdev_flow" from interfering with each other. + * + * + * Rules + * ----- + * + * A flow 'flow' may be accessed without a risk of being freed by code that + * holds a read-lock or write-lock on 'cls->rwlock' or that owns a reference to + * 'flow->ref_cnt' (or both). Code that needs to hold onto a flow for a while + * should take 'cls->rwlock', find the flow it needs, increment 'flow->ref_cnt' + * with dpif_netdev_flow_ref(), and drop 'cls->rwlock'. + * + * 'flow->ref_cnt' protects 'flow' from being freed. It doesn't protect the + * flow from being deleted from 'cls' (that's 'cls->rwlock') and it doesn't + * protect members of 'flow' from modification (that's 'flow->mutex'). + * + * 'flow->mutex' protects the members of 'flow' from modification. It doesn't + * protect the flow from being deleted from 'cls' (that's 'cls->rwlock') and it + * doesn't prevent the flow from being freed (that's 'flow->ref_cnt'). + * + * Some members, marked 'const', are immutable. Accessing other members + * requires synchronization, as noted in more detail below. + */ struct dp_netdev_flow { /* Packet classification. */ - struct cls_rule cr; /* In owning dp_netdev's 'cls'. */ + const struct cls_rule cr; /* In owning dp_netdev's 'cls'. */ + + /* Hash table index by unmasked flow. */ + const struct hmap_node node; /* In owning dp_netdev's 'flow_table'. */ + const struct flow flow; /* The flow that created this entry. */ + + /* Protects members marked OVS_GUARDED. + * + * Acquire after datapath's flow_mutex. */ + struct ovs_mutex mutex OVS_ACQ_AFTER(dp_netdev_mutex); - /* Hash table index by unmasked flow.*/ - struct hmap_node node; /* In owning dp_netdev's 'flow_table'. */ - struct flow flow; /* The flow that created this entry. */ + /* Statistics. + * + * Reading or writing these members requires 'mutex'. */ + struct ovsthread_stats stats; /* Contains "struct dp_netdev_flow_stats". */ + + /* Actions. + * + * Reading 'actions' requires 'mutex'. + * Writing 'actions' requires 'mutex' and (to allow for transactions) the + * datapath's flow_mutex. */ + OVSRCU_TYPE(struct dp_netdev_actions *) actions; +}; + +static void dp_netdev_flow_free(struct dp_netdev_flow *); + +/* Contained by struct dp_netdev_flow's 'stats' member. */ +struct dp_netdev_flow_stats { + struct ovs_mutex mutex; /* Guards all the other members. */ + + long long int used OVS_GUARDED; /* Last used time, in monotonic msecs. */ + long long int packet_count OVS_GUARDED; /* Number of packets matched. */ + long long int byte_count OVS_GUARDED; /* Number of bytes matched. */ + uint16_t tcp_flags OVS_GUARDED; /* Bitwise-OR of seen tcp_flags values. */ +}; - /* Statistics. */ - long long int used; /* Last used time, in monotonic msecs. */ - long long int packet_count; /* Number of packets matched. */ - long long int byte_count; /* Number of bytes matched. */ - uint16_t tcp_flags; /* Bitwise-OR of seen tcp_flags values. */ +/* A set of datapath actions within a "struct dp_netdev_flow". + * + * + * Thread-safety + * ============= + * + * A struct dp_netdev_actions 'actions' may be accessed without a risk of being + * freed by code that holds a read-lock or write-lock on 'flow->mutex' (where + * 'flow' is the dp_netdev_flow for which 'flow->actions == actions') or that + * owns a reference to 'actions->ref_cnt' (or both). */ +struct dp_netdev_actions { + /* These members are immutable: they do not change during the struct's + * lifetime. */ + struct nlattr *actions; /* Sequence of OVS_ACTION_ATTR_* attributes. */ + unsigned int size; /* Size of 'actions', in bytes. */ +}; - /* Actions. */ - struct nlattr *actions; - size_t actions_len; +struct dp_netdev_actions *dp_netdev_actions_create(const struct nlattr *, + size_t); +struct dp_netdev_actions *dp_netdev_flow_get_actions( + const struct dp_netdev_flow *); +static void dp_netdev_actions_free(struct dp_netdev_actions *); + +/* PMD: Poll modes drivers. PMD accesses devices via polling to eliminate + * the performance overhead of interrupt processing. Therefore netdev can + * not implement rx-wait for these devices. dpif-netdev needs to poll + * these device to check for recv buffer. pmd-thread does polling for + * devices assigned to itself thread. + * + * DPDK used PMD for accessing NIC. + * + * A thread that receives packets from PMD ports, looks them up in the flow + * table, and executes the actions it finds. + **/ +struct pmd_thread { + struct dp_netdev *dp; + pthread_t thread; + int id; + atomic_uint change_seq; }; /* Interface to netdev-based datapath. */ @@ -148,34 +332,38 @@ struct dpif_netdev { uint64_t last_port_seq; }; -/* All netdev-based datapaths. */ -static struct shash dp_netdevs = SHASH_INITIALIZER(&dp_netdevs); - -/* Global lock for all data. */ -static struct ovs_mutex dp_netdev_mutex = OVS_MUTEX_INITIALIZER; - -static int get_port_by_number(struct dp_netdev *, odp_port_t port_no, - struct dp_netdev_port **portp); -static int get_port_by_name(struct dp_netdev *, const char *devname, - struct dp_netdev_port **portp); -static void dp_netdev_free(struct dp_netdev *); +static int get_port_by_number(struct dp_netdev *dp, odp_port_t port_no, + struct dp_netdev_port **portp) + OVS_REQ_RDLOCK(dp->port_rwlock); +static int get_port_by_name(struct dp_netdev *dp, const char *devname, + struct dp_netdev_port **portp) + OVS_REQ_RDLOCK(dp->port_rwlock); +static void dp_netdev_free(struct dp_netdev *) + OVS_REQUIRES(dp_netdev_mutex); static void dp_netdev_flow_flush(struct dp_netdev *); -static int do_add_port(struct dp_netdev *, const char *devname, - const char *type, odp_port_t port_no); -static int do_del_port(struct dp_netdev *, odp_port_t port_no); +static int do_add_port(struct dp_netdev *dp, const char *devname, + const char *type, odp_port_t port_no) + OVS_REQ_WRLOCK(dp->port_rwlock); +static int do_del_port(struct dp_netdev *dp, odp_port_t port_no) + OVS_REQ_WRLOCK(dp->port_rwlock); +static void dp_netdev_destroy_all_queues(struct dp_netdev *dp) + OVS_REQ_WRLOCK(dp->queue_rwlock); static int dpif_netdev_open(const struct dpif_class *, const char *name, bool create, struct dpif **); -static int dp_netdev_output_userspace(struct dp_netdev *, const struct ofpbuf *, - int queue_no, const struct flow *, - const struct nlattr *userdata); -static void dp_netdev_execute_actions(struct dp_netdev *, - struct ofpbuf *, struct flow *, +static int dp_netdev_output_userspace(struct dp_netdev *dp, struct ofpbuf *, + int queue_no, int type, + const struct miniflow *, + const struct nlattr *userdata); +static void dp_netdev_execute_actions(struct dp_netdev *dp, + const struct miniflow *, + struct ofpbuf *, bool may_steal, + struct pkt_metadata *, const struct nlattr *actions, size_t actions_len); -static void dp_netdev_port_input(struct dp_netdev *dp, - struct dp_netdev_port *port, - struct ofpbuf *packet, uint32_t skb_priority, - uint32_t pkt_mark, const struct flow_tnl *tnl); +static void dp_netdev_port_input(struct dp_netdev *dp, struct ofpbuf *packet, + struct pkt_metadata *); + +static void dp_netdev_set_pmd_threads(struct dp_netdev *, int n); static struct dpif_netdev * dpif_netdev_cast(const struct dpif *dpif) @@ -224,7 +412,7 @@ create_dpif_netdev(struct dp_netdev *dp) uint16_t netflow_id = hash_string(dp->name, 0); struct dpif_netdev *dpif; - dp->open_cnt++; + ovs_refcount_ref(&dp->ref_cnt); dpif = xmalloc(sizeof *dpif); dpif_init(&dpif->dpif, dp->class, dp->name, netflow_id >> 8, netflow_id); @@ -238,6 +426,7 @@ create_dpif_netdev(struct dp_netdev *dp) * Return ODPP_NONE on failure. */ static odp_port_t choose_port(struct dp_netdev *dp, const char *name) + OVS_REQ_RDLOCK(dp->port_rwlock) { uint32_t port_no; @@ -257,8 +446,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 +455,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); } } @@ -278,33 +467,40 @@ choose_port(struct dp_netdev *dp, const char *name) static int create_dp_netdev(const char *name, const struct dpif_class *class, struct dp_netdev **dpp) + OVS_REQUIRES(dp_netdev_mutex) { struct dp_netdev *dp; int error; - int i; dp = xzalloc(sizeof *dp); - dp->class = class; - dp->name = xstrdup(name); - dp->open_cnt = 0; - dp->max_mtu = ETH_PAYLOAD_MAX; - for (i = 0; i < N_QUEUES; i++) { - dp->queues[i].head = dp->queues[i].tail = 0; - } - dp->queue_seq = seq_create(); - classifier_init(&dp->cls); + shash_add(&dp_netdevs, name, dp); + + *CONST_CAST(const struct dpif_class **, &dp->class) = class; + *CONST_CAST(const char **, &dp->name) = xstrdup(name); + ovs_refcount_init(&dp->ref_cnt); + atomic_flag_clear(&dp->destroyed); + + ovs_mutex_init(&dp->flow_mutex); + classifier_init(&dp->cls, NULL); hmap_init(&dp->flow_table); - list_init(&dp->port_list); + + fat_rwlock_init(&dp->queue_rwlock); + + ovsthread_stats_init(&dp->stats); + + ovs_rwlock_init(&dp->port_rwlock); + hmap_init(&dp->ports); dp->port_seq = seq_create(); + latch_init(&dp->exit_latch); + ovs_rwlock_wrlock(&dp->port_rwlock); error = do_add_port(dp, name, "internal", ODPP_LOCAL); + ovs_rwlock_unlock(&dp->port_rwlock); if (error) { dp_netdev_free(dp); return error; } - shash_add(&dp_netdevs, name, dp); - *dpp = dp; return 0; } @@ -335,52 +531,88 @@ dpif_netdev_open(const struct dpif_class *class, const char *name, static void dp_netdev_purge_queues(struct dp_netdev *dp) + OVS_REQ_WRLOCK(dp->queue_rwlock) { int i; - for (i = 0; i < N_QUEUES; i++) { - struct dp_netdev_queue *q = &dp->queues[i]; + for (i = 0; i < dp->n_handlers; i++) { + struct dp_netdev_queue *q = &dp->handler_queues[i]; + ovs_mutex_lock(&q->mutex); while (q->tail != q->head) { struct dp_netdev_upcall *u = &q->upcalls[q->tail++ & QUEUE_MASK]; + ofpbuf_uninit(&u->upcall.packet); ofpbuf_uninit(&u->buf); } + ovs_mutex_unlock(&q->mutex); } } +/* Requires dp_netdev_mutex so that we can't get a new reference to 'dp' + * through the 'dp_netdevs' shash while freeing 'dp'. */ static void dp_netdev_free(struct dp_netdev *dp) + OVS_REQUIRES(dp_netdev_mutex) { struct dp_netdev_port *port, *next; + struct dp_netdev_stats *bucket; + int i; + + shash_find_and_delete(&dp_netdevs, dp->name); + + dp_netdev_set_pmd_threads(dp, 0); + free(dp->pmd_threads); dp_netdev_flow_flush(dp); - LIST_FOR_EACH_SAFE (port, next, node, &dp->port_list) { + ovs_rwlock_wrlock(&dp->port_rwlock); + HMAP_FOR_EACH_SAFE (port, next, node, &dp->ports) { do_del_port(dp, port->port_no); } - dp_netdev_purge_queues(dp); - seq_destroy(dp->queue_seq); + ovs_rwlock_unlock(&dp->port_rwlock); + + OVSTHREAD_STATS_FOR_EACH_BUCKET (bucket, i, &dp->stats) { + ovs_mutex_destroy(&bucket->mutex); + free_cacheline(bucket); + } + ovsthread_stats_destroy(&dp->stats); + + fat_rwlock_wrlock(&dp->queue_rwlock); + dp_netdev_destroy_all_queues(dp); + fat_rwlock_unlock(&dp->queue_rwlock); + + fat_rwlock_destroy(&dp->queue_rwlock); + classifier_destroy(&dp->cls); hmap_destroy(&dp->flow_table); + ovs_mutex_destroy(&dp->flow_mutex); seq_destroy(dp->port_seq); - free(dp->name); + hmap_destroy(&dp->ports); + latch_destroy(&dp->exit_latch); + free(CONST_CAST(char *, dp->name)); free(dp); } +static void +dp_netdev_unref(struct dp_netdev *dp) +{ + if (dp) { + /* Take dp_netdev_mutex so that, if dp->ref_cnt falls to zero, we can't + * get a new reference to 'dp' through the 'dp_netdevs' shash. */ + ovs_mutex_lock(&dp_netdev_mutex); + if (ovs_refcount_unref(&dp->ref_cnt) == 1) { + dp_netdev_free(dp); + } + ovs_mutex_unlock(&dp_netdev_mutex); + } +} + static void dpif_netdev_close(struct dpif *dpif) { struct dp_netdev *dp = get_dp_netdev(dpif); - ovs_mutex_lock(&dp_netdev_mutex); - - ovs_assert(dp->open_cnt > 0); - if (--dp->open_cnt == 0 && dp->destroyed) { - shash_find_and_delete(&dp_netdevs, dp->name); - dp_netdev_free(dp); - } + dp_netdev_unref(dp); free(dpif); - - ovs_mutex_unlock(&dp_netdev_mutex); } static int @@ -388,9 +620,12 @@ dpif_netdev_destroy(struct dpif *dpif) { struct dp_netdev *dp = get_dp_netdev(dpif); - ovs_mutex_lock(&dp_netdev_mutex); - dp->destroyed = true; - ovs_mutex_unlock(&dp_netdev_mutex); + if (!atomic_flag_test_and_set(&dp->destroyed)) { + if (ovs_refcount_unref(&dp->ref_cnt) == 1) { + /* Can't happen: 'dpif' still owns a reference to 'dp'. */ + OVS_NOT_REACHED(); + } + } return 0; } @@ -399,31 +634,52 @@ static int dpif_netdev_get_stats(const struct dpif *dpif, struct dpif_dp_stats *stats) { struct dp_netdev *dp = get_dp_netdev(dpif); + struct dp_netdev_stats *bucket; + size_t i; - ovs_mutex_lock(&dp_netdev_mutex); + fat_rwlock_rdlock(&dp->cls.rwlock); stats->n_flows = hmap_count(&dp->flow_table); - stats->n_hit = dp->n_hit; - stats->n_missed = dp->n_missed; - stats->n_lost = dp->n_lost; - stats->n_masks = UINT64_MAX; + fat_rwlock_unlock(&dp->cls.rwlock); + + stats->n_hit = stats->n_missed = stats->n_lost = 0; + OVSTHREAD_STATS_FOR_EACH_BUCKET (bucket, i, &dp->stats) { + ovs_mutex_lock(&bucket->mutex); + stats->n_hit += bucket->n[DP_STAT_HIT]; + stats->n_missed += bucket->n[DP_STAT_MISS]; + stats->n_lost += bucket->n[DP_STAT_LOST]; + ovs_mutex_unlock(&bucket->mutex); + } + stats->n_masks = UINT32_MAX; stats->n_mask_hit = UINT64_MAX; - ovs_mutex_unlock(&dp_netdev_mutex); return 0; } +static void +dp_netdev_reload_pmd_threads(struct dp_netdev *dp) +{ + int i; + + for (i = 0; i < dp->n_pmd_threads; i++) { + struct pmd_thread *f = &dp->pmd_threads[i]; + int id; + + atomic_add(&f->change_seq, 1, &id); + } +} + static int do_add_port(struct dp_netdev *dp, const char *devname, const char *type, odp_port_t port_no) + OVS_REQ_WRLOCK(dp->port_rwlock) { struct netdev_saved_flags *sf; struct dp_netdev_port *port; struct netdev *netdev; - struct netdev_rx *rx; enum netdev_flags flags; const char *open_type; - int mtu; int error; + int i; /* XXX reject devices already in some dp_netdev. */ @@ -442,36 +698,42 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, return EINVAL; } - error = netdev_rx_open(netdev, &rx); - if (error - && !(error == EOPNOTSUPP && dpif_netdev_class_is_dummy(dp->class))) { - VLOG_ERR("%s: cannot receive packets on this network device (%s)", - devname, ovs_strerror(errno)); - netdev_close(netdev); - return error; + port = xzalloc(sizeof *port); + port->port_no = port_no; + port->netdev = netdev; + port->rxq = xmalloc(sizeof *port->rxq * netdev_n_rxq(netdev)); + port->type = xstrdup(type); + for (i = 0; i < netdev_n_rxq(netdev); i++) { + error = netdev_rxq_open(netdev, &port->rxq[i], i); + if (error + && !(error == EOPNOTSUPP && dpif_netdev_class_is_dummy(dp->class))) { + VLOG_ERR("%s: cannot receive packets on this network device (%s)", + devname, ovs_strerror(errno)); + netdev_close(netdev); + return error; + } } error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, &sf); if (error) { - netdev_rx_close(rx); + for (i = 0; i < netdev_n_rxq(netdev); i++) { + netdev_rxq_close(port->rxq[i]); + } netdev_close(netdev); + free(port->rxq); + free(port); return error; } - - port = xmalloc(sizeof *port); - port->port_no = port_no; - port->netdev = netdev; port->sf = sf; - port->rx = rx; - port->type = xstrdup(type); - error = netdev_get_mtu(netdev, &mtu); - if (!error && mtu > dp->max_mtu) { - dp->max_mtu = mtu; + if (netdev_is_pmd(netdev)) { + dp->pmd_count++; + dp_netdev_set_pmd_threads(dp, NR_THREADS); + dp_netdev_reload_pmd_threads(dp); } + ovs_refcount_init(&port->ref_cnt); - 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; @@ -487,18 +749,11 @@ dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev, odp_port_t port_no; int error; - ovs_mutex_lock(&dp_netdev_mutex); + ovs_rwlock_wrlock(&dp->port_rwlock); 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; @@ -507,7 +762,7 @@ dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev, *port_nop = port_no; error = do_add_port(dp, dpif_port, netdev_get_type(netdev), port_no); } - ovs_mutex_unlock(&dp_netdev_mutex); + ovs_rwlock_unlock(&dp->port_rwlock); return error; } @@ -518,9 +773,9 @@ dpif_netdev_port_del(struct dpif *dpif, odp_port_t port_no) struct dp_netdev *dp = get_dp_netdev(dpif); int error; - ovs_mutex_lock(&dp_netdev_mutex); + ovs_rwlock_wrlock(&dp->port_rwlock); error = port_no == ODPP_LOCAL ? EINVAL : do_del_port(dp, port_no); - ovs_mutex_unlock(&dp_netdev_mutex); + ovs_rwlock_unlock(&dp->port_rwlock); return error; } @@ -528,29 +783,71 @@ 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) + OVS_REQ_RDLOCK(dp->port_rwlock) +{ + 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 get_port_by_number(struct dp_netdev *dp, odp_port_t port_no, struct dp_netdev_port **portp) + OVS_REQ_RDLOCK(dp->port_rwlock) { if (!is_valid_port_number(port_no)) { *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; } } +static void +port_ref(struct dp_netdev_port *port) +{ + if (port) { + ovs_refcount_ref(&port->ref_cnt); + } +} + +static void +port_unref(struct dp_netdev_port *port) +{ + if (port && ovs_refcount_unref(&port->ref_cnt) == 1) { + int i; + + netdev_close(port->netdev); + netdev_restore_flags(port->sf); + + for (i = 0; i < netdev_n_rxq(port->netdev); i++) { + netdev_rxq_close(port->rxq[i]); + } + free(port->type); + free(port); + } +} + static int get_port_by_name(struct dp_netdev *dp, const char *devname, struct dp_netdev_port **portp) + OVS_REQ_RDLOCK(dp->port_rwlock) { 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; @@ -561,6 +858,7 @@ get_port_by_name(struct dp_netdev *dp, static int do_del_port(struct dp_netdev *dp, odp_port_t port_no) + OVS_REQ_WRLOCK(dp->port_rwlock) { struct dp_netdev_port *port; int error; @@ -570,16 +868,13 @@ 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); + if (netdev_is_pmd(port->netdev)) { + dp_netdev_reload_pmd_threads(dp); + } - netdev_close(port->netdev); - netdev_restore_flags(port->sf); - netdev_rx_close(port->rx); - free(port->type); - free(port); - + port_unref(port); return 0; } @@ -600,12 +895,12 @@ dpif_netdev_port_query_by_number(const struct dpif *dpif, odp_port_t port_no, struct dp_netdev_port *port; int error; - ovs_mutex_lock(&dp_netdev_mutex); + ovs_rwlock_rdlock(&dp->port_rwlock); error = get_port_by_number(dp, port_no, &port); if (!error && dpif_port) { answer_port_query(port, dpif_port); } - ovs_mutex_unlock(&dp_netdev_mutex); + ovs_rwlock_unlock(&dp->port_rwlock); return error; } @@ -618,33 +913,45 @@ dpif_netdev_port_query_by_name(const struct dpif *dpif, const char *devname, struct dp_netdev_port *port; int error; - ovs_mutex_lock(&dp_netdev_mutex); + ovs_rwlock_rdlock(&dp->port_rwlock); error = get_port_by_name(dp, devname, &port); if (!error && dpif_port) { answer_port_query(port, dpif_port); } - ovs_mutex_unlock(&dp_netdev_mutex); + ovs_rwlock_unlock(&dp->port_rwlock); return error; } -static uint32_t -dpif_netdev_get_max_ports(const struct dpif *dpif OVS_UNUSED) +static void +dp_netdev_flow_free(struct dp_netdev_flow *flow) { - return MAX_PORTS; + struct dp_netdev_flow_stats *bucket; + size_t i; + + OVSTHREAD_STATS_FOR_EACH_BUCKET (bucket, i, &flow->stats) { + ovs_mutex_destroy(&bucket->mutex); + free_cacheline(bucket); + } + ovsthread_stats_destroy(&flow->stats); + + cls_rule_destroy(CONST_CAST(struct cls_rule *, &flow->cr)); + dp_netdev_actions_free(dp_netdev_flow_get_actions(flow)); + ovs_mutex_destroy(&flow->mutex); + free(flow); } static void -dp_netdev_free_flow(struct dp_netdev *dp, struct dp_netdev_flow *netdev_flow) +dp_netdev_remove_flow(struct dp_netdev *dp, struct dp_netdev_flow *flow) + OVS_REQ_WRLOCK(dp->cls.rwlock) + OVS_REQUIRES(dp->flow_mutex) { - ovs_rwlock_wrlock(&dp->cls.rwlock); - classifier_remove(&dp->cls, &netdev_flow->cr); - ovs_rwlock_unlock(&dp->cls.rwlock); - cls_rule_destroy(&netdev_flow->cr); + struct cls_rule *cr = CONST_CAST(struct cls_rule *, &flow->cr); + struct hmap_node *node = CONST_CAST(struct hmap_node *, &flow->node); - hmap_remove(&dp->flow_table, &netdev_flow->node); - free(netdev_flow->actions); - free(netdev_flow); + classifier_remove(&dp->cls, cr); + hmap_remove(&dp->flow_table, node); + ovsrcu_postpone(dp_netdev_flow_free, flow); } static void @@ -652,9 +959,13 @@ dp_netdev_flow_flush(struct dp_netdev *dp) { struct dp_netdev_flow *netdev_flow, *next; + ovs_mutex_lock(&dp->flow_mutex); + fat_rwlock_wrlock(&dp->cls.rwlock); HMAP_FOR_EACH_SAFE (netdev_flow, next, node, &dp->flow_table) { - dp_netdev_free_flow(dp, netdev_flow); + dp_netdev_remove_flow(dp, netdev_flow); } + fat_rwlock_unlock(&dp->cls.rwlock); + ovs_mutex_unlock(&dp->flow_mutex); } static int @@ -662,15 +973,13 @@ dpif_netdev_flow_flush(struct dpif *dpif) { struct dp_netdev *dp = get_dp_netdev(dpif); - ovs_mutex_lock(&dp_netdev_mutex); dp_netdev_flow_flush(dp); - ovs_mutex_unlock(&dp_netdev_mutex); - return 0; } struct dp_netdev_port_state { - odp_port_t port_no; + uint32_t bucket; + uint32_t offset; char *name; }; @@ -687,27 +996,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); + ovs_rwlock_rdlock(&dp->port_rwlock); + 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); + ovs_rwlock_unlock(&dp->port_rwlock); - return EOF; + return retval; } static int @@ -726,7 +1037,6 @@ dpif_netdev_port_poll(const struct dpif *dpif_, char **devnamep OVS_UNUSED) uint64_t new_port_seq; int error; - ovs_mutex_lock(&dp_netdev_mutex); new_port_seq = seq_read(dpif->dp->port_seq); if (dpif->last_port_seq != new_port_seq) { dpif->last_port_seq = new_port_seq; @@ -734,7 +1044,6 @@ dpif_netdev_port_poll(const struct dpif *dpif_, char **devnamep OVS_UNUSED) } else { error = EAGAIN; } - ovs_mutex_unlock(&dp_netdev_mutex); return error; } @@ -744,27 +1053,33 @@ dpif_netdev_port_poll_wait(const struct dpif *dpif_) { struct dpif_netdev *dpif = dpif_netdev_cast(dpif_); - ovs_mutex_lock(&dp_netdev_mutex); seq_wait(dpif->dp->port_seq, dpif->last_port_seq); - ovs_mutex_unlock(&dp_netdev_mutex); } static struct dp_netdev_flow * -dp_netdev_lookup_flow(const struct dp_netdev *dp, const struct flow *flow) +dp_netdev_flow_cast(const struct cls_rule *cr) +{ + return cr ? CONTAINER_OF(cr, struct dp_netdev_flow, cr) : NULL; +} + +static struct dp_netdev_flow * +dp_netdev_lookup_flow(const struct dp_netdev *dp, const struct miniflow *key) + OVS_EXCLUDED(dp->cls.rwlock) { - struct cls_rule *cr; + struct dp_netdev_flow *netdev_flow; + struct cls_rule *rule; - ovs_rwlock_wrlock(&dp->cls.rwlock); - cr = classifier_lookup(&dp->cls, flow, NULL); - ovs_rwlock_unlock(&dp->cls.rwlock); + fat_rwlock_rdlock(&dp->cls.rwlock); + rule = classifier_lookup_miniflow_first(&dp->cls, key); + netdev_flow = dp_netdev_flow_cast(rule); + fat_rwlock_unlock(&dp->cls.rwlock); - return (cr - ? CONTAINER_OF(cr, struct dp_netdev_flow, cr) - : NULL); + return netdev_flow; } static struct dp_netdev_flow * dp_netdev_find_flow(const struct dp_netdev *dp, const struct flow *flow) + OVS_REQ_RDLOCK(dp->cls.rwlock) { struct dp_netdev_flow *netdev_flow; @@ -774,6 +1089,7 @@ dp_netdev_find_flow(const struct dp_netdev *dp, const struct flow *flow) return netdev_flow; } } + return NULL; } @@ -781,36 +1097,97 @@ static void get_dpif_flow_stats(struct dp_netdev_flow *netdev_flow, struct dpif_flow_stats *stats) { - stats->n_packets = netdev_flow->packet_count; - stats->n_bytes = netdev_flow->byte_count; - stats->used = netdev_flow->used; - stats->tcp_flags = netdev_flow->tcp_flags; + struct dp_netdev_flow_stats *bucket; + size_t i; + + memset(stats, 0, sizeof *stats); + OVSTHREAD_STATS_FOR_EACH_BUCKET (bucket, i, &netdev_flow->stats) { + ovs_mutex_lock(&bucket->mutex); + stats->n_packets += bucket->packet_count; + stats->n_bytes += bucket->byte_count; + stats->used = MAX(stats->used, bucket->used); + stats->tcp_flags |= bucket->tcp_flags; + ovs_mutex_unlock(&bucket->mutex); + } +} + +static int +dpif_netdev_mask_from_nlattrs(const struct nlattr *key, uint32_t key_len, + const struct nlattr *mask_key, + uint32_t mask_key_len, const struct flow *flow, + struct flow *mask) +{ + if (mask_key_len) { + enum odp_key_fitness fitness; + + fitness = odp_flow_key_to_mask(mask_key, mask_key_len, mask, flow); + if (fitness) { + /* This should not happen: it indicates that + * odp_flow_key_from_mask() and odp_flow_key_to_mask() + * disagree on the acceptable form of a mask. Log the problem + * as an error, with enough details to enable debugging. */ + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + + if (!VLOG_DROP_ERR(&rl)) { + struct ds s; + + ds_init(&s); + odp_flow_format(key, key_len, mask_key, mask_key_len, NULL, &s, + true); + VLOG_ERR("internal error parsing flow mask %s (%s)", + ds_cstr(&s), odp_key_fitness_to_string(fitness)); + ds_destroy(&s); + } + + return EINVAL; + } + } else { + enum mf_field_id id; + /* No mask key, unwildcard everything except fields whose + * prerequisities are not met. */ + memset(mask, 0x0, sizeof *mask); + + for (id = 0; id < MFF_N_IDS; ++id) { + /* Skip registers and metadata. */ + if (!(id >= MFF_REG0 && id < MFF_REG0 + FLOW_N_REGS) + && id != MFF_METADATA) { + const struct mf_field *mf = mf_from_id(id); + if (mf_are_prereqs_ok(mf, flow)) { + mf_mask_field(mf, mask); + } + } + } + } + + /* Force unwildcard the in_port. + * + * We need to do this even in the case where we unwildcard "everything" + * above because "everything" only includes the 16-bit OpenFlow port number + * mask->in_port.ofp_port, which only covers half of the 32-bit datapath + * port number mask->in_port.odp_port. */ + mask->in_port.odp_port = u32_to_odp(UINT32_MAX); + + return 0; } static int -dpif_netdev_flow_mask_from_nlattrs(const struct nlattr *key, uint32_t key_len, - const struct nlattr *mask_key, - uint32_t mask_key_len, struct flow *flow, - struct flow *mask) +dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len, + struct flow *flow) { odp_port_t in_port; - if (odp_flow_key_to_flow(key, key_len, flow) - || (mask_key - && odp_flow_key_to_mask(mask_key, mask_key_len, mask, flow))) { + if (odp_flow_key_to_flow(key, key_len, flow)) { /* This should not happen: it indicates that odp_flow_key_from_flow() - * and odp_flow_key_to_flow() disagree on the acceptable form of a flow - * or odp_flow_key_from_mask() and odp_flow_key_to_mask() disagree on - * the acceptable form of a mask. Log the problem as an error, with - * enough details to enable debugging. */ + * and odp_flow_key_to_flow() disagree on the acceptable form of a + * flow. Log the problem as an error, with enough details to enable + * debugging. */ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); if (!VLOG_DROP_ERR(&rl)) { struct ds s; ds_init(&s); - odp_flow_format(key, key_len, mask_key, mask_key_len, NULL, &s, - true); + odp_flow_format(key, key_len, NULL, 0, NULL, &s, true); VLOG_ERR("internal error parsing flow key %s", ds_cstr(&s)); ds_destroy(&s); } @@ -818,11 +1195,6 @@ dpif_netdev_flow_mask_from_nlattrs(const struct nlattr *key, uint32_t key_len, return EINVAL; } - if (mask_key) { - /* Force unwildcard the in_port. */ - mask->in_port.odp_port = u32_to_odp(UINT32_MAX); - } - in_port = flow->in_port.odp_port; if (!is_valid_port_number(in_port) && in_port != ODPP_NONE) { return EINVAL; @@ -831,14 +1203,6 @@ dpif_netdev_flow_mask_from_nlattrs(const struct nlattr *key, uint32_t key_len, return 0; } -static int -dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len, - struct flow *flow) -{ - return dpif_netdev_flow_mask_from_nlattrs(key, key_len, NULL, 0, flow, - NULL); -} - static int dpif_netdev_flow_get(const struct dpif *dpif, const struct nlattr *nl_key, size_t nl_key_len, @@ -854,75 +1218,76 @@ dpif_netdev_flow_get(const struct dpif *dpif, return error; } - ovs_mutex_lock(&dp_netdev_mutex); + fat_rwlock_rdlock(&dp->cls.rwlock); netdev_flow = dp_netdev_find_flow(dp, &key); + fat_rwlock_unlock(&dp->cls.rwlock); + if (netdev_flow) { if (stats) { get_dpif_flow_stats(netdev_flow, stats); } + if (actionsp) { - *actionsp = ofpbuf_clone_data(netdev_flow->actions, - netdev_flow->actions_len); + struct dp_netdev_actions *actions; + + actions = dp_netdev_flow_get_actions(netdev_flow); + *actionsp = ofpbuf_clone_data(actions->actions, actions->size); } - } else { + } else { error = ENOENT; } - ovs_mutex_unlock(&dp_netdev_mutex); return error; } -static int -set_flow_actions(struct dp_netdev_flow *netdev_flow, - const struct nlattr *actions, size_t actions_len) -{ - netdev_flow->actions = xrealloc(netdev_flow->actions, actions_len); - netdev_flow->actions_len = actions_len; - memcpy(netdev_flow->actions, actions, actions_len); - return 0; -} - static int dp_netdev_flow_add(struct dp_netdev *dp, const struct flow *flow, const struct flow_wildcards *wc, const struct nlattr *actions, size_t actions_len) + OVS_REQUIRES(dp->flow_mutex) { struct dp_netdev_flow *netdev_flow; struct match match; - int error; netdev_flow = xzalloc(sizeof *netdev_flow); - netdev_flow->flow = *flow; + *CONST_CAST(struct flow *, &netdev_flow->flow) = *flow; - match_init(&match, flow, wc); - cls_rule_init(&netdev_flow->cr, &match, NETDEV_RULE_PRIORITY); - ovs_rwlock_wrlock(&dp->cls.rwlock); - classifier_insert(&dp->cls, &netdev_flow->cr); - ovs_rwlock_unlock(&dp->cls.rwlock); + ovs_mutex_init(&netdev_flow->mutex); - error = set_flow_actions(netdev_flow, actions, actions_len); - if (error) { - ovs_rwlock_wrlock(&dp->cls.rwlock); - classifier_remove(&dp->cls, &netdev_flow->cr); - ovs_rwlock_unlock(&dp->cls.rwlock); - cls_rule_destroy(&netdev_flow->cr); + ovsthread_stats_init(&netdev_flow->stats); - free(netdev_flow); - return error; - } + ovsrcu_set(&netdev_flow->actions, + dp_netdev_actions_create(actions, actions_len)); + + match_init(&match, flow, wc); + cls_rule_init(CONST_CAST(struct cls_rule *, &netdev_flow->cr), + &match, NETDEV_RULE_PRIORITY); + fat_rwlock_wrlock(&dp->cls.rwlock); + classifier_insert(&dp->cls, + CONST_CAST(struct cls_rule *, &netdev_flow->cr)); + hmap_insert(&dp->flow_table, + CONST_CAST(struct hmap_node *, &netdev_flow->node), + flow_hash(flow, 0)); + fat_rwlock_unlock(&dp->cls.rwlock); - hmap_insert(&dp->flow_table, &netdev_flow->node, flow_hash(flow, 0)); return 0; } static void clear_stats(struct dp_netdev_flow *netdev_flow) { - netdev_flow->used = 0; - netdev_flow->packet_count = 0; - netdev_flow->byte_count = 0; - netdev_flow->tcp_flags = 0; + struct dp_netdev_flow_stats *bucket; + size_t i; + + OVSTHREAD_STATS_FOR_EACH_BUCKET (bucket, i, &netdev_flow->stats) { + ovs_mutex_lock(&bucket->mutex); + bucket->used = 0; + bucket->packet_count = 0; + bucket->byte_count = 0; + bucket->tcp_flags = 0; + ovs_mutex_unlock(&bucket->mutex); + } } static int @@ -931,17 +1296,24 @@ dpif_netdev_flow_put(struct dpif *dpif, const struct dpif_flow_put *put) struct dp_netdev *dp = get_dp_netdev(dpif); struct dp_netdev_flow *netdev_flow; struct flow flow; + struct miniflow miniflow; struct flow_wildcards wc; int error; - error = dpif_netdev_flow_mask_from_nlattrs(put->key, put->key_len, - put->mask, put->mask_len, &flow, &wc.masks); + error = dpif_netdev_flow_from_nlattrs(put->key, put->key_len, &flow); + if (error) { + return error; + } + error = dpif_netdev_mask_from_nlattrs(put->key, put->key_len, + put->mask, put->mask_len, + &flow, &wc.masks); if (error) { return error; } + miniflow_init(&miniflow, &flow); - ovs_mutex_lock(&dp_netdev_mutex); - netdev_flow = dp_netdev_lookup_flow(dp, &flow); + ovs_mutex_lock(&dp->flow_mutex); + netdev_flow = dp_netdev_lookup_flow(dp, &miniflow); if (!netdev_flow) { if (put->flags & DPIF_FP_CREATE) { if (hmap_count(&dp->flow_table) < MAX_FLOWS) { @@ -959,16 +1331,23 @@ dpif_netdev_flow_put(struct dpif *dpif, const struct dpif_flow_put *put) } else { if (put->flags & DPIF_FP_MODIFY && flow_equal(&flow, &netdev_flow->flow)) { - error = set_flow_actions(netdev_flow, put->actions, - put->actions_len); - if (!error) { - if (put->stats) { - get_dpif_flow_stats(netdev_flow, put->stats); - } - if (put->flags & DPIF_FP_ZERO_STATS) { - clear_stats(netdev_flow); - } + struct dp_netdev_actions *new_actions; + struct dp_netdev_actions *old_actions; + + new_actions = dp_netdev_actions_create(put->actions, + put->actions_len); + + old_actions = dp_netdev_flow_get_actions(netdev_flow); + ovsrcu_set(&netdev_flow->actions, new_actions); + + if (put->stats) { + get_dpif_flow_stats(netdev_flow, put->stats); + } + if (put->flags & DPIF_FP_ZERO_STATS) { + clear_stats(netdev_flow); } + + ovsrcu_postpone(dp_netdev_actions_free, old_actions); } else if (put->flags & DPIF_FP_CREATE) { error = EEXIST; } else { @@ -976,7 +1355,7 @@ dpif_netdev_flow_put(struct dpif *dpif, const struct dpif_flow_put *put) error = EINVAL; } } - ovs_mutex_unlock(&dp_netdev_mutex); + ovs_mutex_unlock(&dp->flow_mutex); return error; } @@ -994,151 +1373,253 @@ dpif_netdev_flow_del(struct dpif *dpif, const struct dpif_flow_del *del) return error; } - ovs_mutex_lock(&dp_netdev_mutex); + ovs_mutex_lock(&dp->flow_mutex); + fat_rwlock_wrlock(&dp->cls.rwlock); netdev_flow = dp_netdev_find_flow(dp, &key); if (netdev_flow) { if (del->stats) { get_dpif_flow_stats(netdev_flow, del->stats); } - dp_netdev_free_flow(dp, netdev_flow); + dp_netdev_remove_flow(dp, netdev_flow); } else { error = ENOENT; } - ovs_mutex_unlock(&dp_netdev_mutex); + fat_rwlock_unlock(&dp->cls.rwlock); + ovs_mutex_unlock(&dp->flow_mutex); return error; } struct dp_netdev_flow_state { - uint32_t bucket; - uint32_t offset; - struct nlattr *actions; + struct dp_netdev_actions *actions; struct odputil_keybuf keybuf; struct odputil_keybuf maskbuf; struct dpif_flow_stats stats; }; -static int -dpif_netdev_flow_dump_start(const struct dpif *dpif OVS_UNUSED, void **statep) -{ - struct dp_netdev_flow_state *state; - +struct dp_netdev_flow_iter { + uint32_t bucket; + uint32_t offset; + int status; + struct ovs_mutex mutex; +}; + +static void +dpif_netdev_flow_dump_state_init(void **statep) +{ + struct dp_netdev_flow_state *state; + *statep = state = xmalloc(sizeof *state); - state->bucket = 0; - state->offset = 0; state->actions = NULL; +} + +static void +dpif_netdev_flow_dump_state_uninit(void *state_) +{ + struct dp_netdev_flow_state *state = state_; + + free(state); +} + +static int +dpif_netdev_flow_dump_start(const struct dpif *dpif OVS_UNUSED, void **iterp) +{ + struct dp_netdev_flow_iter *iter; + + *iterp = iter = xmalloc(sizeof *iter); + iter->bucket = 0; + iter->offset = 0; + iter->status = 0; + ovs_mutex_init(&iter->mutex); return 0; } +/* XXX the caller must use 'actions' without quiescing */ static int -dpif_netdev_flow_dump_next(const struct dpif *dpif, void *state_, +dpif_netdev_flow_dump_next(const struct dpif *dpif, void *iter_, void *state_, const struct nlattr **key, size_t *key_len, const struct nlattr **mask, size_t *mask_len, const struct nlattr **actions, size_t *actions_len, const struct dpif_flow_stats **stats) { + struct dp_netdev_flow_iter *iter = iter_; struct dp_netdev_flow_state *state = state_; struct dp_netdev *dp = get_dp_netdev(dpif); struct dp_netdev_flow *netdev_flow; - struct hmap_node *node; + struct flow_wildcards wc; + int error; - ovs_mutex_lock(&dp_netdev_mutex); - node = hmap_at_position(&dp->flow_table, &state->bucket, &state->offset); - if (!node) { - ovs_mutex_unlock(&dp_netdev_mutex); - return EOF; + ovs_mutex_lock(&iter->mutex); + error = iter->status; + if (!error) { + struct hmap_node *node; + + fat_rwlock_rdlock(&dp->cls.rwlock); + node = hmap_at_position(&dp->flow_table, &iter->bucket, &iter->offset); + if (node) { + netdev_flow = CONTAINER_OF(node, struct dp_netdev_flow, node); + } + fat_rwlock_unlock(&dp->cls.rwlock); + if (!node) { + iter->status = error = EOF; + } + } + ovs_mutex_unlock(&iter->mutex); + if (error) { + return error; } - netdev_flow = CONTAINER_OF(node, struct dp_netdev_flow, node); + minimask_expand(&netdev_flow->cr.match.mask, &wc); if (key) { struct ofpbuf buf; ofpbuf_use_stack(&buf, &state->keybuf, sizeof state->keybuf); - odp_flow_key_from_flow(&buf, &netdev_flow->flow, + odp_flow_key_from_flow(&buf, &netdev_flow->flow, &wc.masks, netdev_flow->flow.in_port.odp_port); - *key = buf.data; - *key_len = buf.size; + *key = ofpbuf_data(&buf); + *key_len = ofpbuf_size(&buf); } if (key && mask) { struct ofpbuf buf; - struct flow_wildcards wc; ofpbuf_use_stack(&buf, &state->maskbuf, sizeof state->maskbuf); - minimask_expand(&netdev_flow->cr.match.mask, &wc); odp_flow_key_from_mask(&buf, &wc.masks, &netdev_flow->flow, - odp_to_u32(wc.masks.in_port.odp_port)); + odp_to_u32(wc.masks.in_port.odp_port), + SIZE_MAX); - *mask = buf.data; - *mask_len = buf.size; + *mask = ofpbuf_data(&buf); + *mask_len = ofpbuf_size(&buf); } - if (actions) { - free(state->actions); - state->actions = xmemdup(netdev_flow->actions, - netdev_flow->actions_len); + if (actions || stats) { + state->actions = NULL; - *actions = state->actions; - *actions_len = netdev_flow->actions_len; - } + if (actions) { + state->actions = dp_netdev_flow_get_actions(netdev_flow); + *actions = state->actions->actions; + *actions_len = state->actions->size; + } - if (stats) { - get_dpif_flow_stats(netdev_flow, &state->stats); - *stats = &state->stats; + if (stats) { + get_dpif_flow_stats(netdev_flow, &state->stats); + *stats = &state->stats; + } } - ovs_mutex_unlock(&dp_netdev_mutex); return 0; } static int -dpif_netdev_flow_dump_done(const struct dpif *dpif OVS_UNUSED, void *state_) +dpif_netdev_flow_dump_done(const struct dpif *dpif OVS_UNUSED, void *iter_) { - struct dp_netdev_flow_state *state = state_; + struct dp_netdev_flow_iter *iter = iter_; - free(state->actions); - free(state); + ovs_mutex_destroy(&iter->mutex); + free(iter); return 0; } static int -dpif_netdev_execute(struct dpif *dpif, const struct dpif_execute *execute) +dpif_netdev_execute(struct dpif *dpif, struct dpif_execute *execute) { struct dp_netdev *dp = get_dp_netdev(dpif); - struct flow md; - int error; - - if (execute->packet->size < ETH_HEADER_LEN || - execute->packet->size > UINT16_MAX) { + struct pkt_metadata *md = &execute->md; + struct { + struct miniflow flow; + uint32_t buf[FLOW_U32S]; + } key; + + if (ofpbuf_size(execute->packet) < ETH_HEADER_LEN || + ofpbuf_size(execute->packet) > UINT16_MAX) { return EINVAL; } - /* Get packet metadata. */ - error = dpif_netdev_flow_from_nlattrs(execute->key, execute->key_len, &md); - if (!error) { - struct ofpbuf *copy; - struct flow key; + /* Extract flow key. */ + miniflow_initialize(&key.flow, key.buf); + miniflow_extract(execute->packet, md, &key.flow); - /* Make a deep copy of 'packet', because we might modify its data. */ - copy = ofpbuf_clone_with_headroom(execute->packet, DP_NETDEV_HEADROOM); + ovs_rwlock_rdlock(&dp->port_rwlock); + dp_netdev_execute_actions(dp, &key.flow, execute->packet, false, md, + execute->actions, execute->actions_len); + ovs_rwlock_unlock(&dp->port_rwlock); - /* Extract flow key. */ - flow_extract(copy, md.skb_priority, md.pkt_mark, &md.tunnel, - &md.in_port, &key); - ovs_mutex_lock(&dp_netdev_mutex); - dp_netdev_execute_actions(dp, copy, &key, - execute->actions, execute->actions_len); - ovs_mutex_unlock(&dp_netdev_mutex); - ofpbuf_delete(copy); + return 0; +} + +static void +dp_netdev_destroy_all_queues(struct dp_netdev *dp) + OVS_REQ_WRLOCK(dp->queue_rwlock) +{ + size_t i; + + dp_netdev_purge_queues(dp); + + for (i = 0; i < dp->n_handlers; i++) { + struct dp_netdev_queue *q = &dp->handler_queues[i]; + + ovs_mutex_destroy(&q->mutex); + seq_destroy(q->seq); + } + free(dp->handler_queues); + dp->handler_queues = NULL; + dp->n_handlers = 0; +} + +static void +dp_netdev_refresh_queues(struct dp_netdev *dp, uint32_t n_handlers) + OVS_REQ_WRLOCK(dp->queue_rwlock) +{ + if (dp->n_handlers != n_handlers) { + size_t i; + + dp_netdev_destroy_all_queues(dp); + + dp->n_handlers = n_handlers; + dp->handler_queues = xzalloc(n_handlers * sizeof *dp->handler_queues); + + for (i = 0; i < n_handlers; i++) { + struct dp_netdev_queue *q = &dp->handler_queues[i]; + + ovs_mutex_init(&q->mutex); + q->seq = seq_create(); + } } - return error; } static int -dpif_netdev_recv_set(struct dpif *dpif OVS_UNUSED, bool enable OVS_UNUSED) +dpif_netdev_recv_set(struct dpif *dpif, bool enable) { + struct dp_netdev *dp = get_dp_netdev(dpif); + + if ((dp->handler_queues != NULL) == enable) { + return 0; + } + + fat_rwlock_wrlock(&dp->queue_rwlock); + if (!enable) { + dp_netdev_destroy_all_queues(dp); + } else { + dp_netdev_refresh_queues(dp, 1); + } + fat_rwlock_unlock(&dp->queue_rwlock); + + return 0; +} + +static int +dpif_netdev_handlers_set(struct dpif *dpif, uint32_t n_handlers) +{ + struct dp_netdev *dp = get_dp_netdev(dpif); + + fat_rwlock_wrlock(&dp->queue_rwlock); + if (dp->handler_queues) { + dp_netdev_refresh_queues(dp, n_handlers); + } + fat_rwlock_unlock(&dp->queue_rwlock); + return 0; } @@ -1150,107 +1631,150 @@ dpif_netdev_queue_to_priority(const struct dpif *dpif OVS_UNUSED, return 0; } -static struct dp_netdev_queue * -find_nonempty_queue(struct dpif *dpif) +static bool +dp_netdev_recv_check(const struct dp_netdev *dp, const uint32_t handler_id) + OVS_REQ_RDLOCK(dp->queue_rwlock) { - struct dp_netdev *dp = get_dp_netdev(dpif); - int i; + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - for (i = 0; i < N_QUEUES; i++) { - struct dp_netdev_queue *q = &dp->queues[i]; - if (q->head != q->tail) { - return q; - } + if (!dp->handler_queues) { + VLOG_WARN_RL(&rl, "receiving upcall disabled"); + return false; } - return NULL; + + if (handler_id >= dp->n_handlers) { + VLOG_WARN_RL(&rl, "handler index out of bound"); + return false; + } + + return true; } static int -dpif_netdev_recv(struct dpif *dpif, struct dpif_upcall *upcall, - struct ofpbuf *buf) +dpif_netdev_recv(struct dpif *dpif, uint32_t handler_id, + struct dpif_upcall *upcall, struct ofpbuf *buf) { + struct dp_netdev *dp = get_dp_netdev(dpif); struct dp_netdev_queue *q; - int error; + int error = 0; - ovs_mutex_lock(&dp_netdev_mutex); - q = find_nonempty_queue(dpif); - if (q) { + fat_rwlock_rdlock(&dp->queue_rwlock); + + if (!dp_netdev_recv_check(dp, handler_id)) { + error = EAGAIN; + goto out; + } + + q = &dp->handler_queues[handler_id]; + ovs_mutex_lock(&q->mutex); + if (q->head != q->tail) { struct dp_netdev_upcall *u = &q->upcalls[q->tail++ & QUEUE_MASK]; *upcall = u->upcall; - upcall->packet = buf; ofpbuf_uninit(buf); *buf = u->buf; - - error = 0; } else { error = EAGAIN; } - ovs_mutex_unlock(&dp_netdev_mutex); + ovs_mutex_unlock(&q->mutex); + +out: + fat_rwlock_unlock(&dp->queue_rwlock); return error; } static void -dpif_netdev_recv_wait(struct dpif *dpif) +dpif_netdev_recv_wait(struct dpif *dpif, uint32_t handler_id) { struct dp_netdev *dp = get_dp_netdev(dpif); + struct dp_netdev_queue *q; uint64_t seq; - ovs_mutex_lock(&dp_netdev_mutex); - seq = seq_read(dp->queue_seq); - if (find_nonempty_queue(dpif)) { + fat_rwlock_rdlock(&dp->queue_rwlock); + + if (!dp_netdev_recv_check(dp, handler_id)) { + goto out; + } + + q = &dp->handler_queues[handler_id]; + ovs_mutex_lock(&q->mutex); + seq = seq_read(q->seq); + if (q->head != q->tail) { poll_immediate_wake(); } else { - seq_wait(dp->queue_seq, seq); + seq_wait(q->seq, seq); } - ovs_mutex_unlock(&dp_netdev_mutex); + + ovs_mutex_unlock(&q->mutex); + +out: + fat_rwlock_unlock(&dp->queue_rwlock); } static void dpif_netdev_recv_purge(struct dpif *dpif) { struct dpif_netdev *dpif_netdev = dpif_netdev_cast(dpif); - ovs_mutex_lock(&dp_netdev_mutex); + + fat_rwlock_wrlock(&dpif_netdev->dp->queue_rwlock); dp_netdev_purge_queues(dpif_netdev->dp); - ovs_mutex_unlock(&dp_netdev_mutex); + fat_rwlock_unlock(&dpif_netdev->dp->queue_rwlock); } +/* Creates and returns a new 'struct dp_netdev_actions', with a reference count + * of 1, whose actions are a copy of from the 'ofpacts_len' bytes of + * 'ofpacts'. */ +struct dp_netdev_actions * +dp_netdev_actions_create(const struct nlattr *actions, size_t size) +{ + struct dp_netdev_actions *netdev_actions; + + netdev_actions = xmalloc(sizeof *netdev_actions); + netdev_actions->actions = xmemdup(actions, size); + netdev_actions->size = size; + + return netdev_actions; +} + +struct dp_netdev_actions * +dp_netdev_flow_get_actions(const struct dp_netdev_flow *flow) +{ + return ovsrcu_get(struct dp_netdev_actions *, &flow->actions); +} + static void -dp_netdev_flow_used(struct dp_netdev_flow *netdev_flow, - const struct ofpbuf *packet) +dp_netdev_actions_free(struct dp_netdev_actions *actions) { - netdev_flow->used = time_msec(); - netdev_flow->packet_count++; - netdev_flow->byte_count += packet->size; - netdev_flow->tcp_flags |= packet_get_tcp_flags(packet, &netdev_flow->flow); + free(actions->actions); + free(actions); } + static void -dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, - struct ofpbuf *packet, uint32_t skb_priority, - uint32_t pkt_mark, const struct flow_tnl *tnl) +dp_netdev_process_rxq_port(struct dp_netdev *dp, + struct dp_netdev_port *port, + struct netdev_rxq *rxq) { - struct dp_netdev_flow *netdev_flow; - struct flow key; - union flow_in_port in_port_; + struct ofpbuf *packet[NETDEV_MAX_RX_BATCH]; + int error, c; - if (packet->size < ETH_HEADER_LEN) { - return; - } - in_port_.odp_port = port->port_no; - flow_extract(packet, skb_priority, pkt_mark, tnl, &in_port_, &key); - netdev_flow = dp_netdev_lookup_flow(dp, &key); - if (netdev_flow) { - dp_netdev_flow_used(netdev_flow, packet); - dp_netdev_execute_actions(dp, packet, &key, - netdev_flow->actions, - netdev_flow->actions_len); - dp->n_hit++; - } else { - dp->n_missed++; - dp_netdev_output_userspace(dp, packet, DPIF_UC_MISS, &key, NULL); + error = netdev_rxq_recv(rxq, packet, &c); + if (!error) { + struct pkt_metadata md = PKT_METADATA_INITIALIZER(port->port_no); + int i; + + for (i = 0; i < c; i++) { + dp_netdev_port_input(dp, packet[i], &md); + } + } else if (error != EAGAIN && error != EOPNOTSUPP) { + static struct vlog_rate_limit rl + = VLOG_RATE_LIMIT_INIT(1, 5); + + VLOG_ERR_RL(&rl, "error receiving data from %s: %s", + netdev_get_name(port->netdev), + ovs_strerror(error)); } } @@ -1258,98 +1782,311 @@ static void dpif_netdev_run(struct dpif *dpif) { struct dp_netdev_port *port; - struct dp_netdev *dp; - struct ofpbuf packet; - - ovs_mutex_lock(&dp_netdev_mutex); - dp = get_dp_netdev(dpif); - ofpbuf_init(&packet, - DP_NETDEV_HEADROOM + VLAN_ETH_HEADER_LEN + dp->max_mtu); - - LIST_FOR_EACH (port, node, &dp->port_list) { - int error; + struct dp_netdev *dp = get_dp_netdev(dpif); - /* Reset packet contents. */ - ofpbuf_clear(&packet); - ofpbuf_reserve(&packet, DP_NETDEV_HEADROOM); + ovs_rwlock_rdlock(&dp->port_rwlock); - error = port->rx ? netdev_rx_recv(port->rx, &packet) : EOPNOTSUPP; - if (!error) { - dp_netdev_port_input(dp, port, &packet, 0, 0, NULL); - } else if (error != EAGAIN && error != EOPNOTSUPP) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + HMAP_FOR_EACH (port, node, &dp->ports) { + if (!netdev_is_pmd(port->netdev)) { + int i; - VLOG_ERR_RL(&rl, "error receiving data from %s: %s", - netdev_get_name(port->netdev), ovs_strerror(error)); + for (i = 0; i < netdev_n_rxq(port->netdev); i++) { + dp_netdev_process_rxq_port(dp, port, port->rxq[i]); + } } } - ofpbuf_uninit(&packet); - ovs_mutex_unlock(&dp_netdev_mutex); + + ovs_rwlock_unlock(&dp->port_rwlock); } static void dpif_netdev_wait(struct dpif *dpif) { struct dp_netdev_port *port; + struct dp_netdev *dp = get_dp_netdev(dpif); - /* There is a race here, if thread A calls dpif_netdev_wait(dpif) and - * thread B calls dpif_port_add(dpif) or dpif_port_remove(dpif) before - * A makes it to poll_block(). - * - * But I think it doesn't matter: - * - * - In the dpif_port_add() case, A will not wake up when a packet - * arrives on the new port, but this would also happen if the - * ordering were reversed. - * - * - In the dpif_port_remove() case, A might wake up spuriously, but - * that is harmless. */ + ovs_rwlock_rdlock(&dp->port_rwlock); - ovs_mutex_lock(&dp_netdev_mutex); - LIST_FOR_EACH (port, node, &get_dp_netdev(dpif)->port_list) { - if (port->rx) { - netdev_rx_wait(port->rx); + HMAP_FOR_EACH (port, node, &dp->ports) { + if (!netdev_is_pmd(port->netdev)) { + int i; + + for (i = 0; i < netdev_n_rxq(port->netdev); i++) { + netdev_rxq_wait(port->rxq[i]); + } } } - ovs_mutex_unlock(&dp_netdev_mutex); + ovs_rwlock_unlock(&dp->port_rwlock); +} + +struct rxq_poll { + struct dp_netdev_port *port; + struct netdev_rxq *rx; +}; + +static int +pmd_load_queues(struct pmd_thread *f, + struct rxq_poll **ppoll_list, int poll_cnt) +{ + struct dp_netdev *dp = f->dp; + struct rxq_poll *poll_list = *ppoll_list; + struct dp_netdev_port *port; + int id = f->id; + int index; + int i; + + /* Simple scheduler for netdev rx polling. */ + ovs_rwlock_rdlock(&dp->port_rwlock); + for (i = 0; i < poll_cnt; i++) { + port_unref(poll_list[i].port); + } + + poll_cnt = 0; + index = 0; + + HMAP_FOR_EACH (port, node, &f->dp->ports) { + if (netdev_is_pmd(port->netdev)) { + int i; + + for (i = 0; i < netdev_n_rxq(port->netdev); i++) { + if ((index % dp->n_pmd_threads) == id) { + poll_list = xrealloc(poll_list, sizeof *poll_list * (poll_cnt + 1)); + + port_ref(port); + poll_list[poll_cnt].port = port; + poll_list[poll_cnt].rx = port->rxq[i]; + poll_cnt++; + } + index++; + } + } + } + + ovs_rwlock_unlock(&dp->port_rwlock); + *ppoll_list = poll_list; + return poll_cnt; +} + +static void * +pmd_thread_main(void *f_) +{ + struct pmd_thread *f = f_; + struct dp_netdev *dp = f->dp; + unsigned int lc = 0; + struct rxq_poll *poll_list; + unsigned int port_seq; + int poll_cnt; + int i; + + poll_cnt = 0; + poll_list = NULL; + + pmd_thread_setaffinity_cpu(f->id); +reload: + poll_cnt = pmd_load_queues(f, &poll_list, poll_cnt); + atomic_read(&f->change_seq, &port_seq); + + for (;;) { + unsigned int c_port_seq; + int i; + + for (i = 0; i < poll_cnt; i++) { + dp_netdev_process_rxq_port(dp, poll_list[i].port, poll_list[i].rx); + } + + if (lc++ > 1024) { + ovsrcu_quiesce(); + + /* TODO: need completely userspace based signaling method. + * to keep this thread entirely in userspace. + * For now using atomic counter. */ + lc = 0; + atomic_read_explicit(&f->change_seq, &c_port_seq, memory_order_consume); + if (c_port_seq != port_seq) { + break; + } + } + } + + if (!latch_is_set(&f->dp->exit_latch)){ + goto reload; + } + + for (i = 0; i < poll_cnt; i++) { + port_unref(poll_list[i].port); + } + + free(poll_list); + return NULL; +} + +static void +dp_netdev_set_pmd_threads(struct dp_netdev *dp, int n) +{ + int i; + + if (n == dp->n_pmd_threads) { + return; + } + + /* Stop existing threads. */ + latch_set(&dp->exit_latch); + dp_netdev_reload_pmd_threads(dp); + for (i = 0; i < dp->n_pmd_threads; i++) { + struct pmd_thread *f = &dp->pmd_threads[i]; + + xpthread_join(f->thread, NULL); + } + latch_poll(&dp->exit_latch); + free(dp->pmd_threads); + + /* Start new threads. */ + dp->pmd_threads = xmalloc(n * sizeof *dp->pmd_threads); + dp->n_pmd_threads = n; + + for (i = 0; i < n; i++) { + struct pmd_thread *f = &dp->pmd_threads[i]; + + f->dp = dp; + f->id = i; + atomic_store(&f->change_seq, 1); + + /* Each thread will distribute all devices rx-queues among + * themselves. */ + f->thread = ovs_thread_create("pmd", pmd_thread_main, f); + } +} + + +static void * +dp_netdev_flow_stats_new_cb(void) +{ + struct dp_netdev_flow_stats *bucket = xzalloc_cacheline(sizeof *bucket); + ovs_mutex_init(&bucket->mutex); + return bucket; +} + +static void +dp_netdev_flow_used(struct dp_netdev_flow *netdev_flow, + const struct ofpbuf *packet, + const struct miniflow *key) +{ + uint16_t tcp_flags = miniflow_get_tcp_flags(key); + long long int now = time_msec(); + struct dp_netdev_flow_stats *bucket; + + bucket = ovsthread_stats_bucket_get(&netdev_flow->stats, + dp_netdev_flow_stats_new_cb); + + ovs_mutex_lock(&bucket->mutex); + bucket->used = MAX(now, bucket->used); + bucket->packet_count++; + bucket->byte_count += ofpbuf_size(packet); + bucket->tcp_flags |= tcp_flags; + ovs_mutex_unlock(&bucket->mutex); +} + +static void * +dp_netdev_stats_new_cb(void) +{ + struct dp_netdev_stats *bucket = xzalloc_cacheline(sizeof *bucket); + ovs_mutex_init(&bucket->mutex); + return bucket; } static void -dp_netdev_output_port(void *dp_, struct ofpbuf *packet, - const struct flow *flow OVS_UNUSED, odp_port_t out_port) +dp_netdev_count_packet(struct dp_netdev *dp, enum dp_stat_type type) { - struct dp_netdev *dp = dp_; - struct dp_netdev_port *p = dp->ports[odp_to_u32(out_port)]; - if (p) { - netdev_send(p->netdev, packet); + struct dp_netdev_stats *bucket; + + bucket = ovsthread_stats_bucket_get(&dp->stats, dp_netdev_stats_new_cb); + ovs_mutex_lock(&bucket->mutex); + bucket->n[type]++; + ovs_mutex_unlock(&bucket->mutex); +} + +static void +dp_netdev_input(struct dp_netdev *dp, struct ofpbuf *packet, + struct pkt_metadata *md) + OVS_REQ_RDLOCK(dp->port_rwlock) +{ + struct dp_netdev_flow *netdev_flow; + struct { + struct miniflow flow; + uint32_t buf[FLOW_U32S]; + } key; + + if (ofpbuf_size(packet) < ETH_HEADER_LEN) { + ofpbuf_delete(packet); + return; } + miniflow_initialize(&key.flow, key.buf); + miniflow_extract(packet, md, &key.flow); + + netdev_flow = dp_netdev_lookup_flow(dp, &key.flow); + if (netdev_flow) { + struct dp_netdev_actions *actions; + + dp_netdev_flow_used(netdev_flow, packet, &key.flow); + + actions = dp_netdev_flow_get_actions(netdev_flow); + dp_netdev_execute_actions(dp, &key.flow, packet, true, md, + actions->actions, actions->size); + dp_netdev_count_packet(dp, DP_STAT_HIT); + } else if (dp->handler_queues) { + dp_netdev_count_packet(dp, DP_STAT_MISS); + dp_netdev_output_userspace(dp, packet, + miniflow_hash_5tuple(&key.flow, 0) + % dp->n_handlers, + DPIF_UC_MISS, &key.flow, NULL); + ofpbuf_delete(packet); + } +} + +static void +dp_netdev_port_input(struct dp_netdev *dp, struct ofpbuf *packet, + struct pkt_metadata *md) + OVS_REQ_RDLOCK(dp->port_rwlock) +{ + uint32_t *recirc_depth = recirc_depth_get(); + + *recirc_depth = 0; + dp_netdev_input(dp, packet, md); } static int -dp_netdev_output_userspace(struct dp_netdev *dp, const struct ofpbuf *packet, - int queue_no, const struct flow *flow, +dp_netdev_output_userspace(struct dp_netdev *dp, struct ofpbuf *packet, + int queue_no, int type, const struct miniflow *key, const struct nlattr *userdata) { - struct dp_netdev_queue *q = &dp->queues[queue_no]; + struct dp_netdev_queue *q; + int error; + + fat_rwlock_rdlock(&dp->queue_rwlock); + q = &dp->handler_queues[queue_no]; + ovs_mutex_lock(&q->mutex); if (q->head - q->tail < MAX_QUEUE_LEN) { struct dp_netdev_upcall *u = &q->upcalls[q->head++ & QUEUE_MASK]; struct dpif_upcall *upcall = &u->upcall; struct ofpbuf *buf = &u->buf; size_t buf_size; + struct flow flow; - upcall->type = queue_no; + upcall->type = type; /* Allocate buffer big enough for everything. */ - buf_size = ODPUTIL_FLOW_KEY_BYTES + 2 + packet->size; + buf_size = ODPUTIL_FLOW_KEY_BYTES; if (userdata) { buf_size += NLA_ALIGN(userdata->nla_len); } + buf_size += ofpbuf_size(packet); ofpbuf_init(buf, buf_size); /* Put ODP flow. */ - odp_flow_key_from_flow(buf, flow, flow->in_port.odp_port); - upcall->key = buf->data; - upcall->key_len = buf->size; + miniflow_expand(key, &flow); + odp_flow_key_from_flow(buf, &flow, NULL, flow.in_port.odp_port); + upcall->key = ofpbuf_data(buf); + upcall->key_len = ofpbuf_size(buf); /* Put userdata. */ if (userdata) { @@ -1357,44 +2094,126 @@ dp_netdev_output_userspace(struct dp_netdev *dp, const struct ofpbuf *packet, NLA_ALIGN(userdata->nla_len)); } - /* Put packet. - * - * We adjust 'data' and 'size' in 'buf' so that only the packet itself - * is visible in 'upcall->packet'. The ODP flow and (if present) - * userdata become part of the headroom. */ - ofpbuf_put_zeros(buf, 2); - buf->data = ofpbuf_put(buf, packet->data, packet->size); - buf->size = packet->size; - upcall->packet = buf; + ofpbuf_set_data(&upcall->packet, + ofpbuf_put(buf, ofpbuf_data(packet), ofpbuf_size(packet))); + ofpbuf_set_size(&upcall->packet, ofpbuf_size(packet)); - seq_change(dp->queue_seq); + seq_change(q->seq); - return 0; + error = 0; } else { - dp->n_lost++; - return ENOBUFS; + dp_netdev_count_packet(dp, DP_STAT_LOST); + error = ENOBUFS; } + ovs_mutex_unlock(&q->mutex); + fat_rwlock_unlock(&dp->queue_rwlock); + + return error; } +struct dp_netdev_execute_aux { + struct dp_netdev *dp; + const struct miniflow *key; +}; + static void -dp_netdev_action_userspace(void *dp, struct ofpbuf *packet, - const struct flow *key, - const struct nlattr *a) -{ - const struct nlattr *userdata; +dp_execute_cb(void *aux_, struct ofpbuf *packet, + struct pkt_metadata *md, + const struct nlattr *a, bool may_steal) + OVS_NO_THREAD_SAFETY_ANALYSIS +{ + struct dp_netdev_execute_aux *aux = aux_; + int type = nl_attr_type(a); + struct dp_netdev_port *p; + uint32_t *depth = recirc_depth_get(); + + switch ((enum ovs_action_attr)type) { + case OVS_ACTION_ATTR_OUTPUT: + p = dp_netdev_lookup_port(aux->dp, u32_to_odp(nl_attr_get_u32(a))); + if (p) { + netdev_send(p->netdev, packet, may_steal); + } + break; + + case OVS_ACTION_ATTR_USERSPACE: { + const struct nlattr *userdata; + + userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA); + + dp_netdev_output_userspace(aux->dp, packet, + miniflow_hash_5tuple(aux->key, 0) + % aux->dp->n_handlers, + DPIF_UC_ACTION, aux->key, + userdata); + + if (may_steal) { + ofpbuf_delete(packet); + } + break; + } + + case OVS_ACTION_ATTR_HASH: { + const struct ovs_action_hash *hash_act; + uint32_t hash; + + hash_act = nl_attr_get(a); + if (hash_act->hash_alg == OVS_HASH_ALG_L4) { + /* Hash need not be symmetric, nor does it need to include + * L2 fields. */ + hash = miniflow_hash_5tuple(aux->key, hash_act->hash_basis); + if (!hash) { + hash = 1; /* 0 is not valid */ + } + + } else { + VLOG_WARN("Unknown hash algorithm specified for the hash action."); + hash = 2; + } + + md->dp_hash = hash; + break; + } + + case OVS_ACTION_ATTR_RECIRC: + if (*depth < MAX_RECIRC_DEPTH) { + struct pkt_metadata recirc_md = *md; + struct ofpbuf *recirc_packet; + + recirc_packet = may_steal ? packet : ofpbuf_clone(packet); + recirc_md.recirc_id = nl_attr_get_u32(a); - userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA); - dp_netdev_output_userspace(dp, packet, DPIF_UC_ACTION, key, userdata); + (*depth)++; + dp_netdev_input(aux->dp, recirc_packet, &recirc_md); + (*depth)--; + + break; + } else { + VLOG_WARN("Packet dropped. Max recirculation depth exceeded."); + } + break; + + case OVS_ACTION_ATTR_PUSH_VLAN: + case OVS_ACTION_ATTR_POP_VLAN: + case OVS_ACTION_ATTR_PUSH_MPLS: + case OVS_ACTION_ATTR_POP_MPLS: + case OVS_ACTION_ATTR_SET: + case OVS_ACTION_ATTR_SAMPLE: + case OVS_ACTION_ATTR_UNSPEC: + case __OVS_ACTION_ATTR_MAX: + OVS_NOT_REACHED(); + } } static void -dp_netdev_execute_actions(struct dp_netdev *dp, - struct ofpbuf *packet, struct flow *key, - const struct nlattr *actions, - size_t actions_len) +dp_netdev_execute_actions(struct dp_netdev *dp, const struct miniflow *key, + struct ofpbuf *packet, bool may_steal, + struct pkt_metadata *md, + const struct nlattr *actions, size_t actions_len) { - odp_execute_actions(dp, packet, key, actions, actions_len, - dp_netdev_output_port, dp_netdev_action_userspace); + struct dp_netdev_execute_aux aux = {dp, key}; + + odp_execute_actions(&aux, packet, may_steal, md, + actions, actions_len, dp_execute_cb); } const struct dpif_class dpif_netdev_class = { @@ -1411,7 +2230,6 @@ const struct dpif_class dpif_netdev_class = { dpif_netdev_port_del, dpif_netdev_port_query_by_number, dpif_netdev_port_query_by_name, - dpif_netdev_get_max_ports, NULL, /* port_get_pid */ dpif_netdev_port_dump_start, dpif_netdev_port_dump_next, @@ -1422,12 +2240,16 @@ const struct dpif_class dpif_netdev_class = { dpif_netdev_flow_put, dpif_netdev_flow_del, dpif_netdev_flow_flush, + dpif_netdev_flow_dump_state_init, dpif_netdev_flow_dump_start, dpif_netdev_flow_dump_next, + NULL, dpif_netdev_flow_dump_done, + dpif_netdev_flow_dump_state_uninit, dpif_netdev_execute, NULL, /* operate */ dpif_netdev_recv_set, + dpif_netdev_handlers_set, dpif_netdev_queue_to_priority, dpif_netdev_recv, dpif_netdev_recv_wait, @@ -1440,33 +2262,42 @@ 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; + ovs_mutex_lock(&dp_netdev_mutex); dp = shash_find_data(&dp_netdevs, argv[1]); if (!dp || !dpif_netdev_class_is_dummy(dp->class)) { + ovs_mutex_unlock(&dp_netdev_mutex); unixctl_command_reply_error(conn, "unknown datapath or not a dummy"); return; } + ovs_refcount_ref(&dp->ref_cnt); + ovs_mutex_unlock(&dp_netdev_mutex); + ovs_rwlock_wrlock(&dp->port_rwlock); if (get_port_by_name(dp, argv[2], &port)) { unixctl_command_reply_error(conn, "unknown port"); - return; + goto exit; } - 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; + goto exit; } - if (dp->ports[port_no]) { + if (dp_netdev_lookup_port(dp, port_no)) { unixctl_command_reply_error(conn, "port number already in use"); - return; + goto exit; } - 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); + +exit: + ovs_rwlock_unlock(&dp->port_rwlock); + dp_netdev_unref(dp); } static void