X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-linux.c;h=1b97410e7a5cc4319acd73d5c0f95e42dbc55d6d;hb=b0fb94a346e52f36aeef238dd5f9bef9a10c14ef;hp=15a21e6688aa636defe7bfd0704d0c35aad4989b;hpb=213a13ed774742939de4c162e572cfbea9ce77df;p=sliver-openvswitch.git diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index 15a21e668..1b97410e7 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ #include "dpif-linux.h" -#include #include #include #include @@ -28,7 +27,10 @@ #include #include #include +#include #include +#include +#include #include #include @@ -45,20 +47,18 @@ #include "odp-util.h" #include "ofpbuf.h" #include "openvswitch/datapath-compat.h" -#include "openvswitch/tunnel.h" #include "packets.h" #include "poll-loop.h" +#include "random.h" #include "shash.h" #include "sset.h" +#include "timeval.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)); +enum { MAX_PORTS = USHRT_MAX }; /* This ethtool flag was introduced in Linux 2.6.24, so it might be * missing if we have old headers. */ @@ -73,10 +73,8 @@ struct dpif_linux_dp { /* Attributes. */ const char *name; /* OVS_DP_ATTR_NAME. */ + const uint32_t *upcall_pid; /* OVS_DP_UPCALL_PID. */ 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 *); @@ -99,19 +97,21 @@ struct dpif_linux_flow { /* 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. + * The 'stats' member points to 64-bit data that might only be aligned on + * 32-bit boundaries, so get_unaligned_u64() should be used to access its + * 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 *mask; /* OVS_FLOW_ATTR_MASK. */ + size_t mask_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. */ + const ovs_32aligned_u64 *used; /* OVS_FLOW_ATTR_USED. */ bool clear; /* OVS_FLOW_ATTR_CLEAR. */ }; @@ -120,50 +120,57 @@ 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, +static int dpif_linux_flow_transact(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 *); +/* One of the dpif channels between the kernel and userspace. */ +struct dpif_channel { + struct nl_sock *sock; /* Netlink socket. */ + long long int last_poll; /* Last time this channel was polled. */ +}; + +static void report_loss(struct dpif *, struct dpif_channel *); + /* Datapath interface for the openvswitch Linux kernel module. */ struct dpif_linux { struct dpif dpif; int dp_ifindex; - /* Multicast group messages. */ - struct nl_sock *mc_sock; - uint32_t mcgroups[DPIF_N_UC_TYPES]; - unsigned int listen_mask; + /* Upcall messages. */ + struct ovs_mutex upcall_lock; + int uc_array_size; /* Size of 'channels' and 'epoll_events'. */ + struct dpif_channel *channels; + struct epoll_event *epoll_events; + int epoll_fd; /* epoll fd that includes channel socks. */ + int n_events; /* Num events returned by epoll_wait(). */ + int event_offset; /* Offset into 'epoll_events'. */ /* Change notification. */ - 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; + struct nl_sock *port_notifier; /* vport multicast group subscriber. */ }; static struct vlog_rate_limit error_rl = VLOG_RATE_LIMIT_INIT(9999, 5); -/* Generic Netlink family numbers for OVS. */ +/* Generic Netlink family numbers for OVS. + * + * Initialized by dpif_linux_init(). */ 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; +/* Generic Netlink multicast groups for OVS. + * + * Initialized by dpif_linux_init(). */ +static unsigned int ovs_vport_mcgroup; static int dpif_linux_init(void); -static void 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 int open_dpif(const struct dpif_linux_dp *, struct dpif **); +static uint32_t dpif_linux_port_get_pid(const struct dpif *, + odp_port_t port_no); static void dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *, struct ofpbuf *); @@ -177,29 +184,6 @@ 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 sset *all_dps) { @@ -229,6 +213,7 @@ dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name, { struct dpif_linux_dp dp_request, dp; struct ofpbuf *buf; + uint32_t upcall_pid; int error; error = dpif_linux_init(); @@ -238,106 +223,184 @@ dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name, /* Create or look up datapath. */ dpif_linux_dp_init(&dp_request); - dp_request.cmd = create ? OVS_DP_CMD_NEW : OVS_DP_CMD_GET; + if (create) { + dp_request.cmd = OVS_DP_CMD_NEW; + upcall_pid = 0; + dp_request.upcall_pid = &upcall_pid; + } else { + dp_request.cmd = OVS_DP_CMD_GET; + } dp_request.name = name; error = dpif_linux_dp_transact(&dp_request, &dp, &buf); if (error) { return error; } - open_dpif(&dp, dpifp); + error = open_dpif(&dp, dpifp); ofpbuf_delete(buf); - return 0; + return error; } -static void +static int open_dpif(const struct dpif_linux_dp *dp, struct dpif **dpifp) { struct dpif_linux *dpif; - int i; - dpif = xmalloc(sizeof *dpif); - dpif->port_notifier = nln_notifier_create(nln, dpif_linux_port_changed, - dpif); + dpif = xzalloc(sizeof *dpif); + dpif->port_notifier = NULL; + ovs_mutex_init(&dpif->upcall_lock, PTHREAD_MUTEX_DEFAULT); + dpif->epoll_fd = -1; dpif_init(&dpif->dpif, &dpif_linux_class, dp->name, dp->dp_ifindex, dp->dp_ifindex); - 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; } static void -dpif_linux_close(struct dpif *dpif_) +destroy_channels(struct dpif_linux *dpif) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); + unsigned int i; - nln_notifier_destroy(dpif->port_notifier); - nl_sock_destroy(dpif->mc_sock); - sset_destroy(&dpif->changed_ports); - free(dpif->lru_bitmap); - free(dpif); + if (dpif->epoll_fd < 0) { + return; + } + + for (i = 0; i < dpif->uc_array_size; i++ ) { + struct dpif_linux_vport vport_request; + struct dpif_channel *ch = &dpif->channels[i]; + uint32_t upcall_pid = 0; + + if (!ch->sock) { + continue; + } + + epoll_ctl(dpif->epoll_fd, EPOLL_CTL_DEL, nl_sock_fd(ch->sock), NULL); + + /* Turn off upcalls. */ + dpif_linux_vport_init(&vport_request); + vport_request.cmd = OVS_VPORT_CMD_SET; + vport_request.dp_ifindex = dpif->dp_ifindex; + vport_request.port_no = u32_to_odp(i); + vport_request.upcall_pid = &upcall_pid; + dpif_linux_vport_transact(&vport_request, NULL, NULL); + + nl_sock_destroy(ch->sock); + } + + free(dpif->channels); + dpif->channels = NULL; + dpif->uc_array_size = 0; + + free(dpif->epoll_events); + dpif->epoll_events = NULL; + dpif->n_events = dpif->event_offset = 0; + + /* Don't close dpif->epoll_fd since that would cause other threads that + * call dpif_recv_wait(dpif) to wait on an arbitrary fd or a closed fd. */ } static int -dpif_linux_destroy(struct dpif *dpif_) +add_channel(struct dpif_linux *dpif, odp_port_t port_no, struct nl_sock *sock) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - struct dpif_linux_dp dp; + struct epoll_event event; + uint32_t port_idx = odp_to_u32(port_no); - 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); + if (dpif->epoll_fd < 0) { + return 0; + } + + /* We assume that the datapath densely chooses port numbers, which + * can therefore be used as an index into an array of channels. */ + if (port_idx >= dpif->uc_array_size) { + uint32_t new_size = port_idx + 1; + uint32_t i; + + if (new_size > MAX_PORTS) { + VLOG_WARN_RL(&error_rl, "%s: datapath port %"PRIu32" too big", + dpif_name(&dpif->dpif), port_no); + return EFBIG; + } + + dpif->channels = xrealloc(dpif->channels, + new_size * sizeof *dpif->channels); + for (i = dpif->uc_array_size; i < new_size; i++) { + dpif->channels[i].sock = NULL; + } + + dpif->epoll_events = xrealloc(dpif->epoll_events, + new_size * sizeof *dpif->epoll_events); + dpif->uc_array_size = new_size; + } + + memset(&event, 0, sizeof event); + event.events = EPOLLIN; + event.data.u32 = port_idx; + if (epoll_ctl(dpif->epoll_fd, EPOLL_CTL_ADD, nl_sock_fd(sock), + &event) < 0) { + return errno; + } + + nl_sock_destroy(dpif->channels[port_idx].sock); + dpif->channels[port_idx].sock = sock; + dpif->channels[port_idx].last_poll = LLONG_MIN; + + return 0; } static void -dpif_linux_run(struct dpif *dpif OVS_UNUSED) +del_channel(struct dpif_linux *dpif, odp_port_t port_no) { - if (nln) { - nln_run(nln); + struct dpif_channel *ch; + uint32_t port_idx = odp_to_u32(port_no); + + if (dpif->epoll_fd < 0 || port_idx >= dpif->uc_array_size) { + return; } + + ch = &dpif->channels[port_idx]; + if (!ch->sock) { + return; + } + + epoll_ctl(dpif->epoll_fd, EPOLL_CTL_DEL, nl_sock_fd(ch->sock), NULL); + dpif->event_offset = dpif->n_events = 0; + + nl_sock_destroy(ch->sock); + ch->sock = NULL; } static void -dpif_linux_wait(struct dpif *dpif OVS_UNUSED) +dpif_linux_close(struct dpif *dpif_) { - if (nln) { - nln_wait(nln); + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + nl_sock_destroy(dpif->port_notifier); + destroy_channels(dpif); + if (dpif->epoll_fd >= 0) { + close(dpif->epoll_fd); } + ovs_mutex_destroy(&dpif->upcall_lock); + free(dpif); } static int -dpif_linux_get_stats(const struct dpif *dpif_, struct ovs_dp_stats *stats) +dpif_linux_destroy(struct dpif *dpif_) { + struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct dpif_linux_dp dp; - struct ofpbuf *buf; - int error; - error = dpif_linux_dp_get(dpif_, &dp, &buf); - if (!error) { - *stats = dp.stats; - ofpbuf_delete(buf); - } - return error; + 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_get_drop_frags(const struct dpif *dpif_, bool *drop_fragsp) +dpif_linux_get_stats(const struct dpif *dpif_, struct dpif_dp_stats *stats) { struct dpif_linux_dp dp; struct ofpbuf *buf; @@ -345,76 +408,179 @@ dpif_linux_get_drop_frags(const struct dpif *dpif_, bool *drop_fragsp) error = dpif_linux_dp_get(dpif_, &dp, &buf); if (!error) { - *drop_fragsp = dp.ipv4_frags == OVS_DP_FRAG_DROP; + stats->n_hit = dp.stats.n_hit; + stats->n_missed = dp.stats.n_missed; + stats->n_lost = dp.stats.n_lost; + stats->n_flows = dp.stats.n_flows; ofpbuf_delete(buf); } return error; } -static int -dpif_linux_set_drop_frags(struct dpif *dpif_, bool drop_frags) +static const char * +get_vport_type(const struct dpif_linux_vport *vport) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - struct dpif_linux_dp dp; + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); - 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); + switch (vport->type) { + case OVS_VPORT_TYPE_NETDEV: + return "system"; + + case OVS_VPORT_TYPE_INTERNAL: + return "internal"; + + case OVS_VPORT_TYPE_GRE: + return "gre"; + + case OVS_VPORT_TYPE_GRE64: + return "gre64"; + + case OVS_VPORT_TYPE_VXLAN: + return "vxlan"; + + case OVS_VPORT_TYPE_LISP: + return "lisp"; + + case OVS_VPORT_TYPE_UNSPEC: + case __OVS_VPORT_TYPE_MAX: + break; + } + + VLOG_WARN_RL(&rl, "dp%d: port `%s' has unsupported type %u", + vport->dp_ifindex, vport->name, (unsigned int) vport->type); + return "unknown"; +} + +static enum ovs_vport_type +netdev_to_ovs_vport_type(const struct netdev *netdev) +{ + const char *type = netdev_get_type(netdev); + + if (!strcmp(type, "tap") || !strcmp(type, "system")) { + return OVS_VPORT_TYPE_NETDEV; + } else if (!strcmp(type, "internal")) { + return OVS_VPORT_TYPE_INTERNAL; + } else if (strstr(type, "gre64")) { + return OVS_VPORT_TYPE_GRE64; + } else if (strstr(type, "gre")) { + return OVS_VPORT_TYPE_GRE; + } else if (!strcmp(type, "vxlan")) { + return OVS_VPORT_TYPE_VXLAN; + } else if (!strcmp(type, "lisp")) { + return OVS_VPORT_TYPE_LISP; + } else { + return OVS_VPORT_TYPE_UNSPEC; + } } static int -dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev, - uint16_t *port_nop) +dpif_linux_port_add__(struct dpif *dpif_, struct netdev *netdev, + odp_port_t *port_nop) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - const char *name = netdev_get_name(netdev); + const struct netdev_tunnel_config *tnl_cfg; + char namebuf[NETDEV_VPORT_NAME_BUFSIZE]; + const char *name = netdev_vport_get_dpif_port(netdev, + namebuf, sizeof namebuf); const char *type = netdev_get_type(netdev); struct dpif_linux_vport request, reply; - const struct ofpbuf *options; + struct nl_sock *sock = NULL; + uint32_t upcall_pid; struct ofpbuf *buf; + uint64_t options_stub[64 / 8]; + struct ofpbuf options; int error; + if (dpif->epoll_fd >= 0) { + error = nl_sock_create(NETLINK_GENERIC, &sock); + if (error) { + return error; + } + } + 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); + request.type = netdev_to_ovs_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); + nl_sock_destroy(sock); return EINVAL; } request.name = name; - options = netdev_vport_get_options(netdev); - if (options && options->size) { - request.options = options->data; - request.options_len = options->size; - } - 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); + tnl_cfg = netdev_get_tunnel_config(netdev); + if (tnl_cfg && tnl_cfg->dst_port != 0) { + ofpbuf_use_stack(&options, options_stub, sizeof options_stub); + nl_msg_put_u16(&options, OVS_TUNNEL_ATTR_DST_PORT, + ntohs(tnl_cfg->dst_port)); + request.options = options.data; + request.options_len = options.size; + } - if (!error) { - *port_nop = reply.port_no; + request.port_no = *port_nop; + upcall_pid = sock ? nl_sock_pid(sock) : 0; + request.upcall_pid = &upcall_pid; + + error = dpif_linux_vport_transact(&request, &reply, &buf); + if (!error) { + *port_nop = reply.port_no; + VLOG_DBG("%s: assigning port %"PRIu32" to netlink pid %"PRIu32, + dpif_name(dpif_), reply.port_no, upcall_pid); + } else { + if (error == EBUSY && *port_nop != ODPP_NONE) { + VLOG_INFO("%s: requested port %"PRIu32" is in use", + dpif_name(dpif_), *port_nop); } + nl_sock_destroy(sock); ofpbuf_delete(buf); - } while (request.port_no != UINT32_MAX - && (error == EBUSY || error == EFBIG)); + return error; + } + ofpbuf_delete(buf); + + if (sock) { + error = add_channel(dpif, *port_nop, sock); + if (error) { + VLOG_INFO("%s: could not add channel for port %s", + dpif_name(dpif_), name); + + /* Delete the port. */ + dpif_linux_vport_init(&request); + request.cmd = OVS_VPORT_CMD_DEL; + request.dp_ifindex = dpif->dp_ifindex; + request.port_no = *port_nop; + dpif_linux_vport_transact(&request, NULL, NULL); + + nl_sock_destroy(sock); + return error; + } + } + + return 0; +} + +static int +dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev, + odp_port_t *port_nop) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + int error; + + ovs_mutex_lock(&dpif->upcall_lock); + error = dpif_linux_port_add__(dpif_, netdev, port_nop); + ovs_mutex_unlock(&dpif->upcall_lock); return error; } static int -dpif_linux_port_del(struct dpif *dpif_, uint16_t port_no) +dpif_linux_port_del__(struct dpif *dpif_, odp_port_t port_no) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct dpif_linux_vport vport; @@ -426,14 +592,26 @@ dpif_linux_port_del(struct dpif *dpif_, uint16_t port_no) vport.port_no = port_no; error = dpif_linux_vport_transact(&vport, NULL, NULL); - if (!error) { - dpif_linux_push_port(dpif, port_no); - } + del_channel(dpif, port_no); + return error; } static int -dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no, +dpif_linux_port_del(struct dpif *dpif_, odp_port_t port_no) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + int error; + + ovs_mutex_lock(&dpif->upcall_lock); + error = dpif_linux_port_del__(dpif_, port_no); + ovs_mutex_unlock(&dpif->upcall_lock); + + return error; +} + +static int +dpif_linux_port_query__(const struct dpif *dpif, odp_port_t port_no, const char *port_name, struct dpif_port *dpif_port) { struct dpif_linux_vport request; @@ -449,16 +627,22 @@ dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no, error = dpif_linux_vport_transact(&request, &reply, &buf); if (!error) { - dpif_port->name = xstrdup(reply.name); - dpif_port->type = xstrdup(netdev_vport_get_netdev_type(&reply)); - dpif_port->port_no = reply.port_no; + if (reply.dp_ifindex != request.dp_ifindex) { + /* A query by name reported that 'port_name' is in some datapath + * other than 'dpif', but the caller wants to know about 'dpif'. */ + error = ENODEV; + } else if (dpif_port) { + dpif_port->name = xstrdup(reply.name); + dpif_port->type = xstrdup(get_vport_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, +dpif_linux_port_query_by_number(const struct dpif *dpif, odp_port_t port_no, struct dpif_port *dpif_port) { return dpif_linux_port_query__(dpif, port_no, NULL, dpif_port); @@ -471,18 +655,35 @@ dpif_linux_port_query_by_name(const struct dpif *dpif, const char *devname, return dpif_linux_port_query__(dpif, 0, devname, dpif_port); } -static int +static odp_port_t dpif_linux_get_max_ports(const struct dpif *dpif OVS_UNUSED) { - /* If the datapath increases its range of supported ports, then it should - * start reporting that. */ - return 1024; + return u32_to_odp(MAX_PORTS); +} + +static uint32_t +dpif_linux_port_get_pid(const struct dpif *dpif_, odp_port_t port_no) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + uint32_t port_idx = odp_to_u32(port_no); + uint32_t pid = 0; + + ovs_mutex_lock(&dpif->upcall_lock); + if (dpif->epoll_fd >= 0) { + /* The ODPP_NONE "reserved" port number uses the "ovs-system"'s + * channel, since it is not heavily loaded. */ + uint32_t idx = port_idx >= dpif->uc_array_size ? 0 : port_idx; + pid = nl_sock_pid(dpif->channels[idx].sock); + } + ovs_mutex_unlock(&dpif->upcall_lock); + + return pid; } static int dpif_linux_flow_flush(struct dpif *dpif_) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct dpif_linux_flow flow; dpif_linux_flow_init(&flow); @@ -493,21 +694,17 @@ dpif_linux_flow_flush(struct dpif *dpif_) 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_); + const 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; @@ -515,7 +712,7 @@ dpif_linux_port_dump_start(const struct dpif *dpif_, void **statep) buf = ofpbuf_new(1024); dpif_linux_vport_to_ofpbuf(&request, buf); - nl_dump_start(&state->dump, genl_sock, buf); + nl_dump_start(&state->dump, NETLINK_GENERIC, buf); ofpbuf_delete(buf); return 0; @@ -531,7 +728,6 @@ dpif_linux_port_dump_next(const struct dpif *dpif OVS_UNUSED, void *state_, int error; if (!nl_dump_next(&state->dump, &buf)) { - state->complete = true; return EOF; } @@ -540,34 +736,18 @@ dpif_linux_port_dump_next(const struct dpif *dpif OVS_UNUSED, void *state_, return error; } - if (vport.port_no < LRU_MAX_PORTS) { - bitmap_set1(state->port_bitmap, vport.port_no); - } - - dpif_port->name = (char *) vport.name; - dpif_port->type = (char *) netdev_vport_get_netdev_type(&vport); + dpif_port->name = CONST_CAST(char *, vport.name); + dpif_port->type = CONST_CAST(char *, get_vport_type(&vport)); dpif_port->port_no = vport.port_no; return 0; } static int -dpif_linux_port_dump_done(const struct dpif *dpif_, void *state_) +dpif_linux_port_dump_done(const struct dpif *dpif_ OVS_UNUSED, 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); - } - } - } - - free(state->port_bitmap); free(state); return error; } @@ -577,23 +757,74 @@ dpif_linux_port_poll(const struct dpif *dpif_, char **devnamep) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - if (dpif->change_error) { - dpif->change_error = false; - sset_clear(&dpif->changed_ports); + /* Lazily create the Netlink socket to listen for notifications. */ + if (!dpif->port_notifier) { + struct nl_sock *sock; + int error; + + error = nl_sock_create(NETLINK_GENERIC, &sock); + if (error) { + return error; + } + + error = nl_sock_join_mcgroup(sock, ovs_vport_mcgroup); + if (error) { + nl_sock_destroy(sock); + return error; + } + dpif->port_notifier = sock; + + /* We have no idea of the current state so report that everything + * changed. */ return ENOBUFS; - } else if (!sset_is_empty(&dpif->changed_ports)) { - *devnamep = sset_pop(&dpif->changed_ports); - return 0; - } else { - return EAGAIN; + } + + for (;;) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + uint64_t buf_stub[4096 / 8]; + struct ofpbuf buf; + int error; + + ofpbuf_use_stub(&buf, buf_stub, sizeof buf_stub); + error = nl_sock_recv(dpif->port_notifier, &buf, false); + if (!error) { + struct dpif_linux_vport vport; + + error = dpif_linux_vport_from_ofpbuf(&vport, &buf); + if (!error) { + 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); + *devnamep = xstrdup(vport.name); + ofpbuf_uninit(&buf); + return 0; + } + } + } else if (error != EAGAIN) { + VLOG_WARN_RL(&rl, "error reading or parsing netlink (%s)", + ovs_strerror(error)); + nl_sock_drain(dpif->port_notifier); + error = ENOBUFS; + } + + ofpbuf_uninit(&buf); + if (error) { + return error; + } } } static void dpif_linux_port_poll_wait(const struct dpif *dpif_) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - if (!sset_is_empty(&dpif->changed_ports) || dpif->change_error) { + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + if (dpif->port_notifier) { + nl_sock_wait(dpif->port_notifier, POLLIN); + } else { poll_immediate_wake(); } } @@ -603,7 +834,7 @@ 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 dpif_linux *dpif = dpif_linux_cast(dpif_); + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct dpif_linux_flow request; dpif_linux_flow_init(&request); @@ -629,7 +860,7 @@ dpif_linux_flow_get(const struct dpif *dpif_, dpif_linux_flow_get_stats(&reply, stats); } if (actionsp) { - buf->data = (void *) reply.actions; + buf->data = CONST_CAST(struct nlattr *, reply.actions); buf->size = reply.actions_len; *actionsp = buf; } else { @@ -639,60 +870,77 @@ dpif_linux_flow_get(const struct dpif *dpif_, return error; } +static void +dpif_linux_init_flow_put(struct dpif *dpif_, const struct dpif_flow_put *put, + struct dpif_linux_flow *request) +{ + static const struct nlattr dummy_action; + + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + dpif_linux_flow_init(request); + request->cmd = (put->flags & DPIF_FP_CREATE + ? OVS_FLOW_CMD_NEW : OVS_FLOW_CMD_SET); + request->dp_ifindex = dpif->dp_ifindex; + request->key = put->key; + request->key_len = put->key_len; + request->mask = put->mask; + request->mask_len = put->mask_len; + /* Ensure that OVS_FLOW_ATTR_ACTIONS will always be included. */ + request->actions = (put->actions + ? put->actions + : CONST_CAST(struct nlattr *, &dummy_action)); + request->actions_len = put->actions_len; + if (put->flags & DPIF_FP_ZERO_STATS) { + request->clear = true; + } + request->nlmsg_flags = put->flags & DPIF_FP_MODIFY ? 0 : NLM_F_CREATE; +} + static int -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) +dpif_linux_flow_put(struct dpif *dpif_, const struct dpif_flow_put *put) { - 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; + dpif_linux_init_flow_put(dpif_, put, &request); error = dpif_linux_flow_transact(&request, - stats ? &reply : NULL, - stats ? &buf : NULL); - if (!error && stats) { - dpif_linux_flow_get_stats(&reply, stats); + put->stats ? &reply : NULL, + put->stats ? &buf : NULL); + if (!error && put->stats) { + dpif_linux_flow_get_stats(&reply, put->stats); ofpbuf_delete(buf); } return error; } +static void +dpif_linux_init_flow_del(struct dpif *dpif_, const struct dpif_flow_del *del, + struct dpif_linux_flow *request) +{ + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + dpif_linux_flow_init(request); + request->cmd = OVS_FLOW_CMD_DEL; + request->dp_ifindex = dpif->dp_ifindex; + request->key = del->key; + request->key_len = del->key_len; +} + static int -dpif_linux_flow_del(struct dpif *dpif_, - const struct nlattr *key, size_t key_len, - struct dpif_flow_stats *stats) +dpif_linux_flow_del(struct dpif *dpif_, const struct dpif_flow_del *del) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct dpif_linux_flow request, reply; struct ofpbuf *buf; int error; - 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; + dpif_linux_init_flow_del(dpif_, del, &request); error = dpif_linux_flow_transact(&request, - stats ? &reply : NULL, - stats ? &buf : NULL); - if (!error && stats) { - dpif_linux_flow_get_stats(&reply, stats); + del->stats ? &reply : NULL, + del->stats ? &buf : NULL); + if (!error && del->stats) { + dpif_linux_flow_get_stats(&reply, del->stats); ofpbuf_delete(buf); } return error; @@ -708,7 +956,7 @@ struct dpif_linux_flow_state { static int dpif_linux_flow_dump_start(const struct dpif *dpif_, void **statep) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct dpif_linux_flow_state *state; struct dpif_linux_flow request; struct ofpbuf *buf; @@ -721,7 +969,7 @@ dpif_linux_flow_dump_start(const struct dpif *dpif_, void **statep) buf = ofpbuf_new(1024); dpif_linux_flow_to_ofpbuf(&request, buf); - nl_dump_start(&state->dump, genl_sock, buf); + nl_dump_start(&state->dump, NETLINK_GENERIC, buf); ofpbuf_delete(buf); state->buf = NULL; @@ -732,6 +980,7 @@ dpif_linux_flow_dump_start(const struct dpif *dpif_, void **statep) 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 **mask, size_t *mask_len, const struct nlattr **actions, size_t *actions_len, const struct dpif_flow_stats **stats) { @@ -759,7 +1008,8 @@ dpif_linux_flow_dump_next(const struct dpif *dpif_ OVS_UNUSED, void *state_, if (error == ENOENT) { VLOG_DBG("dumped flow disappeared on get"); } else if (error) { - VLOG_WARN("error fetching dumped flow: %s", strerror(error)); + VLOG_WARN("error fetching dumped flow: %s", + ovs_strerror(error)); } } } while (error); @@ -772,6 +1022,10 @@ dpif_linux_flow_dump_next(const struct dpif *dpif_ OVS_UNUSED, void *state_, *key = state->flow.key; *key_len = state->flow.key_len; } + if (mask) { + *mask = state->flow.mask; + *mask_len = state->flow.mask ? state->flow.mask_len : 0; + } if (stats) { dpif_linux_flow_get_stats(&state->flow, &state->stats); *stats = &state->stats; @@ -789,126 +1043,280 @@ dpif_linux_flow_dump_done(const struct dpif *dpif OVS_UNUSED, void *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) +static void +dpif_linux_encode_execute(int dp_ifindex, const struct dpif_execute *d_exec, + struct ofpbuf *buf) { - struct ovs_header *execute; - struct ofpbuf *buf; - int error; + struct ovs_header *k_exec; - buf = ofpbuf_new(128 + actions_len + packet->size); + ofpbuf_prealloc_tailroom(buf, (64 + + d_exec->packet->size + + d_exec->key_len + + d_exec->actions_len)); nl_msg_put_genlmsghdr(buf, 0, ovs_packet_family, NLM_F_REQUEST, - OVS_PACKET_CMD_EXECUTE, 1); + OVS_PACKET_CMD_EXECUTE, OVS_PACKET_VERSION); - execute = ofpbuf_put_uninit(buf, sizeof *execute); - execute->dp_ifindex = dp_ifindex; + k_exec = ofpbuf_put_uninit(buf, sizeof *k_exec); + k_exec->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; + nl_msg_put_unspec(buf, OVS_PACKET_ATTR_PACKET, + d_exec->packet->data, d_exec->packet->size); + nl_msg_put_unspec(buf, OVS_PACKET_ATTR_KEY, d_exec->key, d_exec->key_len); + nl_msg_put_unspec(buf, OVS_PACKET_ATTR_ACTIONS, + d_exec->actions, d_exec->actions_len); } 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 *packet) +dpif_linux_execute__(int dp_ifindex, const struct dpif_execute *execute) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); + uint64_t request_stub[1024 / 8]; + struct ofpbuf request; + int error; + + ofpbuf_use_stub(&request, request_stub, sizeof request_stub); + dpif_linux_encode_execute(dp_ifindex, execute, &request); + error = nl_transact(NETLINK_GENERIC, &request, NULL); + ofpbuf_uninit(&request); - return dpif_linux_execute__(dpif->dp_ifindex, key, key_len, - actions, actions_len, packet); + return error; } static int -dpif_linux_recv_get_mask(const struct dpif *dpif_, int *listen_mask) +dpif_linux_execute(struct dpif *dpif_, const struct dpif_execute *execute) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - *listen_mask = dpif->listen_mask; - return 0; + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + return dpif_linux_execute__(dpif->dp_ifindex, execute); } -static int -dpif_linux_recv_set_mask(struct dpif *dpif_, int listen_mask) -{ - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - int error; - int i; +#define MAX_OPS 50 - 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; +static void +dpif_linux_operate__(struct dpif *dpif_, struct dpif_op **ops, size_t n_ops) +{ + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + struct op_auxdata { + struct nl_transaction txn; + + struct ofpbuf request; + uint64_t request_stub[1024 / 8]; + + struct ofpbuf reply; + uint64_t reply_stub[1024 / 8]; + } auxes[MAX_OPS]; + + struct nl_transaction *txnsp[MAX_OPS]; + size_t i; + + ovs_assert(n_ops <= MAX_OPS); + for (i = 0; i < n_ops; i++) { + struct op_auxdata *aux = &auxes[i]; + struct dpif_op *op = ops[i]; + struct dpif_flow_put *put; + struct dpif_flow_del *del; + struct dpif_execute *execute; + struct dpif_linux_flow flow; + + ofpbuf_use_stub(&aux->request, + aux->request_stub, sizeof aux->request_stub); + aux->txn.request = &aux->request; + + ofpbuf_use_stub(&aux->reply, aux->reply_stub, sizeof aux->reply_stub); + aux->txn.reply = NULL; + + switch (op->type) { + case DPIF_OP_FLOW_PUT: + put = &op->u.flow_put; + dpif_linux_init_flow_put(dpif_, put, &flow); + if (put->stats) { + flow.nlmsg_flags |= NLM_F_ECHO; + aux->txn.reply = &aux->reply; + } + dpif_linux_flow_to_ofpbuf(&flow, &aux->request); + break; + + case DPIF_OP_FLOW_DEL: + del = &op->u.flow_del; + dpif_linux_init_flow_del(dpif_, del, &flow); + if (del->stats) { + flow.nlmsg_flags |= NLM_F_ECHO; + aux->txn.reply = &aux->reply; + } + dpif_linux_flow_to_ofpbuf(&flow, &aux->request); + break; + + case DPIF_OP_EXECUTE: + execute = &op->u.execute; + dpif_linux_encode_execute(dpif->dp_ifindex, execute, + &aux->request); + break; + + default: + NOT_REACHED(); } } - /* 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]); - } + for (i = 0; i < n_ops; i++) { + txnsp[i] = &auxes[i].txn; } + nl_transact_multiple(NETLINK_GENERIC, txnsp, n_ops); + + for (i = 0; i < n_ops; i++) { + struct op_auxdata *aux = &auxes[i]; + struct nl_transaction *txn = &auxes[i].txn; + struct dpif_op *op = ops[i]; + struct dpif_flow_put *put; + struct dpif_flow_del *del; - /* Update listen_mask. */ - dpif->listen_mask = listen_mask; + op->error = txn->error; - /* Subscribe to new groups. */ - error = 0; - for (i = 0; i < DPIF_N_UC_TYPES; i++) { - if (dpif->listen_mask & (1u << i)) { - int retval; + switch (op->type) { + case DPIF_OP_FLOW_PUT: + put = &op->u.flow_put; + if (put->stats) { + if (!op->error) { + struct dpif_linux_flow reply; - retval = nl_sock_join_mcgroup(dpif->mc_sock, dpif->mcgroups[i]); - if (retval) { - error = retval; + op->error = dpif_linux_flow_from_ofpbuf(&reply, + txn->reply); + if (!op->error) { + dpif_linux_flow_get_stats(&reply, put->stats); + } + } + + if (op->error) { + memset(put->stats, 0, sizeof *put->stats); + } + } + break; + + case DPIF_OP_FLOW_DEL: + del = &op->u.flow_del; + if (del->stats) { + if (!op->error) { + struct dpif_linux_flow reply; + + op->error = dpif_linux_flow_from_ofpbuf(&reply, + txn->reply); + if (!op->error) { + dpif_linux_flow_get_stats(&reply, del->stats); + } + } + + if (op->error) { + memset(del->stats, 0, sizeof *del->stats); + } } + break; + + case DPIF_OP_EXECUTE: + break; + + default: + NOT_REACHED(); } + + ofpbuf_uninit(&aux->request); + ofpbuf_uninit(&aux->reply); + } +} + +static void +dpif_linux_operate(struct dpif *dpif, struct dpif_op **ops, size_t n_ops) +{ + while (n_ops > 0) { + size_t chunk = MIN(n_ops, MAX_OPS); + dpif_linux_operate__(dpif, ops, chunk); + ops += chunk; + n_ops -= chunk; } - return error; } static int -dpif_linux_get_sflow_probability(const struct dpif *dpif_, - uint32_t *probability) +dpif_linux_recv_set__(struct dpif *dpif_, bool enable) { - struct dpif_linux_dp dp; - struct ofpbuf *buf; - int error; + struct dpif_linux *dpif = dpif_linux_cast(dpif_); - error = dpif_linux_dp_get(dpif_, &dp, &buf); - if (!error) { - *probability = dp.sampling ? *dp.sampling : 0; - ofpbuf_delete(buf); + if ((dpif->epoll_fd >= 0) == enable) { + return 0; } - return error; + + if (!enable) { + destroy_channels(dpif); + } else { + struct dpif_port_dump port_dump; + struct dpif_port port; + + if (dpif->epoll_fd < 0) { + dpif->epoll_fd = epoll_create(10); + if (dpif->epoll_fd < 0) { + return errno; + } + } + + DPIF_PORT_FOR_EACH (&port, &port_dump, &dpif->dpif) { + struct dpif_linux_vport vport_request; + struct nl_sock *sock; + uint32_t upcall_pid; + int error; + + error = nl_sock_create(NETLINK_GENERIC, &sock); + if (error) { + return error; + } + + upcall_pid = nl_sock_pid(sock); + + dpif_linux_vport_init(&vport_request); + vport_request.cmd = OVS_VPORT_CMD_SET; + vport_request.dp_ifindex = dpif->dp_ifindex; + vport_request.port_no = port.port_no; + vport_request.upcall_pid = &upcall_pid; + error = dpif_linux_vport_transact(&vport_request, NULL, NULL); + if (!error) { + VLOG_DBG("%s: assigning port %"PRIu32" to netlink pid %"PRIu32, + dpif_name(&dpif->dpif), vport_request.port_no, + upcall_pid); + } else { + VLOG_WARN_RL(&error_rl, + "%s: failed to set upcall pid on port: %s", + dpif_name(&dpif->dpif), ovs_strerror(error)); + nl_sock_destroy(sock); + + if (error == ENODEV || error == ENOENT) { + /* This device isn't there, but keep trying the others. */ + continue; + } else { + return error; + } + } + + error = add_channel(dpif, port.port_no, sock); + if (error) { + VLOG_INFO("%s: could not add channel for port %s", + dpif_name(dpif_), port.name); + nl_sock_destroy(sock); + return error; + } + } + } + + return 0; } static int -dpif_linux_set_sflow_probability(struct dpif *dpif_, uint32_t probability) +dpif_linux_recv_set(struct dpif *dpif_, bool enable) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - struct dpif_linux_dp dp; + int error; - 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); + ovs_mutex_lock(&dpif->upcall_lock); + error = dpif_linux_recv_set__(dpif_, enable); + ovs_mutex_unlock(&dpif->upcall_lock); + + return error; } static int @@ -934,11 +1342,7 @@ parse_odp_packet(struct ofpbuf *buf, struct dpif_upcall *upcall, [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 }, + [OVS_PACKET_ATTR_USERDATA] = { .type = NL_A_UNSPEC, .optional = true }, }; struct ovs_header *ovs_header; @@ -962,7 +1366,6 @@ parse_odp_packet(struct ofpbuf *buf, struct dpif_upcall *upcall, 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; @@ -971,69 +1374,114 @@ parse_odp_packet(struct ofpbuf *buf, struct dpif_upcall *upcall, 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->data = CONST_CAST(struct nlattr *, + 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 = CONST_CAST(struct nlattr *, + 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]); - } - + upcall->userdata = a[OVS_PACKET_ATTR_USERDATA]; *dp_ifindex = ovs_header->dp_ifindex; return 0; } static int -dpif_linux_recv(struct dpif *dpif_, struct dpif_upcall *upcall) +dpif_linux_recv__(struct dpif *dpif_, struct dpif_upcall *upcall, + struct ofpbuf *buf) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - struct ofpbuf *buf; - int error; - int i; + int read_tries = 0; - if (!dpif->mc_sock) { - return EAGAIN; + if (dpif->epoll_fd < 0) { + return EAGAIN; } - for (i = 0; i < 50; i++) { - int dp_ifindex; + if (dpif->event_offset >= dpif->n_events) { + int retval; - error = nl_sock_recv(dpif->mc_sock, &buf, false); - if (error) { - return error; - } + dpif->event_offset = dpif->n_events = 0; - error = parse_odp_packet(buf, upcall, &dp_ifindex); - if (!error - && dp_ifindex == dpif->dp_ifindex - && dpif->listen_mask & (1u << upcall->type)) { - return 0; + do { + retval = epoll_wait(dpif->epoll_fd, dpif->epoll_events, + dpif->uc_array_size, 0); + } while (retval < 0 && errno == EINTR); + if (retval < 0) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + VLOG_WARN_RL(&rl, "epoll_wait failed (%s)", ovs_strerror(errno)); + } else if (retval > 0) { + dpif->n_events = retval; } + } - ofpbuf_delete(buf); - if (error) { - return error; + while (dpif->event_offset < dpif->n_events) { + int idx = dpif->epoll_events[dpif->event_offset].data.u32; + struct dpif_channel *ch = &dpif->channels[idx]; + + dpif->event_offset++; + + for (;;) { + int dp_ifindex; + int error; + + if (++read_tries > 50) { + return EAGAIN; + } + + error = nl_sock_recv(ch->sock, buf, false); + if (error == ENOBUFS) { + /* ENOBUFS typically means that we've received so many + * packets that the buffer overflowed. Try again + * immediately because there's almost certainly a packet + * waiting for us. */ + report_loss(dpif_, ch); + continue; + } + + ch->last_poll = time_msec(); + if (error) { + if (error == EAGAIN) { + break; + } + return error; + } + + error = parse_odp_packet(buf, upcall, &dp_ifindex); + if (!error && dp_ifindex == dpif->dp_ifindex) { + return 0; + } else if (error) { + return error; + } } } return EAGAIN; } +static int +dpif_linux_recv(struct dpif *dpif_, struct dpif_upcall *upcall, + struct ofpbuf *buf) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + int error; + + ovs_mutex_lock(&dpif->upcall_lock); + error = dpif_linux_recv__(dpif_, upcall, buf); + ovs_mutex_unlock(&dpif->upcall_lock); + + return error; +} + static void dpif_linux_recv_wait(struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - if (dpif->mc_sock) { - nl_sock_wait(dpif->mc_sock, POLLIN); + + ovs_mutex_lock(&dpif->upcall_lock); + if (dpif->epoll_fd >= 0) { + poll_fd_wait(dpif->epoll_fd, POLLIN); } + ovs_mutex_unlock(&dpif->upcall_lock); } static void @@ -1041,27 +1489,36 @@ 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); + ovs_mutex_lock(&dpif->upcall_lock); + if (dpif->epoll_fd >= 0) { + struct dpif_channel *ch; + + for (ch = dpif->channels; ch < &dpif->channels[dpif->uc_array_size]; + ch++) { + if (ch->sock) { + nl_sock_drain(ch->sock); + } + } } + ovs_mutex_unlock(&dpif->upcall_lock); } const struct dpif_class dpif_linux_class = { "system", dpif_linux_enumerate, + NULL, dpif_linux_open, dpif_linux_close, dpif_linux_destroy, - dpif_linux_run, - dpif_linux_wait, + NULL, /* run */ + NULL, /* wait */ dpif_linux_get_stats, - dpif_linux_get_drop_frags, - dpif_linux_set_drop_frags, dpif_linux_port_add, dpif_linux_port_del, dpif_linux_port_query_by_number, dpif_linux_port_query_by_name, dpif_linux_get_max_ports, + dpif_linux_port_get_pid, dpif_linux_port_dump_start, dpif_linux_port_dump_next, dpif_linux_port_dump_done, @@ -1075,10 +1532,8 @@ const struct dpif_class dpif_linux_class = { dpif_linux_flow_dump_next, dpif_linux_flow_dump_done, dpif_linux_execute, - dpif_linux_recv_get_mask, - dpif_linux_recv_set_mask, - dpif_linux_get_sflow_probability, - dpif_linux_set_sflow_probability, + dpif_linux_operate, + dpif_linux_recv_set, dpif_linux_queue_to_priority, dpif_linux_recv, dpif_linux_recv_wait, @@ -1088,11 +1543,10 @@ const struct dpif_class dpif_linux_class = { static int dpif_linux_init(void) { - static int error = -1; - - if (error < 0) { - unsigned int ovs_vport_mcgroup; + static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; + static int error; + if (ovsthread_once_start(&once)) { error = nl_lookup_genl_family(OVS_DATAPATH_FAMILY, &ovs_datapath_family); if (error) { @@ -1110,19 +1564,13 @@ dpif_linux_init(void) 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, OVS_VPORT_MCGROUP_FALLBACK_ID); } - if (!error) { - static struct dpif_linux_vport vport; - nln = nln_create(NETLINK_GENERIC, ovs_vport_mcgroup, - dpif_linux_nln_parse, &vport); - } + + ovsthread_once_done(&once); } return error; @@ -1140,60 +1588,11 @@ dpif_linux_is_internal_device(const char *name) ofpbuf_delete(buf); } else if (error != ENODEV && error != ENOENT) { VLOG_WARN_RL(&error_rl, "%s: vport query failed (%s)", - name, strerror(error)); + name, ovs_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 @@ -1209,16 +1608,10 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, [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), + [OVS_VPORT_ATTR_UPCALL_PID] = { .type = NL_A_U32 }, + [OVS_VPORT_ATTR_STATS] = { NL_POLICY_FOR(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)]; @@ -1242,22 +1635,19 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, 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->port_no = nl_attr_get_odp_port(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_UPCALL_PID]) { + vport->upcall_pid = nl_attr_get(a[OVS_VPORT_ATTR_UPCALL_PID]); + } 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; } @@ -1270,13 +1660,13 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport, struct ovs_header *ovs_header; nl_msg_put_genlmsghdr(buf, 0, ovs_vport_family, NLM_F_REQUEST | NLM_F_ECHO, - vport->cmd, 1); + vport->cmd, OVS_VPORT_VERSION); 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 (vport->port_no != ODPP_NONE) { + nl_msg_put_odp_port(buf, OVS_VPORT_ATTR_PORT_NO, vport->port_no); } if (vport->type != OVS_VPORT_TYPE_UNSPEC) { @@ -1287,24 +1677,19 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport, nl_msg_put_string(buf, OVS_VPORT_ATTR_NAME, vport->name); } + if (vport->upcall_pid) { + nl_msg_put_u32(buf, OVS_VPORT_ATTR_UPCALL_PID, *vport->upcall_pid); + } + if (vport->stats) { nl_msg_put_unspec(buf, OVS_VPORT_ATTR_STATS, vport->stats, sizeof *vport->stats); } - 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); - } } /* Clears 'vport' to "empty" values. */ @@ -1312,7 +1697,7 @@ void dpif_linux_vport_init(struct dpif_linux_vport *vport) { memset(vport, 0, sizeof *vport); - vport->port_no = UINT32_MAX; + vport->port_no = ODPP_NONE; } /* Executes 'request' in the kernel datapath. If the command fails, returns a @@ -1329,7 +1714,7 @@ dpif_linux_vport_transact(const struct dpif_linux_vport *request, struct ofpbuf *request_buf; int error; - assert((reply != NULL) == (bufp != NULL)); + ovs_assert((reply != NULL) == (bufp != NULL)); error = dpif_linux_init(); if (error) { @@ -1342,7 +1727,7 @@ dpif_linux_vport_transact(const struct dpif_linux_vport *request, request_buf = ofpbuf_new(1024); dpif_linux_vport_to_ofpbuf(request, request_buf); - error = nl_sock_transact(genl_sock, request_buf, bufp); + error = nl_transact(NETLINK_GENERIC, request_buf, bufp); ofpbuf_delete(request_buf); if (reply) { @@ -1385,13 +1770,8 @@ 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), + [OVS_DP_ATTR_STATS] = { NL_POLICY_FOR(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)]; @@ -1422,40 +1802,6 @@ dpif_linux_dp_from_ofpbuf(struct dpif_linux_dp *dp, const struct ofpbuf *buf) 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)]; - - 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]); - } - } return 0; } @@ -1467,7 +1813,8 @@ dpif_linux_dp_to_ofpbuf(const struct dpif_linux_dp *dp, struct ofpbuf *buf) struct ovs_header *ovs_header; nl_msg_put_genlmsghdr(buf, 0, ovs_datapath_family, - NLM_F_REQUEST | NLM_F_ECHO, dp->cmd, 1); + NLM_F_REQUEST | NLM_F_ECHO, dp->cmd, + OVS_DATAPATH_VERSION); ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header); ovs_header->dp_ifindex = dp->dp_ifindex; @@ -1476,15 +1823,11 @@ dpif_linux_dp_to_ofpbuf(const struct dpif_linux_dp *dp, struct ofpbuf *buf) 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->upcall_pid) { + nl_msg_put_u32(buf, OVS_DP_ATTR_UPCALL_PID, *dp->upcall_pid); } - if (dp->sampling) { - nl_msg_put_u32(buf, OVS_DP_ATTR_SAMPLING, *dp->sampling); - } + /* Skip OVS_DP_ATTR_STATS since we never have a reason to serialize it. */ } /* Clears 'dp' to "empty" values. */ @@ -1505,7 +1848,7 @@ dpif_linux_dp_dump_start(struct nl_dump *dump) buf = ofpbuf_new(1024); dpif_linux_dp_to_ofpbuf(&request, buf); - nl_dump_start(dump, genl_sock, buf); + nl_dump_start(dump, NETLINK_GENERIC, buf); ofpbuf_delete(buf); } @@ -1522,11 +1865,11 @@ dpif_linux_dp_transact(const struct dpif_linux_dp *request, struct ofpbuf *request_buf; int error; - assert((reply != NULL) == (bufp != NULL)); + ovs_assert((reply != NULL) == (bufp != NULL)); request_buf = ofpbuf_new(1024); dpif_linux_dp_to_ofpbuf(request, request_buf); - error = nl_sock_transact(genl_sock, request_buf, bufp); + error = nl_transact(NETLINK_GENERIC, request_buf, bufp); ofpbuf_delete(request_buf); if (reply) { @@ -1571,10 +1914,9 @@ dpif_linux_flow_from_ofpbuf(struct dpif_linux_flow *flow, { static const struct nl_policy ovs_flow_policy[] = { [OVS_FLOW_ATTR_KEY] = { .type = NL_A_NESTED }, + [OVS_FLOW_ATTR_MASK] = { .type = NL_A_NESTED, .optional = true }, [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), + [OVS_FLOW_ATTR_STATS] = { NL_POLICY_FOR(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 }, @@ -1604,6 +1946,11 @@ dpif_linux_flow_from_ofpbuf(struct dpif_linux_flow *flow, 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_MASK]) { + flow->mask = nl_attr_get(a[OVS_FLOW_ATTR_MASK]); + flow->mask_len = nl_attr_get_size(a[OVS_FLOW_ATTR_MASK]); + } 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]); @@ -1629,8 +1976,8 @@ dpif_linux_flow_to_ofpbuf(const struct dpif_linux_flow *flow, 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); + NLM_F_REQUEST | flow->nlmsg_flags, + flow->cmd, OVS_FLOW_VERSION); ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header); ovs_header->dp_ifindex = flow->dp_ifindex; @@ -1639,15 +1986,19 @@ dpif_linux_flow_to_ofpbuf(const struct dpif_linux_flow *flow, nl_msg_put_unspec(buf, OVS_FLOW_ATTR_KEY, flow->key, flow->key_len); } + if (flow->mask_len) { + nl_msg_put_unspec(buf, OVS_FLOW_ATTR_MASK, flow->mask, flow->mask_len); + } + 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); + ovs_assert(!flow->stats); + ovs_assert(!flow->tcp_flags); + ovs_assert(!flow->used); if (flow->clear) { nl_msg_put_flag(buf, OVS_FLOW_ATTR_CLEAR); @@ -1668,17 +2019,21 @@ dpif_linux_flow_init(struct dpif_linux_flow *flow) * 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 -dpif_linux_flow_transact(const struct dpif_linux_flow *request, +dpif_linux_flow_transact(struct dpif_linux_flow *request, struct dpif_linux_flow *reply, struct ofpbuf **bufp) { struct ofpbuf *request_buf; int error; - assert((reply != NULL) == (bufp != NULL)); + ovs_assert((reply != NULL) == (bufp != NULL)); + + if (reply) { + request->nlmsg_flags |= NLM_F_ECHO; + } request_buf = ofpbuf_new(1024); dpif_linux_flow_to_ofpbuf(request, request_buf); - error = nl_sock_transact(genl_sock, request_buf, bufp); + error = nl_transact(NETLINK_GENERIC, request_buf, bufp); ofpbuf_delete(request_buf); if (reply) { @@ -1705,7 +2060,30 @@ dpif_linux_flow_get_stats(const struct dpif_linux_flow *flow, stats->n_packets = 0; stats->n_bytes = 0; } - stats->used = flow->used ? get_unaligned_u64(flow->used) : 0; + stats->used = flow->used ? get_32aligned_u64(flow->used) : 0; stats->tcp_flags = flow->tcp_flags ? *flow->tcp_flags : 0; } + +/* Logs information about a packet that was recently lost in 'ch' (in + * 'dpif_'). */ +static void +report_loss(struct dpif *dpif_, struct dpif_channel *ch) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5); + struct ds s; + + if (VLOG_DROP_WARN(&rl)) { + return; + } + ds_init(&s); + if (ch->last_poll != LLONG_MIN) { + ds_put_format(&s, " (last polled %lld ms ago)", + time_msec() - ch->last_poll); + } + + VLOG_WARN("%s: lost packet on channel %td%s", + dpif_name(dpif_), ch - dpif->channels, ds_cstr(&s)); + ds_destroy(&s); +}