X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-linux.c;h=3d081aab50a67aee5ef1899dd98bdbf3d7a955d1;hb=f613a0d72c521ca3a4eeb2c29ac523f6fdf72667;hp=1d7249c227558cd24795cca61f85af2a12d6aab1;hpb=21d6e22eeec05a1c382178dc2eb840afe3b9cca6;p=sliver-openvswitch.git diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index 1d7249c22..3d081aab5 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,8 @@ */ #include -#include "dpif.h" + +#include "dpif-linux.h" #include #include @@ -24,57 +25,149 @@ #include #include #include -#include #include #include #include #include -#include #include #include +#include "bitmap.h" #include "dpif-provider.h" +#include "dynamic-string.h" +#include "flow.h" #include "netdev.h" +#include "netdev-linux.h" #include "netdev-vport.h" +#include "netlink-notifier.h" +#include "netlink-socket.h" +#include "netlink.h" +#include "odp-util.h" #include "ofpbuf.h" #include "openvswitch/tunnel.h" +#include "packets.h" #include "poll-loop.h" -#include "rtnetlink.h" -#include "rtnetlink-link.h" #include "shash.h" -#include "svec.h" +#include "sset.h" +#include "unaligned.h" #include "util.h" #include "vlog.h" VLOG_DEFINE_THIS_MODULE(dpif_linux); +enum { LRU_MAX_PORTS = 1024 }; +enum { LRU_MASK = LRU_MAX_PORTS - 1}; +BUILD_ASSERT_DECL(IS_POW2(LRU_MAX_PORTS)); + +/* This ethtool flag was introduced in Linux 2.6.24, so it might be + * missing if we have old headers. */ +#define ETH_FLAG_LRO (1 << 15) /* LRO is enabled */ + +struct dpif_linux_dp { + /* Generic Netlink header. */ + uint8_t cmd; + + /* struct ovs_header. */ + int dp_ifindex; + + /* Attributes. */ + const char *name; /* OVS_DP_ATTR_NAME. */ + struct ovs_dp_stats stats; /* OVS_DP_ATTR_STATS. */ + enum ovs_frag_handling ipv4_frags; /* OVS_DP_ATTR_IPV4_FRAGS. */ + const uint32_t *sampling; /* OVS_DP_ATTR_SAMPLING. */ + uint32_t mcgroups[DPIF_N_UC_TYPES]; /* OVS_DP_ATTR_MCGROUPS. */ +}; + +static void dpif_linux_dp_init(struct dpif_linux_dp *); +static int dpif_linux_dp_from_ofpbuf(struct dpif_linux_dp *, + const struct ofpbuf *); +static void dpif_linux_dp_dump_start(struct nl_dump *); +static int dpif_linux_dp_transact(const struct dpif_linux_dp *request, + struct dpif_linux_dp *reply, + struct ofpbuf **bufp); +static int dpif_linux_dp_get(const struct dpif *, struct dpif_linux_dp *reply, + struct ofpbuf **bufp); + +struct dpif_linux_flow { + /* Generic Netlink header. */ + uint8_t cmd; + + /* struct ovs_header. */ + unsigned int nlmsg_flags; + int dp_ifindex; + + /* Attributes. + * + * The 'stats' and 'used' members point to 64-bit data that might only be + * aligned on 32-bit boundaries, so get_unaligned_u64() should be used to + * access their values. + * + * If 'actions' is nonnull then OVS_FLOW_ATTR_ACTIONS will be included in + * the Netlink version of the command, even if actions_len is zero. */ + const struct nlattr *key; /* OVS_FLOW_ATTR_KEY. */ + size_t key_len; + const struct nlattr *actions; /* OVS_FLOW_ATTR_ACTIONS. */ + size_t actions_len; + const struct ovs_flow_stats *stats; /* OVS_FLOW_ATTR_STATS. */ + const uint8_t *tcp_flags; /* OVS_FLOW_ATTR_TCP_FLAGS. */ + const uint64_t *used; /* OVS_FLOW_ATTR_USED. */ + bool clear; /* OVS_FLOW_ATTR_CLEAR. */ +}; + +static void dpif_linux_flow_init(struct dpif_linux_flow *); +static int dpif_linux_flow_from_ofpbuf(struct dpif_linux_flow *, + const struct ofpbuf *); +static void dpif_linux_flow_to_ofpbuf(const struct dpif_linux_flow *, + struct ofpbuf *); +static int dpif_linux_flow_transact(const struct dpif_linux_flow *request, + struct dpif_linux_flow *reply, + struct ofpbuf **bufp); +static void dpif_linux_flow_get_stats(const struct dpif_linux_flow *, + struct dpif_flow_stats *); + /* Datapath interface for the openvswitch Linux kernel module. */ struct dpif_linux { struct dpif dpif; - int fd; + int dp_ifindex; - /* Used by dpif_linux_get_all_names(). */ - char *local_ifname; - int minor; + /* Multicast group messages. */ + struct nl_sock *mc_sock; + uint32_t mcgroups[DPIF_N_UC_TYPES]; + unsigned int listen_mask; /* Change notification. */ - int local_ifindex; /* Ifindex of local port. */ - struct shash changed_ports; /* Ports that have changed. */ - struct rtnetlink_notifier port_notifier; + struct sset changed_ports; /* Ports that have changed. */ + struct nln_notifier port_notifier; bool change_error; + + /* Queue of unused ports. */ + unsigned long *lru_bitmap; + uint16_t lru_ports[LRU_MAX_PORTS]; + size_t lru_head; + size_t lru_tail; }; static struct vlog_rate_limit error_rl = VLOG_RATE_LIMIT_INIT(9999, 5); -static int do_ioctl(const struct dpif *, int cmd, const void *arg); -static int lookup_minor(const char *name, int *minor); -static int finish_open(struct dpif *, const char *local_ifname); -static int get_openvswitch_major(void); -static int create_minor(const char *name, int minor, struct dpif **dpifp); -static int open_minor(int minor, struct dpif **dpifp); -static int make_openvswitch_device(int minor, char **fnp); -static void dpif_linux_port_changed(const struct rtnetlink_link_change *, - void *dpif); +/* Generic Netlink family numbers for OVS. */ +static int ovs_datapath_family; +static int ovs_vport_family; +static int ovs_flow_family; +static int ovs_packet_family; + +/* Generic Netlink socket. */ +static struct nl_sock *genl_sock; +static struct nln *nln = NULL; + +static int dpif_linux_init(void); +static int open_dpif(const struct dpif_linux_dp *, struct dpif **); +static bool dpif_linux_nln_parse(struct ofpbuf *, void *); +static void dpif_linux_port_changed(const void *vport, void *dpif); + +static void dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *, + struct ofpbuf *); +static int dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *, + const struct ofpbuf *); static struct dpif_linux * dpif_linux_cast(const struct dpif *dpif) @@ -83,264 +176,411 @@ dpif_linux_cast(const struct dpif *dpif) return CONTAINER_OF(dpif, struct dpif_linux, dpif); } +static void +dpif_linux_push_port(struct dpif_linux *dp, uint16_t port) +{ + if (port < LRU_MAX_PORTS && !bitmap_is_set(dp->lru_bitmap, port)) { + bitmap_set1(dp->lru_bitmap, port); + dp->lru_ports[dp->lru_head++ & LRU_MASK] = port; + } +} + +static uint32_t +dpif_linux_pop_port(struct dpif_linux *dp) +{ + uint16_t port; + + if (dp->lru_head == dp->lru_tail) { + return UINT32_MAX; + } + + port = dp->lru_ports[dp->lru_tail++ & LRU_MASK]; + bitmap_set0(dp->lru_bitmap, port); + return port; +} + static int -dpif_linux_enumerate(struct svec *all_dps) +dpif_linux_enumerate(struct sset *all_dps) { - int major; + struct nl_dump dump; + struct ofpbuf msg; int error; - int i; - /* Check that the Open vSwitch module is loaded. */ - major = get_openvswitch_major(); - if (major < 0) { - return -major; + error = dpif_linux_init(); + if (error) { + return error; } - error = 0; - for (i = 0; i < ODP_MAX; i++) { - struct dpif *dpif; - char devname[16]; - int retval; + dpif_linux_dp_dump_start(&dump); + while (nl_dump_next(&dump, &msg)) { + struct dpif_linux_dp dp; - sprintf(devname, "dp%d", i); - retval = dpif_open(devname, "system", &dpif); - if (!retval) { - svec_add(all_dps, devname); - dpif_uninit(dpif, true); - } else if (retval != ENODEV && !error) { - error = retval; + if (!dpif_linux_dp_from_ofpbuf(&dp, &msg)) { + sset_add(all_dps, dp.name); } } - return error; + return nl_dump_done(&dump); } static int dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name, bool create, struct dpif **dpifp) { - int minor; + struct dpif_linux_dp dp_request, dp; + struct ofpbuf *buf; + int error; - minor = !strncmp(name, "dp", 2) - && isdigit((unsigned char)name[2]) ? atoi(name + 2) : -1; - if (create) { - if (minor >= 0) { - return create_minor(name, minor, dpifp); - } else { - /* Scan for unused minor number. */ - for (minor = 0; minor < ODP_MAX; minor++) { - int error = create_minor(name, minor, dpifp); - if (error != EBUSY) { - return error; - } - } + error = dpif_linux_init(); + if (error) { + return error; + } - /* All datapath numbers in use. */ - return ENOBUFS; - } - } else { - struct dpif_linux *dpif; - struct odp_port port; - int error; - - if (minor < 0) { - error = lookup_minor(name, &minor); - if (error) { - return error; - } - } + /* Create or look up datapath. */ + dpif_linux_dp_init(&dp_request); + dp_request.cmd = create ? OVS_DP_CMD_NEW : OVS_DP_CMD_GET; + dp_request.name = name; + error = dpif_linux_dp_transact(&dp_request, &dp, &buf); + if (error) { + return error; + } + error = open_dpif(&dp, dpifp); + ofpbuf_delete(buf); - error = open_minor(minor, dpifp); - if (error) { - return error; - } - dpif = dpif_linux_cast(*dpifp); - - /* We need the local port's ifindex for the poll function. Start by - * getting the local port's name. */ - memset(&port, 0, sizeof port); - port.port = ODPP_LOCAL; - if (ioctl(dpif->fd, ODP_VPORT_QUERY, &port)) { - error = errno; - if (error != ENODEV) { - VLOG_WARN("%s: probe returned unexpected error: %s", - dpif_name(*dpifp), strerror(error)); - } - dpif_uninit(*dpifp, true); - return error; - } + return error; +} + +static int +open_dpif(const struct dpif_linux_dp *dp, struct dpif **dpifp) +{ + struct dpif_linux *dpif; + int error; + int i; + + dpif = xmalloc(sizeof *dpif); + error = nln_notifier_register(nln, &dpif->port_notifier, + dpif_linux_port_changed, dpif); + if (error) { + goto error_free; + } + + dpif_init(&dpif->dpif, &dpif_linux_class, dp->name, + dp->dp_ifindex, dp->dp_ifindex); - /* Then use that to finish up opening. */ - return finish_open(&dpif->dpif, port.devname); + dpif->mc_sock = NULL; + for (i = 0; i < DPIF_N_UC_TYPES; i++) { + dpif->mcgroups[i] = dp->mcgroups[i]; } + dpif->listen_mask = 0; + dpif->dp_ifindex = dp->dp_ifindex; + sset_init(&dpif->changed_ports); + dpif->change_error = false; + *dpifp = &dpif->dpif; + + dpif->lru_head = dpif->lru_tail = 0; + dpif->lru_bitmap = bitmap_allocate(LRU_MAX_PORTS); + bitmap_set1(dpif->lru_bitmap, OVSP_LOCAL); + for (i = 1; i < LRU_MAX_PORTS; i++) { + dpif_linux_push_port(dpif, i); + } + return 0; + +error_free: + free(dpif); + return error; } static void dpif_linux_close(struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - rtnetlink_link_notifier_unregister(&dpif->port_notifier); - shash_destroy(&dpif->changed_ports); - free(dpif->local_ifname); - close(dpif->fd); + + if (nln) { + nln_notifier_unregister(nln, &dpif->port_notifier); + } + + nl_sock_destroy(dpif->mc_sock); + sset_destroy(&dpif->changed_ports); + free(dpif->lru_bitmap); free(dpif); } static int -dpif_linux_get_all_names(const struct dpif *dpif_, struct svec *all_names) +dpif_linux_destroy(struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_dp dp; - svec_add_nocopy(all_names, xasprintf("dp%d", dpif->minor)); - svec_add(all_names, dpif->local_ifname); - return 0; + dpif_linux_dp_init(&dp); + dp.cmd = OVS_DP_CMD_DEL; + dp.dp_ifindex = dpif->dp_ifindex; + return dpif_linux_dp_transact(&dp, NULL, NULL); } -static int -dpif_linux_destroy(struct dpif *dpif_) +static void +dpif_linux_run(struct dpif *dpif OVS_UNUSED) { - return do_ioctl(dpif_, ODP_DP_DESTROY, NULL); + if (nln) { + nln_notifier_run(nln); + } } -static int -dpif_linux_get_stats(const struct dpif *dpif_, struct odp_stats *stats) +static void +dpif_linux_wait(struct dpif *dpif OVS_UNUSED) { - memset(stats, 0, sizeof *stats); - return do_ioctl(dpif_, ODP_DP_STATS, stats); + if (nln) { + nln_notifier_wait(nln); + } } static int -dpif_linux_get_drop_frags(const struct dpif *dpif_, bool *drop_fragsp) +dpif_linux_get_stats(const struct dpif *dpif_, struct ovs_dp_stats *stats) { - int drop_frags; + struct dpif_linux_dp dp; + struct ofpbuf *buf; int error; - error = do_ioctl(dpif_, ODP_GET_DROP_FRAGS, &drop_frags); + error = dpif_linux_dp_get(dpif_, &dp, &buf); if (!error) { - *drop_fragsp = drop_frags & 1; + *stats = dp.stats; + ofpbuf_delete(buf); } return error; } static int -dpif_linux_set_drop_frags(struct dpif *dpif_, bool drop_frags) -{ - int drop_frags_int = drop_frags; - return do_ioctl(dpif_, ODP_SET_DROP_FRAGS, &drop_frags_int); -} - -static void -translate_vport_type_to_netdev_type(struct odp_port *port) +dpif_linux_get_drop_frags(const struct dpif *dpif_, bool *drop_fragsp) { - char *type = port->type; - - if (!strcmp(type, "netdev")) { - ovs_strlcpy(type, "system", sizeof port->type); - } else if (!strcmp(type, "gre")) { - const struct tnl_port_config *config; + struct dpif_linux_dp dp; + struct ofpbuf *buf; + int error; - config = (struct tnl_port_config *)port->config; - if (config->flags & TNL_F_IPSEC) { - ovs_strlcpy(type, "ipsec_gre", sizeof port->type); - } + error = dpif_linux_dp_get(dpif_, &dp, &buf); + if (!error) { + *drop_fragsp = dp.ipv4_frags == OVS_DP_FRAG_DROP; + ofpbuf_delete(buf); } + return error; } -static void -translate_netdev_type_to_vport_type(struct odp_port *port) +static int +dpif_linux_set_drop_frags(struct dpif *dpif_, bool drop_frags) { - char *type = port->type; + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_dp dp; - if (!strcmp(type, "system")) { - ovs_strlcpy(type, "netdev", sizeof port->type); - } else if (!strcmp(type, "ipsec_gre")) { - ovs_strlcpy(type, "gre", sizeof port->type); - } + dpif_linux_dp_init(&dp); + dp.cmd = OVS_DP_CMD_SET; + dp.dp_ifindex = dpif->dp_ifindex; + dp.ipv4_frags = drop_frags ? OVS_DP_FRAG_DROP : OVS_DP_FRAG_ZERO; + return dpif_linux_dp_transact(&dp, NULL, NULL); } static int -dpif_linux_port_add(struct dpif *dpif, struct netdev *netdev, +dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev, uint16_t *port_nop) { + struct dpif_linux *dpif = dpif_linux_cast(dpif_); const char *name = netdev_get_name(netdev); const char *type = netdev_get_type(netdev); - struct odp_port port; + struct dpif_linux_vport request, reply; + const struct ofpbuf *options; + struct ofpbuf *buf; int error; - memset(&port, 0, sizeof port); - strncpy(port.devname, name, sizeof port.devname); - strncpy(port.type, type, sizeof port.type); - netdev_vport_get_config(netdev, port.config); - translate_netdev_type_to_vport_type(&port); + dpif_linux_vport_init(&request); + request.cmd = OVS_VPORT_CMD_NEW; + request.dp_ifindex = dpif->dp_ifindex; + request.type = netdev_vport_get_vport_type(netdev); + if (request.type == OVS_VPORT_TYPE_UNSPEC) { + VLOG_WARN_RL(&error_rl, "%s: cannot create port `%s' because it has " + "unsupported type `%s'", + dpif_name(dpif_), name, type); + return EINVAL; + } + request.name = name; + + options = netdev_vport_get_options(netdev); + if (options && options->size) { + request.options = options->data; + request.options_len = options->size; + } - error = do_ioctl(dpif, ODP_VPORT_ATTACH, &port); - if (!error) { - *port_nop = port.port; + if (request.type == OVS_VPORT_TYPE_NETDEV) { + netdev_linux_ethtool_set_flag(netdev, ETH_FLAG_LRO, "LRO", false); } + /* Loop until we find a port that isn't used. */ + do { + request.port_no = dpif_linux_pop_port(dpif); + error = dpif_linux_vport_transact(&request, &reply, &buf); + + if (!error) { + *port_nop = reply.port_no; + } + ofpbuf_delete(buf); + } while (request.port_no != UINT32_MAX + && (error == EBUSY || error == EFBIG)); + return error; } static int -dpif_linux_port_del(struct dpif *dpif_, uint16_t port_no_) +dpif_linux_port_del(struct dpif *dpif_, uint16_t port_no) { - int port_no = port_no_; /* Kernel expects an "int". */ - return do_ioctl(dpif_, ODP_VPORT_DETACH, &port_no); + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_vport vport; + int error; + + dpif_linux_vport_init(&vport); + vport.cmd = OVS_VPORT_CMD_DEL; + vport.dp_ifindex = dpif->dp_ifindex; + vport.port_no = port_no; + error = dpif_linux_vport_transact(&vport, NULL, NULL); + + if (!error) { + dpif_linux_push_port(dpif, port_no); + } + return error; } static int -dpif_linux_port_query__(const struct dpif *dpif, struct odp_port *port) +dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no, + const char *port_name, struct dpif_port *dpif_port) { - int error = do_ioctl(dpif, ODP_VPORT_QUERY, port); + struct dpif_linux_vport request; + struct dpif_linux_vport reply; + struct ofpbuf *buf; + int error; + + dpif_linux_vport_init(&request); + request.cmd = OVS_VPORT_CMD_GET; + request.dp_ifindex = dpif_linux_cast(dpif)->dp_ifindex; + request.port_no = port_no; + request.name = port_name; + + error = dpif_linux_vport_transact(&request, &reply, &buf); if (!error) { - translate_vport_type_to_netdev_type(port); + dpif_port->name = xstrdup(reply.name); + dpif_port->type = xstrdup(netdev_vport_get_netdev_type(&reply)); + dpif_port->port_no = reply.port_no; + ofpbuf_delete(buf); } return error; } static int dpif_linux_port_query_by_number(const struct dpif *dpif, uint16_t port_no, - struct odp_port *port) + struct dpif_port *dpif_port) { - memset(port, 0, sizeof *port); - port->port = port_no; - return dpif_linux_port_query__(dpif, port); + return dpif_linux_port_query__(dpif, port_no, NULL, dpif_port); } static int dpif_linux_port_query_by_name(const struct dpif *dpif, const char *devname, - struct odp_port *port) + struct dpif_port *dpif_port) +{ + return dpif_linux_port_query__(dpif, 0, devname, dpif_port); +} + +static int +dpif_linux_get_max_ports(const struct dpif *dpif OVS_UNUSED) { - memset(port, 0, sizeof *port); - strncpy(port->devname, devname, sizeof port->devname); - return dpif_linux_port_query__(dpif, port); + /* If the datapath increases its range of supported ports, then it should + * start reporting that. */ + return 1024; } static int dpif_linux_flow_flush(struct dpif *dpif_) { - return do_ioctl(dpif_, ODP_FLOW_FLUSH, NULL); + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_flow flow; + + dpif_linux_flow_init(&flow); + flow.cmd = OVS_FLOW_CMD_DEL; + flow.dp_ifindex = dpif->dp_ifindex; + return dpif_linux_flow_transact(&flow, NULL, NULL); +} + +struct dpif_linux_port_state { + struct nl_dump dump; + unsigned long *port_bitmap; /* Ports in the datapath. */ + bool complete; /* Dump completed without error. */ +}; + +static int +dpif_linux_port_dump_start(const struct dpif *dpif_, void **statep) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_port_state *state; + struct dpif_linux_vport request; + struct ofpbuf *buf; + + *statep = state = xmalloc(sizeof *state); + state->port_bitmap = bitmap_allocate(LRU_MAX_PORTS); + state->complete = false; + + dpif_linux_vport_init(&request); + request.cmd = OVS_DP_CMD_GET; + request.dp_ifindex = dpif->dp_ifindex; + + buf = ofpbuf_new(1024); + dpif_linux_vport_to_ofpbuf(&request, buf); + nl_dump_start(&state->dump, genl_sock, buf); + ofpbuf_delete(buf); + + return 0; } static int -dpif_linux_port_list(const struct dpif *dpif_, struct odp_port *ports, int n) +dpif_linux_port_dump_next(const struct dpif *dpif OVS_UNUSED, void *state_, + struct dpif_port *dpif_port) { - struct odp_portvec pv; - unsigned int i; + struct dpif_linux_port_state *state = state_; + struct dpif_linux_vport vport; + struct ofpbuf buf; int error; - pv.ports = ports; - pv.n_ports = n; - error = do_ioctl(dpif_, ODP_VPORT_LIST, &pv); + if (!nl_dump_next(&state->dump, &buf)) { + state->complete = true; + return EOF; + } + + error = dpif_linux_vport_from_ofpbuf(&vport, &buf); if (error) { - return -error; + return error; + } + + if (vport.port_no < LRU_MAX_PORTS) { + bitmap_set1(state->port_bitmap, vport.port_no); } - for (i = 0; i < pv.n_ports; i++) { - struct odp_port *port = &pv.ports[i]; + dpif_port->name = (char *) vport.name; + dpif_port->type = (char *) netdev_vport_get_netdev_type(&vport); + dpif_port->port_no = vport.port_no; + return 0; +} - translate_vport_type_to_netdev_type(port); +static int +dpif_linux_port_dump_done(const struct dpif *dpif_, void *state_) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_port_state *state = state_; + int error = nl_dump_done(&state->dump); + + if (state->complete) { + uint16_t i; + + for (i = 0; i < LRU_MAX_PORTS; i++) { + if (!bitmap_is_set(state->port_bitmap, i)) { + dpif_linux_push_port(dpif, i); + } + } } - return pv.n_ports; + + free(state->port_bitmap); + free(state); + return error; } static int @@ -350,11 +590,10 @@ dpif_linux_port_poll(const struct dpif *dpif_, char **devnamep) if (dpif->change_error) { dpif->change_error = false; - shash_clear(&dpif->changed_ports); + sset_clear(&dpif->changed_ports); return ENOBUFS; - } else if (!shash_is_empty(&dpif->changed_ports)) { - struct shash_node *node = shash_first(&dpif->changed_ports); - *devnamep = shash_steal(&dpif->changed_ports, node); + } else if (!sset_is_empty(&dpif->changed_ports)) { + *devnamep = sset_pop(&dpif->changed_ports); return 0; } else { return EAGAIN; @@ -365,83 +604,322 @@ static void dpif_linux_port_poll_wait(const struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - if (!shash_is_empty(&dpif->changed_ports) || dpif->change_error) { + if (!sset_is_empty(&dpif->changed_ports) || dpif->change_error) { poll_immediate_wake(); - } else { - rtnetlink_link_notifier_wait(); } } static int -dpif_linux_flow_get(const struct dpif *dpif_, struct odp_flow flows[], int n) +dpif_linux_flow_get__(const struct dpif *dpif_, + const struct nlattr *key, size_t key_len, + struct dpif_linux_flow *reply, struct ofpbuf **bufp) { - struct odp_flowvec fv; - fv.flows = flows; - fv.n_flows = n; - return do_ioctl(dpif_, ODP_FLOW_GET, &fv); + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_flow request; + + dpif_linux_flow_init(&request); + request.cmd = OVS_FLOW_CMD_GET; + request.dp_ifindex = dpif->dp_ifindex; + request.key = key; + request.key_len = key_len; + return dpif_linux_flow_transact(&request, reply, bufp); } static int -dpif_linux_flow_put(struct dpif *dpif_, struct odp_flow_put *put) +dpif_linux_flow_get(const struct dpif *dpif_, + const struct nlattr *key, size_t key_len, + struct ofpbuf **actionsp, struct dpif_flow_stats *stats) { - return do_ioctl(dpif_, ODP_FLOW_PUT, put); + struct dpif_linux_flow reply; + struct ofpbuf *buf; + int error; + + error = dpif_linux_flow_get__(dpif_, key, key_len, &reply, &buf); + if (!error) { + if (stats) { + dpif_linux_flow_get_stats(&reply, stats); + } + if (actionsp) { + buf->data = (void *) reply.actions; + buf->size = reply.actions_len; + *actionsp = buf; + } else { + ofpbuf_delete(buf); + } + } + return error; } static int -dpif_linux_flow_del(struct dpif *dpif_, struct odp_flow *flow) +dpif_linux_flow_put(struct dpif *dpif_, enum dpif_flow_put_flags flags, + const struct nlattr *key, size_t key_len, + const struct nlattr *actions, size_t actions_len, + struct dpif_flow_stats *stats) { - return do_ioctl(dpif_, ODP_FLOW_DEL, flow); + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_flow request, reply; + struct nlattr dummy_action; + struct ofpbuf *buf; + int error; + + dpif_linux_flow_init(&request); + request.cmd = flags & DPIF_FP_CREATE ? OVS_FLOW_CMD_NEW : OVS_FLOW_CMD_SET; + request.dp_ifindex = dpif->dp_ifindex; + request.key = key; + request.key_len = key_len; + /* Ensure that OVS_FLOW_ATTR_ACTIONS will always be included. */ + request.actions = actions ? actions : &dummy_action; + request.actions_len = actions_len; + if (flags & DPIF_FP_ZERO_STATS) { + request.clear = true; + } + request.nlmsg_flags = flags & DPIF_FP_MODIFY ? 0 : NLM_F_CREATE; + error = dpif_linux_flow_transact(&request, + stats ? &reply : NULL, + stats ? &buf : NULL); + if (!error && stats) { + dpif_linux_flow_get_stats(&reply, stats); + ofpbuf_delete(buf); + } + return error; } static int -dpif_linux_flow_list(const struct dpif *dpif_, struct odp_flow flows[], int n) +dpif_linux_flow_del(struct dpif *dpif_, + const struct nlattr *key, size_t key_len, + struct dpif_flow_stats *stats) { - struct odp_flowvec fv; + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_flow request, reply; + struct ofpbuf *buf; int error; - fv.flows = flows; - fv.n_flows = n; - error = do_ioctl(dpif_, ODP_FLOW_LIST, &fv); - return error ? -error : fv.n_flows; + dpif_linux_flow_init(&request); + request.cmd = OVS_FLOW_CMD_DEL; + request.dp_ifindex = dpif->dp_ifindex; + request.key = key; + request.key_len = key_len; + error = dpif_linux_flow_transact(&request, + stats ? &reply : NULL, + stats ? &buf : NULL); + if (!error && stats) { + dpif_linux_flow_get_stats(&reply, stats); + ofpbuf_delete(buf); + } + return error; +} + +struct dpif_linux_flow_state { + struct nl_dump dump; + struct dpif_linux_flow flow; + struct dpif_flow_stats stats; + struct ofpbuf *buf; +}; + +static int +dpif_linux_flow_dump_start(const struct dpif *dpif_, void **statep) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_flow_state *state; + struct dpif_linux_flow request; + struct ofpbuf *buf; + + *statep = state = xmalloc(sizeof *state); + + dpif_linux_flow_init(&request); + request.cmd = OVS_DP_CMD_GET; + request.dp_ifindex = dpif->dp_ifindex; + + buf = ofpbuf_new(1024); + dpif_linux_flow_to_ofpbuf(&request, buf); + nl_dump_start(&state->dump, genl_sock, buf); + ofpbuf_delete(buf); + + state->buf = NULL; + + return 0; +} + +static int +dpif_linux_flow_dump_next(const struct dpif *dpif_ OVS_UNUSED, void *state_, + const struct nlattr **key, size_t *key_len, + const struct nlattr **actions, size_t *actions_len, + const struct dpif_flow_stats **stats) +{ + struct dpif_linux_flow_state *state = state_; + struct ofpbuf buf; + int error; + + do { + ofpbuf_delete(state->buf); + state->buf = NULL; + + if (!nl_dump_next(&state->dump, &buf)) { + return EOF; + } + + error = dpif_linux_flow_from_ofpbuf(&state->flow, &buf); + if (error) { + return error; + } + + if (actions && !state->flow.actions) { + error = dpif_linux_flow_get__(dpif_, state->flow.key, + state->flow.key_len, + &state->flow, &state->buf); + if (error == ENOENT) { + VLOG_DBG("dumped flow disappeared on get"); + } else if (error) { + VLOG_WARN("error fetching dumped flow: %s", strerror(error)); + } + } + } while (error); + + if (actions) { + *actions = state->flow.actions; + *actions_len = state->flow.actions_len; + } + if (key) { + *key = state->flow.key; + *key_len = state->flow.key_len; + } + if (stats) { + dpif_linux_flow_get_stats(&state->flow, &state->stats); + *stats = &state->stats; + } + return error; +} + +static int +dpif_linux_flow_dump_done(const struct dpif *dpif OVS_UNUSED, void *state_) +{ + struct dpif_linux_flow_state *state = state_; + int error = nl_dump_done(&state->dump); + ofpbuf_delete(state->buf); + free(state); + return error; +} + +static int +dpif_linux_execute__(int dp_ifindex, + const struct nlattr *key, size_t key_len, + const struct nlattr *actions, size_t actions_len, + const struct ofpbuf *packet) +{ + struct ovs_header *execute; + struct ofpbuf *buf; + int error; + + buf = ofpbuf_new(128 + actions_len + packet->size); + + nl_msg_put_genlmsghdr(buf, 0, ovs_packet_family, NLM_F_REQUEST, + OVS_PACKET_CMD_EXECUTE, 1); + + execute = ofpbuf_put_uninit(buf, sizeof *execute); + execute->dp_ifindex = dp_ifindex; + + nl_msg_put_unspec(buf, OVS_PACKET_ATTR_PACKET, packet->data, packet->size); + nl_msg_put_unspec(buf, OVS_PACKET_ATTR_KEY, key, key_len); + nl_msg_put_unspec(buf, OVS_PACKET_ATTR_ACTIONS, actions, actions_len); + + error = nl_sock_transact(genl_sock, buf, NULL); + ofpbuf_delete(buf); + return error; } static int dpif_linux_execute(struct dpif *dpif_, + const struct nlattr *key, size_t key_len, const struct nlattr *actions, size_t actions_len, - const struct ofpbuf *buf) + const struct ofpbuf *packet) { - struct odp_execute execute; - memset(&execute, 0, sizeof execute); - execute.actions = (struct nlattr *) actions; - execute.actions_len = actions_len; - execute.data = buf->data; - execute.length = buf->size; - return do_ioctl(dpif_, ODP_EXECUTE, &execute); + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + return dpif_linux_execute__(dpif->dp_ifindex, key, key_len, + actions, actions_len, packet); } static int dpif_linux_recv_get_mask(const struct dpif *dpif_, int *listen_mask) { - return do_ioctl(dpif_, ODP_GET_LISTEN_MASK, listen_mask); + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + *listen_mask = dpif->listen_mask; + return 0; } static int dpif_linux_recv_set_mask(struct dpif *dpif_, int listen_mask) { - return do_ioctl(dpif_, ODP_SET_LISTEN_MASK, &listen_mask); + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + int error; + int i; + + if (listen_mask == dpif->listen_mask) { + return 0; + } else if (!listen_mask) { + nl_sock_destroy(dpif->mc_sock); + dpif->mc_sock = NULL; + dpif->listen_mask = 0; + return 0; + } else if (!dpif->mc_sock) { + error = nl_sock_create(NETLINK_GENERIC, &dpif->mc_sock); + if (error) { + return error; + } + } + + /* Unsubscribe from old groups. */ + for (i = 0; i < DPIF_N_UC_TYPES; i++) { + if (dpif->listen_mask & (1u << i)) { + nl_sock_leave_mcgroup(dpif->mc_sock, dpif->mcgroups[i]); + } + } + + /* Update listen_mask. */ + dpif->listen_mask = listen_mask; + + /* Subscribe to new groups. */ + error = 0; + for (i = 0; i < DPIF_N_UC_TYPES; i++) { + if (dpif->listen_mask & (1u << i)) { + int retval; + + retval = nl_sock_join_mcgroup(dpif->mc_sock, dpif->mcgroups[i]); + if (retval) { + error = retval; + } + } + } + return error; } static int dpif_linux_get_sflow_probability(const struct dpif *dpif_, uint32_t *probability) { - return do_ioctl(dpif_, ODP_GET_SFLOW_PROBABILITY, probability); + struct dpif_linux_dp dp; + struct ofpbuf *buf; + int error; + + error = dpif_linux_dp_get(dpif_, &dp, &buf); + if (!error) { + *probability = dp.sampling ? *dp.sampling : 0; + ofpbuf_delete(buf); + } + return error; } static int dpif_linux_set_sflow_probability(struct dpif *dpif_, uint32_t probability) { - return do_ioctl(dpif_, ODP_SET_SFLOW_PROBABILITY, &probability); + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + struct dpif_linux_dp dp; + + dpif_linux_dp_init(&dp); + dp.cmd = OVS_DP_CMD_SET; + dp.dp_ifindex = dpif->dp_ifindex; + dp.sampling = &probability; + return dpif_linux_dp_transact(&dp, NULL, NULL); } static int @@ -457,64 +935,136 @@ dpif_linux_queue_to_priority(const struct dpif *dpif OVS_UNUSED, } static int -dpif_linux_recv(struct dpif *dpif_, struct ofpbuf **bufp) +parse_odp_packet(struct ofpbuf *buf, struct dpif_upcall *upcall, + int *dp_ifindex) +{ + static const struct nl_policy ovs_packet_policy[] = { + /* Always present. */ + [OVS_PACKET_ATTR_PACKET] = { .type = NL_A_UNSPEC, + .min_len = ETH_HEADER_LEN }, + [OVS_PACKET_ATTR_KEY] = { .type = NL_A_NESTED }, + + /* OVS_PACKET_CMD_ACTION only. */ + [OVS_PACKET_ATTR_USERDATA] = { .type = NL_A_U64, .optional = true }, + + /* OVS_PACKET_CMD_SAMPLE only. */ + [OVS_PACKET_ATTR_SAMPLE_POOL] = { .type = NL_A_U32, .optional = true }, + [OVS_PACKET_ATTR_ACTIONS] = { .type = NL_A_NESTED, .optional = true }, + }; + + struct ovs_header *ovs_header; + struct nlattr *a[ARRAY_SIZE(ovs_packet_policy)]; + struct nlmsghdr *nlmsg; + struct genlmsghdr *genl; + struct ofpbuf b; + int type; + + ofpbuf_use_const(&b, buf->data, buf->size); + + nlmsg = ofpbuf_try_pull(&b, sizeof *nlmsg); + genl = ofpbuf_try_pull(&b, sizeof *genl); + ovs_header = ofpbuf_try_pull(&b, sizeof *ovs_header); + if (!nlmsg || !genl || !ovs_header + || nlmsg->nlmsg_type != ovs_packet_family + || !nl_policy_parse(&b, 0, ovs_packet_policy, a, + ARRAY_SIZE(ovs_packet_policy))) { + return EINVAL; + } + + type = (genl->cmd == OVS_PACKET_CMD_MISS ? DPIF_UC_MISS + : genl->cmd == OVS_PACKET_CMD_ACTION ? DPIF_UC_ACTION + : genl->cmd == OVS_PACKET_CMD_SAMPLE ? DPIF_UC_SAMPLE + : -1); + if (type < 0) { + return EINVAL; + } + + memset(upcall, 0, sizeof *upcall); + upcall->type = type; + upcall->packet = buf; + upcall->packet->data = (void *) nl_attr_get(a[OVS_PACKET_ATTR_PACKET]); + upcall->packet->size = nl_attr_get_size(a[OVS_PACKET_ATTR_PACKET]); + upcall->key = (void *) nl_attr_get(a[OVS_PACKET_ATTR_KEY]); + upcall->key_len = nl_attr_get_size(a[OVS_PACKET_ATTR_KEY]); + upcall->userdata = (a[OVS_PACKET_ATTR_USERDATA] + ? nl_attr_get_u64(a[OVS_PACKET_ATTR_USERDATA]) + : 0); + upcall->sample_pool = (a[OVS_PACKET_ATTR_SAMPLE_POOL] + ? nl_attr_get_u32(a[OVS_PACKET_ATTR_SAMPLE_POOL]) + : 0); + if (a[OVS_PACKET_ATTR_ACTIONS]) { + upcall->actions = (void *) nl_attr_get(a[OVS_PACKET_ATTR_ACTIONS]); + upcall->actions_len = nl_attr_get_size(a[OVS_PACKET_ATTR_ACTIONS]); + } + + *dp_ifindex = ovs_header->dp_ifindex; + + return 0; +} + +static int +dpif_linux_recv(struct dpif *dpif_, struct dpif_upcall *upcall) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct ofpbuf *buf; - int retval; int error; + int i; + + if (!dpif->mc_sock) { + return EAGAIN; + } + + for (i = 0; i < 50; i++) { + int dp_ifindex; + + error = nl_sock_recv(dpif->mc_sock, &buf, false); + if (error) { + return error; + } - buf = ofpbuf_new_with_headroom(65536, DPIF_RECV_MSG_PADDING); - retval = read(dpif->fd, ofpbuf_tail(buf), ofpbuf_tailroom(buf)); - if (retval < 0) { - error = errno; - if (error != EAGAIN) { - VLOG_WARN_RL(&error_rl, "%s: read failed: %s", - dpif_name(dpif_), strerror(error)); - } - } else if (retval >= sizeof(struct odp_msg)) { - struct odp_msg *msg = buf->data; - if (msg->length <= retval) { - buf->size += retval; - *bufp = buf; + error = parse_odp_packet(buf, upcall, &dp_ifindex); + if (!error + && dp_ifindex == dpif->dp_ifindex + && dpif->listen_mask & (1u << upcall->type)) { return 0; - } else { - VLOG_WARN_RL(&error_rl, "%s: discarding message truncated " - "from %"PRIu32" bytes to %d", - dpif_name(dpif_), msg->length, retval); - error = ERANGE; - } - } else if (!retval) { - VLOG_WARN_RL(&error_rl, "%s: unexpected end of file", dpif_name(dpif_)); - error = EPROTO; - } else { - VLOG_WARN_RL(&error_rl, - "%s: discarding too-short message (%d bytes)", - dpif_name(dpif_), retval); - error = ERANGE; + } + + ofpbuf_delete(buf); + if (error) { + return error; + } } - *bufp = NULL; - ofpbuf_delete(buf); - return error; + return EAGAIN; } static void dpif_linux_recv_wait(struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - poll_fd_wait(dpif->fd, POLLIN); + if (dpif->mc_sock) { + nl_sock_wait(dpif->mc_sock, POLLIN); + } +} + +static void +dpif_linux_recv_purge(struct dpif *dpif_) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + if (dpif->mc_sock) { + nl_sock_drain(dpif->mc_sock); + } } const struct dpif_class dpif_linux_class = { "system", - NULL, - NULL, dpif_linux_enumerate, dpif_linux_open, dpif_linux_close, - dpif_linux_get_all_names, dpif_linux_destroy, + dpif_linux_run, + dpif_linux_wait, dpif_linux_get_stats, dpif_linux_get_drop_frags, dpif_linux_set_drop_frags, @@ -522,14 +1072,19 @@ const struct dpif_class dpif_linux_class = { dpif_linux_port_del, dpif_linux_port_query_by_number, dpif_linux_port_query_by_name, - dpif_linux_port_list, + dpif_linux_get_max_ports, + dpif_linux_port_dump_start, + dpif_linux_port_dump_next, + dpif_linux_port_dump_done, dpif_linux_port_poll, dpif_linux_port_poll_wait, dpif_linux_flow_get, dpif_linux_flow_put, dpif_linux_flow_del, dpif_linux_flow_flush, - dpif_linux_flow_list, + dpif_linux_flow_dump_start, + dpif_linux_flow_dump_next, + dpif_linux_flow_dump_done, dpif_linux_execute, dpif_linux_recv_get_mask, dpif_linux_recv_set_mask, @@ -538,284 +1093,629 @@ const struct dpif_class dpif_linux_class = { dpif_linux_queue_to_priority, dpif_linux_recv, dpif_linux_recv_wait, + dpif_linux_recv_purge, }; -static int get_openvswitch_major(void); -static int get_major(const char *target); - static int -do_ioctl(const struct dpif *dpif_, int cmd, const void *arg) +dpif_linux_init(void) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - return ioctl(dpif->fd, cmd, arg) ? errno : 0; + static int error = -1; + + if (error < 0) { + unsigned int ovs_vport_mcgroup; + + error = nl_lookup_genl_family(OVS_DATAPATH_FAMILY, + &ovs_datapath_family); + if (error) { + VLOG_ERR("Generic Netlink family '%s' does not exist. " + "The Open vSwitch kernel module is probably not loaded.", + OVS_DATAPATH_FAMILY); + } + if (!error) { + error = nl_lookup_genl_family(OVS_VPORT_FAMILY, &ovs_vport_family); + } + if (!error) { + error = nl_lookup_genl_family(OVS_FLOW_FAMILY, &ovs_flow_family); + } + if (!error) { + error = nl_lookup_genl_family(OVS_PACKET_FAMILY, + &ovs_packet_family); + } + if (!error) { + error = nl_sock_create(NETLINK_GENERIC, &genl_sock); + } + if (!error) { + error = nl_lookup_genl_mcgroup(OVS_VPORT_FAMILY, OVS_VPORT_MCGROUP, + &ovs_vport_mcgroup); + } + if (!error) { + static struct dpif_linux_vport vport; + nln = nln_create(NETLINK_GENERIC, ovs_vport_mcgroup, + dpif_linux_nln_parse, &vport); + } + } + + return error; } -static int -lookup_minor(const char *name, int *minorp) +bool +dpif_linux_is_internal_device(const char *name) { - struct ethtool_drvinfo drvinfo; - int minor, port_no; - struct ifreq ifr; + struct dpif_linux_vport reply; + struct ofpbuf *buf; int error; - int sock; - sock = socket(AF_INET, SOCK_DGRAM, 0); - if (sock < 0) { - VLOG_WARN("socket(AF_INET) failed: %s", strerror(errno)); - error = errno; - goto error; + error = dpif_linux_vport_get(name, &reply, &buf); + if (!error) { + ofpbuf_delete(buf); + } else if (error != ENODEV && error != ENOENT) { + VLOG_WARN_RL(&error_rl, "%s: vport query failed (%s)", + name, strerror(error)); + } + + return reply.type == OVS_VPORT_TYPE_INTERNAL; +} + +int +dpif_linux_vport_send(int dp_ifindex, uint32_t port_no, + const void *data, size_t size) +{ + struct ofpbuf actions, key, packet; + struct odputil_keybuf keybuf; + struct flow flow; + uint64_t action; + + ofpbuf_use_const(&packet, data, size); + flow_extract(&packet, htonll(0), 0, &flow); + + ofpbuf_use_stack(&key, &keybuf, sizeof keybuf); + odp_flow_key_from_flow(&key, &flow); + + ofpbuf_use_stack(&actions, &action, sizeof action); + nl_msg_put_u32(&actions, OVS_ACTION_ATTR_OUTPUT, port_no); + + return dpif_linux_execute__(dp_ifindex, key.data, key.size, + actions.data, actions.size, &packet); +} + +static bool +dpif_linux_nln_parse(struct ofpbuf *buf, void *vport_) +{ + struct dpif_linux_vport *vport = vport_; + return dpif_linux_vport_from_ofpbuf(vport, buf) == 0; +} + +static void +dpif_linux_port_changed(const void *vport_, void *dpif_) +{ + const struct dpif_linux_vport *vport = vport_; + struct dpif_linux *dpif = dpif_; + + if (vport) { + if (vport->dp_ifindex == dpif->dp_ifindex + && (vport->cmd == OVS_VPORT_CMD_NEW + || vport->cmd == OVS_VPORT_CMD_DEL + || vport->cmd == OVS_VPORT_CMD_SET)) { + VLOG_DBG("port_changed: dpif:%s vport:%s cmd:%"PRIu8, + dpif->dpif.full_name, vport->name, vport->cmd); + sset_add(&dpif->changed_ports, vport->name); + } + } else { + dpif->change_error = true; + } +} + +/* Parses the contents of 'buf', which contains a "struct ovs_header" followed + * by Netlink attributes, into 'vport'. Returns 0 if successful, otherwise a + * positive errno value. + * + * 'vport' will contain pointers into 'buf', so the caller should not free + * 'buf' while 'vport' is still in use. */ +static int +dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, + const struct ofpbuf *buf) +{ + static const struct nl_policy ovs_vport_policy[] = { + [OVS_VPORT_ATTR_PORT_NO] = { .type = NL_A_U32 }, + [OVS_VPORT_ATTR_TYPE] = { .type = NL_A_U32 }, + [OVS_VPORT_ATTR_NAME] = { .type = NL_A_STRING, .max_len = IFNAMSIZ }, + [OVS_VPORT_ATTR_STATS] = { .type = NL_A_UNSPEC, + .min_len = sizeof(struct ovs_vport_stats), + .max_len = sizeof(struct ovs_vport_stats), + .optional = true }, + [OVS_VPORT_ATTR_ADDRESS] = { .type = NL_A_UNSPEC, + .min_len = ETH_ADDR_LEN, + .max_len = ETH_ADDR_LEN, + .optional = true }, + [OVS_VPORT_ATTR_OPTIONS] = { .type = NL_A_NESTED, .optional = true }, + [OVS_VPORT_ATTR_IFINDEX] = { .type = NL_A_U32, .optional = true }, + }; + + struct nlattr *a[ARRAY_SIZE(ovs_vport_policy)]; + struct ovs_header *ovs_header; + struct nlmsghdr *nlmsg; + struct genlmsghdr *genl; + struct ofpbuf b; + + dpif_linux_vport_init(vport); + + ofpbuf_use_const(&b, buf->data, buf->size); + nlmsg = ofpbuf_try_pull(&b, sizeof *nlmsg); + genl = ofpbuf_try_pull(&b, sizeof *genl); + ovs_header = ofpbuf_try_pull(&b, sizeof *ovs_header); + if (!nlmsg || !genl || !ovs_header + || nlmsg->nlmsg_type != ovs_vport_family + || !nl_policy_parse(&b, 0, ovs_vport_policy, a, + ARRAY_SIZE(ovs_vport_policy))) { + return EINVAL; } - memset(&ifr, 0, sizeof ifr); - strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name); - ifr.ifr_data = (caddr_t) &drvinfo; + vport->cmd = genl->cmd; + vport->dp_ifindex = ovs_header->dp_ifindex; + vport->port_no = nl_attr_get_u32(a[OVS_VPORT_ATTR_PORT_NO]); + vport->type = nl_attr_get_u32(a[OVS_VPORT_ATTR_TYPE]); + vport->name = nl_attr_get_string(a[OVS_VPORT_ATTR_NAME]); + if (a[OVS_VPORT_ATTR_STATS]) { + vport->stats = nl_attr_get(a[OVS_VPORT_ATTR_STATS]); + } + if (a[OVS_VPORT_ATTR_ADDRESS]) { + vport->address = nl_attr_get(a[OVS_VPORT_ATTR_ADDRESS]); + } + if (a[OVS_VPORT_ATTR_OPTIONS]) { + vport->options = nl_attr_get(a[OVS_VPORT_ATTR_OPTIONS]); + vport->options_len = nl_attr_get_size(a[OVS_VPORT_ATTR_OPTIONS]); + } + if (a[OVS_VPORT_ATTR_IFINDEX]) { + vport->ifindex = nl_attr_get_u32(a[OVS_VPORT_ATTR_IFINDEX]); + } + return 0; +} - memset(&drvinfo, 0, sizeof drvinfo); - drvinfo.cmd = ETHTOOL_GDRVINFO; - if (ioctl(sock, SIOCETHTOOL, &ifr)) { - VLOG_WARN("ioctl(SIOCETHTOOL) failed: %s", strerror(errno)); - error = errno; - goto error_close_sock; +/* Appends to 'buf' (which must initially be empty) a "struct ovs_header" + * followed by Netlink attributes corresponding to 'vport'. */ +static void +dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport, + struct ofpbuf *buf) +{ + struct ovs_header *ovs_header; + + nl_msg_put_genlmsghdr(buf, 0, ovs_vport_family, NLM_F_REQUEST | NLM_F_ECHO, + vport->cmd, 1); + + ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header); + ovs_header->dp_ifindex = vport->dp_ifindex; + + if (vport->port_no != UINT32_MAX) { + nl_msg_put_u32(buf, OVS_VPORT_ATTR_PORT_NO, vport->port_no); } - if (strcmp(drvinfo.driver, "openvswitch")) { - VLOG_WARN("%s is not an openvswitch device", name); - error = EOPNOTSUPP; - goto error_close_sock; + if (vport->type != OVS_VPORT_TYPE_UNSPEC) { + nl_msg_put_u32(buf, OVS_VPORT_ATTR_TYPE, vport->type); } - if (sscanf(drvinfo.bus_info, "%d.%d", &minor, &port_no) != 2) { - VLOG_WARN("%s ethtool bus_info has unexpected format", name); - error = EPROTOTYPE; - goto error_close_sock; - } else if (port_no != ODPP_LOCAL) { - /* This is an Open vSwitch device but not the local port. We - * intentionally support only using the name of the local port as the - * name of a datapath; otherwise, it would be too difficult to - * enumerate all the names of a datapath. */ - error = EOPNOTSUPP; - goto error_close_sock; + if (vport->name) { + nl_msg_put_string(buf, OVS_VPORT_ATTR_NAME, vport->name); } - *minorp = minor; - close(sock); - return 0; + if (vport->stats) { + nl_msg_put_unspec(buf, OVS_VPORT_ATTR_STATS, + vport->stats, sizeof *vport->stats); + } -error_close_sock: - close(sock); -error: - return error; + if (vport->address) { + nl_msg_put_unspec(buf, OVS_VPORT_ATTR_ADDRESS, + vport->address, ETH_ADDR_LEN); + } + + if (vport->options) { + nl_msg_put_nested(buf, OVS_VPORT_ATTR_OPTIONS, + vport->options, vport->options_len); + } + + if (vport->ifindex) { + nl_msg_put_u32(buf, OVS_VPORT_ATTR_IFINDEX, vport->ifindex); + } } -static int -make_openvswitch_device(int minor, char **fnp) +/* Clears 'vport' to "empty" values. */ +void +dpif_linux_vport_init(struct dpif_linux_vport *vport) +{ + memset(vport, 0, sizeof *vport); + vport->port_no = UINT32_MAX; +} + +/* Executes 'request' in the kernel datapath. If the command fails, returns a + * positive errno value. Otherwise, if 'reply' and 'bufp' are null, returns 0 + * without doing anything else. If 'reply' and 'bufp' are nonnull, then the + * result of the command is expected to be an ovs_vport also, which is decoded + * and stored in '*reply' and '*bufp'. The caller must free '*bufp' when the + * reply is no longer needed ('reply' will contain pointers into '*bufp'). */ +int +dpif_linux_vport_transact(const struct dpif_linux_vport *request, + struct dpif_linux_vport *reply, + struct ofpbuf **bufp) { - const char dirname[] = "/dev/net"; - int major; - dev_t dev; - struct stat s; - char fn[128]; + struct ofpbuf *request_buf; + int error; - *fnp = NULL; + assert((reply != NULL) == (bufp != NULL)); - major = get_openvswitch_major(); - if (major < 0) { - return -major; + error = dpif_linux_init(); + if (error) { + if (reply) { + *bufp = NULL; + dpif_linux_vport_init(reply); + } + return error; } - dev = makedev(major, minor); - sprintf(fn, "%s/dp%d", dirname, minor); - if (!stat(fn, &s)) { - if (!S_ISCHR(s.st_mode)) { - VLOG_WARN_RL(&error_rl, "%s is not a character device, fixing", - fn); - } else if (s.st_rdev != dev) { - VLOG_WARN_RL(&error_rl, - "%s is device %u:%u but should be %u:%u, fixing", - fn, major(s.st_rdev), minor(s.st_rdev), - major(dev), minor(dev)); - } else { - goto success; - } - if (unlink(fn)) { - VLOG_WARN_RL(&error_rl, "%s: unlink failed (%s)", - fn, strerror(errno)); - return errno; - } - } else if (errno == ENOENT) { - if (stat(dirname, &s)) { - if (errno == ENOENT) { - if (mkdir(dirname, 0755)) { - VLOG_WARN_RL(&error_rl, "%s: mkdir failed (%s)", - dirname, strerror(errno)); - return errno; - } - } else { - VLOG_WARN_RL(&error_rl, "%s: stat failed (%s)", - dirname, strerror(errno)); - return errno; - } + request_buf = ofpbuf_new(1024); + dpif_linux_vport_to_ofpbuf(request, request_buf); + error = nl_sock_transact(genl_sock, request_buf, bufp); + ofpbuf_delete(request_buf); + + if (reply) { + if (!error) { + error = dpif_linux_vport_from_ofpbuf(reply, *bufp); } - } else { - VLOG_WARN_RL(&error_rl, "%s: stat failed (%s)", fn, strerror(errno)); - return errno; + if (error) { + dpif_linux_vport_init(reply); + ofpbuf_delete(*bufp); + *bufp = NULL; + } + } + return error; +} + +/* Obtains information about the kernel vport named 'name' and stores it into + * '*reply' and '*bufp'. The caller must free '*bufp' when the reply is no + * longer needed ('reply' will contain pointers into '*bufp'). */ +int +dpif_linux_vport_get(const char *name, struct dpif_linux_vport *reply, + struct ofpbuf **bufp) +{ + struct dpif_linux_vport request; + + dpif_linux_vport_init(&request); + request.cmd = OVS_VPORT_CMD_GET; + request.name = name; + + return dpif_linux_vport_transact(&request, reply, bufp); +} + +/* Parses the contents of 'buf', which contains a "struct ovs_header" followed + * by Netlink attributes, into 'dp'. Returns 0 if successful, otherwise a + * positive errno value. + * + * 'dp' will contain pointers into 'buf', so the caller should not free 'buf' + * while 'dp' is still in use. */ +static int +dpif_linux_dp_from_ofpbuf(struct dpif_linux_dp *dp, const struct ofpbuf *buf) +{ + static const struct nl_policy ovs_datapath_policy[] = { + [OVS_DP_ATTR_NAME] = { .type = NL_A_STRING, .max_len = IFNAMSIZ }, + [OVS_DP_ATTR_STATS] = { .type = NL_A_UNSPEC, + .min_len = sizeof(struct ovs_dp_stats), + .max_len = sizeof(struct ovs_dp_stats), + .optional = true }, + [OVS_DP_ATTR_IPV4_FRAGS] = { .type = NL_A_U32, .optional = true }, + [OVS_DP_ATTR_SAMPLING] = { .type = NL_A_U32, .optional = true }, + [OVS_DP_ATTR_MCGROUPS] = { .type = NL_A_NESTED, .optional = true }, + }; + + struct nlattr *a[ARRAY_SIZE(ovs_datapath_policy)]; + struct ovs_header *ovs_header; + struct nlmsghdr *nlmsg; + struct genlmsghdr *genl; + struct ofpbuf b; + + dpif_linux_dp_init(dp); + + ofpbuf_use_const(&b, buf->data, buf->size); + nlmsg = ofpbuf_try_pull(&b, sizeof *nlmsg); + genl = ofpbuf_try_pull(&b, sizeof *genl); + ovs_header = ofpbuf_try_pull(&b, sizeof *ovs_header); + if (!nlmsg || !genl || !ovs_header + || nlmsg->nlmsg_type != ovs_datapath_family + || !nl_policy_parse(&b, 0, ovs_datapath_policy, a, + ARRAY_SIZE(ovs_datapath_policy))) { + return EINVAL; + } + + dp->cmd = genl->cmd; + dp->dp_ifindex = ovs_header->dp_ifindex; + dp->name = nl_attr_get_string(a[OVS_DP_ATTR_NAME]); + if (a[OVS_DP_ATTR_STATS]) { + /* Can't use structure assignment because Netlink doesn't ensure + * sufficient alignment for 64-bit members. */ + memcpy(&dp->stats, nl_attr_get(a[OVS_DP_ATTR_STATS]), + sizeof dp->stats); } + if (a[OVS_DP_ATTR_IPV4_FRAGS]) { + dp->ipv4_frags = nl_attr_get_u32(a[OVS_DP_ATTR_IPV4_FRAGS]); + } + if (a[OVS_DP_ATTR_SAMPLING]) { + dp->sampling = nl_attr_get(a[OVS_DP_ATTR_SAMPLING]); + } + + if (a[OVS_DP_ATTR_MCGROUPS]) { + static const struct nl_policy ovs_mcgroup_policy[] = { + [OVS_PACKET_CMD_MISS] = { .type = NL_A_U32, .optional = true }, + [OVS_PACKET_CMD_ACTION] = { .type = NL_A_U32, .optional = true }, + [OVS_PACKET_CMD_SAMPLE] = { .type = NL_A_U32, .optional = true }, + }; + + struct nlattr *mcgroups[ARRAY_SIZE(ovs_mcgroup_policy)]; - /* The device needs to be created. */ - if (mknod(fn, S_IFCHR | 0700, dev)) { - VLOG_WARN_RL(&error_rl, - "%s: creating character device %u:%u failed (%s)", - fn, major(dev), minor(dev), strerror(errno)); - return errno; + if (!nl_parse_nested(a[OVS_DP_ATTR_MCGROUPS], ovs_mcgroup_policy, + mcgroups, ARRAY_SIZE(ovs_mcgroup_policy))) { + return EINVAL; + } + + if (mcgroups[OVS_PACKET_CMD_MISS]) { + dp->mcgroups[DPIF_UC_MISS] + = nl_attr_get_u32(mcgroups[OVS_PACKET_CMD_MISS]); + } + if (mcgroups[OVS_PACKET_CMD_ACTION]) { + dp->mcgroups[DPIF_UC_ACTION] + = nl_attr_get_u32(mcgroups[OVS_PACKET_CMD_ACTION]); + } + if (mcgroups[OVS_PACKET_CMD_SAMPLE]) { + dp->mcgroups[DPIF_UC_SAMPLE] + = nl_attr_get_u32(mcgroups[OVS_PACKET_CMD_SAMPLE]); + } } -success: - *fnp = xstrdup(fn); return 0; } -/* Return the major device number of the Open vSwitch device. If it - * cannot be determined, a negative errno is returned. */ -static int -get_openvswitch_major(void) +/* Appends to 'buf' the Generic Netlink message described by 'dp'. */ +static void +dpif_linux_dp_to_ofpbuf(const struct dpif_linux_dp *dp, struct ofpbuf *buf) { - static int openvswitch_major = -1; - if (openvswitch_major < 0) { - openvswitch_major = get_major("openvswitch"); + struct ovs_header *ovs_header; + + nl_msg_put_genlmsghdr(buf, 0, ovs_datapath_family, + NLM_F_REQUEST | NLM_F_ECHO, dp->cmd, 1); + + ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header); + ovs_header->dp_ifindex = dp->dp_ifindex; + + if (dp->name) { + nl_msg_put_string(buf, OVS_DP_ATTR_NAME, dp->name); + } + + /* Skip OVS_DP_ATTR_STATS since we never have a reason to serialize it. */ + + if (dp->ipv4_frags) { + nl_msg_put_u32(buf, OVS_DP_ATTR_IPV4_FRAGS, dp->ipv4_frags); + } + + if (dp->sampling) { + nl_msg_put_u32(buf, OVS_DP_ATTR_SAMPLING, *dp->sampling); } - return openvswitch_major; } +/* Clears 'dp' to "empty" values. */ +static void +dpif_linux_dp_init(struct dpif_linux_dp *dp) +{ + memset(dp, 0, sizeof *dp); +} + +static void +dpif_linux_dp_dump_start(struct nl_dump *dump) +{ + struct dpif_linux_dp request; + struct ofpbuf *buf; + + dpif_linux_dp_init(&request); + request.cmd = OVS_DP_CMD_GET; + + buf = ofpbuf_new(1024); + dpif_linux_dp_to_ofpbuf(&request, buf); + nl_dump_start(dump, genl_sock, buf); + ofpbuf_delete(buf); +} + +/* Executes 'request' in the kernel datapath. If the command fails, returns a + * positive errno value. Otherwise, if 'reply' and 'bufp' are null, returns 0 + * without doing anything else. If 'reply' and 'bufp' are nonnull, then the + * result of the command is expected to be of the same form, which is decoded + * and stored in '*reply' and '*bufp'. The caller must free '*bufp' when the + * reply is no longer needed ('reply' will contain pointers into '*bufp'). */ static int -get_major(const char *target) +dpif_linux_dp_transact(const struct dpif_linux_dp *request, + struct dpif_linux_dp *reply, struct ofpbuf **bufp) { - const char fn[] = "/proc/devices"; - char line[128]; - FILE *file; - int ln; + struct ofpbuf *request_buf; + int error; - file = fopen(fn, "r"); - if (!file) { - VLOG_ERR("opening %s failed (%s)", fn, strerror(errno)); - return -errno; - } + assert((reply != NULL) == (bufp != NULL)); - for (ln = 1; fgets(line, sizeof line, file); ln++) { - char name[64]; - int major; + request_buf = ofpbuf_new(1024); + dpif_linux_dp_to_ofpbuf(request, request_buf); + error = nl_sock_transact(genl_sock, request_buf, bufp); + ofpbuf_delete(request_buf); - if (!strncmp(line, "Character", 9) || line[0] == '\0') { - /* Nothing to do. */ - } else if (!strncmp(line, "Block", 5)) { - /* We only want character devices, so skip the rest of the file. */ - break; - } else if (sscanf(line, "%d %63s", &major, name)) { - if (!strcmp(name, target)) { - fclose(file); - return major; - } - } else { - VLOG_WARN_ONCE("%s:%d: syntax error", fn, ln); + if (reply) { + if (!error) { + error = dpif_linux_dp_from_ofpbuf(reply, *bufp); + } + if (error) { + dpif_linux_dp_init(reply); + ofpbuf_delete(*bufp); + *bufp = NULL; } } - - fclose(file); - - VLOG_ERR("%s: %s major not found (is the module loaded?)", fn, target); - return -ENODEV; + return error; } +/* Obtains information about 'dpif_' and stores it into '*reply' and '*bufp'. + * The caller must free '*bufp' when the reply is no longer needed ('reply' + * will contain pointers into '*bufp'). */ static int -finish_open(struct dpif *dpif_, const char *local_ifname) +dpif_linux_dp_get(const struct dpif *dpif_, struct dpif_linux_dp *reply, + struct ofpbuf **bufp) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - dpif->local_ifname = xstrdup(local_ifname); - dpif->local_ifindex = if_nametoindex(local_ifname); - if (!dpif->local_ifindex) { - int error = errno; - dpif_uninit(dpif_, true); - VLOG_WARN("could not get ifindex of %s device: %s", - local_ifname, strerror(errno)); - return error; + struct dpif_linux_dp request; + + dpif_linux_dp_init(&request); + request.cmd = OVS_DP_CMD_GET; + request.dp_ifindex = dpif->dp_ifindex; + + return dpif_linux_dp_transact(&request, reply, bufp); +} + +/* Parses the contents of 'buf', which contains a "struct ovs_header" followed + * by Netlink attributes, into 'flow'. Returns 0 if successful, otherwise a + * positive errno value. + * + * 'flow' will contain pointers into 'buf', so the caller should not free 'buf' + * while 'flow' is still in use. */ +static int +dpif_linux_flow_from_ofpbuf(struct dpif_linux_flow *flow, + const struct ofpbuf *buf) +{ + static const struct nl_policy ovs_flow_policy[] = { + [OVS_FLOW_ATTR_KEY] = { .type = NL_A_NESTED }, + [OVS_FLOW_ATTR_ACTIONS] = { .type = NL_A_NESTED, .optional = true }, + [OVS_FLOW_ATTR_STATS] = { .type = NL_A_UNSPEC, + .min_len = sizeof(struct ovs_flow_stats), + .max_len = sizeof(struct ovs_flow_stats), + .optional = true }, + [OVS_FLOW_ATTR_TCP_FLAGS] = { .type = NL_A_U8, .optional = true }, + [OVS_FLOW_ATTR_USED] = { .type = NL_A_U64, .optional = true }, + /* The kernel never uses OVS_FLOW_ATTR_CLEAR. */ + }; + + struct nlattr *a[ARRAY_SIZE(ovs_flow_policy)]; + struct ovs_header *ovs_header; + struct nlmsghdr *nlmsg; + struct genlmsghdr *genl; + struct ofpbuf b; + + dpif_linux_flow_init(flow); + + ofpbuf_use_const(&b, buf->data, buf->size); + nlmsg = ofpbuf_try_pull(&b, sizeof *nlmsg); + genl = ofpbuf_try_pull(&b, sizeof *genl); + ovs_header = ofpbuf_try_pull(&b, sizeof *ovs_header); + if (!nlmsg || !genl || !ovs_header + || nlmsg->nlmsg_type != ovs_flow_family + || !nl_policy_parse(&b, 0, ovs_flow_policy, a, + ARRAY_SIZE(ovs_flow_policy))) { + return EINVAL; + } + + flow->nlmsg_flags = nlmsg->nlmsg_flags; + flow->dp_ifindex = ovs_header->dp_ifindex; + flow->key = nl_attr_get(a[OVS_FLOW_ATTR_KEY]); + flow->key_len = nl_attr_get_size(a[OVS_FLOW_ATTR_KEY]); + if (a[OVS_FLOW_ATTR_ACTIONS]) { + flow->actions = nl_attr_get(a[OVS_FLOW_ATTR_ACTIONS]); + flow->actions_len = nl_attr_get_size(a[OVS_FLOW_ATTR_ACTIONS]); + } + if (a[OVS_FLOW_ATTR_STATS]) { + flow->stats = nl_attr_get(a[OVS_FLOW_ATTR_STATS]); + } + if (a[OVS_FLOW_ATTR_TCP_FLAGS]) { + flow->tcp_flags = nl_attr_get(a[OVS_FLOW_ATTR_TCP_FLAGS]); + } + if (a[OVS_FLOW_ATTR_USED]) { + flow->used = nl_attr_get(a[OVS_FLOW_ATTR_USED]); } return 0; } -static int -create_minor(const char *name, int minor, struct dpif **dpifp) +/* Appends to 'buf' (which must initially be empty) a "struct ovs_header" + * followed by Netlink attributes corresponding to 'flow'. */ +static void +dpif_linux_flow_to_ofpbuf(const struct dpif_linux_flow *flow, + struct ofpbuf *buf) { - int error = open_minor(minor, dpifp); - if (!error) { - error = do_ioctl(*dpifp, ODP_DP_CREATE, name); - if (!error) { - error = finish_open(*dpifp, name); - } else { - dpif_uninit(*dpifp, true); - } + struct ovs_header *ovs_header; + + nl_msg_put_genlmsghdr(buf, 0, ovs_flow_family, + NLM_F_REQUEST | NLM_F_ECHO | flow->nlmsg_flags, + flow->cmd, 1); + + ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header); + ovs_header->dp_ifindex = flow->dp_ifindex; + + if (flow->key_len) { + nl_msg_put_unspec(buf, OVS_FLOW_ATTR_KEY, flow->key, flow->key_len); } - return error; + + if (flow->actions || flow->actions_len) { + nl_msg_put_unspec(buf, OVS_FLOW_ATTR_ACTIONS, + flow->actions, flow->actions_len); + } + + /* We never need to send these to the kernel. */ + assert(!flow->stats); + assert(!flow->tcp_flags); + assert(!flow->used); + + if (flow->clear) { + nl_msg_put_flag(buf, OVS_FLOW_ATTR_CLEAR); + } +} + +/* Clears 'flow' to "empty" values. */ +static void +dpif_linux_flow_init(struct dpif_linux_flow *flow) +{ + memset(flow, 0, sizeof *flow); } +/* Executes 'request' in the kernel datapath. If the command fails, returns a + * positive errno value. Otherwise, if 'reply' and 'bufp' are null, returns 0 + * without doing anything else. If 'reply' and 'bufp' are nonnull, then the + * result of the command is expected to be a flow also, which is decoded and + * stored in '*reply' and '*bufp'. The caller must free '*bufp' when the reply + * is no longer needed ('reply' will contain pointers into '*bufp'). */ static int -open_minor(int minor, struct dpif **dpifp) +dpif_linux_flow_transact(const struct dpif_linux_flow *request, + struct dpif_linux_flow *reply, struct ofpbuf **bufp) { + struct ofpbuf *request_buf; int error; - char *fn; - int fd; - error = make_openvswitch_device(minor, &fn); - if (error) { - return error; - } + assert((reply != NULL) == (bufp != NULL)); - fd = open(fn, O_RDONLY | O_NONBLOCK); - if (fd >= 0) { - struct dpif_linux *dpif = xmalloc(sizeof *dpif); - error = rtnetlink_link_notifier_register(&dpif->port_notifier, - dpif_linux_port_changed, - dpif); + request_buf = ofpbuf_new(1024); + dpif_linux_flow_to_ofpbuf(request, request_buf); + error = nl_sock_transact(genl_sock, request_buf, bufp); + ofpbuf_delete(request_buf); + + if (reply) { if (!error) { - char *name; - - name = xasprintf("dp%d", minor); - dpif_init(&dpif->dpif, &dpif_linux_class, name, minor, minor); - free(name); - - dpif->fd = fd; - dpif->local_ifname = NULL; - dpif->minor = minor; - dpif->local_ifindex = 0; - shash_init(&dpif->changed_ports); - dpif->change_error = false; - *dpifp = &dpif->dpif; - } else { - free(dpif); + error = dpif_linux_flow_from_ofpbuf(reply, *bufp); + } + if (error) { + dpif_linux_flow_init(reply); + ofpbuf_delete(*bufp); + *bufp = NULL; } - } else { - error = errno; - VLOG_WARN("%s: open failed (%s)", fn, strerror(error)); } - free(fn); - return error; } static void -dpif_linux_port_changed(const struct rtnetlink_link_change *change, - void *dpif_) +dpif_linux_flow_get_stats(const struct dpif_linux_flow *flow, + struct dpif_flow_stats *stats) { - struct dpif_linux *dpif = dpif_; - - if (change) { - if (change->master_ifindex == dpif->local_ifindex - && (change->nlmsg_type == RTM_NEWLINK - || change->nlmsg_type == RTM_DELLINK)) - { - /* Our datapath changed, either adding a new port or deleting an - * existing one. */ - shash_add_once(&dpif->changed_ports, change->ifname, NULL); - } + if (flow->stats) { + stats->n_packets = get_unaligned_u64(&flow->stats->n_packets); + stats->n_bytes = get_unaligned_u64(&flow->stats->n_bytes); } else { - dpif->change_error = true; + stats->n_packets = 0; + stats->n_bytes = 0; } + stats->used = flow->used ? get_unaligned_u64(flow->used) : 0; + stats->tcp_flags = flow->tcp_flags ? *flow->tcp_flags : 0; } +