X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-dummy.c;h=f23fc9fd33f25f8093e661b25a13411bff5e8bfb;hb=db19b72b9f6d0d40b743214241d9666116e3b448;hp=7c43f125c026136d597cc38b722b29a6007c7885;hpb=863838160e892f625a050e0234ed638af26f106d;p=sliver-openvswitch.git diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 7c43f125c..f23fc9fd3 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -20,6 +20,7 @@ #include +#include "connectivity.h" #include "flow.h" #include "list.h" #include "netdev-provider.h" @@ -28,43 +29,81 @@ #include "ofp-print.h" #include "ofpbuf.h" #include "packets.h" +#include "pcap-file.h" #include "poll-loop.h" +#include "seq.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); -struct dummy_stream { +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 up; + /* In dummy_list. */ + struct list list_node OVS_GUARDED_BY(dummy_list_mutex); + /* Protects all members below. */ - struct ovs_mutex mutex; + struct ovs_mutex mutex OVS_ACQ_AFTER(dummy_list_mutex); - uint8_t hwaddr[ETH_ADDR_LEN]; - int mtu; - struct netdev_stats stats; - enum netdev_flags flags; - unsigned int change_seq; - int ifindex; + 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 pstream *pstream; - struct dummy_stream *streams; - size_t n_streams; + struct dummy_packet_conn conn OVS_GUARDED; - struct list rxes; /* List of child "netdev_rx_dummy"s. */ -}; + FILE *tx_pcap, *rx_pcap OVS_GUARDED; -static const struct netdev_class dummy_class; + struct list rxes OVS_GUARDED; /* List of child "netdev_rx_dummy"s. */ +}; /* Max 'recv_queue_len' in struct netdev_dummy. */ #define NETDEV_DUMMY_MAX_QUEUE 100 @@ -74,16 +113,14 @@ struct netdev_rx_dummy { struct list node; /* In netdev_dummy's "rxes" list. */ struct list recv_queue; int recv_queue_len; /* list_size(&recv_queue). */ - bool listening; + struct seq *seq; /* Reports newly queued packets. */ }; static unixctl_cb_func netdev_dummy_set_admin_state; static int netdev_dummy_construct(struct netdev *); -static void netdev_dummy_poll_notify(struct netdev_dummy *netdev) - OVS_REQUIRES(netdev->mutex); static void netdev_dummy_queue_packet(struct netdev_dummy *, struct ofpbuf *); -static void dummy_stream_close(struct dummy_stream *); +static void dummy_packet_stream_close(struct dummy_packet_stream *); static bool is_dummy_class(const struct netdev_class *class) @@ -106,118 +143,114 @@ netdev_rx_dummy_cast(const struct netdev_rx *rx) } static void -netdev_dummy_run(void) +dummy_packet_stream_init(struct dummy_packet_stream *s, struct stream *stream) { - struct shash dummy_netdevs; - struct shash_node *node; + int rxbuf_size = stream ? 2048 : 0; + s->stream = stream; + ofpbuf_init(&s->rxbuf, rxbuf_size); + list_init(&s->txq); +} - shash_init(&dummy_netdevs); - netdev_get_devices(&dummy_class, &dummy_netdevs); - SHASH_FOR_EACH (node, &dummy_netdevs) { - struct netdev_dummy *dev = node->data; - size_t i; +static struct dummy_packet_stream * +dummy_packet_stream_create(struct stream *stream) +{ + struct dummy_packet_stream *s; - ovs_mutex_lock(&dev->mutex); + s = xzalloc(sizeof *s); + dummy_packet_stream_init(s, stream); - if (dev->pstream) { - struct stream *new_stream; - int error; + return s; +} - error = pstream_accept(dev->pstream, &new_stream); - if (!error) { - struct dummy_stream *s; - - dev->streams = xrealloc(dev->streams, - ((dev->n_streams + 1) - * sizeof *dev->streams)); - s = &dev->streams[dev->n_streams++]; - s->stream = new_stream; - ofpbuf_init(&s->rxbuf, 2048); - list_init(&s->txq); - } else if (error != EAGAIN) { - VLOG_WARN("%s: accept failed (%s)", - pstream_get_name(dev->pstream), ovs_strerror(error)); - pstream_close(dev->pstream); - dev->pstream = NULL; - } - } +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); +} - for (i = 0; i < dev->n_streams; i++) { - struct dummy_stream *s = &dev->streams[i]; - int error = 0; - size_t n; - - stream_run(s->stream); - - if (!list_is_empty(&s->txq)) { - struct ofpbuf *txbuf; - int retval; - - txbuf = ofpbuf_from_list(list_front(&s->txq)); - retval = stream_send(s->stream, txbuf->data, txbuf->size); - if (retval > 0) { - ofpbuf_pull(txbuf, retval); - if (!txbuf->size) { - list_remove(&txbuf->list_node); - ofpbuf_delete(txbuf); - } - } else if (retval != -EAGAIN) { - error = -retval; - } - } +static void +dummy_packet_stream_send(struct dummy_packet_stream *s, const void *buffer, size_t size) +{ + if (list_size(&s->txq) < NETDEV_DUMMY_MAX_QUEUE) { + struct ofpbuf *b; - if (!error) { - if (s->rxbuf.size < 2) { - n = 2 - s->rxbuf.size; - } else { - uint16_t frame_len; - - frame_len = ntohs(get_unaligned_be16(s->rxbuf.data)); - if (frame_len < ETH_HEADER_LEN) { - error = EPROTO; - n = 0; - } else { - n = (2 + frame_len) - s->rxbuf.size; - } - } - } - if (!error) { - int retval; - - ofpbuf_prealloc_tailroom(&s->rxbuf, n); - retval = stream_recv(s->stream, ofpbuf_tail(&s->rxbuf), n); - if (retval > 0) { - s->rxbuf.size += retval; - if (retval == n && s->rxbuf.size > 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 - : s->rxbuf.size ? EPROTO - : EOF); - } - } + 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); + } +} - if (error) { - VLOG_DBG("%s: closing connection (%s)", - stream_get_name(s->stream), - ovs_retval_to_string(error)); - dummy_stream_close(&dev->streams[i]); - dev->streams[i] = dev->streams[--dev->n_streams]; +static int +dummy_packet_stream_run(struct netdev_dummy *dev, struct dummy_packet_stream *s) +{ + int error = 0; + size_t n; + + stream_run(s->stream); + + if (!list_is_empty(&s->txq)) { + struct ofpbuf *txbuf; + int retval; + + txbuf = ofpbuf_from_list(list_front(&s->txq)); + retval = stream_send(s->stream, txbuf->data, txbuf->size); + + if (retval > 0) { + ofpbuf_pull(txbuf, retval); + if (!txbuf->size) { + list_remove(&txbuf->list_node); + ofpbuf_delete(txbuf); } + } else if (retval != -EAGAIN) { + error = -retval; } + } - ovs_mutex_unlock(&dev->mutex); - netdev_close(&dev->up); + if (!error) { + if (s->rxbuf.size < 2) { + n = 2 - s->rxbuf.size; + } else { + uint16_t frame_len; + + frame_len = ntohs(get_unaligned_be16(s->rxbuf.data)); + if (frame_len < ETH_HEADER_LEN) { + error = EPROTO; + n = 0; + } else { + n = (2 + frame_len) - s->rxbuf.size; + } + } } - shash_destroy(&dummy_netdevs); + if (!error) { + int retval; + + ofpbuf_prealloc_tailroom(&s->rxbuf, n); + retval = stream_recv(s->stream, ofpbuf_tail(&s->rxbuf), n); + + if (retval > 0) { + s->rxbuf.size += retval; + if (retval == n && s->rxbuf.size > 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 + : s->rxbuf.size ? EPROTO + : EOF); + } + } + + return error; } static void -dummy_stream_close(struct dummy_stream *s) +dummy_packet_stream_close(struct dummy_packet_stream *s) { stream_close(s->stream); ofpbuf_uninit(&s->rxbuf); @@ -225,34 +258,336 @@ dummy_stream_close(struct dummy_stream *s) } static void -netdev_dummy_wait(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) { - struct shash dummy_netdevs; - struct shash_node *node; - shash_init(&dummy_netdevs); - netdev_get_devices(&dummy_class, &dummy_netdevs); - SHASH_FOR_EACH (node, &dummy_netdevs) { - struct netdev_dummy *dev = node->data; - size_t i; + switch (conn->type) { + case PASSIVE: + smap_add(args, "pstream", pstream_get_name(conn->u.pconn.pstream)); + break; - ovs_mutex_lock(&dev->mutex); - if (dev->pstream) { - pstream_wait(dev->pstream); + 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; } - for (i = 0; i < dev->n_streams; i++) { - struct dummy_stream *s = &dev->streams[i]; + 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; - stream_run_wait(s->stream); - if (!list_is_empty(&s->txq)) { - stream_send_wait(s->stream); + 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; } - stream_recv_wait(s->stream); } + 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_run(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_run(dev); ovs_mutex_unlock(&dev->mutex); - netdev_close(&dev->up); } - shash_destroy(&dummy_netdevs); + 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 * @@ -271,7 +606,8 @@ netdev_dummy_construct(struct netdev *netdev_) atomic_add(&next_n, 1, &n); - ovs_mutex_init(&netdev->mutex, PTHREAD_MUTEX_NORMAL); + ovs_mutex_init(&netdev->mutex); + ovs_mutex_lock(&netdev->mutex); netdev->hwaddr[0] = 0xaa; netdev->hwaddr[1] = 0x55; netdev->hwaddr[2] = n >> 24; @@ -280,14 +616,16 @@ netdev_dummy_construct(struct netdev *netdev_) netdev->hwaddr[5] = n; netdev->mtu = 1500; netdev->flags = 0; - netdev->change_seq = 1; netdev->ifindex = -EOPNOTSUPP; - netdev->pstream = NULL; - netdev->streams = NULL; - netdev->n_streams = 0; + 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); return 0; } @@ -296,13 +634,16 @@ static void netdev_dummy_destruct(struct netdev *netdev_) { struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); - size_t i; - pstream_close(netdev->pstream); - for (i = 0; i < netdev->n_streams; i++) { - dummy_stream_close(&netdev->streams[i]); - } - free(netdev->streams); + 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); } @@ -319,12 +660,15 @@ netdev_dummy_get_config(const struct netdev *netdev_, struct smap *args) { struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); + ovs_mutex_lock(&netdev->mutex); + if (netdev->ifindex >= 0) { smap_add_format(args, "ifindex", "%d", netdev->ifindex); } - if (netdev->pstream) { - smap_add(args, "pstream", pstream_get_name(netdev->pstream)); - } + + dummy_packet_conn_get_config(&netdev->conn, args); + + ovs_mutex_unlock(&netdev->mutex); return 0; } @@ -332,28 +676,35 @@ static int netdev_dummy_set_config(struct netdev *netdev_, const struct smap *args) { struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); - const char *pstream; + const char *pcap; ovs_mutex_lock(&netdev->mutex); netdev->ifindex = smap_get_int(args, "ifindex", -EOPNOTSUPP); - pstream = smap_get(args, "pstream"); - if (!pstream - || !netdev->pstream - || strcmp(pstream_get_name(netdev->pstream), pstream)) { - pstream_close(netdev->pstream); - netdev->pstream = NULL; + dummy_packet_conn_set_config(&netdev->conn, args); - if (pstream) { - int error; + if (netdev->rx_pcap) { + fclose(netdev->rx_pcap); + } + if (netdev->tx_pcap && netdev->tx_pcap != netdev->rx_pcap) { + fclose(netdev->tx_pcap); + } + netdev->rx_pcap = netdev->tx_pcap = NULL; + pcap = smap_get(args, "pcap"); + if (pcap) { + netdev->rx_pcap = netdev->tx_pcap = ovs_pcap_open(pcap, "ab"); + } else { + const char *rx_pcap = smap_get(args, "rx_pcap"); + const char *tx_pcap = smap_get(args, "tx_pcap"); - error = pstream_open(pstream, &netdev->pstream, DSCP_DEFAULT); - if (error) { - VLOG_WARN("%s: open failed (%s)", - pstream, ovs_strerror(error)); - } + if (rx_pcap) { + netdev->rx_pcap = ovs_pcap_open(rx_pcap, "ab"); + } + if (tx_pcap) { + netdev->tx_pcap = ovs_pcap_open(tx_pcap, "ab"); } } + ovs_mutex_unlock(&netdev->mutex); return 0; @@ -376,6 +727,7 @@ netdev_dummy_rx_construct(struct netdev_rx *rx_) 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; @@ -391,6 +743,7 @@ netdev_dummy_rx_destruct(struct netdev_rx *rx_) list_remove(&rx->node); ofpbuf_list_delete(&rx->recv_queue); ovs_mutex_unlock(&netdev->mutex); + seq_destroy(rx->seq); } static void @@ -402,7 +755,7 @@ netdev_dummy_rx_dealloc(struct netdev_rx *rx_) } static int -netdev_dummy_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size) +netdev_dummy_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer) { struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_); struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev); @@ -419,14 +772,20 @@ netdev_dummy_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size) ovs_mutex_unlock(&netdev->mutex); if (!packet) { - return -EAGAIN; + return EAGAIN; } - if (packet->size <= size) { - memcpy(buffer, packet->data, packet->size); - retval = packet->size; + if (packet->size <= ofpbuf_tailroom(buffer)) { + memcpy(buffer->data, packet->data, packet->size); + buffer->size += packet->size; + retval = 0; + + ovs_mutex_lock(&netdev->mutex); + netdev->stats.rx_packets++; + netdev->stats.rx_bytes += packet->size; + ovs_mutex_unlock(&netdev->mutex); } else { - retval = -EMSGSIZE; + retval = EMSGSIZE; } ofpbuf_delete(packet); @@ -438,10 +797,13 @@ netdev_dummy_rx_wait(struct netdev_rx *rx_) { struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_); 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); } @@ -457,6 +819,8 @@ netdev_dummy_rx_drain(struct netdev_rx *rx_) rx->recv_queue_len = 0; ovs_mutex_unlock(&netdev->mutex); + seq_change(rx->seq); + return 0; } @@ -464,7 +828,6 @@ static int netdev_dummy_send(struct netdev *netdev, const void *buffer, size_t size) { struct netdev_dummy *dev = netdev_dummy_cast(netdev); - size_t i; if (size < ETH_HEADER_LEN) { return EMSGSIZE; @@ -472,7 +835,10 @@ netdev_dummy_send(struct netdev *netdev, const void *buffer, size_t size) 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; } @@ -485,17 +851,16 @@ netdev_dummy_send(struct netdev *netdev, const void *buffer, size_t size) dev->stats.tx_packets++; dev->stats.tx_bytes += size; - for (i = 0; i < dev->n_streams; i++) { - struct dummy_stream *s = &dev->streams[i]; + dummy_packet_conn_send(&dev->conn, buffer, size); - if (list_size(&s->txq) < NETDEV_DUMMY_MAX_QUEUE) { - struct ofpbuf *b; + if (dev->tx_pcap) { + struct ofpbuf packet; - 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); - } + ofpbuf_use_const(&packet, buffer, size); + ovs_pcap_write(dev->tx_pcap, &packet); + fflush(dev->tx_pcap); } + ovs_mutex_unlock(&dev->mutex); return 0; @@ -510,7 +875,7 @@ netdev_dummy_set_etheraddr(struct netdev *netdev, ovs_mutex_lock(&dev->mutex); if (!eth_addr_equals(dev->hwaddr, mac)) { memcpy(dev->hwaddr, mac, ETH_ADDR_LEN); - netdev_dummy_poll_notify(dev); + seq_change(connectivity_seq_get()); } ovs_mutex_unlock(&dev->mutex); @@ -605,7 +970,7 @@ netdev_dummy_update_flags__(struct netdev_dummy *netdev, netdev->flags |= on; netdev->flags &= ~off; if (*old_flagsp != netdev->flags) { - netdev_dummy_poll_notify(netdev); + seq_change(connectivity_seq_get()); } return 0; @@ -625,31 +990,9 @@ netdev_dummy_update_flags(struct netdev *netdev_, return error; } - -static unsigned int -netdev_dummy_change_seq(const struct netdev *netdev_) -{ - struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); - unsigned int change_seq; - - ovs_mutex_lock(&netdev->mutex); - change_seq = netdev->change_seq; - ovs_mutex_unlock(&netdev->mutex); - - return change_seq; -} /* Helper functions. */ -static void -netdev_dummy_poll_notify(struct netdev_dummy *dev) -{ - dev->change_seq++; - if (!dev->change_seq) { - dev->change_seq++; - } -} - static const struct netdev_class dummy_class = { "dummy", NULL, /* init */ @@ -690,7 +1033,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 */ @@ -703,8 +1048,6 @@ static const struct netdev_class dummy_class = { netdev_dummy_update_flags, - netdev_dummy_change_seq, - netdev_dummy_rx_alloc, netdev_dummy_rx_construct, netdev_dummy_rx_destruct, @@ -759,13 +1102,19 @@ netdev_dummy_queue_packet__(struct netdev_rx_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_rx_dummy *rx, *prev; + if (dummy->rx_pcap) { + ovs_pcap_write(dummy->rx_pcap, packet); + fflush(dummy->rx_pcap); + } prev = NULL; LIST_FOR_EACH (rx, node, &dummy->rxes) { if (rx->recv_queue_len < NETDEV_DUMMY_MAX_QUEUE) { @@ -807,8 +1156,6 @@ netdev_dummy_receive(struct unixctl_conn *conn, } ovs_mutex_lock(&dummy_dev->mutex); - dummy_dev->stats.rx_packets++; - dummy_dev->stats.rx_bytes += packet->size; netdev_dummy_queue_packet(dummy_dev, packet); ovs_mutex_unlock(&dummy_dev->mutex); } @@ -863,22 +1210,15 @@ netdev_dummy_set_admin_state(struct unixctl_conn *conn, int argc, return; } } else { - struct shash dummy_netdevs; - struct shash_node *node; - - shash_init(&dummy_netdevs); - netdev_get_devices(&dummy_class, &dummy_netdevs); - SHASH_FOR_EACH (node, &dummy_netdevs) { - struct netdev *netdev_ = node->data; - struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); + struct netdev_dummy *netdev; + 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); - - netdev_close(netdev_); } - shash_destroy(&dummy_netdevs); + ovs_mutex_unlock(&dummy_list_mutex); } unixctl_command_reply(conn, "OK"); } @@ -899,6 +1239,9 @@ 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;