Skip to content

Commit

Permalink
Filter out loopback and docker.
Browse files Browse the repository at this point in the history
  • Loading branch information
@JonathanHenson
JonathanHenson committed Oct 18, 2023
1 parent dd0e1a6 commit bc90c6c
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 32 deletions.
4 changes: 2 additions & 2 deletions bin/system_info/print_system_info.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ int main(void) {
fprintf(stdout, " 'numa architecture': false\n");
}
size_t nic_count = aws_system_environment_get_network_card_count(env);
fprintf(stdout, " 'network_card_count': %lu\n", (unsigned long)nic_count);
fprintf(stdout, " 'network_card_count': %lu\n", (unsigned long)nic_count);

if (nic_count > 0) {
fprintf(stdout, " 'network_cards: [\n");
Expand All @@ -49,7 +49,7 @@ int main(void) {
fprintf(stdout, " {\n");
fprintf(stdout, " 'device_name: '%s',\n", aws_string_c_str(nic_array[i]));
fprintf(stdout, " 'numa_node': '%lu'\n", (unsigned long)aws_system_environment_get_cpu_group_for_network_card(env, i));
fprintf(stdout, " }\n");
fprintf(stdout, " }");
if (i != nic_count - 1) {
fprintf(stdout, ",");
}
Expand Down
83 changes: 53 additions & 30 deletions source/linux/system_info.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,25 @@
#include <linux/if_packet.h>
#include <net/ethernet.h>

static bool s_is_irrelevant_interface(const struct aws_byte_cursor name) {

/* loop-back is important but not for looking at the system configuration,
we want the actual cards. */
if (aws_byte_cursor_eq_c_str_ignore_case(&name, "lo")) {
return true;
}

struct aws_byte_cursor bridge_dev_cur = aws_byte_cursor_from_c_str("br-");
/* typical docker devices. */
if (aws_byte_cursor_eq_c_str_ignore_case(&name, "docker") ||
aws_byte_cursor_eq_c_str_ignore_case(&name, "veth") ||
aws_byte_cursor_starts_with_ignore_case(&name, &bridge_dev_cur)) {
return true;
}

return false;
}

int aws_system_environment_load_platform_impl(struct aws_system_environment *env) {
/* provide size_hint when reading "special files", since some platforms mis-report these files' size as 4KB */
aws_byte_buf_init_from_file_with_size_hint(
Expand All @@ -31,41 +50,45 @@ int aws_system_environment_load_platform_impl(struct aws_system_environment *env
while(iterator) {
if (iterator->ifa_addr && iterator->ifa_addr->sa_family == AF_PACKET) {
struct aws_string *device_name = aws_string_new_from_c_str(env->allocator, iterator->ifa_name);
aws_array_list_push_back(&env->str_list_network_cards, &device_name);

/* figure out what numa node if any the network card is on. */
uint16_t group_id = 0;

struct aws_byte_buf temp_numa_info;
aws_byte_buf_init(&temp_numa_info, env->allocator, 256);
struct aws_byte_cursor initial_path = aws_byte_cursor_from_c_str("/sys/class/net/");
aws_byte_buf_write_from_whole_cursor(&temp_numa_info, initial_path);
struct aws_byte_cursor device_name_cur = aws_byte_cursor_from_string(device_name);
aws_byte_buf_append_dynamic(&temp_numa_info, &device_name_cur);
struct aws_byte_cursor final_path_segment = aws_byte_cursor_from_c_str("/device/numa_node");
aws_byte_buf_append_dynamic(&temp_numa_info, &final_path_segment);
/* add a null terminator for sys-call land. */
aws_byte_buf_append_byte_dynamic(&temp_numa_info, 0);

/* fill in buffer and read it converting to int. */
struct aws_byte_buf node_file;
AWS_ZERO_STRUCT(node_file);

if (aws_byte_buf_init_from_file(&node_file, env->allocator, (const char *)temp_numa_info.buffer) == AWS_OP_SUCCESS) {
struct aws_byte_cursor file_cur = aws_byte_cursor_from_buf(&temp_numa_info);

uint64_t parsed_int = 0;
if (aws_byte_cursor_utf8_parse_u64(file_cur, &parsed_int) == AWS_OP_SUCCESS) {

/* should always be true, but doesn't hurt to be safe. */
if (parsed_int < UINT16_MAX) {
group_id = (uint16_t)parsed_int;
if (!s_is_irrelevant_interface(device_name_cur)) {
/* figure out what numa node if any the network card is on. */
uint16_t group_id = 0;

struct aws_byte_buf temp_numa_info;
aws_byte_buf_init(&temp_numa_info, env->allocator, 256);
struct aws_byte_cursor initial_path = aws_byte_cursor_from_c_str("/sys/class/net/");
aws_byte_buf_write_from_whole_cursor(&temp_numa_info, initial_path);
aws_byte_buf_append_dynamic(&temp_numa_info, &device_name_cur);
struct aws_byte_cursor final_path_segment = aws_byte_cursor_from_c_str("/device/numa_node");
aws_byte_buf_append_dynamic(&temp_numa_info, &final_path_segment);
/* add a null terminator for sys-call land. */
aws_byte_buf_append_byte_dynamic(&temp_numa_info, 0);

/* fill in buffer and read it converting to int. */
struct aws_byte_buf node_file;
AWS_ZERO_STRUCT(node_file);

if (aws_byte_buf_init_from_file(&node_file, env->allocator, (const char *)temp_numa_info.buffer) ==
AWS_OP_SUCCESS) {
struct aws_byte_cursor file_cur = aws_byte_cursor_from_buf(&temp_numa_info);

uint64_t parsed_int = 0;
if (aws_byte_cursor_utf8_parse_u64(file_cur, &parsed_int) == AWS_OP_SUCCESS) {

/* should always be true, but doesn't hurt to be safe. */
if (parsed_int < UINT16_MAX) {
group_id = (uint16_t)parsed_int;
}
}
aws_byte_buf_clean_up(&node_file);
}
aws_byte_buf_clean_up(&node_file);
aws_byte_buf_clean_up(&temp_numa_info);

aws_array_list_push_back(&env->str_list_network_cards, &device_name);
aws_array_list_push_back(&env->u16_nic_to_cpu_group, &group_id);
}
aws_byte_buf_clean_up(&temp_numa_info);
aws_array_list_push_back(&env->u16_nic_to_cpu_group, &group_id);
}
iterator = iterator->ifa_next;
}
Expand Down

0 comments on commit bc90c6c

Please sign in to comment.