walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Bump libbpf to v0.6.1

This commit is contained in:
Tatsuhiro Tsujikawa 2022-02-09 18:46:57 +09:00
parent 832d811982
commit 02f2336ab1
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -85,7 +85,7 @@ jobs:
- name: Build libbpf - name: Build libbpf
if: matrix.http3 == 'http3' && matrix.compiler == 'clang' && runner.os == 'Linux' if: matrix.http3 == 'http3' && matrix.compiler == 'clang' && runner.os == 'Linux'
run: | 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 cd libbpf
PREFIX=$PWD/build make -C src install PREFIX=$PWD/build make -C src install

4
README.rst
View File

@ -170,7 +170,7 @@ Use ``--with-libbpf`` configure option to build eBPF program.
libelf-dev is needed to build libbpf. libelf-dev is needed to build libbpf.
For Ubuntu 20.04, you can build libbpf from `the source code 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 requires eBPF program for reloading its configuration and hot swapping
its executable. its executable.
@ -393,7 +393,7 @@ from source:
.. code-block:: text .. 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 $ cd libbpf
$ PREFIX=$PWD/build make -C src install $ PREFIX=$PWD/build make -C src install
$ cd .. $ cd ..

2
docker/Dockerfile
View File

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

8
src/shrpx_connection_handler.cc
View File

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