X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fnetdev.h;h=a81989e5d217045f4dd62cb53c37b931fabca1eb;hb=f76def2592cc5cb449a3360430ee9cc0f208765d;hp=852b75dbd5f2d3b309f10b636369f4dee0394a3f;hpb=796223f5bc3a4896e6398733c798390158479400;p=cascardo%2Fovs.git diff --git a/lib/netdev.h b/lib/netdev.h index 852b75dbd..a81989e5d 100644 --- a/lib/netdev.h +++ b/lib/netdev.h @@ -21,6 +21,8 @@ #include #include #include "openvswitch/types.h" +#include "packets.h" +#include "flow.h" #ifdef __cplusplus extern "C" { @@ -31,17 +33,45 @@ extern "C" { * Every port on a switch must have a corresponding netdev that must minimally * support a few operations, such as the ability to read the netdev's MTU. * The PORTING file at the top of the source tree has more information in the - * "Writing a netdev Provider" section. */ + * "Writing a netdev Provider" section. + * + * Thread-safety + * ============= + * + * Most of the netdev functions are fully thread-safe: they may be called from + * any number of threads on the same or different netdev objects. The + * exceptions are: + * + * netdev_rxq_recv() + * netdev_rxq_wait() + * netdev_rxq_drain() + * + * These functions are conditionally thread-safe: they may be called from + * different threads only on different netdev_rxq objects. (The client may + * create multiple netdev_rxq objects for a single netdev and access each + * of those from a different thread.) + * + * NETDEV_FOR_EACH_QUEUE + * netdev_queue_dump_next() + * netdev_queue_dump_done() + * + * These functions are conditionally thread-safe: they may be called from + * different threads only on different netdev_queue_dump objects. (The + * client may create multiple netdev_queue_dump objects for a single + * netdev and access each of those from a different thread.) + */ +struct dp_packet; struct netdev; struct netdev_class; -struct netdev_rx; +struct netdev_rxq; struct netdev_saved_flags; struct ofpbuf; struct in_addr; struct in6_addr; struct smap; struct sset; +struct ovs_action_push_tnl; /* Network device statistics. * @@ -88,8 +118,10 @@ struct netdev_tunnel_config { bool ip_src_flow; bool ip_dst_flow; - ovs_be32 ip_src; - ovs_be32 ip_dst; + struct in6_addr ipv6_src; + struct in6_addr ipv6_dst; + + uint32_t exts; uint8_t ttl; bool ttl_inherit; @@ -106,18 +138,28 @@ void netdev_run(void); void netdev_wait(void); void netdev_enumerate_types(struct sset *types); +bool netdev_is_reserved_name(const char *name); + +int netdev_n_txq(const struct netdev *netdev); +int netdev_n_rxq(const struct netdev *netdev); +int netdev_requested_n_rxq(const struct netdev *netdev); +bool netdev_is_pmd(const struct netdev *netdev); /* Open and close. */ -int netdev_open(const char *name, const char *type, struct netdev **); +int netdev_open(const char *name, const char *type, struct netdev **netdevp); + +struct netdev *netdev_ref(const struct netdev *); +void netdev_remove(struct netdev *); void netdev_close(struct netdev *); void netdev_parse_name(const char *netdev_name, char **name, char **type); /* Options. */ -int netdev_set_config(struct netdev *, const struct smap *args); +int netdev_set_config(struct netdev *, const struct smap *args, char **errp); int netdev_get_config(const struct netdev *, struct smap *); const struct netdev_tunnel_config * netdev_get_tunnel_config(const struct netdev *); +int netdev_get_numa_id(const struct netdev *); /* Basic properties. */ const char *netdev_get_name(const struct netdev *); @@ -126,24 +168,36 @@ const char *netdev_get_type_from_name(const char *); int netdev_get_mtu(const struct netdev *, int *mtup); int netdev_set_mtu(const struct netdev *, int mtu); int netdev_get_ifindex(const struct netdev *); +int netdev_set_multiq(struct netdev *, unsigned int n_txq, unsigned int n_rxq); /* Packet reception. */ -int netdev_rx_open(struct netdev *, struct netdev_rx **); -void netdev_rx_close(struct netdev_rx *); +int netdev_rxq_open(struct netdev *, struct netdev_rxq **, int id); +void netdev_rxq_close(struct netdev_rxq *); -const char *netdev_rx_get_name(const struct netdev_rx *); +const char *netdev_rxq_get_name(const struct netdev_rxq *); +int netdev_rxq_get_queue_id(const struct netdev_rxq *); -int netdev_rx_recv(struct netdev_rx *, struct ofpbuf *); -void netdev_rx_wait(struct netdev_rx *); -int netdev_rx_drain(struct netdev_rx *); +int netdev_rxq_recv(struct netdev_rxq *rx, struct dp_packet **buffers, + int *cnt); +void netdev_rxq_wait(struct netdev_rxq *); +int netdev_rxq_drain(struct netdev_rxq *); /* Packet transmission. */ -int netdev_send(struct netdev *, const struct ofpbuf *); -void netdev_send_wait(struct netdev *); +int netdev_send(struct netdev *, int qid, struct dp_packet **, int cnt, + bool may_steal); +void netdev_send_wait(struct netdev *, int qid); + +int netdev_build_header(const struct netdev *, struct ovs_action_push_tnl *data, + const struct flow *tnl_flow); +int netdev_push_header(const struct netdev *netdev, + struct dp_packet **buffers, int cnt, + const struct ovs_action_push_tnl *data); +int netdev_pop_header(struct netdev *netdev, struct dp_packet **buffers, + int cnt); /* Hardware address. */ -int netdev_set_etheraddr(struct netdev *, const uint8_t mac[6]); -int netdev_get_etheraddr(const struct netdev *, uint8_t mac[6]); +int netdev_set_etheraddr(struct netdev *, const struct eth_addr mac); +int netdev_get_etheraddr(const struct netdev *, struct eth_addr *mac); /* PHY interface. */ bool netdev_get_carrier(const struct netdev *); @@ -207,13 +261,13 @@ int netdev_add_router(struct netdev *, struct in_addr router); int netdev_get_next_hop(const struct netdev *, const struct in_addr *host, struct in_addr *next_hop, char **); int netdev_get_status(const struct netdev *, struct smap *); -int netdev_arp_lookup(const struct netdev *, ovs_be32 ip, uint8_t mac[6]); +int netdev_arp_lookup(const struct netdev *, ovs_be32 ip, + struct eth_addr *mac); struct netdev *netdev_find_dev_by_in4(const struct in_addr *); /* Statistics. */ int netdev_get_stats(const struct netdev *, struct netdev_stats *); -int netdev_set_stats(struct netdev *, const struct netdev_stats *); /* Quality of service. */ struct netdev_qos_capabilities { @@ -225,6 +279,9 @@ struct netdev_queue_stats { uint64_t tx_bytes; uint64_t tx_packets; uint64_t tx_errors; + + /* Time at which the queue was created, in msecs, LLONG_MIN if unknown. */ + long long int created; }; int netdev_set_policing(struct netdev *, uint32_t kbits_rate, @@ -249,11 +306,33 @@ int netdev_set_queue(struct netdev *, int netdev_delete_queue(struct netdev *, unsigned int queue_id); int netdev_get_queue_stats(const struct netdev *, unsigned int queue_id, struct netdev_queue_stats *); +uint64_t netdev_get_change_seq(const struct netdev *); -typedef void netdev_dump_queues_cb(unsigned int queue_id, - const struct smap *details, void *aux); -int netdev_dump_queues(const struct netdev *, - netdev_dump_queues_cb *, void *aux); +struct netdev_queue_dump { + struct netdev *netdev; + int error; + void *state; +}; +void netdev_queue_dump_start(struct netdev_queue_dump *, + const struct netdev *); +bool netdev_queue_dump_next(struct netdev_queue_dump *, + unsigned int *queue_id, struct smap *details); +int netdev_queue_dump_done(struct netdev_queue_dump *); + +/* Iterates through each queue in NETDEV, using DUMP as state. Fills QUEUE_ID + * and DETAILS with information about queues. The client must initialize and + * destroy DETAILS. + * + * Arguments all have pointer type. + * + * If you break out of the loop, then you need to free the dump structure by + * hand using netdev_queue_dump_done(). */ +#define NETDEV_QUEUE_FOR_EACH(QUEUE_ID, DETAILS, DUMP, NETDEV) \ + for (netdev_queue_dump_start(DUMP, NETDEV); \ + (netdev_queue_dump_next(DUMP, QUEUE_ID, DETAILS) \ + ? true \ + : (netdev_queue_dump_done(DUMP), false)); \ + ) typedef void netdev_dump_queue_stats_cb(unsigned int queue_id, struct netdev_queue_stats *, @@ -261,7 +340,8 @@ typedef void netdev_dump_queue_stats_cb(unsigned int queue_id, int netdev_dump_queue_stats(const struct netdev *, netdev_dump_queue_stats_cb *, void *aux); -unsigned int netdev_change_seq(const struct netdev *netdev); +enum { NETDEV_MAX_BURST = 32 }; /* Maximum number packets in a batch. */ +extern struct seq *tnl_conf_seq; #ifdef __cplusplus }