* [net-next v2] openvswitch: Simplify do_execute_actions().
@ 2017-01-27 21:45 Andy Zhou
2017-01-28 5:35 ` Pravin Shelar
2017-01-30 0:00 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Andy Zhou @ 2017-01-27 21:45 UTC (permalink / raw)
To: davem; +Cc: netdev, Andy Zhou
do_execute_actions() implements a worthwhile optimization: in case
an output action is the last action in an action list, skb_clone()
can be avoided by outputing the current skb. However, the
implementation is more complicated than necessary. This patch
simplify this logic.
Signed-off-by: Andy Zhou <azhou@ovn.org>
---
v1->v2: drop skb NULL check in do_output()
---
net/openvswitch/actions.c | 42 ++++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 514f7bc..efa9a88 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -1141,12 +1141,6 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
struct sw_flow_key *key,
const struct nlattr *attr, int len)
{
- /* Every output action needs a separate clone of 'skb', but the common
- * case is just a single output action, so that doing a clone and
- * then freeing the original skbuff is wasteful. So the following code
- * is slightly obscure just to avoid that.
- */
- int prev_port = -1;
const struct nlattr *a;
int rem;
@@ -1154,20 +1148,28 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
a = nla_next(a, &rem)) {
int err = 0;
- if (unlikely(prev_port != -1)) {
- struct sk_buff *out_skb = skb_clone(skb, GFP_ATOMIC);
-
- if (out_skb)
- do_output(dp, out_skb, prev_port, key);
+ switch (nla_type(a)) {
+ case OVS_ACTION_ATTR_OUTPUT: {
+ int port = nla_get_u32(a);
+ struct sk_buff *clone;
+
+ /* Every output action needs a separate clone
+ * of 'skb', In case the output action is the
+ * last action, cloning can be avoided.
+ */
+ if (nla_is_last(a, rem)) {
+ do_output(dp, skb, port, key);
+ /* 'skb' has been used for output.
+ */
+ return 0;
+ }
+ clone = skb_clone(skb, GFP_ATOMIC);
+ if (clone)
+ do_output(dp, clone, port, key);
OVS_CB(skb)->cutlen = 0;
- prev_port = -1;
- }
-
- switch (nla_type(a)) {
- case OVS_ACTION_ATTR_OUTPUT:
- prev_port = nla_get_u32(a);
break;
+ }
case OVS_ACTION_ATTR_TRUNC: {
struct ovs_action_trunc *trunc = nla_data(a);
@@ -1257,11 +1259,7 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
}
}
- if (prev_port != -1)
- do_output(dp, skb, prev_port, key);
- else
- consume_skb(skb);
-
+ consume_skb(skb);
return 0;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [net-next v2] openvswitch: Simplify do_execute_actions().
2017-01-27 21:45 [net-next v2] openvswitch: Simplify do_execute_actions() Andy Zhou
@ 2017-01-28 5:35 ` Pravin Shelar
2017-01-30 0:00 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Pravin Shelar @ 2017-01-28 5:35 UTC (permalink / raw)
To: Andy Zhou; +Cc: David S. Miller, Linux Kernel Network Developers
On Fri, Jan 27, 2017 at 1:45 PM, Andy Zhou <azhou@ovn.org> wrote:
> do_execute_actions() implements a worthwhile optimization: in case
> an output action is the last action in an action list, skb_clone()
> can be avoided by outputing the current skb. However, the
> implementation is more complicated than necessary. This patch
> simplify this logic.
>
> Signed-off-by: Andy Zhou <azhou@ovn.org>
> ---
> v1->v2: drop skb NULL check in do_output()
>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [net-next v2] openvswitch: Simplify do_execute_actions().
2017-01-27 21:45 [net-next v2] openvswitch: Simplify do_execute_actions() Andy Zhou
2017-01-28 5:35 ` Pravin Shelar
@ 2017-01-30 0:00 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-01-30 0:00 UTC (permalink / raw)
To: azhou; +Cc: netdev
From: Andy Zhou <azhou@ovn.org>
Date: Fri, 27 Jan 2017 13:45:28 -0800
> do_execute_actions() implements a worthwhile optimization: in case
> an output action is the last action in an action list, skb_clone()
> can be avoided by outputing the current skb. However, the
> implementation is more complicated than necessary. This patch
> simplify this logic.
>
> Signed-off-by: Andy Zhou <azhou@ovn.org>
> ---
> v1->v2: drop skb NULL check in do_output()
Applied, thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-30 0:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-27 21:45 [net-next v2] openvswitch: Simplify do_execute_actions() Andy Zhou
2017-01-28 5:35 ` Pravin Shelar
2017-01-30 0:00 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.