X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.h;h=27151b9cb04a3b0392317ce7d3f2a053bc49aab8;hb=3fd10fed12165ecb635f71dc9a632fe753a64ae5;hp=ff8ac104d7aca6f15ad9c2c0d5882819be40d633;hpb=9197df76b46ff6fbe1f7a522961730ffc55a860d;p=sliver-openvswitch.git diff --git a/datapath/datapath.h b/datapath/datapath.h index ff8ac104d..27151b9cb 100644 --- a/datapath/datapath.h +++ b/datapath/datapath.h @@ -1,13 +1,21 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. - * Distributed under the terms of the GNU GPL version 2. + * Copyright (c) 2007-2011 Nicira Networks. * - * Significant portions of this file may be copied from parts of the Linux - * kernel, by Linus Torvalds and others. + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA */ -/* Interface exported by openvswitch_mod. */ - #ifndef DATAPATH_H #define DATAPATH_H 1 @@ -15,8 +23,8 @@ #include #include #include -#include #include +#include #include #include "checksum.h" @@ -27,17 +35,12 @@ 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_MASK 0xe000 -#define VLAN_PCP_SHIFT 13 - #define DP_MAX_PORTS 1024 +#define SAMPLE_ACTION_DEPTH 3 /** * 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 @@ -48,20 +51,17 @@ struct vport; * 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 u64_stats_sync sync; }; /** * struct datapath - datapath for flow-based packet switching * @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//brif. Protected by RTNL. - * @drop_frags: Drop all IP fragments if nonzero. * @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 @@ -69,21 +69,15 @@ struct dp_stats_percpu { * @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 - * %OVS_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 rcu_head rcu; - int dp_ifindex; struct list_head list_node; struct kobject ifobj; - int drop_frags; - /* Flow table. */ struct flow_table __rcu *table; @@ -93,14 +87,10 @@ 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 @@ -112,7 +102,6 @@ struct datapath { * before 2.6.27. */ struct ovs_skb_cb { - struct vport *vport; struct sw_flow *flow; __be64 tun_id; #ifdef NEED_CSUM_NORMALIZE @@ -129,31 +118,31 @@ struct ovs_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: Becomes %OVS_PACKET_ATTR_USERDATA if nonzero. - * @sample_pool: Becomes %OVS_PACKET_ATTR_SAMPLE_POOL if nonzero. - * @actions: Becomes %OVS_PACKET_ATTR_ACTIONS if nonnull. - * @actions_len: Number of bytes in @actions. -*/ + * @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; - u64 userdata; - u32 sample_pool; - const struct nlattr *actions; - u32 actions_len; + 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 struct notifier_block ovs_dp_device_notifier; +extern struct genl_multicast_group ovs_dp_vport_multicast_group; +extern int (*ovs_dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd); -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 *); +void ovs_dp_process_received_packet(struct vport *, struct sk_buff *); +void ovs_dp_detach_port(struct vport *); +int ovs_dp_upcall(struct datapath *, struct sk_buff *, + const struct dp_upcall_info *); -struct datapath *get_dp(int dp_idx); -const char *dp_name(const struct datapath *dp); +const char *ovs_dp_name(const struct datapath *dp); struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq, u8 cmd); +int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb); #endif /* datapath.h */