X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-dummy.c;h=f81b68e67ff52da5d0c6602ef34a2e30e53aacf1;hb=620606f63cc56c7541005dc6787106789e2c364e;hp=370584355a039478b01de05bac23c65c927fbe27;hpb=6333182946ffd368eb7623d7408185a521058b46;p=sliver-openvswitch.git diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 370584355..f81b68e67 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Nicira Networks. + * Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,19 +20,27 @@ #include +#include "flow.h" #include "list.h" #include "netdev-provider.h" +#include "netdev-vport.h" +#include "odp-util.h" +#include "ofp-print.h" +#include "ofpbuf.h" #include "packets.h" +#include "poll-loop.h" #include "shash.h" +#include "sset.h" +#include "unixctl.h" #include "vlog.h" VLOG_DEFINE_THIS_MODULE(netdev_dummy); -struct netdev_dummy_notifier { - struct netdev_notifier notifier; - struct list list_node; - struct shash_node *shash_node; -}; +#ifdef __FreeBSD__ +#define FREE_BSD 1 +#else +#define FREE_BSD 0 +#endif struct netdev_dev_dummy { struct netdev_dev netdev_dev; @@ -40,18 +48,28 @@ struct netdev_dev_dummy { int mtu; struct netdev_stats stats; enum netdev_flags flags; + unsigned int change_seq; + + struct list devs; /* List of child "netdev_dummy"s. */ }; struct netdev_dummy { struct netdev netdev; + struct list node; /* In netdev_dev_dummy's "devs" list. */ + struct list recv_queue; + bool listening; }; -static struct shash netdev_dummy_notifiers = - SHASH_INITIALIZER(&netdev_dummy_notifiers); +static struct shash dummy_netdev_devs = SHASH_INITIALIZER(&dummy_netdev_devs); +static unixctl_cb_func netdev_dummy_set_admin_state; static int netdev_dummy_create(const struct netdev_class *, const char *, - const struct shash *, struct netdev_dev **); -static void netdev_dummy_poll_notify(const struct netdev *); + 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 bool is_dummy_class(const struct netdev_class *class) @@ -62,7 +80,7 @@ is_dummy_class(const struct netdev_class *class) static struct netdev_dev_dummy * netdev_dev_dummy_cast(const struct netdev_dev *netdev_dev) { - assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev_dev, struct netdev_dev_dummy, netdev_dev); } @@ -70,13 +88,12 @@ static struct netdev_dummy * netdev_dummy_cast(const struct netdev *netdev) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev, struct netdev_dummy, netdev); } static int netdev_dummy_create(const struct netdev_class *class, const char *name, - const struct shash *args OVS_UNUSED, struct netdev_dev **netdev_devp) { static unsigned int n = 0xaa550000; @@ -92,6 +109,10 @@ netdev_dummy_create(const struct netdev_class *class, const char *name, netdev_dev->hwaddr[5] = n; netdev_dev->mtu = 1500; netdev_dev->flags = 0; + netdev_dev->change_seq = 1; + list_init(&netdev_dev->devs); + + shash_add(&dummy_netdev_devs, name, netdev_dev); n++; @@ -105,19 +126,24 @@ netdev_dummy_destroy(struct netdev_dev *netdev_dev_) { struct netdev_dev_dummy *netdev_dev = netdev_dev_dummy_cast(netdev_dev_); + shash_find_and_delete(&dummy_netdev_devs, + netdev_dev_get_name(netdev_dev_)); free(netdev_dev); } static int -netdev_dummy_open(struct netdev_dev *netdev_dev_, int ethertype OVS_UNUSED, - struct netdev **netdevp) +netdev_dummy_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp) { + struct netdev_dev_dummy *netdev_dev = netdev_dev_dummy_cast(netdev_dev_); struct netdev_dummy *netdev; netdev = xmalloc(sizeof *netdev); netdev_init(&netdev->netdev, netdev_dev_); + list_init(&netdev->recv_queue); + netdev->listening = false; *netdevp = &netdev->netdev; + list_push_back(&netdev_dev->devs, &netdev->node); return 0; } @@ -125,9 +151,59 @@ static void netdev_dummy_close(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_) +{ + struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); + netdev->listening = true; + return 0; +} + +static int +netdev_dummy_recv(struct netdev *netdev_, void *buffer, size_t size) +{ + struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); + struct ofpbuf *packet; + size_t packet_size; + + if (list_is_empty(&netdev->recv_queue)) { + return -EAGAIN; + } + + packet = ofpbuf_from_list(list_pop_front(&netdev->recv_queue)); + if (packet->size > size) { + return -EMSGSIZE; + } + packet_size = packet->size; + + memcpy(buffer, packet->data, packet->size); + ofpbuf_delete(packet); + + return packet_size; +} + +static void +netdev_dummy_recv_wait(struct netdev *netdev_) +{ + struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); + if (!list_is_empty(&netdev->recv_queue)) { + poll_immediate_wake(); + } +} + +static int +netdev_dummy_drain(struct netdev *netdev_) +{ + struct netdev_dummy *netdev = netdev_dummy_cast(netdev_); + ofpbuf_list_delete(&netdev->recv_queue); + return 0; +} + static int netdev_dummy_set_etheraddr(struct netdev *netdev, const uint8_t mac[ETH_ADDR_LEN]) @@ -137,7 +213,7 @@ netdev_dummy_set_etheraddr(struct netdev *netdev, if (!eth_addr_equals(dev->hwaddr, mac)) { memcpy(dev->hwaddr, mac, ETH_ADDR_LEN); - netdev_dummy_poll_notify(netdev); + netdev_dev_dummy_poll_notify(dev); } return 0; @@ -164,6 +240,16 @@ netdev_dummy_get_mtu(const struct netdev *netdev, int *mtup) 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)); + + dev->mtu = mtu; + return 0; +} + static int netdev_dummy_get_stats(const struct netdev *netdev, struct netdev_stats *stats) { @@ -192,6 +278,14 @@ netdev_dummy_update_flags(struct netdev *netdev, struct netdev_dev_dummy *dev = netdev_dev_dummy_cast(netdev_get_dev(netdev)); + return netdev_dev_dummy_update_flags(dev, off, on, old_flagsp); +} + +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) +{ if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) { return EINVAL; } @@ -200,72 +294,25 @@ netdev_dummy_update_flags(struct netdev *netdev, dev->flags |= on; dev->flags &= ~off; if (*old_flagsp != dev->flags) { - netdev_dummy_poll_notify(netdev); + netdev_dev_dummy_poll_notify(dev); } return 0; } -static int -netdev_dummy_poll_add(struct netdev *netdev, - void (*cb)(struct netdev_notifier *), void *aux, - struct netdev_notifier **notifierp) +static unsigned int +netdev_dummy_change_seq(const struct netdev *netdev) { - const char *name = netdev_get_name(netdev); - struct netdev_dummy_notifier *notifier; - struct list *list; - struct shash_node *shash_node; - - shash_node = shash_find_data(&netdev_dummy_notifiers, name); - if (!shash_node) { - list = xmalloc(sizeof *list); - list_init(list); - shash_node = shash_add(&netdev_dummy_notifiers, name, list); - } else { - list = shash_node->data; - } - - notifier = xmalloc(sizeof *notifier); - netdev_notifier_init(¬ifier->notifier, netdev, cb, aux); - list_push_back(list, ¬ifier->list_node); - notifier->shash_node = shash_node; - - *notifierp = ¬ifier->notifier; - - return 0; -} - -static void -netdev_dummy_poll_remove(struct netdev_notifier *notifier_) -{ - struct netdev_dummy_notifier *notifier = - CONTAINER_OF(notifier_, struct netdev_dummy_notifier, notifier); - - struct list *list; - - list = list_remove(¬ifier->list_node); - if (list_is_empty(list)) { - shash_delete(&netdev_dummy_notifiers, notifier->shash_node); - free(list); - } - - free(notifier); + return netdev_dev_dummy_cast(netdev_get_dev(netdev))->change_seq; } /* Helper functions. */ static void -netdev_dummy_poll_notify(const struct netdev *netdev) +netdev_dev_dummy_poll_notify(struct netdev_dev_dummy *dev) { - const char *name = netdev_get_name(netdev); - struct list *list = shash_find_data(&netdev_dummy_notifiers, name); - - if (list) { - struct netdev_dummy_notifier *notifier; - - LIST_FOR_EACH (notifier, list_node, list) { - struct netdev_notifier *n = ¬ifier->notifier; - n->cb(n); - } + dev->change_seq++; + if (!dev->change_seq) { + dev->change_seq++; } } @@ -277,16 +324,17 @@ static const struct netdev_class dummy_class = { netdev_dummy_create, netdev_dummy_destroy, - NULL, + NULL, /* get_config */ + NULL, /* set_config */ + NULL, /* get_tunnel_config */ netdev_dummy_open, netdev_dummy_close, - NULL, /* enumerate */ - - NULL, /* recv */ - NULL, /* recv_wait */ - NULL, /* drain */ + netdev_dummy_listen, + netdev_dummy_recv, + netdev_dummy_recv_wait, + netdev_dummy_drain, NULL, /* send */ NULL, /* send_wait */ @@ -294,15 +342,16 @@ static const struct netdev_class dummy_class = { netdev_dummy_set_etheraddr, netdev_dummy_get_etheraddr, netdev_dummy_get_mtu, + netdev_dummy_set_mtu, NULL, /* get_ifindex */ NULL, /* get_carrier */ + NULL, /* get_carrier_resets */ NULL, /* get_miimon */ netdev_dummy_get_stats, netdev_dummy_set_stats, NULL, /* get_features */ NULL, /* set_advertisements */ - NULL, /* get_vlan_vid */ NULL, /* set_policing */ NULL, /* get_qos_types */ @@ -326,12 +375,170 @@ static const struct netdev_class dummy_class = { netdev_dummy_update_flags, - netdev_dummy_poll_add, - netdev_dummy_poll_remove, + netdev_dummy_change_seq }; +static struct ofpbuf * +eth_from_packet_or_flow(const char *s) +{ + enum odp_key_fitness fitness; + struct ofpbuf *packet; + struct ofpbuf odp_key; + struct flow flow; + int error; + + if (!eth_from_hex(s, &packet)) { + return packet; + } + + /* Convert string to datapath key. + * + * It would actually be nicer to parse an OpenFlow-like flow key here, but + * the code for that currently calls exit() on parse error. We have to + * settle for parsing a datapath key for now. + */ + ofpbuf_init(&odp_key, 0); + error = odp_flow_key_from_string(s, NULL, &odp_key); + 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); + if (fitness == ODP_FIT_ERROR) { + ofpbuf_uninit(&odp_key); + return NULL; + } + + packet = ofpbuf_new(0); + flow_compose(packet, &flow); + + ofpbuf_uninit(&odp_key); + return 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; + int i; + + dummy_dev = shash_find_data(&dummy_netdev_devs, argv[1]); + if (!dummy_dev) { + unixctl_command_reply_error(conn, "no such dummy netdev"); + return; + } + + 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; + } + + 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); + } + + if (!n_listeners) { + unixctl_command_reply(conn, "packets queued but nobody listened"); + } else { + unixctl_command_reply(conn, "success"); + } +} + +static void +netdev_dev_dummy_set_admin_state(struct netdev_dev_dummy *dev, + bool admin_state) +{ + enum netdev_flags old_flags; + + if (admin_state) { + netdev_dev_dummy_update_flags(dev, 0, NETDEV_UP, &old_flags); + } else { + netdev_dev_dummy_update_flags(dev, NETDEV_UP, 0, &old_flags); + } +} + +static void +netdev_dummy_set_admin_state(struct unixctl_conn *conn, int argc, + const char *argv[], void *aux OVS_UNUSED) +{ + bool up; + + if (!strcasecmp(argv[argc - 1], "up")) { + up = true; + } else if ( !strcasecmp(argv[argc - 1], "down")) { + up = false; + } else { + unixctl_command_reply_error(conn, "Invalid Admin State"); + return; + } + + if (argc > 2) { + struct netdev_dev_dummy *dummy_dev; + + dummy_dev = shash_find_data(&dummy_netdev_devs, argv[1]); + if (dummy_dev) { + netdev_dev_dummy_set_admin_state(dummy_dev, up); + } else { + unixctl_command_reply_error(conn, "Unknown Dummy Interface"); + return; + } + } else { + struct shash_node *node; + + SHASH_FOR_EACH (node, &dummy_netdev_devs) { + netdev_dev_dummy_set_admin_state(node->data, up); + } + } + unixctl_command_reply(conn, "OK"); +} + void -netdev_dummy_register(void) +netdev_dummy_register(bool override) { + unixctl_command_register("netdev-dummy/receive", "NAME PACKET|FLOW...", + 2, INT_MAX, netdev_dummy_receive, NULL); + unixctl_command_register("netdev-dummy/set-admin-state", + "[netdev] up|down", 1, 2, + netdev_dummy_set_admin_state, NULL); + + if (override) { + struct sset types; + const char *type; + + sset_init(&types); + netdev_enumerate_types(&types); + SSET_FOR_EACH (type, &types) { + if (!netdev_unregister_provider(type)) { + struct netdev_class *class; + + class = xmalloc(sizeof *class); + *class = dummy_class; + class->type = xstrdup(type); + netdev_register_provider(class); + } + } + sset_destroy(&types); + } netdev_register_provider(&dummy_class); + + if (FREE_BSD) { + netdev_vport_tunnel_register(); + } }