Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to use BESS dpdk-2011 branch #204

Merged
merged 1 commit into from
Feb 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@ ARG CPU=native
RUN apt-get update && \
apt-get -y install --no-install-recommends \
ca-certificates \
libelf-dev

libelf-dev \
python3-pip \
python3-setuptools
RUN pip3 install --no-cache-dir \
meson \
ninja

ARG MAKEFLAGS

# linux ver should match target machine's kernel
WORKDIR /libbpf
ARG LIBBPF_VER=v0.1.0
ARG LIBBPF_VER=v0.3
RUN curl -L https://github.com/libbpf/libbpf/tarball/${LIBBPF_VER} | \
tar xz -C . --strip-components=1 && \
cp include/uapi/linux/if_xdp.h /usr/include/linux && \
Expand All @@ -25,7 +30,7 @@ RUN curl -L https://github.com/libbpf/libbpf/tarball/${LIBBPF_VER} | \

# BESS pre-reqs
WORKDIR /bess
ARG BESS_COMMIT=master
ARG BESS_COMMIT=dpdk-2011
RUN curl -L https://github.com/NetSys/bess/tarball/${BESS_COMMIT} | \
tar xz -C . --strip-components=1

Expand Down
76 changes: 0 additions & 76 deletions patches/bess/0002-DPDK-Add-AF_XDP-PMD-support.patch

This file was deleted.

14 changes: 0 additions & 14 deletions patches/bess/0003-Add-FIB-routing-support-in-IPLookup-module.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,10 @@ Subject: [PATCH] Add FIB routing support in IPLookup module.

Signed-off-by: Muhammad Asim Jamshed <muhammad.jamshed@intel.com>
---
build.py | 2 +-
core/modules/ip_lookup.cc | 61 +++++++++++++++++++++++++++++++++++++--
core/modules/ip_lookup.h | 14 +++++++++
3 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/build.py b/build.py
index 3fac9064..d0f16cc7 100755
--- a/build.py
+++ b/build.py
@@ -95,5 +95,5 @@ DPDK_TARGET = 'x86_64-native-linuxapp-gcc'
kernel_release = cmd('uname -r', quiet=True).strip()

DPDK_DIR = '%s/%s' % (DEPS_DIR, DPDK_VER)
-DPDK_CFLAGS = '"-g -w"'
+DPDK_CFLAGS = '"-g -w -DALLOW_EXPERIMENTAL_API"'
DPDK_CONFIG = '%s/build/.config' % DPDK_DIR

extra_libs = set()
diff --git a/core/modules/ip_lookup.cc b/core/modules/ip_lookup.cc
index 3c8b1157..7e976d41 100644
--- a/core/modules/ip_lookup.cc
Expand Down