X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-linux.c;h=e2300d6c297987354d6aa3687f276133334f3842;hb=b3dcb73cc58a7ee089cfaec623818142196e1172;hp=496230e0365d2b461f39d523b43e8b1ba785e289;hpb=0aeaabc8dbccef7593dc19e891a3f5bbef1991cd;p=sliver-openvswitch.git diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index 496230e03..e2300d6c2 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. + * 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 @@ -47,8 +46,6 @@ #include "netlink.h" #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" @@ -62,11 +59,6 @@ VLOG_DEFINE_THIS_MODULE(dpif_linux); enum { MAX_PORTS = USHRT_MAX }; -enum { N_CHANNELS = 17 }; -BUILD_ASSERT_DECL(IS_POW2(N_CHANNELS - 1)); -BUILD_ASSERT_DECL(N_CHANNELS > 1); -BUILD_ASSERT_DECL(N_CHANNELS <= 32); /* We use a 32-bit word as a mask. */ - /* 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 */ @@ -112,6 +104,8 @@ struct dpif_linux_flow { * 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. */ @@ -131,92 +125,51 @@ static int dpif_linux_flow_transact(struct dpif_linux_flow *request, static void dpif_linux_flow_get_stats(const struct dpif_linux_flow *, struct dpif_flow_stats *); -/* Packet drop monitoring. - * - * When kernel-to-user Netlink buffers overflow, the kernel notifies us that - * one or more packets were dropped, but it doesn't tell us anything about - * those packets. However, the administrator really wants to know. So we do - * the next best thing, and keep track of the top sources of packets received - * on each kernel-to-user channel, since the top sources are those that will - * cause the buffers to overflow. - * - * We use a variation on the "Space-Saving" algorithm in Metwally et al., - * "Efficient Computation of Frequent and Top-k Elements in Data Streams", ACM - * Transactions on Database Systems 31:3 (2006). This algorithm yields - * perfectly accurate results when the data stream's unique values (in this - * case, port numbers) fit into our data structure, and degrades gracefully - * even for challenging distributions (e.g. Zipf). - * - * Our implementation is very simple, without any of the special flourishes - * described in the paper. It avoids the need to use a hash for lookup by - * keeping the constant factor (N_SKETCHES) very small. The error calculations - * in the paper make it sound like the results should still be satisfactory. - * - * "space-saving" and "Metwally" seem like awkward names for data structures, - * so we call this a "sketch" even though technically that's a different sort - * of summary structure. - */ - -/* One of N_SKETCHES counting elements per channel in the Metwally - * "space-saving" algorithm. */ -enum { N_SKETCHES = 8 }; /* Number of elements per channel. */ -struct dpif_sketch { - uint32_t port_no; /* Port number. */ - unsigned int hits; /* Number of hits. */ - unsigned int error; /* Upper bound on error in 'hits'. */ -}; - -/* One of N_CHANNELS channels per dpif between the kernel and userspace. */ +/* One of the dpif channels between the kernel and userspace. */ struct dpif_channel { struct nl_sock *sock; /* Netlink socket. */ - struct dpif_sketch sketches[N_SKETCHES]; /* From max to min 'hits'. */ long long int last_poll; /* Last time this channel was polled. */ }; -static void update_sketch(struct dpif_channel *, uint32_t port_no); -static void scale_sketches(struct dpif *); static void report_loss(struct dpif *, struct dpif_channel *); -/* Interval, in milliseconds, at which to scale down the sketch values by a - * factor of 2. The Metwally algorithm doesn't do this, which makes sense in - * the context it assumes, but in our situation we ought to weight recent data - * more heavily than old data, so in my opinion this is reasonable. */ -#define SCALE_INTERVAL (60 * 1000) - /* Datapath interface for the openvswitch Linux kernel module. */ struct dpif_linux { struct dpif dpif; int dp_ifindex; /* Upcall messages. */ - struct dpif_channel channels[N_CHANNELS]; - uint32_t ready_mask; /* 1-bit for each sock with unread 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. */ - long long int next_scale; /* Next time to scale down the sketches. */ + 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; + 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 uint32_t dpif_linux_port_get_pid(const struct dpif *, uint32_t port_no); +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 *); @@ -282,45 +235,141 @@ dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name, 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; dpif = xzalloc(sizeof *dpif); - dpif->port_notifier = nln_notifier_create(nln, dpif_linux_port_changed, - dpif); + dpif->port_notifier = NULL; + ovs_mutex_init(&dpif->upcall_lock); dpif->epoll_fd = -1; dpif_init(&dpif->dpif, &dpif_linux_class, dp->name, dp->dp_ifindex, dp->dp_ifindex); - dpif->next_scale = LLONG_MAX; - dpif->dp_ifindex = dp->dp_ifindex; - sset_init(&dpif->changed_ports); *dpifp = &dpif->dpif; + + return 0; } static void destroy_channels(struct dpif_linux *dpif) { - struct dpif_channel *ch; + unsigned int i; - if (dpif->epoll_fd >= 0) { - close(dpif->epoll_fd); - dpif->epoll_fd = -1; + if (dpif->epoll_fd < 0) { + return; } - for (ch = dpif->channels; ch < &dpif->channels[N_CHANNELS]; ch++) { + + 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); - ch->sock = NULL; } - dpif->next_scale = LLONG_MAX; + + 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 +add_channel(struct dpif_linux *dpif, odp_port_t port_no, struct nl_sock *sock) +{ + struct epoll_event event; + uint32_t port_idx = odp_to_u32(port_no); + + 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 +del_channel(struct dpif_linux *dpif, odp_port_t port_no) +{ + 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 @@ -328,9 +377,12 @@ dpif_linux_close(struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - nln_notifier_destroy(dpif->port_notifier); + nl_sock_destroy(dpif->port_notifier); destroy_channels(dpif); - sset_destroy(&dpif->changed_ports); + if (dpif->epoll_fd >= 0) { + close(dpif->epoll_fd); + } + ovs_mutex_destroy(&dpif->upcall_lock); free(dpif); } @@ -346,29 +398,6 @@ dpif_linux_destroy(struct dpif *dpif_) return dpif_linux_dp_transact(&dp, NULL, NULL); } -static void -dpif_linux_run(struct dpif *dpif_) -{ - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - - if (time_msec() >= dpif->next_scale) { - dpif->next_scale = time_msec() + SCALE_INTERVAL; - scale_sketches(dpif_); - } - - if (nln) { - nln_run(nln); - } -} - -static void -dpif_linux_wait(struct dpif *dpif OVS_UNUSED) -{ - if (nln) { - nln_wait(nln); - } -} - static int dpif_linux_get_stats(const struct dpif *dpif_, struct dpif_dp_stats *stats) { @@ -387,63 +416,170 @@ dpif_linux_get_stats(const struct dpif *dpif_, struct dpif_dp_stats *stats) return error; } +static const char * +get_vport_type(const struct dpif_linux_vport *vport) +{ + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); + + 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, - uint32_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); } + 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; + } + request.port_no = *port_nop; - upcall_pid = dpif_linux_port_get_pid(dpif_, request.port_no); + 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_), request.port_no, upcall_pid); - } else if (error == EBUSY && *port_nop != UINT32_MAX) { - VLOG_INFO("%s: requested port %"PRIu32" is in use", - dpif_name(dpif_), *port_nop); + 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); + 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_, uint32_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; @@ -455,11 +591,26 @@ dpif_linux_port_del(struct dpif *dpif_, uint32_t port_no) vport.port_no = port_no; error = dpif_linux_vport_transact(&vport, NULL, NULL); + 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; @@ -481,7 +632,7 @@ dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no, error = ENODEV; } else if (dpif_port) { dpif_port->name = xstrdup(reply.name); - dpif_port->type = xstrdup(netdev_vport_get_netdev_type(&reply)); + dpif_port->type = xstrdup(get_vport_type(&reply)); dpif_port->port_no = reply.port_no; } ofpbuf_delete(buf); @@ -490,7 +641,7 @@ dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no, } static int -dpif_linux_port_query_by_number(const struct dpif *dpif, uint32_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); @@ -503,33 +654,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 uint32_t dpif_linux_get_max_ports(const struct dpif *dpif OVS_UNUSED) { return MAX_PORTS; } static uint32_t -dpif_linux_port_get_pid(const struct dpif *dpif_, uint32_t port_no) +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; - if (dpif->epoll_fd < 0) { - return 0; - } else { - int idx; - - idx = (port_no != UINT32_MAX - ? 1 + (port_no & (N_CHANNELS - 2)) - : 0); - return nl_sock_pid(dpif->channels[idx].sock); + 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); @@ -545,7 +698,7 @@ struct dpif_linux_port_state { 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; @@ -558,7 +711,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; @@ -583,7 +736,7 @@ dpif_linux_port_dump_next(const struct dpif *dpif OVS_UNUSED, void *state_, } dpif_port->name = CONST_CAST(char *, vport.name); - dpif_port->type = CONST_CAST(char *, netdev_vport_get_netdev_type(&vport)); + dpif_port->type = CONST_CAST(char *, get_vport_type(&vport)); dpif_port->port_no = vport.port_no; return 0; } @@ -603,23 +756,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(); } } @@ -629,7 +833,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); @@ -669,9 +873,9 @@ static void dpif_linux_init_flow_put(struct dpif *dpif_, const struct dpif_flow_put *put, struct dpif_linux_flow *request) { - static struct nlattr dummy_action; + static const struct nlattr dummy_action; - struct dpif_linux *dpif = dpif_linux_cast(dpif_); + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); dpif_linux_flow_init(request); request->cmd = (put->flags & DPIF_FP_CREATE @@ -679,8 +883,12 @@ dpif_linux_init_flow_put(struct dpif *dpif_, const struct dpif_flow_put *put, 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 : &dummy_action; + 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; @@ -710,7 +918,7 @@ static void dpif_linux_init_flow_del(struct dpif *dpif_, const struct dpif_flow_del *del, struct dpif_linux_flow *request) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); dpif_linux_flow_init(request); request->cmd = OVS_FLOW_CMD_DEL; @@ -747,7 +955,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; @@ -760,7 +968,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; @@ -771,6 +979,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) { @@ -798,7 +1007,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); @@ -811,6 +1021,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; @@ -861,7 +1075,7 @@ dpif_linux_execute__(int dp_ifindex, const struct dpif_execute *execute) ofpbuf_use_stub(&request, request_stub, sizeof request_stub); dpif_linux_encode_execute(dp_ifindex, execute, &request); - error = nl_sock_transact(genl_sock, &request, NULL); + error = nl_transact(NETLINK_GENERIC, &request, NULL); ofpbuf_uninit(&request); return error; @@ -870,7 +1084,7 @@ dpif_linux_execute__(int dp_ifindex, const struct dpif_execute *execute) static int dpif_linux_execute(struct dpif *dpif_, const struct dpif_execute *execute) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); return dpif_linux_execute__(dpif->dp_ifindex, execute); } @@ -880,7 +1094,7 @@ dpif_linux_execute(struct dpif *dpif_, const struct dpif_execute *execute) static void dpif_linux_operate__(struct dpif *dpif_, struct dpif_op **ops, size_t n_ops) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct op_auxdata { struct nl_transaction txn; @@ -895,7 +1109,7 @@ dpif_linux_operate__(struct dpif *dpif_, struct dpif_op **ops, size_t n_ops) struct nl_transaction *txnsp[MAX_OPS]; size_t i; - assert(n_ops <= MAX_OPS); + 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]; @@ -946,7 +1160,7 @@ dpif_linux_operate__(struct dpif *dpif_, struct dpif_op **ops, size_t n_ops) for (i = 0; i < n_ops; i++) { txnsp[i] = &auxes[i].txn; } - nl_sock_transact_multiple(genl_sock, txnsp, n_ops); + nl_transact_multiple(NETLINK_GENERIC, txnsp, n_ops); for (i = 0; i < n_ops; i++) { struct op_auxdata *aux = &auxes[i]; @@ -1019,37 +1233,8 @@ dpif_linux_operate(struct dpif *dpif, struct dpif_op **ops, size_t n_ops) } } -static void -set_upcall_pids(struct dpif *dpif_) -{ - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - struct dpif_port_dump port_dump; - struct dpif_port port; - int error; - - DPIF_PORT_FOR_EACH (&port, &port_dump, &dpif->dpif) { - uint32_t upcall_pid = dpif_linux_port_get_pid(dpif_, port.port_no); - struct dpif_linux_vport vport_request; - - 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), strerror(error)); - } - } -} - static int -dpif_linux_recv_set(struct dpif *dpif_, bool enable) +dpif_linux_recv_set__(struct dpif *dpif_, bool enable) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); @@ -1060,47 +1245,79 @@ dpif_linux_recv_set(struct dpif *dpif_, bool enable) if (!enable) { destroy_channels(dpif); } else { - struct dpif_channel *ch; - int error; + struct dpif_port_dump port_dump; + struct dpif_port port; - dpif->epoll_fd = epoll_create(N_CHANNELS); if (dpif->epoll_fd < 0) { - return errno; + dpif->epoll_fd = epoll_create(10); + if (dpif->epoll_fd < 0) { + return errno; + } } - for (ch = dpif->channels; ch < &dpif->channels[N_CHANNELS]; ch++) { - int indx = ch - dpif->channels; - struct epoll_event event; + 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, &ch->sock); + error = nl_sock_create(NETLINK_GENERIC, &sock); if (error) { - destroy_channels(dpif); return error; } - memset(&event, 0, sizeof event); - event.events = EPOLLIN; - event.data.u32 = indx; - if (epoll_ctl(dpif->epoll_fd, EPOLL_CTL_ADD, nl_sock_fd(ch->sock), - &event) < 0) { - error = errno; - destroy_channels(dpif); - 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; + } } - memset(ch->sketches, 0, sizeof ch->sketches); - ch->last_poll = LLONG_MIN; + 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; + } } - - dpif->ready_mask = 0; - dpif->next_scale = time_msec() + SCALE_INTERVAL; } - set_upcall_pids(dpif_); - return 0; } +static int +dpif_linux_recv_set(struct dpif *dpif_, bool enable) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + int error; + + ovs_mutex_lock(&dpif->upcall_lock); + error = dpif_linux_recv_set__(dpif_, enable); + ovs_mutex_unlock(&dpif->upcall_lock); + + return error; +} + static int dpif_linux_queue_to_priority(const struct dpif *dpif OVS_UNUSED, uint32_t queue_id, uint32_t *priority) @@ -1124,7 +1341,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_ATTR_USERDATA] = { .type = NL_A_UNSPEC, .optional = true }, }; struct ovs_header *ovs_header; @@ -1162,17 +1379,15 @@ parse_odp_packet(struct ofpbuf *buf, struct dpif_upcall *upcall, 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->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, - struct ofpbuf *buf) +dpif_linux_recv__(struct dpif *dpif_, struct dpif_upcall *upcall, + struct ofpbuf *buf) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); int read_tries = 0; @@ -1181,29 +1396,28 @@ dpif_linux_recv(struct dpif *dpif_, struct dpif_upcall *upcall, return EAGAIN; } - if (!dpif->ready_mask) { - struct epoll_event events[N_CHANNELS]; + if (dpif->event_offset >= dpif->n_events) { int retval; - int i; + + dpif->event_offset = dpif->n_events = 0; do { - retval = epoll_wait(dpif->epoll_fd, events, N_CHANNELS, 0); + 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)", strerror(errno)); - } - - for (i = 0; i < retval; i++) { - dpif->ready_mask |= 1u << events[i].data.u32; + VLOG_WARN_RL(&rl, "epoll_wait failed (%s)", ovs_strerror(errno)); + } else if (retval > 0) { + dpif->n_events = retval; } } - while (dpif->ready_mask) { - int indx = ffs(dpif->ready_mask) - 1; - struct dpif_channel *ch = &dpif->channels[indx]; + 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->ready_mask &= ~(1u << indx); + dpif->event_offset++; for (;;) { int dp_ifindex; @@ -1233,16 +1447,8 @@ dpif_linux_recv(struct dpif *dpif_, struct dpif_upcall *upcall, error = parse_odp_packet(buf, upcall, &dp_ifindex); if (!error && dp_ifindex == dpif->dp_ifindex) { - const struct nlattr *in_port; - - in_port = nl_attr_find__(upcall->key, upcall->key_len, - OVS_KEY_ATTR_IN_PORT); - if (in_port) { - update_sketch(ch, nl_attr_get_u32(in_port)); - } return 0; - } - if (error) { + } else if (error) { return error; } } @@ -1251,31 +1457,49 @@ dpif_linux_recv(struct dpif *dpif_, struct dpif_upcall *upcall, 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->epoll_fd < 0) { - return; + ovs_mutex_lock(&dpif->upcall_lock); + if (dpif->epoll_fd >= 0) { + poll_fd_wait(dpif->epoll_fd, POLLIN); } - - poll_fd_wait(dpif->epoll_fd, POLLIN); + ovs_mutex_unlock(&dpif->upcall_lock); } static void dpif_linux_recv_purge(struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - struct dpif_channel *ch; - if (dpif->epoll_fd < 0) { - return; - } + ovs_mutex_lock(&dpif->upcall_lock); + if (dpif->epoll_fd >= 0) { + struct dpif_channel *ch; - for (ch = dpif->channels; ch < &dpif->channels[N_CHANNELS]; ch++) { - nl_sock_drain(ch->sock); + 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 = { @@ -1285,8 +1509,8 @@ const struct dpif_class dpif_linux_class = { 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_port_add, dpif_linux_port_del, @@ -1318,11 +1542,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) { @@ -1340,19 +1563,12 @@ 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); + &ovs_vport_mcgroup); } + + ovsthread_once_done(&once); } return error; @@ -1370,65 +1586,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 dpif_execute execute; - struct flow flow; - uint64_t action; - - ofpbuf_use_const(&packet, data, size); - flow_extract(&packet, 0, NULL, 0, &flow); - - ofpbuf_use_stack(&key, &keybuf, sizeof keybuf); - odp_flow_key_from_flow(&key, &flow, OVSP_NONE); - - ofpbuf_use_stack(&actions, &action, sizeof action); - nl_msg_put_u32(&actions, OVS_ACTION_ATTR_OUTPUT, port_no); - - execute.key = key.data; - execute.key_len = key.size; - execute.actions = actions.data; - execute.actions_len = actions.size; - execute.packet = &packet; - return dpif_linux_execute__(dp_ifindex, &execute); -} - -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 @@ -1447,10 +1609,6 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, [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 }, }; @@ -1475,7 +1633,7 @@ 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]) { @@ -1484,9 +1642,6 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, 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]); @@ -1508,8 +1663,8 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport, 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) { @@ -1529,11 +1684,6 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport, 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); @@ -1545,7 +1695,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 @@ -1562,7 +1712,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) { @@ -1575,7 +1725,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) { @@ -1696,7 +1846,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); } @@ -1713,11 +1863,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) { @@ -1762,6 +1912,7 @@ 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] = { NL_POLICY_FOR(struct ovs_flow_stats), .optional = true }, @@ -1793,6 +1944,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]); @@ -1828,15 +1984,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); @@ -1863,7 +2023,7 @@ dpif_linux_flow_transact(struct dpif_linux_flow *request, 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; @@ -1871,7 +2031,7 @@ dpif_linux_flow_transact(struct dpif_linux_flow *request, 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) { @@ -1902,55 +2062,6 @@ dpif_linux_flow_get_stats(const struct dpif_linux_flow *flow, stats->tcp_flags = flow->tcp_flags ? *flow->tcp_flags : 0; } -/* Metwally "space-saving" algorithm implementation. */ - -/* Updates 'ch' to record that a packet was received on 'port_no'. */ -static void -update_sketch(struct dpif_channel *ch, uint32_t port_no) -{ - struct dpif_sketch *sk; - - /* Find an existing counting element for 'port_no' or, if none, replace the - * counting element with the fewest hits by 'port_no'. */ - for (sk = ch->sketches; ; sk++) { - if (port_no == sk->port_no) { - break; - } else if (sk == &ch->sketches[N_SKETCHES - 1]) { - sk->port_no = port_no; - sk->error = sk->hits; - break; - } - } - - /* Increment the hit count, then re-sort the counting elements (usually - * nothing needs to be done). */ - sk->hits++; - while (sk > ch->sketches && sk[-1].hits > sk->hits) { - struct dpif_sketch tmp = sk[-1]; - sk[-1] = *sk; - *sk = tmp; - sk--; - } -} - -/* Divide the counts of all the the counting elements in 'dpif' by 2. See the - * comment on SCALE_INTERVAL. */ -static void -scale_sketches(struct dpif *dpif_) -{ - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - struct dpif_channel *ch; - - for (ch = dpif->channels; ch < &dpif->channels[N_CHANNELS]; ch++) { - struct dpif_sketch *sk; - - for (sk = ch->sketches; sk < &ch->sketches[N_SKETCHES]; sk++) { - sk->hits /= 2; - sk->error /= 2; - } - } -} - /* Logs information about a packet that was recently lost in 'ch' (in * 'dpif_'). */ static void @@ -1958,10 +2069,9 @@ 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 dpif_sketch *sk; struct ds s; - if (VLOG_DROP_ERR(&rl)) { + if (VLOG_DROP_WARN(&rl)) { return; } @@ -1970,25 +2080,6 @@ report_loss(struct dpif *dpif_, struct dpif_channel *ch) ds_put_format(&s, " (last polled %lld ms ago)", time_msec() - ch->last_poll); } - ds_put_cstr(&s, ", most frequent sources are"); - for (sk = ch->sketches; sk < &ch->sketches[N_SKETCHES]; sk++) { - if (sk->hits) { - struct dpif_port port; - - ds_put_format(&s, " %"PRIu32, sk->port_no); - if (!dpif_port_query_by_number(dpif_, sk->port_no, &port)) { - ds_put_format(&s, "(%s)", port.name); - dpif_port_destroy(&port); - } - if (sk->error) { - ds_put_format(&s, ": %u to %u,", - sk->hits - sk->error, sk->hits); - } else { - ds_put_format(&s, ": %u,", sk->hits); - } - } - } - ds_chomp(&s, ','); VLOG_WARN("%s: lost packet on channel %td%s", dpif_name(dpif_), ch - dpif->channels, ds_cstr(&s));