X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif.h;h=45c78a55071ce32525f3c884ce2c7a5e50a5ea5b;hb=1e3f34c7693bcabae8e443ac1b246680ef9b60e2;hp=4df2318442dcae365ba518d7ead93c34e54177d1;hpb=b85d8d61a6c3b9c2fa578fa62c795a93544764af;p=sliver-openvswitch.git diff --git a/lib/dpif.h b/lib/dpif.h index 4df231844..45c78a550 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, Inc. * * 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,8 @@ #include #include #include +#include #include "openflow/openflow.h" -#include "openvswitch/datapath-protocol.h" #include "netdev.h" #include "util.h" @@ -32,6 +32,7 @@ extern "C" { struct dpif; struct ds; +struct flow; struct nlattr; struct ofpbuf; struct sset; @@ -39,6 +40,7 @@ struct dpif_class; int dp_register_provider(const struct dpif_class *); int dp_unregister_provider(const char *type); +void dp_blacklist_provider(const char *type); void dp_enumerate_types(struct sset *types); const char *dpif_normalize_type(const char *); @@ -58,9 +60,17 @@ const char *dpif_base_name(const struct dpif *); 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); @@ -72,7 +82,6 @@ struct dpif_port { char *name; /* Network device name, e.g. "eth0". */ char *type; /* Network device type, e.g. "system". */ uint32_t port_no; /* Port number within datapath. */ - struct netdev_stats stats; /* Port statistics. */ }; void dpif_port_clone(struct dpif_port *, const struct dpif_port *); void dpif_port_destroy(struct dpif_port *); @@ -83,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; @@ -108,6 +118,8 @@ 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; @@ -116,6 +128,8 @@ struct dpif_flow_stats { uint8_t tcp_flags; }; +void dpif_flow_stats_extract(const struct flow *, const struct ofpbuf *packet, + long long int used, struct dpif_flow_stats *); void dpif_flow_stats_format(const struct dpif_flow_stats *, struct ds *); enum dpif_flow_put_flags { @@ -147,16 +161,72 @@ bool dpif_flow_dump_next(struct dpif_flow_dump *, 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_FLOW_DEL, + DPIF_OP_EXECUTE, +}; + +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_flow_del { + /* Input. */ + const struct nlattr *key; /* Flow to delete. */ + size_t key_len; /* Length of 'key' 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_flow_del flow_del; + 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, /* ODP_ACTION_ATTR_USERSPACE action. */ - DPIF_UC_SAMPLE, /* Packet sampling. */ + DPIF_UC_ACTION, /* OVS_ACTION_ATTR_USERSPACE action. */ DPIF_N_UC_TYPES }; @@ -177,21 +247,15 @@ struct dpif_upcall { size_t key_len; /* Length of 'key' in bytes. */ /* DPIF_UC_ACTION only. */ - uint64_t userdata; /* Argument to ODP_ACTION_ATTR_USERSPACE. */ - - /* DPIF_UC_SAMPLE only. */ - uint32_t sample_pool; /* # of sampling candidate packets so far. */ - struct nlattr *actions; /* Associated flow actions. */ - size_t actions_len; + 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(struct dpif *, struct dpif_upcall *); +int dpif_recv_set(struct dpif *, bool enable); +int dpif_recv(struct dpif *, struct dpif_upcall *, struct ofpbuf *); 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);