#define VPORT_H 1
#include <linux/list.h>
+#include <linux/seqlock.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
#endif
int vport_user_stats_get(struct odp_vport_stats_req __user *);
+int vport_user_stats_set(struct odp_vport_stats_req __user *);
int vport_user_ether_get(struct odp_vport_ether __user *);
int vport_user_ether_set(struct odp_vport_ether __user *);
int vport_user_mtu_get(struct odp_vport_mtu __user *);
int vport_set_mtu(struct vport *, int mtu);
int vport_set_addr(struct vport *, const unsigned char *);
+int vport_set_stats(struct vport *, struct odp_vport_stats *);
const char *vport_get_name(const struct vport *);
const char *vport_get_type(const struct vport *);
const unsigned char *vport_get_addr(const struct vport *);
struct dp_port *vport_get_dp_port(const struct vport *);
-
struct kobject *vport_get_kobj(const struct vport *);
+int vport_get_stats(struct vport *, struct odp_vport_stats *);
unsigned vport_get_flags(const struct vport *);
int vport_is_running(const struct vport *);
u64 rx_packets;
u64 tx_bytes;
u64 tx_packets;
+ seqcount_t seqlock;
};
struct vport_err_stats {
- spinlock_t lock;
-
u64 rx_dropped;
u64 rx_errors;
u64 rx_frame_err;
struct dp_port *dp_port;
struct vport_percpu_stats *percpu_stats;
+
+ spinlock_t stats_lock;
struct vport_err_stats err_stats;
+ struct odp_vport_stats offset_stats;
};
#define VPORT_F_REQUIRED (1 << 0) /* If init fails, module loading fails. */
* @detach: Detach a vport from a datapath. May be null if not needed.
* @set_mtu: Set the device's MTU. May be null if not supported.
* @set_addr: Set the device's MAC address. May be null if not supported.
+ * @set_stats: Provides stats as an offset to be added to the device stats.
+ * May be null if not supported.
* @get_name: Get the device's name.
* @get_addr: Get the device's MAC address.
* @get_kobj: Get the kobj associated with the device (may return null).
* @get_stats: Fill in the transmit/receive stats. May be null if stats are
- * not supported or if generic stats are in use. If defined overrides
- * VPORT_F_GEN_STATS.
+ * not supported or if generic stats are in use. If defined and
+ * VPORT_F_GEN_STATS is also set, the error stats are added to those already
+ * collected.
* @get_dev_flags: Get the device's flags.
* @is_running: Checks whether the device is running.
* @get_operstate: Get the device's operating state.
int (*set_mtu)(struct vport *, int mtu);
int (*set_addr)(struct vport *, const unsigned char *);
+ int (*set_stats)(const struct vport *, struct odp_vport_stats *);
/* Called with rcu_read_lock or RTNL lock. */
const char *(*get_name)(const struct vport *);
* area was allocated on creation. This allows that area to be accessed and
* used for any purpose needed by the vport implementer.
*/
-static inline void *
-vport_priv(const struct vport *vport)
+static inline void *vport_priv(const struct vport *vport)
{
return (u8 *)vport + ALIGN(sizeof(struct vport), VPORT_ALIGN);
}
* the result of a hash table lookup. @priv must point to the start of the
* private data area.
*/
-static inline struct vport *
-vport_from_priv(const void *priv)
+static inline struct vport *vport_from_priv(const void *priv)
{
return (struct vport *)(priv - ALIGN(sizeof(struct vport), VPORT_ALIGN));
}
void vport_receive(struct vport *, struct sk_buff *);
void vport_record_error(struct vport *, enum vport_err_type err_type);
+/* List of statically compiled vport implementations. Don't forget to also
+ * add yours to the list at the top of vport.c. */
+extern struct vport_ops netdev_vport_ops;
+extern struct vport_ops internal_vport_ops;
+extern struct vport_ops patch_vport_ops;
+extern struct vport_ops gre_vport_ops;
+extern struct vport_ops capwap_vport_ops;
+
#endif /* vport.h */