X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-vport.c;h=d85d528454b46201675ff252ab022482bd914217;hb=f613a0d72c521ca3a4eeb2c29ac523f6fdf72667;hp=fc20232806eeaf7a6bec8cb501ce273da5fdee5c;hpb=de5cdb90f7c02d22b0595c7dc311c5306291b02f;p=sliver-openvswitch.git diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index fc2023280..d85d52845 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -35,13 +35,13 @@ #include "netdev-linux.h" #include "netdev-provider.h" #include "netlink.h" +#include "netlink-notifier.h" #include "netlink-socket.h" #include "ofpbuf.h" #include "openvswitch/datapath-protocol.h" #include "openvswitch/tunnel.h" #include "packets.h" #include "route-table.h" -#include "rtnetlink.h" #include "shash.h" #include "socket-util.h" #include "vlog.h" @@ -61,7 +61,7 @@ struct netdev_vport { }; struct vport_class { - enum odp_vport_type type; + enum ovs_vport_type type; struct netdev_class netdev_class; int (*parse_config)(const char *name, const char *type, const struct shash *args, struct ofpbuf *options); @@ -77,7 +77,7 @@ static int netdev_vport_create(const struct netdev_class *, const char *, static void netdev_vport_poll_notify(const struct netdev *); static int tnl_port_config_from_nlattr(const struct nlattr *options, size_t options_len, - struct nlattr *a[ODP_TUNNEL_ATTR_MAX + 1]); + struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1]); static const char *netdev_vport_get_tnl_iface(const struct netdev *netdev); @@ -110,7 +110,7 @@ netdev_vport_cast(const struct netdev *netdev) } /* If 'netdev' is a vport netdev, returns an ofpbuf that contains Netlink - * options to include in ODP_VPORT_ATTR_OPTIONS for configuring that vport. + * options to include in OVS_VPORT_ATTR_OPTIONS for configuring that vport. * Otherwise returns NULL. */ const struct ofpbuf * netdev_vport_get_options(const struct netdev *netdev) @@ -122,48 +122,48 @@ netdev_vport_get_options(const struct netdev *netdev) : NULL); } -enum odp_vport_type +enum ovs_vport_type netdev_vport_get_vport_type(const struct netdev *netdev) { const struct netdev_dev *dev = netdev_get_dev(netdev); const struct netdev_class *class = netdev_dev_get_class(dev); return (is_vport_class(class) ? vport_class_cast(class)->type - : class == &netdev_internal_class ? ODP_VPORT_TYPE_INTERNAL - : class == &netdev_linux_class ? ODP_VPORT_TYPE_NETDEV - : ODP_VPORT_TYPE_UNSPEC); + : class == &netdev_internal_class ? OVS_VPORT_TYPE_INTERNAL + : class == &netdev_linux_class ? OVS_VPORT_TYPE_NETDEV + : OVS_VPORT_TYPE_UNSPEC); } const char * netdev_vport_get_netdev_type(const struct dpif_linux_vport *vport) { - struct nlattr *a[ODP_TUNNEL_ATTR_MAX + 1]; + struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1]; switch (vport->type) { - case ODP_VPORT_TYPE_UNSPEC: + case OVS_VPORT_TYPE_UNSPEC: break; - case ODP_VPORT_TYPE_NETDEV: + case OVS_VPORT_TYPE_NETDEV: return "system"; - case ODP_VPORT_TYPE_INTERNAL: + case OVS_VPORT_TYPE_INTERNAL: return "internal"; - case ODP_VPORT_TYPE_PATCH: + case OVS_VPORT_TYPE_PATCH: return "patch"; - case ODP_VPORT_TYPE_GRE: + case OVS_VPORT_TYPE_GRE: if (tnl_port_config_from_nlattr(vport->options, vport->options_len, a)) { break; } - return (nl_attr_get_u32(a[ODP_TUNNEL_ATTR_FLAGS]) & TNL_F_IPSEC + return (nl_attr_get_u32(a[OVS_TUNNEL_ATTR_FLAGS]) & TNL_F_IPSEC ? "ipsec_gre" : "gre"); - case ODP_VPORT_TYPE_CAPWAP: + case OVS_VPORT_TYPE_CAPWAP: return "capwap"; - case __ODP_VPORT_TYPE_MAX: + case __OVS_VPORT_TYPE_MAX: break; } @@ -276,7 +276,7 @@ netdev_vport_set_config(struct netdev_dev *dev_, const struct shash *args) struct dpif_linux_vport vport; dpif_linux_vport_init(&vport); - vport.cmd = ODP_VPORT_CMD_SET; + vport.cmd = OVS_VPORT_CMD_SET; vport.name = name; vport.options = options->data; vport.options_len = options->size; @@ -330,7 +330,7 @@ netdev_vport_set_etheraddr(struct netdev *netdev, int error; dpif_linux_vport_init(&vport); - vport.cmd = ODP_VPORT_CMD_SET; + vport.cmd = OVS_VPORT_CMD_SET; vport.name = netdev_get_name(netdev); vport.address = mac; @@ -361,19 +361,43 @@ netdev_vport_get_etheraddr(const struct netdev *netdev, return error; } -static int -netdev_vport_get_mtu(const struct netdev *netdev, int *mtup) -{ - struct dpif_linux_vport reply; - struct ofpbuf *buf; - int error; +#define COPY_OVS_STATS \ + dst->rx_packets = src->rx_packets; \ + dst->tx_packets = src->tx_packets; \ + dst->rx_bytes = src->rx_bytes; \ + dst->tx_bytes = src->tx_bytes; \ + dst->rx_errors = src->rx_errors; \ + dst->tx_errors = src->tx_errors; \ + dst->rx_dropped = src->rx_dropped; \ + dst->tx_dropped = src->tx_dropped; - error = dpif_linux_vport_get(netdev_get_name(netdev), &reply, &buf); - if (!error) { - *mtup = reply.mtu; - ofpbuf_delete(buf); - } - return error; +/* Copies 'src' into 'dst', performing format conversion in the process. */ +static void +netdev_stats_from_ovs_vport_stats(struct netdev_stats *dst, + const struct ovs_vport_stats *src) +{ + COPY_OVS_STATS + dst->multicast = 0; + dst->collisions = 0; + dst->rx_length_errors = 0; + dst->rx_over_errors = 0; + dst->rx_crc_errors = 0; + dst->rx_frame_errors = 0; + dst->rx_fifo_errors = 0; + dst->rx_missed_errors = 0; + dst->tx_aborted_errors = 0; + dst->tx_carrier_errors = 0; + dst->tx_fifo_errors = 0; + dst->tx_heartbeat_errors = 0; + dst->tx_window_errors = 0; +} + +/* Copies 'src' into 'dst', performing format conversion in the process. */ +static void +netdev_stats_to_ovs_vport_stats(struct ovs_vport_stats *dst, + const struct netdev_stats *src) +{ + COPY_OVS_STATS } int @@ -391,7 +415,7 @@ netdev_vport_get_stats(const struct netdev *netdev, struct netdev_stats *stats) return EOPNOTSUPP; } - netdev_stats_from_rtnl_link_stats64(stats, reply.stats); + netdev_stats_from_ovs_vport_stats(stats, reply.stats); ofpbuf_delete(buf); @@ -401,14 +425,14 @@ netdev_vport_get_stats(const struct netdev *netdev, struct netdev_stats *stats) int netdev_vport_set_stats(struct netdev *netdev, const struct netdev_stats *stats) { - struct rtnl_link_stats64 rtnl_stats; + struct ovs_vport_stats rtnl_stats; struct dpif_linux_vport vport; int err; - netdev_stats_to_rtnl_link_stats64(&rtnl_stats, stats); + netdev_stats_to_ovs_vport_stats(&rtnl_stats, stats); dpif_linux_vport_init(&vport); - vport.cmd = ODP_VPORT_CMD_SET; + vport.cmd = OVS_VPORT_CMD_SET; vport.name = netdev_get_name(netdev); vport.stats = &rtnl_stats; @@ -435,7 +459,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")); @@ -481,7 +505,7 @@ netdev_vport_wait(void) static const char * netdev_vport_get_tnl_iface(const struct netdev *netdev) { - struct nlattr *a[ODP_TUNNEL_ATTR_MAX + 1]; + struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1]; ovs_be32 route; struct netdev_dev_vport *ndv; static char name[IFNAMSIZ]; @@ -491,7 +515,7 @@ netdev_vport_get_tnl_iface(const struct netdev *netdev) a)) { return NULL; } - route = nl_attr_get_be32(a[ODP_TUNNEL_ATTR_DST_IPV4]); + route = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]); if (route_table_get_name(route, name)) { return name; @@ -572,20 +596,20 @@ parse_tunnel_config(const char *name, const char *type, if (lookup_ip(node->data, &in_addr)) { VLOG_WARN("%s: bad %s 'local_ip'", name, type); } else { - nl_msg_put_be32(options, ODP_TUNNEL_ATTR_SRC_IPV4, + nl_msg_put_be32(options, OVS_TUNNEL_ATTR_SRC_IPV4, in_addr.s_addr); } } else if (!strcmp(node->name, "tos")) { if (!strcmp(node->data, "inherit")) { flags |= TNL_F_TOS_INHERIT; } else { - nl_msg_put_u8(options, ODP_TUNNEL_ATTR_TOS, atoi(node->data)); + nl_msg_put_u8(options, OVS_TUNNEL_ATTR_TOS, atoi(node->data)); } } else if (!strcmp(node->name, "ttl")) { if (!strcmp(node->data, "inherit")) { flags |= TNL_F_TTL_INHERIT; } else { - nl_msg_put_u8(options, ODP_TUNNEL_ATTR_TTL, atoi(node->data)); + nl_msg_put_u8(options, OVS_TUNNEL_ATTR_TTL, atoi(node->data)); } } else if (!strcmp(node->name, "csum") && is_gre) { if (!strcmp(node->data, "true")) { @@ -634,9 +658,9 @@ parse_tunnel_config(const char *name, const char *type, || !strcmp(node->name, "private_key") || !strcmp(node->name, "use_ssl_cert"))) { /* Ignore options not used by the netdev. */ - } else if (is_gre && (!strcmp(node->name, "key") || - !strcmp(node->name, "in_key") || - !strcmp(node->name, "out_key"))) { + } else if (!strcmp(node->name, "key") || + !strcmp(node->name, "in_key") || + !strcmp(node->name, "out_key")) { /* Handled separately below. */ } else { VLOG_WARN("%s: unknown %s argument '%s'", name, type, node->name); @@ -666,41 +690,39 @@ parse_tunnel_config(const char *name, const char *type, } } - if (is_gre) { - set_key(args, "in_key", ODP_TUNNEL_ATTR_IN_KEY, options); - set_key(args, "out_key", ODP_TUNNEL_ATTR_OUT_KEY, options); - } + set_key(args, "in_key", OVS_TUNNEL_ATTR_IN_KEY, options); + set_key(args, "out_key", OVS_TUNNEL_ATTR_OUT_KEY, options); if (!daddr) { 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); + nl_msg_put_be32(options, OVS_TUNNEL_ATTR_DST_IPV4, daddr); - nl_msg_put_u32(options, ODP_TUNNEL_ATTR_FLAGS, flags); + nl_msg_put_u32(options, OVS_TUNNEL_ATTR_FLAGS, flags); return 0; } static int tnl_port_config_from_nlattr(const struct nlattr *options, size_t options_len, - struct nlattr *a[ODP_TUNNEL_ATTR_MAX + 1]) -{ - static const struct nl_policy odp_tunnel_policy[] = { - [ODP_TUNNEL_ATTR_FLAGS] = { .type = NL_A_U32 }, - [ODP_TUNNEL_ATTR_DST_IPV4] = { .type = NL_A_BE32 }, - [ODP_TUNNEL_ATTR_SRC_IPV4] = { .type = NL_A_BE32, .optional = true }, - [ODP_TUNNEL_ATTR_IN_KEY] = { .type = NL_A_BE64, .optional = true }, - [ODP_TUNNEL_ATTR_OUT_KEY] = { .type = NL_A_BE64, .optional = true }, - [ODP_TUNNEL_ATTR_TOS] = { .type = NL_A_U8, .optional = true }, - [ODP_TUNNEL_ATTR_TTL] = { .type = NL_A_U8, .optional = true }, + struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1]) +{ + static const struct nl_policy ovs_tunnel_policy[] = { + [OVS_TUNNEL_ATTR_FLAGS] = { .type = NL_A_U32 }, + [OVS_TUNNEL_ATTR_DST_IPV4] = { .type = NL_A_BE32 }, + [OVS_TUNNEL_ATTR_SRC_IPV4] = { .type = NL_A_BE32, .optional = true }, + [OVS_TUNNEL_ATTR_IN_KEY] = { .type = NL_A_BE64, .optional = true }, + [OVS_TUNNEL_ATTR_OUT_KEY] = { .type = NL_A_BE64, .optional = true }, + [OVS_TUNNEL_ATTR_TOS] = { .type = NL_A_U8, .optional = true }, + [OVS_TUNNEL_ATTR_TTL] = { .type = NL_A_U8, .optional = true }, }; struct ofpbuf buf; ofpbuf_use_const(&buf, options, options_len); - if (!nl_policy_parse(&buf, 0, odp_tunnel_policy, - a, ARRAY_SIZE(odp_tunnel_policy))) { + if (!nl_policy_parse(&buf, 0, ovs_tunnel_policy, + a, ARRAY_SIZE(ovs_tunnel_policy))) { return EINVAL; } return 0; @@ -717,7 +739,7 @@ unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED, const struct nlattr *options, size_t options_len, struct shash *args) { - struct nlattr *a[ODP_TUNNEL_ATTR_MAX + 1]; + struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1]; ovs_be32 daddr; uint32_t flags; int error; @@ -727,36 +749,36 @@ unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED, return error; } - flags = nl_attr_get_u32(a[ODP_TUNNEL_ATTR_FLAGS]); + flags = nl_attr_get_u32(a[OVS_TUNNEL_ATTR_FLAGS]); if (!(flags & TNL_F_HDR_CACHE) == !(flags & TNL_F_IPSEC)) { smap_add(args, "header_cache", flags & TNL_F_HDR_CACHE ? "true" : "false"); } - daddr = nl_attr_get_be32(a[ODP_TUNNEL_ATTR_DST_IPV4]); + daddr = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]); shash_add(args, "remote_ip", xasprintf(IP_FMT, IP_ARGS(&daddr))); - if (a[ODP_TUNNEL_ATTR_SRC_IPV4]) { - ovs_be32 saddr = nl_attr_get_be32(a[ODP_TUNNEL_ATTR_SRC_IPV4]); + if (a[OVS_TUNNEL_ATTR_SRC_IPV4]) { + ovs_be32 saddr = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_SRC_IPV4]); shash_add(args, "local_ip", xasprintf(IP_FMT, IP_ARGS(&saddr))); } - if (!a[ODP_TUNNEL_ATTR_IN_KEY] && !a[ODP_TUNNEL_ATTR_OUT_KEY]) { + if (!a[OVS_TUNNEL_ATTR_IN_KEY] && !a[OVS_TUNNEL_ATTR_OUT_KEY]) { smap_add(args, "key", "flow"); } else { - uint64_t in_key = get_be64_or_zero(a[ODP_TUNNEL_ATTR_IN_KEY]); - uint64_t out_key = get_be64_or_zero(a[ODP_TUNNEL_ATTR_OUT_KEY]); + uint64_t in_key = get_be64_or_zero(a[OVS_TUNNEL_ATTR_IN_KEY]); + uint64_t out_key = get_be64_or_zero(a[OVS_TUNNEL_ATTR_OUT_KEY]); if (in_key && in_key == out_key) { shash_add(args, "key", xasprintf("%"PRIu64, in_key)); } else { - if (!a[ODP_TUNNEL_ATTR_IN_KEY]) { + if (!a[OVS_TUNNEL_ATTR_IN_KEY]) { smap_add(args, "in_key", "flow"); } else if (in_key) { shash_add(args, "in_key", xasprintf("%"PRIu64, in_key)); } - if (!a[ODP_TUNNEL_ATTR_OUT_KEY]) { + if (!a[OVS_TUNNEL_ATTR_OUT_KEY]) { smap_add(args, "out_key", "flow"); } else if (out_key) { shash_add(args, "out_key", xasprintf("%"PRIu64, out_key)); @@ -766,15 +788,15 @@ unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED, if (flags & TNL_F_TTL_INHERIT) { smap_add(args, "tos", "inherit"); - } else if (a[ODP_TUNNEL_ATTR_TTL]) { - int ttl = nl_attr_get_u8(a[ODP_TUNNEL_ATTR_TTL]); + } else if (a[OVS_TUNNEL_ATTR_TTL]) { + int ttl = nl_attr_get_u8(a[OVS_TUNNEL_ATTR_TTL]); shash_add(args, "tos", xasprintf("%d", ttl)); } if (flags & TNL_F_TOS_INHERIT) { smap_add(args, "tos", "inherit"); - } else if (a[ODP_TUNNEL_ATTR_TOS]) { - int tos = nl_attr_get_u8(a[ODP_TUNNEL_ATTR_TOS]); + } else if (a[OVS_TUNNEL_ATTR_TOS]) { + int tos = nl_attr_get_u8(a[OVS_TUNNEL_ATTR_TOS]); shash_add(args, "tos", xasprintf("%d", tos)); } @@ -821,7 +843,7 @@ parse_patch_config(const char *name, const char *type OVS_UNUSED, return EINVAL; } - nl_msg_put_string(options, ODP_PATCH_ATTR_PEER, peer); + nl_msg_put_string(options, OVS_PATCH_ATTR_PEER, peer); return 0; } @@ -831,22 +853,22 @@ unparse_patch_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED, const struct nlattr *options, size_t options_len, struct shash *args) { - static const struct nl_policy odp_patch_policy[] = { - [ODP_PATCH_ATTR_PEER] = { .type = NL_A_STRING, + static const struct nl_policy ovs_patch_policy[] = { + [OVS_PATCH_ATTR_PEER] = { .type = NL_A_STRING, .max_len = IFNAMSIZ, .optional = false } }; - struct nlattr *a[ARRAY_SIZE(odp_patch_policy)]; + struct nlattr *a[ARRAY_SIZE(ovs_patch_policy)]; struct ofpbuf buf; ofpbuf_use_const(&buf, options, options_len); - if (!nl_policy_parse(&buf, 0, odp_patch_policy, - a, ARRAY_SIZE(odp_patch_policy))) { + if (!nl_policy_parse(&buf, 0, ovs_patch_policy, + a, ARRAY_SIZE(ovs_patch_policy))) { return EINVAL; } - smap_add(args, "peer", nl_attr_get_string(a[ODP_PATCH_ATTR_PEER])); + smap_add(args, "peer", nl_attr_get_string(a[OVS_PATCH_ATTR_PEER])); return 0; } @@ -875,7 +897,8 @@ unparse_patch_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED, \ netdev_vport_set_etheraddr, \ netdev_vport_get_etheraddr, \ - netdev_vport_get_mtu, \ + NULL, /* get_mtu */ \ + NULL, /* set_mtu */ \ NULL, /* get_ifindex */ \ NULL, /* get_carrier */ \ NULL, /* get_miimon */ \ @@ -914,19 +937,19 @@ void netdev_vport_register(void) { static const struct vport_class vport_classes[] = { - { ODP_VPORT_TYPE_GRE, + { OVS_VPORT_TYPE_GRE, { "gre", VPORT_FUNCTIONS(netdev_vport_get_status) }, parse_tunnel_config, unparse_tunnel_config }, - { ODP_VPORT_TYPE_GRE, + { OVS_VPORT_TYPE_GRE, { "ipsec_gre", VPORT_FUNCTIONS(netdev_vport_get_status) }, parse_tunnel_config, unparse_tunnel_config }, - { ODP_VPORT_TYPE_CAPWAP, + { OVS_VPORT_TYPE_CAPWAP, { "capwap", VPORT_FUNCTIONS(netdev_vport_get_status) }, parse_tunnel_config, unparse_tunnel_config }, - { ODP_VPORT_TYPE_PATCH, + { OVS_VPORT_TYPE_PATCH, { "patch", VPORT_FUNCTIONS(NULL) }, parse_patch_config, unparse_patch_config } };