X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-provider.h;h=c2123dc6717f603d851874d3b2a48c448c51a8eb;hb=41ca1e0afb4b261a217c9fdaf672ef606e8434f9;hp=6a38e1f85eb112dc62f2a1305acc1c9f57c49d27;hpb=40d26f04b2588632cf08e2ca3ea2cee40402a3f9;p=sliver-openvswitch.git diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h index 6a38e1f85..c2123dc67 100644 --- a/lib/netdev-provider.h +++ b/lib/netdev-provider.h @@ -19,8 +19,10 @@ /* Generic interface to network devices. */ +#include "connectivity.h" #include "netdev.h" #include "list.h" +#include "seq.h" #include "shash.h" #include "smap.h" @@ -38,30 +40,51 @@ struct netdev { const struct netdev_class *netdev_class; /* Functions to control this device. */ + /* A sequence number which indicates changes in one of 'netdev''s + * properties. It must be nonzero so that users have a value which + * they may use as a reset when tracking 'netdev'. + * + * Minimally, the sequence number is required to change whenever + * 'netdev''s flags, features, ethernet address, or carrier changes. */ + uint64_t change_seq; + /* The following are protected by 'netdev_mutex' (internal to netdev.c). */ + int n_rxq; int ref_cnt; /* Times this devices was opened. */ struct shash_node *node; /* Pointer to element in global map. */ struct list saved_flags_list; /* Contains "struct netdev_saved_flags". */ }; +static void +netdev_change_seq_changed(struct netdev *netdev) +{ + seq_change(connectivity_seq_get()); + netdev->change_seq++; + if (!netdev->change_seq) { + netdev->change_seq++; + } +} + const char *netdev_get_type(const struct netdev *); const struct netdev_class *netdev_get_class(const struct netdev *); const char *netdev_get_name(const struct netdev *); struct netdev *netdev_from_name(const char *name); void netdev_get_devices(const struct netdev_class *, struct shash *device_list); +struct netdev **netdev_get_vports(size_t *size); /* A data structure for capturing packets received by a network device. * * Network device implementations may read these members but should not modify * them. * - * None of these members change during the lifetime of a struct netdev_rx. */ -struct netdev_rx { + * None of these members change during the lifetime of a struct netdev_rxq. */ +struct netdev_rxq { struct netdev *netdev; /* Owns a reference to the netdev. */ + int queue_id; }; -struct netdev *netdev_rx_get_netdev(const struct netdev_rx *); +struct netdev *netdev_rxq_get_netdev(const struct netdev_rxq *); /* Network device class structure, to be defined by each implementation of a * network device. @@ -77,7 +100,7 @@ struct netdev *netdev_rx_get_netdev(const struct netdev_rx *); * * - "struct netdev", which represents a network device. * - * - "struct netdev_rx", which represents a handle for capturing packets + * - "struct netdev_rxq", which represents a handle for capturing packets * received on a network device * * Each of these data structures contains all of the implementation-independent @@ -96,10 +119,10 @@ struct netdev *netdev_rx_get_netdev(const struct netdev_rx *); * * Four stylized functions accompany each of these data structures: * - * "alloc" "construct" "destruct" "dealloc" - * ------------ ---------------- --------------- -------------- - * netdev ->alloc ->construct ->destruct ->dealloc - * netdev_rx ->rx_alloc ->rx_construct ->rx_destruct ->rx_dealloc + * "alloc" "construct" "destruct" "dealloc" + * ------------ ---------------- --------------- -------------- + * netdev ->alloc ->construct ->destruct ->dealloc + * netdev_rxq ->rxq_alloc ->rxq_construct ->rxq_destruct ->rxq_dealloc * * Any instance of a given data structure goes through the following life * cycle: @@ -127,6 +150,9 @@ struct netdev *netdev_rx_get_netdev(const struct netdev_rx *); * implementation must not refer to base or derived state in the data * structure, because it has already been uninitialized. * + * If netdev support multi-queue IO then netdev->construct should set initialize + * netdev->n_rxq to number of queues. + * * Each "alloc" function allocates and returns a new instance of the respective * data structure. The "alloc" function is not given any information about the * use of the new data structure, so it cannot perform much initialization. @@ -620,19 +646,19 @@ struct netdev_class { int (*update_flags)(struct netdev *netdev, enum netdev_flags off, enum netdev_flags on, enum netdev_flags *old_flags); -/* ## ------------------- ## */ -/* ## netdev_rx Functions ## */ -/* ## ------------------- ## */ +/* ## -------------------- ## */ +/* ## netdev_rxq Functions ## */ +/* ## -------------------- ## */ /* If a particular netdev class does not support receiving packets, all these * function pointers must be NULL. */ - /* Life-cycle functions for a netdev_rx. See the large comment above on + /* Life-cycle functions for a netdev_rxq. See the large comment above on * struct netdev_class. */ - struct netdev_rx *(*rx_alloc)(void); - int (*rx_construct)(struct netdev_rx *); - void (*rx_destruct)(struct netdev_rx *); - void (*rx_dealloc)(struct netdev_rx *); + struct netdev_rxq *(*rxq_alloc)(void); + int (*rxq_construct)(struct netdev_rxq *); + void (*rxq_destruct)(struct netdev_rxq *); + void (*rxq_dealloc)(struct netdev_rxq *); /* Attempts to receive batch of packets from 'rx' and place array of pointers * into '*pkt'. netdev is responsible for allocating buffers. @@ -645,15 +671,15 @@ struct netdev_class { * Caller is expected to pass array of size MAX_RX_BATCH. * This function may be set to null if it would always return EOPNOTSUPP * anyhow. */ - int (*rx_recv)(struct netdev_rx *rx, struct ofpbuf **pkt, int *cnt); + int (*rxq_recv)(struct netdev_rxq *rx, struct ofpbuf **pkt, int *cnt); /* Registers with the poll loop to wake up from the next call to - * poll_block() when a packet is ready to be received with netdev_rx_recv() + * poll_block() when a packet is ready to be received with netdev_rxq_recv() * on 'rx'. */ - void (*rx_wait)(struct netdev_rx *rx); + void (*rxq_wait)(struct netdev_rxq *rx); /* Discards all packets waiting to be received from 'rx'. */ - int (*rx_drain)(struct netdev_rx *rx); + int (*rxq_drain)(struct netdev_rxq *rx); }; int netdev_register_provider(const struct netdev_class *);