X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnetdev-vport.c;h=8e5b5b5ac07d4b445249b5f99705cf701e1c1c47;hb=8402c74b186e28c53ad51fc8813aebe64a12cd7c;hp=97cc170a3a79f5c3478a57f4eb53af4de00b275f;hpb=8a86254e9857f241bae149fda7b7d390a541d57c;p=openvswitch

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 97cc170a..8e5b5b5a 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -26,10 +26,13 @@
 #include <sys/ioctl.h>
 
 #include "byte-order.h"
+#include "daemon.h"
+#include "dirs.h"
 #include "dpif-linux.h"
 #include "hash.h"
 #include "hmap.h"
 #include "list.h"
+#include "netdev-linux.h"
 #include "netdev-provider.h"
 #include "netlink.h"
 #include "netlink-socket.h"
@@ -45,15 +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 {
@@ -70,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,
@@ -177,68 +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 error;
-
-    shash_init(&fetched_args);
-
-    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;
-
-        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);
-            }
-            ofpbuf_delete(buf);
-        } else {
-            VLOG_ERR_RL(&rl, "%s: vport query failed (%s)",
-                        name, strerror(error));
-        }
-    }
-
-    if (!error) {
-        struct netdev_dev_vport *dev;
+    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;
-
-        *netdev_devp = &dev->netdev_dev;
-        route_table_register();
-    } else {
-        ofpbuf_delete(options);
-    }
+    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;
 
-    shash_destroy(&fetched_args);
+    *netdev_devp = &dev->netdev_dev;
+    route_table_register();
 
-    return error;
+    return 0;
 }
 
 static void
@@ -251,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;
 
@@ -270,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)
 {
@@ -284,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;
 
@@ -309,6 +296,32 @@ netdev_vport_set_config(struct netdev_dev *dev_, const struct shash *args)
     return error;
 }
 
+static int
+netdev_vport_send(struct netdev *netdev, const void *data, size_t size)
+{
+    struct netdev_dev *dev_ = netdev_get_dev(netdev);
+    struct netdev_dev_vport *dev = netdev_dev_vport_cast(dev_);
+
+    if (dev->dp_ifindex == -1) {
+        const char *name = netdev_get_name(netdev);
+        struct dpif_linux_vport reply;
+        struct ofpbuf *buf;
+        int error;
+
+        error = dpif_linux_vport_get(name, &reply, &buf);
+        if (error) {
+            VLOG_ERR_RL(&rl, "%s: failed to query vport for send (%s)",
+                        name, strerror(error));
+            return error;
+        }
+        dev->dp_ifindex = reply.dp_ifindex;
+        dev->port_no = reply.port_no;
+        ofpbuf_delete(buf);
+    }
+
+    return dpif_linux_vport_send(dev->dp_ifindex, dev->port_no, data, size);
+}
+
 static int
 netdev_vport_set_etheraddr(struct netdev *netdev,
                            const uint8_t mac[ETH_ADDR_LEN])
@@ -378,27 +391,7 @@ netdev_vport_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
         return EOPNOTSUPP;
     }
 
-    stats->rx_packets = reply.stats->rx_packets;
-    stats->tx_packets = reply.stats->tx_packets;
-    stats->rx_bytes = reply.stats->rx_bytes;
-    stats->tx_bytes = reply.stats->tx_bytes;
-    stats->rx_errors = reply.stats->rx_errors;
-    stats->tx_errors = reply.stats->tx_errors;
-    stats->rx_dropped = reply.stats->rx_dropped;
-    stats->tx_dropped = reply.stats->tx_dropped;
-    stats->multicast = reply.stats->multicast;
-    stats->collisions = reply.stats->collisions;
-    stats->rx_length_errors = reply.stats->rx_length_errors;
-    stats->rx_over_errors = reply.stats->rx_over_errors;
-    stats->rx_crc_errors = reply.stats->rx_crc_errors;
-    stats->rx_frame_errors = reply.stats->rx_frame_errors;
-    stats->rx_fifo_errors = reply.stats->rx_fifo_errors;
-    stats->rx_missed_errors = reply.stats->rx_missed_errors;
-    stats->tx_aborted_errors = reply.stats->tx_aborted_errors;
-    stats->tx_carrier_errors = reply.stats->tx_carrier_errors;
-    stats->tx_fifo_errors = reply.stats->tx_fifo_errors;
-    stats->tx_heartbeat_errors = reply.stats->tx_heartbeat_errors;
-    stats->tx_window_errors = reply.stats->tx_window_errors;
+    netdev_stats_from_rtnl_link_stats64(stats, reply.stats);
 
     ofpbuf_delete(buf);
 
