X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=07f181d1e0bda740caf0624e256c66a026a42c4c;hb=cfc50ae514f805dcd9c14589f21158185424daf6;hp=2fb13391590884d8092c4ca9f0409a82a61163fc;hpb=14608a1539b73f8f9812e0e791adb60825fee38b;p=sliver-openvswitch.git diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 2fb133915..07f181d1e 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * 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. @@ -17,7 +17,6 @@ #include #include "dpif.h" -#include #include #include #include @@ -25,123 +24,352 @@ #include #include #include +#include #include #include #include #include #include +#include "classifier.h" #include "csum.h" +#include "dpif.h" #include "dpif-provider.h" +#include "dummy.h" +#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 "queue.h" +#include "random.h" +#include "seq.h" +#include "shash.h" +#include "sset.h" #include "timeval.h" +#include "unixctl.h" #include "util.h" #include "vlog.h" -VLOG_DEFINE_THIS_MODULE(dpif_netdev) +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 { N_QUEUES = 2 }; /* Number of queues for dpif_recv(). */ -enum { MAX_QUEUE_LEN = 100 }; /* Maximum number of packets per queue. */ -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 { 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 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 { - struct list node; - int dp_idx; - int open_cnt; - bool destroyed; - - bool drop_frags; /* Drop all IP fragments, if true. */ - struct ovs_queue queues[N_QUEUES]; /* Messages queued for dpif_recv(). */ - struct hmap flow_table; /* Flow table. */ - - /* Statistics. */ - long long int n_frags; /* Number of dropped IP fragments. */ - 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. */ - int n_ports; - struct dp_netdev_port *ports[MAX_PORTS]; - struct list port_list; - unsigned int serial; + 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 { - int 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; - bool internal; /* Internal port (as ODP_PORT_INTERNAL)? */ + struct netdev_saved_flags *sf; + 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 { - struct hmap_node node; /* Element in dp_netdev's 'flow_table'. */ - struct flow key; + /* Packet classification. */ + 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); + + /* 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. */ - struct timespec used; /* Last used time. */ - long long int packet_count; /* Number of packets matched. */ - long long int byte_count; /* Number of bytes matched. */ - uint16_t tcp_ctl; /* Bitwise-OR of seen tcp_ctl 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. */ - union odp_action *actions; - unsigned int n_actions; +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; + char *name; }; /* Interface to netdev-based datapath. */ struct dpif_netdev { struct dpif dpif; struct dp_netdev *dp; - int listen_mask; - unsigned int dp_serial; + uint64_t last_port_seq; }; -/* All netdev-based datapaths. */ -static struct dp_netdev *dp_netdevs[256]; -struct list dp_netdev_list = LIST_INITIALIZER(&dp_netdev_list); -enum { N_DP_NETDEVS = ARRAY_SIZE(dp_netdevs) }; - -/* Maximum port MTU seen so far. */ -static int max_mtu = ETH_PAYLOAD_MAX; - -static int get_port_by_number(struct dp_netdev *, uint16_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, uint16_t flags, - uint16_t port_no); -static int do_del_port(struct dp_netdev *, uint16_t port_no); -static int dp_netdev_output_control(struct dp_netdev *, const struct ofpbuf *, - int queue_no, int port_no, uint32_t arg); -static int dp_netdev_execute_actions(struct dp_netdev *, - struct ofpbuf *, struct flow *, - const union odp_action *, int n); +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 *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 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) { - dpif_assert_class(dpif, &dpif_netdev_class); + ovs_assert(dpif->dpif_class->open == dpif_netdev_open); return CONTAINER_OF(dpif, struct dpif_netdev, dpif); } @@ -152,154 +380,239 @@ get_dp_netdev(const struct dpif *dpif) } static int -name_to_dp_idx(const char *name) +dpif_netdev_enumerate(struct sset *all_dps) { - if (!strncmp(name, "dp", 2) && isdigit((unsigned char)name[2])) { - int dp_idx = atoi(name + 2); - if (dp_idx >= 0 && dp_idx < N_DP_NETDEVS) { - return dp_idx; - } + struct shash_node *node; + + ovs_mutex_lock(&dp_netdev_mutex); + SHASH_FOR_EACH(node, &dp_netdevs) { + sset_add(all_dps, node->name); } - return -1; + ovs_mutex_unlock(&dp_netdev_mutex); + + return 0; } -static struct dp_netdev * -find_dp_netdev(const char *name) +static bool +dpif_netdev_class_is_dummy(const struct dpif_class *class) { - int dp_idx; - size_t i; - - dp_idx = name_to_dp_idx(name); - if (dp_idx >= 0) { - return dp_netdevs[dp_idx]; - } + return class != &dpif_netdev_class; +} - for (i = 0; i < N_DP_NETDEVS; i++) { - struct dp_netdev *dp = dp_netdevs[i]; - if (dp) { - struct dp_netdev_port *port; - if (!get_port_by_name(dp, name, &port)) { - return dp; - } - } - } - return NULL; +static const char * +dpif_netdev_port_open_type(const struct dpif_class *class, const char *type) +{ + return strcmp(type, "internal") ? type + : dpif_netdev_class_is_dummy(class) ? "dummy" + : "tap"; } static struct dpif * create_dpif_netdev(struct dp_netdev *dp) { + uint16_t netflow_id = hash_string(dp->name, 0); struct dpif_netdev *dpif; - char *dpname; - dp->open_cnt++; + ovs_refcount_ref(&dp->ref_cnt); - dpname = xasprintf("dp%d", dp->dp_idx); dpif = xmalloc(sizeof *dpif); - dpif_init(&dpif->dpif, &dpif_netdev_class, dpname, dp->dp_idx, dp->dp_idx); + dpif_init(&dpif->dpif, dp->class, dp->name, netflow_id >> 8, netflow_id); dpif->dp = dp; - dpif->listen_mask = 0; - dpif->dp_serial = dp->serial; - free(dpname); + dpif->last_port_seq = seq_read(dp->port_seq); return &dpif->dpif; } +/* Choose an unused, non-zero port number and return it on success. + * 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; + + if (dp->class != &dpif_netdev_class) { + const char *p; + int start_no = 0; + + /* If the port name begins with "br", start the number search at + * 100 to make writing tests easier. */ + if (!strncmp(name, "br", 2)) { + start_no = 100; + } + + /* If the port name contains a number, try to assign that port number. + * This can make writing unit tests easier because port numbers are + * predictable. */ + 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 != odp_to_u32(ODPP_NONE) + && !dp_netdev_lookup_port(dp, u32_to_odp(port_no))) { + return u32_to_odp(port_no); + } + break; + } + } + } + + 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); + } + } + + return ODPP_NONE; +} + static int -create_dp_netdev(const char *name, int dp_idx, struct dpif **dpifp) +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; - if (dp_netdevs[dp_idx]) { - return EBUSY; - } + dp = xzalloc(sizeof *dp); + shash_add(&dp_netdevs, name, dp); - /* Create datapath. */ - dp_netdevs[dp_idx] = dp = xzalloc(sizeof *dp); - list_push_back(&dp_netdev_list, &dp->node); - dp->dp_idx = dp_idx; - dp->open_cnt = 0; - dp->drop_frags = false; - for (i = 0; i < N_QUEUES; i++) { - queue_init(&dp->queues[i]); - } + *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); - error = do_add_port(dp, name, ODP_PORT_INTERNAL, ODPP_LOCAL); + + 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 ENODEV; + return error; } - *dpifp = create_dpif_netdev(dp); + *dpp = dp; return 0; } static int -dpif_netdev_open(const char *name, const char *type OVS_UNUSED, bool create, - struct dpif **dpifp) +dpif_netdev_open(const struct dpif_class *class, const char *name, + bool create, struct dpif **dpifp) { - if (create) { - if (find_dp_netdev(name)) { - return EEXIST; - } else { - int dp_idx = name_to_dp_idx(name); - if (dp_idx >= 0) { - return create_dp_netdev(name, dp_idx, dpifp); - } else { - /* Scan for unused dp_idx number. */ - for (dp_idx = 0; dp_idx < N_DP_NETDEVS; dp_idx++) { - int error = create_dp_netdev(name, dp_idx, dpifp); - if (error != EBUSY) { - return error; - } - } + struct dp_netdev *dp; + int error; - /* All datapath numbers in use. */ - return ENOBUFS; - } - } + ovs_mutex_lock(&dp_netdev_mutex); + dp = shash_find_data(&dp_netdevs, name); + if (!dp) { + error = create ? create_dp_netdev(name, class, &dp) : ENODEV; } else { - struct dp_netdev *dp = find_dp_netdev(name); - if (dp) { - *dpifp = create_dpif_netdev(dp); - return 0; - } else { - return ENODEV; + error = (dp->class != class ? EINVAL + : create ? EEXIST + : 0); + } + if (!error) { + *dpifp = create_dpif_netdev(dp); + } + ovs_mutex_unlock(&dp_netdev_mutex); + + return error; +} + +static void +dp_netdev_purge_queues(struct dp_netdev *dp) + OVS_REQ_WRLOCK(dp->queue_rwlock) +{ + int 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); - while (dp->n_ports > 0) { - struct dp_netdev_port *port = CONTAINER_OF( - dp->port_list.next, struct dp_netdev_port, node); + ovs_rwlock_wrlock(&dp->port_rwlock); + HMAP_FOR_EACH_SAFE (port, next, node, &dp->ports) { do_del_port(dp, port->port_no); } - for (i = 0; i < N_QUEUES; i++) { - queue_destroy(&dp->queues[i]); + 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); - dp_netdevs[dp->dp_idx] = NULL; - list_remove(&dp->node); + ovs_mutex_destroy(&dp->flow_mutex); + seq_destroy(dp->port_seq); + 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); - assert(dp->open_cnt > 0); - if (--dp->open_cnt == 0 && dp->destroyed) { - dp_netdev_free(dp); - } + + dp_netdev_unref(dp); free(dpif); } @@ -307,146 +620,235 @@ static int dpif_netdev_destroy(struct dpif *dpif) { struct dp_netdev *dp = get_dp_netdev(dpif); - dp->destroyed = true; + + 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; } static int -dpif_netdev_get_stats(const struct dpif *dpif, struct odp_stats *stats) +dpif_netdev_get_stats(const struct dpif *dpif, struct dpif_dp_stats *stats) { struct dp_netdev *dp = get_dp_netdev(dpif); - memset(stats, 0, sizeof *stats); + struct dp_netdev_stats *bucket; + size_t i; + + fat_rwlock_rdlock(&dp->cls.rwlock); stats->n_flows = hmap_count(&dp->flow_table); - stats->cur_capacity = hmap_capacity(&dp->flow_table); - stats->max_capacity = MAX_FLOWS; - stats->n_ports = dp->n_ports; - stats->max_ports = MAX_PORTS; - stats->n_frags = dp->n_frags; - stats->n_hit = dp->n_hit; - stats->n_missed = dp->n_missed; - stats->n_lost = dp->n_lost; - stats->max_miss_queue = MAX_QUEUE_LEN; - stats->max_action_queue = MAX_QUEUE_LEN; - return 0; -} + 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; -static int -dpif_netdev_get_drop_frags(const struct dpif *dpif, bool *drop_fragsp) -{ - struct dp_netdev *dp = get_dp_netdev(dpif); - *drop_fragsp = dp->drop_frags; return 0; } -static int -dpif_netdev_set_drop_frags(struct dpif *dpif, bool drop_frags) +static void +dp_netdev_reload_pmd_threads(struct dp_netdev *dp) { - struct dp_netdev *dp = get_dp_netdev(dpif); - dp->drop_frags = drop_frags; - return 0; + 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, uint16_t flags, - uint16_t port_no) +do_add_port(struct dp_netdev *dp, const char *devname, const char *type, + odp_port_t port_no) + OVS_REQ_WRLOCK(dp->port_rwlock) { - bool internal = (flags & ODP_PORT_INTERNAL) != 0; + struct netdev_saved_flags *sf; struct dp_netdev_port *port; - struct netdev_options netdev_options; struct netdev *netdev; - int mtu; + enum netdev_flags flags; + const char *open_type; int error; + int i; /* XXX reject devices already in some dp_netdev. */ /* Open and validate network device. */ - memset(&netdev_options, 0, sizeof netdev_options); - netdev_options.name = devname; - netdev_options.ethertype = NETDEV_ETH_TYPE_ANY; - if (internal) { - netdev_options.type = "tap"; - } - - error = netdev_open(&netdev_options, &netdev); + open_type = dpif_netdev_port_open_type(dp->class, type); + error = netdev_open(devname, open_type, &netdev); if (error) { return error; } - /* XXX reject loopback devices */ /* XXX reject non-Ethernet devices */ - error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, false); - if (error) { + netdev_get_flags(netdev, &flags); + if (flags & NETDEV_LOOPBACK) { + VLOG_ERR("%s: cannot add a loopback device", devname); netdev_close(netdev); - return error; + return EINVAL; } - port = xmalloc(sizeof *port); + port = xzalloc(sizeof *port); port->port_no = port_no; port->netdev = netdev; - port->internal = internal; + 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) { + 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->sf = sf; - netdev_get_mtu(netdev, &mtu); - if (mtu > max_mtu) { - 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[port_no] = port; - dp->n_ports++; - dp->serial++; + hmap_insert(&dp->ports, &port->node, hash_int(odp_to_u32(port_no), 0)); + seq_change(dp->port_seq); return 0; } static int -dpif_netdev_port_add(struct dpif *dpif, const char *devname, uint16_t flags, - uint16_t *port_nop) +dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev, + odp_port_t *port_nop) { struct dp_netdev *dp = get_dp_netdev(dpif); - int port_no; + char namebuf[NETDEV_VPORT_NAME_BUFSIZE]; + const char *dpif_port; + odp_port_t port_no; + int error; - for (port_no = 0; port_no < MAX_PORTS; port_no++) { - if (!dp->ports[port_no]) { - *port_nop = port_no; - return do_add_port(dp, devname, flags, port_no); - } + ovs_rwlock_wrlock(&dp->port_rwlock); + dpif_port = netdev_vport_get_dpif_port(netdev, namebuf, sizeof namebuf); + if (*port_nop != ODPP_NONE) { + 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; } - return EFBIG; + if (!error) { + *port_nop = port_no; + error = do_add_port(dp, dpif_port, netdev_get_type(netdev), port_no); + } + ovs_rwlock_unlock(&dp->port_rwlock); + + return error; } static int -dpif_netdev_port_del(struct dpif *dpif, uint16_t port_no) +dpif_netdev_port_del(struct dpif *dpif, odp_port_t port_no) { struct dp_netdev *dp = get_dp_netdev(dpif); - return port_no == ODPP_LOCAL ? EINVAL : do_del_port(dp, port_no); + int error; + + ovs_rwlock_wrlock(&dp->port_rwlock); + error = port_no == ODPP_LOCAL ? EINVAL : do_del_port(dp, port_no); + ovs_rwlock_unlock(&dp->port_rwlock); + + return error; } static bool -is_valid_port_number(uint16_t port_no) +is_valid_port_number(odp_port_t port_no) { - return 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, - uint16_t port_no, struct dp_netdev_port **portp) + 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[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; @@ -456,10 +858,10 @@ get_port_by_name(struct dp_netdev *dp, } static int -do_del_port(struct dp_netdev *dp, uint16_t port_no) +do_del_port(struct dp_netdev *dp, odp_port_t port_no) + OVS_REQ_WRLOCK(dp->port_rwlock) { struct dp_netdev_port *port; - char *name; int error; error = get_port_by_number(dp, port_no, &port); @@ -467,852 +869,1468 @@ do_del_port(struct dp_netdev *dp, uint16_t port_no) return error; } - list_remove(&port->node); - dp->ports[port->port_no] = NULL; - dp->n_ports--; - dp->serial++; - - name = xstrdup(netdev_get_name(port->netdev)); - netdev_close(port->netdev); - - free(name); - free(port); + hmap_remove(&dp->ports, &port->node); + seq_change(dp->port_seq); + if (netdev_is_pmd(port->netdev)) { + dp_netdev_reload_pmd_threads(dp); + } + port_unref(port); return 0; } static void -answer_port_query(const struct dp_netdev_port *port, struct odp_port *odp_port) +answer_port_query(const struct dp_netdev_port *port, + struct dpif_port *dpif_port) { - memset(odp_port, 0, sizeof *odp_port); - ovs_strlcpy(odp_port->devname, netdev_get_name(port->netdev), - sizeof odp_port->devname); - odp_port->port = port->port_no; - odp_port->flags = port->internal ? ODP_PORT_INTERNAL : 0; + dpif_port->name = xstrdup(netdev_get_name(port->netdev)); + dpif_port->type = xstrdup(port->type); + dpif_port->port_no = port->port_no; } static int -dpif_netdev_port_query_by_number(const struct dpif *dpif, uint16_t port_no, - struct odp_port *odp_port) +dpif_netdev_port_query_by_number(const struct dpif *dpif, odp_port_t port_no, + struct dpif_port *dpif_port) { struct dp_netdev *dp = get_dp_netdev(dpif); struct dp_netdev_port *port; int error; + ovs_rwlock_rdlock(&dp->port_rwlock); error = get_port_by_number(dp, port_no, &port); - if (!error) { - answer_port_query(port, odp_port); + if (!error && dpif_port) { + answer_port_query(port, dpif_port); } + ovs_rwlock_unlock(&dp->port_rwlock); + return error; } static int dpif_netdev_port_query_by_name(const struct dpif *dpif, const char *devname, - struct odp_port *odp_port) + struct dpif_port *dpif_port) { struct dp_netdev *dp = get_dp_netdev(dpif); struct dp_netdev_port *port; int error; + ovs_rwlock_rdlock(&dp->port_rwlock); error = get_port_by_name(dp, devname, &port); - if (!error) { - answer_port_query(port, odp_port); + if (!error && dpif_port) { + answer_port_query(port, dpif_port); } + ovs_rwlock_unlock(&dp->port_rwlock); + return error; } static void -dp_netdev_free_flow(struct dp_netdev *dp, struct dp_netdev_flow *flow) +dp_netdev_flow_free(struct dp_netdev_flow *flow) { - hmap_remove(&dp->flow_table, &flow->node); - free(flow->actions); + 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_remove_flow(struct dp_netdev *dp, struct dp_netdev_flow *flow) + OVS_REQ_WRLOCK(dp->cls.rwlock) + OVS_REQUIRES(dp->flow_mutex) +{ + struct cls_rule *cr = CONST_CAST(struct cls_rule *, &flow->cr); + struct hmap_node *node = CONST_CAST(struct hmap_node *, &flow->node); + + classifier_remove(&dp->cls, cr); + hmap_remove(&dp->flow_table, node); + ovsrcu_postpone(dp_netdev_flow_free, flow); +} + static void dp_netdev_flow_flush(struct dp_netdev *dp) { - struct dp_netdev_flow *flow, *next; + struct dp_netdev_flow *netdev_flow, *next; - HMAP_FOR_EACH_SAFE (flow, next, node, &dp->flow_table) { - dp_netdev_free_flow(dp, flow); + 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_remove_flow(dp, netdev_flow); } + fat_rwlock_unlock(&dp->cls.rwlock); + ovs_mutex_unlock(&dp->flow_mutex); } static int dpif_netdev_flow_flush(struct dpif *dpif) { struct dp_netdev *dp = get_dp_netdev(dpif); + dp_netdev_flow_flush(dp); return 0; } +struct dp_netdev_port_state { + uint32_t bucket; + uint32_t offset; + char *name; +}; + +static int +dpif_netdev_port_dump_start(const struct dpif *dpif OVS_UNUSED, void **statep) +{ + *statep = xzalloc(sizeof(struct dp_netdev_port_state)); + return 0; +} + static int -dpif_netdev_port_list(const struct dpif *dpif, struct odp_port *ports, int n) +dpif_netdev_port_dump_next(const struct dpif *dpif, void *state_, + struct dpif_port *dpif_port) { + struct dp_netdev_port_state *state = state_; struct dp_netdev *dp = get_dp_netdev(dpif); - struct dp_netdev_port *port; - int i; + struct hmap_node *node; + int retval; - i = 0; - LIST_FOR_EACH (port, node, &dp->port_list) { - struct odp_port *odp_port = &ports[i]; - if (i >= n) { - break; - } - answer_port_query(port, odp_port); - i++; + ovs_rwlock_rdlock(&dp->port_rwlock); + node = hmap_at_position(&dp->ports, &state->bucket, &state->offset); + if (node) { + struct dp_netdev_port *port; + + 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; } - return dp->n_ports; + ovs_rwlock_unlock(&dp->port_rwlock); + + return retval; +} + +static int +dpif_netdev_port_dump_done(const struct dpif *dpif OVS_UNUSED, void *state_) +{ + struct dp_netdev_port_state *state = state_; + free(state->name); + free(state); + return 0; } static int dpif_netdev_port_poll(const struct dpif *dpif_, char **devnamep OVS_UNUSED) { struct dpif_netdev *dpif = dpif_netdev_cast(dpif_); - if (dpif->dp_serial != dpif->dp->serial) { - dpif->dp_serial = dpif->dp->serial; - return ENOBUFS; + uint64_t new_port_seq; + int error; + + new_port_seq = seq_read(dpif->dp->port_seq); + if (dpif->last_port_seq != new_port_seq) { + dpif->last_port_seq = new_port_seq; + error = ENOBUFS; } else { - return EAGAIN; + error = EAGAIN; } + + return error; } static void dpif_netdev_port_poll_wait(const struct dpif *dpif_) { struct dpif_netdev *dpif = dpif_netdev_cast(dpif_); - if (dpif->dp_serial != dpif->dp->serial) { - poll_immediate_wake(); - } + + seq_wait(dpif->dp->port_seq, dpif->last_port_seq); +} + +static struct dp_netdev_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 dp_netdev_flow *netdev_flow; + struct cls_rule *rule; + + 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 netdev_flow; } static struct dp_netdev_flow * -dp_netdev_lookup_flow(const struct dp_netdev *dp, const struct flow *key) +dp_netdev_find_flow(const struct dp_netdev *dp, const struct flow *flow) + OVS_REQ_RDLOCK(dp->cls.rwlock) { - struct dp_netdev_flow *flow; + struct dp_netdev_flow *netdev_flow; - HMAP_FOR_EACH_WITH_HASH (flow, node, flow_hash(key, 0), &dp->flow_table) { - if (flow_equal(&flow->key, key)) { - return flow; + HMAP_FOR_EACH_WITH_HASH (netdev_flow, node, flow_hash(flow, 0), + &dp->flow_table) { + if (flow_equal(&netdev_flow->flow, flow)) { + return netdev_flow; } } + return NULL; } -/* The caller must fill in odp_flow->key itself. */ static void -answer_flow_query(struct dp_netdev_flow *flow, uint32_t query_flags, - struct odp_flow *odp_flow) -{ - if (flow) { - odp_flow->stats.n_packets = flow->packet_count; - odp_flow->stats.n_bytes = flow->byte_count; - odp_flow->stats.used_sec = flow->used.tv_sec; - odp_flow->stats.used_nsec = flow->used.tv_nsec; - odp_flow->stats.tcp_flags = TCP_FLAGS(flow->tcp_ctl); - odp_flow->stats.reserved = 0; - odp_flow->stats.error = 0; - if (odp_flow->n_actions > 0) { - unsigned int n = MIN(odp_flow->n_actions, flow->n_actions); - memcpy(odp_flow->actions, flow->actions, - n * sizeof *odp_flow->actions); - odp_flow->n_actions = flow->n_actions; - } - - if (query_flags & ODPFF_ZERO_TCP_FLAGS) { - flow->tcp_ctl = 0; - } - - } else { - odp_flow->stats.error = ENOENT; - } -} - -static int -dpif_netdev_flow_get(const struct dpif *dpif, struct odp_flow flows[], int n) +get_dpif_flow_stats(struct dp_netdev_flow *netdev_flow, + struct dpif_flow_stats *stats) { - struct dp_netdev *dp = get_dp_netdev(dpif); - int i; - - for (i = 0; i < n; i++) { - struct odp_flow *odp_flow = &flows[i]; - struct flow key; + struct dp_netdev_flow_stats *bucket; + size_t i; - odp_flow_key_to_flow(&odp_flow->key, &key); - answer_flow_query(dp_netdev_lookup_flow(dp, &key), - odp_flow->flags, odp_flow); + 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); } - return 0; } static int -dpif_netdev_validate_actions(const union odp_action *actions, int n_actions, - bool *mutates) -{ - unsigned int i; - - *mutates = false; - for (i = 0; i < n_actions; i++) { - const union odp_action *a = &actions[i]; - switch (a->type) { - case ODPAT_OUTPUT: - if (a->output.port >= MAX_PORTS) { - return EINVAL; - } - break; - - case ODPAT_CONTROLLER: - break; - - case ODPAT_SET_VLAN_VID: - *mutates = true; - if (a->vlan_vid.vlan_vid & htons(~VLAN_VID_MASK)) { - return EINVAL; +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); } - break; - case ODPAT_SET_VLAN_PCP: - *mutates = true; - if (a->vlan_pcp.vlan_pcp & ~(VLAN_PCP_MASK >> VLAN_PCP_SHIFT)) { - return EINVAL; - } - break; - - case ODPAT_SET_NW_TOS: - *mutates = true; - if (a->nw_tos.nw_tos & IP_ECN_MASK) { - return EINVAL; + 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); + } } - break; - - case ODPAT_STRIP_VLAN: - case ODPAT_SET_DL_SRC: - case ODPAT_SET_DL_DST: - case ODPAT_SET_NW_SRC: - case ODPAT_SET_NW_DST: - case ODPAT_SET_TP_SRC: - case ODPAT_SET_TP_DST: - *mutates = true; - break; - - default: - return EOPNOTSUPP; } } + + /* 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 -set_flow_actions(struct dp_netdev_flow *flow, struct odp_flow *odp_flow) +dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len, + struct flow *flow) { - size_t n_bytes; - bool mutates; - int error; + odp_port_t in_port; + + 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. 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, NULL, 0, NULL, &s, true); + VLOG_ERR("internal error parsing flow key %s", ds_cstr(&s)); + ds_destroy(&s); + } - if (odp_flow->n_actions >= 4096 / sizeof *odp_flow->actions) { return EINVAL; } - error = dpif_netdev_validate_actions(odp_flow->actions, - odp_flow->n_actions, &mutates); - if (error) { - return error; + + in_port = flow->in_port.odp_port; + if (!is_valid_port_number(in_port) && in_port != ODPP_NONE) { + return EINVAL; } - n_bytes = odp_flow->n_actions * sizeof *flow->actions; - flow->actions = xrealloc(flow->actions, n_bytes); - flow->n_actions = odp_flow->n_actions; - memcpy(flow->actions, odp_flow->actions, n_bytes); return 0; } static int -add_flow(struct dpif *dpif, struct odp_flow *odp_flow) +dpif_netdev_flow_get(const struct dpif *dpif, + const struct nlattr *nl_key, size_t nl_key_len, + struct ofpbuf **actionsp, struct dpif_flow_stats *stats) { struct dp_netdev *dp = get_dp_netdev(dpif); - struct dp_netdev_flow *flow; + struct dp_netdev_flow *netdev_flow; + struct flow key; int error; - flow = xzalloc(sizeof *flow); - odp_flow_key_to_flow(&odp_flow->key, &flow->key); - - error = set_flow_actions(flow, odp_flow); + error = dpif_netdev_flow_from_nlattrs(nl_key, nl_key_len, &key); if (error) { - free(flow); return error; } - hmap_insert(&dp->flow_table, &flow->node, flow_hash(&flow->key, 0)); + 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) { + struct dp_netdev_actions *actions; + + actions = dp_netdev_flow_get_actions(netdev_flow); + *actionsp = ofpbuf_clone_data(actions->actions, actions->size); + } + } else { + error = ENOENT; + } + + return error; +} + +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; + + netdev_flow = xzalloc(sizeof *netdev_flow); + *CONST_CAST(struct flow *, &netdev_flow->flow) = *flow; + + ovs_mutex_init(&netdev_flow->mutex); + + ovsthread_stats_init(&netdev_flow->stats); + + 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); + return 0; } static void -clear_stats(struct dp_netdev_flow *flow) +clear_stats(struct dp_netdev_flow *netdev_flow) { - flow->used.tv_sec = 0; - flow->used.tv_nsec = 0; - flow->packet_count = 0; - flow->byte_count = 0; - flow->tcp_ctl = 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 -dpif_netdev_flow_put(struct dpif *dpif, struct odp_flow_put *put) +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 *flow; - struct flow key; + struct dp_netdev_flow *netdev_flow; + struct flow flow; + struct miniflow miniflow; + struct flow_wildcards wc; + int error; + + 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); - odp_flow_key_to_flow(&put->flow.key, &key); - flow = dp_netdev_lookup_flow(dp, &key); - if (!flow) { - if (put->flags & ODPPF_CREATE) { + 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) { - return add_flow(dpif, &put->flow); + if (put->stats) { + memset(put->stats, 0, sizeof *put->stats); + } + error = dp_netdev_flow_add(dp, &flow, &wc, put->actions, + put->actions_len); } else { - return EFBIG; + error = EFBIG; } } else { - return ENOENT; + error = ENOENT; } } else { - if (put->flags & ODPPF_MODIFY) { - int error = set_flow_actions(flow, &put->flow); - if (!error && put->flags & ODPPF_ZERO_STATS) { - clear_stats(flow); + if (put->flags & DPIF_FP_MODIFY + && flow_equal(&flow, &netdev_flow->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); } - return error; + 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 { - return EEXIST; + /* Overlapping flow. */ + error = EINVAL; } } -} + ovs_mutex_unlock(&dp->flow_mutex); + return error; +} static int -dpif_netdev_flow_del(struct dpif *dpif, struct odp_flow *odp_flow) +dpif_netdev_flow_del(struct dpif *dpif, const struct dpif_flow_del *del) { struct dp_netdev *dp = get_dp_netdev(dpif); - struct dp_netdev_flow *flow; + struct dp_netdev_flow *netdev_flow; struct flow key; + int error; - odp_flow_key_to_flow(&odp_flow->key, &key); - flow = dp_netdev_lookup_flow(dp, &key); - if (flow) { - answer_flow_query(flow, 0, odp_flow); - dp_netdev_free_flow(dp, flow); - return 0; + error = dpif_netdev_flow_from_nlattrs(del->key, del->key_len, &key); + if (error) { + return error; + } + + 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_remove_flow(dp, netdev_flow); } else { - return ENOENT; + error = ENOENT; } + fat_rwlock_unlock(&dp->cls.rwlock); + ovs_mutex_unlock(&dp->flow_mutex); + + return error; } -static int -dpif_netdev_flow_list(const struct dpif *dpif, struct odp_flow flows[], int n) +struct dp_netdev_flow_state { + struct dp_netdev_actions *actions; + struct odputil_keybuf keybuf; + struct odputil_keybuf maskbuf; + struct dpif_flow_stats stats; +}; + +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 *dp = get_dp_netdev(dpif); - struct dp_netdev_flow *flow; - int i; + struct dp_netdev_flow_state *state; - i = 0; - HMAP_FOR_EACH (flow, node, &dp->flow_table) { - if (i >= n) { - break; - } + *statep = state = xmalloc(sizeof *state); + state->actions = NULL; +} - odp_flow_key_from_flow(&flows[i].key, &flow->key); - answer_flow_query(flow, 0, &flows[i]); - i++; - } - return hmap_count(&dp->flow_table); +static void +dpif_netdev_flow_dump_state_uninit(void *state_) +{ + struct dp_netdev_flow_state *state = state_; + + free(state); } static int -dpif_netdev_execute(struct dpif *dpif, - const union odp_action actions[], int n_actions, - const struct ofpbuf *packet) +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 *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 ofpbuf copy; - bool mutates; - flow_t key; + struct dp_netdev_flow *netdev_flow; + struct flow_wildcards wc; int error; - if (packet->size < ETH_HEADER_LEN || packet->size > UINT16_MAX) { - return EINVAL; - } + ovs_mutex_lock(&iter->mutex); + error = iter->status; + if (!error) { + struct hmap_node *node; - error = dpif_netdev_validate_actions(actions, n_actions, &mutates); + 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; } - if (mutates) { - /* We need a deep copy of 'packet' since we're going to modify its - * data. */ - ofpbuf_init(©, DP_NETDEV_HEADROOM + packet->size); - copy.data = (char*)copy.base + DP_NETDEV_HEADROOM; - ofpbuf_put(©, packet->data, packet->size); - } else { - /* We still need a shallow copy of 'packet', even though we won't - * modify its data, because flow_extract() modifies packet->l2, etc. - * We could probably get away with modifying those but it's more polite - * if we don't. */ - copy = *packet; + 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, &wc.masks, + netdev_flow->flow.in_port.odp_port); + + *key = ofpbuf_data(&buf); + *key_len = ofpbuf_size(&buf); } - flow_extract(©, 0, -1, &key); - error = dp_netdev_execute_actions(dp, ©, &key, actions, n_actions); - if (mutates) { - ofpbuf_uninit(©); + + if (key && mask) { + struct ofpbuf buf; + + ofpbuf_use_stack(&buf, &state->maskbuf, sizeof state->maskbuf); + odp_flow_key_from_mask(&buf, &wc.masks, &netdev_flow->flow, + odp_to_u32(wc.masks.in_port.odp_port), + SIZE_MAX); + + *mask = ofpbuf_data(&buf); + *mask_len = ofpbuf_size(&buf); } - return error; + + if (actions || stats) { + state->actions = NULL; + + 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; + } + } + + return 0; } static int -dpif_netdev_recv_get_mask(const struct dpif *dpif, int *listen_mask) +dpif_netdev_flow_dump_done(const struct dpif *dpif OVS_UNUSED, void *iter_) { - struct dpif_netdev *dpif_netdev = dpif_netdev_cast(dpif); - *listen_mask = dpif_netdev->listen_mask; + struct dp_netdev_flow_iter *iter = iter_; + + ovs_mutex_destroy(&iter->mutex); + free(iter); return 0; } static int -dpif_netdev_recv_set_mask(struct dpif *dpif, int listen_mask) +dpif_netdev_execute(struct dpif *dpif, struct dpif_execute *execute) { - struct dpif_netdev *dpif_netdev = dpif_netdev_cast(dpif); - if (!(listen_mask & ~ODPL_ALL)) { - dpif_netdev->listen_mask = listen_mask; - return 0; - } else { + struct dp_netdev *dp = get_dp_netdev(dpif); + struct pkt_metadata *md = &execute->md; + struct miniflow key; + uint32_t buf[FLOW_U32S]; + + if (ofpbuf_size(execute->packet) < ETH_HEADER_LEN || + ofpbuf_size(execute->packet) > UINT16_MAX) { return EINVAL; } + + /* Extract flow key. */ + miniflow_initialize(&key, buf); + miniflow_extract(execute->packet, md, &key); + + ovs_rwlock_rdlock(&dp->port_rwlock); + dp_netdev_execute_actions(dp, &key, execute->packet, false, md, + execute->actions, execute->actions_len); + ovs_rwlock_unlock(&dp->port_rwlock); + + 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 struct ovs_queue * -find_nonempty_queue(struct dpif *dpif) +static void +dp_netdev_refresh_queues(struct dp_netdev *dp, uint32_t n_handlers) + OVS_REQ_WRLOCK(dp->queue_rwlock) { - struct dpif_netdev *dpif_netdev = dpif_netdev_cast(dpif); - struct dp_netdev *dp = get_dp_netdev(dpif); - int mask = dpif_netdev->listen_mask; - int i; + if (dp->n_handlers != n_handlers) { + size_t i; + + dp_netdev_destroy_all_queues(dp); - for (i = 0; i < N_QUEUES; i++) { - struct ovs_queue *q = &dp->queues[i]; - if (q->n && mask & (1u << i)) { - return q; + 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 NULL; } static int -dpif_netdev_recv(struct dpif *dpif, struct ofpbuf **bufp) +dpif_netdev_recv_set(struct dpif *dpif, bool enable) { - struct ovs_queue *q = find_nonempty_queue(dpif); - if (q) { - *bufp = queue_pop_head(q); + 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 { - return EAGAIN; + dp_netdev_refresh_queues(dp, 1); } + fat_rwlock_unlock(&dp->queue_rwlock); + + return 0; } -static void -dpif_netdev_recv_wait(struct dpif *dpif) +static int +dpif_netdev_handlers_set(struct dpif *dpif, uint32_t n_handlers) { - struct ovs_queue *q = find_nonempty_queue(dpif); - if (q) { - poll_immediate_wake(); - } else { - /* No messages ready to be received, and dp_wait() will ensure that we - * wake up to queue new messages, so there is nothing to do. */ + 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; } - -static void -dp_netdev_flow_used(struct dp_netdev_flow *flow, struct flow *key, - const struct ofpbuf *packet) + +static int +dpif_netdev_queue_to_priority(const struct dpif *dpif OVS_UNUSED, + uint32_t queue_id, uint32_t *priority) { - time_timespec(&flow->used); - flow->packet_count++; - flow->byte_count += packet->size; - if (key->dl_type == htons(ETH_TYPE_IP) && key->nw_proto == IPPROTO_TCP) { - struct tcp_header *th = packet->l4; - flow->tcp_ctl |= th->tcp_ctl; - } + *priority = queue_id; + return 0; } -static void -dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, - struct ofpbuf *packet) +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_flow *flow; - struct flow key; + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - if (packet->size < ETH_HEADER_LEN) { - return; - } - if (flow_extract(packet, 0, port->port_no, &key) && dp->drop_frags) { - dp->n_frags++; - return; + if (!dp->handler_queues) { + VLOG_WARN_RL(&rl, "receiving upcall disabled"); + return false; } - flow = dp_netdev_lookup_flow(dp, &key); - if (flow) { - dp_netdev_flow_used(flow, &key, packet); - dp_netdev_execute_actions(dp, packet, &key, - flow->actions, flow->n_actions); - dp->n_hit++; - } else { - dp->n_missed++; - dp_netdev_output_control(dp, packet, _ODPL_MISS_NR, port->port_no, 0); + if (handler_id >= dp->n_handlers) { + VLOG_WARN_RL(&rl, "handler index out of bound"); + return false; } + + return true; } -static void -dp_netdev_run(void) +static int +dpif_netdev_recv(struct dpif *dpif, uint32_t handler_id, + struct dpif_upcall *upcall, struct ofpbuf *buf) { - struct ofpbuf packet; - struct dp_netdev *dp; + struct dp_netdev *dp = get_dp_netdev(dpif); + struct dp_netdev_queue *q; + int error = 0; - ofpbuf_init(&packet, DP_NETDEV_HEADROOM + max_mtu); - LIST_FOR_EACH (dp, node, &dp_netdev_list) { - struct dp_netdev_port *port; + fat_rwlock_rdlock(&dp->queue_rwlock); - LIST_FOR_EACH (port, node, &dp->port_list) { - int error; + if (!dp_netdev_recv_check(dp, handler_id)) { + error = EAGAIN; + goto out; + } - /* Reset packet contents. */ - packet.data = (char*)packet.base + DP_NETDEV_HEADROOM; - packet.size = 0; + 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]; - error = netdev_recv(port->netdev, &packet); - if (!error) { - dp_netdev_port_input(dp, port, &packet); - } else if (error != EAGAIN) { - 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), strerror(error)); - } - } + *upcall = u->upcall; + + ofpbuf_uninit(buf); + *buf = u->buf; + } else { + error = EAGAIN; } - ofpbuf_uninit(&packet); + ovs_mutex_unlock(&q->mutex); + +out: + fat_rwlock_unlock(&dp->queue_rwlock); + + return error; } static void -dp_netdev_wait(void) +dpif_netdev_recv_wait(struct dpif *dpif, uint32_t handler_id) { - struct dp_netdev *dp; + struct dp_netdev *dp = get_dp_netdev(dpif); + struct dp_netdev_queue *q; + uint64_t seq; - LIST_FOR_EACH (dp, node, &dp_netdev_list) { - struct dp_netdev_port *port; - LIST_FOR_EACH (port, node, &dp->port_list) { - netdev_recv_wait(port->netdev); - } - } -} + fat_rwlock_rdlock(&dp->queue_rwlock); + if (!dp_netdev_recv_check(dp, handler_id)) { + goto out; + } -/* Modify the TCI field of 'packet'. If a VLAN tag is not present, one - * is added with the TCI field set to 'tci'. If a VLAN tag is present, - * then 'mask' bits are cleared before 'tci' is logically OR'd into the - * TCI field. - * - * Note that the function does not ensure that 'tci' does not affect - * bits outside of 'mask'. - */ -static void -dp_netdev_modify_vlan_tci(struct ofpbuf *packet, uint16_t tci, uint16_t mask) -{ - struct vlan_eth_header *veh; - struct eth_header *eh; - - eh = packet->l2; - if (packet->size >= sizeof(struct vlan_eth_header) - && eh->eth_type == htons(ETH_TYPE_VLAN)) { - /* Clear 'mask' bits, but maintain other TCI bits. */ - veh = packet->l2; - veh->veth_tci &= ~htons(mask); - veh->veth_tci |= htons(tci); + 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 { - /* Insert new 802.1Q header. */ - struct vlan_eth_header tmp; - memcpy(tmp.veth_dst, eh->eth_dst, ETH_ADDR_LEN); - memcpy(tmp.veth_src, eh->eth_src, ETH_ADDR_LEN); - tmp.veth_type = htons(ETH_TYPE_VLAN); - tmp.veth_tci = htons(tci); - tmp.veth_next_type = eh->eth_type; - - veh = ofpbuf_push_uninit(packet, VLAN_HEADER_LEN); - memcpy(veh, &tmp, sizeof tmp); - packet->l2 = (char*)packet->l2 - VLAN_HEADER_LEN; + seq_wait(q->seq, seq); } + + ovs_mutex_unlock(&q->mutex); + +out: + fat_rwlock_unlock(&dp->queue_rwlock); } static void -dp_netdev_strip_vlan(struct ofpbuf *packet) +dpif_netdev_recv_purge(struct dpif *dpif) { - struct vlan_eth_header *veh = packet->l2; - if (packet->size >= sizeof *veh - && veh->veth_type == htons(ETH_TYPE_VLAN)) { - struct eth_header tmp; + struct dpif_netdev *dpif_netdev = dpif_netdev_cast(dpif); - memcpy(tmp.eth_dst, veh->veth_dst, ETH_ADDR_LEN); - memcpy(tmp.eth_src, veh->veth_src, ETH_ADDR_LEN); - tmp.eth_type = veh->veth_next_type; + fat_rwlock_wrlock(&dpif_netdev->dp->queue_rwlock); + dp_netdev_purge_queues(dpif_netdev->dp); + 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; - packet->size -= VLAN_HEADER_LEN; - packet->data = (char*)packet->data + VLAN_HEADER_LEN; - packet->l2 = (char*)packet->l2 + VLAN_HEADER_LEN; - memcpy(packet->data, &tmp, sizeof tmp); - } + netdev_actions = xmalloc(sizeof *netdev_actions); + netdev_actions->actions = xmemdup(actions, size); + netdev_actions->size = size; + + return netdev_actions; } -static void -dp_netdev_set_dl_src(struct ofpbuf *packet, const uint8_t dl_addr[ETH_ADDR_LEN]) +struct dp_netdev_actions * +dp_netdev_flow_get_actions(const struct dp_netdev_flow *flow) { - struct eth_header *eh = packet->l2; - memcpy(eh->eth_src, dl_addr, sizeof eh->eth_src); + return ovsrcu_get(struct dp_netdev_actions *, &flow->actions); } static void -dp_netdev_set_dl_dst(struct ofpbuf *packet, const uint8_t dl_addr[ETH_ADDR_LEN]) +dp_netdev_actions_free(struct dp_netdev_actions *actions) { - struct eth_header *eh = packet->l2; - memcpy(eh->eth_dst, dl_addr, sizeof eh->eth_dst); + free(actions->actions); + free(actions); } + -static bool -is_ip(const struct ofpbuf *packet, const struct flow *key) +static void +dp_netdev_process_rxq_port(struct dp_netdev *dp, + struct dp_netdev_port *port, + struct netdev_rxq *rxq) { - return key->dl_type == htons(ETH_TYPE_IP) && packet->l4; + struct ofpbuf *packet[NETDEV_MAX_RX_BATCH]; + int error, c; + + 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)); + } } static void -dp_netdev_set_nw_addr(struct ofpbuf *packet, struct flow *key, - const struct odp_action_nw_addr *a) -{ - if (is_ip(packet, key)) { - struct ip_header *nh = packet->l3; - uint32_t *field; - - field = a->type == ODPAT_SET_NW_SRC ? &nh->ip_src : &nh->ip_dst; - if (key->nw_proto == IP_TYPE_TCP && packet->l7) { - struct tcp_header *th = packet->l4; - th->tcp_csum = recalc_csum32(th->tcp_csum, *field, a->nw_addr); - } else if (key->nw_proto == IP_TYPE_UDP && packet->l7) { - struct udp_header *uh = packet->l4; - if (uh->udp_csum) { - uh->udp_csum = recalc_csum32(uh->udp_csum, *field, a->nw_addr); - if (!uh->udp_csum) { - uh->udp_csum = 0xffff; - } +dpif_netdev_run(struct dpif *dpif) +{ + struct dp_netdev_port *port; + struct dp_netdev *dp = get_dp_netdev(dpif); + + ovs_rwlock_rdlock(&dp->port_rwlock); + + 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++) { + dp_netdev_process_rxq_port(dp, port, port->rxq[i]); } } - nh->ip_csum = recalc_csum32(nh->ip_csum, *field, a->nw_addr); - *field = a->nw_addr; } + + ovs_rwlock_unlock(&dp->port_rwlock); } static void -dp_netdev_set_nw_tos(struct ofpbuf *packet, struct flow *key, - const struct odp_action_nw_tos *a) +dpif_netdev_wait(struct dpif *dpif) { - if (is_ip(packet, key)) { - struct ip_header *nh = packet->l3; - uint8_t *field = &nh->ip_tos; + struct dp_netdev_port *port; + struct dp_netdev *dp = get_dp_netdev(dpif); + + ovs_rwlock_rdlock(&dp->port_rwlock); - /* Set the DSCP bits and preserve the ECN bits. */ - uint8_t new = a->nw_tos | (nh->ip_tos & IP_ECN_MASK); + HMAP_FOR_EACH (port, node, &dp->ports) { + if (!netdev_is_pmd(port->netdev)) { + int i; - nh->ip_csum = recalc_csum16(nh->ip_csum, htons((uint16_t)*field), - htons((uint16_t)a->nw_tos)); - *field = new; + for (i = 0; i < netdev_n_rxq(port->netdev); i++) { + netdev_rxq_wait(port->rxq[i]); + } + } } + ovs_rwlock_unlock(&dp->port_rwlock); } -static void -dp_netdev_set_tp_port(struct ofpbuf *packet, struct flow *key, - const struct odp_action_tp_port *a) -{ - if (is_ip(packet, key)) { - uint16_t *field; - if (key->nw_proto == IPPROTO_TCP && packet->l7) { - struct tcp_header *th = packet->l4; - field = a->type == ODPAT_SET_TP_SRC ? &th->tcp_src : &th->tcp_dst; - th->tcp_csum = recalc_csum16(th->tcp_csum, *field, a->tp_port); - *field = a->tp_port; - } else if (key->nw_proto == IPPROTO_UDP && packet->l7) { - struct udp_header *uh = packet->l4; - field = a->type == ODPAT_SET_TP_SRC ? &uh->udp_src : &uh->udp_dst; - uh->udp_csum = recalc_csum16(uh->udp_csum, *field, a->tp_port); - *field = a->tp_port; - } else { - return; +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 -dp_netdev_output_port(struct dp_netdev *dp, struct ofpbuf *packet, - uint16_t out_port) +static void * +pmd_thread_main(void *f_) { - struct dp_netdev_port *p = dp->ports[out_port]; - if (p) { - netdev_send(p->netdev, packet); + 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; + + f->name = xasprintf("pmd_%u", ovsthread_id_self()); + set_subprogram_name("%s", f->name); + 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); + free(f->name); + return NULL; } -static int -dp_netdev_output_control(struct dp_netdev *dp, const struct ofpbuf *packet, - int queue_no, int port_no, uint32_t arg) +static void +dp_netdev_set_pmd_threads(struct dp_netdev *dp, int n) { - struct ovs_queue *q = &dp->queues[queue_no]; - struct odp_msg *header; - struct ofpbuf *msg; - size_t msg_size; + 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]; - if (q->n >= MAX_QUEUE_LEN) { - dp->n_lost++; - return ENOBUFS; + xpthread_join(f->thread, NULL); } + latch_poll(&dp->exit_latch); + free(dp->pmd_threads); - msg_size = sizeof *header + packet->size; - msg = ofpbuf_new_with_headroom(msg_size, DPIF_RECV_MSG_PADDING); - header = ofpbuf_put_uninit(msg, sizeof *header); - header->type = queue_no; - header->length = msg_size; - header->port = port_no; - header->arg = arg; - ofpbuf_put(msg, packet->data, packet->size); - queue_push_tail(q, msg); + /* Start new threads. */ + dp->pmd_threads = xmalloc(n * sizeof *dp->pmd_threads); + dp->n_pmd_threads = n; - return 0; + 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. */ + xpthread_create(&f->thread, NULL, pmd_thread_main, f); + } } -/* Returns true if 'packet' is an invalid Ethernet+IPv4 ARP packet: one with - * screwy or truncated header fields or one whose inner and outer Ethernet - * address differ. */ -static bool -dp_netdev_is_spoofed_arp(struct ofpbuf *packet, const struct flow *key) + +static void * +dp_netdev_flow_stats_new_cb(void) { - struct arp_eth_header *arp; - struct eth_header *eth; - ptrdiff_t l3_size; + struct dp_netdev_flow_stats *bucket = xzalloc_cacheline(sizeof *bucket); + ovs_mutex_init(&bucket->mutex); + return bucket; +} - if (key->dl_type != htons(ETH_TYPE_ARP)) { - return false; - } +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; +} - l3_size = (char *) ofpbuf_end(packet) - (char *) packet->l3; - if (l3_size < sizeof(struct arp_eth_header)) { - return true; +static void +dp_netdev_count_packet(struct dp_netdev *dp, enum dp_stat_type type) +{ + 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 miniflow key; + uint32_t buf[FLOW_U32S]; + + if (ofpbuf_size(packet) < ETH_HEADER_LEN) { + ofpbuf_delete(packet); + return; } + miniflow_initialize(&key, buf); + miniflow_extract(packet, md, &key); + + netdev_flow = dp_netdev_lookup_flow(dp, &key); + if (netdev_flow) { + struct dp_netdev_actions *actions; + + dp_netdev_flow_used(netdev_flow, packet, &key); + + actions = dp_netdev_flow_get_actions(netdev_flow); + dp_netdev_execute_actions(dp, &key, 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, 0) + % dp->n_handlers, + DPIF_UC_MISS, &key, NULL); + ofpbuf_delete(packet); + } +} - eth = packet->l2; - arp = packet->l3; - return (arp->ar_hrd != htons(ARP_HRD_ETHERNET) - || arp->ar_pro != htons(ARP_PRO_IP) - || arp->ar_hln != ETH_HEADER_LEN - || arp->ar_pln != 4 - || !eth_addr_equals(arp->ar_sha, eth->eth_src)); +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_execute_actions(struct dp_netdev *dp, - struct ofpbuf *packet, struct flow *key, - const union odp_action *actions, int n_actions) +dp_netdev_output_userspace(struct dp_netdev *dp, struct ofpbuf *packet, + int queue_no, int type, const struct miniflow *key, + const struct nlattr *userdata) { - int i; - for (i = 0; i < n_actions; i++) { - const union odp_action *a = &actions[i]; + struct dp_netdev_queue *q; + int error; - switch (a->type) { - case ODPAT_OUTPUT: - dp_netdev_output_port(dp, packet, a->output.port); - break; + 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 = type; + + /* Allocate buffer big enough for everything. */ + 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. */ + 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) { + upcall->userdata = ofpbuf_put(buf, userdata, + NLA_ALIGN(userdata->nla_len)); + } - case ODPAT_CONTROLLER: - dp_netdev_output_control(dp, packet, _ODPL_ACTION_NR, - key->in_port, a->controller.arg); - break; + ofpbuf_set_data(&upcall->packet, + ofpbuf_put(buf, ofpbuf_data(packet), ofpbuf_size(packet))); + ofpbuf_set_size(&upcall->packet, ofpbuf_size(packet)); - case ODPAT_SET_VLAN_VID: - dp_netdev_modify_vlan_tci(packet, ntohs(a->vlan_vid.vlan_vid), - VLAN_VID_MASK); - break; + seq_change(q->seq); - case ODPAT_SET_VLAN_PCP: - dp_netdev_modify_vlan_tci(packet, - a->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT, - VLAN_PCP_MASK); - break; + error = 0; + } else { + dp_netdev_count_packet(dp, DP_STAT_LOST); + error = ENOBUFS; + } + ovs_mutex_unlock(&q->mutex); + fat_rwlock_unlock(&dp->queue_rwlock); - case ODPAT_STRIP_VLAN: - dp_netdev_strip_vlan(packet); - break; + return error; +} - case ODPAT_SET_DL_SRC: - dp_netdev_set_dl_src(packet, a->dl_addr.dl_addr); - break; +struct dp_netdev_execute_aux { + struct dp_netdev *dp; + const struct miniflow *key; +}; - case ODPAT_SET_DL_DST: - dp_netdev_set_dl_dst(packet, a->dl_addr.dl_addr); - break; +static void +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 ODPAT_SET_NW_SRC: - case ODPAT_SET_NW_DST: - dp_netdev_set_nw_addr(packet, key, &a->nw_addr); - break; + case OVS_ACTION_ATTR_USERSPACE: { + const struct nlattr *userdata; - case ODPAT_SET_NW_TOS: - dp_netdev_set_nw_tos(packet, key, &a->nw_tos); - break; + userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA); - case ODPAT_SET_TP_SRC: - case ODPAT_SET_TP_DST: - dp_netdev_set_tp_port(packet, key, &a->tp_port); - break; + dp_netdev_output_userspace(aux->dp, packet, + miniflow_hash_5tuple(aux->key, 0) + % aux->dp->n_handlers, + DPIF_UC_ACTION, aux->key, + userdata); - case ODPAT_DROP_SPOOFED_ARP: - if (dp_netdev_is_spoofed_arp(packet, key)) { - return 0; + 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; } - return 0; + + 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); + + (*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, const struct miniflow *key, + struct ofpbuf *packet, bool may_steal, + struct pkt_metadata *md, + const struct nlattr *actions, size_t actions_len) +{ + 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 = { "netdev", - dp_netdev_run, - dp_netdev_wait, - NULL, /* enumerate */ + dpif_netdev_enumerate, + dpif_netdev_port_open_type, dpif_netdev_open, dpif_netdev_close, - NULL, /* get_all_names */ dpif_netdev_destroy, + dpif_netdev_run, + dpif_netdev_wait, dpif_netdev_get_stats, - dpif_netdev_get_drop_frags, - dpif_netdev_set_drop_frags, dpif_netdev_port_add, dpif_netdev_port_del, dpif_netdev_port_query_by_number, dpif_netdev_port_query_by_name, - dpif_netdev_port_list, + NULL, /* port_get_pid */ + dpif_netdev_port_dump_start, + dpif_netdev_port_dump_next, + dpif_netdev_port_dump_done, dpif_netdev_port_poll, dpif_netdev_port_poll_wait, dpif_netdev_flow_get, dpif_netdev_flow_put, dpif_netdev_flow_del, dpif_netdev_flow_flush, - dpif_netdev_flow_list, + 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, - dpif_netdev_recv_get_mask, - dpif_netdev_recv_set_mask, - NULL, /* get_sflow_probability */ - NULL, /* set_sflow_probability */ - NULL, /* queue_to_priority */ + NULL, /* operate */ + dpif_netdev_recv_set, + dpif_netdev_handlers_set, + dpif_netdev_queue_to_priority, dpif_netdev_recv, dpif_netdev_recv_wait, + dpif_netdev_recv_purge, }; + +static void +dpif_dummy_change_port_number(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[], void *aux OVS_UNUSED) +{ + struct dp_netdev_port *port; + struct dp_netdev *dp; + 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"); + goto exit; + } + + port_no = u32_to_odp(atoi(argv[3])); + if (!port_no || port_no == ODPP_NONE) { + unixctl_command_reply_error(conn, "bad port number"); + goto exit; + } + if (dp_netdev_lookup_port(dp, port_no)) { + unixctl_command_reply_error(conn, "port number already in use"); + goto exit; + } + 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 +dpif_dummy_register__(const char *type) +{ + struct dpif_class *class; + + class = xmalloc(sizeof *class); + *class = dpif_netdev_class; + class->type = xstrdup(type); + dp_register_provider(class); +} + +void +dpif_dummy_register(bool override) +{ + if (override) { + struct sset types; + const char *type; + + sset_init(&types); + dp_enumerate_types(&types); + SSET_FOR_EACH (type, &types) { + if (!dp_unregister_provider(type)) { + dpif_dummy_register__(type); + } + } + sset_destroy(&types); + } + + dpif_dummy_register__("dummy"); + + unixctl_command_register("dpif-dummy/change-port-number", + "DP PORT NEW-NUMBER", + 3, 3, dpif_dummy_change_port_number, NULL); +}