X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-linux.c;h=f7f529266821786d104c550987a150c9fdc269c8;hb=bdd534291ff72077390f7b1745c4443ad3833d99;hp=b6eba397621b70c188b4075e051c30bc18c02b36;hpb=c060c4cf83c03385f295680e34bc55f4a8024034;p=sliver-openvswitch.git diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index b6eba3976..f7f529266 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -25,8 +25,6 @@ #include #include #include -#include -#include #include #include #include @@ -46,8 +44,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" @@ -74,8 +70,11 @@ struct dpif_linux_dp { /* Attributes. */ const char *name; /* OVS_DP_ATTR_NAME. */ - const uint32_t *upcall_pid; /* OVS_DP_UPCALL_PID. */ + const uint32_t *upcall_pid; /* OVS_DP_ATTR_UPCALL_PID. */ + uint32_t user_features; /* OVS_DP_ATTR_USER_FEATURES */ struct ovs_dp_stats stats; /* OVS_DP_ATTR_STATS. */ + struct ovs_dp_megaflow_stats megaflow_stats; + /* OVS_DP_ATTR_MEGAFLOW_STATS.*/ }; static void dpif_linux_dp_init(struct dpif_linux_dp *); @@ -106,6 +105,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. */ @@ -139,6 +140,7 @@ struct dpif_linux { int dp_ifindex; /* 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; @@ -147,28 +149,30 @@ struct dpif_linux { 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. */ + bool refresh_channels; }; 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 int dpif_linux_refresh_channels(struct dpif *); static void dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *, struct ofpbuf *); @@ -226,41 +230,44 @@ dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name, upcall_pid = 0; dp_request.upcall_pid = &upcall_pid; } else { - dp_request.cmd = OVS_DP_CMD_GET; + /* Use OVS_DP_CMD_SET to report user features */ + dp_request.cmd = OVS_DP_CMD_SET; } dp_request.name = name; + dp_request.user_features |= OVS_DP_F_UNALIGNED; 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; 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->dp_ifindex = dp->dp_ifindex; - sset_init(&dpif->changed_ports); *dpifp = &dpif->dpif; + + return 0; } static void destroy_channels(struct dpif_linux *dpif) { - int i; + unsigned int i; if (dpif->epoll_fd < 0) { return; @@ -275,11 +282,13 @@ destroy_channels(struct dpif_linux *dpif) 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 = i; + vport_request.port_no = u32_to_odp(i); vport_request.upcall_pid = &upcall_pid; dpif_linux_vport_transact(&vport_request, NULL, NULL); @@ -294,14 +303,15 @@ destroy_channels(struct dpif_linux *dpif) dpif->epoll_events = NULL; dpif->n_events = dpif->event_offset = 0; - close(dpif->epoll_fd); - dpif->epoll_fd = -1; + /* 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, uint32_t port_no, struct nl_sock *sock) +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; @@ -309,11 +319,11 @@ add_channel(struct dpif_linux *dpif, uint32_t port_no, struct nl_sock *sock) /* We assume that the datapath densely chooses port numbers, which * can therefore be used as an index into an array of channels. */ - if (port_no >= dpif->uc_array_size) { - int new_size = port_no + 1; - int i; + if (port_idx >= dpif->uc_array_size) { + uint32_t new_size = port_idx + 1; + uint32_t i; - if (new_size > 65535) { + if (new_size > MAX_PORTS) { VLOG_WARN_RL(&error_rl, "%s: datapath port %"PRIu32" too big", dpif_name(&dpif->dpif), port_no); return EFBIG; @@ -332,33 +342,36 @@ add_channel(struct dpif_linux *dpif, uint32_t port_no, struct nl_sock *sock) memset(&event, 0, sizeof event); event.events = EPOLLIN; - event.data.u32 = port_no; + event.data.u32 = port_idx; if (epoll_ctl(dpif->epoll_fd, EPOLL_CTL_ADD, nl_sock_fd(sock), &event) < 0) { return errno; } - dpif->channels[port_no].sock = sock; - dpif->channels[port_no].last_poll = LLONG_MIN; + 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, uint32_t port_no) +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_no >= dpif->uc_array_size) { + if (dpif->epoll_fd < 0 || port_idx >= dpif->uc_array_size) { return; } - ch = &dpif->channels[port_no]; + 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; @@ -369,9 +382,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); } @@ -388,18 +404,12 @@ dpif_linux_destroy(struct dpif *dpif_) } static void -dpif_linux_run(struct dpif *dpif_ OVS_UNUSED) +dpif_linux_run(struct dpif *dpif_) { - if (nln) { - nln_run(nln); - } -} - -static void -dpif_linux_wait(struct dpif *dpif OVS_UNUSED) -{ - if (nln) { - nln_wait(nln); + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + if (dpif->refresh_channels) { + dpif->refresh_channels = false; + dpif_linux_refresh_channels(dpif_); } } @@ -416,6 +426,8 @@ dpif_linux_get_stats(const struct dpif *dpif_, struct dpif_dp_stats *stats) stats->n_missed = dp.stats.n_missed; stats->n_lost = dp.stats.n_lost; stats->n_flows = dp.stats.n_flows; + stats->n_masks = dp.megaflow_stats.n_masks; + stats->n_mask_hit = dp.megaflow_stats.n_mask_hit; ofpbuf_delete(buf); } return error; @@ -439,12 +451,12 @@ get_vport_type(const struct dpif_linux_vport *vport) case OVS_VPORT_TYPE_GRE64: return "gre64"; - case OVS_VPORT_TYPE_CAPWAP: - return "capwap"; - 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; @@ -468,26 +480,31 @@ netdev_to_ovs_vport_type(const struct netdev *netdev) return OVS_VPORT_TYPE_GRE64; } else if (strstr(type, "gre")) { return OVS_VPORT_TYPE_GRE; - } else if (!strcmp(type, "capwap")) { - return OVS_VPORT_TYPE_CAPWAP; } 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_vport_get_dpif_port(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; 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) { @@ -514,6 +531,15 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *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 = sock ? nl_sock_pid(sock) : 0; request.upcall_pid = &upcall_pid; @@ -524,7 +550,7 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev, VLOG_DBG("%s: assigning port %"PRIu32" to netlink pid %"PRIu32, dpif_name(dpif_), reply.port_no, upcall_pid); } else { - if (error == EBUSY && *port_nop != UINT32_MAX) { + if (error == EBUSY && *port_nop != ODPP_NONE) { VLOG_INFO("%s: requested port %"PRIu32" is in use", dpif_name(dpif_), *port_nop); } @@ -556,7 +582,21 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev, } static int -dpif_linux_port_del(struct dpif *dpif_, uint32_t port_no) +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_, odp_port_t port_no) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct dpif_linux_vport vport; @@ -574,7 +614,20 @@ dpif_linux_port_del(struct dpif *dpif_, uint32_t port_no) } 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; @@ -605,7 +658,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); @@ -618,31 +671,30 @@ 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 -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 { - /* The UINT32_MAX "reserved" port number uses the "ovs-system"'s + 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. */ - int idx = (port_no >= dpif->uc_array_size) ? 0 : port_no; - return nl_sock_pid(dpif->channels[idx].sock); + uint32_t idx = port_idx >= dpif->uc_array_size ? 0 : port_idx; + const struct nl_sock *sock = dpif->channels[idx].sock; + pid = sock ? nl_sock_pid(sock) : 0; } + 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); @@ -655,46 +707,66 @@ struct dpif_linux_port_state { struct nl_dump dump; }; -static int -dpif_linux_port_dump_start(const struct dpif *dpif_, void **statep) +static void +dpif_linux_port_dump_start__(const struct dpif *dpif_, struct nl_dump *dump) { - struct dpif_linux *dpif = dpif_linux_cast(dpif_); - struct dpif_linux_port_state *state; + const struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct dpif_linux_vport request; struct ofpbuf *buf; - *statep = state = xmalloc(sizeof *state); - dpif_linux_vport_init(&request); - request.cmd = OVS_DP_CMD_GET; + request.cmd = OVS_VPORT_CMD_GET; request.dp_ifindex = dpif->dp_ifindex; buf = ofpbuf_new(1024); dpif_linux_vport_to_ofpbuf(&request, buf); - nl_dump_start(&state->dump, genl_sock, buf); + nl_dump_start(dump, NETLINK_GENERIC, buf); ofpbuf_delete(buf); +} + +static int +dpif_linux_port_dump_start(const struct dpif *dpif, void **statep) +{ + struct dpif_linux_port_state *state; + + *statep = state = xmalloc(sizeof *state); + dpif_linux_port_dump_start__(dpif, &state->dump); return 0; } static int -dpif_linux_port_dump_next(const struct dpif *dpif OVS_UNUSED, void *state_, - struct dpif_port *dpif_port) +dpif_linux_port_dump_next__(const struct dpif *dpif_, struct nl_dump *dump, + struct dpif_linux_vport *vport) { - struct dpif_linux_port_state *state = state_; - struct dpif_linux_vport vport; + struct dpif_linux *dpif = dpif_linux_cast(dpif_); struct ofpbuf buf; int error; - if (!nl_dump_next(&state->dump, &buf)) { + if (!nl_dump_next(dump, &buf)) { return EOF; } - error = dpif_linux_vport_from_ofpbuf(&vport, &buf); + error = dpif_linux_vport_from_ofpbuf(vport, &buf); if (error) { - return error; + VLOG_WARN_RL(&error_rl, "%s: failed to parse vport record (%s)", + dpif_name(&dpif->dpif), ovs_strerror(error)); } + return error; +} + +static int +dpif_linux_port_dump_next(const struct dpif *dpif OVS_UNUSED, void *state_, + struct dpif_port *dpif_port) +{ + struct dpif_linux_port_state *state = state_; + struct dpif_linux_vport vport; + int error; + error = dpif_linux_port_dump_next__(dpif, &state->dump, &vport); + if (error) { + return error; + } 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; @@ -716,23 +788,77 @@ 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); + if (vport.cmd == OVS_VPORT_CMD_DEL) { + dpif->refresh_channels = true; + } + *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(); } } @@ -742,7 +868,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); @@ -782,9 +908,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 @@ -792,8 +918,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; @@ -823,7 +953,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; @@ -860,7 +990,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; @@ -868,12 +998,12 @@ dpif_linux_flow_dump_start(const struct dpif *dpif_, void **statep) *statep = state = xmalloc(sizeof *state); dpif_linux_flow_init(&request); - request.cmd = OVS_DP_CMD_GET; + request.cmd = OVS_FLOW_CMD_GET; request.dp_ifindex = dpif->dp_ifindex; buf = ofpbuf_new(1024); dpif_linux_flow_to_ofpbuf(&request, buf); - nl_dump_start(&state->dump, genl_sock, buf); + nl_dump_start(&state->dump, NETLINK_GENERIC, buf); ofpbuf_delete(buf); state->buf = NULL; @@ -882,8 +1012,9 @@ 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_, +dpif_linux_flow_dump_next(const struct dpif *dpif_, 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) { @@ -911,7 +1042,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); @@ -924,6 +1056,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; @@ -946,10 +1082,11 @@ dpif_linux_encode_execute(int dp_ifindex, const struct dpif_execute *d_exec, struct ofpbuf *buf) { struct ovs_header *k_exec; + size_t key_ofs; ofpbuf_prealloc_tailroom(buf, (64 + d_exec->packet->size - + d_exec->key_len + + ODP_KEY_METADATA_SIZE + d_exec->actions_len)); nl_msg_put_genlmsghdr(buf, 0, ovs_packet_family, NLM_F_REQUEST, @@ -960,7 +1097,11 @@ dpif_linux_encode_execute(int dp_ifindex, const struct dpif_execute *d_exec, 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); + + key_ofs = nl_msg_start_nested(buf, OVS_PACKET_ATTR_KEY); + odp_key_from_pkt_metadata(buf, &d_exec->md); + nl_msg_end_nested(buf, key_ofs); + nl_msg_put_unspec(buf, OVS_PACKET_ATTR_ACTIONS, d_exec->actions, d_exec->actions_len); } @@ -974,16 +1115,16 @@ 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; } static int -dpif_linux_execute(struct dpif *dpif_, const struct dpif_execute *execute) +dpif_linux_execute(struct dpif *dpif_, 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); } @@ -993,7 +1134,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; @@ -1052,14 +1193,14 @@ dpif_linux_operate__(struct dpif *dpif_, struct dpif_op **ops, size_t n_ops) break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } 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]; @@ -1113,7 +1254,7 @@ dpif_linux_operate__(struct dpif *dpif_, struct dpif_op **ops, size_t n_ops) break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } ofpbuf_uninit(&aux->request); @@ -1132,43 +1273,59 @@ dpif_linux_operate(struct dpif *dpif, struct dpif_op **ops, size_t n_ops) } } +/* Synchronizes 'dpif->channels' with the set of vports currently in 'dpif' in + * the kernel, by adding a new channel for any kernel vport that lacks one and + * deleting any channels that have no backing kernel vports. */ static int -dpif_linux_recv_set(struct dpif *dpif_, bool enable) +dpif_linux_refresh_channels(struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); + unsigned long int *keep_channels; + struct dpif_linux_vport vport; + size_t keep_channels_nbits; + struct nl_dump dump; + int retval = 0; + size_t i; - if ((dpif->epoll_fd >= 0) == enable) { - return 0; - } - - if (!enable) { - destroy_channels(dpif); - } else { - struct dpif_port_dump port_dump; - struct dpif_port port; - + /* To start with, we need an epoll fd. */ + 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; + keep_channels_nbits = dpif->uc_array_size; + keep_channels = bitmap_allocate(keep_channels_nbits); + + dpif->n_events = dpif->event_offset = 0; + dpif_linux_port_dump_start__(dpif_, &dump); + while (!dpif_linux_port_dump_next__(dpif_, &dump, &vport)) { + uint32_t port_no = odp_to_u32(vport.port_no); + struct nl_sock *sock = (port_no < dpif->uc_array_size + ? dpif->channels[port_no].sock + : NULL); + bool new_sock = !sock; + int error; + + if (new_sock) { error = nl_sock_create(NETLINK_GENERIC, &sock); if (error) { - return error; + retval = error; + goto error; } + } - upcall_pid = nl_sock_pid(sock); + /* Configure the vport to deliver misses to 'sock'. */ + if (!vport.upcall_pid || *vport.upcall_pid != nl_sock_pid(sock)) { + uint32_t upcall_pid = nl_sock_pid(sock); + 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.port_no = vport.port_no; vport_request.upcall_pid = &upcall_pid; error = dpif_linux_vport_transact(&vport_request, NULL, NULL); if (!error) { @@ -1178,28 +1335,77 @@ dpif_linux_recv_set(struct dpif *dpif_, bool enable) } else { VLOG_WARN_RL(&error_rl, "%s: failed to set upcall pid on port: %s", - dpif_name(&dpif->dpif), strerror(error)); - nl_sock_destroy(sock); + dpif_name(&dpif->dpif), ovs_strerror(error)); - if (error == ENODEV || error == ENOENT) { - /* This device isn't there, but keep trying the others. */ - continue; + if (error != ENODEV && error != ENOENT) { + retval = error; } else { - return error; + /* The vport isn't really there, even though the dump says + * it is. Probably we just hit a race after a port + * disappeared. */ } + goto error; } + } - error = add_channel(dpif, port.port_no, sock); + if (new_sock) { + error = add_channel(dpif, vport.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_name(dpif_), vport.name); + retval = error; + goto error; } } + + if (port_no < keep_channels_nbits) { + bitmap_set1(keep_channels, port_no); + } + continue; + + error: + nl_sock_destroy(sock); } + nl_dump_done(&dump); - return 0; + /* Discard any saved channels that we didn't reuse. */ + for (i = 0; i < keep_channels_nbits; i++) { + if (!bitmap_is_set(keep_channels, i)) { + nl_sock_destroy(dpif->channels[i].sock); + dpif->channels[i].sock = NULL; + } + } + free(keep_channels); + + return retval; +} + +static int +dpif_linux_recv_set__(struct dpif *dpif_, bool enable) +{ + struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + if ((dpif->epoll_fd >= 0) == enable) { + return 0; + } else if (!enable) { + destroy_channels(dpif); + return 0; + } else { + return dpif_linux_refresh_channels(dpif_); + } +} + +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 @@ -1225,7 +1431,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; @@ -1254,26 +1460,30 @@ parse_odp_packet(struct ofpbuf *buf, struct dpif_upcall *upcall, return EINVAL; } - memset(upcall, 0, sizeof *upcall); + /* (Re)set ALL fields of '*upcall' on successful return. */ upcall->type = type; - upcall->packet = buf; - 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 = 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]; + + /* Allow overwriting the netlink attribute header without reallocating. */ + ofpbuf_use_stub(&upcall->packet, + CONST_CAST(struct nlattr *, + nl_attr_get(a[OVS_PACKET_ATTR_PACKET])) - 1, + nl_attr_get_size(a[OVS_PACKET_ATTR_PACKET]) + + sizeof(struct nlattr)); + upcall->packet.data = (char *)upcall->packet.data + sizeof(struct nlattr); + upcall->packet.size = nl_attr_get_size(a[OVS_PACKET_ATTR_PACKET]); + *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; @@ -1293,7 +1503,7 @@ dpif_linux_recv(struct dpif *dpif_, struct dpif_upcall *upcall, } 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)); + VLOG_WARN_RL(&rl, "epoll_wait failed (%s)", ovs_strerror(errno)); } else if (retval > 0) { dpif->n_events = retval; } @@ -1343,33 +1553,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[dpif->uc_array_size]; ch++) { - if (ch->sock) { - 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 = { @@ -1380,13 +1606,12 @@ const struct dpif_class dpif_linux_class = { dpif_linux_close, dpif_linux_destroy, dpif_linux_run, - dpif_linux_wait, + NULL, /* wait */ dpif_linux_get_stats, 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, @@ -1412,11 +1637,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) { @@ -1434,19 +1658,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; @@ -1464,38 +1681,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; } - -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 @@ -1538,7 +1728,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]) { @@ -1568,8 +1758,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) { @@ -1600,7 +1790,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 @@ -1630,7 +1820,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) { @@ -1675,6 +1865,9 @@ dpif_linux_dp_from_ofpbuf(struct dpif_linux_dp *dp, const struct ofpbuf *buf) [OVS_DP_ATTR_NAME] = { .type = NL_A_STRING, .max_len = IFNAMSIZ }, [OVS_DP_ATTR_STATS] = { NL_POLICY_FOR(struct ovs_dp_stats), .optional = true }, + [OVS_DP_ATTR_MEGAFLOW_STATS] = { + NL_POLICY_FOR(struct ovs_dp_megaflow_stats), + .optional = true }, }; struct nlattr *a[ARRAY_SIZE(ovs_datapath_policy)]; @@ -1706,6 +1899,13 @@ dpif_linux_dp_from_ofpbuf(struct dpif_linux_dp *dp, const struct ofpbuf *buf) sizeof dp->stats); } + if (a[OVS_DP_ATTR_MEGAFLOW_STATS]) { + /* Can't use structure assignment because Netlink doesn't ensure + * sufficient alignment for 64-bit members. */ + memcpy(&dp->megaflow_stats, nl_attr_get(a[OVS_DP_ATTR_MEGAFLOW_STATS]), + sizeof dp->megaflow_stats); + } + return 0; } @@ -1730,6 +1930,10 @@ dpif_linux_dp_to_ofpbuf(const struct dpif_linux_dp *dp, struct ofpbuf *buf) nl_msg_put_u32(buf, OVS_DP_ATTR_UPCALL_PID, *dp->upcall_pid); } + if (dp->user_features) { + nl_msg_put_u32(buf, OVS_DP_ATTR_USER_FEATURES, dp->user_features); + } + /* Skip OVS_DP_ATTR_STATS since we never have a reason to serialize it. */ } @@ -1738,6 +1942,8 @@ static void dpif_linux_dp_init(struct dpif_linux_dp *dp) { memset(dp, 0, sizeof *dp); + dp->megaflow_stats.n_masks = UINT32_MAX; + dp->megaflow_stats.n_mask_hit = UINT64_MAX; } static void @@ -1751,7 +1957,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); } @@ -1772,15 +1978,15 @@ dpif_linux_dp_transact(const struct dpif_linux_dp *request, 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) { + dpif_linux_dp_init(reply); if (!error) { error = dpif_linux_dp_from_ofpbuf(reply, *bufp); } if (error) { - dpif_linux_dp_init(reply); ofpbuf_delete(*bufp); *bufp = NULL; } @@ -1817,6 +2023,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 }, @@ -1848,6 +2055,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]); @@ -1883,6 +2095,10 @@ 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); @@ -1926,7 +2142,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) { @@ -1976,7 +2192,7 @@ report_loss(struct dpif *dpif_, struct dpif_channel *ch) time_msec() - ch->last_poll); } - VLOG_WARN("%s: lost packet on channel %td%s", + VLOG_WARN("%s: lost packet on channel %"PRIdPTR"%s", dpif_name(dpif_), ch - dpif->channels, ds_cstr(&s)); ds_destroy(&s); }