X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif.h;h=3c376ec1f380bfa7186362a5de66abb0c672e9fd;hb=bc4a05c639ee3789d009bb6143345cf121b2d4d4;hp=c844289c33ed75dba334bcf8b521af4ef90760bb;hpb=f1588b1fa1be46231ee079358e428dae74ff09cc;p=sliver-openvswitch.git diff --git a/lib/dpif.h b/lib/dpif.h index c844289c3..3c376ec1f 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. @@ -30,6 +30,8 @@ extern "C" { #endif struct dpif; +struct netdev; +struct nlattr; struct ofpbuf; struct svec; struct dpif_class; @@ -59,16 +61,48 @@ 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); -int dpif_port_add(struct dpif *, const char *devname, uint16_t flags, - uint16_t *port_no); +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. */ +}; +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 *); @@ -77,29 +111,49 @@ 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_list(const struct dpif *, struct odp_flow[], size_t n, - size_t *n_out); -int dpif_flow_list_all(const struct dpif *, - struct odp_flow **flowsp, size_t *np); - -int dpif_execute(struct dpif *, const union odp_action[], size_t n_actions, - const struct ofpbuf *); - -/* Minimum number of bytes of headroom for a packet returned by dpif_recv() - * member function. This headroom allows "struct odp_msg" to be replaced by - * "struct ofp_packet_in" without copying the buffer. */ -#define DPIF_RECV_MSG_PADDING (sizeof(struct ofp_packet_in) \ - - sizeof(struct odp_msg)) -BUILD_ASSERT_DECL(sizeof(struct ofp_packet_in) > sizeof(struct odp_msg)); -BUILD_ASSERT_DECL(DPIF_RECV_MSG_PADDING % 4 == 0); + +struct dpif_flow_dump { + const struct dpif *dpif; + int error; + 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 *); +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 *); + +/* A packet passed up from the datapath to userspace. + * + * If 'key' or 'actions' is nonnull, then it points into data owned by + * 'packet', so their memory cannot be freed separately. (This is hardly a + * great way to do things but it works out OK for the dpif providers and + * clients that exist so far.) + */ +struct dpif_upcall { + uint32_t type; /* One of _ODPL_*_NR. */ + + /* All types. */ + 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; +}; 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 ofpbuf **); -int dpif_recv_purge(struct dpif *); +int dpif_recv(struct dpif *, struct dpif_upcall *); +void dpif_recv_purge(struct dpif *); void dpif_recv_wait(struct dpif *); void dpif_get_netflow_ids(const struct dpif *,