Upstream commit:
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: Andy Zhou <[email protected]>
Acked-by: Pravin B Shelar <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Upstream: 4572ef52a00b ("openvswitch: Refactor recirc key allocation.")
Signed-off-by: Andy Zhou <[email protected]>
Acked-by: Joe Stringer <[email protected]>
---
v1->v2: no change
---
datapath/actions.c | 66 +++++++++++++++++++++++++++++++++---------------------
1 file changed, 40 insertions(+), 26 deletions(-)
diff --git a/datapath/actions.c b/datapath/actions.c
index 964d398655f8..f300307b422b 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2015 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
@@ -81,14 +81,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;
@@ -1074,8 +1091,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;
@@ -1099,29 +1116,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;
- }
-
- da = add_deferred_actions(skb, key, NULL, 0);
- if (da) {
- da->pkt_key.recirc_id = nla_get_u32(a);
} else {
- kfree_skb(skb);
-
- if (net_ratelimit())
- pr_warn("%s: deferred action limit reached, drop recirc
action\n",
- ovs_dp_name(dp));
+ da = add_deferred_actions(skb, key, NULL, 0);
+ if (da) {
+ 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;
}
@@ -1311,8 +1325,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;
}
@@ -1323,5 +1337,5 @@ int action_fifos_init(void)
void action_fifos_exit(void)
{
free_percpu(action_fifos);
- free_percpu(recirc_keys);
+ free_percpu(flow_keys);
}
--
1.8.3.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
