X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif.h;h=4df2318442dcae365ba518d7ead93c34e54177d1;hb=72f7976600581cc9c57915dad150f7984c33e18b;hp=3e72539c1652512af8254b0984c18f39aaa0f5e7;hpb=856081f683d3e7d5b5fa07af4233d285eb205c47;p=openvswitch diff --git a/lib/dpif.h b/lib/dpif.h index 3e72539c..4df23184 100644 --- a/lib/dpif.h +++ b/lib/dpif.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ #include #include "openflow/openflow.h" #include "openvswitch/datapath-protocol.h" +#include "netdev.h" #include "util.h" #ifdef __cplusplus @@ -30,20 +31,18 @@ extern "C" { #endif struct dpif; -struct netdev; +struct ds; 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_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,9 +50,11 @@ 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 *); @@ -63,22 +64,77 @@ int dpif_set_drop_frags(struct dpif *, bool drop_frags); int dpif_port_add(struct dpif *, struct netdev *, uint16_t *port_nop); int dpif_port_del(struct dpif *, uint16_t port_no); + +/* A port within a datapath. + * + * 'name' and 'type' are suitable for passing to netdev_open(). */ +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 *); int dpif_port_query_by_number(const struct dpif *, uint16_t port_no, - struct odp_port *); + struct dpif_port *); int dpif_port_query_by_name(const struct dpif *, const char *devname, - struct odp_port *); + struct dpif_port *); int dpif_port_get_name(struct dpif *, uint16_t port_no, char *name, size_t name_size); -int dpif_port_list(const struct dpif *, struct odp_port **, size_t *n_ports); +int dpif_get_max_ports(const struct dpif *); + +struct dpif_port_dump { + const struct dpif *dpif; + int error; + void *state; +}; +void dpif_port_dump_start(struct dpif_port_dump *, const struct dpif *); +bool dpif_port_dump_next(struct dpif_port_dump *, struct dpif_port *); +int dpif_port_dump_done(struct dpif_port_dump *); + +/* Iterates through each DPIF_PORT in DPIF, using DUMP as state. + * + * Arguments all have pointer type. + * + * If you break out of the loop, then you need to free the dump structure by + * hand using dpif_port_dump_done(). */ +#define DPIF_PORT_FOR_EACH(DPIF_PORT, DUMP, DPIF) \ + for (dpif_port_dump_start(DUMP, DPIF); \ + (dpif_port_dump_next(DUMP, DPIF_PORT) \ + ? true \ + : (dpif_port_dump_done(DUMP), false)); \ + ) int dpif_port_poll(const struct dpif *, char **devnamep); void dpif_port_poll_wait(const struct dpif *); +struct dpif_flow_stats { + uint64_t n_packets; + uint64_t n_bytes; + long long int used; + uint8_t tcp_flags; +}; + +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; @@ -86,11 +142,25 @@ 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 *); -int dpif_execute(struct dpif *, const struct nlattr *actions, - size_t actions_len, const struct ofpbuf *); +int dpif_execute(struct dpif *, + const struct nlattr *key, size_t key_len, + const struct nlattr *actions, size_t actions_len, + const struct ofpbuf *); + +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_N_UC_TYPES +}; + +const char *dpif_upcall_type_to_string(enum dpif_upcall_type); /* A packet passed up from the datapath to userspace. * @@ -100,17 +170,16 @@ 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. */ + /* DPIF_UC_ACTION only. */ + uint64_t userdata; /* Argument to ODP_ACTION_ATTR_USERSPACE. */ - /* _ODPL_SFLOW_NR only. */ + /* DPIF_UC_SAMPLE only. */ uint32_t sample_pool; /* # of sampling candidate packets so far. */ struct nlattr *actions; /* Associated flow actions. */ size_t actions_len; @@ -121,7 +190,7 @@ 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_purge(struct dpif *); +void dpif_recv_purge(struct dpif *); void dpif_recv_wait(struct dpif *); void dpif_get_netflow_ids(const struct dpif *,