/*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 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
#include <linux/kernel.h>
#include <linux/mutex.h>
#include <linux/netdevice.h>
-#include <linux/workqueue.h>
+#include <linux/seqlock.h>
#include <linux/skbuff.h>
#include <linux/version.h>
+
+#include "checksum.h"
+#include "compat.h"
#include "flow.h"
#include "dp_sysfs.h"
+#include "vlan.h"
+
+struct vport;
/* 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_SHIFT 13
#define DP_MAX_PORTS 1024
-#define DP_MAX_GROUPS 16
-
-#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 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 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 3
-#define DP_MAX_QUEUE_LEN 100
/**
* struct dp_stats_percpu - per-cpu packet processing statistics for a given
u64 n_hit;
u64 n_missed;
u64 n_lost;
-};
-
-struct dp_port_group {
- struct rcu_head rcu;
- int n_ports;
- u16 ports[];
+ seqcount_t seqlock;
};
/**
* 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/<devname>/brif.
+ * @rcu: RCU callback head for deferred destruction.
+ * @dp_ifindex: ifindex of local port.
+ * @list_node: Element in global 'dps' list.
+ * @ifobj: Represents /sys/class/net/<devname>/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 (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.
+ * @table: Current flow table. Protected by genl_lock and RCU.
+ * @ports: Map from port number to &struct vport. %ODPP_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.
+ * %ODP_PACKET_CMD_SAMPLE multicast group, 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 mutex mutex;
- int dp_idx;
+ struct rcu_head rcu;
+ int dp_ifindex;
+ 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. */
- unsigned int n_flows;
- struct dp_table *table;
-
- /* Port groups. */
- struct dp_port_group *groups[DP_MAX_GROUPS];
+ struct tbl __rcu *table;
/* Switch ports. */
- unsigned int n_ports;
- struct net_bridge_port *ports[DP_MAX_PORTS];
+ struct vport __rcu *ports[DP_MAX_PORTS];
struct list_head port_list;
/* Stats. */
- struct dp_stats_percpu *stats_percpu;
+ struct dp_stats_percpu __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/<devname>/brport.
- * @linkname: The name of the link from /sys/class/net/<datapath>/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 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.
+ * @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
+ * 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 net_bridge_port {
- u16 port_no;
- struct datapath *dp;
- struct net_device *dev;
- struct kobject kobj;
- char linkname[IFNAMSIZ];
- struct list_head node;
- atomic_t sflow_pool;
+struct ovs_skb_cb {
+ struct vport *vport;
+ struct sw_flow *flow;
+#ifdef NEED_CSUM_NORMALIZE
+ enum csum_type ip_summed;
+#endif
+ __be64 tun_id;
+#ifdef NEED_VLAN_FIELD
+ u16 vlan_tci;
+#endif
+};
+#define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
+
+/**
+ * struct dp_upcall - metadata to include with a packet to send to userspace
+ * @cmd: One of %ODP_PACKET_CMD_*.
+ * @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.
+*/
+struct dp_upcall_info {
+ 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 int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
-/* Flow table. */
-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 *);
-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 *);
-int dp_table_foreach(struct dp_table *table,
- int (*callback)(struct sw_flow *flow, void *aux),
- void *aux);
-
-void dp_process_received_packet(struct sk_buff *, struct net_bridge_port *);
-int dp_del_port(struct net_bridge_port *);
-int dp_output_control(struct datapath *, struct sk_buff *, int, u32 arg);
+void dp_process_received_packet(struct vport *, struct sk_buff *);
+int 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_dp_devs_mtu(const struct datapath *dp, struct net_device *dev);
+void set_internal_devs_mtu(const struct datapath *dp);
struct datapath *get_dp(int dp_idx);
-
-static inline const char *dp_name(const struct datapath *dp)
-{
- return dp->ports[ODPP_LOCAL]->dev->name;
-}
-
-#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID)
-int vswitch_skb_checksum_setup(struct sk_buff *skb);
-#else
-static inline int vswitch_skb_checksum_setup(struct sk_buff *skb)
-{
- return 0;
-}
-#endif
-
-void forward_ip_summed(struct sk_buff *skb);
+const char *dp_name(const struct datapath *dp);
#endif /* datapath.h */
git://git.onelab.eu / sliver-openvswitch.git / blobdiff