X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fconnmgr.c;h=2e05adb8bbaf6ad85bf83207f45325f1292869d7;hb=4000658b1a893485c163d19f50b51fbe942765e4;hp=0cd7d53fa791c3410340490341609a9df5726cb2;hpb=9886b6620ea710a4a8afd0a88271e563a64e7ea2;p=openvswitch diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 0cd7d53f..2e05adb8 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -58,9 +58,8 @@ struct ofconn { /* OpenFlow state. */ enum nx_role role; /* Role. */ - enum nx_flow_format flow_format; /* Currently selected flow format. */ + enum ofputil_protocol protocol; /* Current protocol variant. */ enum nx_packet_in_format packet_in_format; /* OFPT_PACKET_IN format. */ - bool flow_mod_table_id; /* NXT_FLOW_MOD_TABLE_ID enabled? */ /* Asynchronous flow table operation support. */ struct list opgroups; /* Contains pending "ofopgroups", if any. */ @@ -73,6 +72,7 @@ struct ofconn { struct pinsched *schedulers[N_SCHEDULERS]; struct pktbuf *pktbuf; /* OpenFlow packet buffers. */ int miss_send_len; /* Bytes to send of buffered packets. */ + uint16_t controller_id; /* Connection controller ID. */ /* Number of OpenFlow messages queued on 'rconn' as replies to OpenFlow * requests, and the maximum number before we stop reading OpenFlow @@ -122,11 +122,12 @@ struct ofservice { int rate_limit; /* Max packet-in rate in packets per second. */ int burst_limit; /* Limit on accumulating packet credits. */ bool enable_async_msgs; /* Initially enable async messages? */ + uint8_t dscp; /* DSCP Value for controller connection */ }; static void ofservice_reconfigure(struct ofservice *, const struct ofproto_controller *); -static int ofservice_create(struct connmgr *, const char *target); +static int ofservice_create(struct connmgr *, const char *target, uint8_t dscp); static void ofservice_destroy(struct connmgr *, struct ofservice *); static struct ofservice *ofservice_lookup(struct connmgr *, const char *target); @@ -275,12 +276,13 @@ connmgr_run(struct connmgr *mgr, struct vconn *vconn; int retval; - retval = pvconn_accept(ofservice->pvconn, OFP_VERSION, &vconn); + retval = pvconn_accept(ofservice->pvconn, OFP10_VERSION, &vconn); if (!retval) { struct rconn *rconn; char *name; - rconn = rconn_create(ofservice->probe_interval, 0); + /* Passing default value for creation of the rconn */ + rconn = rconn_create(ofservice->probe_interval, 0, ofservice->dscp); name = ofconn_make_name(mgr, vconn_get_name(vconn)); rconn_connect_unreliably(rconn, vconn, name); free(name); @@ -298,7 +300,7 @@ connmgr_run(struct connmgr *mgr, struct vconn *vconn; int retval; - retval = pvconn_accept(mgr->snoops[i], OFP_VERSION, &vconn); + retval = pvconn_accept(mgr->snoops[i], OFP10_VERSION, &vconn); if (!retval) { add_snooper(mgr, vconn); } else if (retval != EAGAIN) { @@ -358,7 +360,7 @@ connmgr_retry(struct connmgr *mgr) /* OpenFlow configuration. */ -static void add_controller(struct connmgr *, const char *target); +static void add_controller(struct connmgr *, const char *target, uint8_t dscp); static struct ofconn *find_controller_by_target(struct connmgr *, const char *target); static void update_fail_open(struct connmgr *); @@ -465,11 +467,11 @@ connmgr_set_controllers(struct connmgr *mgr, if (!vconn_verify_name(c->target)) { if (!find_controller_by_target(mgr, c->target)) { - add_controller(mgr, c->target); + add_controller(mgr, c->target, c->dscp); } } else if (!pvconn_verify_name(c->target)) { if (!ofservice_lookup(mgr, c->target)) { - ofservice_create(mgr, c->target); + ofservice_create(mgr, c->target, c->dscp); } } else { VLOG_WARN_RL(&rl, "%s: unsupported controller \"%s\"", @@ -559,12 +561,12 @@ connmgr_has_snoops(const struct connmgr *mgr) /* Creates a new controller for 'target' in 'mgr'. update_controller() needs * to be called later to finish the new ofconn's configuration. */ static void -add_controller(struct connmgr *mgr, const char *target) +add_controller(struct connmgr *mgr, const char *target, uint8_t dscp) { char *name = ofconn_make_name(mgr, target); struct ofconn *ofconn; - ofconn = ofconn_create(mgr, rconn_create(5, 8), OFCONN_PRIMARY, true); + ofconn = ofconn_create(mgr, rconn_create(5, 8, dscp), OFCONN_PRIMARY, true); ofconn->pktbuf = pktbuf_create(); rconn_connect(ofconn->rconn, target, name); hmap_insert(&mgr->controllers, &ofconn->hmap_node, hash_string(target, 0)); @@ -672,7 +674,7 @@ set_pvconns(struct pvconn ***pvconnsp, size_t *n_pvconnsp, struct pvconn *pvconn; int error; - error = pvconn_open(name, &pvconn); + error = pvconn_open(name, &pvconn, DSCP_INVALID); if (!error) { pvconns[n_pvconns++] = pvconn; } else { @@ -785,20 +787,23 @@ ofconn_get_invalid_ttl_to_controller(struct ofconn *ofconn) return (ofconn->master_async_config[OAM_PACKET_IN] & bit) != 0; } -/* Returns the currently configured flow format for 'ofconn', one of NXFF_*. +/* Returns the currently configured protocol for 'ofconn', one of OFPUTIL_P_*. * - * The default, if no other format has been set, is NXFF_OPENFLOW10. */ -enum nx_flow_format -ofconn_get_flow_format(struct ofconn *ofconn) + * The default, if no other format has been set, is OFPUTIL_P_OPENFLOW10. */ +enum ofputil_protocol +ofconn_get_protocol(struct ofconn *ofconn) { - return ofconn->flow_format; + return ofconn->protocol; } -/* Sets the flow format for 'ofconn' to 'flow_format' (one of NXFF_*). */ +/* Sets the protocol for 'ofconn' to 'protocol' (one of OFPUTIL_P_*). + * + * (This doesn't actually send anything to accomplish this. Presumably the + * caller already did that.) */ void -ofconn_set_flow_format(struct ofconn *ofconn, enum nx_flow_format flow_format) +ofconn_set_protocol(struct ofconn *ofconn, enum ofputil_protocol protocol) { - ofconn->flow_format = flow_format; + ofconn->protocol = protocol; } /* Returns the currently configured packet in format for 'ofconn', one of @@ -820,22 +825,14 @@ ofconn_set_packet_in_format(struct ofconn *ofconn, ofconn->packet_in_format = packet_in_format; } -/* Returns true if the NXT_FLOW_MOD_TABLE_ID extension is enabled, false - * otherwise. +/* Sets the controller connection ID for 'ofconn' to 'controller_id'. * - * By default the extension is not enabled. */ -bool -ofconn_get_flow_mod_table_id(const struct ofconn *ofconn) -{ - return ofconn->flow_mod_table_id; -} - -/* Enables or disables (according to 'enable') the NXT_FLOW_MOD_TABLE_ID - * extension on 'ofconn'. */ + * The connection controller ID is used for OFPP_CONTROLLER and + * NXAST_CONTROLLER actions. See "struct nx_action_controller" for details. */ void -ofconn_set_flow_mod_table_id(struct ofconn *ofconn, bool enable) +ofconn_set_controller_id(struct ofconn *ofconn, uint16_t controller_id) { - ofconn->flow_mod_table_id = enable; + ofconn->controller_id = controller_id; } /* Returns the default miss send length for 'ofconn'. */ @@ -983,9 +980,8 @@ ofconn_flush(struct ofconn *ofconn) int i; ofconn->role = NX_ROLE_OTHER; - ofconn->flow_format = NXFF_OPENFLOW10; + ofconn->protocol = OFPUTIL_P_OF10; ofconn->packet_in_format = NXPIF_OPENFLOW10; - ofconn->flow_mod_table_id = false; /* Disassociate 'ofconn' from all of the ofopgroups that it initiated that * have not yet completed. (Those ofopgroups will still run to completion @@ -1017,6 +1013,7 @@ ofconn_flush(struct ofconn *ofconn) ofconn->miss_send_len = (ofconn->type == OFCONN_PRIMARY ? OFP_DEFAULT_MISS_SEND_LEN : 0); + ofconn->controller_id = 0; rconn_packet_counter_destroy(ofconn->reply_counter); ofconn->reply_counter = rconn_packet_counter_create(); @@ -1075,6 +1072,7 @@ ofconn_reconfigure(struct ofconn *ofconn, const struct ofproto_controller *c) int probe_interval; ofconn->band = c->band; + ofconn->enable_async_msgs = c->enable_async_msgs; rconn_set_max_backoff(ofconn->rconn, c->max_backoff); @@ -1234,27 +1232,26 @@ ofconn_send(const struct ofconn *ofconn, struct ofpbuf *msg, /* Sending asynchronous messages. */ -static void schedule_packet_in(struct ofconn *, struct ofputil_packet_in, - const struct flow *); +static void schedule_packet_in(struct ofconn *, struct ofputil_packet_in); /* Sends an OFPT_PORT_STATUS message with 'opp' and 'reason' to appropriate * controllers managed by 'mgr'. */ void -connmgr_send_port_status(struct connmgr *mgr, const struct ofp_phy_port *opp, - uint8_t reason) +connmgr_send_port_status(struct connmgr *mgr, + const struct ofputil_phy_port *pp, uint8_t reason) { /* XXX Should limit the number of queued port status change messages. */ + struct ofputil_port_status ps; struct ofconn *ofconn; + ps.reason = reason; + ps.desc = *pp; LIST_FOR_EACH (ofconn, node, &mgr->all_conns) { if (ofconn_receives_async_msg(ofconn, OAM_PORT_STATUS, reason)) { - struct ofp_port_status *ops; - struct ofpbuf *b; + struct ofpbuf *msg; - ops = make_openflow_xid(sizeof *ops, OFPT_PORT_STATUS, 0, &b); - ops->reason = reason; - ops->desc = *opp; - ofconn_send(ofconn, b, NULL); + msg = ofputil_encode_port_status(&ps, ofconn->protocol); + ofconn_send(ofconn, msg, NULL); } } } @@ -1276,24 +1273,26 @@ connmgr_send_flow_removed(struct connmgr *mgr, * also prevents new flows from being added (and expiring). (It * also prevents processing OpenFlow requests that would not add * new flows, so it is imperfect.) */ - msg = ofputil_encode_flow_removed(fr, ofconn->flow_format); + msg = ofputil_encode_flow_removed(fr, ofconn->protocol); ofconn_send_reply(ofconn, msg); } } } /* Given 'pin', sends an OFPT_PACKET_IN message to each OpenFlow controller as - * necessary according to their individual configurations. */ + * necessary according to their individual configurations. + * + * The caller doesn't need to fill in pin->buffer_id or pin->total_len. */ void connmgr_send_packet_in(struct connmgr *mgr, - const struct ofputil_packet_in *pin, - const struct flow *flow) + const struct ofputil_packet_in *pin) { struct ofconn *ofconn; LIST_FOR_EACH (ofconn, node, &mgr->all_conns) { - if (ofconn_receives_async_msg(ofconn, OAM_PACKET_IN, pin->reason)) { - schedule_packet_in(ofconn, *pin, flow); + if (ofconn_receives_async_msg(ofconn, OAM_PACKET_IN, pin->reason) + && ofconn->controller_id == pin->controller_id) { + schedule_packet_in(ofconn, *pin); } } } @@ -1308,15 +1307,15 @@ do_send_packet_in(struct ofpbuf *ofp_packet_in, void *ofconn_) ofconn->packet_in_counter, 100); } -/* Takes 'pin', whose packet has the flow specified by 'flow', composes an - * OpenFlow packet-in message from it, and passes it to 'ofconn''s packet - * scheduler for sending. */ +/* Takes 'pin', composes an OpenFlow packet-in message from it, and passes it + * to 'ofconn''s packet scheduler for sending. */ static void -schedule_packet_in(struct ofconn *ofconn, struct ofputil_packet_in pin, - const struct flow *flow) +schedule_packet_in(struct ofconn *ofconn, struct ofputil_packet_in pin) { struct connmgr *mgr = ofconn->connmgr; + pin.total_len = pin.packet_len; + /* Get OpenFlow buffer_id. */ if (pin.reason == OFPR_ACTION) { pin.buffer_id = UINT32_MAX; @@ -1326,7 +1325,7 @@ schedule_packet_in(struct ofconn *ofconn, struct ofputil_packet_in pin, pin.buffer_id = UINT32_MAX; } else { pin.buffer_id = pktbuf_save(ofconn->pktbuf, pin.packet, pin.packet_len, - flow->in_port); + pin.fmd.in_port); } /* Figure out how much of the packet to send. */ @@ -1344,7 +1343,7 @@ schedule_packet_in(struct ofconn *ofconn, struct ofputil_packet_in pin, * immediately call into do_send_packet_in() or it might buffer it for a * while (until a later call to pinsched_run()). */ pinsched_send(ofconn->schedulers[pin.reason == OFPR_NO_MATCH ? 0 : 1], - flow->in_port, + pin.fmd.in_port, ofputil_encode_packet_in(&pin, ofconn->packet_in_format), do_send_packet_in, ofconn); } @@ -1441,29 +1440,6 @@ connmgr_is_any_controller_admitted(const struct connmgr *mgr) } return false; } - -/* Sends 'packet' to each controller connected to 'mgr'. Takes ownership of - * 'packet'. */ -void -connmgr_broadcast(struct connmgr *mgr, struct ofpbuf *packet) -{ - struct ofconn *ofconn, *prev; - - prev = NULL; - LIST_FOR_EACH (ofconn, node, &mgr->all_conns) { - if (prev) { - ofconn_send_reply(ofconn, ofpbuf_clone(packet)); - } - if (rconn_is_connected(ofconn->rconn)) { - prev = ofconn; - } - } - if (prev) { - ofconn_send_reply(prev, packet); - } else { - ofpbuf_delete(packet); - } -} /* In-band configuration. */ @@ -1563,7 +1539,7 @@ connmgr_flushed(struct connmgr *mgr) struct cls_rule rule; memset(&action, 0, sizeof action); - action.type = htons(OFPAT_OUTPUT); + action.type = htons(OFPAT10_OUTPUT); action.output.len = htons(sizeof action); action.output.port = htons(OFPP_NORMAL); cls_rule_init_catchall(&rule, 0); @@ -1577,13 +1553,13 @@ connmgr_flushed(struct connmgr *mgr) * ofservice_reconfigure() must be called to fully configure the new * ofservice. */ static int -ofservice_create(struct connmgr *mgr, const char *target) +ofservice_create(struct connmgr *mgr, const char *target, uint8_t dscp) { struct ofservice *ofservice; struct pvconn *pvconn; int error; - error = pvconn_open(target, &pvconn); + error = pvconn_open(target, &pvconn, dscp); if (error) { return error; } @@ -1611,6 +1587,7 @@ ofservice_reconfigure(struct ofservice *ofservice, ofservice->rate_limit = c->rate_limit; ofservice->burst_limit = c->burst_limit; ofservice->enable_async_msgs = c->enable_async_msgs; + ofservice->dscp = c->dscp; } /* Finds and returns the ofservice within 'mgr' that has the given