diff --git a/tools/packaging/qemu/patches/virtiofsd/0001-add-time-to-seccomp.patch b/tools/packaging/qemu/patches/virtiofsd/0001-add-time-to-seccomp.patch deleted file mode 100644 index deadcb5b09..0000000000 --- a/tools/packaging/qemu/patches/virtiofsd/0001-add-time-to-seccomp.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2317a63d2acab16be4655ec87542a2bf3d75551b Mon Sep 17 00:00:00 2001 -From: "Dr. David Alan Gilbert" -Date: Thu, 26 Sep 2019 18:41:34 +0100 -Subject: [PATCH] virtiofsd: Add time to seccomp - -Needed by static builds - -Signed-off-by: Dr. David Alan Gilbert ---- - contrib/virtiofsd/seccomp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/contrib/virtiofsd/seccomp.c b/contrib/virtiofsd/seccomp.c -index 3b92c6ee13..374bab2bef 100644 ---- a/contrib/virtiofsd/seccomp.c -+++ b/contrib/virtiofsd/seccomp.c -@@ -75,6 +75,7 @@ static const int syscall_whitelist[] = { - SCMP_SYS(setresuid), - SCMP_SYS(set_robust_list), - SCMP_SYS(symlinkat), -+ SCMP_SYS(time), /* Rarely needed, except on static builds */ - SCMP_SYS(tgkill), - SCMP_SYS(unlinkat), - SCMP_SYS(utimensat), --- -2.21.0 diff --git a/tools/packaging/qemu/patches/virtiofsd/0002-libvhost-user-Fix-the-VHOST_USER_PROTOCOL_F_SLAVE_SE.patch b/tools/packaging/qemu/patches/virtiofsd/0002-libvhost-user-Fix-the-VHOST_USER_PROTOCOL_F_SLAVE_SE.patch deleted file mode 100644 index 03f8f5c1b9..0000000000 --- a/tools/packaging/qemu/patches/virtiofsd/0002-libvhost-user-Fix-the-VHOST_USER_PROTOCOL_F_SLAVE_SE.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 47adda63e398a179b6211763377c8f61c5d62f5a Mon Sep 17 00:00:00 2001 -From: Sebastien Boeuf -Date: Wed, 7 Aug 2019 07:15:32 -0700 -Subject: [PATCH] libvhost-user: Fix the VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD - check - -Vhost user protocol features are set as a bitmask. And the following -constant VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD value is 10 because the bit -10 indicates if the features is set or not. - -The proper way to check for the presence or absence of this feature is -to shift 1 by the value of this constant and then mask it with the -actual bitmask representing the supported protocol features. - -This patch aims to fix the current code as it was not doing the -shifting, but instead it was masking directly with the value of the -constant itself. - -Signed-off-by: Sebastien Boeuf ---- - contrib/libvhost-user/libvhost-user.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c -index 215ce22b79..626e2a035f 100644 ---- a/contrib/libvhost-user/libvhost-user.c -+++ b/contrib/libvhost-user/libvhost-user.c -@@ -1129,7 +1129,8 @@ bool vu_set_queue_host_notifier(VuDev *dev, VuVirtq *vq, int fd, - - vmsg.fd_num = fd_num; - -- if ((dev->protocol_features & VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) == 0) { -+ if ((dev->protocol_features & -+ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD)) == 0) { - return false; - } - -@@ -2554,7 +2555,8 @@ int64_t vu_fs_cache_request(VuDev *dev, VhostUserSlaveRequest req, int fd, - - vmsg.fd_num = fd_num; - -- if ((dev->protocol_features & VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) == 0) { -+ if ((dev->protocol_features & -+ (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD)) == 0) { - return -EINVAL; - } - --- -2.20.1 - diff --git a/tools/packaging/static-build/qemu-virtiofs/Dockerfile b/tools/packaging/static-build/qemu-virtiofs/Dockerfile index 9f68ce8d95..2a906d6945 100644 --- a/tools/packaging/static-build/qemu-virtiofs/Dockerfile +++ b/tools/packaging/static-build/qemu-virtiofs/Dockerfile @@ -1,4 +1,4 @@ -from ubuntu:18.04 +from ubuntu:20.04 ARG QEMU_VIRTIOFS_REPO # commit/tag/branch @@ -19,37 +19,57 @@ RUN apt-get --no-install-recommends install -y \ flex \ gawk \ libaudit-dev \ + libblkid-dev \ libcap-dev \ libcap-ng-dev \ libdw-dev \ libelf-dev \ + libffi-dev \ libglib2.0-0 \ libglib2.0-dev \ libglib2.0-dev git \ libltdl-dev \ + libmount-dev \ libpixman-1-dev \ libpmem-dev \ libseccomp-dev \ + libseccomp2 \ + libselinux1-dev \ libtool \ - patch \ + make \ pkg-config \ pkg-config \ python \ python-dev \ rsync \ seccomp \ - libseccomp2 \ zlib1g-dev RUN cd .. && git clone "${QEMU_VIRTIOFS_REPO}" qemu-virtiofs RUN git checkout "${QEMU_VIRTIOFS_TAG}" -ADD qemu/patches/virtiofsd/0001-add-time-to-seccomp.patch /root/0001-add-time-to-seccomp.patch -ADD qemu/patches/virtiofsd/0002-libvhost-user-Fix-the-VHOST_USER_PROTOCOL_F_SLAVE_SE.patch /root/0002-libvhost-user-Fix-the-VHOST_USER_PROTOCOL_F_SLAVE_SE.patch -RUN patch -p1 < /root/0001-add-time-to-seccomp.patch -RUN patch -p1 < /root/0002-libvhost-user-Fix-the-VHOST_USER_PROTOCOL_F_SLAVE_SE.patch + ADD scripts/configure-hypervisor.sh /root/configure-hypervisor.sh -RUN PREFIX="${PREFIX}" /root/configure-hypervisor.sh -s kata-qemu | sed -e 's|--enable-rbd||g' -e 's|--disable-seccomp||g' | xargs ./configure \ +ADD qemu/patches/ /root/kata_qemu_patches + +# Apply experimental specific patches +# Patches to quick fix virtiofs fork +ENV VIRTIOFS_PATCHES_DIR=/root/kata_qemu_patches/${QEMU_VIRTIOFS_TAG}/ +RUN find "${VIRTIOFS_PATCHES_DIR}" -name '*.patch' -type f |sort -t- -k1,1n > patches_virtiofs +RUN echo "Patches to apply for virtiofs fixes:" +RUN cat patches_virtiofs +RUN [ ! -s patches_virtiofs ] || git apply $(cat patches_virtiofs) + +RUN cat VERSION | awk 'BEGIN{FS=OFS="."}{print $1 "." $2 ".x"}' > stable_branch +RUN echo "root/kata_qemu_patches/$(cat stable_branch)/" > patches_qemu_dir +RUN echo "patches dir $(cat patches_qemu_dir)" +RUN find "$(cat patches_qemu_dir)" -name '*.patch' -type f |sort -t- -k1,1n > patches_qemu +RUN echo "Patches to apply for qemu:" +RUN cat patches_qemu +RUN [ ! -s patches_qemu ] || git apply $(cat patches_qemu ) + +RUN PREFIX="${PREFIX}" /root/configure-hypervisor.sh -s kata-qemu | sed -e 's|--disable-seccomp||g' | xargs ./configure \ --with-pkgversion=kata-static + RUN make -j$(nproc) RUN make -j$(nproc) virtiofsd RUN make install DESTDIR=/tmp/qemu-virtiofs-static