@@ -412,27 +405,7 @@ netdev_vport_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
     struct dpif_linux_vport vport;
     int err;
 
-    rtnl_stats.rx_packets = stats->rx_packets;
-    rtnl_stats.tx_packets = stats->tx_packets;
-    rtnl_stats.rx_bytes = stats->rx_bytes;
-    rtnl_stats.tx_bytes = stats->tx_bytes;
-    rtnl_stats.rx_errors = stats->rx_errors;
-    rtnl_stats.tx_errors = stats->tx_errors;
-    rtnl_stats.rx_dropped = stats->rx_dropped;
-    rtnl_stats.tx_dropped = stats->tx_dropped;
-    rtnl_stats.multicast = stats->multicast;
-    rtnl_stats.collisions = stats->collisions;
-    rtnl_stats.rx_length_errors = stats->rx_length_errors;
-    rtnl_stats.rx_over_errors = stats->rx_over_errors;
-    rtnl_stats.rx_crc_errors = stats->rx_crc_errors;
-    rtnl_stats.rx_frame_errors = stats->rx_frame_errors;
-    rtnl_stats.rx_fifo_errors = stats->rx_fifo_errors;
-    rtnl_stats.rx_missed_errors = stats->rx_missed_errors;
-    rtnl_stats.tx_aborted_errors = stats->tx_aborted_errors;
-    rtnl_stats.tx_carrier_errors = stats->tx_carrier_errors;
-    rtnl_stats.tx_fifo_errors = stats->tx_fifo_errors;
-    rtnl_stats.tx_heartbeat_errors = stats->tx_heartbeat_errors;
-    rtnl_stats.tx_window_errors = stats->tx_window_errors;
+    netdev_stats_to_rtnl_link_stats64(&rtnl_stats, stats);
 
     dpif_linux_vport_init(&vport);
     vport.cmd = ODP_VPORT_CMD_SET;
@@ -462,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"));
@@ -486,57 +459,10 @@ netdev_vport_update_flags(struct netdev *netdev OVS_UNUSED,
     return 0;
 }
 
