Skip to content

QAT test updates #1599

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

Merged
merged 3 commits into from
Nov 20, 2023
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions demo/crypto-perf/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ WORKDIR $DIR

RUN echo "deb-src http://deb.debian.org/debian unstable main" >> \
/etc/apt/sources.list.d/deb-src.list
RUN apt-get update && apt-get install -y --no-install-recommends wget build-essential meson ninja-build python3-pyelftools libnuma-dev python3-pip libssl-dev pkg-config dpkg-dev
RUN apt-get update && apt-get install -y --no-install-recommends wget build-essential meson ninja-build python3-pyelftools libnuma-dev python3-pip pkg-config dpkg-dev libipsec-mb-dev

# Download & unpack DPDK tarball
ARG DPDK_TARBALL=dpdk-23.07-rc4.tar.xz
ARG DPDK_TARBALL_SHA256="f16e25a8b1eeb7335fbd265a6d4f9cce512709436efc80f6422ee9cfdf2f32b9"
ARG DPDK_TARBALL=dpdk-23.11-rc3.tar.xz
ARG DPDK_TARBALL_SHA256="cacd8b6d796f9983479f8c5989830cb86705922f8d6a813d83ecb82034088993"

ARG SOVERSION=23
RUN wget -q https://git.dpdk.org/dpdk/snapshot/$DPDK_TARBALL \
&& echo "$DPDK_TARBALL_SHA256 $DPDK_TARBALL" | sha256sum -c - \
&& tar -xf $DPDK_TARBALL && rm $DPDK_TARBALL

ARG SOVERSION=24
RUN cd dpdk-* && meson setup \
-Dplatform=generic \
-Dcpu_instruction_set=westmere \
Expand All @@ -28,7 +28,7 @@ RUN cd dpdk-* && \
install -D builddir/app/dpdk-test-crypto-perf /install_root/usr/bin/dpdk-test-crypto-perf && \
install -D builddir/app/dpdk-test-compress-perf /install_root/usr/bin/dpdk-test-compress-perf && \
install -d /install_root/usr/lib/x86_64-linux-gnu/ && \
for r in bus_pci eal kvargs hash security telemetry pci mbuf mempool ring net rcu ipsec cryptodev compressdev common_qat; do \
for r in log bus_pci eal kvargs hash security telemetry pci mbuf mempool ring net rcu ipsec cryptodev compressdev common_qat; do \
install installdir/lib/x86_64-linux-gnu/librte_${r}.so.${SOVERSION} /install_root/usr/lib/x86_64-linux-gnu/; \
done

Expand All @@ -38,7 +38,7 @@ RUN mkdir -p /install_root/licenses/dpdk && \
apt-get source --download-only -y libatomic1 libnuma1

FROM debian:sid-slim
RUN apt-get update && apt-get install -y --no-install-recommends libssl3 libnuma1 libatomic1 && ldconfig -v
RUN apt-get update && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
COPY --from=builder /install_root /
COPY run-dpdk-test /usr/bin/

Expand Down
10 changes: 5 additions & 5 deletions demo/openssl-qat-engine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ubuntu:22.04 as builder

ARG QATLIB_VERSION="23.08.0"
ARG QATLIB_VERSION="23.11.0"
ARG QAT_ENGINE_VERSION="v1.4.0"
ARG ASYNC_NGINX_VERSION="v0.5.1"
ARG IPSEC_MB_VERSION="v1.4"
ARG IPP_CRYPTO_VERSION="ippcp_2021.8"
ARG IPSEC_MB_VERSION="v1.5"
ARG IPP_CRYPTO_VERSION="ippcp_2021.9.0"

RUN apt update && \
env DEBIAN_FRONTEND=noninteractive apt install -y \
Expand Down Expand Up @@ -71,10 +71,10 @@ RUN cd /asynch_mode_nginx && \
FROM ubuntu:22.04

COPY --from=builder /usr/bin/*_sample* /usr/bin/
COPY --from=builder /usr/lib/libqat.so.4.0.0 /usr/lib/
COPY --from=builder /usr/lib/libqat.so.4.1.0 /usr/lib/
COPY --from=builder /usr/lib/libusdm.so.0.1.0 /usr/lib/
COPY --from=builder /usr/lib64/libIPSec_MB.so.1 /usr/lib/x86_64-linux-gnu/
COPY --from=builder /usr/local/lib/libcrypto_mb.so.11.8 /usr/lib/x86_64-linux-gnu/
COPY --from=builder /usr/local/lib/libcrypto_mb.so.11.9 /usr/lib/x86_64-linux-gnu/
COPY --from=builder /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so
COPY --from=builder /var/www/ /var/www/
COPY --from=builder /usr/lib64/nginx/* /usr/lib64/nginx/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kube-rbac-proxy
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
args:
- "--secure-listen-address=0.0.0.0:8443"
- "--upstream=http://127.0.0.1:8080/"
Expand Down