From 086b85b8f971b372dc061ad52966a2d92804369a Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Mon, 4 Oct 2021 22:39:31 +0900
Subject: [PATCH] nghttpx: Unload BPF program after setting up all QUIC
 listeners

---
 src/shrpx.cc                | 4 ----
 src/shrpx_process.h         | 1 -
 src/shrpx_worker_process.cc | 7 ++-----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/shrpx.cc b/src/shrpx.cc
index a4faaa69..f77db9fa 100644
--- a/src/shrpx.cc
+++ b/src/shrpx.cc
@@ -3885,10 +3885,6 @@ void reload_config(WorkerProcess *wp) {
 #endif // ENABLE_HTTP3
                                                      ));
 
-#ifdef ENABLE_HTTP3
-  ipc_send(last_wp.get(), SHRPX_IPC_UNLOAD_BPF_OBJECT);
-#endif // ENABLE_HTTP3
-
   worker_process_adjust_limit();
 
   if (!get_config()->pid_file.empty()) {
diff --git a/src/shrpx_process.h b/src/shrpx_process.h
index b64e5c73..d35461b9 100644
--- a/src/shrpx_process.h
+++ b/src/shrpx_process.h
@@ -31,7 +31,6 @@ namespace shrpx {
 
 constexpr uint8_t SHRPX_IPC_REOPEN_LOG = 1;
 constexpr uint8_t SHRPX_IPC_GRACEFUL_SHUTDOWN = 2;
-constexpr uint8_t SHRPX_IPC_UNLOAD_BPF_OBJECT = 3;
 
 } // namespace shrpx
 
diff --git a/src/shrpx_worker_process.cc b/src/shrpx_worker_process.cc
index 8b55e386..85b94c47 100644
--- a/src/shrpx_worker_process.cc
+++ b/src/shrpx_worker_process.cc
@@ -175,11 +175,6 @@ void ipc_readcb(struct ev_loop *loop, ev_io *w, int revents) {
     case SHRPX_IPC_REOPEN_LOG:
       reopen_log(conn_handler);
       break;
-#if defined(ENABLE_HTTP3) && defined(HAVE_LIBBPF)
-    case SHRPX_IPC_UNLOAD_BPF_OBJECT:
-      conn_handler->unload_bpf_objects();
-      break;
-#endif // defined(ENABLE_HTTP3) && defined(HAVE_LIBBPF)
     }
   }
 }
@@ -608,6 +603,8 @@ int worker_process_event_loop(WorkerProcessConfig *wpconf) {
 #endif // !NOTHREADS
   }
 
+  conn_handler->unload_bpf_objects();
+
   drop_privileges(
 #ifdef HAVE_NEVERBLEED
       nb.get()