X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif.h;h=1a6ca0538739d33702334d79c57c3b62ddac0b2e;hb=94e0c3ff3c096456bddfe33ac8d6540be17bfe8e;hp=4efabd0a2e055ab27de367ee9e6122b891cd4167;hpb=996c1b3d7a4d6e82e1831ff8821e5fd7e1a5522c;p=sliver-openvswitch.git diff --git a/lib/dpif.h b/lib/dpif.h index 4efabd0a2..1a6ca0538 100644 --- a/lib/dpif.h +++ b/lib/dpif.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,9 @@ #include #include #include +#include #include "openflow/openflow.h" -#include "openvswitch/datapath-protocol.h" +#include "netdev.h" #include "util.h" #ifdef __cplusplus @@ -30,20 +31,20 @@ extern "C" { #endif struct dpif; -struct netdev; +struct ds; +struct flow; struct nlattr; struct ofpbuf; -struct svec; +struct sset; struct dpif_class; -void dp_run(void); -void dp_wait(void); - int dp_register_provider(const struct dpif_class *); int dp_unregister_provider(const char *type); -void dp_enumerate_types(struct svec *types); +void dp_blacklist_provider(const char *type); +void dp_enumerate_types(struct sset *types); +const char *dpif_normalize_type(const char *); -int dp_enumerate_names(const char *type, struct svec *names); +int dp_enumerate_names(const char *type, struct sset *names); void dp_parse_name(const char *datapath_name, char **name, char **type); int dpif_open(const char *name, const char *type, struct dpif **); @@ -51,15 +52,25 @@ int dpif_create(const char *name, const char *type, struct dpif **); int dpif_create_and_open(const char *name, const char *type, struct dpif **); void dpif_close(struct dpif *); +void dpif_run(struct dpif *); +void dpif_wait(struct dpif *); + const char *dpif_name(const struct dpif *); const char *dpif_base_name(const struct dpif *); -int dpif_get_all_names(const struct dpif *, struct svec *); int dpif_delete(struct dpif *); -int dpif_get_dp_stats(const struct dpif *, struct odp_stats *); -int dpif_get_drop_frags(const struct dpif *, bool *drop_frags); -int dpif_set_drop_frags(struct dpif *, bool drop_frags); +/* Statisticss for a dpif as a whole. */ +struct dpif_dp_stats { + uint64_t n_hit; /* Number of flow table matches. */ + uint64_t n_missed; /* Number of flow table misses. */ + uint64_t n_lost; /* Number of misses not sent to userspace. */ + uint64_t n_flows; /* Number of flows present. */ +}; +int dpif_get_dp_stats(const struct dpif *, struct dpif_dp_stats *); + + +/* Port operations. */ int dpif_port_add(struct dpif *, struct netdev *, uint16_t *port_nop); int dpif_port_del(struct dpif *, uint16_t port_no); @@ -81,6 +92,7 @@ int dpif_port_query_by_name(const struct dpif *, const char *devname, int dpif_port_get_name(struct dpif *, uint16_t port_no, char *name, size_t name_size); int dpif_get_max_ports(const struct dpif *); +uint32_t dpif_port_get_pid(const struct dpif *, uint16_t port_no); struct dpif_port_dump { const struct dpif *dpif; @@ -106,12 +118,37 @@ int dpif_port_dump_done(struct dpif_port_dump *); int dpif_port_poll(const struct dpif *, char **devnamep); void dpif_port_poll_wait(const struct dpif *); + +/* Flow table operations. */ + +struct dpif_flow_stats { + uint64_t n_packets; + uint64_t n_bytes; + long long int used; + uint8_t tcp_flags; +}; + +void dpif_flow_stats_extract(const struct flow *, const struct ofpbuf *packet, + struct dpif_flow_stats *); +void dpif_flow_stats_format(const struct dpif_flow_stats *, struct ds *); + +enum dpif_flow_put_flags { + DPIF_FP_CREATE = 1 << 0, /* Allow creating a new flow. */ + DPIF_FP_MODIFY = 1 << 1, /* Allow modifying an existing flow. */ + DPIF_FP_ZERO_STATS = 1 << 2 /* Zero the stats of an existing flow. */ +}; int dpif_flow_flush(struct dpif *); -int dpif_flow_put(struct dpif *, struct odp_flow_put *); -int dpif_flow_del(struct dpif *, struct odp_flow *); -int dpif_flow_get(const struct dpif *, struct odp_flow *); -int dpif_flow_get_multiple(const struct dpif *, struct odp_flow[], size_t n); +int dpif_flow_put(struct dpif *, enum dpif_flow_put_flags, + const struct nlattr *key, size_t key_len, + const struct nlattr *actions, size_t actions_len, + struct dpif_flow_stats *); +int dpif_flow_del(struct dpif *, + const struct nlattr *key, size_t key_len, + struct dpif_flow_stats *); +int dpif_flow_get(const struct dpif *, + const struct nlattr *key, size_t key_len, + struct ofpbuf **actionsp, struct dpif_flow_stats *); struct dpif_flow_dump { const struct dpif *dpif; @@ -119,11 +156,70 @@ struct dpif_flow_dump { void *state; }; void dpif_flow_dump_start(struct dpif_flow_dump *, const struct dpif *); -bool dpif_flow_dump_next(struct dpif_flow_dump *, struct odp_flow *); +bool dpif_flow_dump_next(struct dpif_flow_dump *, + const struct nlattr **key, size_t *key_len, + const struct nlattr **actions, size_t *actions_len, + const struct dpif_flow_stats **); int dpif_flow_dump_done(struct dpif_flow_dump *); + +/* Packet operations. */ + +int dpif_execute(struct dpif *, + const struct nlattr *key, size_t key_len, + const struct nlattr *actions, size_t actions_len, + const struct ofpbuf *); + +/* Operation batching interface. + * + * Some datapaths are faster at performing N operations together than the same + * N operations individually, hence an interface for batching. + */ + +enum dpif_op_type { + DPIF_OP_FLOW_PUT = 1, + DPIF_OP_EXECUTE +}; -int dpif_execute(struct dpif *, const struct nlattr *actions, - size_t actions_len, const struct ofpbuf *); +struct dpif_flow_put { + /* Input. */ + enum dpif_flow_put_flags flags; /* DPIF_FP_*. */ + const struct nlattr *key; /* Flow to put. */ + size_t key_len; /* Length of 'key' in bytes. */ + const struct nlattr *actions; /* Actions to perform on flow. */ + size_t actions_len; /* Length of 'actions' in bytes. */ + + /* Output. */ + struct dpif_flow_stats *stats; /* Optional flow statistics. */ +}; + +struct dpif_execute { + const struct nlattr *key; /* Partial flow key (only for metadata). */ + size_t key_len; /* Length of 'key' in bytes. */ + const struct nlattr *actions; /* Actions to execute on packet. */ + size_t actions_len; /* Length of 'actions' in bytes. */ + const struct ofpbuf *packet; /* Packet to execute. */ +}; + +struct dpif_op { + enum dpif_op_type type; + int error; + union { + struct dpif_flow_put flow_put; + struct dpif_execute execute; + } u; +}; + +void dpif_operate(struct dpif *, struct dpif_op **ops, size_t n_ops); + +/* Upcalls. */ + +enum dpif_upcall_type { + DPIF_UC_MISS, /* Miss in flow table. */ + DPIF_UC_ACTION, /* OVS_ACTION_ATTR_USERSPACE action. */ + DPIF_N_UC_TYPES +}; + +const char *dpif_upcall_type_to_string(enum dpif_upcall_type); /* A packet passed up from the datapath to userspace. * @@ -133,29 +229,22 @@ int dpif_execute(struct dpif *, const struct nlattr *actions, * clients that exist so far.) */ struct dpif_upcall { - uint32_t type; /* One of _ODPL_*_NR. */ - /* All types. */ + enum dpif_upcall_type type; struct ofpbuf *packet; /* Packet data. */ struct nlattr *key; /* Flow key. */ size_t key_len; /* Length of 'key' in bytes. */ - /* _ODPL_ACTION_NR only. */ - uint64_t userdata; /* Argument to ODPAT_CONTROLLER. */ - - /* _ODPL_SFLOW_NR only. */ - uint32_t sample_pool; /* # of sampling candidate packets so far. */ - struct nlattr *actions; /* Associated flow actions. */ - size_t actions_len; + /* DPIF_UC_ACTION only. */ + uint64_t userdata; /* Argument to OVS_ACTION_ATTR_USERSPACE. */ }; -int dpif_recv_get_mask(const struct dpif *, int *listen_mask); -int dpif_recv_set_mask(struct dpif *, int listen_mask); -int dpif_get_sflow_probability(const struct dpif *, uint32_t *probability); -int dpif_set_sflow_probability(struct dpif *, uint32_t probability); +int dpif_recv_set(struct dpif *, bool enable); int dpif_recv(struct dpif *, struct dpif_upcall *); void dpif_recv_purge(struct dpif *); void dpif_recv_wait(struct dpif *); + +/* Miscellaneous. */ void dpif_get_netflow_ids(const struct dpif *, uint8_t *engine_type, uint8_t *engine_id);