X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.h;h=4964a51c6cade04e708ee3ef51e3908aa879cbf5;hb=dfbf7f354416264a0b84b09bf882ac0932e78c8b;hp=e1bdb7b4ce17f621d0fbc67d6608b774244c2185;hpb=dd8d6b8cd4d708553037e306d41d1c501d3cecad;p=openvswitch diff --git a/datapath/datapath.h b/datapath/datapath.h index e1bdb7b4..4964a51c 100644 --- a/datapath/datapath.h +++ b/datapath/datapath.h @@ -1,5 +1,5 @@ /* - * 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 @@ -15,31 +15,24 @@ #include #include #include -#include #include #include #include #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_MASK 0xe000 -#define VLAN_PCP_SHIFT 13 - #define DP_MAX_PORTS 1024 - -#define DP_N_QUEUES 3 -#define DP_MAX_QUEUE_LEN 100 +#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 @@ -50,7 +43,6 @@ struct vport; * one of the datapath's queues). */ struct dp_stats_percpu { - u64 n_frags; u64 n_hit; u64 n_missed; u64 n_lost; @@ -59,78 +51,91 @@ struct dp_stats_percpu { /** * 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. + * @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 (RCU protected). - * @n_ports: Number of ports currently in @ports. - * @ports: Map from port number to &struct vport. %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. %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. - * @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. + * + * 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; + 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. */ - struct tbl *table; + struct flow_table __rcu *table; /* Switch ports. */ - unsigned int n_ports; - struct vport *ports[DP_MAX_PORTS]; + struct vport __rcu *ports[DP_MAX_PORTS]; struct list_head port_list; /* Stats. */ - struct dp_stats_percpu *stats_percpu; - - /* sFlow Sampling */ - unsigned int sflow_probability; + struct dp_stats_percpu __percpu *stats_percpu; }; /** * 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. - * @tun_id: ID (in network byte order) of the tunnel that encapsulated this - * packet. It is 0 if the packet was not received on a tunnel. + * @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 - __be32 tun_id; }; #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); void dp_process_received_packet(struct vport *, struct sk_buff *); -int dp_detach_port(struct vport *); -int dp_output_control(struct datapath *, struct sk_buff *, int, u32 arg); -int dp_min_mtu(const struct datapath *dp); -void set_internal_devs_mtu(const struct datapath *dp); +void dp_detach_port(struct vport *); +int 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, + u8 cmd); #endif /* datapath.h */