X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.h;h=9bc98fb76d5c662fe390253cda1a6b0f0f27feef;hb=85c9de194b9f432f7b8a66bda980cbab52a55b72;hp=8a71391346100ab4e31a99600707024c325bf466;hpb=be07be4dcba9faa181b195cdda0d8ab3761e738d;p=sliver-openvswitch.git diff --git a/datapath/datapath.h b/datapath/datapath.h index 8a7139134..9bc98fb76 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-2012 Nicira, Inc. * - * 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,25 +23,24 @@ #include #include #include -#include #include -#include +#include #include "checksum.h" #include "compat.h" #include "flow.h" -#include "dp_sysfs.h" +#include "tunnel.h" #include "vlan.h" +#include "vport.h" -struct vport; +#define DP_MAX_PORTS USHRT_MAX +#define DP_VPORT_HASH_BUCKETS 1024 -#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 @@ -44,26 +51,22 @@ 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. * @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 - * 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. + * @ports: Hash table for ports. %OVSP_LOCAL port always exists. Protected by + * RTNL and RCU. * @stats_percpu: Per-CPU datapath statistics. + * @net: Reference to net namespace. * * Context: See the comment on locking at the top of datapath.c for additional * locking information. @@ -71,26 +74,27 @@ struct dp_stats_percpu { struct datapath { struct rcu_head rcu; struct list_head list_node; - struct kobject ifobj; - - int drop_frags; /* Flow table. */ struct flow_table __rcu *table; /* Switch ports. */ - struct vport __rcu *ports[DP_MAX_PORTS]; - struct list_head port_list; + struct hlist_head *ports; /* Stats. */ struct dp_stats_percpu __percpu *stats_percpu; + +#ifdef CONFIG_NET_NS + /* Network namespace ref. */ + struct net *net; +#endif }; /** * 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 + * @tun_key: Key for the tunnel that encapsulated this packet. NULL if the + * packet is not being tunneled. * @ip_summed: Consistently stores L4 checksumming status across different * kernel versions. * @csum_start: Stores the offset from which to start checksumming independent @@ -100,9 +104,8 @@ struct datapath { * before 2.6.27. */ struct ovs_skb_cb { - struct vport *vport; struct sw_flow *flow; - __be64 tun_id; + struct ovs_key_ipv4_tunnel *tun_key; #ifdef NEED_CSUM_NORMALIZE enum csum_type ip_summed; u16 csum_start; @@ -117,26 +120,73 @@ 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: Is passed to user-space as %OVS_PACKET_ATTR_USERDATA if @cmd is - * %OVS_PACKET_CMD_ACTION. + * @userdata: If nonnull, its variable-length value is passed to userspace as + * %OVS_PACKET_ATTR_USERDATA. + * @portid: Netlink PID to which packet should be sent. If @portid 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; + const struct nlattr *userdata; + u32 portid; }; -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); +/** + * struct ovs_net - Per net-namespace data for ovs. + * @dps: List of datapaths to enable dumping them all out. + * Protected by genl_mutex. + * @vport_net: Per network namespace data for vport. + */ +struct ovs_net { + struct list_head dps; + struct vport_net vport_net; +}; + +extern int ovs_net_id; + +static inline struct net *ovs_dp_get_net(struct datapath *dp) +{ + return read_pnet(&dp->net); +} + +static inline void ovs_dp_set_net(struct datapath *dp, struct net *net) +{ + write_pnet(&dp->net, net); +} + +struct vport *ovs_lookup_vport(const struct datapath *dp, u16 port_no); + +static inline struct vport *ovs_vport_rcu(const struct datapath *dp, int port_no) +{ + WARN_ON_ONCE(!rcu_read_lock_held()); + return ovs_lookup_vport(dp, port_no); +} + +static inline struct vport *ovs_vport_rtnl_rcu(const struct datapath *dp, int port_no) +{ + WARN_ON_ONCE(!rcu_read_lock_held() && !rtnl_is_locked()); + return ovs_lookup_vport(dp, port_no); +} + +static inline struct vport *ovs_vport_rtnl(const struct datapath *dp, int port_no) +{ + ASSERT_RTNL(); + return ovs_lookup_vport(dp, port_no); +} + +extern struct notifier_block ovs_dp_device_notifier; +extern struct genl_multicast_group ovs_dp_vport_multicast_group; -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); -struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq, +const char *ovs_dp_name(const struct datapath *dp); +struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 portid, u32 seq, u8 cmd); +int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb); #endif /* datapath.h */