From f144366f1a35decff75b7baf99b16cf794de1f7c Mon Sep 17 00:00:00 2001 From: Richard Patel Date: Mon, 11 Aug 2025 23:56:42 +0000 Subject: [PATCH] bundle: sleep while disconnected Saves power when disconnected from the bundle server --- src/disco/bundle/fd_bundle_client.c | 6 ++- src/disco/bundle/fd_bundle_tile.seccomppolicy | 4 ++ .../bundle/generated/fd_bundle_tile_seccomp.h | 50 ++++++++++--------- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/disco/bundle/fd_bundle_client.c b/src/disco/bundle/fd_bundle_client.c index c98c2854a3b..7cee647bcb7 100644 --- a/src/disco/bundle/fd_bundle_client.c +++ b/src/disco/bundle/fd_bundle_client.c @@ -339,8 +339,12 @@ fd_bundle_client_step1( fd_bundle_tile_t * ctx, /* gRPC conn died? */ if( FD_UNLIKELY( !ctx->grpc_client ) ) { + long sleep_start; reconnect: - if( FD_UNLIKELY( fd_bundle_tile_should_stall( ctx, fd_bundle_now() ) ) ) { + sleep_start = fd_bundle_now(); + if( FD_UNLIKELY( fd_bundle_tile_should_stall( ctx, sleep_start ) ) ) { + long wait_dur = ctx->backoff_until - sleep_start; + fd_log_sleep( fd_long_min( wait_dur, 1e6 ) ); return; } fd_bundle_client_create_conn( ctx ); diff --git a/src/disco/bundle/fd_bundle_tile.seccomppolicy b/src/disco/bundle/fd_bundle_tile.seccomppolicy index 2901560c25d..4fa93b93146 100644 --- a/src/disco/bundle/fd_bundle_tile.seccomppolicy +++ b/src/disco/bundle/fd_bundle_tile.seccomppolicy @@ -119,3 +119,7 @@ lseek: (and (or (eq (arg 0) etc_resolv_conf) (eq (arg 0) etc_hosts_fd)) (eq (arg 1) 0) (eq (arg 2) "SEEK_SET")) + +# bundle: yield to scheduler to save power +sched_yield +clock_nanosleep diff --git a/src/disco/bundle/generated/fd_bundle_tile_seccomp.h b/src/disco/bundle/generated/fd_bundle_tile_seccomp.h index 40e70807627..f9f305931e5 100644 --- a/src/disco/bundle/generated/fd_bundle_tile_seccomp.h +++ b/src/disco/bundle/generated/fd_bundle_tile_seccomp.h @@ -21,54 +21,58 @@ #else # error "Target architecture is unsupported by seccomp." #endif -static const unsigned int sock_filter_policy_fd_bundle_tile_instr_cnt = 95; +static const unsigned int sock_filter_policy_fd_bundle_tile_instr_cnt = 97; static void populate_sock_filter_policy_fd_bundle_tile( ulong out_cnt, struct sock_filter * out, uint logfile_fd, uint keylog_fd, uint etc_hosts_fd, uint etc_resolv_conf ) { - FD_TEST( out_cnt >= 95 ); - struct sock_filter filter[95] = { + FD_TEST( out_cnt >= 97 ); + struct sock_filter filter[97] = { /* Check: Jump to RET_KILL_PROCESS if the script's arch != the runtime arch */ BPF_STMT( BPF_LD | BPF_W | BPF_ABS, ( offsetof( struct seccomp_data, arch ) ) ), - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, ARCH_NR, 0, /* RET_KILL_PROCESS */ 91 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, ARCH_NR, 0, /* RET_KILL_PROCESS */ 93 ), /* loading syscall number in accumulator */ BPF_STMT( BPF_LD | BPF_W | BPF_ABS, ( offsetof( struct seccomp_data, nr ) ) ), /* simply allow read */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_read, /* RET_ALLOW */ 90, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_read, /* RET_ALLOW */ 92, 0 ), /* allow recvmsg based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_recvmsg, /* check_recvmsg */ 18, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_recvmsg, /* check_recvmsg */ 20, 0 ), /* simply allow write */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_write, /* RET_ALLOW */ 88, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_write, /* RET_ALLOW */ 90, 0 ), /* allow writev based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_writev, /* check_writev */ 20, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_writev, /* check_writev */ 22, 0 ), /* allow sendmsg based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_sendmsg, /* check_sendmsg */ 23, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_sendmsg, /* check_sendmsg */ 25, 0 ), /* allow sendto based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_sendto, /* check_sendto */ 28, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_sendto, /* check_sendto */ 30, 0 ), /* allow fsync based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_fsync, /* check_fsync */ 29, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_fsync, /* check_fsync */ 31, 0 ), /* allow socket based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_socket, /* check_socket */ 30, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_socket, /* check_socket */ 32, 0 ), /* simply allow connect */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_connect, /* RET_ALLOW */ 82, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_connect, /* RET_ALLOW */ 84, 0 ), /* allow shutdown based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_shutdown, /* check_shutdown */ 46, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_shutdown, /* check_shutdown */ 48, 0 ), /* simply allow close */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_close, /* RET_ALLOW */ 80, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_close, /* RET_ALLOW */ 82, 0 ), /* allow fcntl based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_fcntl, /* check_fcntl */ 46, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_fcntl, /* check_fcntl */ 48, 0 ), /* allow bind based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_bind, /* check_bind */ 49, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_bind, /* check_bind */ 51, 0 ), /* simply allow ppoll */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_ppoll, /* RET_ALLOW */ 77, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_ppoll, /* RET_ALLOW */ 79, 0 ), /* allow setsockopt based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_setsockopt, /* check_setsockopt */ 51, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_setsockopt, /* check_setsockopt */ 53, 0 ), /* simply allow getsockname */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_getsockname, /* RET_ALLOW */ 75, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_getsockname, /* RET_ALLOW */ 77, 0 ), /* simply allow getpid */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_getpid, /* RET_ALLOW */ 74, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_getpid, /* RET_ALLOW */ 76, 0 ), /* simply allow getrandom */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_getrandom, /* RET_ALLOW */ 73, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_getrandom, /* RET_ALLOW */ 75, 0 ), /* allow lseek based on expression */ - BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_lseek, /* check_lseek */ 63, 0 ), + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_lseek, /* check_lseek */ 65, 0 ), + /* simply allow sched_yield */ + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_sched_yield, /* RET_ALLOW */ 73, 0 ), + /* simply allow clock_nanosleep */ + BPF_JUMP( BPF_JMP | BPF_JEQ | BPF_K, SYS_clock_nanosleep, /* RET_ALLOW */ 72, 0 ), /* none of the syscalls matched */ { BPF_JMP | BPF_JA, 0, 0, /* RET_KILL_PROCESS */ 70 }, // check_recvmsg: