X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-linux.c;h=779f764e69b552f6144d1189bb931ee60b12fd8b;hb=a79f29f20e556514259d8593de779fc1b15c4055;hp=ca5f496d0c5f0fce3e4c3c3ca99cd081bc792cee;hpb=1dd16b9a274afbde46c9d9a4052d720d4cf3c3e2;p=sliver-openvswitch.git diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index ca5f496d0..779f764e6 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +25,6 @@ #include #include #include -#include -#include #include #include #include @@ -46,7 +44,6 @@ #include "netlink.h" #include "odp-util.h" #include "ofpbuf.h" -#include "openvswitch/datapath-compat.h" #include "packets.h" #include "poll-loop.h" #include "random.h" @@ -73,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 *); @@ -150,6 +150,7 @@ struct dpif_linux { /* Change notification. */ 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); @@ -170,7 +171,8 @@ static unsigned int ovs_vport_mcgroup; static int dpif_linux_init(void); 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); + odp_port_t port_no, uint32_t hash); +static int dpif_linux_refresh_channels(struct dpif *); static void dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *, struct ofpbuf *); @@ -188,7 +190,8 @@ static int dpif_linux_enumerate(struct sset *all_dps) { struct nl_dump dump; - struct ofpbuf msg; + uint64_t reply_stub[NL_DUMP_BUFSIZE / 8]; + struct ofpbuf msg, buf; int error; error = dpif_linux_init(); @@ -196,14 +199,16 @@ dpif_linux_enumerate(struct sset *all_dps) return error; } + ofpbuf_use_stub(&buf, reply_stub, sizeof reply_stub); dpif_linux_dp_dump_start(&dump); - while (nl_dump_next(&dump, &msg)) { + while (nl_dump_next(&dump, &msg, &buf)) { struct dpif_linux_dp dp; if (!dpif_linux_dp_from_ofpbuf(&dp, &msg)) { sset_add(all_dps, dp.name); } } + ofpbuf_uninit(&buf); return nl_dump_done(&dump); } @@ -228,9 +233,11 @@ 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; @@ -300,7 +307,7 @@ destroy_channels(struct dpif_linux *dpif) 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. */ + * call dpif_recv_wait() to wait on an arbitrary fd or a closed fd. */ } static int @@ -399,6 +406,16 @@ 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 (dpif->refresh_channels) { + dpif->refresh_channels = false; + dpif_linux_refresh_channels(dpif_); + } +} + static int dpif_linux_get_stats(const struct dpif *dpif_, struct dpif_dp_stats *stats) { @@ -412,6 +429,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; @@ -423,8 +442,11 @@ 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_NETDEV: { + const char *type = netdev_get_type_from_name(vport->name); + + return type ? type : "system"; + } case OVS_VPORT_TYPE_INTERNAL: return "internal"; @@ -656,13 +678,8 @@ dpif_linux_port_query_by_name(const struct dpif *dpif, const char *devname, } 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_, odp_port_t port_no) +dpif_linux_port_get_pid(const struct dpif *dpif_, odp_port_t port_no, + uint32_t hash OVS_UNUSED) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); uint32_t port_idx = odp_to_u32(port_no); @@ -673,7 +690,8 @@ dpif_linux_port_get_pid(const struct dpif *dpif_, odp_port_t port_no) /* 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); + const struct nl_sock *sock = dpif->channels[idx].sock; + pid = sock ? nl_sock_pid(sock) : 0; } ovs_mutex_unlock(&dpif->upcall_lock); @@ -694,48 +712,72 @@ dpif_linux_flow_flush(struct dpif *dpif_) struct dpif_linux_port_state { struct nl_dump dump; + struct ofpbuf buf; }; -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) { 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); - 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, NETLINK_GENERIC, 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); + ofpbuf_init(&state->buf, NL_DUMP_BUFSIZE); 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 ofpbuf *buffer) { - 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, buffer)) { 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, + &state->buf); + 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; @@ -748,6 +790,7 @@ dpif_linux_port_dump_done(const struct dpif *dpif_ OVS_UNUSED, void *state_) struct dpif_linux_port_state *state = state_; int error = nl_dump_done(&state->dump); + ofpbuf_uninit(&state->buf); free(state); return error; } @@ -798,6 +841,9 @@ dpif_linux_port_poll(const struct dpif *dpif_, char **devnamep) || 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; @@ -947,64 +993,90 @@ dpif_linux_flow_del(struct dpif *dpif_, const struct dpif_flow_del *del) } struct dpif_linux_flow_state { - struct nl_dump dump; struct dpif_linux_flow flow; struct dpif_flow_stats stats; - struct ofpbuf *buf; + struct ofpbuf buffer; /* Always used to store flows. */ + struct ofpbuf *tmp; /* Used if kernel does not supply actions. */ }; +struct dpif_linux_flow_iter { + struct nl_dump dump; + atomic_int status; +}; + +static void +dpif_linux_flow_dump_state_init(void **statep) +{ + struct dpif_linux_flow_state *state; + + *statep = state = xmalloc(sizeof *state); + ofpbuf_init(&state->buffer, NL_DUMP_BUFSIZE); + state->tmp = NULL; +} + +static void +dpif_linux_flow_dump_state_uninit(void *state_) +{ + struct dpif_linux_flow_state *state = state_; + + ofpbuf_uninit(&state->buffer); + ofpbuf_delete(state->tmp); + free(state); +} + static int -dpif_linux_flow_dump_start(const struct dpif *dpif_, void **statep) +dpif_linux_flow_dump_start(const struct dpif *dpif_, void **iterp) { const struct dpif_linux *dpif = dpif_linux_cast(dpif_); - struct dpif_linux_flow_state *state; + struct dpif_linux_flow_iter *iter; struct dpif_linux_flow request; struct ofpbuf *buf; - *statep = state = xmalloc(sizeof *state); + *iterp = iter = xmalloc(sizeof *iter); 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, NETLINK_GENERIC, buf); + nl_dump_start(&iter->dump, NETLINK_GENERIC, buf); ofpbuf_delete(buf); - - state->buf = NULL; + atomic_init(&iter->status, 0); return 0; } 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 *iter_, 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) { + struct dpif_linux_flow_iter *iter = iter_; struct dpif_linux_flow_state *state = state_; struct ofpbuf buf; int error; do { - ofpbuf_delete(state->buf); - state->buf = NULL; + ofpbuf_delete(state->tmp); + state->tmp = NULL; - if (!nl_dump_next(&state->dump, &buf)) { + if (!nl_dump_next(&iter->dump, &buf, &state->buffer)) { return EOF; } error = dpif_linux_flow_from_ofpbuf(&state->flow, &buf); if (error) { + atomic_store(&iter->status, error); return error; } if (actions && !state->flow.actions) { error = dpif_linux_flow_get__(dpif_, state->flow.key, state->flow.key_len, - &state->flow, &state->buf); + &state->flow, &state->tmp); if (error == ENOENT) { VLOG_DBG("dumped flow disappeared on get"); } else if (error) { @@ -1033,14 +1105,24 @@ dpif_linux_flow_dump_next(const struct dpif *dpif_ OVS_UNUSED, void *state_, return error; } -static int -dpif_linux_flow_dump_done(const struct dpif *dpif OVS_UNUSED, void *state_) +static bool +dpif_linux_flow_dump_next_may_destroy_keys(void *state_) { struct dpif_linux_flow_state *state = state_; - int error = nl_dump_done(&state->dump); - ofpbuf_delete(state->buf); - free(state); - return error; + + return state->buffer.size ? false : true; +} + +static int +dpif_linux_flow_dump_done(const struct dpif *dpif OVS_UNUSED, void *iter_) +{ + struct dpif_linux_flow_iter *iter = iter_; + int dump_status; + unsigned int nl_status = nl_dump_done(&iter->dump); + + atomic_read(&iter->status, &dump_status); + free(iter); + return dump_status ? dump_status : nl_status; } static void @@ -1048,10 +1130,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, @@ -1062,7 +1145,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); } @@ -1083,7 +1170,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) +dpif_linux_execute(struct dpif *dpif_, struct dpif_execute *execute) { const struct dpif_linux *dpif = dpif_linux_cast(dpif_); @@ -1154,7 +1241,7 @@ dpif_linux_operate__(struct dpif *dpif_, struct dpif_op **ops, size_t n_ops) break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1215,7 +1302,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); @@ -1234,45 +1321,62 @@ 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; + uint64_t reply_stub[NL_DUMP_BUFSIZE / 8]; + struct ofpbuf buf; + int retval = 0; + size_t i; - if ((dpif->epoll_fd >= 0) == enable) { - return 0; + /* 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; + } } - if (!enable) { - destroy_channels(dpif); - } else { - struct dpif_port_dump port_dump; - struct dpif_port port; + keep_channels_nbits = dpif->uc_array_size; + keep_channels = bitmap_allocate(keep_channels_nbits); - if (dpif->epoll_fd < 0) { - dpif->epoll_fd = epoll_create(10); - if (dpif->epoll_fd < 0) { - return errno; - } - } + dpif->n_events = dpif->event_offset = 0; - 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; + ofpbuf_use_stub(&buf, reply_stub, sizeof reply_stub); + dpif_linux_port_dump_start__(dpif_, &dump); + while (!dpif_linux_port_dump_next__(dpif_, &dump, &vport, &buf)) { + 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) { @@ -1283,27 +1387,64 @@ dpif_linux_recv_set__(struct dpif *dpif_, bool enable) 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; + 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); + ofpbuf_uninit(&buf); - 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 @@ -1319,6 +1460,13 @@ dpif_linux_recv_set(struct dpif *dpif_, bool enable) return error; } +static int +dpif_linux_handlers_set(struct dpif *dpif_ OVS_UNUSED, + uint32_t n_handlers OVS_UNUSED) +{ + return 0; +} + static int dpif_linux_queue_to_priority(const struct dpif *dpif OVS_UNUSED, uint32_t queue_id, uint32_t *priority) @@ -1371,16 +1519,22 @@ 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]; + + /* 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; @@ -1459,8 +1613,8 @@ dpif_linux_recv__(struct dpif *dpif_, struct dpif_upcall *upcall, } static int -dpif_linux_recv(struct dpif *dpif_, struct dpif_upcall *upcall, - struct ofpbuf *buf) +dpif_linux_recv(struct dpif *dpif_, uint32_t handler_id OVS_UNUSED, + struct dpif_upcall *upcall, struct ofpbuf *buf) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); int error; @@ -1473,7 +1627,7 @@ dpif_linux_recv(struct dpif *dpif_, struct dpif_upcall *upcall, } static void -dpif_linux_recv_wait(struct dpif *dpif_) +dpif_linux_recv_wait(struct dpif *dpif_, uint32_t handler_id OVS_UNUSED) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); @@ -1510,14 +1664,13 @@ const struct dpif_class dpif_linux_class = { dpif_linux_open, dpif_linux_close, dpif_linux_destroy, - NULL, /* run */ + dpif_linux_run, 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, @@ -1528,12 +1681,16 @@ const struct dpif_class dpif_linux_class = { dpif_linux_flow_put, dpif_linux_flow_del, dpif_linux_flow_flush, + dpif_linux_flow_dump_state_init, dpif_linux_flow_dump_start, dpif_linux_flow_dump_next, + dpif_linux_flow_dump_next_may_destroy_keys, dpif_linux_flow_dump_done, + dpif_linux_flow_dump_state_uninit, dpif_linux_execute, dpif_linux_operate, dpif_linux_recv_set, + dpif_linux_handlers_set, dpif_linux_queue_to_priority, dpif_linux_recv, dpif_linux_recv_wait, @@ -1566,8 +1723,7 @@ dpif_linux_init(void) } if (!error) { error = nl_lookup_genl_mcgroup(OVS_VPORT_FAMILY, OVS_VPORT_MCGROUP, - &ovs_vport_mcgroup, - OVS_VPORT_MCGROUP_FALLBACK_ID); + &ovs_vport_mcgroup); } ovsthread_once_done(&once); @@ -1772,6 +1928,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)]; @@ -1803,6 +1962,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; } @@ -1827,6 +1993,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. */ } @@ -1835,6 +2005,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 @@ -1873,11 +2045,11 @@ dpif_linux_dp_transact(const struct dpif_linux_dp *request, 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; } @@ -2083,7 +2255,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); }