-
Notifications
You must be signed in to change notification settings - Fork 173
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
netwatcher :更改uprobe适配判断、增添redis监控信息 (incomplete) #835
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
eBPF_Supermarket/Network_Subsystem/net_watcher/data/connects.log
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +0,0 @@ | ||
connection{pid="214827",sock="0xffff944e0c3dda00",src="192.168.239.132:35422",dst="20.189.173.1:443",is_server="0",backlog="-",maxbacklog="-",cwnd="-",ssthresh="-",sndbuf="-",wmem_queued="-",rx_bytes="-",tx_bytes="-",srtt="-",duration="-",total_retrans="-",fast_retrans="-",timeout_retrans="-"} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,7 +44,7 @@ static int all_conn = 0, err_packet = 0, extra_conn_info = 0, layer_time = 0, | |
http_info = 0, retrans_info = 0, udp_info = 0, net_filter = 0, | ||
drop_reason = 0, addr_to_func = 0, icmp_info = 0, tcp_info = 0, | ||
time_load = 0, dns_info = 0, stack_info = 0, mysql_info = 0, | ||
count_info = 0; // flag | ||
redis_info = 0 ,count_info = 0;// flag | ||
|
||
static const char *tcp_states[] = { | ||
[1] = "ESTABLISHED", [2] = "SYN_SENT", [3] = "SYN_RECV", | ||
|
@@ -78,8 +78,8 @@ static const struct argp_option opts[] = { | |
{"stack", 'A', 0, 0, "set to trace of stack "}, | ||
{"mysql", 'M', 0, 0, | ||
"set to trace mysql information info include Pid 进程id、Comm " | ||
"进程名、Size sql语句字节大小、Sql 语句、Duration Sql耗时、Request " | ||
"Sql请求数"}, | ||
"进程名、Size sql语句字节大小、Sql 语句"}, | ||
{"redis", 'R', 0, 0}, | ||
{"count", 'C', "NUMBER", 0, | ||
"specify the time to count the number of requests"}, | ||
{}}; | ||
|
@@ -141,6 +141,9 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state) { | |
case 'M': | ||
mysql_info = 1; | ||
break; | ||
case 'R': | ||
redis_info = 1; | ||
break; | ||
case 'C': | ||
count_info = strtoul(arg, &end, 10); | ||
break; | ||
|
@@ -169,6 +172,7 @@ enum MonitorMode { | |
MODE_TCP, | ||
MODE_DNS, | ||
MODE_MYSQL, | ||
MODE_REDIS, | ||
MODE_DEFAULT | ||
}; | ||
|
||
|
@@ -187,7 +191,10 @@ enum MonitorMode get_monitor_mode() { | |
return MODE_DNS; | ||
} else if (mysql_info) { | ||
return MODE_MYSQL; | ||
} else { | ||
} else if (redis_info) { | ||
return MODE_REDIS; | ||
} | ||
else { | ||
return MODE_DEFAULT; | ||
} | ||
} | ||
|
@@ -227,7 +234,7 @@ void print_logo() { | |
|
||
pclose(lolcat_pipe); | ||
} | ||
static const char binary_path[] = "/usr/sbin/mysqld"; | ||
static char binary_path[64]=""; | ||
#define __ATTACH_UPROBE(skel, sym_name, prog_name, is_retprobe) \ | ||
do { \ | ||
LIBBPF_OPTS(bpf_uprobe_opts, uprobe_opts, .func_name = #sym_name, \ | ||
|
@@ -419,6 +426,7 @@ static void set_rodata_flags(struct netwatcher_bpf *skel) { | |
skel->rodata->dns_info = dns_info; | ||
skel->rodata->stack_info = stack_info; | ||
skel->rodata->mysql_info = mysql_info; | ||
skel->rodata->redis_info = redis_info; | ||
} | ||
static void set_disable_load(struct netwatcher_bpf *skel) { | ||
|
||
|
@@ -556,6 +564,8 @@ static void set_disable_load(struct netwatcher_bpf *skel) { | |
mysql_info ? true : false); | ||
bpf_program__set_autoload(skel->progs.query__end, | ||
mysql_info ? true : false); | ||
bpf_program__set_autoload(skel->progs.query__start_redis, | ||
redis_info ? true : false); | ||
} | ||
|
||
static void print_header(enum MonitorMode mode) { | ||
|
@@ -617,6 +627,14 @@ static void print_header(enum MonitorMode mode) { | |
printf("%-20s %-20s %-20s %-20s %-40s %-20s %-20s \n", "Pid", "Tid", | ||
"Comm", "Size", "Sql", "Duration/μs", "Request"); | ||
break; | ||
case MODE_REDIS: | ||
printf("===============================================================" | ||
"====================MYSQL " | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这里MODE_REDIS 打印又是MYSQL?是不是错了呀 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 因为这个功能在测试阶段,这周将它总的改掉 |
||
"INFORMATION====================================================" | ||
"============================\n"); | ||
printf("%-20s %-20s %-20s %-40s %-20s \n", "Pid", "Comm", "Size", "Sql", | ||
"duration/μs"); | ||
break; | ||
case MODE_DEFAULT: | ||
printf("===============================================================" | ||
"=INFORMATION===================================================" | ||
|
@@ -765,7 +783,7 @@ static int print_conns(struct netwatcher_bpf *skel) { | |
|
||
static int print_packet(void *ctx, void *packet_info, size_t size) { | ||
if (udp_info || net_filter || drop_reason || icmp_info || tcp_info || | ||
dns_info || mysql_info) | ||
dns_info || mysql_info||redis_info) | ||
return 0; | ||
const struct pack_t *pack_info = packet_info; | ||
if (pack_info->mac_time > MAXTIME || pack_info->ip_time > MAXTIME || | ||
|
@@ -1155,7 +1173,8 @@ static int print_trace(void *_ctx, void *data, size_t size) { | |
return 0; | ||
} | ||
|
||
int attach_uprobe(struct netwatcher_bpf *skel) { | ||
int attach_uprobe_mysql(struct netwatcher_bpf *skel) { | ||
|
||
ATTACH_UPROBE_CHECKED( | ||
skel, _Z16dispatch_commandP3THDPK8COM_DATA19enum_server_command, | ||
query__start); | ||
|
@@ -1164,7 +1183,12 @@ int attach_uprobe(struct netwatcher_bpf *skel) { | |
query__end); | ||
return 0; | ||
} | ||
|
||
int attach_uprobe_redis(struct netwatcher_bpf *skel) { | ||
ATTACH_UPROBE_CHECKED( | ||
skel, processCommand, | ||
query__start_redis); | ||
return 0; | ||
} | ||
int main(int argc, char **argv) { | ||
char *last_slash = strrchr(argv[0], '/'); | ||
if (last_slash) { | ||
|
@@ -1222,13 +1246,25 @@ int main(int argc, char **argv) { | |
|
||
/* Attach tracepoint handler */ | ||
if (mysql_info) { | ||
err = attach_uprobe(skel); | ||
strcpy(binary_path, "/usr/sbin/mysqld"); | ||
err = attach_uprobe_mysql(skel); | ||
if (err) { | ||
fprintf(stderr, "failed to attach uprobes\n"); | ||
|
||
goto cleanup; | ||
} | ||
} else { | ||
} | ||
else if(redis_info) | ||
{ | ||
strcpy(binary_path, "/usr/bin/redis-server"); | ||
err = attach_uprobe_redis(skel); | ||
if (err) { | ||
fprintf(stderr, "failed to attach uprobes\n"); | ||
|
||
goto cleanup; | ||
} | ||
} | ||
else { | ||
err = netwatcher_bpf__attach(skel); | ||
if (err) { | ||
fprintf(stderr, "Failed to attach BPF skeleton\n"); | ||
|
@@ -1237,7 +1273,7 @@ int main(int argc, char **argv) { | |
} | ||
enum MonitorMode mode = get_monitor_mode(); | ||
|
||
print_logo(); | ||
//print_logo(); | ||
|
||
print_header(mode); | ||
|
||
|
60 changes: 60 additions & 0 deletions
60
eBPF_Supermarket/Network_Subsystem/net_watcher/redis.bpf.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
// Copyright 2023 The LMP Authors. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// https://github.com/linuxkerneltravel/lmp/blob/develop/LICENSE | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
// | ||
// author: [email protected] | ||
// mysql | ||
|
||
#include "common.bpf.h" | ||
#include "redis_helper.bpf.h" | ||
#define MAXEPOLL 10 | ||
static __always_inline int __handle_redis_start(struct pt_regs *ctx) { | ||
struct client *cli = (struct client *)PT_REGS_PARM1(ctx); | ||
int argc; | ||
void *ptr; | ||
char name[100]=""; | ||
int argv_len; | ||
bpf_probe_read(&argc, sizeof(argc), &cli->argc); | ||
bpf_printk("%d",argc); | ||
robj **arg0; | ||
robj *arg1; | ||
//unsigned type; | ||
unsigned encoding; | ||
unsigned lru; | ||
int refcount; | ||
bpf_probe_read(&arg0, sizeof(arg0), &cli->argv); | ||
|
||
// 读取 argv[0],即第一个命令参数 | ||
bpf_probe_read(&arg1, sizeof(arg1), &arg0[0]); | ||
|
||
for(int i=0;i<argc&&i<MAXEPOLL;i++) | ||
{ | ||
bpf_probe_read(&arg1, sizeof(arg1), &arg0[i]); | ||
// 读取 argv[i]->ptr 中的字符串 | ||
bpf_probe_read(&ptr, sizeof(ptr),&arg1->ptr); | ||
bpf_probe_read_str(name, sizeof(name),ptr); | ||
bpf_printk("%s",name); | ||
} | ||
// 读取 argv[0]->ptr 中的字符串 | ||
bpf_probe_read(&ptr, sizeof(ptr),&arg1->ptr); | ||
bpf_probe_read_str(name, sizeof(name),ptr); | ||
|
||
|
||
bpf_probe_read(&argv_len, sizeof(argv_len), &cli->argv_len_sum); | ||
|
||
bpf_printk("%d",argv_len); | ||
|
||
pid_t pid = bpf_get_current_pid_tgid() >> 32; | ||
return 0; | ||
} | ||
|
55 changes: 55 additions & 0 deletions
55
eBPF_Supermarket/Network_Subsystem/net_watcher/redis_helper.bpf.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
// Copyright 2023 The LMP Authors. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// https://github.com/linuxkerneltravel/lmp/blob/develop/LICENSE | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
// | ||
// author: [email protected] | ||
// | ||
// netwatcher libbpf 内核<->用户 传递信息相关结构体 | ||
|
||
#ifndef __REDIS_HELPER_BPF_H | ||
#define __REDIS_HELPER_BPF_H | ||
|
||
#include "netwatcher.h" | ||
#include "vmlinux.h" | ||
#include <asm-generic/errno.h> | ||
#include <bpf/bpf_core_read.h> | ||
#include <bpf/bpf_endian.h> | ||
#include <bpf/bpf_helpers.h> | ||
#include <bpf/bpf_tracing.h> | ||
#include <string.h> | ||
|
||
#define LRU_BITS 24 | ||
typedef struct redisObject { | ||
unsigned type:4; | ||
unsigned encoding:4; | ||
unsigned lru:24; | ||
int refcount; | ||
void *ptr; | ||
} robj; | ||
|
||
struct client { | ||
u64 id; /* Client incremental unique ID. */ | ||
u64 conn; | ||
int resp; /* RESP protocol version. Can be 2 or 3. */ | ||
u64 db; /* Pointer to currently SELECTed DB. */ | ||
robj *name; /* As set by CLIENT SETNAME. */ | ||
char* querybuf; /* Buffer we use to accumulate client queries. */ | ||
unsigned long qb_pos; /* The position we have read in querybuf. */ | ||
char* pending_querybuf; | ||
unsigned long querybuf_peak; /* Recent (100ms or more) peak of querybuf size. */ | ||
int argc; /* Num of arguments of current command. */ | ||
robj **argv; /* Arguments of current command. */ | ||
unsigned long argv_len_sum; /* Size of argv array (may be more than argc) */ | ||
}; | ||
|
||
#endif |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个文件是运行产生的吗?日志文件不用提交。
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个是将上次的删掉了 不是这次交的