mirror of
https://github.com/openvswitch/ovs
synced 2025-10-27 15:18:06 +00:00
It is cleaner to not use ofp_bundle_entry for non-bundle flow mods. To address this, the new struct ofproto_flow_mod combines an ofputil_flow_mod and the necessary execution context for executing the start, revert, and finish phases of the flow mod, which all were previously members of struct ofp_bundle_entry. This also simplifies many of the function prototypes introduced with the OF 1.4 bundles code. However, in case of learn action execution this approach requires a new copy of the ofputil_flow_mod. This could be avoided by making struct ofproto_flow_mod more complex, but it seems not worth the complication. As part of carving out the execution context from ofp_bundle_entry to ofproto_flow_mod, the 'version' member is now also in ofproto_flow_mod, as it makes sense for flow mods, but not for port mods. Now that the functions operate on the version also get the full execution context, they use 'version' instead of 'ofproto->tables_version'. This allows ofproto->tables_version to be changed only when a new version is committed. Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
172 lines
4.1 KiB
C
172 lines
4.1 KiB
C
/*
|
|
* Copyright (c) 2013, 2014 Alexandru Copot <alex.mihai.c@gmail.com>, with support from IXIA.
|
|
* Copyright (c) 2013, 2014 Daniel Baluta <dbaluta@ixiacom.com>
|
|
* Copyright (c) 2014, 2015 Nicira, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at:
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "coverage.h"
|
|
#include "fail-open.h"
|
|
#include "in-band.h"
|
|
#include "odp-util.h"
|
|
#include "ofp-actions.h"
|
|
#include "ofp-msgs.h"
|
|
#include "ofp-util.h"
|
|
#include "ofpbuf.h"
|
|
#include "ofproto-provider.h"
|
|
#include "pinsched.h"
|
|
#include "poll-loop.h"
|
|
#include "pktbuf.h"
|
|
#include "rconn.h"
|
|
#include "shash.h"
|
|
#include "simap.h"
|
|
#include "stream.h"
|
|
#include "timeval.h"
|
|
#include "openvswitch/vconn.h"
|
|
#include "openvswitch/vlog.h"
|
|
|
|
#include "bundles.h"
|
|
|
|
VLOG_DEFINE_THIS_MODULE(bundles);
|
|
|
|
static struct ofp_bundle *
|
|
ofp_bundle_create(uint32_t id, uint16_t flags)
|
|
{
|
|
struct ofp_bundle *bundle;
|
|
|
|
bundle = xmalloc(sizeof(*bundle));
|
|
|
|
bundle->id = id;
|
|
bundle->flags = flags;
|
|
bundle->state = BS_OPEN;
|
|
|
|
list_init(&bundle->msg_list);
|
|
|
|
return bundle;
|
|
}
|
|
|
|
void
|
|
ofp_bundle_remove__(struct ofconn *ofconn, struct ofp_bundle *bundle,
|
|
bool success)
|
|
{
|
|
struct ofp_bundle_entry *msg;
|
|
|
|
LIST_FOR_EACH_POP (msg, node, &bundle->msg_list) {
|
|
if (success && msg->type == OFPTYPE_FLOW_MOD) {
|
|
/* Tell connmgr about successful flow mods. */
|
|
ofconn_report_flow_mod(ofconn, msg->ofm.fm.command);
|
|
}
|
|
ofp_bundle_entry_free(msg);
|
|
}
|
|
|
|
ofconn_remove_bundle(ofconn, bundle);
|
|
free(bundle);
|
|
}
|
|
|
|
enum ofperr
|
|
ofp_bundle_open(struct ofconn *ofconn, uint32_t id, uint16_t flags)
|
|
{
|
|
struct ofp_bundle *bundle;
|
|
enum ofperr error;
|
|
|
|
bundle = ofconn_get_bundle(ofconn, id);
|
|
|
|
if (bundle) {
|
|
VLOG_INFO("Bundle %x already exists.", id);
|
|
ofp_bundle_remove__(ofconn, bundle, false);
|
|
|
|
return OFPERR_OFPBFC_BAD_ID;
|
|
}
|
|
|
|
bundle = ofp_bundle_create(id, flags);
|
|
error = ofconn_insert_bundle(ofconn, bundle);
|
|
if (error) {
|
|
free(bundle);
|
|
}
|
|
|
|
return error;
|
|
}
|
|
|
|
enum ofperr
|
|
ofp_bundle_close(struct ofconn *ofconn, uint32_t id, uint16_t flags)
|
|
{
|
|
struct ofp_bundle *bundle;
|
|
|
|
bundle = ofconn_get_bundle(ofconn, id);
|
|
|
|
if (!bundle) {
|
|
return OFPERR_OFPBFC_BAD_ID;
|
|
}
|
|
|
|
if (bundle->state == BS_CLOSED) {
|
|
ofp_bundle_remove__(ofconn, bundle, false);
|
|
return OFPERR_OFPBFC_BUNDLE_CLOSED;
|
|
}
|
|
|
|
if (bundle->flags != flags) {
|
|
ofp_bundle_remove__(ofconn, bundle, false);
|
|
return OFPERR_OFPBFC_BAD_FLAGS;
|
|
}
|
|
|
|
bundle->state = BS_CLOSED;
|
|
return 0;
|
|
}
|
|
|
|
enum ofperr
|
|
ofp_bundle_discard(struct ofconn *ofconn, uint32_t id)
|
|
{
|
|
struct ofp_bundle *bundle;
|
|
|
|
bundle = ofconn_get_bundle(ofconn, id);
|
|
|
|
if (!bundle) {
|
|
return OFPERR_OFPBFC_BAD_ID;
|
|
}
|
|
|
|
ofp_bundle_remove__(ofconn, bundle, false);
|
|
|
|
return 0;
|
|
}
|
|
|
|
enum ofperr
|
|
ofp_bundle_add_message(struct ofconn *ofconn, uint32_t id, uint16_t flags,
|
|
struct ofp_bundle_entry *bmsg)
|
|
{
|
|
struct ofp_bundle *bundle;
|
|
|
|
bundle = ofconn_get_bundle(ofconn, id);
|
|
|
|
if (!bundle) {
|
|
enum ofperr error;
|
|
|
|
bundle = ofp_bundle_create(id, flags);
|
|
error = ofconn_insert_bundle(ofconn, bundle);
|
|
if (error) {
|
|
free(bundle);
|
|
return error;
|
|
}
|
|
} else if (bundle->state == BS_CLOSED) {
|
|
ofp_bundle_remove__(ofconn, bundle, false);
|
|
return OFPERR_OFPBFC_BUNDLE_CLOSED;
|
|
} else if (flags != bundle->flags) {
|
|
ofp_bundle_remove__(ofconn, bundle, false);
|
|
return OFPERR_OFPBFC_BAD_FLAGS;
|
|
}
|
|
|
|
list_push_back(&bundle->msg_list, &bmsg->node);
|
|
return 0;
|
|
}
|