Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kube OVN
Commits
bfcc952c
Unverified
Commit
bfcc952c
authored
2 years ago
by
Kaihang Zhang
Committed by
GitHub
2 years ago
1
Browse files
Options
Download
Email Patches
Plain Diff
fix: Add support for Mellanox NIC (#1999)
parent
f4c977f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dist/images/Dockerfile.base-dpdk
+5
-4
dist/images/Dockerfile.base-dpdk
dist/images/start-ovs-dpdk-v2.sh
+0
-7
dist/images/start-ovs-dpdk-v2.sh
with
5 additions
and
11 deletions
+5
-11
dist/images/Dockerfile.base-dpdk
+
5
-
4
View file @
bfcc952c
...
@@ -9,7 +9,8 @@ ENV SRC_DIR='/usr/src'
...
@@ -9,7 +9,8 @@ ENV SRC_DIR='/usr/src'
RUN apt update && apt install build-essential git libnuma-dev autoconf curl \
RUN apt update && apt install build-essential git libnuma-dev autoconf curl \
python3 libmnl-dev libpcap-dev libtool libcap-ng-dev libssl-dev pkg-config \
python3 libmnl-dev libpcap-dev libtool libcap-ng-dev libssl-dev pkg-config \
python3-six libunbound-dev libunwind-dev dh-make fakeroot debhelper dh-python \
python3-six libunbound-dev libunwind-dev dh-make fakeroot debhelper dh-python \
flake8 python3-sphinx graphviz groff wget libjemalloc-dev python3-pip -y
flake8 python3-sphinx graphviz groff wget libjemalloc-dev python3-pip libibverbs1 \
libibverbs-dev ibverbs-providers -y
RUN pip3 install meson ninja
RUN pip3 install meson ninja
...
@@ -28,7 +29,7 @@ RUN cd /usr/src/ && \
...
@@ -28,7 +29,7 @@ RUN cd /usr/src/ && \
RUN cd /usr/src/ && \
RUN cd /usr/src/ && \
git clone https://github.com/openvswitch/ovs.git && \
git clone https://github.com/openvswitch/ovs.git && \
cd ovs && \
cd ovs && \
git checkout
c50a0f080d95e9027
b7ba
3a70150b02c2377c721
&& \
git checkout
1570924c3f83851f39f56e3363050
b7
0
ba
1aafb0
&& \
curl -s https://github.com/kubeovn/ovs/commit/22ea22c40b46ee5adeae977ff6cfca81b3ff25d7.patch | git apply && \
curl -s https://github.com/kubeovn/ovs/commit/22ea22c40b46ee5adeae977ff6cfca81b3ff25d7.patch | git apply && \
curl -s https://github.com/openvswitch/ovs/commit/a432b1eb496cc1606873068c26716977a02029e2.patch | git apply && \
curl -s https://github.com/openvswitch/ovs/commit/a432b1eb496cc1606873068c26716977a02029e2.patch | git apply && \
# compile without avx512
# compile without avx512
...
@@ -44,7 +45,6 @@ RUN dpkg -i /usr/src/python3-openvswitch*.deb /usr/src/libopenvswitch*.deb
...
@@ -44,7 +45,6 @@ RUN dpkg -i /usr/src/python3-openvswitch*.deb /usr/src/libopenvswitch*.deb
RUN cd /usr/src/ && git clone -b branch-21.06 --depth=1 https://github.com/kubeovn/ovn.git && \
RUN cd /usr/src/ && git clone -b branch-21.06 --depth=1 https://github.com/kubeovn/ovn.git && \
cd ovn && \
cd ovn && \
sed -i 's/OVN/ovn/g' debian/changelog && \
sed -i 's/OVN/ovn/g' debian/changelog && \
rm -rf .git && \
rm -rf .git && \
./boot.sh && \
./boot.sh && \
...
@@ -72,7 +72,8 @@ ARG DEBIAN_FRONTEND=noninteractive
...
@@ -72,7 +72,8 @@ ARG DEBIAN_FRONTEND=noninteractive
RUN apt update && apt upgrade -y && apt install ca-certificates python3 hostname driverctl libunwind8 netbase \
RUN apt update && apt upgrade -y && apt install ca-certificates python3 hostname driverctl libunwind8 netbase \
ethtool iproute2 ncat libunbound-dev procps libatomic1 kmod iptables \
ethtool iproute2 ncat libunbound-dev procps libatomic1 kmod iptables \
tcpdump ipset curl uuid-runtime openssl inetutils-ping arping ndisc6 \
tcpdump ipset curl uuid-runtime openssl inetutils-ping arping ndisc6 \
logrotate libjemalloc2 dnsutils libnuma-dev -y --no-install-recommends && \
logrotate libjemalloc2 dnsutils libnuma-dev libibverbs1 libibverbs-dev \
ibverbs-providers libnl-3-dev libnl-route-3-dev libnl-3-200 libnl-route-3-200 -y --no-install-recommends && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /var/lib/apt/lists/* && \
cd /usr/sbin && \
cd /usr/sbin && \
ln -sf /usr/sbin/iptables-legacy iptables && \
ln -sf /usr/sbin/iptables-legacy iptables && \
...
...
This diff is collapsed.
Click to expand it.
dist/images/start-ovs-dpdk-v2.sh
+
0
-
7
View file @
bfcc952c
...
@@ -11,13 +11,6 @@ if ! test -f "$OVS_DPDK_CONFIG_FILE"; then
...
@@ -11,13 +11,6 @@ if ! test -f "$OVS_DPDK_CONFIG_FILE"; then
fi
fi
source
$OVS_DPDK_CONFIG_FILE
source
$OVS_DPDK_CONFIG_FILE
# set up driver
modprobe vfio-pci
# band nic to dpdk driver
driverctl set-override
${
DPDK_DEV
}
vfio-pci
# link sock
# link sock
mkdir
-p
/usr/local/var/run
mkdir
-p
/usr/local/var/run
...
...
This diff is collapsed.
Click to expand it.
小 白蛋
@baidan
mentioned in commit
0b47ca3d
·
2 years ago
mentioned in commit
0b47ca3d
mentioned in commit 0b47ca3d6d040f706a04a0c22c213518c95251d2
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help