[ovs-dev,v3,1/3] ofproto-dpif-sflow: propagate actions within clone

Message ID 20180109185433.23945-2-zoltan.balogh@ericsson.com
State Accepted
Headers show
Series
  • Fix tunnel neighbor cache population
Related show

Commit Message

Zoltan Balogh Jan. 9, 2018, 6:54 p.m.
By avoiding Tx recirculation and embedding tnl_push action within clone,
the tunnel metadata is not propagated when sflow is read. Unless clone
action is handled in the dpif_sflow_read_actions() function as well.
This commit resolves this issue.

In addition, some sflow data needs to be stored and restored in
ofproto-dpif-xlate when native_tunnel_output() is invoked. Otherwise the
output action of underlay bridge is getting counted too when sFlow is set
on the overlay bridge.
Both bugs are connected to sflows and were introduced by the commit in
the "Fixes:" tag below.

Signed-off-by: Zoltan Balogh <zoltan.balogh@ericsson.com>
CC: Sugesh Chandran <sugesh.chandran@intel.com>
Fixes: 7c12dfc527a5 ("tunneling: Avoid datapath-recirc by combining
recirc actions at xlate.")
---
 ofproto/ofproto-dpif-sflow.c  | 16 +++++++++++-----
 ofproto/ofproto-dpif-sflow.h  |  4 ++--
 ofproto/ofproto-dpif-upcall.c |  2 +-
 ofproto/ofproto-dpif-xlate.c  |  7 +++++++
 tests/ofproto-dpif.at         |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

Comments

Ben Pfaff Jan. 23, 2018, 6:40 p.m. | #1
On Tue, Jan 09, 2018 at 07:54:31PM +0100, Zoltan Balogh wrote:
> By avoiding Tx recirculation and embedding tnl_push action within clone,
> the tunnel metadata is not propagated when sflow is read. Unless clone
> action is handled in the dpif_sflow_read_actions() function as well.
> This commit resolves this issue.
> 
> In addition, some sflow data needs to be stored and restored in
> ofproto-dpif-xlate when native_tunnel_output() is invoked. Otherwise the
> output action of underlay bridge is getting counted too when sFlow is set
> on the overlay bridge.
> Both bugs are connected to sflows and were introduced by the commit in
> the "Fixes:" tag below.
> 
> Signed-off-by: Zoltan Balogh <zoltan.balogh@ericsson.com>
> CC: Sugesh Chandran <sugesh.chandran@intel.com>
> Fixes: 7c12dfc527a5 ("tunneling: Avoid datapath-recirc by combining
> recirc actions at xlate.")

Thanks a lot for the fix.

It took me a while to properly understand the commit message, so I
rewrote it a bit:

commit 283d866294b128610acde63027283ce738d97b6c
Author: Zoltan Balogh <zoltan.balogh@ericsson.com>
Date:   Tue Jan 9 19:54:31 2018 +0100

    ofproto-dpif-sflow: Recursively examine actions inside clone.
    
    Until now, dpif_sflow_read_actions() has ignored actions inside clone.
    This means that sflow missed tnl_push actions inside clone, which OVS
    now uses to avoid tx recirculation.  This commit fixes the problem
    by making dpif_sflow_read_actions() recursively process actions inside
    clone.
    
    In addition, some sflow data needs to be stored and restored in
    ofproto-dpif-xlate when native_tunnel_output() is invoked. Otherwise the
    output action of underlay bridge is getting counted too when sFlow is set
    on the overlay bridge.
    
    Both bugs are connected to sflows and were introduced by the commit in
    the "Fixes:" tag below.
    
    Signed-off-by: Zoltan Balogh <zoltan.balogh@ericsson.com>
    CC: Sugesh Chandran <sugesh.chandran@intel.com>
    Fixes: 7c12dfc527a5 ("tunneling: Avoid datapath-recirc by combining recirc actions at xlate.")
    Signed-off-by: Ben Pfaff <blp@ovn.org>

With those changes, I applied this to master and branch-2.9.

Patch

diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
index 2be586998..bef38c382 100644
--- a/ofproto/ofproto-dpif-sflow.c
+++ b/ofproto/ofproto-dpif-sflow.c
@@ -961,7 +961,7 @@  sflow_read_set_action(const struct nlattr *attr,
         } else {
             dpif_sflow_read_actions(NULL,
                                     nl_attr_get(attr), nl_attr_get_size(attr),
-                                    sflow_actions);
+                                    sflow_actions, true);
         }
         break;
     case OVS_KEY_ATTR_PRIORITY:
@@ -1088,8 +1088,9 @@  dpif_sflow_capture_input_mpls(const struct flow *flow,
 
 void
 dpif_sflow_read_actions(const struct flow *flow,
-			const struct nlattr *actions, size_t actions_len,
-			struct dpif_sflow_actions *sflow_actions)
+                        const struct nlattr *actions, size_t actions_len,
+                        struct dpif_sflow_actions *sflow_actions,
+                        bool capture_mpls)
 {
     const struct nlattr *a;
     unsigned int left;
@@ -1099,7 +1100,7 @@  dpif_sflow_read_actions(const struct flow *flow,
 	return;
     }
 
-    if (flow != NULL) {
+    if (flow != NULL && capture_mpls == true) {
 	/* Make sure the MPLS output stack
 	 * is seeded with the input stack.
 	 */
@@ -1197,8 +1198,13 @@  dpif_sflow_read_actions(const struct flow *flow,
 	     * structure to report this.
 	     */
 	    break;
+    case OVS_ACTION_ATTR_CLONE:
+        if (flow != NULL) {
+            dpif_sflow_read_actions(flow, nl_attr_get(a), nl_attr_get_size(a),
+                                    sflow_actions, false);
+        }
+        break;
 	case OVS_ACTION_ATTR_SAMPLE:
-	case OVS_ACTION_ATTR_CLONE:
         case OVS_ACTION_ATTR_PUSH_NSH:
         case OVS_ACTION_ATTR_POP_NSH:
 	case OVS_ACTION_ATTR_UNSPEC:
diff --git a/ofproto/ofproto-dpif-sflow.h b/ofproto/ofproto-dpif-sflow.h
index 014e6cce3..87ed93c6e 100644
--- a/ofproto/ofproto-dpif-sflow.h
+++ b/ofproto/ofproto-dpif-sflow.h
@@ -70,8 +70,8 @@  void dpif_sflow_run(struct dpif_sflow *);
 void dpif_sflow_wait(struct dpif_sflow *);
 
 void dpif_sflow_read_actions(const struct flow *,
-			     const struct nlattr *actions, size_t actions_len,
-			     struct dpif_sflow_actions *);
+                             const struct nlattr *actions, size_t actions_len,
+                             struct dpif_sflow_actions *, bool capture_mpls);
 
 void dpif_sflow_received(struct dpif_sflow *, const struct dp_packet *,
                          const struct flow *, odp_port_t odp_port,
diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c
index 02cf5415b..dc496344f 100644
--- a/ofproto/ofproto-dpif-upcall.c
+++ b/ofproto/ofproto-dpif-upcall.c
@@ -1317,7 +1317,7 @@  dpif_read_actions(struct udpif *udpif, struct upcall *upcall,
 
     switch (type) {
     case SFLOW_UPCALL:
-        dpif_sflow_read_actions(flow, actions, actions_len, upcall_data);
+        dpif_sflow_read_actions(flow, actions, actions_len, upcall_data, true);
         break;
     case FLOW_SAMPLE_UPCALL:
     case IPFIX_UPCALL:
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 4506150b2..2328ec1da 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -3260,6 +3260,9 @@  native_tunnel_output(struct xlate_ctx *ctx, const struct xport *xport,
     char buf_sip6[INET6_ADDRSTRLEN];
     char buf_dip6[INET6_ADDRSTRLEN];
 
+    /* Store sFlow data. */
+    uint32_t sflow_n_outputs = ctx->sflow_n_outputs;
+
     /* Structures to backup Ethernet and IP of base_flow. */
     struct flow old_base_flow;
     struct flow old_flow;
@@ -3411,6 +3414,10 @@  native_tunnel_output(struct xlate_ctx *ctx, const struct xport *xport,
     /* Restore the flows after the translation. */
     memcpy(&ctx->xin->flow, &old_flow, sizeof ctx->xin->flow);
     memcpy(&ctx->base_flow, &old_base_flow, sizeof ctx->base_flow);
+
+    /* Restore sFlow data. */
+    ctx->sflow_n_outputs = sflow_n_outputs;
+
     return 0;
 }
 
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index 9a51a1364..cdf48f4de 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -6286,7 +6286,7 @@  AT_CHECK([ovs-appctl ovs/route/add 1.1.2.92/24 br0], [0], [OK
 AT_CHECK([ovs-ofctl add-flow br0 action=normal])
 
 dnl Prime ARP Cache for 1.1.2.92
-AT_CHECK([ovs-appctl netdev-dummy/receive br0 'recirc_id(0),in_port(100),eth(src=f8:bc:12:44:34:b6,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=1.1.2.92,tip=1.1.2.88,op=2,sha=f8:bc:12:44:34:b6,tha=00:00:00:00:00:00)'])
+AT_CHECK([ovs-appctl netdev-dummy/receive p0 'recirc_id(0),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=1.1.2.92,tip=1.1.2.88,op=2,sha=f8:bc:12:44:34:b6,tha=00:00:00:00:00:00)'])
 
 dnl configure sflow on int-br only
 ovs-vsctl \