Bump libbpf to v0.6.1

.github/workflows/build.yml

@@ -85,7 +85,7 @@ jobs:
     - name: Build libbpf
       if: matrix.http3 == 'http3' && matrix.compiler == 'clang' && runner.os == 'Linux'
       run: |
-        git clone -b v0.4.0 https://github.com/libbpf/libbpf
+        git clone -b v0.6.1 https://github.com/libbpf/libbpf
         cd libbpf
         PREFIX=$PWD/build make -C src install
 

README.rst

@@ -170,7 +170,7 @@ Use ``--with-libbpf`` configure option to build eBPF program.
 libelf-dev is needed to build libbpf.
 
 For Ubuntu 20.04, you can build libbpf from `the source code
-<https://github.com/libbpf/libbpf/releases/tag/v0.4.0>`_.  nghttpx
+<https://github.com/libbpf/libbpf/releases/tag/v0.6.1>`_.  nghttpx
 requires eBPF program for reloading its configuration and hot swapping
 its executable.
 
@@ -393,7 +393,7 @@ from source:
 
 .. code-block:: text
 
-   $ git clone --depth 1 -b v0.4.0 https://github.com/libbpf/libbpf
+   $ git clone --depth 1 -b v0.6.1 https://github.com/libbpf/libbpf
    $ cd libbpf
    $ PREFIX=$PWD/build make -C src install
    $ cd ..

docker/Dockerfile

@@ -36,7 +36,7 @@ RUN git clone --depth 1 -b v0.1.0 https://github.com/ngtcp2/ngtcp2 && \
     cd .. && \
     rm -rf ngtcp2
 
-RUN git clone --depth 1 -b v0.4.0 https://github.com/libbpf/libbpf && \
+RUN git clone --depth 1 -b v0.6.1 https://github.com/libbpf/libbpf && \
     cd libbpf && \
     PREFIX=/usr/local make -C src install && \
     cd .. && \

src/shrpx_connection_handler.cc

@@ -1080,8 +1080,6 @@ std::vector<BPFRef> &ConnectionHandler::get_quic_bpf_refs() {
 }
 
 void ConnectionHandler::unload_bpf_objects() {
-  std::array<char, STRERROR_BUFSIZE> errbuf;
-
   LOG(NOTICE) << "Unloading BPF objects";
 
   for (auto &ref : quic_bpf_refs_) {
@@ -1089,11 +1087,7 @@ void ConnectionHandler::unload_bpf_objects() {
       continue;
     }
 
-    if (bpf_object__unload(ref.obj) != 0) {
-      LOG(WARN) << "Failed to unload bpf object: "
-                << xsi_strerror(errno, errbuf.data(), errbuf.size());
-      continue;
-    }
+    bpf_object__close(ref.obj);
 
     ref.obj = nullptr;
   }