X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-dummy.c;h=501fb82b83819e563dfdaa92d0871686107b9693;hb=HEAD;hp=234d7bc5624496cdb5a4bc9274e3787057431cd9;hpb=02d5bfe3beca895d2beb5906e8bcf50cb945efce;p=sliver-openvswitch.git diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 234d7bc56..501fb82b8 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -20,6 +20,7 @@ #include +#include "dpif-netdev.h" #include "flow.h" #include "list.h" #include "netdev-provider.h" @@ -28,192 +29,836 @@ #include "ofp-print.h" #include "ofpbuf.h" #include "packets.h" +#include "pcap-file.h" #include "poll-loop.h" #include "shash.h" #include "sset.h" +#include "stream.h" +#include "unaligned.h" +#include "timeval.h" #include "unixctl.h" +#include "reconnect.h" #include "vlog.h" VLOG_DEFINE_THIS_MODULE(netdev_dummy); -#ifdef __FreeBSD__ -#define FREE_BSD 1 -#else -#define FREE_BSD 0 -#endif - -struct netdev_dev_dummy { - struct netdev_dev netdev_dev; - uint8_t hwaddr[ETH_ADDR_LEN]; - int mtu; - struct netdev_stats stats; - enum netdev_flags flags; - unsigned int change_seq; - - struct list devs; /* List of child "netdev_dummy"s. */ +struct reconnect; + +struct dummy_packet_stream { + struct stream *stream; + struct ofpbuf rxbuf; + struct list txq; +}; + +enum dummy_packet_conn_type { + NONE, /* No connection is configured. */ + PASSIVE, /* Listener. */ + ACTIVE /* Connect to listener. */ +}; + +struct dummy_packet_pconn { + struct pstream *pstream; + struct dummy_packet_stream *streams; + size_t n_streams; }; +struct dummy_packet_rconn { + struct dummy_packet_stream *rstream; + struct reconnect *reconnect; +}; + +struct dummy_packet_conn { + enum dummy_packet_conn_type type; + union { + struct dummy_packet_pconn pconn; + struct dummy_packet_rconn rconn; + } u; +}; + +/* Protects 'dummy_list'. */ +static struct ovs_mutex dummy_list_mutex = OVS_MUTEX_INITIALIZER; + +/* Contains all 'struct dummy_dev's. */ +static struct list dummy_list OVS_GUARDED_BY(dummy_list_mutex) + = LIST_INITIALIZER(&dummy_list); + struct netdev_dummy { - struct netdev netdev; - struct list node; /* In netdev_dev_dummy's "devs" list. */ - struct list recv_queue; - bool listening; + struct netdev up; + + /* In dummy_list. */ + struct list list_node OVS_GUARDED_BY(dummy_list_mutex); + + /* Protects all members below. */ + struct ovs_mutex mutex OVS_ACQ_AFTER(dummy_list_mutex); + + uint8_t hwaddr[ETH_ADDR_LEN] OVS_GUARDED; + int mtu OVS_GUARDED; + struct netdev_stats stats OVS_GUARDED; + enum netdev_flags flags OVS_GUARDED; + int ifindex OVS_GUARDED; + + struct dummy_packet_conn conn OVS_GUARDED; + + FILE *tx_pcap, *rxq_pcap OVS_GUARDED; + + struct list rxes OVS_GUARDED; /* List of child "netdev_rxq_dummy"s. */ }; -static struct shash dummy_netdev_devs = SHASH_INITIALIZER(&dummy_netdev_devs); +/* Max 'recv_queue_len' in struct netdev_dummy. */ +#define NETDEV_DUMMY_MAX_QUEUE 100 + +struct netdev_rxq_dummy { + struct netdev_rxq up; + struct list node; /* In netdev_dummy's "rxes" list. */ + struct list recv_queue; + int recv_queue_len; /* list_size(&recv_queue). */ + struct seq *seq; /* Reports newly queued packets. */ +}; static unixctl_cb_func netdev_dummy_set_admin_state; -static int netdev_dummy_create(const struct netdev_class *, const char *, - struct netdev_dev **); -static void netdev_dev_dummy_poll_notify(struct netdev_dev_dummy *); -static int netdev_dev_dummy_update_flags(struct netdev_dev_dummy *, - enum netdev_flags off, - enum netdev_flags on, - enum netdev_flags *old_flagsp); +static int netdev_dummy_construct(struct netdev *); +static void netdev_dummy_queue_packet(struct netdev_dummy *, struct ofpbuf *); + +static void dummy_packet_stream_close(struct dummy_packet_stream *); static bool is_dummy_class(const struct netdev_class *class) { - return class->create == netdev_dummy_create; + return class->construct == netdev_dummy_construct; } -static struct netdev_dev_dummy * -netdev_dev_dummy_cast(const struct netdev_dev *netdev_dev) +static struct netdev_dummy * +netdev_dummy_cast(const struct netdev *netdev) { - ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); - return CONTAINER_OF(netdev_dev, struct netdev_dev_dummy, netdev_dev); + ovs_assert(is_dummy_class(netdev_get_class(netdev))); + return CONTAINER_OF(netdev, struct netdev_dummy, up); } -static struct netdev_dummy * -netdev_dummy_cast(const struct netdev *netdev) +static struct netdev_rxq_dummy * +netdev_rxq_dummy_cast(const struct netdev_rxq *rx) +{ + ovs_assert(is_dummy_class(netdev_get_class(rx->netdev))); + return CONTAINER_OF(rx, struct netdev_rxq_dummy, up); +} + +static void +dummy_packet_stream_init(struct dummy_packet_stream *s, struct stream *stream) +{ + int rxbuf_size = stream ? 2048 : 0; + s->stream = stream; + ofpbuf_init(&s->rxbuf, rxbuf_size); + list_init(&s->txq); +} + +static struct dummy_packet_stream * +dummy_packet_stream_create(struct stream *stream) +{ + struct dummy_packet_stream *s; + + s = xzalloc(sizeof *s); + dummy_packet_stream_init(s, stream); + + return s; +} + +static void +dummy_packet_stream_wait(struct dummy_packet_stream *s) +{ + stream_run_wait(s->stream); + if (!list_is_empty(&s->txq)) { + stream_send_wait(s->stream); + } + stream_recv_wait(s->stream); +} + +static void +dummy_packet_stream_send(struct dummy_packet_stream *s, const void *buffer, size_t size) { - struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); - return CONTAINER_OF(netdev, struct netdev_dummy, netdev); + if (list_size(&s->txq) < NETDEV_DUMMY_MAX_QUEUE) { + struct ofpbuf *b; + + b = ofpbuf_clone_data_with_headroom(buffer, size, 2); + put_unaligned_be16(ofpbuf_push_uninit(b, 2), htons(size)); + list_push_back(&s->txq, &b->list_node); + } } static int -netdev_dummy_create(const struct netdev_class *class, const char *name, - struct netdev_dev **netdev_devp) +dummy_packet_stream_run(struct netdev_dummy *dev, struct dummy_packet_stream *s) { - static unsigned int n = 0xaa550000; - struct netdev_dev_dummy *netdev_dev; + int error = 0; + size_t n; - netdev_dev = xzalloc(sizeof *netdev_dev); - netdev_dev_init(&netdev_dev->netdev_dev, name, class); - netdev_dev->hwaddr[0] = 0xaa; - netdev_dev->hwaddr[1] = 0x55; - netdev_dev->hwaddr[2] = n >> 24; - netdev_dev->hwaddr[3] = n >> 16; - netdev_dev->hwaddr[4] = n >> 8; - netdev_dev->hwaddr[5] = n; - netdev_dev->mtu = 1500; - netdev_dev->flags = 0; - netdev_dev->change_seq = 1; - list_init(&netdev_dev->devs); + stream_run(s->stream); - shash_add(&dummy_netdev_devs, name, netdev_dev); + if (!list_is_empty(&s->txq)) { + struct ofpbuf *txbuf; + int retval; - n++; + txbuf = ofpbuf_from_list(list_front(&s->txq)); + retval = stream_send(s->stream, ofpbuf_data(txbuf), ofpbuf_size(txbuf)); - *netdev_devp = &netdev_dev->netdev_dev; + if (retval > 0) { + ofpbuf_pull(txbuf, retval); + if (!ofpbuf_size(txbuf)) { + list_remove(&txbuf->list_node); + ofpbuf_delete(txbuf); + } + } else if (retval != -EAGAIN) { + error = -retval; + } + } - return 0; + if (!error) { + if (ofpbuf_size(&s->rxbuf) < 2) { + n = 2 - ofpbuf_size(&s->rxbuf); + } else { + uint16_t frame_len; + + frame_len = ntohs(get_unaligned_be16(ofpbuf_data(&s->rxbuf))); + if (frame_len < ETH_HEADER_LEN) { + error = EPROTO; + n = 0; + } else { + n = (2 + frame_len) - ofpbuf_size(&s->rxbuf); + } + } + } + if (!error) { + int retval; + + ofpbuf_prealloc_tailroom(&s->rxbuf, n); + retval = stream_recv(s->stream, ofpbuf_tail(&s->rxbuf), n); + + if (retval > 0) { + ofpbuf_set_size(&s->rxbuf, ofpbuf_size(&s->rxbuf) + retval); + if (retval == n && ofpbuf_size(&s->rxbuf) > 2) { + ofpbuf_pull(&s->rxbuf, 2); + netdev_dummy_queue_packet(dev, + ofpbuf_clone(&s->rxbuf)); + ofpbuf_clear(&s->rxbuf); + } + } else if (retval != -EAGAIN) { + error = (retval < 0 ? -retval + : ofpbuf_size(&s->rxbuf) ? EPROTO + : EOF); + } + } + + return error; +} + +static void +dummy_packet_stream_close(struct dummy_packet_stream *s) +{ + stream_close(s->stream); + ofpbuf_uninit(&s->rxbuf); + ofpbuf_list_delete(&s->txq); +} + +static void +dummy_packet_conn_init(struct dummy_packet_conn *conn) +{ + memset(conn, 0, sizeof *conn); + conn->type = NONE; +} + +static void +dummy_packet_conn_get_config(struct dummy_packet_conn *conn, struct smap *args) +{ + + switch (conn->type) { + case PASSIVE: + smap_add(args, "pstream", pstream_get_name(conn->u.pconn.pstream)); + break; + + case ACTIVE: + smap_add(args, "stream", stream_get_name(conn->u.rconn.rstream->stream)); + break; + + case NONE: + default: + break; + } +} + +static void +dummy_packet_conn_close(struct dummy_packet_conn *conn) +{ + int i; + struct dummy_packet_pconn *pconn = &conn->u.pconn; + struct dummy_packet_rconn *rconn = &conn->u.rconn; + + switch (conn->type) { + case PASSIVE: + pstream_close(pconn->pstream); + for (i = 0; i < pconn->n_streams; i++) { + dummy_packet_stream_close(&pconn->streams[i]); + } + free(pconn->streams); + pconn->pstream = NULL; + pconn->streams = NULL; + break; + + case ACTIVE: + dummy_packet_stream_close(rconn->rstream); + free(rconn->rstream); + rconn->rstream = NULL; + reconnect_destroy(rconn->reconnect); + rconn->reconnect = NULL; + break; + + case NONE: + default: + break; + } + + conn->type = NONE; + memset(conn, 0, sizeof *conn); +} + +static void +dummy_packet_conn_set_config(struct dummy_packet_conn *conn, + const struct smap *args) +{ + const char *pstream = smap_get(args, "pstream"); + const char *stream = smap_get(args, "stream"); + + if (pstream && stream) { + VLOG_WARN("Open failed: both %s and %s are configured", + pstream, stream); + return; + } + + switch (conn->type) { + case PASSIVE: + if (!strcmp(pstream_get_name(conn->u.pconn.pstream), pstream)) { + return; + } + dummy_packet_conn_close(conn); + break; + case ACTIVE: + if (!strcmp(stream_get_name(conn->u.rconn.rstream->stream), stream)) { + return; + } + dummy_packet_conn_close(conn); + break; + case NONE: + default: + break; + } + + if (pstream) { + int error; + + error = pstream_open(pstream, &conn->u.pconn.pstream, DSCP_DEFAULT); + if (error) { + VLOG_WARN("%s: open failed (%s)", pstream, ovs_strerror(error)); + } else { + conn->type = PASSIVE; + } + } + + if (stream) { + int error; + struct stream *active_stream; + struct reconnect *reconnect;; + + reconnect = reconnect_create(time_msec()); + reconnect_set_name(reconnect, stream); + reconnect_set_passive(reconnect, false, time_msec()); + reconnect_enable(reconnect, time_msec()); + reconnect_set_backoff(reconnect, 100, INT_MAX); + reconnect_set_probe_interval(reconnect, 0); + conn->u.rconn.reconnect = reconnect; + conn->type = ACTIVE; + + error = stream_open(stream, &active_stream, DSCP_DEFAULT); + conn->u.rconn.rstream = dummy_packet_stream_create(active_stream); + + switch (error) { + case 0: + reconnect_connected(reconnect, time_msec()); + break; + + case EAGAIN: + reconnect_connecting(reconnect, time_msec()); + break; + + default: + reconnect_connect_failed(reconnect, time_msec(), error); + stream_close(active_stream); + conn->u.rconn.rstream->stream = NULL; + break; + } + } +} + +static void +dummy_pconn_run(struct netdev_dummy *dev) + OVS_REQUIRES(dev->mutex) +{ + struct stream *new_stream; + struct dummy_packet_pconn *pconn = &dev->conn.u.pconn; + int error; + size_t i; + + error = pstream_accept(pconn->pstream, &new_stream); + if (!error) { + struct dummy_packet_stream *s; + + pconn->streams = xrealloc(pconn->streams, + ((pconn->n_streams + 1) + * sizeof *s)); + s = &pconn->streams[pconn->n_streams++]; + dummy_packet_stream_init(s, new_stream); + } else if (error != EAGAIN) { + VLOG_WARN("%s: accept failed (%s)", + pstream_get_name(pconn->pstream), ovs_strerror(error)); + pstream_close(pconn->pstream); + pconn->pstream = NULL; + dev->conn.type = NONE; + } + + for (i = 0; i < pconn->n_streams; i++) { + struct dummy_packet_stream *s = &pconn->streams[i]; + + error = dummy_packet_stream_run(dev, s); + if (error) { + VLOG_DBG("%s: closing connection (%s)", + stream_get_name(s->stream), + ovs_retval_to_string(error)); + dummy_packet_stream_close(s); + pconn->streams[i] = pconn->streams[--pconn->n_streams]; + } + } +} + +static void +dummy_rconn_run(struct netdev_dummy *dev) +OVS_REQUIRES(dev->mutex) +{ + struct dummy_packet_rconn *rconn = &dev->conn.u.rconn; + + switch (reconnect_run(rconn->reconnect, time_msec())) { + case RECONNECT_CONNECT: + { + int error; + + if (rconn->rstream->stream) { + error = stream_connect(rconn->rstream->stream); + } else { + error = stream_open(reconnect_get_name(rconn->reconnect), + &rconn->rstream->stream, DSCP_DEFAULT); + } + + switch (error) { + case 0: + reconnect_connected(rconn->reconnect, time_msec()); + break; + + case EAGAIN: + reconnect_connecting(rconn->reconnect, time_msec()); + break; + + default: + reconnect_connect_failed(rconn->reconnect, time_msec(), error); + stream_close(rconn->rstream->stream); + rconn->rstream->stream = NULL; + break; + } + } + break; + + case RECONNECT_DISCONNECT: + case RECONNECT_PROBE: + default: + break; + } + + if (reconnect_is_connected(rconn->reconnect)) { + int err; + + err = dummy_packet_stream_run(dev, rconn->rstream); + + if (err) { + reconnect_disconnected(rconn->reconnect, time_msec(), err); + stream_close(rconn->rstream->stream); + rconn->rstream->stream = NULL; + } + } +} + +static void +dummy_packet_conn_run(struct netdev_dummy *dev) + OVS_REQUIRES(dev->mutex) +{ + switch (dev->conn.type) { + case PASSIVE: + dummy_pconn_run(dev); + break; + + case ACTIVE: + dummy_rconn_run(dev); + break; + + case NONE: + default: + break; + } +} + +static void +dummy_packet_conn_wait(struct dummy_packet_conn *conn) +{ + int i; + switch (conn->type) { + case PASSIVE: + pstream_wait(conn->u.pconn.pstream); + for (i = 0; i < conn->u.pconn.n_streams; i++) { + struct dummy_packet_stream *s = &conn->u.pconn.streams[i]; + dummy_packet_stream_wait(s); + } + break; + case ACTIVE: + if (reconnect_is_connected(conn->u.rconn.reconnect)) { + dummy_packet_stream_wait(conn->u.rconn.rstream); + } + break; + + case NONE: + default: + break; + } +} + +static void +dummy_packet_conn_send(struct dummy_packet_conn *conn, + const void *buffer, size_t size) +{ + int i; + + switch (conn->type) { + case PASSIVE: + for (i = 0; i < conn->u.pconn.n_streams; i++) { + struct dummy_packet_stream *s = &conn->u.pconn.streams[i]; + + dummy_packet_stream_send(s, buffer, size); + pstream_wait(conn->u.pconn.pstream); + } + break; + + case ACTIVE: + if (reconnect_is_connected(conn->u.rconn.reconnect)) { + dummy_packet_stream_send(conn->u.rconn.rstream, buffer, size); + dummy_packet_stream_wait(conn->u.rconn.rstream); + } + break; + + case NONE: + default: + break; + } } static void -netdev_dummy_destroy(struct netdev_dev *netdev_dev_) +netdev_dummy_run(void) { - struct netdev_dev_dummy *netdev_dev = netdev_dev_dummy_cast(netdev_dev_); + struct netdev_dummy *dev; - shash_find_and_delete(&dummy_netdev_devs, - netdev_dev_get_name(netdev_dev_)); - free(netdev_dev); + ovs_mutex_lock(&dummy_list_mutex); + LIST_FOR_EACH (dev, list_node, &dummy_list) { + ovs_mutex_lock(&dev->mutex); + dummy_packet_conn_run(dev); + ovs_mutex_unlock(&dev->mutex); + } + ovs_mutex_unlock(&dummy_list_mutex); +} + +static void +netdev_dummy_wait(void) +{ + struct netdev_dummy *dev; + + ovs_mutex_lock(&dummy_list_mutex); + LIST_FOR_EACH (dev, list_node, &dummy_list) { + ovs_mutex_lock(&dev->mutex); + dummy_packet_conn_wait(&dev->conn); + ovs_mutex_unlock(&dev->mutex); + } + ovs_mutex_unlock(&dummy_list_mutex); +} + +static struct netdev * +netdev_dummy_alloc(void) +{ + struct netdev_dummy *netdev = xzalloc(sizeof *netdev); + return &netdev->up; } static int -netdev_dummy_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp) +netdev_dummy_construct(struct netdev *netdev_) { - struct netdev_dev_dummy *netdev_dev = netdev_dev_dummy_cast(netdev_dev_); - struct netdev_dummy *netdev; + static atomic_uint next_n = ATOMIC_VAR_INIT(0xaa550000); + struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); + unsigned int n; - netdev = xmalloc(sizeof *netdev); - netdev_init(&netdev->netdev, netdev_dev_); - list_init(&netdev->recv_queue); - netdev->listening = false; + atomic_add(&next_n, 1, &n); + + ovs_mutex_init(&netdev->mutex); + ovs_mutex_lock(&netdev->mutex); + netdev->hwaddr[0] = 0xaa; + netdev->hwaddr[1] = 0x55; + netdev->hwaddr[2] = n >> 24; + netdev->hwaddr[3] = n >> 16; + netdev->hwaddr[4] = n >> 8; + netdev->hwaddr[5] = n; + netdev->mtu = 1500; + netdev->flags = 0; + netdev->ifindex = -EOPNOTSUPP; + + dummy_packet_conn_init(&netdev->conn); + + list_init(&netdev->rxes); + ovs_mutex_unlock(&netdev->mutex); + + ovs_mutex_lock(&dummy_list_mutex); + list_push_back(&dummy_list, &netdev->list_node); + ovs_mutex_unlock(&dummy_list_mutex); - *netdevp = &netdev->netdev; - list_push_back(&netdev_dev->devs, &netdev->node); return 0; } static void -netdev_dummy_close(struct netdev *netdev_) +netdev_dummy_destruct(struct netdev *netdev_) +{ + struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); + + ovs_mutex_lock(&dummy_list_mutex); + list_remove(&netdev->list_node); + ovs_mutex_unlock(&dummy_list_mutex); + + ovs_mutex_lock(&netdev->mutex); + dummy_packet_conn_close(&netdev->conn); + netdev->conn.type = NONE; + + ovs_mutex_unlock(&netdev->mutex); + ovs_mutex_destroy(&netdev->mutex); +} + +static void +netdev_dummy_dealloc(struct netdev *netdev_) { struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); - list_remove(&netdev->node); - ofpbuf_list_delete(&netdev->recv_queue); + free(netdev); } static int -netdev_dummy_listen(struct netdev *netdev_) +netdev_dummy_get_config(const struct netdev *netdev_, struct smap *args) { struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); - netdev->listening = true; + + ovs_mutex_lock(&netdev->mutex); + + if (netdev->ifindex >= 0) { + smap_add_format(args, "ifindex", "%d", netdev->ifindex); + } + + dummy_packet_conn_get_config(&netdev->conn, args); + + ovs_mutex_unlock(&netdev->mutex); return 0; } static int -netdev_dummy_recv(struct netdev *netdev_, void *buffer, size_t size) +netdev_dummy_set_config(struct netdev *netdev_, const struct smap *args) { struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); - struct ofpbuf *packet; - size_t packet_size; + const char *pcap; + + ovs_mutex_lock(&netdev->mutex); + netdev->ifindex = smap_get_int(args, "ifindex", -EOPNOTSUPP); + + dummy_packet_conn_set_config(&netdev->conn, args); - if (list_is_empty(&netdev->recv_queue)) { - return -EAGAIN; + if (netdev->rxq_pcap) { + fclose(netdev->rxq_pcap); } + if (netdev->tx_pcap && netdev->tx_pcap != netdev->rxq_pcap) { + fclose(netdev->tx_pcap); + } + netdev->rxq_pcap = netdev->tx_pcap = NULL; + pcap = smap_get(args, "pcap"); + if (pcap) { + netdev->rxq_pcap = netdev->tx_pcap = ovs_pcap_open(pcap, "ab"); + } else { + const char *rxq_pcap = smap_get(args, "rxq_pcap"); + const char *tx_pcap = smap_get(args, "tx_pcap"); - packet = ofpbuf_from_list(list_pop_front(&netdev->recv_queue)); - if (packet->size > size) { - return -EMSGSIZE; + if (rxq_pcap) { + netdev->rxq_pcap = ovs_pcap_open(rxq_pcap, "ab"); + } + if (tx_pcap) { + netdev->tx_pcap = ovs_pcap_open(tx_pcap, "ab"); + } } - packet_size = packet->size; - memcpy(buffer, packet->data, packet->size); - ofpbuf_delete(packet); + ovs_mutex_unlock(&netdev->mutex); - return packet_size; + return 0; +} + +static struct netdev_rxq * +netdev_dummy_rxq_alloc(void) +{ + struct netdev_rxq_dummy *rx = xzalloc(sizeof *rx); + return &rx->up; +} + +static int +netdev_dummy_rxq_construct(struct netdev_rxq *rxq_) +{ + struct netdev_rxq_dummy *rx = netdev_rxq_dummy_cast(rxq_); + struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev); + + ovs_mutex_lock(&netdev->mutex); + list_push_back(&netdev->rxes, &rx->node); + list_init(&rx->recv_queue); + rx->recv_queue_len = 0; + rx->seq = seq_create(); + ovs_mutex_unlock(&netdev->mutex); + + return 0; } static void -netdev_dummy_recv_wait(struct netdev *netdev_) +netdev_dummy_rxq_destruct(struct netdev_rxq *rxq_) { - struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); - if (!list_is_empty(&netdev->recv_queue)) { + struct netdev_rxq_dummy *rx = netdev_rxq_dummy_cast(rxq_); + struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev); + + ovs_mutex_lock(&netdev->mutex); + list_remove(&rx->node); + ofpbuf_list_delete(&rx->recv_queue); + ovs_mutex_unlock(&netdev->mutex); + seq_destroy(rx->seq); +} + +static void +netdev_dummy_rxq_dealloc(struct netdev_rxq *rxq_) +{ + struct netdev_rxq_dummy *rx = netdev_rxq_dummy_cast(rxq_); + + free(rx); +} + +static int +netdev_dummy_rxq_recv(struct netdev_rxq *rxq_, struct ofpbuf **arr, int *c) +{ + struct netdev_rxq_dummy *rx = netdev_rxq_dummy_cast(rxq_); + struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev); + struct ofpbuf *packet; + + ovs_mutex_lock(&netdev->mutex); + if (!list_is_empty(&rx->recv_queue)) { + packet = ofpbuf_from_list(list_pop_front(&rx->recv_queue)); + rx->recv_queue_len--; + } else { + packet = NULL; + } + ovs_mutex_unlock(&netdev->mutex); + + if (!packet) { + return EAGAIN; + } + ovs_mutex_lock(&netdev->mutex); + netdev->stats.rx_packets++; + netdev->stats.rx_bytes += ofpbuf_size(packet); + ovs_mutex_unlock(&netdev->mutex); + + dp_packet_pad(packet); + arr[0] = packet; + *c = 1; + return 0; +} + +static void +netdev_dummy_rxq_wait(struct netdev_rxq *rxq_) +{ + struct netdev_rxq_dummy *rx = netdev_rxq_dummy_cast(rxq_); + struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev); + uint64_t seq = seq_read(rx->seq); + + ovs_mutex_lock(&netdev->mutex); + if (!list_is_empty(&rx->recv_queue)) { poll_immediate_wake(); + } else { + seq_wait(rx->seq, seq); } + ovs_mutex_unlock(&netdev->mutex); } static int -netdev_dummy_drain(struct netdev *netdev_) +netdev_dummy_rxq_drain(struct netdev_rxq *rxq_) { - struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); - ofpbuf_list_delete(&netdev->recv_queue); + struct netdev_rxq_dummy *rx = netdev_rxq_dummy_cast(rxq_); + struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev); + + ovs_mutex_lock(&netdev->mutex); + ofpbuf_list_delete(&rx->recv_queue); + rx->recv_queue_len = 0; + ovs_mutex_unlock(&netdev->mutex); + + seq_change(rx->seq); + return 0; } static int -netdev_dummy_send(struct netdev *netdev, const void *buffer OVS_UNUSED, - size_t size) +netdev_dummy_send(struct netdev *netdev, struct ofpbuf *pkt, bool may_steal) { - struct netdev_dev_dummy *dev = - netdev_dev_dummy_cast(netdev_get_dev(netdev)); + struct netdev_dummy *dev = netdev_dummy_cast(netdev); + const void *buffer = ofpbuf_data(pkt); + size_t size = ofpbuf_size(pkt); + + if (size < ETH_HEADER_LEN) { + return EMSGSIZE; + } else { + const struct eth_header *eth = buffer; + int max_size; + ovs_mutex_lock(&dev->mutex); + max_size = dev->mtu + ETH_HEADER_LEN; + ovs_mutex_unlock(&dev->mutex); + + if (eth->eth_type == htons(ETH_TYPE_VLAN)) { + max_size += VLAN_HEADER_LEN; + } + if (size > max_size) { + return EMSGSIZE; + } + } + + ovs_mutex_lock(&dev->mutex); dev->stats.tx_packets++; dev->stats.tx_bytes += size; + dummy_packet_conn_send(&dev->conn, buffer, size); + + if (dev->tx_pcap) { + struct ofpbuf packet; + + ofpbuf_use_const(&packet, buffer, size); + ovs_pcap_write(dev->tx_pcap, &packet); + fflush(dev->tx_pcap); + } + + ovs_mutex_unlock(&dev->mutex); + if (may_steal) { + ofpbuf_delete(pkt); + } + return 0; } @@ -221,13 +866,14 @@ static int netdev_dummy_set_etheraddr(struct netdev *netdev, const uint8_t mac[ETH_ADDR_LEN]) { - struct netdev_dev_dummy *dev = - netdev_dev_dummy_cast(netdev_get_dev(netdev)); + struct netdev_dummy *dev = netdev_dummy_cast(netdev); + ovs_mutex_lock(&dev->mutex); if (!eth_addr_equals(dev->hwaddr, mac)) { memcpy(dev->hwaddr, mac, ETH_ADDR_LEN); - netdev_dev_dummy_poll_notify(dev); + netdev_change_seq_changed(netdev); } + ovs_mutex_unlock(&dev->mutex); return 0; } @@ -236,119 +882,127 @@ static int netdev_dummy_get_etheraddr(const struct netdev *netdev, uint8_t mac[ETH_ADDR_LEN]) { - const struct netdev_dev_dummy *dev = - netdev_dev_dummy_cast(netdev_get_dev(netdev)); + struct netdev_dummy *dev = netdev_dummy_cast(netdev); + ovs_mutex_lock(&dev->mutex); memcpy(mac, dev->hwaddr, ETH_ADDR_LEN); + ovs_mutex_unlock(&dev->mutex); + return 0; } static int netdev_dummy_get_mtu(const struct netdev *netdev, int *mtup) { - const struct netdev_dev_dummy *dev = - netdev_dev_dummy_cast(netdev_get_dev(netdev)); + struct netdev_dummy *dev = netdev_dummy_cast(netdev); + ovs_mutex_lock(&dev->mutex); *mtup = dev->mtu; + ovs_mutex_unlock(&dev->mutex); + return 0; } static int netdev_dummy_set_mtu(const struct netdev *netdev, int mtu) { - struct netdev_dev_dummy *dev = - netdev_dev_dummy_cast(netdev_get_dev(netdev)); + struct netdev_dummy *dev = netdev_dummy_cast(netdev); + ovs_mutex_lock(&dev->mutex); dev->mtu = mtu; + ovs_mutex_unlock(&dev->mutex); + return 0; } static int netdev_dummy_get_stats(const struct netdev *netdev, struct netdev_stats *stats) { - const struct netdev_dev_dummy *dev = - netdev_dev_dummy_cast(netdev_get_dev(netdev)); + struct netdev_dummy *dev = netdev_dummy_cast(netdev); + ovs_mutex_lock(&dev->mutex); *stats = dev->stats; + ovs_mutex_unlock(&dev->mutex); + return 0; } static int netdev_dummy_set_stats(struct netdev *netdev, const struct netdev_stats *stats) { - struct netdev_dev_dummy *dev = - netdev_dev_dummy_cast(netdev_get_dev(netdev)); + struct netdev_dummy *dev = netdev_dummy_cast(netdev); + ovs_mutex_lock(&dev->mutex); dev->stats = *stats; + ovs_mutex_unlock(&dev->mutex); + return 0; } static int -netdev_dummy_update_flags(struct netdev *netdev, - enum netdev_flags off, enum netdev_flags on, - enum netdev_flags *old_flagsp) +netdev_dummy_get_ifindex(const struct netdev *netdev) { - struct netdev_dev_dummy *dev = - netdev_dev_dummy_cast(netdev_get_dev(netdev)); + struct netdev_dummy *dev = netdev_dummy_cast(netdev); + int ifindex; - return netdev_dev_dummy_update_flags(dev, off, on, old_flagsp); + ovs_mutex_lock(&dev->mutex); + ifindex = dev->ifindex; + ovs_mutex_unlock(&dev->mutex); + + return ifindex; } static int -netdev_dev_dummy_update_flags(struct netdev_dev_dummy *dev, - enum netdev_flags off, enum netdev_flags on, - enum netdev_flags *old_flagsp) +netdev_dummy_update_flags__(struct netdev_dummy *netdev, + enum netdev_flags off, enum netdev_flags on, + enum netdev_flags *old_flagsp) + OVS_REQUIRES(netdev->mutex) { if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) { return EINVAL; } - *old_flagsp = dev->flags; - dev->flags |= on; - dev->flags &= ~off; - if (*old_flagsp != dev->flags) { - netdev_dev_dummy_poll_notify(dev); + *old_flagsp = netdev->flags; + netdev->flags |= on; + netdev->flags &= ~off; + if (*old_flagsp != netdev->flags) { + netdev_change_seq_changed(&netdev->up); } + return 0; } -static unsigned int -netdev_dummy_change_seq(const struct netdev *netdev) +static int +netdev_dummy_update_flags(struct netdev *netdev_, + enum netdev_flags off, enum netdev_flags on, + enum netdev_flags *old_flagsp) { - return netdev_dev_dummy_cast(netdev_get_dev(netdev))->change_seq; + struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); + int error; + + ovs_mutex_lock(&netdev->mutex); + error = netdev_dummy_update_flags__(netdev, off, on, old_flagsp); + ovs_mutex_unlock(&netdev->mutex); + + return error; } /* Helper functions. */ -static void -netdev_dev_dummy_poll_notify(struct netdev_dev_dummy *dev) -{ - dev->change_seq++; - if (!dev->change_seq) { - dev->change_seq++; - } -} - static const struct netdev_class dummy_class = { "dummy", NULL, /* init */ - NULL, /* run */ - NULL, /* wait */ - - netdev_dummy_create, - netdev_dummy_destroy, - NULL, /* get_config */ - NULL, /* set_config */ + netdev_dummy_run, + netdev_dummy_wait, + + netdev_dummy_alloc, + netdev_dummy_construct, + netdev_dummy_destruct, + netdev_dummy_dealloc, + netdev_dummy_get_config, + netdev_dummy_set_config, NULL, /* get_tunnel_config */ - netdev_dummy_open, - netdev_dummy_close, - - netdev_dummy_listen, - netdev_dummy_recv, - netdev_dummy_recv_wait, - netdev_dummy_drain, - netdev_dummy_send, /* send */ NULL, /* send_wait */ @@ -356,7 +1010,7 @@ static const struct netdev_class dummy_class = { netdev_dummy_get_etheraddr, netdev_dummy_get_mtu, netdev_dummy_set_mtu, - NULL, /* get_ifindex */ + netdev_dummy_get_ifindex, NULL, /* get_carrier */ NULL, /* get_carrier_resets */ NULL, /* get_miimon */ @@ -375,7 +1029,9 @@ static const struct netdev_class dummy_class = { NULL, /* set_queue */ NULL, /* delete_queue */ NULL, /* get_queue_stats */ - NULL, /* dump_queues */ + NULL, /* queue_dump_start */ + NULL, /* queue_dump_next */ + NULL, /* queue_dump_done */ NULL, /* dump_queue_stats */ NULL, /* get_in4 */ @@ -388,7 +1044,13 @@ static const struct netdev_class dummy_class = { netdev_dummy_update_flags, - netdev_dummy_change_seq + netdev_dummy_rxq_alloc, + netdev_dummy_rxq_construct, + netdev_dummy_rxq_destruct, + netdev_dummy_rxq_dealloc, + netdev_dummy_rxq_recv, + netdev_dummy_rxq_wait, + netdev_dummy_rxq_drain, }; static struct ofpbuf * @@ -411,14 +1073,14 @@ eth_from_packet_or_flow(const char *s) * settle for parsing a datapath key for now. */ ofpbuf_init(&odp_key, 0); - error = odp_flow_key_from_string(s, NULL, &odp_key); + error = odp_flow_from_string(s, NULL, &odp_key, NULL); if (error) { ofpbuf_uninit(&odp_key); return NULL; } /* Convert odp_key to flow. */ - fitness = odp_flow_key_to_flow(odp_key.data, odp_key.size, &flow); + fitness = odp_flow_key_to_flow(ofpbuf_data(&odp_key), ofpbuf_size(&odp_key), &flow); if (fitness == ODP_FIT_ERROR) { ofpbuf_uninit(&odp_key); return NULL; @@ -431,62 +1093,85 @@ eth_from_packet_or_flow(const char *s) return packet; } +static void +netdev_dummy_queue_packet__(struct netdev_rxq_dummy *rx, struct ofpbuf *packet) +{ + list_push_back(&rx->recv_queue, &packet->list_node); + rx->recv_queue_len++; + seq_change(rx->seq); +} + +static void +netdev_dummy_queue_packet(struct netdev_dummy *dummy, struct ofpbuf *packet) + OVS_REQUIRES(dummy->mutex) +{ + struct netdev_rxq_dummy *rx, *prev; + + if (dummy->rxq_pcap) { + ovs_pcap_write(dummy->rxq_pcap, packet); + fflush(dummy->rxq_pcap); + } + prev = NULL; + LIST_FOR_EACH (rx, node, &dummy->rxes) { + if (rx->recv_queue_len < NETDEV_DUMMY_MAX_QUEUE) { + if (prev) { + netdev_dummy_queue_packet__(prev, ofpbuf_clone(packet)); + } + prev = rx; + } + } + if (prev) { + netdev_dummy_queue_packet__(prev, packet); + } else { + ofpbuf_delete(packet); + } +} + static void netdev_dummy_receive(struct unixctl_conn *conn, int argc, const char *argv[], void *aux OVS_UNUSED) { - struct netdev_dev_dummy *dummy_dev; - int n_listeners; + struct netdev_dummy *dummy_dev; + struct netdev *netdev; int i; - dummy_dev = shash_find_data(&dummy_netdev_devs, argv[1]); - if (!dummy_dev) { + netdev = netdev_from_name(argv[1]); + if (!netdev || !is_dummy_class(netdev->netdev_class)) { unixctl_command_reply_error(conn, "no such dummy netdev"); - return; + goto exit; } + dummy_dev = netdev_dummy_cast(netdev); - n_listeners = 0; for (i = 2; i < argc; i++) { - struct netdev_dummy *dev; struct ofpbuf *packet; packet = eth_from_packet_or_flow(argv[i]); if (!packet) { unixctl_command_reply_error(conn, "bad packet syntax"); - return; + goto exit; } - dummy_dev->stats.rx_packets++; - dummy_dev->stats.rx_bytes += packet->size; - - n_listeners = 0; - LIST_FOR_EACH (dev, node, &dummy_dev->devs) { - if (dev->listening) { - struct ofpbuf *copy = ofpbuf_clone(packet); - list_push_back(&dev->recv_queue, ©->list_node); - n_listeners++; - } - } - ofpbuf_delete(packet); + ovs_mutex_lock(&dummy_dev->mutex); + netdev_dummy_queue_packet(dummy_dev, packet); + ovs_mutex_unlock(&dummy_dev->mutex); } - if (!n_listeners) { - unixctl_command_reply(conn, "packets queued but nobody listened"); - } else { - unixctl_command_reply(conn, "success"); - } + unixctl_command_reply(conn, NULL); + +exit: + netdev_close(netdev); } static void -netdev_dev_dummy_set_admin_state(struct netdev_dev_dummy *dev, - bool admin_state) +netdev_dummy_set_admin_state__(struct netdev_dummy *dev, bool admin_state) + OVS_REQUIRES(dev->mutex) { enum netdev_flags old_flags; if (admin_state) { - netdev_dev_dummy_update_flags(dev, 0, NETDEV_UP, &old_flags); + netdev_dummy_update_flags__(dev, 0, NETDEV_UP, &old_flags); } else { - netdev_dev_dummy_update_flags(dev, NETDEV_UP, 0, &old_flags); + netdev_dummy_update_flags__(dev, NETDEV_UP, 0, &old_flags); } } @@ -506,21 +1191,30 @@ netdev_dummy_set_admin_state(struct unixctl_conn *conn, int argc, } if (argc > 2) { - struct netdev_dev_dummy *dummy_dev; + struct netdev *netdev = netdev_from_name(argv[1]); + if (netdev && is_dummy_class(netdev->netdev_class)) { + struct netdev_dummy *dummy_dev = netdev_dummy_cast(netdev); + + ovs_mutex_lock(&dummy_dev->mutex); + netdev_dummy_set_admin_state__(dummy_dev, up); + ovs_mutex_unlock(&dummy_dev->mutex); - dummy_dev = shash_find_data(&dummy_netdev_devs, argv[1]); - if (dummy_dev) { - netdev_dev_dummy_set_admin_state(dummy_dev, up); + netdev_close(netdev); } else { unixctl_command_reply_error(conn, "Unknown Dummy Interface"); + netdev_close(netdev); return; } } else { - struct shash_node *node; + struct netdev_dummy *netdev; - SHASH_FOR_EACH (node, &dummy_netdev_devs) { - netdev_dev_dummy_set_admin_state(node->data, up); + ovs_mutex_lock(&dummy_list_mutex); + LIST_FOR_EACH (netdev, list_node, &dummy_list) { + ovs_mutex_lock(&netdev->mutex); + netdev_dummy_set_admin_state__(netdev, up); + ovs_mutex_unlock(&netdev->mutex); } + ovs_mutex_unlock(&dummy_list_mutex); } unixctl_command_reply(conn, "OK"); } @@ -541,20 +1235,27 @@ netdev_dummy_register(bool override) sset_init(&types); netdev_enumerate_types(&types); SSET_FOR_EACH (type, &types) { + if (!strcmp(type, "patch")) { + continue; + } if (!netdev_unregister_provider(type)) { struct netdev_class *class; + int error; - class = xmalloc(sizeof *class); - *class = dummy_class; + class = xmemdup(&dummy_class, sizeof dummy_class); class->type = xstrdup(type); - netdev_register_provider(class); + error = netdev_register_provider(class); + if (error) { + VLOG_ERR("%s: failed to register netdev provider (%s)", + type, ovs_strerror(error)); + free(CONST_CAST(char *, class->type)); + free(class); + } } } sset_destroy(&types); } netdev_register_provider(&dummy_class); - if (FREE_BSD) { - netdev_vport_tunnel_register(); - } + netdev_vport_tunnel_register(); }