X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=ofproto%2Fofproto-sflow.c;h=784e5528f85472abea96585eeba427c08ff3553f;hb=27bcf966b4057623f7b4d856c0348a1e0eb452e0;hp=5488724e0c7c56adca5a846be35fdd72d85ec883;hpb=c62caaa3f4132eba085c8ba15577b62195642711;p=sliver-openvswitch.git diff --git a/ofproto/ofproto-sflow.c b/ofproto/ofproto-sflow.c index 5488724e0..784e5528f 100644 --- a/ofproto/ofproto-sflow.c +++ b/ofproto/ofproto-sflow.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2009, 2010 InMon Corp. - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009 InMon Corp. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,21 +22,25 @@ #include "collectors.h" #include "dpif.h" #include "compiler.h" +#include "hash.h" +#include "hmap.h" #include "netdev.h" #include "ofpbuf.h" #include "ofproto.h" +#include "packets.h" #include "poll-loop.h" -#include "port-array.h" #include "sflow_api.h" #include "socket-util.h" #include "timeval.h" - -#define THIS_MODULE VLM_sflow #include "vlog.h" +VLOG_DEFINE_THIS_MODULE(sflow) + struct ofproto_sflow_port { + struct hmap_node hmap_node; /* In struct ofproto_sflow's "ports" hmap. */ struct netdev *netdev; /* Underlying network device, for stats. */ SFLDataSource_instance dsi; /* sFlow library's notion of port number. */ + uint16_t odp_port; /* ODP port number. */ }; struct ofproto_sflow { @@ -47,9 +51,12 @@ struct ofproto_sflow { struct dpif *dpif; time_t next_tick; size_t n_flood, n_all; - struct port_array ports; /* Indexed by ODP port number. */ + struct hmap ports; /* Contains "struct ofproto_sflow_port"s. */ }; +static void ofproto_sflow_del_port__(struct ofproto_sflow *, + struct ofproto_sflow_port *); + #define RECEIVER_INDEX 1 static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); @@ -129,6 +136,20 @@ sflow_agent_send_packet_cb(void *os_, SFLAgent *agent OVS_UNUSED, collectors_send(os->collectors, pkt, pktLen); } +static struct ofproto_sflow_port * +ofproto_sflow_find_port(const struct ofproto_sflow *os, uint16_t odp_port) +{ + struct ofproto_sflow_port *osp; + + HMAP_FOR_EACH_IN_BUCKET (osp, hmap_node, + hash_int(odp_port, 0), &os->ports) { + if (osp->odp_port == odp_port) { + return osp; + } + } + return NULL; +} + static void sflow_agent_get_counters(void *os_, SFLPoller *poller, SFL_COUNTERS_SAMPLE_TYPE *cs) @@ -141,7 +162,7 @@ sflow_agent_get_counters(void *os_, SFLPoller *poller, enum netdev_flags flags; uint32_t current; - osp = port_array_get(&os->ports, poller->bridgePort); + osp = ofproto_sflow_find_port(os, poller->bridgePort); if (!osp) { return; } @@ -239,9 +260,6 @@ success: void ofproto_sflow_clear(struct ofproto_sflow *os) { - struct ofproto_sflow_port *osp; - unsigned int odp_port; - if (os->sflow_agent) { sfl_agent_release(os->sflow_agent); os->sflow_agent = NULL; @@ -251,11 +269,6 @@ ofproto_sflow_clear(struct ofproto_sflow *os) ofproto_sflow_options_destroy(os->options); os->options = NULL; - PORT_ARRAY_FOR_EACH (osp, &os->ports, odp_port) { - ofproto_sflow_del_port(os, odp_port); - } - port_array_clear(&os->ports); - /* Turn off sampling to save CPU cycles. */ dpif_set_sflow_probability(os->dpif, 0); } @@ -274,7 +287,7 @@ ofproto_sflow_create(struct dpif *dpif) os = xcalloc(1, sizeof *os); os->dpif = dpif; os->next_tick = time_now() + 1; - port_array_init(&os->ports); + hmap_init(&os->ports); return os; } @@ -282,8 +295,13 @@ void ofproto_sflow_destroy(struct ofproto_sflow *os) { if (os) { + struct ofproto_sflow_port *osp, *next; + ofproto_sflow_clear(os); - port_array_destroy(&os->ports); + HMAP_FOR_EACH_SAFE (osp, next, hmap_node, &os->ports) { + ofproto_sflow_del_port__(os, osp); + } + hmap_destroy(&os->ports); free(os); } } @@ -301,12 +319,11 @@ ofproto_sflow_add_poller(struct ofproto_sflow *os, static void ofproto_sflow_add_sampler(struct ofproto_sflow *os, - struct ofproto_sflow_port *osp, - u_int32_t sampling_rate, u_int32_t header_len) + struct ofproto_sflow_port *osp) { SFLSampler *sampler = sfl_agent_addSampler(os->sflow_agent, &osp->dsi); - sfl_sampler_set_sFlowFsPacketSamplingRate(sampler, sampling_rate); - sfl_sampler_set_sFlowFsMaximumHeaderSize(sampler, header_len); + sfl_sampler_set_sFlowFsPacketSamplingRate(sampler, os->options->sampling_rate); + sfl_sampler_set_sFlowFsMaximumHeaderSize(sampler, os->options->header_len); sfl_sampler_set_sFlowFsReceiver(sampler, RECEIVER_INDEX); } @@ -337,26 +354,35 @@ ofproto_sflow_add_port(struct ofproto_sflow *os, uint16_t odp_port, ifindex = (os->sflow_agent->subId << 16) + odp_port; } SFL_DS_SET(osp->dsi, 0, ifindex, 0); - port_array_set(&os->ports, odp_port, osp); + osp->odp_port = odp_port; + hmap_insert(&os->ports, &osp->hmap_node, hash_int(odp_port, 0)); - /* Add poller. */ + /* Add poller and sampler. */ if (os->sflow_agent) { ofproto_sflow_add_poller(os, osp, odp_port); + ofproto_sflow_add_sampler(os, osp); } } +static void +ofproto_sflow_del_port__(struct ofproto_sflow *os, + struct ofproto_sflow_port *osp) +{ + if (os->sflow_agent) { + sfl_agent_removePoller(os->sflow_agent, &osp->dsi); + sfl_agent_removeSampler(os->sflow_agent, &osp->dsi); + } + netdev_close(osp->netdev); + hmap_remove(&os->ports, &osp->hmap_node); + free(osp); +} + void ofproto_sflow_del_port(struct ofproto_sflow *os, uint16_t odp_port) { - struct ofproto_sflow_port *osp = port_array_get(&os->ports, odp_port); + struct ofproto_sflow_port *osp = ofproto_sflow_find_port(os, odp_port); if (osp) { - if (os->sflow_agent) { - sfl_agent_removePoller(os->sflow_agent, &osp->dsi); - sfl_agent_removeSampler(os->sflow_agent, &osp->dsi); - } - netdev_close(osp->netdev); - free(osp); - port_array_set(&os->ports, odp_port, NULL); + ofproto_sflow_del_port__(os, osp); } } @@ -367,7 +393,6 @@ ofproto_sflow_set_options(struct ofproto_sflow *os, struct ofproto_sflow_port *osp; bool options_changed; SFLReceiver *receiver; - unsigned int odp_port; SFLAddress agentIP; time_t now; @@ -417,7 +442,7 @@ ofproto_sflow_set_options(struct ofproto_sflow *os, sfl_agent_release(os->sflow_agent); } os->sflow_agent = xcalloc(1, sizeof *os->sflow_agent); - now = time_now(); + now = time_wall(); sfl_agent_init(os->sflow_agent, &agentIP, options->sub_id, @@ -438,9 +463,9 @@ ofproto_sflow_set_options(struct ofproto_sflow *os, MAX(1, UINT32_MAX / options->sampling_rate)); /* Add samplers and pollers for the currently known ports. */ - PORT_ARRAY_FOR_EACH (osp, &os->ports, odp_port) { - ofproto_sflow_add_sampler(os, osp, - options->sampling_rate, options->header_len); + HMAP_FOR_EACH (osp, hmap_node, &os->ports) { + ofproto_sflow_add_poller(os, osp, osp->odp_port); + ofproto_sflow_add_sampler(os, osp); } } @@ -448,7 +473,7 @@ static int ofproto_sflow_odp_port_to_ifindex(const struct ofproto_sflow *os, uint16_t odp_port) { - struct ofproto_sflow_port *osp = port_array_get(&os->ports, odp_port); + struct ofproto_sflow_port *osp = ofproto_sflow_find_port(os, odp_port); return osp ? SFL_DS_INDEX(osp->dsi) : 0; } @@ -464,8 +489,8 @@ ofproto_sflow_received(struct ofproto_sflow *os, struct odp_msg *msg) const union odp_action *actions; struct ofpbuf payload; size_t n_actions, n_outputs; + struct flow flow; size_t min_size; - flow_t flow; size_t i; /* Get odp_sflow_sample_header. */ @@ -533,13 +558,16 @@ ofproto_sflow_received(struct ofproto_sflow *os, struct odp_msg *msg) switchElem.tag = SFLFLOW_EX_SWITCH; switchElem.flowType.sw.src_vlan = ntohs(flow.dl_vlan); switchElem.flowType.sw.src_priority = -1; /* XXX */ - switchElem.flowType.sw.dst_vlan = -1; /* Filled in correctly below. */ + /* Initialize the output VLAN and priority to be the same as the input, + but these fields can be overriden below if affected by an action. */ + switchElem.flowType.sw.dst_vlan = switchElem.flowType.sw.src_vlan; switchElem.flowType.sw.dst_priority = switchElem.flowType.sw.src_priority; /* Figure out the output ports. */ n_outputs = 0; for (i = 0; i < n_actions; i++) { const union odp_action *a = &actions[i]; + uint16_t tci; switch (a->type) { case ODPAT_OUTPUT: @@ -547,18 +575,10 @@ ofproto_sflow_received(struct ofproto_sflow *os, struct odp_msg *msg) n_outputs++; break; - case ODPAT_OUTPUT_GROUP: - n_outputs += (a->output_group.group == DP_GROUP_FLOOD ? os->n_flood - : a->output_group.group == DP_GROUP_ALL ? os->n_all - : 0); - break; - - case ODPAT_SET_VLAN_VID: - switchElem.flowType.sw.dst_vlan = ntohs(a->vlan_vid.vlan_vid); - break; - - case ODPAT_SET_VLAN_PCP: - switchElem.flowType.sw.dst_priority = a->vlan_pcp.vlan_pcp; + case ODPAT_SET_DL_TCI: + tci = a->dl_tci.tci; + switchElem.flowType.sw.dst_vlan = vlan_tci_to_vid(tci); + switchElem.flowType.sw.dst_priority = vlan_tci_to_pcp(tci); break; default: @@ -583,21 +603,13 @@ ofproto_sflow_received(struct ofproto_sflow *os, struct odp_msg *msg) sfl_sampler_writeFlowSample(sampler, &fs); } -void -ofproto_sflow_set_group_sizes(struct ofproto_sflow *os, - size_t n_flood, size_t n_all) -{ - os->n_flood = n_flood; - os->n_all = n_all; -} - void ofproto_sflow_run(struct ofproto_sflow *os) { if (ofproto_sflow_is_enabled(os)) { time_t now = time_now(); if (now >= os->next_tick) { - sfl_agent_tick(os->sflow_agent, now); + sfl_agent_tick(os->sflow_agent, time_wall()); os->next_tick = now + 1; } } @@ -607,6 +619,6 @@ void ofproto_sflow_wait(struct ofproto_sflow *os) { if (ofproto_sflow_is_enabled(os)) { - poll_timer_wait(os->next_tick * 1000 - time_msec()); + poll_timer_wait_until(os->next_tick * 1000LL); } }