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

Commit d98612b8 authored by Lorand Jakab's avatar Lorand Jakab Committed by Pravin B Shelar
Browse files

openvswitch: Remove flow member from struct ovs_skb_cb 



The 'flow' memeber was chosen for removal because it's only used
in ovs_execute_actions() we can pass it as argument to this
function.

Signed-off-by: default avatarLorand Jakab <lojakab@cisco.com>
Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
parent 1a4e96a0

net/openvswitch/actions.c

+1 −4
Original line number Diff line number Diff line
@@ -865,14 +865,11 @@ static void process_deferred_actions(struct datapath *dp) 


/* Execute a list of actions against 'skb'. */

int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb,

			struct sw_flow_key *key)

			struct sw_flow_actions *acts, struct sw_flow_key *key)

{

	int level = this_cpu_read(exec_actions_level);

	struct sw_flow_actions *acts;

	int err;



	acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);



	this_cpu_inc(exec_actions_level);

	OVS_CB(skb)->egress_tun_info = NULL;

	err = do_execute_actions(dp, skb, key,

net/openvswitch/datapath.c

+7 −5
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key) 
	const struct vport *p = OVS_CB(skb)->input_vport;

	struct datapath *dp = p->dp;

	struct sw_flow *flow;

	struct sw_flow_actions *sf_acts;

	struct dp_stats_percpu *stats;

	u64 *stats_counter;

	u32 n_mask_hit;
@@ -282,10 +283,10 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key) 
		goto out;

	}



	OVS_CB(skb)->flow = flow;

	ovs_flow_stats_update(flow, key->tp.flags, skb);

	sf_acts = rcu_dereference(flow->sf_acts);

	ovs_execute_actions(dp, skb, sf_acts, key);



	ovs_flow_stats_update(OVS_CB(skb)->flow, key->tp.flags, skb);

	ovs_execute_actions(dp, skb, key);

	stats_counter = &stats->n_hit;



out:
@@ -524,6 +525,7 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) 
	struct sw_flow_actions *acts;

	struct sk_buff *packet;

	struct sw_flow *flow;

	struct sw_flow_actions *sf_acts;

	struct datapath *dp;

	struct ethhdr *eth;

	struct vport *input_vport;
@@ -579,7 +581,6 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) 
	rcu_assign_pointer(flow->sf_acts, acts);



	OVS_CB(packet)->egress_tun_info = NULL;

	OVS_CB(packet)->flow = flow;

	packet->priority = flow->key.phy.priority;

	packet->mark = flow->key.phy.skb_mark;
@@ -597,9 +598,10 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) 
		goto err_unlock;



	OVS_CB(packet)->input_vport = input_vport;

	sf_acts = rcu_dereference(flow->sf_acts);



	local_bh_disable();

	err = ovs_execute_actions(dp, packet, &flow->key);

	err = ovs_execute_actions(dp, packet, sf_acts, &flow->key);

	local_bh_enable();

	rcu_read_unlock();

net/openvswitch/datapath.h

+1 −3
Original line number Diff line number Diff line
@@ -94,14 +94,12 @@ struct datapath { 


/**

 * struct ovs_skb_cb - OVS data in skb CB

 * @flow: The flow associated with this packet.  May be %NULL if no flow.

 * @egress_tun_key: Tunnel information about this packet on egress path.

 * NULL if the packet is not being tunneled.

 * @input_vport: The original vport packet came in on. This value is cached

 * when a packet is received by OVS.

 */

struct ovs_skb_cb {

	struct sw_flow		*flow;

	struct ovs_tunnel_info  *egress_tun_info;

	struct vport		*input_vport;

};
@@ -194,7 +192,7 @@ 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,

			struct sw_flow_key *);

			struct sw_flow_actions *acts, struct sw_flow_key *);



void ovs_dp_notify_wq(struct work_struct *work);