Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fcf018a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch 



Jesse Gross says:

====================
Open vSwitch

A set of updates for net-next/3.13. Major changes are:
 * Restructure flow handling code to be more logically organized and
   easier to read.
 * Rehashing of the flow table is moved from a workqueue to flow
   installation time. Before, heavy load could block the workqueue for
   excessive periods of time.
 * Additional debugging information is provided to help diagnose megaflows.
 * It's now possible to match on TCP flags.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5a6e55c4 8ddd0946

include/uapi/linux/openvswitch.h

+15 −3
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ enum ovs_datapath_cmd { 
 * not be sent.

 * @OVS_DP_ATTR_STATS: Statistics about packets that have passed through the

 * datapath.  Always present in notifications.

 * @OVS_DP_ATTR_MEGAFLOW_STATS: Statistics about mega flow masks usage for the

 * datapath. Always present in notifications.

 *

 * These attributes follow the &struct ovs_header within the Generic Netlink

 * payload for %OVS_DP_* commands.
@@ -72,6 +74,7 @@ enum ovs_datapath_attr { 
	OVS_DP_ATTR_NAME,		/* name of dp_ifindex netdev */

	OVS_DP_ATTR_UPCALL_PID,		/* Netlink PID to receive upcalls */

	OVS_DP_ATTR_STATS,		/* struct ovs_dp_stats */

	OVS_DP_ATTR_MEGAFLOW_STATS,	/* struct ovs_dp_megaflow_stats */

	__OVS_DP_ATTR_MAX

};
@@ -84,6 +87,14 @@ struct ovs_dp_stats { 
	__u64 n_flows;           /* Number of flows present */

};



struct ovs_dp_megaflow_stats {

	__u64 n_mask_hit;	 /* Number of masks used for flow lookups. */

	__u32 n_masks;		 /* Number of masks for the datapath. */

	__u32 pad0;		 /* Pad for future expension. */

	__u64 pad1;		 /* Pad for future expension. */

	__u64 pad2;		 /* Pad for future expension. */

};



struct ovs_vport_stats {

	__u64   rx_packets;		/* total packets received       */

	__u64   tx_packets;		/* total packets transmitted    */
@@ -260,6 +271,7 @@ enum ovs_key_attr { 
	OVS_KEY_ATTR_SKB_MARK,  /* u32 skb mark */

	OVS_KEY_ATTR_TUNNEL,    /* Nested set of ovs_tunnel attributes */

	OVS_KEY_ATTR_SCTP,      /* struct ovs_key_sctp */

	OVS_KEY_ATTR_TCP_FLAGS,	/* be16 TCP flags. */



#ifdef __KERNEL__

	OVS_KEY_ATTR_IPV4_TUNNEL,  /* struct ovs_key_ipv4_tunnel */

net/openvswitch/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ openvswitch-y := \ 
	datapath.o \

	dp_notify.o \

	flow.o \

	flow_netlink.o \

	flow_table.o \

	vport.o \

	vport-internal_dev.o \

	vport-netdev.o

net/openvswitch/datapath.c

+70 −598

File changed.

Preview size limit exceeded, changes collapsed.

net/openvswitch/datapath.h

+7 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/u64_stats_sync.h>



#include "flow.h"

#include "flow_table.h"

#include "vport.h"



#define DP_MAX_PORTS           USHRT_MAX
@@ -45,11 +46,15 @@ 
 * @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).

 * @n_mask_hit: Number of masks looked up for flow match.

 *   @n_mask_hit / (@n_hit + @n_missed)  will be the average masks looked

 *   up per packet.

 */

struct dp_stats_percpu {

	u64 n_hit;

	u64 n_missed;

	u64 n_lost;

	u64 n_mask_hit;

	struct u64_stats_sync sync;

};
@@ -57,7 +62,7 @@ struct dp_stats_percpu { 
 * struct datapath - datapath for flow-based packet switching

 * @rcu: RCU callback head for deferred destruction.

 * @list_node: Element in global 'dps' list.

 * @table: Current flow table.  Protected by ovs_mutex and RCU.

 * @table: flow table.

 * @ports: Hash table for ports.  %OVSP_LOCAL port always exists.  Protected by

 * ovs_mutex and RCU.

 * @stats_percpu: Per-CPU datapath statistics.
@@ -71,7 +76,7 @@ struct datapath { 
	struct list_head list_node;



	/* Flow table. */

	struct flow_table __rcu *table;

	struct flow_table table;



	/* Switch ports. */

	struct hlist_head *ports;

net/openvswitch/flow.c

+24 −1581

File changed.

Preview size limit exceeded, changes collapsed.