X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=lib%2Fdpif.c;h=a866499514063482009f2edc433f8627ce677321;hb=50e6c26f93f39d45600bf6e9b5f5c46d00abd363;hp=44cd54a5f8214cafae0986322550e603c6cde546;hpb=e14deea0bd133796872d06f39a14d0393880f5bb;p=cascardo%2Fovs.git diff --git a/lib/dpif.c b/lib/dpif.c index 44cd54a5f..a86649951 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ #include "coverage.h" #include "dpctl.h" #include "dp-packet.h" +#include "dpif-netdev.h" #include "dynamic-string.h" #include "flow.h" #include "netdev.h" @@ -43,9 +44,10 @@ #include "shash.h" #include "sset.h" #include "timeval.h" -#include "tnl-arp-cache.h" +#include "tnl-neigh-cache.h" #include "tnl-ports.h" #include "util.h" +#include "uuid.h" #include "valgrind.h" #include "openvswitch/vlog.h" @@ -120,7 +122,7 @@ dp_initialize(void) tnl_conf_seq = seq_create(); dpctl_unixctl_register(); tnl_port_map_init(); - tnl_arp_cache_init(); + tnl_neigh_cache_init(); route_table_init(); for (i = 0; i < ARRAY_SIZE(base_dpif_classes); i++) { @@ -135,6 +137,7 @@ static int dp_register_provider__(const struct dpif_class *new_class) { struct registered_dpif_class *registered_class; + int error; if (sset_contains(&dpif_blacklist, new_class->type)) { VLOG_DBG("attempted to register blacklisted provider: %s", @@ -148,6 +151,13 @@ dp_register_provider__(const struct dpif_class *new_class) return EEXIST; } + error = new_class->init ? new_class->init() : 0; + if (error) { + VLOG_WARN("failed to initialize %s datapath class: %s", + new_class->type, ovs_strerror(error)); + return error; + } + registered_class = xmalloc(sizeof *registered_class); registered_class->dpif_class = new_class; registered_class->refcount = 0; @@ -805,11 +815,11 @@ dpif_port_poll_wait(const struct dpif *dpif) * arguments must have been initialized through a call to flow_extract(). * 'used' is stored into stats->used. */ void -dpif_flow_stats_extract(const struct flow *flow, const struct ofpbuf *packet, +dpif_flow_stats_extract(const struct flow *flow, const struct dp_packet *packet, long long int used, struct dpif_flow_stats *stats) { stats->tcp_flags = ntohs(flow->tcp_flags); - stats->n_bytes = ofpbuf_size(packet); + stats->n_bytes = dp_packet_size(packet); stats->n_packets = 1; stats->used = used; } @@ -844,6 +854,7 @@ dpif_flow_hash(const struct dpif *dpif OVS_UNUSED, ovsthread_once_done(&once); } hash_bytes128(key, key_len, secret, hash); + uuid_set_bits_v4((struct uuid *)hash); } /* Deletes all flows from 'dpif'. Returns 0 if successful, otherwise a @@ -877,7 +888,7 @@ dpif_probe_feature(struct dpif *dpif, const char *name, * restarted) at just the right time such that feature probes from the * previous run are still present in the datapath. */ error = dpif_flow_put(dpif, DPIF_FP_CREATE | DPIF_FP_MODIFY | DPIF_FP_PROBE, - ofpbuf_data(key), ofpbuf_size(key), NULL, 0, NULL, 0, + key->data, key->size, NULL, 0, NULL, 0, ufid, PMD_ID_NULL, NULL); if (error) { if (error != EINVAL) { @@ -888,14 +899,15 @@ dpif_probe_feature(struct dpif *dpif, const char *name, } ofpbuf_use_stack(&reply, &stub, sizeof stub); - error = dpif_flow_get(dpif, ofpbuf_data(key), ofpbuf_size(key), ufid, + error = dpif_flow_get(dpif, key->data, key->size, ufid, PMD_ID_NULL, &reply, &flow); if (!error - && (!ufid || (flow.ufid_present && ovs_u128_equal(ufid, &flow.ufid)))) { + && (!ufid || (flow.ufid_present + && ovs_u128_equals(ufid, &flow.ufid)))) { enable_feature = true; } - error = dpif_flow_del(dpif, ofpbuf_data(key), ofpbuf_size(key), ufid, + error = dpif_flow_del(dpif, key->data, key->size, ufid, PMD_ID_NULL, NULL); if (error) { VLOG_WARN("%s: failed to delete %s feature probe flow", @@ -909,7 +921,7 @@ dpif_probe_feature(struct dpif *dpif, const char *name, int dpif_flow_get(struct dpif *dpif, const struct nlattr *key, size_t key_len, const ovs_u128 *ufid, - const int pmd_id, struct ofpbuf *buf, struct dpif_flow *flow) + const unsigned pmd_id, struct ofpbuf *buf, struct dpif_flow *flow) { struct dpif_op *opp; struct dpif_op op; @@ -938,7 +950,7 @@ dpif_flow_put(struct dpif *dpif, enum dpif_flow_put_flags flags, 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 ovs_u128 *ufid, const int pmd_id, + const ovs_u128 *ufid, const unsigned pmd_id, struct dpif_flow_stats *stats) { struct dpif_op *opp; @@ -966,7 +978,7 @@ dpif_flow_put(struct dpif *dpif, enum dpif_flow_put_flags flags, int dpif_flow_del(struct dpif *dpif, const struct nlattr *key, size_t key_len, const ovs_u128 *ufid, - const int pmd_id, struct dpif_flow_stats *stats) + const unsigned pmd_id, struct dpif_flow_stats *stats) { struct dpif_op *opp; struct dpif_op op; @@ -1080,12 +1092,12 @@ dpif_execute_helper_cb(void *aux_, struct dp_packet **packets, int cnt, { struct dpif_execute_helper_aux *aux = aux_; int type = nl_attr_type(action); - struct ofpbuf *packet = &packets[0]->ofpbuf; - struct pkt_metadata *md = &packets[0]->md; + struct dp_packet *packet = *packets; ovs_assert(cnt == 1); switch ((enum ovs_action_attr)type) { + case OVS_ACTION_ATTR_CT: case OVS_ACTION_ATTR_OUTPUT: case OVS_ACTION_ATTR_TUNNEL_PUSH: case OVS_ACTION_ATTR_TUNNEL_POP: @@ -1094,8 +1106,11 @@ dpif_execute_helper_cb(void *aux_, struct dp_packet **packets, int cnt, struct dpif_execute execute; struct ofpbuf execute_actions; uint64_t stub[256 / 8]; + struct pkt_metadata *md = &packet->md; + bool dst_set; - if (md->tunnel.ip_dst) { + dst_set = flow_tnl_dst_is_set(&md->tunnel); + if (dst_set) { /* The Linux kernel datapath throws away the tunnel information * that we supply as metadata. We have to use a "set" action to * supply it. */ @@ -1103,21 +1118,21 @@ dpif_execute_helper_cb(void *aux_, struct dp_packet **packets, int cnt, odp_put_tunnel_action(&md->tunnel, &execute_actions); ofpbuf_put(&execute_actions, action, NLA_ALIGN(action->nla_len)); - execute.actions = ofpbuf_data(&execute_actions); - execute.actions_len = ofpbuf_size(&execute_actions); + execute.actions = execute_actions.data; + execute.actions_len = execute_actions.size; } else { execute.actions = action; execute.actions_len = NLA_ALIGN(action->nla_len); } execute.packet = packet; - execute.md = *md; execute.needs_help = false; execute.probe = false; + execute.mtu = 0; aux->error = dpif_execute(aux->dpif, &execute); log_execute_message(aux->dpif, &execute, true, aux->error); - if (md->tunnel.ip_dst) { + if (dst_set) { ofpbuf_uninit(&execute_actions); } break; @@ -1146,23 +1161,13 @@ static int dpif_execute_with_help(struct dpif *dpif, struct dpif_execute *execute) { struct dpif_execute_helper_aux aux = {dpif, 0}; - struct dp_packet packet, *pp; + struct dp_packet *pp; COVERAGE_INC(dpif_execute_with_help); - packet.ofpbuf = *execute->packet; - packet.md = execute->md; - pp = &packet; - + pp = execute->packet; odp_execute_actions(&aux, &pp, 1, false, execute->actions, execute->actions_len, dpif_execute_helper_cb); - - /* Even though may_steal is set to false, some actions could modify or - * reallocate the ofpbuf memory. We need to pass those changes to the - * caller */ - *execute->packet = packet.ofpbuf; - execute->md = packet.md; - return aux.error; } @@ -1344,6 +1349,14 @@ dpif_handlers_set(struct dpif *dpif, uint32_t n_handlers) return error; } +void +dpif_register_dp_purge_cb(struct dpif *dpif, dp_purge_callback *cb, void *aux) +{ + if (dpif->dpif_class->register_dp_purge_cb) { + dpif->dpif_class->register_dp_purge_cb(dpif, cb, aux); + } +} + void dpif_register_upcall_cb(struct dpif *dpif, upcall_callback *cb, void *aux) { @@ -1375,8 +1388,8 @@ dpif_print_packet(struct dpif *dpif, struct dpif_upcall *upcall) struct ds flow; char *packet; - packet = ofp_packet_to_string(ofpbuf_data(&upcall->packet), - ofpbuf_size(&upcall->packet)); + packet = ofp_packet_to_string(dp_packet_data(&upcall->packet), + dp_packet_size(&upcall->packet)); ds_init(&flow); odp_flow_key_format(upcall->key, upcall->key_len, &flow); @@ -1393,13 +1406,12 @@ dpif_print_packet(struct dpif *dpif, struct dpif_upcall *upcall) /* If 'dpif' creates its own I/O polling threads, refreshes poll threads * configuration. */ int -dpif_poll_threads_set(struct dpif *dpif, unsigned int n_rxqs, - const char *cmask) +dpif_poll_threads_set(struct dpif *dpif, const char *cmask) { int error = 0; if (dpif->dpif_class->poll_threads_set) { - error = dpif->dpif_class->poll_threads_set(dpif, n_rxqs, cmask); + error = dpif->dpif_class->poll_threads_set(dpif, cmask); if (error) { log_operation(dpif, "poll_threads_set", error); } @@ -1571,7 +1583,7 @@ flow_message_log_level(int error) static bool should_log_flow_message(int error) { - return !vlog_should_drop(THIS_MODULE, flow_message_log_level(error), + return !vlog_should_drop(&this_module, flow_message_log_level(error), error ? &error_rl : &dpmsg_rl); } @@ -1604,7 +1616,7 @@ log_flow_message(const struct dpif *dpif, int error, const char *operation, ds_put_cstr(&ds, ", actions:"); format_odp_actions(&ds, actions, actions_len); } - vlog(THIS_MODULE, flow_message_log_level(error), "%s", ds_cstr(&ds)); + vlog(&this_module, flow_message_log_level(error), "%s", ds_cstr(&ds)); ds_destroy(&ds); } @@ -1671,8 +1683,8 @@ log_execute_message(struct dpif *dpif, const struct dpif_execute *execute, struct ds ds = DS_EMPTY_INITIALIZER; char *packet; - packet = ofp_packet_to_string(ofpbuf_data(execute->packet), - ofpbuf_size(execute->packet)); + packet = ofp_packet_to_string(dp_packet_data(execute->packet), + dp_packet_size(execute->packet)); ds_put_format(&ds, "%s: %sexecute ", dpif_name(dpif), (subexecute ? "sub-" @@ -1683,7 +1695,8 @@ log_execute_message(struct dpif *dpif, const struct dpif_execute *execute, ds_put_format(&ds, " failed (%s)", ovs_strerror(error)); } ds_put_format(&ds, " on packet %s", packet); - vlog(THIS_MODULE, error ? VLL_WARN : VLL_DBG, "%s", ds_cstr(&ds)); + ds_put_format(&ds, " mtu %d", execute->mtu); + vlog(&this_module, error ? VLL_WARN : VLL_DBG, "%s", ds_cstr(&ds)); ds_destroy(&ds); free(packet); } @@ -1705,6 +1718,5 @@ log_flow_get_message(const struct dpif *dpif, const struct dpif_flow_get *get, bool dpif_supports_tnl_push_pop(const struct dpif *dpif) { - return !strcmp(dpif->dpif_class->type, "netdev") || - !strcmp(dpif->dpif_class->type, "dummy"); + return dpif_is_netdev(dpif); }