X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport.h;h=6ba7f2f507013a744144375b4ad978f380ff7542;hb=7f9bd4e8db2b307813c44bce0c5c5e2e69331c25;hp=5f3c7e9f1378beb15909e7fb392fb3d4ca8af732;hpb=94903c989826268a7fab3c730cd7d0b35ef423d5;p=openvswitch diff --git a/datapath/vport.h b/datapath/vport.h index 5f3c7e9f..6ba7f2f5 100644 --- a/datapath/vport.h +++ b/datapath/vport.h @@ -20,18 +20,10 @@ struct vport; struct vport_parms; -struct dp_port; /* The following definitions are for users of the vport subsytem: */ -int vport_user_add(const struct odp_vport_add __user *); -int vport_user_mod(const struct odp_vport_mod __user *); -int vport_user_del(const char __user *udevname); - -#ifdef CONFIG_COMPAT -int compat_vport_user_add(struct compat_odp_vport_add __user *); -int compat_vport_user_mod(struct compat_odp_vport_mod __user *); -#endif +int vport_user_mod(const struct odp_port __user *); int vport_user_stats_get(struct odp_vport_stats_req __user *); int vport_user_stats_set(struct odp_vport_stats_req __user *); @@ -47,14 +39,11 @@ int vport_init(void); void vport_exit(void); struct vport *vport_add(const struct vport_parms *); -int vport_mod(struct vport *, const void __user *config); +int vport_mod(struct vport *, struct odp_port *); int vport_del(struct vport *); struct vport *vport_locate(const char *name); -int vport_attach(struct vport *, struct dp_port *); -int vport_detach(struct vport *); - int vport_set_mtu(struct vport *, int mtu); int vport_set_addr(struct vport *, const unsigned char *); int vport_set_stats(struct vport *, struct rtnl_link_stats64 *); @@ -63,7 +52,6 @@ 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 rtnl_link_stats64 *); @@ -75,6 +63,7 @@ int vport_get_ifindex(const struct vport *); int vport_get_iflink(const struct vport *); int vport_get_mtu(const struct vport *); +void vport_get_config(const struct vport *, void *); int vport_send(struct vport *, struct sk_buff *); @@ -95,12 +84,39 @@ struct vport_err_stats { u64 tx_errors; }; +/** + * struct vport - one port within a datapath + * @port_no: Index into @dp's @ports array. + * @dp: Datapath to which this port belongs. + * @kobj: Represents /sys/class/net//brport. + * @linkname: The name of the link from /sys/class/net//brif to this + * &struct vport. (We keep this around so that we can delete it if the + * device gets renamed.) Set to the null string when no link exists. + * @node: Element in @dp's @port_list. + * @sflow_pool: Number of packets that were candidates for sFlow sampling, + * regardless of whether they were actually chosen and sent down to userspace. + * @hash_node: Element in @dev_table hash table in vport.c. + * @ops: Class structure. + * @percpu_stats: Points to per-CPU statistics used and maintained by the vport + * code if %VPORT_F_GEN_STATS is set to 1 in @ops flags, otherwise unused. + * @stats_lock: Protects @err_stats and @offset_stats. + * @err_stats: Points to error statistics used and maintained by the vport code + * if %VPORT_F_GEN_STATS is set to 1 in @ops flags, otherwise unused. + * @offset_stats: Added to actual statistics as a sop to compatibility with + * XAPI for Citrix XenServer. Deprecated. + */ struct vport { + u16 port_no; + struct datapath *dp; + struct kobject kobj; + char linkname[IFNAMSIZ]; + struct list_head node; + atomic_t sflow_pool; + struct hlist_node hash_node; const struct vport_ops *ops; - struct dp_port *dp_port; - struct vport_percpu_stats *percpu_stats; + struct vport_percpu_stats __percpu *percpu_stats; spinlock_t stats_lock; struct vport_err_stats err_stats; @@ -117,13 +133,19 @@ struct vport { * * @name: New vport's name. * @type: New vport's type. - * @config: New vport's configuration, as %NULL or a userspace pointer to an - * arbitrary type-specific structure. + * @config: Kernel copy of 'config' member of &struct odp_port describing + * configuration for new port. Exactly %VPORT_CONFIG_SIZE bytes. + * @dp: New vport's datapath. + * @port_no: New vport's port number. */ struct vport_parms { const char *name; const char *type; - const void __user *config; + const void *config; + + /* For vport_alloc(). */ + struct datapath *dp; + u16 port_no; }; /** @@ -141,18 +163,14 @@ struct vport_parms { * a new vport allocated with vport_alloc(), otherwise an ERR_PTR() value. * @modify: Modify the configuration of an existing vport. May be null if * modification is not supported. - * @destroy: Destroy and free a vport using vport_free(). Prior to destruction - * @detach will be called followed by synchronize_rcu(). - * @attach: Attach a previously created vport to a datapath. After attachment - * packets may be sent and received. Prior to attachment any packets may be - * silently discarded. May be null if not needed. - * @detach: Detach a vport from a datapath. May be null if not needed. + * @destroy: Detach and destroy a vport. * @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_config: Get the device's configuration. * @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 and @@ -179,12 +197,9 @@ struct vport_ops { /* Called with RTNL lock. */ struct vport *(*create)(const struct vport_parms *); - int (*modify)(struct vport *, const void __user *config); + int (*modify)(struct vport *, struct odp_port *); int (*destroy)(struct vport *); - int (*attach)(struct vport *); - int (*detach)(struct vport *); - int (*set_mtu)(struct vport *, int mtu); int (*set_addr)(struct vport *, const unsigned char *); int (*set_stats)(const struct vport *, struct rtnl_link_stats64 *); @@ -192,6 +207,7 @@ struct vport_ops { /* Called with rcu_read_lock or RTNL lock. */ const char *(*get_name)(const struct vport *); const unsigned char *(*get_addr)(const struct vport *); + void (*get_config)(const struct vport *, void *); struct kobject *(*get_kobj)(const struct vport *); int (*get_stats)(const struct vport *, struct rtnl_link_stats64 *); @@ -214,7 +230,7 @@ enum vport_err_type { VPORT_E_TX_ERROR, }; -struct vport *vport_alloc(int priv_size, const struct vport_ops *); +struct vport *vport_alloc(int priv_size, const struct vport_ops *, const struct vport_parms *); void vport_free(struct vport *); #define VPORT_ALIGN 8