X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.h;h=3d7ee629dc35e20af43e595d1cb90a114852d9c0;hb=6455100f38e9312346f4d58511595f695d813537;hp=455580f06f4bcf9a50500b9c54eb482b41c48597;hpb=72ca14c15430b1e06b06fa2042dab347c1c7d7df;p=sliver-openvswitch.git diff --git a/datapath/datapath.h b/datapath/datapath.h index 455580f06..3d7ee629d 100644 --- a/datapath/datapath.h +++ b/datapath/datapath.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 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 @@ -14,129 +14,129 @@ #include #include #include -#include #include -#include +#include #include -#include "flow.h" -#include "brc_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 DP_MAX_PORTS 256 -#define DP_MAX_GROUPS 16 - -#define DP_L2_BITS (PAGE_SHIFT - ilog2(sizeof(struct sw_flow*))) -#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_SIZE (1 << DP_L1_BITS) -#define DP_L1_SHIFT DP_L2_BITS - -#define DP_MAX_BUCKETS (DP_L1_SIZE * DP_L2_SIZE) - -struct dp_table { - unsigned int n_buckets; - struct sw_flow ***flows[2]; - struct rcu_head rcu; -}; - -#define DP_N_QUEUES 2 -#define DP_MAX_QUEUE_LEN 100 +#include +#include "checksum.h" +#include "compat.h" +#include "flow.h" +#include "dp_sysfs.h" +#include "vlan.h" + +struct vport; + +#define DP_MAX_PORTS 1024 +#define SAMPLE_ACTION_DEPTH 3 + +/** + * struct dp_stats_percpu - per-cpu packet processing statistics for a given + * 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; u64 n_missed; u64 n_lost; + seqcount_t seqlock; }; -struct dp_port_group { - struct rcu_head rcu; - int n_ports; - u16 ports[]; -}; - +/** + * struct datapath - datapath for flow-based packet switching + * @rcu: RCU callback head for deferred destruction. + * @list_node: Element in global 'dps' list. + * @ifobj: Represents /sys/class/net//brif. Protected by RTNL. + * @n_flows: Number of flows currently in flow table. + * @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. + * + * Context: See the comment on locking at the top of datapath.c for additional + * locking information. + */ struct datapath { - struct mutex mutex; - int dp_idx; - -#ifdef SUPPORT_SYSFS + struct rcu_head rcu; + struct list_head list_node; struct kobject ifobj; -#endif - - 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 flow_table __rcu *table; /* 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 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; }; -struct net_bridge_port { - u16 port_no; - struct datapath *dp; - struct net_device *dev; -#ifdef SUPPORT_SYSFS - struct kobject kobj; +/** + * 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. + * @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 - struct list_head node; /* Element in datapath.ports. */ +}; +#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 %OVS_PACKET_CMD_*. + * @key: Becomes %OVS_PACKET_ATTR_KEY. Must be nonnull. + * @userdata: If nonnull, its u64 value is extracted and passed to userspace as + * %OVS_PACKET_ATTR_USERDATA. + * @pid: Netlink PID to which packet should be sent. If @pid is 0 then no + * packet is sent and the packet is accounted in the datapath's @n_lost + * counter. + */ +struct dp_upcall_info { + u8 cmd; + const struct sw_flow_key *key; + const struct nlattr *userdata; + u32 pid; }; 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); -extern int (*dp_add_dp_hook)(struct datapath *dp); -extern int (*dp_del_dp_hook)(struct datapath *dp); -extern int (*dp_add_if_hook)(struct net_bridge_port *p); -extern int (*dp_del_if_hook)(struct net_bridge_port *p); - -/* 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 *); -struct sw_flow **dp_table_lookup_for_insert(struct dp_table *, const struct odp_flow_key *); -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); -struct datapath *get_dp(int dp_idx); +void dp_process_received_packet(struct vport *, struct sk_buff *); +void dp_detach_port(struct vport *); +int dp_upcall(struct datapath *, struct sk_buff *, + const struct dp_upcall_info *); -static inline const char *dp_name(const struct datapath *dp) -{ - return dp->ports[ODPP_LOCAL]->dev->name; -} - -#ifdef CONFIG_XEN -int skb_checksum_setup(struct sk_buff *skb); -#else -static inline int skb_checksum_setup(struct sk_buff *skb) -{ - return 0; -} -#endif +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 */