X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fnetdev-vport.c;h=8e5b5b5ac07d4b445249b5f99705cf701e1c1c47;hb=18812dff32ce650440b9f1eac1bb00afe08c621a;hp=3067323671a1a7e87cd286214a385da56143c8f3;hpb=b2fda3effc787f265b5ad5dfa967ac00627bd075;p=openvswitch diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 30673236..8e5b5b5a 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -48,17 +48,12 @@ VLOG_DEFINE_THIS_MODULE(netdev_vport); -struct netdev_vport_notifier { - struct netdev_notifier notifier; - struct list list_node; - struct shash_node *shash_node; -}; - struct netdev_dev_vport { struct netdev_dev netdev_dev; struct ofpbuf *options; int dp_ifindex; /* -1 if unknown. */ uint32_t port_no; /* UINT32_MAX if unknown. */ + unsigned int change_seq; }; struct netdev_vport { @@ -75,13 +70,10 @@ struct vport_class { struct shash *args); }; -static struct shash netdev_vport_notifiers = - SHASH_INITIALIZER(&netdev_vport_notifiers); - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); static int netdev_vport_create(const struct netdev_class *, const char *, - const struct shash *, struct netdev_dev **); + struct netdev_dev **); static void netdev_vport_poll_notify(const struct netdev *); static int tnl_port_config_from_nlattr(const struct nlattr *options, size_t options_len, @@ -182,76 +174,21 @@ netdev_vport_get_netdev_type(const struct dpif_linux_vport *vport) static int netdev_vport_create(const struct netdev_class *netdev_class, const char *name, - const struct shash *args, struct netdev_dev **netdev_devp) { - const struct vport_class *vport_class = vport_class_cast(netdev_class); - struct ofpbuf *options = NULL; - struct shash fetched_args; - int dp_ifindex; - uint32_t port_no; - int error; + struct netdev_dev_vport *dev; - shash_init(&fetched_args); + dev = xmalloc(sizeof *dev); + netdev_dev_init(&dev->netdev_dev, name, netdev_class); + dev->options = NULL; + dev->dp_ifindex = -1; + dev->port_no = UINT32_MAX; + dev->change_seq = 1; - dp_ifindex = -1; - port_no = UINT32_MAX; - if (!shash_is_empty(args)) { - /* Parse the provided configuration. */ - options = ofpbuf_new(64); - error = vport_class->parse_config(name, netdev_class->type, - args, options); - } else { - /* Fetch an existing configuration from the kernel. - * - * This case could be ambiguous with initializing a new vport with an - * empty configuration, but none of the existing vport classes accept - * an empty configuration. */ - struct dpif_linux_vport reply; - struct ofpbuf *buf; + *netdev_devp = &dev->netdev_dev; + route_table_register(); - error = dpif_linux_vport_get(name, &reply, &buf); - if (!error) { - /* XXX verify correct type */ - error = vport_class->unparse_config(name, netdev_class->type, - reply.options, - reply.options_len, - &fetched_args); - if (error) { - VLOG_ERR_RL(&rl, "%s: failed to parse kernel config (%s)", - name, strerror(error)); - } else { - options = ofpbuf_clone_data(reply.options, reply.options_len); - dp_ifindex = reply.dp_ifindex; - port_no = reply.port_no; - } - ofpbuf_delete(buf); - } else { - VLOG_ERR_RL(&rl, "%s: vport query failed (%s)", - name, strerror(error)); - } - } - - if (!error) { - struct netdev_dev_vport *dev; - - dev = xmalloc(sizeof *dev); - netdev_dev_init(&dev->netdev_dev, name, - shash_is_empty(&fetched_args) ? args : &fetched_args, - netdev_class); - dev->options = options; - dev->dp_ifindex = dp_ifindex; - dev->port_no = port_no; - - *netdev_devp = &dev->netdev_dev; - route_table_register(); - } else { - ofpbuf_delete(options); - } - - shash_destroy(&fetched_args); - - return error; + return 0; } static void @@ -264,8 +201,7 @@ netdev_vport_destroy(struct netdev_dev *netdev_dev_) } static int -netdev_vport_open(struct netdev_dev *netdev_dev_, int ethertype OVS_UNUSED, - struct netdev **netdevp) +netdev_vport_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp) { struct netdev_vport *netdev; @@ -283,6 +219,43 @@ netdev_vport_close(struct netdev *netdev_) free(netdev); } +static int +netdev_vport_get_config(struct netdev_dev *dev_, struct shash *args) +{ + const struct netdev_class *netdev_class = netdev_dev_get_class(dev_); + const struct vport_class *vport_class = vport_class_cast(netdev_class); + struct netdev_dev_vport *dev = netdev_dev_vport_cast(dev_); + const char *name = netdev_dev_get_name(dev_); + int error; + + if (!dev->options) { + struct dpif_linux_vport reply; + struct ofpbuf *buf; + + error = dpif_linux_vport_get(name, &reply, &buf); + if (error) { + VLOG_ERR_RL(&rl, "%s: vport query failed (%s)", + name, strerror(error)); + return error; + } + + dev->options = ofpbuf_clone_data(reply.options, reply.options_len); + dev->dp_ifindex = reply.dp_ifindex; + dev->port_no = reply.port_no; + ofpbuf_delete(buf); + } + + error = vport_class->unparse_config(name, netdev_class->type, + dev->options->data, + dev->options->size, + args); + if (error) { + VLOG_ERR_RL(&rl, "%s: failed to parse kernel config (%s)", + name, strerror(error)); + } + return error; +} + static int netdev_vport_set_config(struct netdev_dev *dev_, const struct shash *args) { @@ -297,7 +270,8 @@ netdev_vport_set_config(struct netdev_dev *dev_, const struct shash *args) error = vport_class->parse_config(name, netdev_dev_get_type(dev_), args, options); if (!error - && (options->size != dev->options->size + && (!dev->options + || options->size != dev->options->size || memcmp(options->data, dev->options->data, options->size))) { struct dpif_linux_vport vport; @@ -461,7 +435,7 @@ netdev_vport_get_status(const struct netdev *netdev, struct shash *sh) shash_add(sh, "tunnel_egress_iface", xstrdup(iface)); - if (!netdev_open_default(iface, &egress_netdev)) { + if (!netdev_open(iface, "system", &egress_netdev)) { shash_add(sh, "tunnel_egress_iface_carrier", xstrdup(netdev_get_carrier(egress_netdev) ? "up" : "down")); @@ -485,57 +459,10 @@ netdev_vport_update_flags(struct netdev *netdev OVS_UNUSED, return 0; } -static char * -make_poll_name(const struct netdev *netdev) -{ - return xasprintf("%s:%s", netdev_get_type(netdev), netdev_get_name(netdev)); -} - -static int -netdev_vport_poll_add(struct netdev *netdev, - void (*cb)(struct netdev_notifier *), void *aux, - struct netdev_notifier **notifierp) -{ - char *poll_name = make_poll_name(netdev); - struct netdev_vport_notifier *notifier; - struct list *list; - struct shash_node *shash_node; - - shash_node = shash_find(&netdev_vport_notifiers, poll_name); - if (!shash_node) { - list = xmalloc(sizeof *list); - list_init(list); - shash_node = shash_add(&netdev_vport_notifiers, poll_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; - free(poll_name); - - return 0; -} - -static void -netdev_vport_poll_remove(struct netdev_notifier *notifier_) +static unsigned int +netdev_vport_change_seq(const struct netdev *netdev) { - struct netdev_vport_notifier *notifier = - CONTAINER_OF(notifier_, struct netdev_vport_notifier, notifier); - - struct list *list; - - list = list_remove(¬ifier->list_node); - if (list_is_empty(list)) { - shash_delete(&netdev_vport_notifiers, notifier->shash_node); - free(list); - } - - free(notifier); + return netdev_dev_vport_cast(netdev_get_dev(netdev))->change_seq; } static void @@ -578,20 +505,14 @@ netdev_vport_get_tnl_iface(const struct netdev *netdev) static void netdev_vport_poll_notify(const struct netdev *netdev) { - char *poll_name = make_poll_name(netdev); - struct list *list = shash_find_data(&netdev_vport_notifiers, - poll_name); + struct netdev_dev_vport *ndv; - if (list) { - struct netdev_vport_notifier *notifier; + ndv = netdev_dev_vport_cast(netdev_get_dev(netdev)); - LIST_FOR_EACH (notifier, list_node, list) { - struct netdev_notifier *n = ¬ifier->notifier; - n->cb(n); - } + ndv->change_seq++; + if (!ndv->change_seq) { + ndv->change_seq++; } - - free(poll_name); } /* Code specific to individual vport types. */ @@ -936,6 +857,7 @@ unparse_patch_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED, \ netdev_vport_create, \ netdev_vport_destroy, \ + netdev_vport_get_config, \ netdev_vport_set_config, \ \ netdev_vport_open, \ @@ -943,6 +865,7 @@ unparse_patch_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED, \ NULL, /* enumerate */ \ \ + NULL, /* listen */ \ NULL, /* recv */ \ NULL, /* recv_wait */ \ NULL, /* drain */ \ @@ -985,8 +908,7 @@ unparse_patch_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED, \ netdev_vport_update_flags, \ \ - netdev_vport_poll_add, \ - netdev_vport_poll_remove, + netdev_vport_change_seq void netdev_vport_register(void)