Skip to content

Commit

Permalink
Move tsc monitoring into cli
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladislav Abrosimov committed Jan 29, 2024
1 parent 5400947 commit b0c90cf
Show file tree
Hide file tree
Showing 13 changed files with 389 additions and 161 deletions.
198 changes: 198 additions & 0 deletions cli/develop.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
#pragma once

#include <chrono>
#include <cstdint>
#include <string>
#include <sys/shm.h>
#include <thread>
#include <vector>

#include "common/icontrolplane.h"
#include "common/idataplane.h"
#include "common/tsc_deltas.h"

#include "helper.h"

Expand Down Expand Up @@ -160,6 +168,196 @@ void counter(const uint32_t& counter_id,
table.print();
}

using namespace ::dataplane::perf;
class tsc_monitoring_t
{
public:
void connect_shm()
{
interface::dataPlane dataplane;
const auto response = dataplane.get_shm_tsc_info();
std::map<key_t, void*> ipc_cache;

for (const auto& [core, socket, ipc_key, offset] : response)
{
(void)socket;
if (ipc_cache.find(ipc_key) == ipc_cache.end())
{
auto shmid = shmget(ipc_key, 0, 0);
if (shmid == -1)
{
throw std::string("shmget(") + std::to_string(ipc_key) + ", 0, 0) = " + std::strerror(errno);
}
auto shmaddr = shmat(shmid, NULL, SHM_RDONLY);
if (shmaddr == (void*)-1)
{
throw std::string("shmat(") + std::to_string(ipc_key) + ", NULL, 0) = " + std::strerror(errno);
}

ipc_cache[ipc_key] = shmaddr;
}

auto counter_addr = (tsc_deltas*)((intptr_t)ipc_cache[ipc_key] + offset);
worker_counters.emplace_back(core, counter_addr, tsc_deltas{}, overflow_store{});
}
}

void monitor()
{
connect_shm();
for (auto iter = 0;; iter++)
{
if (iter % 4 == 0)
{
insert_header();
}

for (auto& [core_id, counter, previous_value, overflow_store] : worker_counters)
{
const auto& counter_copy = *counter;
for (auto bin = 0; bin < YANET_TSC_BINS_N; bin++)
{
overflow_store.handle_overflow(counter_copy, previous_value, bin);
if (iter % 4 == 0)
{
insert_bin(counter_copy, overflow_store, bin, core_id);
}
}

previous_value = counter_copy;
}

if (iter % 4 == 0)
{
table.render();
}
std::this_thread::sleep_for(std::chrono::milliseconds(250));
}
}

protected:
struct overflow_store;

void insert_header()
{
table.insert("core_id",
"iter_num",
"logicalPort_ingress",
"acl_ingress4",
"acl_ingress6",
"tun64_ipv4",
"tun64_ipv6",
"route4",
"route6",
"decap",
"nat64stateful_lan",
"nat64stateful_wan",
"nat64stateless_egress",
"nat64stateless_ingress",
"balancer",
"balancer_icmp_reply",
"balancer_icmp_forward",
"route_tunnel4",
"route_tunnel6",
"acl_egress4",
"acl_egress6",
"logicalPort_egress",
"controlPlane");
}

void insert_bin(const tsc_deltas& cnt, const overflow_store& of_store, int bin, uint32_t core_id)
{
table.insert(bin == 0 ? std::to_string(core_id) : std::string{},
bin == 0 ? std::to_string(cnt.iter_num) : std::string{},
of_store.logicalPort_ingress_handle[bin] + cnt.logicalPort_ingress_handle[bin],
of_store.acl_ingress_handle4[bin] + cnt.acl_ingress_handle4[bin],
of_store.acl_ingress_handle6[bin] + cnt.acl_ingress_handle6[bin],
of_store.tun64_ipv4_handle[bin] + cnt.tun64_ipv4_handle[bin],
of_store.tun64_ipv6_handle[bin] + cnt.tun64_ipv6_handle[bin],
of_store.route_handle4[bin] + cnt.route_handle4[bin],
of_store.route_handle6[bin] + cnt.route_handle6[bin],

of_store.decap_handle[bin] + cnt.decap_handle[bin],
of_store.nat64stateful_lan_handle[bin] + cnt.nat64stateful_lan_handle[bin],
of_store.nat64stateful_wan_handle[bin] + cnt.nat64stateful_wan_handle[bin],
of_store.nat64stateless_egress_handle[bin] + cnt.nat64stateless_egress_handle[bin],
of_store.nat64stateless_ingress_handle[bin] + cnt.nat64stateless_ingress_handle[bin],
of_store.balancer_handle[bin] + cnt.balancer_handle[bin],
of_store.balancer_icmp_reply_handle[bin] + cnt.balancer_icmp_reply_handle[bin],

of_store.balancer_icmp_forward_handle[bin] + cnt.balancer_icmp_forward_handle[bin],
of_store.route_tunnel_handle4[bin] + cnt.route_tunnel_handle4[bin],
of_store.route_tunnel_handle6[bin] + cnt.route_tunnel_handle6[bin],
of_store.acl_egress_handle4[bin] + cnt.acl_egress_handle4[bin],
of_store.acl_egress_handle6[bin] + cnt.acl_egress_handle6[bin],
of_store.logicalPort_egress_handle[bin] + cnt.logicalPort_egress_handle[bin],
of_store.controlPlane_handle[bin] + cnt.controlPlane_handle[bin]);
}

struct overflow_store
{
uint64_t logicalPort_ingress_handle[YANET_TSC_BINS_N];
uint64_t acl_ingress_handle4[YANET_TSC_BINS_N];
uint64_t acl_ingress_handle6[YANET_TSC_BINS_N];
uint64_t tun64_ipv4_handle[YANET_TSC_BINS_N];
uint64_t tun64_ipv6_handle[YANET_TSC_BINS_N];
uint64_t route_handle4[YANET_TSC_BINS_N];
uint64_t route_handle6[YANET_TSC_BINS_N];

uint64_t decap_handle[YANET_TSC_BINS_N];
uint64_t nat64stateful_lan_handle[YANET_TSC_BINS_N];
uint64_t nat64stateful_wan_handle[YANET_TSC_BINS_N];
uint64_t nat64stateless_egress_handle[YANET_TSC_BINS_N];
uint64_t nat64stateless_ingress_handle[YANET_TSC_BINS_N];
uint64_t balancer_handle[YANET_TSC_BINS_N];
uint64_t balancer_icmp_reply_handle[YANET_TSC_BINS_N];
uint64_t balancer_icmp_forward_handle[YANET_TSC_BINS_N];

uint64_t route_tunnel_handle4[YANET_TSC_BINS_N];
uint64_t route_tunnel_handle6[YANET_TSC_BINS_N];
uint64_t acl_egress_handle4[YANET_TSC_BINS_N];
uint64_t acl_egress_handle6[YANET_TSC_BINS_N];
uint64_t logicalPort_egress_handle[YANET_TSC_BINS_N];
uint64_t controlPlane_handle[YANET_TSC_BINS_N];

void handle_overflow(const tsc_deltas& cnt, const tsc_deltas& prev, int bin)
{
logicalPort_ingress_handle[bin] += (prev.logicalPort_ingress_handle[bin] > cnt.logicalPort_ingress_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
acl_ingress_handle4[bin] += (prev.acl_ingress_handle4[bin] > cnt.acl_ingress_handle4[bin]) << sizeof(uint16_t) * CHAR_BIT;
acl_ingress_handle6[bin] += (prev.acl_ingress_handle6[bin] > cnt.acl_ingress_handle6[bin]) << sizeof(uint16_t) * CHAR_BIT;
tun64_ipv4_handle[bin] += (prev.tun64_ipv4_handle[bin] > cnt.tun64_ipv4_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
tun64_ipv6_handle[bin] += (prev.tun64_ipv6_handle[bin] > cnt.tun64_ipv6_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
route_handle4[bin] += (prev.route_handle4[bin] > cnt.route_handle4[bin]) << sizeof(uint16_t) * CHAR_BIT;
route_handle6[bin] += (prev.route_handle6[bin] > cnt.route_handle6[bin]) << sizeof(uint16_t) * CHAR_BIT;

decap_handle[bin] += (prev.decap_handle[bin] > cnt.decap_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
nat64stateful_lan_handle[bin] += (prev.nat64stateful_lan_handle[bin] > cnt.nat64stateful_lan_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
nat64stateful_wan_handle[bin] += (prev.nat64stateful_wan_handle[bin] > cnt.nat64stateful_wan_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
nat64stateless_egress_handle[bin] += (prev.nat64stateless_egress_handle[bin] > cnt.nat64stateless_egress_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
nat64stateless_ingress_handle[bin] += (prev.nat64stateless_ingress_handle[bin] > cnt.nat64stateless_ingress_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
balancer_handle[bin] += (prev.balancer_handle[bin] > cnt.balancer_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
balancer_icmp_reply_handle[bin] += (prev.balancer_icmp_reply_handle[bin] > cnt.balancer_icmp_reply_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
balancer_icmp_forward_handle[bin] += (prev.balancer_icmp_forward_handle[bin] > cnt.balancer_icmp_forward_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;

route_tunnel_handle4[bin] += (prev.route_tunnel_handle4[bin] > cnt.route_tunnel_handle4[bin]) << sizeof(uint16_t) * CHAR_BIT;
route_tunnel_handle6[bin] += (prev.route_tunnel_handle6[bin] > cnt.route_tunnel_handle6[bin]) << sizeof(uint16_t) * CHAR_BIT;
acl_egress_handle4[bin] += (prev.acl_egress_handle4[bin] > cnt.acl_egress_handle4[bin]) << sizeof(uint16_t) * CHAR_BIT;
acl_egress_handle6[bin] += (prev.acl_egress_handle6[bin] > cnt.acl_egress_handle6[bin]) << sizeof(uint16_t) * CHAR_BIT;
logicalPort_egress_handle[bin] += (prev.logicalPort_egress_handle[bin] > cnt.logicalPort_egress_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
controlPlane_handle[bin] += (prev.controlPlane_handle[bin] > cnt.controlPlane_handle[bin]) << sizeof(uint16_t) * CHAR_BIT;
}
};

std::vector<std::tuple<uint32_t, tsc_deltas*, tsc_deltas, overflow_store>> worker_counters;
table_t table;
};

void tsc_monitoring()
{
tsc_monitoring_t monitoring{};
monitoring.monitor();
}

}

}
7 changes: 7 additions & 0 deletions cli/helper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,13 @@ class table_t
}
}

void render()
{
printf("\033[2J\033[H");
print_default();
table.clear();
}

protected:
converter::config_t config;
std::vector<std::vector<std::string>> table;
Expand Down
1 change: 1 addition & 0 deletions cli/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ std::vector<std::tuple<std::string,
{"dontdoit podumoi controlplane rib save", "", [](const auto& args) { call(rib::save, args); }},
{"dontdoit podumoi controlplane rib load", "", [](const auto& args) { call(rib::load, args); }},
{"dontdoit podumoi controlplane rib clear", "[protocol] <peer> <vrf> <priority>", [](const auto& args) { call(rib::clear, args); }},
{"dontdoit podumoi tsc monitoring", "", [](const auto& args) { call(develop::dataplane::tsc_monitoring, args); }},
{},
{"telegraf unsafe", "", [](const auto& args) { call(telegraf::unsafe, args); }},
{"telegraf ports", "", [](const auto& args) { call(telegraf::ports_stats, args); }},
Expand Down
47 changes: 24 additions & 23 deletions cli/show.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include "common/icontrolplane.h"
#include "common/idataplane.h"
#include "common/tsc_deltas.h"
#include "common/version.h"

#include "dataplane/tsc_deltas.h"
#include "helper.h"

namespace show
Expand Down Expand Up @@ -879,28 +879,29 @@ void shm_tsc_set_state(bool state)
dataplane.updateGlobalBase(globalbase);
}

static const std::map<std::string, unsigned int> counter_name_to_offset = {
{"logicalPort_ingress_handle", offsetof(dataplane::perf::tsc_base_values, logicalPort_ingress_handle)},
{"acl_ingress_handle4", offsetof(dataplane::perf::tsc_base_values, acl_ingress_handle4)},
{"acl_ingress_handle6", offsetof(dataplane::perf::tsc_base_values, acl_ingress_handle6)},
{"tun64_ipv4_handle", offsetof(dataplane::perf::tsc_base_values, tun64_ipv4_handle)},
{"tun64_ipv6_handle", offsetof(dataplane::perf::tsc_base_values, tun64_ipv6_handle)},
{"route_handle4", offsetof(dataplane::perf::tsc_base_values, route_handle4)},
{"route_handle6", offsetof(dataplane::perf::tsc_base_values, route_handle6)},
{"decap_handle", offsetof(dataplane::perf::tsc_base_values, decap_handle)},
{"nat64stateful_lan_handle", offsetof(dataplane::perf::tsc_base_values, nat64stateful_lan_handle)},
{"nat64stateful_wan_handle", offsetof(dataplane::perf::tsc_base_values, nat64stateful_wan_handle)},
{"nat64stateless_egress_handle", offsetof(dataplane::perf::tsc_base_values, nat64stateless_egress_handle)},
{"nat64stateless_ingress_handle", offsetof(dataplane::perf::tsc_base_values, nat64stateless_ingress_handle)},
{"balancer_handle", offsetof(dataplane::perf::tsc_base_values, balancer_handle)},
{"balancer_icmp_reply_handle", offsetof(dataplane::perf::tsc_base_values, balancer_icmp_reply_handle)},
{"balancer_icmp_forward_handle", offsetof(dataplane::perf::tsc_base_values, balancer_icmp_forward_handle)},
{"route_tunnel_handle4", offsetof(dataplane::perf::tsc_base_values, route_tunnel_handle4)},
{"route_tunnel_handle6", offsetof(dataplane::perf::tsc_base_values, route_tunnel_handle6)},
{"acl_egress_handle4", offsetof(dataplane::perf::tsc_base_values, acl_egress_handle4)},
{"acl_egress_handle6", offsetof(dataplane::perf::tsc_base_values, acl_egress_handle6)},
{"logicalPort_egress_handle", offsetof(dataplane::perf::tsc_base_values, logicalPort_egress_handle)},
{"controlPlane_handle", offsetof(dataplane::perf::tsc_base_values, controlPlane_handle)},
using dataplane::perf::tsc_base_values;
static const std::map<std::string, uint32_t> counter_name_to_offset = {
{"logicalPort_ingress_handle", offsetof(tsc_base_values, logicalPort_ingress_handle)},
{"acl_ingress_handle4", offsetof(tsc_base_values, acl_ingress_handle4)},
{"acl_ingress_handle6", offsetof(tsc_base_values, acl_ingress_handle6)},
{"tun64_ipv4_handle", offsetof(tsc_base_values, tun64_ipv4_handle)},
{"tun64_ipv6_handle", offsetof(tsc_base_values, tun64_ipv6_handle)},
{"route_handle4", offsetof(tsc_base_values, route_handle4)},
{"route_handle6", offsetof(tsc_base_values, route_handle6)},
{"decap_handle", offsetof(tsc_base_values, decap_handle)},
{"nat64stateful_lan_handle", offsetof(tsc_base_values, nat64stateful_lan_handle)},
{"nat64stateful_wan_handle", offsetof(tsc_base_values, nat64stateful_wan_handle)},
{"nat64stateless_egress_handle", offsetof(tsc_base_values, nat64stateless_egress_handle)},
{"nat64stateless_ingress_handle", offsetof(tsc_base_values, nat64stateless_ingress_handle)},
{"balancer_handle", offsetof(tsc_base_values, balancer_handle)},
{"balancer_icmp_reply_handle", offsetof(tsc_base_values, balancer_icmp_reply_handle)},
{"balancer_icmp_forward_handle", offsetof(tsc_base_values, balancer_icmp_forward_handle)},
{"route_tunnel_handle4", offsetof(tsc_base_values, route_tunnel_handle4)},
{"route_tunnel_handle6", offsetof(tsc_base_values, route_tunnel_handle6)},
{"acl_egress_handle4", offsetof(tsc_base_values, acl_egress_handle4)},
{"acl_egress_handle6", offsetof(tsc_base_values, acl_egress_handle6)},
{"logicalPort_egress_handle", offsetof(tsc_base_values, logicalPort_egress_handle)},
{"controlPlane_handle", offsetof(tsc_base_values, controlPlane_handle)},
};

void shm_tsc_set_base_value(std::string counter_name, uint32_t value)
Expand Down
1 change: 1 addition & 0 deletions common/config.release.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,4 @@
#define YANET_CONFIG_SHARED_RINGS_NUMBER (32)
#define YANET_DEFAULT_IPC_SHMKEY (12345)
#define YANET_CONFIG_KERNEL_INTERFACE_QUEUE_SIZE (4096)
#define YANET_CONFIG_TSC_ACTIVE_STATE (0)
Loading

0 comments on commit b0c90cf

Please sign in to comment.