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

Commit 4572ef52 authored by andy zhou's avatar andy zhou Committed by David S. Miller
Browse files

openvswitch: Refactor recirc key allocation. 



The logic of allocating and copy key for each 'exec_actions_level'
was specific to execute_recirc(). However, future patches will reuse
as well.  Refactor the logic into its own function clone_key().

Signed-off-by: default avatarAndy Zhou <azhou@ovn.org>
Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47c697aa

net/openvswitch/actions.c

+40 −26
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2007-2014 Nicira, Inc.

 * Copyright (c) 2007-2017 Nicira, Inc.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of version 2 of the GNU General Public
@@ -83,14 +83,31 @@ struct action_fifo { 
	struct deferred_action fifo[DEFERRED_ACTION_FIFO_SIZE];

};



struct recirc_keys {

struct action_flow_keys {

	struct sw_flow_key key[OVS_DEFERRED_ACTION_THRESHOLD];

};



static struct action_fifo __percpu *action_fifos;

static struct recirc_keys __percpu *recirc_keys;

static struct action_flow_keys __percpu *flow_keys;

static DEFINE_PER_CPU(int, exec_actions_level);



/* Make a clone of the 'key', using the pre-allocated percpu 'flow_keys'

 * space. Return NULL if out of key spaces.

 */

static struct sw_flow_key *clone_key(const struct sw_flow_key *key_)

{

	struct action_flow_keys *keys = this_cpu_ptr(flow_keys);

	int level = this_cpu_read(exec_actions_level);

	struct sw_flow_key *key = NULL;



	if (level <= OVS_DEFERRED_ACTION_THRESHOLD) {

		key = &keys->key[level - 1];

		*key = *key_;

	}



	return key;

}



static void action_fifo_init(struct action_fifo *fifo)

{

	fifo->head = 0;
@@ -1090,8 +1107,8 @@ static int execute_recirc(struct datapath *dp, struct sk_buff *skb, 
			  struct sw_flow_key *key,

			  const struct nlattr *a, int rem)

{

	struct sw_flow_key *recirc_key;

	struct deferred_action *da;

	int level;



	if (!is_flow_key_valid(key)) {

		int err;
@@ -1115,29 +1132,26 @@ static int execute_recirc(struct datapath *dp, struct sk_buff *skb, 
			return 0;

	}



	level = this_cpu_read(exec_actions_level);

	if (level <= OVS_DEFERRED_ACTION_THRESHOLD) {

		struct recirc_keys *rks = this_cpu_ptr(recirc_keys);

		struct sw_flow_key *recirc_key = &rks->key[level - 1];



		*recirc_key = *key;

	/* If within the limit of 'OVS_DEFERRED_ACTION_THRESHOLD',

	 * recirc immediately, otherwise, defer it for later execution.

	 */

	recirc_key = clone_key(key);

	if (recirc_key) {

		recirc_key->recirc_id = nla_get_u32(a);

		ovs_dp_process_packet(skb, recirc_key);



		return 0;

	}



	} else {

		da = add_deferred_actions(skb, key, NULL, 0);

		if (da) {

		da->pkt_key.recirc_id = nla_get_u32(a);

			recirc_key = &da->pkt_key;

			recirc_key->recirc_id = nla_get_u32(a);

		} else {

			/* Log an error in case action fifo is full.  */

			kfree_skb(skb);



			if (net_ratelimit())

				pr_warn("%s: deferred action limit reached, drop recirc action\n",

					ovs_dp_name(dp));

		}



	}

	return 0;

}
@@ -1327,8 +1341,8 @@ int action_fifos_init(void) 
	if (!action_fifos)

		return -ENOMEM;



	recirc_keys = alloc_percpu(struct recirc_keys);

	if (!recirc_keys) {

	flow_keys = alloc_percpu(struct action_flow_keys);

	if (!flow_keys) {

		free_percpu(action_fifos);

		return -ENOMEM;

	}
@@ -1339,5 +1353,5 @@ int action_fifos_init(void) 
void action_fifos_exit(void)

{

	free_percpu(action_fifos);

	free_percpu(recirc_keys);

	free_percpu(flow_keys);

}