-static char *
-make_poll_name(const struct netdev *netdev)
+static unsigned int
+netdev_vport_change_seq(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(&notifier->notifier, netdev, cb, aux);
-    list_push_back(list, &notifier->list_node);
-    notifier->shash_node = shash_node;
-
-    *notifierp = &notifier->notifier;
-    free(poll_name);
-
-    return 0;
-}
-
-static void
-netdev_vport_poll_remove(struct netdev_notifier *notifier_)
-{
-    struct netdev_vport_notifier *notifier =
-                CONTAINER_OF(notifier_, struct netdev_vport_notifier, notifier);
-
-    struct list *list;
-
-    list = list_remove(&notifier->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
@@ -556,7 +482,7 @@ static const char *
 netdev_vport_get_tnl_iface(const struct netdev *netdev)
 {
     struct nlattr *a[ODP_TUNNEL_ATTR_MAX + 1];
-    uint32_t route;
+    ovs_be32 route;
     struct netdev_dev_vport *ndv;
     static char name[IFNAMSIZ];
 
@@ -579,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 = &notifier->notifier;
-            n->cb(n);
-        }
+    ndv->change_seq++;
+    if (!ndv->change_seq) {
+        ndv->change_seq++;
     }
-
-    free(poll_name);
 }
 
 /* Code specific to individual vport types. */
@@ -629,7 +549,7 @@ parse_tunnel_config(const char *name, const char *type,
     ovs_be32 daddr = htonl(0);
     uint32_t flags;
 
-    flags = TNL_F_PMTUD | TNL_F_HDR_CACHE;
+    flags = TNL_F_DF_DEFAULT | TNL_F_PMTUD | TNL_F_HDR_CACHE;
     if (!strcmp(type, "gre")) {
         is_gre = true;
     } else if (!strcmp(type, "ipsec_gre")) {
@@ -671,6 +591,14 @@ parse_tunnel_config(const char *name, const char *type,
             if (!strcmp(node->data, "true")) {
                 flags |= TNL_F_CSUM;
             }
+        } else if (!strcmp(node->name, "df_inherit")) {
+            if (!strcmp(node->data, "true")) {
+                flags |= TNL_F_DF_INHERIT;
+            }
+        } else if (!strcmp(node->name, "df_default")) {
+            if (!strcmp(node->data, "false")) {
+                flags &= ~TNL_F_DF_DEFAULT;
+            }
         } else if (!strcmp(node->name, "pmtud")) {
             if (!strcmp(node->data, "false")) {
                 flags &= ~TNL_F_PMTUD;
@@ -693,8 +621,8 @@ parse_tunnel_config(const char *name, const char *type,
                  */
                 use_ssl_cert = shash_find_data(args, "use_ssl_cert");
                 if (!use_ssl_cert || strcmp(use_ssl_cert, "true")) {
-                    VLOG_WARN("%s: 'peer_cert' requires 'certificate' argument",
-                              name);
+                    VLOG_ERR("%s: 'peer_cert' requires 'certificate' argument",
+                             name);
                     return EINVAL;
                 }
                 ipsec_mech_set = true;
@@ -716,14 +644,24 @@ parse_tunnel_config(const char *name, const char *type,
     }
 
     if (is_ipsec) {
+        char *file_name = xasprintf("%s/%s", ovs_rundir(),
+                "ovs-monitor-ipsec.pid");
+        pid_t pid = read_pidfile(file_name);
+        free(file_name);
+        if (pid < 0) {
+            VLOG_ERR("%s: IPsec requires the ovs-monitor-ipsec daemon",
+                     name);
+            return EINVAL;
+        }
+
         if (shash_find(args, "peer_cert") && shash_find(args, "psk")) {
-            VLOG_WARN("%s: cannot define both 'peer_cert' and 'psk'", name);
+            VLOG_ERR("%s: cannot define both 'peer_cert' and 'psk'", name);
             return EINVAL;
         }
 
         if (!ipsec_mech_set) {
-            VLOG_WARN("%s: IPsec requires an 'peer_cert' or psk' argument",
-                      name);
+            VLOG_ERR("%s: IPsec requires an 'peer_cert' or psk' argument",
+                     name);
             return EINVAL;
         }
     }
@@ -734,8 +672,8 @@ parse_tunnel_config(const char *name, const char *type,
     }
 
     if (!daddr) {
-        VLOG_WARN("%s: %s type requires valid 'remote_ip' argument",
-                  name, type);
+        VLOG_ERR("%s: %s type requires valid 'remote_ip' argument",
+                 name, type);
         return EINVAL;
     }
     nl_msg_put_be32(options, ODP_TUNNEL_ATTR_DST_IPV4, daddr);
@@ -843,6 +781,12 @@ unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
     if (flags & TNL_F_CSUM) {
         smap_add(args, "csum", "true");
     }
+    if (flags & TNL_F_DF_INHERIT) {
+        smap_add(args, "df_inherit", "true");
+    }
+    if (!(flags & TNL_F_DF_DEFAULT)) {
+        smap_add(args, "df_default", "false");
+    }
     if (!(flags & TNL_F_PMTUD)) {
         smap_add(args, "pmtud", "false");
     }
@@ -858,22 +802,22 @@ parse_patch_config(const char *name, const char *type OVS_UNUSED,
 
     peer = shash_find_data(args, "peer");
     if (!peer) {
-        VLOG_WARN("%s: patch type requires valid 'peer' argument", name);
+        VLOG_ERR("%s: patch type requires valid 'peer' argument", name);
         return EINVAL;
     }
 
     if (shash_count(args) > 1) {
-        VLOG_WARN("%s: patch type takes only a 'peer' argument", name);
+        VLOG_ERR("%s: patch type takes only a 'peer' argument", name);
         return EINVAL;
     }
 
     if (strlen(peer) >= IFNAMSIZ) {
-        VLOG_WARN("%s: patch 'peer' arg too long", name);
+        VLOG_ERR("%s: patch 'peer' arg too long", name);
         return EINVAL;
     }
 
     if (!strcmp(name, peer)) {
-        VLOG_WARN("%s: patch peer must not be self", name);
+        VLOG_ERR("%s: patch peer must not be self", name);
         return EINVAL;
     }
 
@@ -913,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,                                      \
@@ -920,11 +865,12 @@ unparse_patch_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
                                                             \
     NULL,                       /* enumerate */             \
                                                             \
+    NULL,                       /* listen */                \
     NULL,                       /* recv */                  \
     NULL,                       /* recv_wait */             \
     NULL,                       /* drain */                 \
                                                             \
-    NULL,                       /* send */                  \
+    netdev_vport_send,          /* send */                  \
     NULL,                       /* send_wait */             \
                                                             \
     netdev_vport_set_etheraddr,                             \
@@ -962,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)