X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif.c;h=ad143c8ed21c7ad612d334531921c4909670391c;hb=f613a0d72c521ca3a4eeb2c29ac523f6fdf72667;hp=a754613a00fc77d688823db277d99b289aa3f56c;hpb=7aec165dbc4690c8c2c703d142e2f017bb851d31;p=sliver-openvswitch.git diff --git a/lib/dpif.c b/lib/dpif.c index a754613a0..ad143c8ed 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -36,7 +36,7 @@ #include "packets.h" #include "poll-loop.h" #include "shash.h" -#include "svec.h" +#include "sset.h" #include "timeval.h" #include "util.h" #include "valgrind.h" @@ -101,38 +101,6 @@ dp_initialize(void) } } -/* Performs periodic work needed by all the various kinds of dpifs. - * - * If your program opens any dpifs, it must call both this function and - * netdev_run() within its main poll loop. */ -void -dp_run(void) -{ - struct shash_node *node; - SHASH_FOR_EACH(node, &dpif_classes) { - const struct registered_dpif_class *registered_class = node->data; - if (registered_class->dpif_class->run) { - registered_class->dpif_class->run(); - } - } -} - -/* Arranges for poll_block() to wake up when dp_run() needs to be called. - * - * If your program opens any dpifs, it must call both this function and - * netdev_wait() within its main poll loop. */ -void -dp_wait(void) -{ - struct shash_node *node; - SHASH_FOR_EACH(node, &dpif_classes) { - const struct registered_dpif_class *registered_class = node->data; - if (registered_class->dpif_class->wait) { - registered_class->dpif_class->wait(); - } - } -} - /* Registers a new datapath provider. After successful registration, new * datapaths of that type can be opened using dpif_open(). */ int @@ -184,36 +152,36 @@ dp_unregister_provider(const char *type) } /* Clears 'types' and enumerates the types of all currently registered datapath - * providers into it. The caller must first initialize the svec. */ + * providers into it. The caller must first initialize the sset. */ void -dp_enumerate_types(struct svec *types) +dp_enumerate_types(struct sset *types) { struct shash_node *node; dp_initialize(); - svec_clear(types); + sset_clear(types); SHASH_FOR_EACH(node, &dpif_classes) { const struct registered_dpif_class *registered_class = node->data; - svec_add(types, registered_class->dpif_class->type); + sset_add(types, registered_class->dpif_class->type); } } /* Clears 'names' and enumerates the names of all known created datapaths with - * the given 'type'. The caller must first initialize the svec. Returns 0 if + * the given 'type'. The caller must first initialize the sset. Returns 0 if * successful, otherwise a positive errno value. * * Some kinds of datapaths might not be practically enumerable. This is not * considered an error. */ int -dp_enumerate_names(const char *type, struct svec *names) +dp_enumerate_names(const char *type, struct sset *names) { const struct registered_dpif_class *registered_class; const struct dpif_class *dpif_class; int error; dp_initialize(); - svec_clear(names); + sset_clear(names); registered_class = shash_find_data(&dpif_classes, type); if (!registered_class) { @@ -232,8 +200,10 @@ dp_enumerate_names(const char *type, struct svec *names) return error; } -/* Parses 'datapath name', which is of the form type@name into its - * component pieces. 'name' and 'type' must be freed by the caller. */ +/* Parses 'datapath_name_', which is of the form [type@]name into its + * component pieces. 'name' and 'type' must be freed by the caller. + * + * The returned 'type' is normalized, as if by dpif_normalize_type(). */ void dp_parse_name(const char *datapath_name_, char **name, char **type) { @@ -244,10 +214,10 @@ dp_parse_name(const char *datapath_name_, char **name, char **type) if (separator) { *separator = '\0'; *type = datapath_name; - *name = xstrdup(separator + 1); + *name = xstrdup(dpif_normalize_type(separator + 1)); } else { *name = datapath_name; - *type = NULL; + *type = xstrdup(dpif_normalize_type(NULL)); } } @@ -260,9 +230,7 @@ do_open(const char *name, const char *type, bool create, struct dpif **dpifp) dp_initialize(); - if (!type || *type == '\0') { - type = "system"; - } + type = dpif_normalize_type(type); registered_class = shash_find_data(&dpif_classes, type); if (!registered_class) { @@ -347,6 +315,25 @@ dpif_close(struct dpif *dpif) } } +/* Performs periodic work needed by 'dpif'. */ +void +dpif_run(struct dpif *dpif) +{ + if (dpif->dpif_class->run) { + dpif->dpif_class->run(dpif); + } +} + +/* Arranges for poll_block() to wake up when dp_run() needs to be called for + * 'dpif'. */ +void +dpif_wait(struct dpif *dpif) +{ + if (dpif->dpif_class->wait) { + dpif->dpif_class->wait(dpif); + } +} + /* Returns the name of datapath 'dpif' prefixed with the type * (for use in log messages). */ const char * @@ -363,6 +350,16 @@ dpif_base_name(const struct dpif *dpif) return dpif->base_name; } +/* Returns the fully spelled out name for the given datapath 'type'. + * + * Normalized type string can be compared with strcmp(). Unnormalized type + * string might be the same even if they have different spellings. */ +const char * +dpif_normalize_type(const char *type) +{ + return type && type[0] ? type : "system"; +} + /* Destroys the datapath that 'dpif' is connected to, first removing all of its * ports. After calling this function, it does not make sense to pass 'dpif' * to any functions other than dpif_name() or dpif_close(). */ @@ -381,7 +378,7 @@ dpif_delete(struct dpif *dpif) /* Retrieves statistics for 'dpif' into 'stats'. Returns 0 if successful, * otherwise a positive errno value. */ int -dpif_get_dp_stats(const struct dpif *dpif, struct odp_stats *stats) +dpif_get_dp_stats(const struct dpif *dpif, struct ovs_dp_stats *stats) { int error = dpif->dpif_class->get_stats(dpif, stats); if (error) { @@ -525,11 +522,14 @@ dpif_port_query_by_name(const struct dpif *dpif, const char *devname, } else { memset(port, 0, sizeof *port); - /* Log level is DBG here because all the current callers are interested - * in whether 'dpif' actually has a port 'devname', so that it's not an - * issue worth logging if it doesn't. */ - VLOG_DBG_RL(&error_rl, "%s: failed to query port %s: %s", - dpif_name(dpif), devname, strerror(error)); + /* For ENOENT or ENODEV we use DBG level because the caller is probably + * interested in whether 'dpif' actually has a port 'devname', so that + * it's not an issue worth logging if it doesn't. Other errors are + * uncommon and more likely to indicate a real problem. */ + VLOG_RL(&error_rl, + error == ENOENT || error == ENODEV ? VLL_DBG : VLL_WARN, + "%s: failed to query port %s: %s", + dpif_name(dpif), devname, strerror(error)); } return error; } @@ -690,7 +690,7 @@ dpif_flow_flush(struct dpif *dpif) } /* Queries 'dpif' for a flow entry. The flow is specified by the Netlink - * attributes with types ODP_KEY_ATTR_* in the 'key_len' bytes starting at + * attributes with types OVS_KEY_ATTR_* in the 'key_len' bytes starting at * 'key'. * * Returns 0 if successful. If no flow matches, returns ENOENT. On other @@ -739,9 +739,9 @@ dpif_flow_get(const struct dpif *dpif, } /* Adds or modifies a flow in 'dpif'. The flow is specified by the Netlink - * attributes with types ODP_KEY_ATTR_* in the 'key_len' bytes starting at + * attributes with types OVS_KEY_ATTR_* in the 'key_len' bytes starting at * 'key'. The associated actions are specified by the Netlink attributes with - * types ODP_ACTION_ATTR_* in the 'actions_len' bytes starting at 'actions'. + * types OVS_ACTION_ATTR_* in the 'actions_len' bytes starting at 'actions'. * * - If the flow's key does not exist in 'dpif', then the flow will be added if * 'flags' includes DPIF_FP_CREATE. Otherwise the operation will fail with @@ -797,7 +797,7 @@ dpif_flow_put(struct dpif *dpif, enum dpif_flow_put_flags flags, /* Deletes a flow from 'dpif' and returns 0, or returns ENOENT if 'dpif' does * not contain such a flow. The flow is specified by the Netlink attributes - * with types ODP_KEY_ATTR_* in the 'key_len' bytes starting at 'key'. + * with types OVS_KEY_ATTR_* in the 'key_len' bytes starting at 'key'. * * If the operation succeeds, then 'stats', if nonnull, will be set to the * flow's statistics before its deletion. */ @@ -843,9 +843,9 @@ dpif_flow_dump_start(struct dpif_flow_dump *dump, const struct dpif *dpif) * completed by calling dpif_flow_dump_done(). * * On success, if 'key' and 'key_len' are nonnull then '*key' and '*key_len' - * will be set to Netlink attributes with types ODP_KEY_ATTR_* representing the + * will be set to Netlink attributes with types OVS_KEY_ATTR_* representing the * dumped flow's key. If 'actions' and 'actions_len' are nonnull then they are - * set to Netlink attributes with types ODP_ACTION_ATTR_* representing the + * set to Netlink attributes with types OVS_ACTION_ATTR_* representing the * dumped flow's actions. If 'stats' is nonnull then it will be set to the * dumped flow's statistics. * @@ -913,11 +913,15 @@ dpif_flow_dump_done(struct dpif_flow_dump *dump) } /* Causes 'dpif' to perform the 'actions_len' bytes of actions in 'actions' on - * the Ethernet frame specified in 'packet'. + * the Ethernet frame specified in 'packet' taken from the flow specified in + * the 'key_len' bytes of 'key'. ('key' is mostly redundant with 'packet', but + * it contains some metadata that cannot be recovered from 'packet', such as + * tun_id and in_port.) * * Returns 0 if successful, otherwise a positive errno value. */ int dpif_execute(struct dpif *dpif, + const struct nlattr *key, size_t key_len, const struct nlattr *actions, size_t actions_len, const struct ofpbuf *buf) { @@ -925,7 +929,8 @@ dpif_execute(struct dpif *dpif, COVERAGE_INC(dpif_execute); if (actions_len > 0) { - error = dpif->dpif_class->execute(dpif, actions, actions_len, buf); + error = dpif->dpif_class->execute(dpif, key, key_len, + actions, actions_len, buf); } else { error = 0; } @@ -946,6 +951,18 @@ dpif_execute(struct dpif *dpif, return error; } +/* Returns a string that represents 'type', for use in log messages. */ +const char * +dpif_upcall_type_to_string(enum dpif_upcall_type type) +{ + switch (type) { + case DPIF_UC_MISS: return "miss"; + case DPIF_UC_ACTION: return "action"; + case DPIF_UC_SAMPLE: return "sample"; + case DPIF_N_UC_TYPES: default: return ""; + } +} + static bool OVS_UNUSED is_valid_listen_mask(int listen_mask) { @@ -1039,20 +1056,22 @@ dpif_recv(struct dpif *dpif, struct dpif_upcall *upcall) { int error = dpif->dpif_class->recv(dpif, upcall); if (!error && !VLOG_DROP_DBG(&dpmsg_rl)) { - struct flow flow; - char *s; - - s = ofp_packet_to_string(upcall->packet->data, - upcall->packet->size, upcall->packet->size); - odp_flow_key_to_flow(upcall->key, upcall->key_len, &flow); - - VLOG_DBG("%s: %s upcall on port %"PRIu16": %s", dpif_name(dpif), - (upcall->type == DPIF_UC_MISS ? "miss" - : upcall->type == DPIF_UC_ACTION ? "action" - : upcall->type == DPIF_UC_SAMPLE ? "sample" - : ""), - flow.in_port, s); - free(s); + struct ds flow; + char *packet; + + packet = ofp_packet_to_string(upcall->packet->data, + upcall->packet->size, + upcall->packet->size); + + ds_init(&flow); + odp_flow_key_format(upcall->key, upcall->key_len, &flow); + + VLOG_DBG("%s: %s upcall:\n%s\n%s", + dpif_name(dpif), dpif_upcall_type_to_string(upcall->type), + ds_cstr(&flow), packet); + + ds_destroy(&flow); + free(packet); } return error; } @@ -1087,7 +1106,7 @@ dpif_get_netflow_ids(const struct dpif *dpif, } /* Translates OpenFlow queue ID 'queue_id' (in host byte order) into a priority - * value for use in the ODP_ACTION_ATTR_SET_PRIORITY action. On success, + * value for use in the OVS_ACTION_ATTR_SET_PRIORITY action. On success, * returns 0 and stores the priority into '*priority'. On failure, returns a * positive errno value and stores 0 into '*priority'. */ int