Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dockers/docker-base-stretch/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ RUN apt-get -y purge \
{{ install_debian_packages(docker_base_stretch_debs.split(' ')) }}
{%- endif %}

# Base packages for bpf
RUN apt-get install -f -y libbpf-dev libelf-dev

# Clean up apt
# Remove /var/lib/apt/lists/*, could be obsoleted for derived images
RUN apt-get clean -y && \
Expand Down
2 changes: 2 additions & 0 deletions files/build_templates/docker_image_ctl.j2
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,8 @@ start() {
{%- if sonic_asic_platform != "mellanox" %}
--tmpfs /tmp \
{%- endif %}
-v /sys/kernel/debug:/sys/kernel/debug \
--ulimit memlock=67108864:67108864 \
--tmpfs /var/tmp \
--env "NAMESPACE_ID"="$DEV" \
--env "NAMESPACE_PREFIX"="$NAMESPACE_PREFIX" \
Expand Down
10 changes: 10 additions & 0 deletions rules/libebpf.dep
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

SPATH := $($(LIBEBPF)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/libebpf.mk rules/libebpf.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
DEP_FILES += $(shell git ls-files $(SPATH))

$(LIBEBPF)_CACHE_MODE := GIT_CONTENT_SHA
$(LIBEBPF)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(LIBEBPF)_DEP_FILES := $(DEP_FILES)

13 changes: 13 additions & 0 deletions rules/libebpf.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# BPF package
BPF_VERSION := 1.0.0
LIBEBPF = libebpf_$(BPF_VERSION)_$(CONFIGURED_ARCH).deb
$(LIBEBPF)_SRC_PATH = $(SRC_PATH)/libebpf
$(LIBEBPF)_DEPENDS += $(LINUX_HEADERS) $(LINUX_COMMON_HEADERS)
SONIC_MAKE_DEBS += $(LIBEBPF)

LIBEBPF_DBG = libebpf-dbgsym_$(BPF_VERSION)_$(CONFIGURED_ARCH).deb
$(LIBEBPF_DBG)_DEPENDS += $(LIBEBPF)
$(eval $(call add_derived_package,$(LIBEBPF),$(LIBEBPF_DBG)))

export LIBEBPF LIBEBPF_DBG BPF_VERSION

5 changes: 5 additions & 0 deletions sonic-slave-stretch/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,11 @@ RUN apt-get update && apt-get install -y \
# For iptables
libnetfilter-conntrack-dev \
libnftnl-dev \
# eBPF tools
clang-6.0 \
llvm-6.0 \
libbpf-dev \
libelf-dev \
# For SAI3.7
protobuf-compiler \
libprotobuf-dev \
Expand Down
14 changes: 14 additions & 0 deletions src/libebpf/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
SHELL = /bin/bash
.ONESHELL:
.SHELLFLAGS += -e

MAIN_TARGET := libebpf_$(EBPF_VERSION)_$(CONFIGURED_ARCH).deb

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :

pushd src
[ ! -f ./autogen.sh ] || ./autogen.sh
dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
popd

mv $(LIBEBPF_DBG) $* $(DEST)/
3 changes: 3 additions & 0 deletions src/libebpf/src/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ACLOCAL_AMFLAGS = -I m4

SUBDIRS = libutil samples/ebpf-kern-mod samples/ebpf-user-mod
6 changes: 6 additions & 0 deletions src/libebpf/src/autogen.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

libtoolize --force --copy &&
autoreconf --force --install -I m4
rm -Rf autom4te.cache

Loading