Skip to content

Commit dd15aef

Browse files
ekoopsekoops
committed
feat!: drop listen enter evts gen, testing and parsing code
As the `listen` exit events contain all the information needed, drop `listen` enter events generation from all drivers, and all related testing and parsing code. BREAKING CHANGE: drop `listen` enter evts gen and parsing Signed-off-by: Leonardo Di Giovanna <[email protected]>
1 parent d3172e8 commit dd15aef

File tree

9 files changed

+13
-141
lines changed

9 files changed

+13
-141
lines changed

‎driver/fillers_table.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const struct ppm_event_entry g_ppm_events[PPM_EVENT_MAX] = {
4343
[PPME_SOCKET_BIND_X] = {FILLER_REF(sys_socket_bind_x)},
4444
[PPME_SOCKET_CONNECT_E] = {FILLER_REF(sys_connect_e)},
4545
[PPME_SOCKET_CONNECT_X] = {FILLER_REF(sys_connect_x)},
46-
[PPME_SOCKET_LISTEN_E] = {FILLER_REF(sys_listen_e)},
46+
[PPME_SOCKET_LISTEN_E] = {FILLER_DISABLED},
4747
[PPME_SOCKET_LISTEN_X] = {FILLER_REF(sys_listen_x)},
4848
[PPME_SOCKET_SEND_E] = {FILLER_REF(sys_send_e)},
4949
[PPME_SOCKET_SEND_X] = {FILLER_REF(sys_send_x)},

‎driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/listen.bpf.c‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,6 @@
88

99
#include <helpers/interfaces/fixed_size_event.h>
1010

11-
/*=============================== ENTER EVENT ===========================*/
12-
13-
SEC("tp_btf/sys_enter")
14-
int BPF_PROG(listen_e, struct pt_regs *regs, long id) {
15-
/* We need to keep this at the beginning of the program because otherwise we alter the state of
16-
* the ebpf registers causing a verifier issue.
17-
*/
18-
unsigned long args[2] = {0};
19-
extract__network_args(args, 2, regs);
20-
21-
struct ringbuf_struct ringbuf;
22-
if(!ringbuf__reserve_space(&ringbuf, LISTEN_E_SIZE, PPME_SOCKET_LISTEN_E)) {
23-
return 0;
24-
}
25-
26-
ringbuf__store_event_header(&ringbuf);
27-
28-
/*=============================== COLLECT PARAMETERS ===========================*/
29-
30-
/* Parameter 1: fd (type: PT_FD) */
31-
int32_t fd = (int32_t)args[0];
32-
ringbuf__store_s64(&ringbuf, (int64_t)fd);
33-
34-
/* Parameter 2: backlog (type: PT_INT32) */
35-
int32_t backlog = (int32_t)args[1];
36-
ringbuf__store_s32(&ringbuf, backlog);
37-
38-
/*=============================== COLLECT PARAMETERS ===========================*/
39-
40-
ringbuf__submit_event(&ringbuf);
41-
42-
return 0;
43-
}
44-
45-
/*=============================== ENTER EVENT ===========================*/
46-
4711
/*=============================== EXIT EVENT ===========================*/
4812

4913
SEC("tp_btf/sys_exit")

‎test/drivers/test_suites/syscall_enter_suite/listen_e.cpp‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎test/drivers/test_suites/syscall_enter_suite/socketcall_e.cpp‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -173,50 +173,6 @@ TEST(SyscallEnter, socketcall_accept4E) {
173173
}
174174
#endif
175175

176-
#ifdef __NR_listen
177-
TEST(SyscallEnter, socketcall_listenE) {
178-
auto evt_test = get_syscall_event_test(__NR_listen, ENTER_EVENT);
179-
180-
evt_test->enable_capture();
181-
182-
/*=============================== TRIGGER SYSCALL ===========================*/
183-
184-
int32_t socket_fd = 2;
185-
int backlog = 3;
186-
187-
unsigned long args[2]{};
188-
args[0] = socket_fd;
189-
args[1] = backlog;
190-
assert_syscall_state(SYSCALL_FAILURE, "listen", syscall(__NR_socketcall, SYS_LISTEN, args));
191-
192-
/*=============================== TRIGGER SYSCALL ===========================*/
193-
194-
evt_test->disable_capture();
195-
196-
evt_test->assert_event_presence();
197-
198-
if(HasFatalFailure()) {
199-
return;
200-
}
201-
202-
evt_test->parse_event();
203-
204-
evt_test->assert_header();
205-
206-
/*=============================== ASSERT PARAMETERS ===========================*/
207-
208-
/* Parameter 1: fd (type: PT_FD) */
209-
evt_test->assert_numeric_param(1, (int64_t)socket_fd);
210-
211-
/* Parameter 2: backlog (type: PT_INT32) */
212-
evt_test->assert_numeric_param(2, (int32_t)backlog);
213-
214-
/*=============================== ASSERT PARAMETERS ===========================*/
215-
216-
evt_test->assert_num_params_pushed(2);
217-
}
218-
#endif
219-
220176
#ifdef __NR_recvfrom
221177

222178
TEST(SyscallEnter, socketcall_recvfromE) {

‎test/libscap/helpers/engines.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#define MAX_ITERATIONS 300
1313

1414
/* Number of events we want to assert */
15-
#define EVENTS_TO_ASSERT 23
15+
#define EVENTS_TO_ASSERT 22
1616

1717
void check_event_is_not_overwritten(scap_t *h) {
1818
/* Start the capture */
@@ -102,14 +102,14 @@ void check_event_is_not_overwritten(scap_t *h) {
102102

103103
void check_event_order(scap_t *h) {
104104
uint32_t events_to_assert[EVENTS_TO_ASSERT] = {
105-
PPME_SYSCALL_CLOSE_E, PPME_SYSCALL_CLOSE_X, PPME_SYSCALL_OPENAT_2_E,
106-
PPME_SYSCALL_OPENAT_2_X, PPME_SOCKET_LISTEN_E, PPME_SOCKET_LISTEN_X,
107-
PPME_SOCKET_ACCEPT4_6_E, PPME_SOCKET_ACCEPT4_6_X, PPME_SYSCALL_GETEGID_X,
108-
PPME_SYSCALL_GETGID_X, PPME_SYSCALL_GETEUID_X, PPME_SYSCALL_GETUID_X,
109-
PPME_SOCKET_BIND_X, PPME_SOCKET_CONNECT_E, PPME_SOCKET_CONNECT_X,
110-
PPME_SOCKET_SENDTO_E, PPME_SOCKET_SENDTO_X, PPME_SOCKET_GETSOCKOPT_X,
111-
PPME_SOCKET_RECVMSG_X, PPME_SOCKET_RECVFROM_E, PPME_SOCKET_RECVFROM_X,
112-
PPME_SOCKET_SOCKET_X, PPME_SOCKET_SOCKETPAIR_X};
105+
PPME_SYSCALL_CLOSE_E, PPME_SYSCALL_CLOSE_X, PPME_SYSCALL_OPENAT_2_E,
106+
PPME_SYSCALL_OPENAT_2_X, PPME_SOCKET_LISTEN_X, PPME_SOCKET_ACCEPT4_6_E,
107+
PPME_SOCKET_ACCEPT4_6_X, PPME_SYSCALL_GETEGID_X, PPME_SYSCALL_GETGID_X,
108+
PPME_SYSCALL_GETEUID_X, PPME_SYSCALL_GETUID_X, PPME_SOCKET_BIND_X,
109+
PPME_SOCKET_CONNECT_E, PPME_SOCKET_CONNECT_X, PPME_SOCKET_SENDTO_E,
110+
PPME_SOCKET_SENDTO_X, PPME_SOCKET_GETSOCKOPT_X, PPME_SOCKET_RECVMSG_X,
111+
PPME_SOCKET_RECVFROM_E, PPME_SOCKET_RECVFROM_X, PPME_SOCKET_SOCKET_X,
112+
PPME_SOCKET_SOCKETPAIR_X};
113113

114114
/* Start the capture */
115115
ASSERT_EQ(scap_start_capture(h), SCAP_SUCCESS)

‎test/libsinsp_e2e/tcp_client_server.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,9 @@ void runtest(iotype iot,
167167
}
168168
log_param(param);
169169
callnum++;
170-
} else if(evt->get_type() == PPME_SOCKET_LISTEN_E) {
171-
EXPECT_EQ("1", evt->get_param_value_str("backlog"));
172-
log_param(param);
173-
callnum++;
174170
} else if(evt->get_type() == PPME_SOCKET_LISTEN_X) {
175171
EXPECT_EQ("0", evt->get_param_value_str("res"));
172+
EXPECT_EQ("1", evt->get_param_value_str("backlog"));
176173
log_param(param);
177174
callnum++;
178175
} else if(evt->get_type() == PPME_SOCKET_ACCEPT4_6_E) {

‎test/libsinsp_e2e/tcp_client_server_ipv4_mapped.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,11 +445,9 @@ void runtest_ipv4m(iotype iot,
445445
EXPECT_EQ(SERVER_PORT_STR, dst_port);
446446
}
447447
callnum++;
448-
} else if(evt->get_type() == PPME_SOCKET_LISTEN_E) {
449-
EXPECT_EQ("1", evt->get_param_value_str("backlog"));
450-
callnum++;
451448
} else if(evt->get_type() == PPME_SOCKET_LISTEN_X) {
452449
EXPECT_EQ("0", evt->get_param_value_str("res"));
450+
EXPECT_EQ("1", evt->get_param_value_str("backlog"));
453451
callnum++;
454452
} else if(evt->get_type() == PPME_SOCKET_ACCEPT4_6_E) {
455453
EXPECT_EQ("0", evt->get_param_value_str("flags"));

‎userspace/libpman/src/events_prog_table.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ event_prog_t event_prog_table[PPM_EVENT_MAX][MAX_FEATURE_CHECKS] = {
111111
[PPME_SOCKET_ACCEPT_5_X] = {{false, "accept_x", 0}},
112112
[PPME_SOCKET_BIND_E] = {{true, NULL}},
113113
[PPME_SOCKET_BIND_X] = {{false, "bind_x", 0}},
114-
[PPME_SOCKET_LISTEN_E] = {{false, "listen_e", 0}},
114+
[PPME_SOCKET_LISTEN_E] = {{true, NULL}},
115115
[PPME_SOCKET_LISTEN_X] = {{false, "listen_x", 0}},
116116
[PPME_SYSCALL_EXECVE_19_E] = {{false, "execve_e", 0}},
117117
[PPME_SYSCALL_EXECVE_19_X] = {{false, "execve_x", 0}},

‎userspace/libsinsp/test/events_net.ut.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ TEST_F(sinsp_with_test_input, net_bind_listen_accept_ipv4) {
380380

381381
int64_t server_fd = sinsp_test_input::socket_params::default_fd;
382382
int32_t backlog = 5;
383-
add_event_advance_ts(increasing_ts(), 1, PPME_SOCKET_LISTEN_E, 2, server_fd, backlog);
384383
add_event_advance_ts(increasing_ts(),
385384
1,
386385
PPME_SOCKET_LISTEN_X,
@@ -447,7 +446,6 @@ TEST_F(sinsp_with_test_input, net_bind_listen_accept_ipv6) {
447446

448447
int64_t server_fd = sinsp_test_input::socket_params::default_fd;
449448
int32_t backlog = 5;
450-
add_event_advance_ts(increasing_ts(), 1, PPME_SOCKET_LISTEN_E, 2, server_fd, backlog);
451449
add_event_advance_ts(increasing_ts(),
452450
1,
453451
PPME_SOCKET_LISTEN_X,

0 commit comments

Comments
 (0)