packages/sysSentry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!180 add debug log and modify disk type for ebpf

Browse Source 
From: @zhuofeng6 
Reviewed-by: @znzjugod 
Signed-off-by: @znzjugod
This commit is contained in:
openeuler-ci-bot 2024-12-13 06:56:22 +00:00 committed by Gitee
commit 633c65818a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 358 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

350
add-debug-log-and-modify-disk-type-for-ebpf.patch Normal file
View File

@ -0,0 +1,350 @@
From e1ea5de69c55fae218c2f06d5ae12a32d714df49 Mon Sep 17 00:00:00 2001
From: zhuofeng <zhuofeng2@huawei.com>
Date: Fri, 13 Dec 2024 14:21:32 +0800
Subject: [PATCH] add debug log and modify disk type for ebpf
---
src/c/ebpf_collector/ebpf_collector.c | 200 ++++++++++++++++++++---
src/python/sentryCollector/collect_io.py | 2 +
2 files changed, 178 insertions(+), 24 deletions(-)
diff --git a/src/c/ebpf_collector/ebpf_collector.c b/src/c/ebpf_collector/ebpf_collector.c
index af452c8..54a3a9e 100644
--- a/src/c/ebpf_collector/ebpf_collector.c
+++ b/src/c/ebpf_collector/ebpf_collector.c
@@ -11,6 +11,7 @@
#include <time.h>
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <linux/sysinfo.h>
#include <sys/resource.h>
#include <bpf/bpf.h>
@@ -36,11 +37,25 @@
#define TAG_RES_2 (map_fd[13])
#define BPF_FILE "/usr/lib/ebpf_collector.bpf.o"
+#define MAX_LINE_LENGTH 1024
+#define MAX_SECTION_NAME_LENGTH 256
+#define CONFIG_FILE "/etc/sysSentry/collector.conf"
+
typedef struct {
int major;
int minor;
} DeviceInfo;
+typedef enum {
+ LOG_LEVEL_NONE,
+ LOG_LEVEL_DEBUG,
+ LOG_LEVEL_INFO,
+ LOG_LEVEL_WARNING,
+ LOG_LEVEL_ERROR
+} LogLevel;
+
+LogLevel currentLogLevel = LOG_LEVEL_INFO;
+
static volatile bool exiting;
const char argp_program_doc[] =
@@ -152,24 +167,28 @@ static int print_map_res(struct bpf_map *map_res, char *stage, int *map_size, in
struct stage_data counter;
int key = 0;
+ logMessage(LOG_LEVEL_DEBUG, "print_map_res map_size: %d\n", map_size);
for (key = 0; key < map_size; key++) {
int err = bpf_map_lookup_elem(map_res, &key, &counter);
if (err < 0) {
- fprintf(stderr, "failed to lookup %s map_res: %d\n", stage, err);
+ logMessage(LOG_LEVEL_ERROR, "failed to lookup %s map_res: %d\n", stage, err);
return -1;
}
size_t length = strlen(counter.io_type);
char io_type;
if (length > 0) {
+ logMessage(LOG_LEVEL_DEBUG, "io_type have value.\n");
io_type = counter.io_type[0];
} else {
+ logMessage(LOG_LEVEL_DEBUG, "io_type not value.\n");
io_type = NULL;
}
int major = counter.major;
int first_minor = counter.first_minor;
dev_t dev = makedev(major, first_minor);
char *device_name = find_device_name(dev);
+ logMessage(LOG_LEVEL_DEBUG, "device_name: %s\n", device_name);
if (device_name && io_type) {
printf("%-7s %10llu %10llu %d %c %s\n",
stage,
@@ -195,7 +214,7 @@ int init_map(int *map_fd, const char *map_name, int *map_size, DeviceInfo *devic
init_data.major = devices[i].major;
init_data.first_minor = devices[i].minor;
if (bpf_map_update_elem(map_fd, &i, &init_data, BPF_ANY) != 0) {
- printf("Failed to initialize map %s at index %d\n", map_name, i);
+ logMessage(LOG_LEVEL_ERROR, "Failed to initialize map %s at index %d\n", map_name, i);
return 1;
}
}
@@ -203,6 +222,101 @@ int init_map(int *map_fd, const char *map_name, int *map_size, DeviceInfo *devic
return 0;
}
+char *read_config_value(const char *file, const char *section, const char *key) {
+ FILE *fp = fopen(file, "r");
+ if (fp == NULL) {
+ logMessage(LOG_LEVEL_ERROR, "Failed to open config file.\n");
+ return NULL;
+ }
+
+ char line[MAX_LINE_LENGTH];
+ char current_section[MAX_SECTION_NAME_LENGTH] = {0};
+ char *value = NULL;
+
+ while (fgets(line, sizeof(line), fp) != NULL) {
+ line[strcspn(line, "\n")] = 0;
+
+ if (line[0] == '\0' || line[0] == ';' || line[0] == '#') {
+ continue;
+ }
+
+ if (line[0] == '[') {
+ sscanf(line, "[%255[^]]", current_section);
+ continue;
+ }
+
+ if (strcmp(current_section, section) == 0) {
+ char *delimiter = "=";
+ char *token = strtok(line, delimiter);
+ if (token != NULL) {
+ if (strcmp(token, key) == 0) {
+ token = strtok(NULL, delimiter);
+ if (token != NULL) {
+ value = strdup(token);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ fclose(fp);
+ return value;
+}
+
+void setLogLevel(const char *levelStr) {
+ if (strcmp(levelStr, "info") == 0) {
+ currentLogLevel = LOG_LEVEL_INFO;
+ }
+ else if (strcmp(levelStr, "warning") == 0) {
+ currentLogLevel = LOG_LEVEL_WARNING;
+ }
+ else if (strcmp(levelStr, "error") == 0) {
+ currentLogLevel = LOG_LEVEL_ERROR;
+ }
+ else if (strcmp(levelStr, "debug") == 0) {
+ currentLogLevel = LOG_LEVEL_DEBUG;
+ }
+ else if (strcmp(levelStr, "none") == 0) {
+ currentLogLevel = LOG_LEVEL_NONE;
+ }
+ else {
+ logMessage(LOG_LEVEL_ERROR, "unknown log level: %s\n", levelStr);
+ }
+}
+
+void logMessage(LogLevel level, const char *format, ...){
+ if (level >= currentLogLevel) {
+ va_list args;
+ va_start(args, format);
+ vprintf(format, args);
+ va_end(args);
+ }
+}
+
+int check_for_device(const char *device_name) {
+ char path[256];
+ snprintf(path, sizeof(path), "/sys/block/%s", device_name);
+
+ DIR *dir = opendir(path);
+ if (dir == NULL) {
+ return 0;
+ }
+
+ struct dirent *entry;
+ while ((entry = readdir(dir)) != NULL) {
+ struct stat statbuf;
+ if (stat(path, &statbuf) == 0) {
+ if (S_ISDIR(statbuf.st_mode)) {
+ closedir(dir);
+ return 1;
+ }
+ }
+ }
+ closedir(dir);
+ return 0;
+}
+
int main(int argc, char **argv) {
struct partitions *partitions = NULL;
const struct partition *partition;
@@ -222,13 +336,29 @@ int main(int argc, char **argv) {
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
setrlimit(RLIMIT_MEMLOCK, &r);
+ char *level = read_config_value(CONFIG_FILE, "log", "level");
+ if (level != NULL) {
+ if (level[strlen(level) - 1] == '\r') {
+ size_t len = strlen(level);
+ level[len - 1] = '\0';
+ }
+ setLogLevel(level);
+ free(level);
+ } else {
+ logMessage(LOG_LEVEL_INFO, "the log level is incorrectly configured. the default log level is info.\n");
+ }
+ logMessage(LOG_LEVEL_DEBUG, "finish config parse.\n");
+
err = argp_parse(&argp, argc, argv, 0, NULL, NULL);
- if (err)
+ if (err) {
+ logMessage(LOG_LEVEL_ERROR, "argp parse failed.\n");
return err;
+ }
snprintf(filename, sizeof(filename), BPF_FILE);
- if (load_bpf_file(filename)) {
+ if (load_bpf_file(filename)) {
+ logMessage(LOG_LEVEL_ERROR, "load_bpf_file failed.\n");
return 1;
}
@@ -236,39 +366,52 @@ int main(int argc, char **argv) {
dir = opendir("/dev");
if (dir == NULL) {
- printf("Failed to open /dev directory");
+ logMessage(LOG_LEVEL_ERROR, "Failed to open /dev directory.\n");
return EXIT_FAILURE;
}
while ((entry = readdir(dir)) != NULL) {
- if (entry->d_type == DT_BLK) {
- snprintf(path, sizeof(path), "/dev/%s", entry->d_name);
- struct stat statbuf;
- if (lstat(path, &statbuf) == 0) {
- if (S_ISBLK(statbuf.st_mode)) {
- devices[device_count].major = major(statbuf.st_rdev);
- devices[device_count].minor = minor(statbuf.st_rdev);
- device_count++;
- if (device_count >= MAP_SIZE) {
- break;
- }
- }
- }
+ if (entry->d_type != DT_BLK) {
+ continue;
+ }
+ snprintf(path, sizeof(path), "/dev/%s", entry->d_name);
+ struct stat statbuf;
+ if (lstat(path, &statbuf) != 0 && !S_ISBLK(statbuf.st_mode)) {
+ continue;
+ }
+ if (!strncmp(entry->d_name, "dm-", 3) || !strncmp(entry->d_name, "loop", 4) ||
+ !strncmp(entry->d_name, "md", 2)) {
+ continue;
+ }
+ if (!check_for_device(entry->d_name)) {
+ continue;
+ }
+
+ devices[device_count].major = major(statbuf.st_rdev);
+ devices[device_count].minor = minor(statbuf.st_rdev);
+ device_count++;
+ if (device_count >= MAP_SIZE) {
+ logMessage(LOG_LEVEL_DEBUG, " device_count moren than MAP_SIZE.\n");
+ break;
}
}
closedir(dir);
if (init_map(BLK_RES, "blk_res_map", device_count, devices) != 0) {
+ logMessage(LOG_LEVEL_ERROR, "blk_res_map failed.\n");
return 1;
}
if (init_map(BIO_RES, "blo_res_map", device_count, devices) != 0) {
+ logMessage(LOG_LEVEL_ERROR, "blo_res_map failed.\n");
return 1;
}
if (init_map(WBT_RES, "wbt_res_map", device_count, devices) != 0) {
+ logMessage(LOG_LEVEL_ERROR, "wbt_res_map failed.\n");
return 1;
}
if (init_map(TAG_RES, "tag_res_map", device_count, devices) != 0) {
+ logMessage(LOG_LEVEL_ERROR, "tag_res_map failed.\n");
return 1;
}
@@ -279,31 +422,40 @@ int main(int argc, char **argv) {
int io_dump_blk[MAP_SIZE] = {0};
update_io_dump(BLK_RES_2, io_dump_blk, device_count,"rq_driver");
err = print_map_res(BLK_RES, "rq_driver", device_count, io_dump_blk);
- if (err)
+ if (err) {
+ logMessage(LOG_LEVEL_ERROR, "print_map_res rq_driver error.\n");
break;
+ }
int io_dump_bio[MAP_SIZE] = {0};
update_io_dump(BIO_RES_2, io_dump_bio, device_count,"bio");
err = print_map_res(BIO_RES, "bio", device_count, io_dump_bio);
- if (err)
+ if (err) {
+ logMessage(LOG_LEVEL_ERROR, "print_map_res bio error.\n");
break;
+ }
int io_dump_tag[MAP_SIZE] = {0};
update_io_dump(TAG_RES_2, io_dump_tag, device_count,"gettag");
err = print_map_res(TAG_RES, "gettag", device_count, io_dump_tag);
- if (err)
+ if (err) {
+ logMessage(LOG_LEVEL_ERROR, "print_map_res gettag error.\n");
break;
+ }
int io_dump_wbt[MAP_SIZE] = {0};
update_io_dump(WBT_RES_2, io_dump_wbt, device_count,"wbt");
err = print_map_res(WBT_RES, "wbt", device_count, io_dump_wbt);
- if (err)
+ if (err) {
+ logMessage(LOG_LEVEL_ERROR, "print_map_res wbt error.\n");
break;
+ }
- if (exiting)
+ if (exiting) {
+ logMessage(LOG_LEVEL_DEBUG, "exit program.\n");
break;
+ }
}
return -err;
}
-
diff --git a/src/python/sentryCollector/collect_io.py b/src/python/sentryCollector/collect_io.py
index 8a82eab..a7e86cb 100644
--- a/src/python/sentryCollector/collect_io.py
+++ b/src/python/sentryCollector/collect_io.py
@@ -269,6 +269,8 @@ class CollectIo():
if len(data_list) != 6:
continue
stage, finish_count, latency, io_dump, io_type ,disk_name = data_list
+ if stage not in EBPF_STAGE_LIST:
+ continue
if disk_name not in self.window_value:
continue
io_type = self.get_ebpf_io_type(io_type)
--
2.27.0

9
sysSentry.spec
View File

@ -4,7 +4,7 @@
Summary: System Inspection Framework
Name: sysSentry
Version: 1.0.2
Release: 67
Release: 68
License: Mulan PSL v2
Group: System Environment/Daemons
Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz
@ -83,6 +83,7 @@ Patch70: fix-excessive-CPU-usage.patch
Patch71: change-avg_block_io-config.patch
Patch72: update-nvme-config.patch
Patch73: fix-absolute-threshold-not-be-used.patch
Patch74: add-debug-log-and-modify-disk-type-for-ebpf.patch
BuildRequires: cmake gcc-c++
BuildRequires: python3 python3-setuptools
@ -354,6 +355,12 @@ rm -rf %{buildroot}
%attr(0550,root,root) %{python3_sitelib}/sentryCollector/__pycache__/collect_plugin*
%changelog
* Fri Dec 13 2024 zhuofeng <zhuofeng2@huawei.com> - 1.0.2-68
- Type:bugfix
- CVE:NA
- SUG:NA
- DES:add debug log and modify disk type for ebpf
* Fri Nov 15 2024 heyouzhi <heyouzhi@huawei.com> - 1.0.2-67
- Type:bugfix
- CVE:NA