X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.h;h=ea200a3ad3a7374e537d1fcbc8f3d0d87e5134bd;hb=2c11e6d91216a1f40e9a499ee37868c81fc34f35;hp=d8b7a6dabe59e4ceae83e7e8857dd2d3bea21319;hpb=996c1b3d7a4d6e82e1831ff8821e5fd7e1a5522c;p=sliver-openvswitch.git diff --git a/datapath/datapath.h b/datapath/datapath.h index d8b7a6dab..ea200a3ad 100644 --- a/datapath/datapath.h +++ b/datapath/datapath.h @@ -15,14 +15,15 @@ #include #include #include -#include #include #include #include #include "checksum.h" +#include "compat.h" #include "flow.h" #include "dp_sysfs.h" +#include "vlan.h" struct vport; @@ -33,8 +34,7 @@ struct vport; #define DP_MAX_PORTS 1024 -#define DP_N_QUEUES 3 -#define DP_MAX_QUEUE_LEN 100 +#define SAMPLE_ACTION_DEPTH 3 /** * struct dp_stats_percpu - per-cpu packet processing statistics for a given @@ -60,36 +60,29 @@ struct dp_stats_percpu { /** * struct datapath - datapath for flow-based packet switching * @rcu: RCU callback head for deferred destruction. - * @mutex: Mutual exclusion for ioctls. - * @dp_idx: Datapath number (index into the dps[] array in datapath.c). - * @ifobj: Represents /sys/class/net//brif. + * @list_node: Element in global 'dps' list. + * @ifobj: Represents /sys/class/net//brif. Protected by RTNL. * @drop_frags: Drop all IP fragments if nonzero. - * @queues: %DP_N_QUEUES sets of queued packets for userspace to handle. - * @waitqueue: Waitqueue, for waiting for new packets in @queues. * @n_flows: Number of flows currently in flow table. - * @table: Current flow table. - * @ports: Map from port number to &struct vport. %ODPP_LOCAL port - * always exists, other ports may be %NULL. - * @port_list: List of all ports in @ports in arbitrary order. + * @table: Current flow table. Protected by genl_lock and RCU. + * @ports: Map from port number to &struct vport. %OVSP_LOCAL port + * always exists, other ports may be %NULL. Protected by RTNL and RCU. + * @port_list: List of all ports in @ports in arbitrary order. RTNL required + * to iterate or modify. * @stats_percpu: Per-CPU datapath statistics. - * @sflow_probability: Number of packets out of UINT_MAX to sample to the - * %ODPL_SFLOW queue, e.g. (@sflow_probability/UINT_MAX) is the probability of - * sampling a given packet. + * + * Context: See the comment on locking at the top of datapath.c for additional + * locking information. */ struct datapath { struct rcu_head rcu; - struct mutex mutex; - int dp_idx; + struct list_head list_node; struct kobject ifobj; int drop_frags; - /* Queued data. */ - struct sk_buff_head queues[DP_N_QUEUES]; - wait_queue_head_t waitqueue; - /* Flow table. */ - struct tbl __rcu *table; + struct flow_table __rcu *table; /* Switch ports. */ struct vport __rcu *ports[DP_MAX_PORTS]; @@ -97,58 +90,59 @@ struct datapath { /* Stats. */ struct dp_stats_percpu __percpu *stats_percpu; - - /* sFlow Sampling */ - unsigned int sflow_probability; }; /** * struct ovs_skb_cb - OVS data in skb CB * @vport: The datapath port on which the skb entered the switch. * @flow: The flow associated with this packet. May be %NULL if no flow. + * @tun_id: ID of the tunnel that encapsulated this packet. It is 0 if the * @ip_summed: Consistently stores L4 checksumming status across different * kernel versions. - * @tun_id: ID of the tunnel that encapsulated this packet. It is 0 if the + * @csum_start: Stores the offset from which to start checksumming independent + * of the transport header on all kernel versions. * packet was not received on a tunnel. + * @vlan_tci: Provides a substitute for the skb->vlan_tci field on kernels + * before 2.6.27. */ struct ovs_skb_cb { struct vport *vport; struct sw_flow *flow; + __be64 tun_id; #ifdef NEED_CSUM_NORMALIZE enum csum_type ip_summed; + u16 csum_start; +#endif +#ifdef NEED_VLAN_FIELD + u16 vlan_tci; #endif - __be64 tun_id; }; #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb) /** * struct dp_upcall - metadata to include with a packet to send to userspace - * @type: One of %_ODPL_*_NR. - * @key: Becomes %ODP_PACKET_ATTR_KEY. Must be nonnull. - * @userdata: Becomes %ODP_PACKET_ATTR_USERDATA if nonzero. - * @sample_pool: Becomes %ODP_PACKET_ATTR_SAMPLE_POOL if nonzero. - * @actions: Becomes %ODP_PACKET_ATTR_ACTIONS if nonnull. - * @actions_len: Number of bytes in @actions. -*/ + * @cmd: One of %OVS_PACKET_CMD_*. + * @key: Becomes %OVS_PACKET_ATTR_KEY. Must be nonnull. + * @userdata: Is passed to user-space as %OVS_PACKET_ATTR_USERDATA if @cmd is + * %OVS_PACKET_CMD_ACTION. + */ struct dp_upcall_info { - u32 type; + u8 cmd; const struct sw_flow_key *key; u64 userdata; - u32 sample_pool; - const struct nlattr *actions; - u32 actions_len; }; extern struct notifier_block dp_device_notifier; +extern struct genl_multicast_group dp_vport_multicast_group; extern int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd); void dp_process_received_packet(struct vport *, struct sk_buff *); -int dp_detach_port(struct vport *); +void dp_detach_port(struct vport *); int dp_upcall(struct datapath *, struct sk_buff *, const struct dp_upcall_info *); -int dp_min_mtu(const struct datapath *dp); -void set_internal_devs_mtu(const struct datapath *dp); struct datapath *get_dp(int dp_idx); const char *dp_name(const struct datapath *dp); +struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq, + u8 cmd); #endif /* datapath.h */