X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif-provider.h;h=5d651c6e0036136136698843f0d2cfd179960bb3;hb=76ecc721793b29c8bae44b10a065ec9ac07a9e4b;hp=39c66e11b25cafc684d55cfedac3564bc2f06d23;hpb=49c36903d6d65bed96cba31f05534510a21a68d7;p=openvswitch diff --git a/lib/dpif-provider.h b/lib/dpif-provider.h index 39c66e11..5d651c6e 100644 --- a/lib/dpif-provider.h +++ b/lib/dpif-provider.h @@ -18,10 +18,14 @@ #define DPIF_PROVIDER_H 1 /* Provider interface to dpifs, which provide an interface to an Open vSwitch - * datapath. */ + * datapath. A datapath is a collection of physical or virtual ports that are + * exposed over OpenFlow as a single switch. Datapaths and the collections of + * ports that they contain may be fixed or dynamic. */ #include +#include "openflow/openflow.h" #include "dpif.h" +#include "util.h" #ifdef __cplusplus extern "C" { @@ -32,13 +36,16 @@ extern "C" { * This structure should be treated as opaque by dpif implementations. */ struct dpif { const struct dpif_class *dpif_class; - char *name; + char *base_name; + char *full_name; uint8_t netflow_engine_type; uint8_t netflow_engine_id; }; void dpif_init(struct dpif *, const struct dpif_class *, const char *name, uint8_t netflow_engine_type, uint8_t netflow_engine_id); +void dpif_uninit(struct dpif *dpif, bool close); + static inline void dpif_assert_class(const struct dpif *dpif, const struct dpif_class *dpif_class) { @@ -56,15 +63,11 @@ static inline void dpif_assert_class(const struct dpif *dpif, * EWOULDBLOCK or EINPROGRESS. We may relax this requirement in the future if * and when we encounter performance problems. */ struct dpif_class { - /* Prefix for names of dpifs in this class, e.g. "netdev:". + /* Type of dpif in this class, e.g. "system", "netdev", etc. * - * One dpif class may have the empty string "" as its prefix, in which case - * that dpif class is associated with dpif names that don't match any other - * class name. */ - const char *prefix; - - /* Class name, for use in error messages. */ - const char *name; + * One of the providers should supply a "system" type, since this is + * the type assumed if no type is specified when opening a dpif. */ + const char *type; /* Performs periodic work needed by dpifs of this class, if any is * necessary. */ @@ -85,16 +88,14 @@ struct dpif_class { * case this function may be a null pointer. */ int (*enumerate)(struct svec *all_dps); - /* Attempts to open an existing dpif, if 'create' is false, or to open an - * existing dpif or create a new one, if 'create' is true. 'name' is the - * full dpif name provided by the user, e.g. "udatapath:/var/run/mypath". - * This name is useful for error messages but must not be modified. - * - * 'suffix' is a copy of 'name' following the dpif's 'prefix'. + /* Attempts to open an existing dpif called 'name', if 'create' is false, + * or to open an existing dpif or create a new one, if 'create' is true. + * 'type' corresponds to the 'type' field used in the dpif_class + * structure. * * If successful, stores a pointer to the new dpif in '*dpifp'. On failure * there are no requirements on what is stored in '*dpifp'. */ - int (*open)(const char *name, char *suffix, bool create, + int (*open)(const char *name, const char *type, bool create, struct dpif **dpifp); /* Closes 'dpif' and frees associated memory. */ @@ -182,20 +183,6 @@ struct dpif_class { * value other than EAGAIN. */ void (*port_poll_wait)(const struct dpif *dpif); - /* Stores in 'ports' the port numbers of up to 'n' ports that belong to - * 'group' in 'dpif'. Returns the number of ports in 'group' (not the - * number stored), if successful, otherwise a negative errno value. */ - int (*port_group_get)(const struct dpif *dpif, int group, - uint16_t ports[], int n); - - /* Changes port group 'group' in 'dpif' to consist of the 'n' ports whose - * numbers are given in 'ports'. - * - * Use the get_stats member function to obtain the number of supported port - * groups. */ - int (*port_group_set)(struct dpif *dpif, int group, - const uint16_t ports[], int n); - /* For each flow 'flow' in the 'n' flows in 'flows': * * - If a flow matching 'flow->key' exists in 'dpif': @@ -261,14 +248,8 @@ struct dpif_class { int (*flow_list)(const struct dpif *dpif, struct odp_flow flows[], int n); /* Performs the 'n_actions' actions in 'actions' on the Ethernet frame - * specified in 'packet'. - * - * Pretends that the frame was originally received on the port numbered - * 'in_port'. This affects only ODPAT_OUTPUT_GROUP actions, which will not - * send a packet out their input port. Specify the number of an unused - * port (e.g. UINT16_MAX is currently always unused) to avoid this - * behavior. */ - int (*execute)(struct dpif *dpif, uint16_t in_port, + * specified in 'packet'. */ + int (*execute)(struct dpif *dpif, const union odp_action actions[], int n_actions, const struct ofpbuf *packet); @@ -301,10 +282,18 @@ struct dpif_class { * packet. */ int (*set_sflow_probability)(struct dpif *dpif, uint32_t probability); + /* Translates OpenFlow queue ID 'queue_id' (in host byte order) into a + * priority value for use in the ODPAT_SET_PRIORITY action in + * '*priority'. */ + int (*queue_to_priority)(const struct dpif *dpif, uint32_t queue_id, + uint32_t *priority); + /* Attempts to receive a message from 'dpif'. If successful, stores the * message into '*packetp'. The message, if one is received, must begin - * with 'struct odp_msg' as a header. Only messages of the types selected - * with the set_listen_mask member function should be received. + * with 'struct odp_msg' as a header, and must have at least + * DPIF_RECV_MSG_PADDING bytes of headroom (allocated using + * e.g. ofpbuf_reserve()). Only messages of the types selected with the + * set_listen_mask member function should be received. * * This function must not block. If no message is ready to be received * when it is called, it should return EAGAIN without blocking. */