X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev.c;h=c7de9064b80d425a475e1b567ac0f26087ba6ab4;hb=56b20c59a3fbfe94dcbb94fa4abfc013630af541;hp=38f4dd58561ad5a2abd9e78d8c22294eccbc4ad1;hpb=efdd908807544de7bee8644fafc1400e6a32d936;p=sliver-openvswitch.git diff --git a/lib/netdev.c b/lib/netdev.c index 38f4dd585..c7de9064b 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -31,24 +31,21 @@ #include "hash.h" #include "list.h" #include "netdev-provider.h" +#include "netdev-vport.h" #include "ofpbuf.h" #include "openflow/openflow.h" #include "packets.h" #include "poll-loop.h" #include "shash.h" #include "svec.h" - -#define THIS_MODULE VLM_netdev #include "vlog.h" -static const struct netdev_class *base_netdev_classes[] = { -#ifdef HAVE_NETLINK - &netdev_linux_class, - &netdev_tap_class, - &netdev_patch_class, - &netdev_gre_class, -#endif -}; +VLOG_DEFINE_THIS_MODULE(netdev); + +COVERAGE_DEFINE(netdev_received); +COVERAGE_DEFINE(netdev_sent); +COVERAGE_DEFINE(netdev_add_router); +COVERAGE_DEFINE(netdev_get_stats); static struct shash netdev_classes = SHASH_INITIALIZER(&netdev_classes); @@ -69,17 +66,19 @@ void update_device_args(struct netdev_dev *, const struct shash *args); static void netdev_initialize(void) { - static int status = -1; + static bool inited; - if (status < 0) { - int i; + if (!inited) { + inited = true; fatal_signal_add_hook(close_all_netdevs, NULL, NULL, true); - status = 0; - for (i = 0; i < ARRAY_SIZE(base_netdev_classes); i++) { - netdev_register_provider(base_netdev_classes[i]); - } +#ifdef HAVE_NETLINK + netdev_register_provider(&netdev_linux_class); + netdev_register_provider(&netdev_internal_class); + netdev_register_provider(&netdev_tap_class); + netdev_vport_register(); +#endif } } @@ -120,8 +119,6 @@ netdev_wait(void) int netdev_register_provider(const struct netdev_class *new_class) { - struct netdev_class *new_provider; - if (shash_find(&netdev_classes, new_class->type)) { VLOG_WARN("attempted to register duplicate netdev provider: %s", new_class->type); @@ -137,10 +134,7 @@ netdev_register_provider(const struct netdev_class *new_class) } } - new_provider = xmalloc(sizeof *new_provider); - memcpy(new_provider, new_class, sizeof *new_provider); - - shash_add(&netdev_classes, new_class->type, new_provider); + shash_add(&netdev_classes, new_class->type, new_class); return 0; } @@ -170,11 +164,17 @@ netdev_unregister_provider(const char *type) } shash_delete(&netdev_classes, del_node); - free(del_node->data); return 0; } +const struct netdev_class * +netdev_lookup_provider(const char *type) +{ + netdev_initialize(); + return shash_find_data(&netdev_classes, type && type[0] ? type : "system"); +} + /* Clears 'types' and enumerates the types of all currently registered netdev * providers into it. The caller must first initialize the svec. */ void @@ -207,7 +207,7 @@ compare_device_args(const struct netdev_dev *dev, const struct shash *args) new_args = shash_sort(args); for (i = 0; i < dev->n_args; i++) { - if (strcmp(dev->args[i].key, new_args[i]->name) || + if (strcmp(dev->args[i].key, new_args[i]->name) || strcmp(dev->args[i].value, new_args[i]->data)) { result = false; goto finish; @@ -260,39 +260,17 @@ update_device_args(struct netdev_dev *dev, const struct shash *args) qsort(dev->args, dev->n_args, sizeof *dev->args, compare_args); } -static int -create_device(struct netdev_options *options, struct netdev_dev **netdev_devp) -{ - struct netdev_class *netdev_class; - - if (!options->type || strlen(options->type) == 0) { - /* Default to system. */ - options->type = "system"; - } - - netdev_class = shash_find_data(&netdev_classes, options->type); - if (!netdev_class) { - VLOG_WARN("could not create netdev %s of unknown type %s", - options->name, options->type); - return EAFNOSUPPORT; - } - - return netdev_class->create(options->name, options->type, options->args, - netdev_devp); -} - /* Opens the network device named 'name' (e.g. "eth0") and returns zero if * successful, otherwise a positive errno value. On success, sets '*netdevp' * to the new network device, otherwise to null. * * If this is the first time the device has been opened, then create is called - * before opening. The device is created using the given type and arguments. + * before opening. The device is created using the given type and arguments. * * 'ethertype' may be a 16-bit Ethernet protocol value in host byte order to * capture frames of that type received on the device. It may also be one of * the 'enum netdev_pseudo_ethertype' values to receive frames in one of those * categories. */ - int netdev_open(struct netdev_options *options, struct netdev **netdevp) { @@ -310,10 +288,20 @@ netdev_open(struct netdev_options *options, struct netdev **netdevp) netdev_dev = shash_find_data(&netdev_dev_shash, options->name); if (!netdev_dev) { - error = create_device(options, &netdev_dev); + const struct netdev_class *class; + + class = netdev_lookup_provider(options->type); + if (!class) { + VLOG_WARN("could not create netdev %s of unknown type %s", + options->name, options->type); + return EAFNOSUPPORT; + } + error = class->create(class, options->name, options->args, + &netdev_dev); if (error) { return error; } + assert(netdev_dev->netdev_class == class); update_device_args(netdev_dev, options->args); } else if (!shash_is_empty(options->args) && @@ -324,7 +312,7 @@ netdev_open(struct netdev_options *options, struct netdev **netdevp) return EINVAL; } - error = netdev_dev->netdev_class->open(netdev_dev, options->ethertype, + error = netdev_dev->netdev_class->open(netdev_dev, options->ethertype, netdevp); if (!error) { @@ -462,8 +450,7 @@ netdev_enumerate(struct svec *svec) * be returned. * * Some network devices may not implement support for this function. In such - * cases this function will always return EOPNOTSUPP. - */ + * cases this function will always return EOPNOTSUPP. */ int netdev_recv(struct netdev *netdev, struct ofpbuf *buffer) { @@ -629,8 +616,7 @@ netdev_get_ifindex(const struct netdev *netdev) * passed-in values are set to 0. * * Some network devices may not implement support for this function. In such - * cases this function will always return EOPNOTSUPP. - */ + * cases this function will always return EOPNOTSUPP. */ int netdev_get_features(struct netdev *netdev, uint32_t *current, uint32_t *advertised, @@ -715,8 +701,8 @@ netdev_set_advertisements(struct netdev *netdev, uint32_t advertise) * * - EOPNOTSUPP: No IPv4 network stack attached to 'netdev'. * - * 'address' or 'netmask' or both may be null, in which case the address or netmask - * is not reported. */ + * 'address' or 'netmask' or both may be null, in which case the address or + * netmask is not reported. */ int netdev_get_in4(const struct netdev *netdev, struct in_addr *address_, struct in_addr *netmask_) @@ -726,7 +712,7 @@ netdev_get_in4(const struct netdev *netdev, int error; error = (netdev_get_dev(netdev)->netdev_class->get_in4 - ? netdev_get_dev(netdev)->netdev_class->get_in4(netdev, + ? netdev_get_dev(netdev)->netdev_class->get_in4(netdev, &address, &netmask) : EOPNOTSUPP); if (address_) { @@ -801,7 +787,7 @@ netdev_get_in6(const struct netdev *netdev, struct in6_addr *in6) int error; error = (netdev_get_dev(netdev)->netdev_class->get_in6 - ? netdev_get_dev(netdev)->netdev_class->get_in6(netdev, + ? netdev_get_dev(netdev)->netdev_class->get_in6(netdev, in6 ? in6 : &dummy) : EOPNOTSUPP); if (error && in6) { @@ -822,7 +808,7 @@ do_update_flags(struct netdev *netdev, enum netdev_flags off, enum netdev_flags old_flags; int error; - error = netdev_get_dev(netdev)->netdev_class->update_flags(netdev, + error = netdev_get_dev(netdev)->netdev_class->update_flags(netdev, off & ~on, on, &old_flags); if (error) { VLOG_WARN_RL(&rl, "failed to %s flags for network device %s: %s", @@ -897,7 +883,7 @@ netdev_arp_lookup(const struct netdev *netdev, uint32_t ip, uint8_t mac[ETH_ADDR_LEN]) { int error = (netdev_get_dev(netdev)->netdev_class->arp_lookup - ? netdev_get_dev(netdev)->netdev_class->arp_lookup(netdev, + ? netdev_get_dev(netdev)->netdev_class->arp_lookup(netdev, ip, mac) : EOPNOTSUPP); if (error) { @@ -906,19 +892,32 @@ netdev_arp_lookup(const struct netdev *netdev, return error; } -/* Sets 'carrier' to true if carrier is active (link light is on) on - * 'netdev'. */ -int -netdev_get_carrier(const struct netdev *netdev, bool *carrier) +/* Returns true if carrier is active (link light is on) on 'netdev'. */ +bool +netdev_get_carrier(const struct netdev *netdev) { - int error = (netdev_get_dev(netdev)->netdev_class->get_carrier - ? netdev_get_dev(netdev)->netdev_class->get_carrier(netdev, - carrier) - : EOPNOTSUPP); + int error; + enum netdev_flags flags; + bool carrier; + + netdev_get_flags(netdev, &flags); + if (!(flags & NETDEV_UP)) { + return false; + } + + if (!netdev_get_dev(netdev)->netdev_class->get_carrier) { + return true; + } + + error = netdev_get_dev(netdev)->netdev_class->get_carrier(netdev, + &carrier); if (error) { - *carrier = false; + VLOG_DBG("%s: failed to get network device carrier status, assuming " + "down: %s", netdev_get_name(netdev), strerror(error)); + carrier = false; } - return error; + + return carrier; } /* Retrieves current device stats for 'netdev'. */ @@ -958,7 +957,7 @@ netdev_set_policing(struct netdev *netdev, uint32_t kbits_rate, uint32_t kbits_burst) { return (netdev_get_dev(netdev)->netdev_class->set_policing - ? netdev_get_dev(netdev)->netdev_class->set_policing(netdev, + ? netdev_get_dev(netdev)->netdev_class->set_policing(netdev, kbits_rate, kbits_burst) : EOPNOTSUPP); } @@ -1147,8 +1146,7 @@ netdev_get_queue(const struct netdev *netdev, * the current form of QoS (e.g. as returned by netdev_get_n_queues(netdev)). * * This function does not modify 'details', and the caller retains ownership of - * it. - */ + * it. */ int netdev_set_queue(struct netdev *netdev, unsigned int queue_id, const struct shash *details) @@ -1251,7 +1249,7 @@ int netdev_get_vlan_vid(const struct netdev *netdev, int *vlan_vid) { int error = (netdev_get_dev(netdev)->netdev_class->get_vlan_vid - ? netdev_get_dev(netdev)->netdev_class->get_vlan_vid(netdev, + ? netdev_get_dev(netdev)->netdev_class->get_vlan_vid(netdev, vlan_vid) : ENOENT); if (error) { @@ -1416,7 +1414,7 @@ netdev_uninit(struct netdev *netdev, bool close) } -/* Returns the class type of 'netdev'. +/* Returns the class type of 'netdev'. * * The caller must not free the returned value. */ const char * @@ -1540,8 +1538,7 @@ netdev_monitor_remove(struct netdev_monitor *monitor, struct netdev *netdev) * sets '*devnamep' to the name of a device that has changed and returns 0. * The caller is responsible for freeing '*devnamep' (with free()). * - * If no devices have changed, sets '*devnamep' to NULL and returns EAGAIN. - */ + * If no devices have changed, sets '*devnamep' to NULL and returns EAGAIN. */ int netdev_monitor_poll(struct netdev_monitor *monitor, char **devnamep) { @@ -1550,8 +1547,7 @@ netdev_monitor_poll(struct netdev_monitor *monitor, char **devnamep) *devnamep = NULL; return EAGAIN; } else { - *devnamep = xstrdup(node->name); - shash_delete(&monitor->changed_netdevs, node); + *devnamep = shash_steal(&monitor->changed_netdevs, node); return 0; } } @@ -1594,7 +1590,7 @@ static void close_all_netdevs(void *aux OVS_UNUSED) { struct netdev *netdev, *next; - LIST_FOR_EACH_SAFE(netdev, next, struct netdev, node, &netdev_list) { + LIST_FOR_EACH_SAFE(netdev, next, node, &netdev_list) { netdev_close(netdev); } }