sflow: Export LAG, PORTNAME, and OPENFLOWPORT information also.

[cascardo/ovs.git] / ofproto / ofproto-dpif-sflow.c

diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
index ff07e70..60b65a3 100644 (file)
--- a/ofproto/ofproto-dpif-sflow.c
+++ b/ofproto/ofproto-dpif-sflow.c
@@ -32,6 +32,7 @@
 #include "ofproto.h"
 #include "packets.h"
 #include "poll-loop.h"
+#include "ovs-router.h"
 #include "route-table.h"
 #include "sflow_api.h"
 #include "socket-util.h"
@@ -39,6 +40,7 @@
 #include "vlog.h"
 #include "lib/odp-util.h"
 #include "ofproto-provider.h"
+#include "lacp.h"
 
 VLOG_DEFINE_THIS_MODULE(sflow);
 
@@ -165,12 +167,14 @@ sflow_agent_get_counters(void *ds_, SFLPoller *poller,
     OVS_REQUIRES(mutex)
 {
     struct dpif_sflow *ds = ds_;
-    SFLCounters_sample_element elem;
+    SFLCounters_sample_element elem, lacp_elem, of_elem, name_elem;
     enum netdev_features current;
     struct dpif_sflow_port *dsp;
     SFLIf_counters *counters;
     struct netdev_stats stats;
     enum netdev_flags flags;
+    struct lacp_slave_stats lacp_stats;
+    const char *ifName;
 
     dsp = dpif_sflow_find_port(ds, u32_to_odp(poller->bridgePort));
     if (!dsp) {
@@ -222,6 +226,59 @@ sflow_agent_get_counters(void *ds_, SFLPoller *poller,
     counters->ifPromiscuousMode = 0;
 
     SFLADD_ELEMENT(cs, &elem);
+
+    /* Include LACP counters and identifiers if this port is part of a LAG. */
+    if (ofproto_port_get_lacp_stats(dsp->ofport, &lacp_stats) == 0) {
+       memset(&lacp_elem, 0, sizeof lacp_elem);
+       lacp_elem.tag = SFLCOUNTERS_LACP;
+       memcpy(&lacp_elem.counterBlock.lacp.actorSystemID,
+              lacp_stats.dot3adAggPortActorSystemID,
+              ETH_ADDR_LEN);
+       memcpy(&lacp_elem.counterBlock.lacp.partnerSystemID,
+              lacp_stats.dot3adAggPortPartnerOperSystemID,
+              ETH_ADDR_LEN);
+       lacp_elem.counterBlock.lacp.attachedAggID =
+           lacp_stats.dot3adAggPortAttachedAggID;
+       lacp_elem.counterBlock.lacp.portState.v.actorAdmin =
+           lacp_stats.dot3adAggPortActorAdminState;
+       lacp_elem.counterBlock.lacp.portState.v.actorOper =
+           lacp_stats.dot3adAggPortActorOperState;
+       lacp_elem.counterBlock.lacp.portState.v.partnerAdmin =
+           lacp_stats.dot3adAggPortPartnerAdminState;
+       lacp_elem.counterBlock.lacp.portState.v.partnerOper =
+           lacp_stats.dot3adAggPortPartnerOperState;
+       lacp_elem.counterBlock.lacp.LACPDUsRx =
+           lacp_stats.dot3adAggPortStatsLACPDUsRx;
+       SFL_UNDEF_COUNTER(lacp_elem.counterBlock.lacp.markerPDUsRx);
+       SFL_UNDEF_COUNTER(lacp_elem.counterBlock.lacp.markerResponsePDUsRx);
+       SFL_UNDEF_COUNTER(lacp_elem.counterBlock.lacp.unknownRx);
+       lacp_elem.counterBlock.lacp.illegalRx =
+           lacp_stats.dot3adAggPortStatsIllegalRx;
+       lacp_elem.counterBlock.lacp.LACPDUsTx =
+           lacp_stats.dot3adAggPortStatsLACPDUsTx;
+       SFL_UNDEF_COUNTER(lacp_elem.counterBlock.lacp.markerPDUsTx);
+       SFL_UNDEF_COUNTER(lacp_elem.counterBlock.lacp.markerResponsePDUsTx);
+       SFLADD_ELEMENT(cs, &lacp_elem);
+    }
+
+    /* Include Port name. */
+    if ((ifName = netdev_get_name(dsp->ofport->netdev)) != NULL) {
+       memset(&name_elem, 0, sizeof name_elem);
+       name_elem.tag = SFLCOUNTERS_PORTNAME;
+       name_elem.counterBlock.portName.portName.str = (char *)ifName;
+       name_elem.counterBlock.portName.portName.len = strlen(ifName);
+       SFLADD_ELEMENT(cs, &name_elem);
+    }
+
+    /* Include OpenFlow DPID and openflow port number. */
+    memset(&of_elem, 0, sizeof of_elem);
+    of_elem.tag = SFLCOUNTERS_OPENFLOWPORT;
+    of_elem.counterBlock.ofPort.datapath_id =
+       ofproto_get_datapath_id(dsp->ofport->ofproto);
+    of_elem.counterBlock.ofPort.port_no =
+      (OVS_FORCE uint32_t)dsp->ofport->ofp_port;
+    SFLADD_ELEMENT(cs, &of_elem);
+
     sfl_poller_writeCountersSample(poller, cs);
 }
 
@@ -253,13 +310,17 @@ sflow_choose_agent_address(const char *agent_device,
     }
 
     SSET_FOR_EACH (target, targets) {
-        struct sockaddr_storage ss;
+        union {
+            struct sockaddr_storage ss;
+            struct sockaddr_in sin;
+        } sa;
         char name[IFNAMSIZ];
 
-        if (inet_parse_active(target, SFL_DEFAULT_COLLECTOR_PORT, &ss)
-            && ss.ss_family == AF_INET) {
-            struct sockaddr_in *sin = (struct sockaddr_in *) &ss;
-            if (route_table_get_name(sin->sin_addr.s_addr, name)
+        if (inet_parse_active(target, SFL_DEFAULT_COLLECTOR_PORT, &sa.ss)
+            && sa.ss.ss_family == AF_INET) {
+            ovs_be32 gw;
+
+            if (ovs_router_lookup(sa.sin.sin_addr.s_addr, name, &gw)
                 && !netdev_get_in4_by_name(name, &in4)) {
                 goto success;
             }
@@ -361,7 +422,7 @@ dpif_sflow_get_probability(const struct dpif_sflow *ds) OVS_EXCLUDED(mutex)
 void
 dpif_sflow_unref(struct dpif_sflow *ds) OVS_EXCLUDED(mutex)
 {
-    if (ds && ovs_refcount_unref(&ds->ref_cnt) == 1) {
+    if (ds && ovs_refcount_unref_relaxed(&ds->ref_cnt) == 1) {
         struct dpif_sflow_port *dsp, *next;
 
         route_table_unregister();
@@ -370,7 +431,6 @@ dpif_sflow_unref(struct dpif_sflow *ds) OVS_EXCLUDED(mutex)
             dpif_sflow_del_port__(ds, dsp);
         }
         hmap_destroy(&ds->ports);
-        ovs_refcount_destroy(&ds->ref_cnt);
         free(ds);
     }
 }
@@ -562,7 +622,7 @@ dpif_sflow_odp_port_to_ifindex(const struct dpif_sflow *ds,
 }
 
 void
-dpif_sflow_received(struct dpif_sflow *ds, struct ofpbuf *packet,
+dpif_sflow_received(struct dpif_sflow *ds, const struct ofpbuf *packet,
                     const struct flow *flow, odp_port_t odp_in_port,
                     const union user_action_cookie *cookie)
     OVS_EXCLUDED(mutex)
@@ -603,12 +663,12 @@ dpif_sflow_received(struct dpif_sflow *ds, struct ofpbuf *packet,
     header->header_protocol = SFLHEADER_ETHERNET_ISO8023;
     /* The frame_length should include the Ethernet FCS (4 bytes),
      * but it has already been stripped,  so we need to add 4 here. */
-    header->frame_length = packet->size + 4;
+    header->frame_length = ofpbuf_size(packet) + 4;
     /* Ethernet FCS stripped off. */
     header->stripped = 4;
-    header->header_length = MIN(packet->size,
+    header->header_length = MIN(ofpbuf_size(packet),
                                 sampler->sFlowFsMaximumHeaderSize);
-    header->header_bytes = packet->data;
+    header->header_bytes = ofpbuf_data(packet);
 
     /* Add extended switch element. */
     memset(&switchElem, 0, sizeof(switchElem));