Skip to content

Commit c01cfc4

Browse files
swananankuba-moo
authored andcommitted
selftests/bpf: check epoll readiness during reuseport migration
Inside migrate_dance(), add epoll checks around shutdown() to verify that the target listener is not ready before shutdown() and becomes ready immediately after shutdown() triggers migration. Cover TCP_ESTABLISHED and TCP_SYN_RECV. Exclude TCP_NEW_SYN_RECV as it depends on later handshake completion. Suggested-by: Kuniyuki Iwashima <[email protected]> Reviewed-by: Kuniyuki Iwashima <[email protected]> Signed-off-by: Zhenzhong Wu <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 3864c6b commit c01cfc4

1 file changed

Lines changed: 42 additions & 7 deletions

File tree

tools/testing/selftests/bpf/prog_tests/migrate_reuseport.c

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,29 @@
77
* 3. call listen() for 1 server socket. (migration target)
88
* 4. update a map to migrate all child sockets
99
* to the last server socket (migrate_map[cookie] = 4)
10-
* 5. call shutdown() for first 4 server sockets
10+
* 5. for TCP_ESTABLISHED and TCP_SYN_RECV cases, verify via epoll
11+
* that the last server socket is not ready before migration.
12+
* 6. call shutdown() for first 4 server sockets
1113
* and migrate the requests in the accept queue
1214
* to the last server socket.
13-
* 6. call listen() for the second server socket.
14-
* 7. call shutdown() for the last server
15+
* 7. for TCP_ESTABLISHED and TCP_SYN_RECV cases, verify via epoll
16+
* that the last server socket is ready after migration.
17+
* 8. call listen() for the second server socket.
18+
* 9. call shutdown() for the last server
1519
* and migrate the requests in the accept queue
1620
* to the second server socket.
17-
* 8. call listen() for the last server.
18-
* 9. call shutdown() for the second server
21+
* 10. call listen() for the last server.
22+
* 11. call shutdown() for the second server
1923
* and migrate the requests in the accept queue
2024
* to the last server socket.
21-
* 10. call accept() for the last server socket.
25+
* 12. call accept() for the last server socket.
2226
*
2327
* Author: Kuniyuki Iwashima <[email protected]>
2428
*/
2529

2630
#include <bpf/bpf.h>
2731
#include <bpf/libbpf.h>
32+
#include <sys/epoll.h>
2833

2934
#include "test_progs.h"
3035
#include "test_migrate_reuseport.skel.h"
@@ -350,21 +355,51 @@ static int update_maps(struct migrate_reuseport_test_case *test_case,
350355

351356
static int migrate_dance(struct migrate_reuseport_test_case *test_case)
352357
{
358+
struct epoll_event ev = {
359+
.events = EPOLLIN,
360+
};
361+
int epoll = -1, nfds;
353362
int i, err;
354363

364+
if (test_case->state != BPF_TCP_NEW_SYN_RECV) {
365+
epoll = epoll_create1(0);
366+
if (!ASSERT_NEQ(epoll, -1, "epoll_create1"))
367+
return -1;
368+
369+
ev.data.fd = test_case->servers[MIGRATED_TO];
370+
if (!ASSERT_OK(epoll_ctl(epoll, EPOLL_CTL_ADD,
371+
test_case->servers[MIGRATED_TO], &ev),
372+
"epoll_ctl"))
373+
goto close_epoll;
374+
375+
nfds = epoll_wait(epoll, &ev, 1, 0);
376+
if (!ASSERT_EQ(nfds, 0, "epoll_wait 1"))
377+
goto close_epoll;
378+
}
379+
355380
/* Migrate TCP_ESTABLISHED and TCP_SYN_RECV requests
356381
* to the last listener based on eBPF.
357382
*/
358383
for (i = 0; i < MIGRATED_TO; i++) {
359384
err = shutdown(test_case->servers[i], SHUT_RDWR);
360385
if (!ASSERT_OK(err, "shutdown"))
361-
return -1;
386+
goto close_epoll;
362387
}
363388

364389
/* No dance for TCP_NEW_SYN_RECV to migrate based on eBPF */
365390
if (test_case->state == BPF_TCP_NEW_SYN_RECV)
366391
return 0;
367392

393+
nfds = epoll_wait(epoll, &ev, 1, 0);
394+
if (!ASSERT_EQ(nfds, 1, "epoll_wait 2")) {
395+
close_epoll:
396+
if (epoll >= 0)
397+
close(epoll);
398+
return -1;
399+
}
400+
401+
close(epoll);
402+
368403
/* Note that we use the second listener instead of the
369404
* first one here.
370405
*

0 commit comments

Comments
 (0)