X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.h;h=d98a9656a990ce162270e0ca57ec061b3ee58927;hb=56fd8edf80b6098289f9ddd94a6a4be3be648472;hp=6ff8d2102878a5672a572ca87d1e657a4f446e7b;hpb=2e7dd8eca88d131112a76301da24709b0472e381;p=sliver-openvswitch.git diff --git a/datapath/datapath.h b/datapath/datapath.h index 6ff8d2102..d98a9656a 100644 --- a/datapath/datapath.h +++ b/datapath/datapath.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * Distributed under the terms of the GNU GPL version 2. * * Significant portions of this file may be copied from parts of the Linux @@ -14,39 +14,87 @@ #include #include #include -#include #include #include #include +#include #include "flow.h" -#include "brc_sysfs.h" +#include "dp_sysfs.h" /* Mask for the priority bits in a vlan header. If we ever merge upstream * then this should go into include/linux/if_vlan.h. */ #define VLAN_PCP_MASK 0xe000 +#define VLAN_PCP_SHIFT 13 -#define DP_MAX_PORTS 256 +#define DP_MAX_PORTS 1024 #define DP_MAX_GROUPS 16 -#define DP_L2_BITS (PAGE_SHIFT - ilog2(sizeof(struct sw_flow*))) +#define DP_L2_BITS (PAGE_SHIFT - ilog2(sizeof(struct dp_bucket*))) #define DP_L2_SIZE (1 << DP_L2_BITS) #define DP_L2_SHIFT 0 -#define DP_L1_BITS (PAGE_SHIFT - ilog2(sizeof(struct sw_flow**))) +#define DP_L1_BITS (PAGE_SHIFT - ilog2(sizeof(struct dp_bucket**))) #define DP_L1_SIZE (1 << DP_L1_BITS) #define DP_L1_SHIFT DP_L2_BITS +/* For 4 kB pages, this is 1,048,576 on 32-bit or 262,144 on 64-bit. */ #define DP_MAX_BUCKETS (DP_L1_SIZE * DP_L2_SIZE) +/** + * struct dp_table - flow table + * @n_buckets: number of buckets (a power of 2 between %DP_L1_SIZE and + * %DP_MAX_BUCKETS) + * @buckets: pointer to @n_buckets/%DP_L1_SIZE pointers to %DP_L1_SIZE pointers + * to buckets + * @hash_seed: random number used for flow hashing, to make the hash + * distribution harder to predict + * @rcu: RCU callback structure + * + * The @buckets array is logically an array of pointers to buckets. It is + * broken into two levels to avoid the need to kmalloc() any object larger than + * a single page or to use vmalloc(). @buckets is always nonnull, as is each + * @buckets[i], but each @buckets[i][j] is nonnull only if the specified hash + * bucket is nonempty (for 0 <= i < @n_buckets/%DP_L1_SIZE, 0 <= j < + * %DP_L1_SIZE). + */ struct dp_table { unsigned int n_buckets; - struct sw_flow ***flows[2]; + struct dp_bucket ***buckets; + unsigned int hash_seed; + struct rcu_head rcu; +}; + +/** + * struct dp_bucket - single bucket within datapath flow table + * @rcu: RCU callback structure + * @n_flows: number of flows in @flows[] array + * @flows: array of @n_flows pointers to flows + * + * The expected number of flows per bucket is 1, but this allows for an + * arbitrary number of collisions. + */ +struct dp_bucket { struct rcu_head rcu; + unsigned int n_flows; + struct sw_flow *flows[]; }; -#define DP_N_QUEUES 2 +#define DP_N_QUEUES 3 #define DP_MAX_QUEUE_LEN 100 +/** + * struct dp_stats_percpu - per-cpu packet processing statistics for a given + * datapath. + * @n_frags: Number of IP fragments processed by datapath. + * @n_hit: Number of received packets for which a matching flow was found in + * the flow table. + * @n_miss: Number of received packets that had no matching flow in the flow + * table. The sum of @n_hit and @n_miss is the number of packets that have + * been received by the datapath. + * @n_lost: Number of received packets that had no matching flow in the flow + * table that could not be sent to userspace (normally due to an overflow in + * one of the datapath's queues). + */ struct dp_stats_percpu { u64 n_frags; u64 n_hit; @@ -60,13 +108,30 @@ struct dp_port_group { u16 ports[]; }; +/** + * struct datapath - datapath for flow-based packet switching + * @mutex: Mutual exclusion for ioctls. + * @dp_idx: Datapath number (index into the dps[] array in datapath.c). + * @ifobj: Represents /sys/class/net//brif. + * @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 (RCU protected). + * @groups: Port groups, used by ODPAT_OUTPUT_GROUP action (RCU protected). + * @n_ports: Number of ports currently in @ports. + * @ports: Map from port number to &struct net_bridge_port. %ODPP_LOCAL port + * always exists, other ports may be %NULL. + * @port_list: List of all ports in @ports in arbitrary order. + * @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. + */ struct datapath { struct mutex mutex; int dp_idx; - -#ifdef SUPPORT_SYSFS struct kobject ifobj; -#endif int drop_frags; @@ -84,20 +149,37 @@ struct datapath { /* Switch ports. */ unsigned int n_ports; struct net_bridge_port *ports[DP_MAX_PORTS]; - struct list_head port_list; /* All ports, including local_port. */ + struct list_head port_list; /* Stats. */ struct dp_stats_percpu *stats_percpu; + + /* sFlow Sampling */ + unsigned int sflow_probability; }; +/** + * struct net_bridge_port - one port within a datapath + * @port_no: Index into @dp's @ports array. + * @dp: Datapath to which this port belongs. + * @dev: The network device attached to this port. The @br_port member in @dev + * points back to this &struct net_bridge_port. + * @kobj: Represents /sys/class/net//brport. + * @linkname: The name of the link from /sys/class/net//brif to this + * &struct net_bridge_port. (We keep this around so that we can delete it + * if @dev 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. + */ struct net_bridge_port { u16 port_no; struct datapath *dp; struct net_device *dev; -#ifdef SUPPORT_SYSFS struct kobject kobj; -#endif - struct list_head node; /* Element in datapath.ports. */ + char linkname[IFNAMSIZ]; + struct list_head node; + atomic_t sflow_pool; }; extern struct notifier_block dp_device_notifier; @@ -107,7 +189,7 @@ extern int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd); struct dp_table *dp_table_create(unsigned int n_buckets); void dp_table_destroy(struct dp_table *, int free_flows); struct sw_flow *dp_table_lookup(struct dp_table *, const struct odp_flow_key *); -struct sw_flow **dp_table_lookup_for_insert(struct dp_table *, const struct odp_flow_key *); +int dp_table_insert(struct dp_table *, struct sw_flow *); int dp_table_delete(struct dp_table *, struct sw_flow *); int dp_table_expand(struct datapath *); int dp_table_flush(struct datapath *); @@ -136,4 +218,6 @@ static inline int skb_checksum_setup(struct sk_buff *skb) } #endif +int vswitch_skb_checksum_setup(struct sk_buff *skb); + #endif /* datapath.h */