From 5995d9a10dc3b66b4ea458da056dbda0cec9b506 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 20 Nov 2017 13:53:35 +0000 Subject: [PATCH 01/13] kernel: Fix Dockerfile.kbuild Patches were not applied and this fixes it as well as tidying up the error handling. Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile.kconfig | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig index fbd9e282c..182bbe092 100644 --- a/kernel/Dockerfile.kconfig +++ b/kernel/Dockerfile.kconfig @@ -13,7 +13,8 @@ ARG KERNEL_VERSIONS COPY / / # Unpack kernels (download if not present) -RUN set -e && for VERSION in ${KERNEL_VERSIONS}; do \ +RUN set -e && \ + for VERSION in ${KERNEL_VERSIONS}; do \ echo "Downloading/Unpacking $VERSION" && \ KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${VERSION}.tar.xz && \ [ -f sources/linux-${VERSION}.tar.xz ] || curl -fSLo sources/linux-${VERSION}.tar.xz ${KERNEL_SOURCE} && \ @@ -21,12 +22,12 @@ RUN set -e && for VERSION in ${KERNEL_VERSIONS}; do \ done # Apply patches to all kernels and move config files into place -RUN for VERSION in ${KERNEL_VERSIONS}; do \ +RUN set -e && \ + for VERSION in ${KERNEL_VERSIONS}; do \ SERIES=${VERSION%.*}.x && \ - echo "Patching $VERSION" && \ + echo "Patching $VERSION $SERIES" && \ cd /linux-${VERSION} && \ - set -e && \ - if [ -d /patches-${KERNEL_SERIES} ]; then \ + if [ -d /patches-${SERIES} ]; then \ for patch in /patches-${SERIES}/*.patch; do \ echo "Applying $patch" && \ patch -p1 < "$patch"; \ From eb9a5604a8e838f57bb5ac5299785f3097ead547 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 20 Nov 2017 16:09:20 +0000 Subject: [PATCH 02/13] tools/alpine: Add mpc1-dev/mpfr-dev These are needed to enable GCC_PLUGINS for the Linux kernel build. Signed-off-by: Rolf Neugebauer --- tools/alpine/packages | 2 ++ tools/alpine/versions.aarch64 | 6 ++++-- tools/alpine/versions.x86_64 | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/alpine/packages b/tools/alpine/packages index fd52d985b..0d300913c 100644 --- a/tools/alpine/packages +++ b/tools/alpine/packages @@ -68,6 +68,8 @@ libunwind-dev linux-headers lsscsi make +mpc1-dev +mpfr-dev mtools multipath-tools musl-dev diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index aa18c677c..0333f67d9 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:941b953167b50becb3b34992df9cd9791edb1a08-arm64 +# linuxkit/alpine:4e4f7a9be7a10f1378542c6cb739c43806f02fde-arm64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 @@ -183,6 +183,8 @@ m4-1.4.18-r0 make-4.2.1-r0 mesa-gbm-17.0.3-r1 mpc1-1.0.3-r0 +mpc1-dev-1.0.3-r0 +mpfr-dev-3.1.5-r0 mpfr3-3.1.5-r0 mtools-4.0.18-r1 multipath-tools-0.7.1-r1 @@ -257,7 +259,7 @@ util-linux-dev-2.28.2-r2 vde2-libs-2.3.2-r7 vim-8.0.0595-r0 wayland-1.13.0-r0 -wireguard-tools-0.0.20171101-r0 +wireguard-tools-0.0.20171111-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r4 xfsprogs-4.5.0-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index a733d0320..3d4814d5e 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28-amd64 +# linuxkit/alpine:585174df463ba33e6c0e2050a29a0d9e942d56cb-amd64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 @@ -189,6 +189,8 @@ make-4.2.1-r0 mesa-gbm-17.0.3-r1 mkinitfs-3.1.0-r3 mpc1-1.0.3-r0 +mpc1-dev-1.0.3-r0 +mpfr-dev-3.1.5-r0 mpfr3-3.1.5-r0 mtools-4.0.18-r1 multipath-tools-0.7.1-r1 @@ -265,7 +267,7 @@ util-linux-dev-2.28.2-r2 vde2-libs-2.3.2-r7 vim-8.0.0595-r0 wayland-1.13.0-r0 -wireguard-tools-0.0.20171101-r0 +wireguard-tools-0.0.20171111-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r4 xfsprogs-4.5.0-r0 From 2c1fdc7b471632412d86ae58826c27fdd63008c1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 20 Nov 2017 16:53:38 +0000 Subject: [PATCH 03/13] kernel: Use latest linuxkit/alpine and install mpc1-dev/mpfr-dev The GCC_PLUGINS config options enabled in the next commits require mpc1-dev/mpfr-dev Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 4 +++- kernel/Dockerfile.kconfig | 2 +- kernel/Dockerfile.zfs | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 988eaf450..7d3edf0b2 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS kernel-build +FROM linuxkit/alpine:585174df463ba33e6c0e2050a29a0d9e942d56cb AS kernel-build RUN apk add \ argp-standalone \ automake \ @@ -18,6 +18,8 @@ RUN apk add \ libelf-dev \ libressl-dev \ linux-headers \ + mpc1-dev \ + mpfr-dev \ ncurses-dev \ sed \ squashfs-tools \ diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig index 182bbe092..2abd5d84f 100644 --- a/kernel/Dockerfile.kconfig +++ b/kernel/Dockerfile.kconfig @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS kernel-build +FROM linuxkit/alpine:585174df463ba33e6c0e2050a29a0d9e942d56cb AS kernel-build RUN apk add \ argp-standalone \ build-base \ diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs index 1f392ec30..cce8896cc 100644 --- a/kernel/Dockerfile.zfs +++ b/kernel/Dockerfile.zfs @@ -1,6 +1,6 @@ ARG IMAGE FROM ${IMAGE} AS ksrc -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build +FROM linuxkit/alpine:585174df463ba33e6c0e2050a29a0d9e942d56cb AS build RUN apk add \ attr-dev \ autoconf \ @@ -10,6 +10,8 @@ RUN apk add \ git \ libtirpc-dev \ libtool \ + mpc1-dev \ + mpfr-dev \ util-linux-dev \ zlib-dev From b0db43567ea0f23b12cae7619f727bd91effe992 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 20 Nov 2017 11:27:51 +0000 Subject: [PATCH 04/13] kernel: Enable GCC_PLUGIN on kernels supporting it Subsequent commits will enable selected sub options. Signed-off-by: Rolf Neugebauer --- kernel/config-4.13.x-aarch64 | 6 +++++- kernel/config-4.13.x-x86_64 | 6 +++++- kernel/config-4.14.x-aarch64 | 6 +++++- kernel/config-4.14.x-x86_64 | 6 +++++- kernel/config-4.9.x-aarch64 | 4 +++- kernel/config-4.9.x-x86_64 | 4 +++- 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/kernel/config-4.13.x-aarch64 b/kernel/config-4.13.x-aarch64 index 604f5d3a1..9a940dd6c 100644 --- a/kernel/config-4.13.x-aarch64 +++ b/kernel/config-4.13.x-aarch64 @@ -250,7 +250,11 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set +CONFIG_GCC_PLUGINS=y +# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set +# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set diff --git a/kernel/config-4.13.x-x86_64 b/kernel/config-4.13.x-x86_64 index 76bbeb318..af845a20e 100644 --- a/kernel/config-4.13.x-x86_64 +++ b/kernel/config-4.13.x-x86_64 @@ -294,7 +294,11 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set +CONFIG_GCC_PLUGINS=y +# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set +# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index 152ce6cf2..b25d80008 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -253,7 +253,11 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set +CONFIG_GCC_PLUGINS=y +# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set +# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index a7346d661..755ec692c 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -296,7 +296,11 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set +CONFIG_GCC_PLUGINS=y +# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set +# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set diff --git a/kernel/config-4.9.x-aarch64 b/kernel/config-4.9.x-aarch64 index 11f02615e..f5af3d236 100644 --- a/kernel/config-4.9.x-aarch64 +++ b/kernel/config-4.9.x-aarch64 @@ -238,7 +238,9 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set +CONFIG_GCC_PLUGINS=y +# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set diff --git a/kernel/config-4.9.x-x86_64 b/kernel/config-4.9.x-x86_64 index 909aeca7f..acc848494 100644 --- a/kernel/config-4.9.x-x86_64 +++ b/kernel/config-4.9.x-x86_64 @@ -282,7 +282,9 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set +CONFIG_GCC_PLUGINS=y +# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set From 8d164266445a2f3122eb0722cfaeda7554ac3854 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 20 Nov 2017 14:16:42 +0000 Subject: [PATCH 05/13] kernel: Enable GCC_PLUGIN_STRUCTLEAK on kernels supporting it The 4.13 and 4.14 kernels support GCC_PLUGIN_STRUCTLEAK, a GCC plugin to zero initialise any structures with the __user attribute to prevent information exposure. On 4.14 kernels also enable GCC_PLUGIN_STRUCTLEAK_BYREF_ALL which is an extension of the above Signed-off-by: Rolf Neugebauer --- kernel/config-4.13.x-aarch64 | 3 ++- kernel/config-4.13.x-x86_64 | 3 ++- kernel/config-4.14.x-aarch64 | 4 +++- kernel/config-4.14.x-x86_64 | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/kernel/config-4.13.x-aarch64 b/kernel/config-4.13.x-aarch64 index 9a940dd6c..8dc821b8b 100644 --- a/kernel/config-4.13.x-aarch64 +++ b/kernel/config-4.13.x-aarch64 @@ -253,7 +253,8 @@ CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set +CONFIG_GCC_PLUGIN_STRUCTLEAK=y +# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y diff --git a/kernel/config-4.13.x-x86_64 b/kernel/config-4.13.x-x86_64 index af845a20e..f7a590cd8 100644 --- a/kernel/config-4.13.x-x86_64 +++ b/kernel/config-4.13.x-x86_64 @@ -297,7 +297,8 @@ CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set +CONFIG_GCC_PLUGIN_STRUCTLEAK=y +# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index b25d80008..0425b552c 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -256,7 +256,9 @@ CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set +CONFIG_GCC_PLUGIN_STRUCTLEAK=y +CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y +# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index 755ec692c..860225e22 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -299,7 +299,9 @@ CONFIG_HAVE_GCC_PLUGINS=y CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set +CONFIG_GCC_PLUGIN_STRUCTLEAK=y +CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y +# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y From 66342d0646c60358487598cd65b7f1bc98422d1e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 20 Nov 2017 15:10:02 +0000 Subject: [PATCH 06/13] kernel: Enable GCC_PLUGIN_RANDSTRUCT on kernels supporting it On 4.13 and 4.14 kernels GCC_PLUGIN_RANDSTRUCT can be use to randomise some kernel data structures such as structs with function pointers. We also select GCC_PLUGIN_RANDSTRUCT_PERFORMANCE which tries harder to restrict randomisation to cache-lines in order to reduce performance impact. Signed-off-by: Rolf Neugebauer --- kernel/config-4.13.x-aarch64 | 5 +++-- kernel/config-4.13.x-x86_64 | 5 +++-- kernel/config-4.14.x-aarch64 | 5 +++-- kernel/config-4.14.x-x86_64 | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/kernel/config-4.13.x-aarch64 b/kernel/config-4.13.x-aarch64 index 8dc821b8b..b6e477048 100644 --- a/kernel/config-4.13.x-aarch64 +++ b/kernel/config-4.13.x-aarch64 @@ -255,7 +255,8 @@ CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_GCC_PLUGIN_STRUCTLEAK=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set -# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set +CONFIG_GCC_PLUGIN_RANDSTRUCT=y +CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set @@ -298,7 +299,7 @@ CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel/config-4.13.x-x86_64 b/kernel/config-4.13.x-x86_64 index f7a590cd8..0a6d24205 100644 --- a/kernel/config-4.13.x-x86_64 +++ b/kernel/config-4.13.x-x86_64 @@ -299,7 +299,8 @@ CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_GCC_PLUGIN_STRUCTLEAK=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set -# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set +CONFIG_GCC_PLUGIN_RANDSTRUCT=y +CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set @@ -353,7 +354,7 @@ CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index 0425b552c..0faa0ca9d 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -259,7 +259,8 @@ CONFIG_GCC_PLUGINS=y CONFIG_GCC_PLUGIN_STRUCTLEAK=y CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set -# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set +CONFIG_GCC_PLUGIN_RANDSTRUCT=y +CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set @@ -303,7 +304,7 @@ CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index 860225e22..a11d00e58 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -302,7 +302,8 @@ CONFIG_GCC_PLUGINS=y CONFIG_GCC_PLUGIN_STRUCTLEAK=y CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set -# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set +CONFIG_GCC_PLUGIN_RANDSTRUCT=y +CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set @@ -357,7 +358,7 @@ CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set # CONFIG_MODULE_COMPRESS is not set From f79c392ce3041e55f9e54224b60c563891fd3bc8 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 20 Nov 2017 15:33:23 +0000 Subject: [PATCH 07/13] kernel: Enable REFCOUNT_FULL on kernels supporting it REFCOUNT_FULL enables full reference count validation. There is a potential slow down but ti protects against certain use-after-free attacks. Signed-off-by: Rolf Neugebauer --- kernel/config-4.13.x-aarch64 | 2 +- kernel/config-4.13.x-x86_64 | 2 +- kernel/config-4.14.x-aarch64 | 2 +- kernel/config-4.14.x-x86_64 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/config-4.13.x-aarch64 b/kernel/config-4.13.x-aarch64 index b6e477048..4ab210e3f 100644 --- a/kernel/config-4.13.x-aarch64 +++ b/kernel/config-4.13.x-aarch64 @@ -284,7 +284,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -# CONFIG_REFCOUNT_FULL is not set +CONFIG_REFCOUNT_FULL=y # # GCOV-based kernel profiling diff --git a/kernel/config-4.13.x-x86_64 b/kernel/config-4.13.x-x86_64 index 0a6d24205..ffdf51f47 100644 --- a/kernel/config-4.13.x-x86_64 +++ b/kernel/config-4.13.x-x86_64 @@ -339,7 +339,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -# CONFIG_REFCOUNT_FULL is not set +CONFIG_REFCOUNT_FULL=y # # GCOV-based kernel profiling diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index 0faa0ca9d..8833c94b0 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -289,7 +289,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -# CONFIG_REFCOUNT_FULL is not set +CONFIG_REFCOUNT_FULL=y # # GCOV-based kernel profiling diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index a11d00e58..053c7d103 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -343,7 +343,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -# CONFIG_REFCOUNT_FULL is not set +CONFIG_REFCOUNT_FULL=y # # GCOV-based kernel profiling From 717829ea89b9ad1f10fad3d6c32a1364518557ac Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 21 Nov 2017 11:44:00 +0000 Subject: [PATCH 08/13] kernel: Don't build a debug kernel for 4.13 We already have too many kernels to build and 4.13 will be EOLed soon Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 3 ++- kernel/Makefile | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 7d3edf0b2..6a79c8d16 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -142,7 +142,8 @@ RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdept -path './arch/*/include' -prune -o \ -path './scripts/*' -prune -o \ -type f \( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \ - -name '*.lds' -o -name '*.pl' -o -name '*.sh' \) | \ + -name '*.lds' -o -name '*.pl' -o -name '*.sh' -o \ + -name 'objtool' -o -name 'fixdep' -o -name 'randomize_layout_seed.h' \) | \ tar cf - -T - | (cd $dir; tar xf -) && \ ( cd /tmp && tar cf /out/kernel-dev.tar usr/src ) diff --git a/kernel/Makefile b/kernel/Makefile index c5c294ac5..fbf455082 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -175,7 +175,6 @@ endef $(eval $(call kernel,4.14,4.14.x,$(EXTRA))) $(eval $(call kernel,4.14,4.14.x,-dbg)) $(eval $(call kernel,4.13.13,4.13.x,$(EXTRA))) -$(eval $(call kernel,4.13.13,4.13.x,-dbg)) $(eval $(call kernel,4.9.62,4.9.x,$(EXTRA))) $(eval $(call kernel,4.9.62,4.9.x,-dbg)) $(eval $(call kernel,4.4.98,4.4.x,$(EXTRA))) From f5e970b7fba3ff79d4486ed0333356c428ad2b9c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 20 Nov 2017 15:57:35 +0000 Subject: [PATCH 09/13] kernel: Update to 4.13.14/4.9.63/4.4.99 Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 8 ++++---- kernel/config-4.13.x-aarch64 | 2 +- kernel/config-4.13.x-x86_64 | 2 +- kernel/config-4.4.x-aarch64 | 2 +- kernel/config-4.4.x-x86_64 | 2 +- kernel/config-4.9.x-aarch64 | 2 +- kernel/config-4.9.x-x86_64 | 2 +- ...bus-vmbus_open-reset-onchannel_callback-on-error.patch | 2 +- ...us-remove-goto-error_clean_msglist-in-vmbus_open.patch | 2 +- ...ock-implements-Hyper-V-transport-for-Virtual-Soc.patch | 2 +- .../0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch | 2 +- .../0005-hv_sock-add-the-support-of-auto-loading.patch | 2 +- .../0006-tools-hv_sock-2-simple-test-cases.patch | 2 +- .../0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch | 2 +- ...008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch | 2 +- ...ock-a-temporary-workaround-for-the-pending_send_.patch | 2 +- ...-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch | 2 +- ...t4-fix-fault-handling-when-mounted-with-o-dax-ro.patch | 2 +- ...MM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch | 2 +- .../0001-tools-build-Add-test-for-sched_getcpu.patch | 2 +- ...f-jit-Avoid-returning-garbage-for-a-ret-variable.patch | 2 +- .../0003-hv_sock-introduce-Hyper-V-Sockets.patch | 2 +- ...004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch | 2 +- ...ers-hv-utils-Fix-the-mapping-between-host-versio.patch | 2 +- .../0006-Drivers-hv-vss-Improve-log-messages.patch | 2 +- ...ers-hv-vss-Operation-timeouts-should-match-host-.patch | 2 +- ...ers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch | 2 +- .../0009-Drivers-hv-Log-the-negotiated-IC-versions.patch | 2 +- .../0010-vmbus-fix-missed-ring-events-on-boot.patch | 2 +- ...us-remove-goto-error_clean_msglist-in-vmbus_open.patch | 2 +- ...s-dynamically-enqueue-dequeue-the-channel-on-vmb.patch | 2 +- 31 files changed, 34 insertions(+), 34 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index fbf455082..a26291e7d 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -174,10 +174,10 @@ endef # $(eval $(call kernel,4.14,4.14.x,$(EXTRA))) $(eval $(call kernel,4.14,4.14.x,-dbg)) -$(eval $(call kernel,4.13.13,4.13.x,$(EXTRA))) -$(eval $(call kernel,4.9.62,4.9.x,$(EXTRA))) -$(eval $(call kernel,4.9.62,4.9.x,-dbg)) -$(eval $(call kernel,4.4.98,4.4.x,$(EXTRA))) +$(eval $(call kernel,4.13.14,4.13.x,$(EXTRA))) +$(eval $(call kernel,4.9.63,4.9.x,$(EXTRA))) +$(eval $(call kernel,4.9.63,4.9.x,-dbg)) +$(eval $(call kernel,4.4.99,4.4.x,$(EXTRA))) # Target for kernel config kconfig: | sources diff --git a/kernel/config-4.13.x-aarch64 b/kernel/config-4.13.x-aarch64 index 4ab210e3f..74d2140ee 100644 --- a/kernel/config-4.13.x-aarch64 +++ b/kernel/config-4.13.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.13.13 Kernel Configuration +# Linux/arm64 4.13.14 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.13.x-x86_64 b/kernel/config-4.13.x-x86_64 index ffdf51f47..c3a4a9ebb 100644 --- a/kernel/config-4.13.x-x86_64 +++ b/kernel/config-4.13.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.13.13 Kernel Configuration +# Linux/x86 4.13.14 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.4.x-aarch64 b/kernel/config-4.4.x-aarch64 index d519ae1ea..20072c7ac 100644 --- a/kernel/config-4.4.x-aarch64 +++ b/kernel/config-4.4.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.4.98 Kernel Configuration +# Linux/arm64 4.4.99 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.4.x-x86_64 b/kernel/config-4.4.x-x86_64 index 36c43d82c..92a74f8b8 100644 --- a/kernel/config-4.4.x-x86_64 +++ b/kernel/config-4.4.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.98 Kernel Configuration +# Linux/x86 4.4.99 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.9.x-aarch64 b/kernel/config-4.9.x-aarch64 index f5af3d236..4b9bb2bbe 100644 --- a/kernel/config-4.9.x-aarch64 +++ b/kernel/config-4.9.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.62 Kernel Configuration +# Linux/arm64 4.9.63 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.9.x-x86_64 b/kernel/config-4.9.x-x86_64 index acc848494..a54b2f0ad 100644 --- a/kernel/config-4.9.x-x86_64 +++ b/kernel/config-4.9.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.62 Kernel Configuration +# Linux/x86 4.9.63 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch b/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch index 35b301918..f508487b0 100644 --- a/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch +++ b/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch @@ -1,4 +1,4 @@ -From d43464fb275afeba676d2402bd24305b2812c81d Mon Sep 17 00:00:00 2001 +From b43d442205092edc95d0b7d452b728c69e21d5ac Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:12 -0600 Subject: [PATCH 01/12] vmbus: vmbus_open(): reset onchannel_callback on error diff --git a/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch b/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch index 83c3a1fd5..f93beb57f 100644 --- a/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch +++ b/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch @@ -1,4 +1,4 @@ -From 608ca133adfc444f5824e455ee5b92590e4110ed Mon Sep 17 00:00:00 2001 +From bd099cbe34d9cfa5f7d63d20a1aa86d8c9ccaca0 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:20 -0600 Subject: [PATCH 02/12] vmbus: remove "goto error_clean_msglist" in diff --git a/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch b/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch index c946bfa87..118dfd767 100644 --- a/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch +++ b/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch @@ -1,4 +1,4 @@ -From 49aec551372d5b95714c54a8ac6e8e478f1f719d Mon Sep 17 00:00:00 2001 +From 084235c775dc08582cba3ec2d6a8fa85402e2c52 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:26 -0600 Subject: [PATCH 03/12] hv_sock: implements Hyper-V transport for Virtual diff --git a/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch b/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch index e31bee5ea..b32eada47 100644 --- a/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch +++ b/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch @@ -1,4 +1,4 @@ -From 2ca5a13b8f72016d874876b884e1c2a8187927d4 Mon Sep 17 00:00:00 2001 +From ba91e50f4a7e633e10189d232e54209ca5e3c2e3 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:29 -0600 Subject: [PATCH 04/12] VMCI: only try to load on VMware hypervisor diff --git a/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch b/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch index 12af061b1..b7b4d6825 100644 --- a/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch +++ b/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch @@ -1,4 +1,4 @@ -From c7695e20566be27138e55893d5a23b997f04e425 Mon Sep 17 00:00:00 2001 +From f0ff54d17b714723ad1f0c5e19a42eda7f8cce02 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:35 -0600 Subject: [PATCH 05/12] hv_sock: add the support of auto-loading diff --git a/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch b/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch index cd35c9624..1def7524a 100644 --- a/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch +++ b/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch @@ -1,4 +1,4 @@ -From 23b672dd198b20112e33577f99f9371923377fac Mon Sep 17 00:00:00 2001 +From 2c29eff7fc5d621f97f0f6d8f7a32904bea07694 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 18:52:02 -0600 Subject: [PATCH 06/12] tools: hv_sock: 2 simple test cases. diff --git a/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch b/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch index 92eecaaf7..b81c88587 100644 --- a/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch +++ b/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch @@ -1,4 +1,4 @@ -From e8eb16e6cd31bb62f933b59c31dda745b29cd3e7 Mon Sep 17 00:00:00 2001 +From fd27a793192e9e7ad70946cf2926f1e997d72b14 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Tue, 16 May 2017 22:14:03 +0800 Subject: [PATCH 07/12] hvsock: fix a race in hvs_stream_dequeue() diff --git a/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch b/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch index 876a782f6..8e339e055 100644 --- a/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch +++ b/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch @@ -1,4 +1,4 @@ -From 5f039667d878b45eff799c432f0b5c7049b33981 Mon Sep 17 00:00:00 2001 +From 2f54848bdb154990a06ebaf52dac8fdd91f45445 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 19 May 2017 21:49:59 +0800 Subject: [PATCH 08/12] hvsock: fix vsock_dequeue/enqueue_accept race diff --git a/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch b/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch index fe43dc2e5..cd3dc7974 100644 --- a/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch +++ b/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch @@ -1,4 +1,4 @@ -From 7a0d26c3069406c6b862ffb48c9974cc147be766 Mon Sep 17 00:00:00 2001 +From e6ea28549683bfe3d1b9b8c76aec74c2d2329174 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 21 Jun 2017 22:30:42 +0800 Subject: [PATCH 09/12] hv-sock: a temporary workaround for the diff --git a/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch b/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch index 78571175b..84c6b1f3c 100644 --- a/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch +++ b/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch @@ -1,4 +1,4 @@ -From 57019e6ea3017c0ad0d78cbefa03994f3df93db1 Mon Sep 17 00:00:00 2001 +From 56f7e6e177165f95c9fc817ba492cedad1c28e35 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 7 Jul 2017 09:15:29 +0800 Subject: [PATCH 10/12] hv-sock: avoid double FINs if shutdown() is called diff --git a/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch b/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch index cf11c83ea..77c829fc0 100644 --- a/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch +++ b/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch @@ -1,4 +1,4 @@ -From 963aeff4efef364aceab72434c5b25cc13cbb5b4 Mon Sep 17 00:00:00 2001 +From 8de015c52461809ab001d4b7a14f9eadef732f59 Mon Sep 17 00:00:00 2001 From: Randy Dodgen Date: Thu, 24 Aug 2017 15:26:01 -0400 Subject: [PATCH 11/12] ext4: fix fault handling when mounted with -o dax,ro diff --git a/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch b/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch index bf0066527..14c47d3b6 100644 --- a/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch +++ b/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch @@ -1,4 +1,4 @@ -From 03ef1166593af9b9a9e36875ea2cab95076fe497 Mon Sep 17 00:00:00 2001 +From ac99e31c0fb9f3305e035ba5eab28edb144cf146 Mon Sep 17 00:00:00 2001 From: Cheng-mean Liu Date: Tue, 11 Jul 2017 16:58:26 -0700 Subject: [PATCH 12/12] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB diff --git a/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch b/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch index 1252f3590..b0c56040b 100644 --- a/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch +++ b/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch @@ -1,4 +1,4 @@ -From 8bfd0bbc4cfde912748d3f808df5b4209104e0de Mon Sep 17 00:00:00 2001 +From 3df10f5ef221efb7c240f8d6268edb3132f63bef Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 2 Mar 2017 12:55:49 -0300 Subject: [PATCH 01/12] tools build: Add test for sched_getcpu() diff --git a/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch b/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch index 100c42992..39778c0b6 100644 --- a/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch +++ b/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch @@ -1,4 +1,4 @@ -From d03af585a538dbf9ee9590e8642928c50da7cec9 Mon Sep 17 00:00:00 2001 +From de761517b9e5ce881f8adcaf869545adb77e167b Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 13 Oct 2016 17:12:35 -0300 Subject: [PATCH 02/12] perf jit: Avoid returning garbage for a ret variable diff --git a/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch b/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch index b667565a2..647c2c575 100644 --- a/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch +++ b/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch @@ -1,4 +1,4 @@ -From 17017600d2d9bbcfa7a0a03564e08be8b968c5a6 Mon Sep 17 00:00:00 2001 +From 7ba870644950cb1b05535ad9ea3aa0773966db38 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sat, 23 Jul 2016 01:35:51 +0000 Subject: [PATCH 03/12] hv_sock: introduce Hyper-V Sockets diff --git a/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch b/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch index d539c6110..cd2ec259d 100644 --- a/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch +++ b/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch @@ -1,4 +1,4 @@ -From e0a24f69fddb3a1400f2ad6c89641188008cc5ca Mon Sep 17 00:00:00 2001 +From 31139f2e552bf21e4f981ac0f205dbd9e1639872 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 23 May 2016 18:55:45 +0100 Subject: [PATCH 04/12] vmbus: Don't spam the logs with unknown GUIDs diff --git a/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch b/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch index 50a771f56..1f55fd5d9 100644 --- a/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch +++ b/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch @@ -1,4 +1,4 @@ -From 7193e0024dbfef76366a8c2a320b24388d0024ec Mon Sep 17 00:00:00 2001 +From dfafebdfe6eca31d826333e1bdd4cf85cbc98795 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:07 -0800 Subject: [PATCH 05/12] Drivers: hv: utils: Fix the mapping between host diff --git a/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch b/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch index 4d889ab04..5eadff932 100644 --- a/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch +++ b/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch @@ -1,4 +1,4 @@ -From 48569e58deb80292bc54df0f6b69ae5d00cbdb0c Mon Sep 17 00:00:00 2001 +From 972b3d4961c04940cab0009fad601194266f46a3 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:10 -0800 Subject: [PATCH 06/12] Drivers: hv: vss: Improve log messages. diff --git a/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch b/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch index 71482b309..840a75caf 100644 --- a/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch +++ b/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch @@ -1,4 +1,4 @@ -From fcbd72600dad702cfb38ac90697876fe3b659ce5 Mon Sep 17 00:00:00 2001 +From 387b297055130e551114c3ea36b3ed42f8b56b24 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:11 -0800 Subject: [PATCH 07/12] Drivers: hv: vss: Operation timeouts should match host diff --git a/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch b/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch index e496f1bfb..acb16ade9 100644 --- a/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch +++ b/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch @@ -1,4 +1,4 @@ -From d671eb3d9d0fa92f69e52866b8444866c9ed6ff6 Mon Sep 17 00:00:00 2001 +From 8f311fd4ca673ff00c2e048212dd857c280a6edb Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:17 -0700 Subject: [PATCH 08/12] Drivers: hv: vmbus: Use all supported IC versions to diff --git a/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch b/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch index a57358bbe..e4f98918e 100644 --- a/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch +++ b/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch @@ -1,4 +1,4 @@ -From 0a74d546a03ef026a234d65eacb3091a6928c9b1 Mon Sep 17 00:00:00 2001 +From 58e7016cc50d4e3ec936a56f4b40f05968bca658 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:18 -0700 Subject: [PATCH 09/12] Drivers: hv: Log the negotiated IC versions. diff --git a/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch b/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch index 36c00398c..80710dd73 100644 --- a/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch +++ b/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch @@ -1,4 +1,4 @@ -From b8c9e3b14cdb864c833081312202b6dd74d4167c Mon Sep 17 00:00:00 2001 +From aadee72fe80ffbc17d6f59967ab13f7e5d5b6c77 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sun, 26 Mar 2017 16:42:20 +0800 Subject: [PATCH 10/12] vmbus: fix missed ring events on boot diff --git a/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch b/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch index fd4328d9f..b608ce116 100644 --- a/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch +++ b/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch @@ -1,4 +1,4 @@ -From 3e99b1aae367a0978feff895ea1745c27e942fb5 Mon Sep 17 00:00:00 2001 +From d72dc9c712111da81e7d64a012bacc2ec09c942e Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 29 Mar 2017 18:37:10 +0800 Subject: [PATCH 11/12] vmbus: remove "goto error_clean_msglist" in diff --git a/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch b/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch index 61172dbfb..8ee601fb9 100644 --- a/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch +++ b/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch @@ -1,4 +1,4 @@ -From 8e5978d4c9416531d7d3de14da3aacf711114702 Mon Sep 17 00:00:00 2001 +From ef0936889e90345153f19355c4d47596ce6833fd Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 24 Mar 2017 20:53:18 +0800 Subject: [PATCH 12/12] vmbus: dynamically enqueue/dequeue the channel on From 57226034e6cd85da67c311d3ec788299892f53d1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 21 Nov 2017 14:59:44 +0000 Subject: [PATCH 10/13] kernel: Move KEYS_COMPAT Commit 31c8c4942820 ("security/keys: add CONFIG_KEYS_COMPAT to Kconfig") moved the KEYS_COMPAT config option to a different section. Adjust config file. Signed-off-by: Rolf Neugebauer --- kernel/config-4.4.x-x86_64 | 2 +- kernel/config-4.9.x-x86_64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/config-4.4.x-x86_64 b/kernel/config-4.4.x-x86_64 index 92a74f8b8..ab1bd0616 100644 --- a/kernel/config-4.4.x-x86_64 +++ b/kernel/config-4.4.x-x86_64 @@ -704,7 +704,6 @@ CONFIG_IA32_EMULATION=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_KEYS_COMPAT=y CONFIG_X86_DEV_DMA_OPS=y CONFIG_PMC_ATOM=y CONFIG_NET=y @@ -3437,6 +3436,7 @@ CONFIG_X86_DEBUG_FPU=y # Security options # CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_BIG_KEYS=y # CONFIG_TRUSTED_KEYS is not set diff --git a/kernel/config-4.9.x-x86_64 b/kernel/config-4.9.x-x86_64 index a54b2f0ad..c4f50ffd1 100644 --- a/kernel/config-4.9.x-x86_64 +++ b/kernel/config-4.9.x-x86_64 @@ -761,7 +761,6 @@ CONFIG_IA32_EMULATION=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_KEYS_COMPAT=y CONFIG_X86_DEV_DMA_OPS=y CONFIG_PMC_ATOM=y CONFIG_NET=y @@ -3631,6 +3630,7 @@ CONFIG_X86_DEBUG_FPU=y # Security options # CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_BIG_KEYS=y CONFIG_TRUSTED_KEYS=m From 6ede240737cadd7da40dd4abf7d90795f1d06cc7 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 21 Nov 2017 17:05:35 +0000 Subject: [PATCH 11/13] kernel: Update to 4.14.1/4.13.15/4.9.64/4.4.100 Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 12 ++++++------ kernel/config-4.13.x-aarch64 | 2 +- kernel/config-4.13.x-x86_64 | 2 +- kernel/config-4.14.x-aarch64 | 2 +- kernel/config-4.14.x-x86_64 | 2 +- kernel/config-4.4.x-aarch64 | 2 +- kernel/config-4.4.x-x86_64 | 2 +- kernel/config-4.9.x-aarch64 | 2 +- kernel/config-4.9.x-x86_64 | 2 +- ...mbus_open-reset-onchannel_callback-on-error.patch | 2 +- ...move-goto-error_clean_msglist-in-vmbus_open.patch | 2 +- ...mplements-Hyper-V-transport-for-Virtual-Soc.patch | 2 +- ...-VMCI-only-try-to-load-on-VMware-hypervisor.patch | 2 +- ...005-hv_sock-add-the-support-of-auto-loading.patch | 2 +- .../0006-tools-hv_sock-2-simple-test-cases.patch | 2 +- ...007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch | 2 +- ...vsock-fix-vsock_dequeue-enqueue_accept-race.patch | 2 +- ...-temporary-workaround-for-the-pending_send_.patch | 2 +- ...ock-avoid-double-FINs-if-shutdown-is-called.patch | 2 +- ...x-fault-handling-when-mounted-with-o-dax-ro.patch | 2 +- ...ducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch | 2 +- .../0001-tools-build-Add-test-for-sched_getcpu.patch | 2 +- ...-Avoid-returning-garbage-for-a-ret-variable.patch | 2 +- .../0003-hv_sock-introduce-Hyper-V-Sockets.patch | 2 +- ...mbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch | 2 +- ...v-utils-Fix-the-mapping-between-host-versio.patch | 2 +- .../0006-Drivers-hv-vss-Improve-log-messages.patch | 2 +- ...v-vss-Operation-timeouts-should-match-host-.patch | 2 +- ...v-vmbus-Use-all-supported-IC-versions-to-ne.patch | 2 +- ...9-Drivers-hv-Log-the-negotiated-IC-versions.patch | 2 +- .../0010-vmbus-fix-missed-ring-events-on-boot.patch | 2 +- ...move-goto-error_clean_msglist-in-vmbus_open.patch | 2 +- ...amically-enqueue-dequeue-the-channel-on-vmb.patch | 2 +- 33 files changed, 38 insertions(+), 38 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index a26291e7d..c118be5a2 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -172,12 +172,12 @@ endef # Build Targets # Debug targets only for latest stable and LTS stable # -$(eval $(call kernel,4.14,4.14.x,$(EXTRA))) -$(eval $(call kernel,4.14,4.14.x,-dbg)) -$(eval $(call kernel,4.13.14,4.13.x,$(EXTRA))) -$(eval $(call kernel,4.9.63,4.9.x,$(EXTRA))) -$(eval $(call kernel,4.9.63,4.9.x,-dbg)) -$(eval $(call kernel,4.4.99,4.4.x,$(EXTRA))) +$(eval $(call kernel,4.14.1,4.14.x,$(EXTRA))) +$(eval $(call kernel,4.14.1,4.14.x,-dbg)) +$(eval $(call kernel,4.13.15,4.13.x,$(EXTRA))) +$(eval $(call kernel,4.9.64,4.9.x,$(EXTRA))) +$(eval $(call kernel,4.9.64,4.9.x,-dbg)) +$(eval $(call kernel,4.4.100,4.4.x,$(EXTRA))) # Target for kernel config kconfig: | sources diff --git a/kernel/config-4.13.x-aarch64 b/kernel/config-4.13.x-aarch64 index 74d2140ee..9391343cb 100644 --- a/kernel/config-4.13.x-aarch64 +++ b/kernel/config-4.13.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.13.14 Kernel Configuration +# Linux/arm64 4.13.15 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.13.x-x86_64 b/kernel/config-4.13.x-x86_64 index c3a4a9ebb..29e990ca8 100644 --- a/kernel/config-4.13.x-x86_64 +++ b/kernel/config-4.13.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.13.14 Kernel Configuration +# Linux/x86 4.13.15 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index 8833c94b0..a35b5d909 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.0 Kernel Configuration +# Linux/arm64 4.14.1 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index 053c7d103..b81444937 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.0 Kernel Configuration +# Linux/x86 4.14.1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.4.x-aarch64 b/kernel/config-4.4.x-aarch64 index 20072c7ac..425a5a10e 100644 --- a/kernel/config-4.4.x-aarch64 +++ b/kernel/config-4.4.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.4.99 Kernel Configuration +# Linux/arm64 4.4.100 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.4.x-x86_64 b/kernel/config-4.4.x-x86_64 index ab1bd0616..eab26fad0 100644 --- a/kernel/config-4.4.x-x86_64 +++ b/kernel/config-4.4.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.99 Kernel Configuration +# Linux/x86 4.4.100 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.9.x-aarch64 b/kernel/config-4.9.x-aarch64 index 4b9bb2bbe..8e7f0275d 100644 --- a/kernel/config-4.9.x-aarch64 +++ b/kernel/config-4.9.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.63 Kernel Configuration +# Linux/arm64 4.9.64 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.9.x-x86_64 b/kernel/config-4.9.x-x86_64 index c4f50ffd1..820ae4f42 100644 --- a/kernel/config-4.9.x-x86_64 +++ b/kernel/config-4.9.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.63 Kernel Configuration +# Linux/x86 4.9.64 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch b/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch index f508487b0..1f5aab60c 100644 --- a/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch +++ b/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch @@ -1,4 +1,4 @@ -From b43d442205092edc95d0b7d452b728c69e21d5ac Mon Sep 17 00:00:00 2001 +From e85ffd0a854df881c75a049824b848fff09a9085 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:12 -0600 Subject: [PATCH 01/12] vmbus: vmbus_open(): reset onchannel_callback on error diff --git a/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch b/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch index f93beb57f..4467de6d1 100644 --- a/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch +++ b/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch @@ -1,4 +1,4 @@ -From bd099cbe34d9cfa5f7d63d20a1aa86d8c9ccaca0 Mon Sep 17 00:00:00 2001 +From a57450357991eb0f658e421dc641c2a9fd5d9110 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:20 -0600 Subject: [PATCH 02/12] vmbus: remove "goto error_clean_msglist" in diff --git a/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch b/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch index 118dfd767..470d68f8e 100644 --- a/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch +++ b/kernel/patches-4.13.x/0003-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch @@ -1,4 +1,4 @@ -From 084235c775dc08582cba3ec2d6a8fa85402e2c52 Mon Sep 17 00:00:00 2001 +From 0f8303c91fea8c348f5ab93f184b88df242cde24 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:26 -0600 Subject: [PATCH 03/12] hv_sock: implements Hyper-V transport for Virtual diff --git a/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch b/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch index b32eada47..ad694bf40 100644 --- a/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch +++ b/kernel/patches-4.13.x/0004-VMCI-only-try-to-load-on-VMware-hypervisor.patch @@ -1,4 +1,4 @@ -From ba91e50f4a7e633e10189d232e54209ca5e3c2e3 Mon Sep 17 00:00:00 2001 +From b39f12ccedb637382d102712b5b59ad989186db5 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:29 -0600 Subject: [PATCH 04/12] VMCI: only try to load on VMware hypervisor diff --git a/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch b/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch index b7b4d6825..6022e7e48 100644 --- a/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch +++ b/kernel/patches-4.13.x/0005-hv_sock-add-the-support-of-auto-loading.patch @@ -1,4 +1,4 @@ -From f0ff54d17b714723ad1f0c5e19a42eda7f8cce02 Mon Sep 17 00:00:00 2001 +From 70a30e3aede2c701fd954ab78a8fe170783c0cdc Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:35 -0600 Subject: [PATCH 05/12] hv_sock: add the support of auto-loading diff --git a/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch b/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch index 1def7524a..189036934 100644 --- a/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch +++ b/kernel/patches-4.13.x/0006-tools-hv_sock-2-simple-test-cases.patch @@ -1,4 +1,4 @@ -From 2c29eff7fc5d621f97f0f6d8f7a32904bea07694 Mon Sep 17 00:00:00 2001 +From b3803b16af15e6a1447864c44f8bb789e55593df Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 18:52:02 -0600 Subject: [PATCH 06/12] tools: hv_sock: 2 simple test cases. diff --git a/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch b/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch index b81c88587..3001c3196 100644 --- a/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch +++ b/kernel/patches-4.13.x/0007-hvsock-fix-a-race-in-hvs_stream_dequeue.patch @@ -1,4 +1,4 @@ -From fd27a793192e9e7ad70946cf2926f1e997d72b14 Mon Sep 17 00:00:00 2001 +From 3e3e352848d134366dc4ca047a1348c1f4e63c4f Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Tue, 16 May 2017 22:14:03 +0800 Subject: [PATCH 07/12] hvsock: fix a race in hvs_stream_dequeue() diff --git a/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch b/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch index 8e339e055..bd4813be5 100644 --- a/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch +++ b/kernel/patches-4.13.x/0008-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch @@ -1,4 +1,4 @@ -From 2f54848bdb154990a06ebaf52dac8fdd91f45445 Mon Sep 17 00:00:00 2001 +From 37e8142153d367fee4253a2bfb88e6797a4ce097 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 19 May 2017 21:49:59 +0800 Subject: [PATCH 08/12] hvsock: fix vsock_dequeue/enqueue_accept race diff --git a/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch b/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch index cd3dc7974..4be27a2da 100644 --- a/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch +++ b/kernel/patches-4.13.x/0009-hv-sock-a-temporary-workaround-for-the-pending_send_.patch @@ -1,4 +1,4 @@ -From e6ea28549683bfe3d1b9b8c76aec74c2d2329174 Mon Sep 17 00:00:00 2001 +From 24c31a6d9e3dd607e0f0a910a14e613aef9af91a Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 21 Jun 2017 22:30:42 +0800 Subject: [PATCH 09/12] hv-sock: a temporary workaround for the diff --git a/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch b/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch index 84c6b1f3c..865f9d267 100644 --- a/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch +++ b/kernel/patches-4.13.x/0010-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch @@ -1,4 +1,4 @@ -From 56f7e6e177165f95c9fc817ba492cedad1c28e35 Mon Sep 17 00:00:00 2001 +From 685be0bb6a26f648f045606d435c96a220b57fde Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 7 Jul 2017 09:15:29 +0800 Subject: [PATCH 10/12] hv-sock: avoid double FINs if shutdown() is called diff --git a/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch b/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch index 77c829fc0..8adbf5878 100644 --- a/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch +++ b/kernel/patches-4.13.x/0011-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch @@ -1,4 +1,4 @@ -From 8de015c52461809ab001d4b7a14f9eadef732f59 Mon Sep 17 00:00:00 2001 +From cc33e5ec02df7b139e0958586888d0a06518c806 Mon Sep 17 00:00:00 2001 From: Randy Dodgen Date: Thu, 24 Aug 2017 15:26:01 -0400 Subject: [PATCH 11/12] ext4: fix fault handling when mounted with -o dax,ro diff --git a/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch b/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch index 14c47d3b6..d520b370b 100644 --- a/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch +++ b/kernel/patches-4.13.x/0012-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch @@ -1,4 +1,4 @@ -From ac99e31c0fb9f3305e035ba5eab28edb144cf146 Mon Sep 17 00:00:00 2001 +From 22cc975d9fef30079f16054e6157bf855633b22b Mon Sep 17 00:00:00 2001 From: Cheng-mean Liu Date: Tue, 11 Jul 2017 16:58:26 -0700 Subject: [PATCH 12/12] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB diff --git a/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch b/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch index b0c56040b..4918612cd 100644 --- a/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch +++ b/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch @@ -1,4 +1,4 @@ -From 3df10f5ef221efb7c240f8d6268edb3132f63bef Mon Sep 17 00:00:00 2001 +From 180281ab2038a8adbbba807985da1cbfef05ce72 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 2 Mar 2017 12:55:49 -0300 Subject: [PATCH 01/12] tools build: Add test for sched_getcpu() diff --git a/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch b/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch index 39778c0b6..1cba14611 100644 --- a/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch +++ b/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch @@ -1,4 +1,4 @@ -From de761517b9e5ce881f8adcaf869545adb77e167b Mon Sep 17 00:00:00 2001 +From 96f10db8ab29cd542eb3975f527d3fa0d0d7caa6 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 13 Oct 2016 17:12:35 -0300 Subject: [PATCH 02/12] perf jit: Avoid returning garbage for a ret variable diff --git a/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch b/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch index 647c2c575..d514bb0e5 100644 --- a/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch +++ b/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch @@ -1,4 +1,4 @@ -From 7ba870644950cb1b05535ad9ea3aa0773966db38 Mon Sep 17 00:00:00 2001 +From fefee3d6da7f7af56db64a2234a9ba5c99cf42ca Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sat, 23 Jul 2016 01:35:51 +0000 Subject: [PATCH 03/12] hv_sock: introduce Hyper-V Sockets diff --git a/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch b/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch index cd2ec259d..cf058609d 100644 --- a/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch +++ b/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch @@ -1,4 +1,4 @@ -From 31139f2e552bf21e4f981ac0f205dbd9e1639872 Mon Sep 17 00:00:00 2001 +From b3e690defe71198388ab2bf24a5cdfe2452c42d0 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 23 May 2016 18:55:45 +0100 Subject: [PATCH 04/12] vmbus: Don't spam the logs with unknown GUIDs diff --git a/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch b/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch index 1f55fd5d9..681f7edf1 100644 --- a/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch +++ b/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch @@ -1,4 +1,4 @@ -From dfafebdfe6eca31d826333e1bdd4cf85cbc98795 Mon Sep 17 00:00:00 2001 +From 4fef96da83ea834b5574b79d5eaf9acefcd76963 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:07 -0800 Subject: [PATCH 05/12] Drivers: hv: utils: Fix the mapping between host diff --git a/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch b/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch index 5eadff932..5c3c15459 100644 --- a/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch +++ b/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch @@ -1,4 +1,4 @@ -From 972b3d4961c04940cab0009fad601194266f46a3 Mon Sep 17 00:00:00 2001 +From 9c992923156012dcc21c199d8b95ab4a979dffc2 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:10 -0800 Subject: [PATCH 06/12] Drivers: hv: vss: Improve log messages. diff --git a/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch b/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch index 840a75caf..5da380d7f 100644 --- a/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch +++ b/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch @@ -1,4 +1,4 @@ -From 387b297055130e551114c3ea36b3ed42f8b56b24 Mon Sep 17 00:00:00 2001 +From 9a842de6843c9f52e82768f1ed793d7118508c51 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:11 -0800 Subject: [PATCH 07/12] Drivers: hv: vss: Operation timeouts should match host diff --git a/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch b/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch index acb16ade9..b408f7301 100644 --- a/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch +++ b/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch @@ -1,4 +1,4 @@ -From 8f311fd4ca673ff00c2e048212dd857c280a6edb Mon Sep 17 00:00:00 2001 +From 9e343fbd30bfe4364b34690cfb77fd239dca9e75 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:17 -0700 Subject: [PATCH 08/12] Drivers: hv: vmbus: Use all supported IC versions to diff --git a/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch b/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch index e4f98918e..7b7e1f1eb 100644 --- a/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch +++ b/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch @@ -1,4 +1,4 @@ -From 58e7016cc50d4e3ec936a56f4b40f05968bca658 Mon Sep 17 00:00:00 2001 +From ecc1894ed5c4185c4faba7d72babd50a29d70a7d Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:18 -0700 Subject: [PATCH 09/12] Drivers: hv: Log the negotiated IC versions. diff --git a/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch b/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch index 80710dd73..2c97e7b33 100644 --- a/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch +++ b/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch @@ -1,4 +1,4 @@ -From aadee72fe80ffbc17d6f59967ab13f7e5d5b6c77 Mon Sep 17 00:00:00 2001 +From e3721fa8af25ff4e83c1e3ec9521717b6e99a8ce Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sun, 26 Mar 2017 16:42:20 +0800 Subject: [PATCH 10/12] vmbus: fix missed ring events on boot diff --git a/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch b/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch index b608ce116..9465be8fb 100644 --- a/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch +++ b/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch @@ -1,4 +1,4 @@ -From d72dc9c712111da81e7d64a012bacc2ec09c942e Mon Sep 17 00:00:00 2001 +From fe1775ea70a5e90c5baed1ef64c08fbae494bd79 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 29 Mar 2017 18:37:10 +0800 Subject: [PATCH 11/12] vmbus: remove "goto error_clean_msglist" in diff --git a/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch b/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch index 8ee601fb9..312f56979 100644 --- a/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch +++ b/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch @@ -1,4 +1,4 @@ -From ef0936889e90345153f19355c4d47596ce6833fd Mon Sep 17 00:00:00 2001 +From 7ca528cc3fb9820c41fc6bd2e9c5c9b51f24d1bf Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 24 Mar 2017 20:53:18 +0800 Subject: [PATCH 12/12] vmbus: dynamically enqueue/dequeue the channel on From 06689b5d686799ce2c8c9b2955b075433641dc62 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 21 Nov 2017 11:22:07 +0000 Subject: [PATCH 12/13] tests: Add kernel module tests for all supported kernels Also add libelf-dev as this is needed for ORC_UNWINDER. While this is only a feature of 4.14.x we added it to all Dockerfiles to keep things in synch. Signed-off-by: Rolf Neugebauer --- .../020_kernel/010_kmod_4.4.x/Dockerfile | 23 ++++++++++++++ .../check.sh | 0 .../src/Makefile | 0 .../src/hello_world.c | 0 .../test.sh | 0 test/cases/020_kernel/010_kmod_4.4.x/test.yml | 20 ++++++++++++ .../Dockerfile | 4 +-- test/cases/020_kernel/011_kmod_4.9.x/check.sh | 15 +++++++++ .../020_kernel/011_kmod_4.9.x/src/Makefile | 6 ++++ .../011_kmod_4.9.x/src/hello_world.c | 22 +++++++++++++ test/cases/020_kernel/011_kmod_4.9.x/test.sh | 31 +++++++++++++++++++ .../test.yml | 2 +- .../020_kernel/015_kmod_4.13.x/Dockerfile | 23 ++++++++++++++ .../cases/020_kernel/015_kmod_4.13.x/check.sh | 15 +++++++++ .../020_kernel/015_kmod_4.13.x/src/Makefile | 6 ++++ .../015_kmod_4.13.x/src/hello_world.c | 22 +++++++++++++ test/cases/020_kernel/015_kmod_4.13.x/test.sh | 31 +++++++++++++++++++ .../cases/020_kernel/015_kmod_4.13.x/test.yml | 20 ++++++++++++ .../020_kernel/016_kmod_4.14.x/Dockerfile | 23 ++++++++++++++ .../cases/020_kernel/016_kmod_4.14.x/check.sh | 15 +++++++++ .../020_kernel/016_kmod_4.14.x/src/Makefile | 6 ++++ .../016_kmod_4.14.x/src/hello_world.c | 22 +++++++++++++ test/cases/020_kernel/016_kmod_4.14.x/test.sh | 31 +++++++++++++++++++ .../cases/020_kernel/016_kmod_4.14.x/test.yml | 20 ++++++++++++ 24 files changed, 354 insertions(+), 3 deletions(-) create mode 100644 test/cases/020_kernel/010_kmod_4.4.x/Dockerfile rename test/cases/020_kernel/{010_kmod_4.9.x => 010_kmod_4.4.x}/check.sh (100%) rename test/cases/020_kernel/{010_kmod_4.9.x => 010_kmod_4.4.x}/src/Makefile (100%) rename test/cases/020_kernel/{010_kmod_4.9.x => 010_kmod_4.4.x}/src/hello_world.c (100%) rename test/cases/020_kernel/{010_kmod_4.9.x => 010_kmod_4.4.x}/test.sh (100%) create mode 100644 test/cases/020_kernel/010_kmod_4.4.x/test.yml rename test/cases/020_kernel/{010_kmod_4.9.x => 011_kmod_4.9.x}/Dockerfile (88%) create mode 100755 test/cases/020_kernel/011_kmod_4.9.x/check.sh create mode 100644 test/cases/020_kernel/011_kmod_4.9.x/src/Makefile create mode 100644 test/cases/020_kernel/011_kmod_4.9.x/src/hello_world.c create mode 100644 test/cases/020_kernel/011_kmod_4.9.x/test.sh rename test/cases/020_kernel/{010_kmod_4.9.x => 011_kmod_4.9.x}/test.yml (93%) create mode 100644 test/cases/020_kernel/015_kmod_4.13.x/Dockerfile create mode 100755 test/cases/020_kernel/015_kmod_4.13.x/check.sh create mode 100644 test/cases/020_kernel/015_kmod_4.13.x/src/Makefile create mode 100644 test/cases/020_kernel/015_kmod_4.13.x/src/hello_world.c create mode 100644 test/cases/020_kernel/015_kmod_4.13.x/test.sh create mode 100644 test/cases/020_kernel/015_kmod_4.13.x/test.yml create mode 100644 test/cases/020_kernel/016_kmod_4.14.x/Dockerfile create mode 100755 test/cases/020_kernel/016_kmod_4.14.x/check.sh create mode 100644 test/cases/020_kernel/016_kmod_4.14.x/src/Makefile create mode 100644 test/cases/020_kernel/016_kmod_4.14.x/src/hello_world.c create mode 100644 test/cases/020_kernel/016_kmod_4.14.x/test.sh create mode 100644 test/cases/020_kernel/016_kmod_4.14.x/test.yml diff --git a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile new file mode 100644 index 000000000..217ef0655 --- /dev/null +++ b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile @@ -0,0 +1,23 @@ +# This Dockerfile extracts the kernel headers from the kernel image +# and then compiles a simple hello world kernel module against them. +# In the last stage, it creates a package, which can be used for +# testing. + +FROM linuxkit/kernel:4.4.100 AS ksrc + +# Extract headers and compile module +FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build +RUN apk add build-base libelf-dev + +COPY --from=ksrc /kernel-dev.tar / +RUN tar xf kernel-dev.tar + +WORKDIR /kmod +COPY ./src/* ./ +RUN make all + +# Package +FROM alpine:3.5 +COPY --from=build /kmod/hello_world.ko / +COPY check.sh /check.sh +ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/010_kmod_4.9.x/check.sh b/test/cases/020_kernel/010_kmod_4.4.x/check.sh similarity index 100% rename from test/cases/020_kernel/010_kmod_4.9.x/check.sh rename to test/cases/020_kernel/010_kmod_4.4.x/check.sh diff --git a/test/cases/020_kernel/010_kmod_4.9.x/src/Makefile b/test/cases/020_kernel/010_kmod_4.4.x/src/Makefile similarity index 100% rename from test/cases/020_kernel/010_kmod_4.9.x/src/Makefile rename to test/cases/020_kernel/010_kmod_4.4.x/src/Makefile diff --git a/test/cases/020_kernel/010_kmod_4.9.x/src/hello_world.c b/test/cases/020_kernel/010_kmod_4.4.x/src/hello_world.c similarity index 100% rename from test/cases/020_kernel/010_kmod_4.9.x/src/hello_world.c rename to test/cases/020_kernel/010_kmod_4.4.x/src/hello_world.c diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.sh b/test/cases/020_kernel/010_kmod_4.4.x/test.sh similarity index 100% rename from test/cases/020_kernel/010_kmod_4.9.x/test.sh rename to test/cases/020_kernel/010_kmod_4.4.x/test.sh diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml new file mode 100644 index 000000000..beaf6f284 --- /dev/null +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -0,0 +1,20 @@ +kernel: + image: linuxkit/kernel:4.4.100 + cmdline: "console=ttyS0" +init: + - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 + - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d +onboot: + - name: check + image: kmod-test + binds: + - /dev:/dev + - /lib/modules:/lib/modules + capabilities: + - all + - name: poweroff + image: linuxkit/poweroff:280bd01daa8776fbe1f4d912977f1886b8374834 + command: ["/bin/sh", "/poweroff.sh", "3"] +trust: + org: + - linuxkit diff --git a/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile similarity index 88% rename from test/cases/020_kernel/010_kmod_4.9.x/Dockerfile rename to test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index 2e6b6ba22..abca4bcd7 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -3,11 +3,11 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.9.62 AS ksrc +FROM linuxkit/kernel:4.9.64 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build -RUN apk add build-base +RUN apk add build-base libelf-dev COPY --from=ksrc /kernel-dev.tar / RUN tar xf kernel-dev.tar diff --git a/test/cases/020_kernel/011_kmod_4.9.x/check.sh b/test/cases/020_kernel/011_kmod_4.9.x/check.sh new file mode 100755 index 000000000..02e491624 --- /dev/null +++ b/test/cases/020_kernel/011_kmod_4.9.x/check.sh @@ -0,0 +1,15 @@ +#!/bin/sh +function failed { + printf "Kernel module test suite FAILED\n" + /sbin/poweroff -f +} + +uname -a +modinfo hello_world.ko || failed +insmod hello_world.ko || failed +[ -n "$(dmesg | grep -o 'Hello LinuxKit')" ] || failed +rmmod hello_world || failed + +printf "Kernel module test suite PASSED\n" + +/sbin/poweroff -f diff --git a/test/cases/020_kernel/011_kmod_4.9.x/src/Makefile b/test/cases/020_kernel/011_kmod_4.9.x/src/Makefile new file mode 100644 index 000000000..31c8215dd --- /dev/null +++ b/test/cases/020_kernel/011_kmod_4.9.x/src/Makefile @@ -0,0 +1,6 @@ +obj-m += hello_world.o +KVER=$(shell basename /usr/src/linux-headers-*) +all: + make -C /usr/src/$(KVER) M=$(PWD) modules +clean: + make -C /usr/src/$(KVER) M=$(PWD) clean diff --git a/test/cases/020_kernel/011_kmod_4.9.x/src/hello_world.c b/test/cases/020_kernel/011_kmod_4.9.x/src/hello_world.c new file mode 100644 index 000000000..7dd6d3ee2 --- /dev/null +++ b/test/cases/020_kernel/011_kmod_4.9.x/src/hello_world.c @@ -0,0 +1,22 @@ +/* + * A simple Hello World kernel module + */ +#include +#include + +int init_hello(void) +{ + printk(KERN_INFO "Hello LinuxKit\n"); + return 0; +} + +void exit_hello(void) +{ + printk(KERN_INFO "Goodbye LinuxKit.\n"); +} + +module_init(init_hello); +module_exit(exit_hello); +MODULE_AUTHOR("Rolf Neugebauer "); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("A simple Hello World kernel module for testing"); diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.sh b/test/cases/020_kernel/011_kmod_4.9.x/test.sh new file mode 100644 index 000000000..e845162e5 --- /dev/null +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# SUMMARY: Test build and insertion of kernel modules +# LABELS: +# REPEAT: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=kmod +IMAGE_NAME=kmod-test + +clean_up() { + docker rmi ${IMAGE_NAME} || true + rm -rf ${NAME}-* +} +trap clean_up EXIT + +# Make sure we have the latest kernel image +docker pull linuxkit/kernel:4.9.62 +# Build a package +docker build -t ${IMAGE_NAME} . + +# Build and run a LinuxKit image with kernel module (and test script) +linuxkit build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run ${NAME})" +echo "${RESULT}" | grep -q "Hello LinuxKit" + +exit 0 diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml similarity index 93% rename from test/cases/020_kernel/010_kmod_4.9.x/test.yml rename to test/cases/020_kernel/011_kmod_4.9.x/test.yml index d4b02cc3e..3983e0729 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/015_kmod_4.13.x/Dockerfile b/test/cases/020_kernel/015_kmod_4.13.x/Dockerfile new file mode 100644 index 000000000..7e2cf90c8 --- /dev/null +++ b/test/cases/020_kernel/015_kmod_4.13.x/Dockerfile @@ -0,0 +1,23 @@ +# This Dockerfile extracts the kernel headers from the kernel image +# and then compiles a simple hello world kernel module against them. +# In the last stage, it creates a package, which can be used for +# testing. + +FROM linuxkit/kernel:4.13.15 AS ksrc + +# Extract headers and compile module +FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build +RUN apk add build-base libelf-dev + +COPY --from=ksrc /kernel-dev.tar / +RUN tar xf kernel-dev.tar + +WORKDIR /kmod +COPY ./src/* ./ +RUN make all + +# Package +FROM alpine:3.5 +COPY --from=build /kmod/hello_world.ko / +COPY check.sh /check.sh +ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/015_kmod_4.13.x/check.sh b/test/cases/020_kernel/015_kmod_4.13.x/check.sh new file mode 100755 index 000000000..02e491624 --- /dev/null +++ b/test/cases/020_kernel/015_kmod_4.13.x/check.sh @@ -0,0 +1,15 @@ +#!/bin/sh +function failed { + printf "Kernel module test suite FAILED\n" + /sbin/poweroff -f +} + +uname -a +modinfo hello_world.ko || failed +insmod hello_world.ko || failed +[ -n "$(dmesg | grep -o 'Hello LinuxKit')" ] || failed +rmmod hello_world || failed + +printf "Kernel module test suite PASSED\n" + +/sbin/poweroff -f diff --git a/test/cases/020_kernel/015_kmod_4.13.x/src/Makefile b/test/cases/020_kernel/015_kmod_4.13.x/src/Makefile new file mode 100644 index 000000000..31c8215dd --- /dev/null +++ b/test/cases/020_kernel/015_kmod_4.13.x/src/Makefile @@ -0,0 +1,6 @@ +obj-m += hello_world.o +KVER=$(shell basename /usr/src/linux-headers-*) +all: + make -C /usr/src/$(KVER) M=$(PWD) modules +clean: + make -C /usr/src/$(KVER) M=$(PWD) clean diff --git a/test/cases/020_kernel/015_kmod_4.13.x/src/hello_world.c b/test/cases/020_kernel/015_kmod_4.13.x/src/hello_world.c new file mode 100644 index 000000000..7dd6d3ee2 --- /dev/null +++ b/test/cases/020_kernel/015_kmod_4.13.x/src/hello_world.c @@ -0,0 +1,22 @@ +/* + * A simple Hello World kernel module + */ +#include +#include + +int init_hello(void) +{ + printk(KERN_INFO "Hello LinuxKit\n"); + return 0; +} + +void exit_hello(void) +{ + printk(KERN_INFO "Goodbye LinuxKit.\n"); +} + +module_init(init_hello); +module_exit(exit_hello); +MODULE_AUTHOR("Rolf Neugebauer "); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("A simple Hello World kernel module for testing"); diff --git a/test/cases/020_kernel/015_kmod_4.13.x/test.sh b/test/cases/020_kernel/015_kmod_4.13.x/test.sh new file mode 100644 index 000000000..e845162e5 --- /dev/null +++ b/test/cases/020_kernel/015_kmod_4.13.x/test.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# SUMMARY: Test build and insertion of kernel modules +# LABELS: +# REPEAT: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=kmod +IMAGE_NAME=kmod-test + +clean_up() { + docker rmi ${IMAGE_NAME} || true + rm -rf ${NAME}-* +} +trap clean_up EXIT + +# Make sure we have the latest kernel image +docker pull linuxkit/kernel:4.9.62 +# Build a package +docker build -t ${IMAGE_NAME} . + +# Build and run a LinuxKit image with kernel module (and test script) +linuxkit build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run ${NAME})" +echo "${RESULT}" | grep -q "Hello LinuxKit" + +exit 0 diff --git a/test/cases/020_kernel/015_kmod_4.13.x/test.yml b/test/cases/020_kernel/015_kmod_4.13.x/test.yml new file mode 100644 index 000000000..1533a465f --- /dev/null +++ b/test/cases/020_kernel/015_kmod_4.13.x/test.yml @@ -0,0 +1,20 @@ +kernel: + image: linuxkit/kernel:4.13.15 + cmdline: "console=ttyS0" +init: + - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 + - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d +onboot: + - name: check + image: kmod-test + binds: + - /dev:/dev + - /lib/modules:/lib/modules + capabilities: + - all + - name: poweroff + image: linuxkit/poweroff:280bd01daa8776fbe1f4d912977f1886b8374834 + command: ["/bin/sh", "/poweroff.sh", "3"] +trust: + org: + - linuxkit diff --git a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile new file mode 100644 index 000000000..31244e20d --- /dev/null +++ b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile @@ -0,0 +1,23 @@ +# This Dockerfile extracts the kernel headers from the kernel image +# and then compiles a simple hello world kernel module against them. +# In the last stage, it creates a package, which can be used for +# testing. + +FROM linuxkit/kernel:4.14.1 AS ksrc + +# Extract headers and compile module +FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build +RUN apk add build-base libelf-dev + +COPY --from=ksrc /kernel-dev.tar / +RUN tar xf kernel-dev.tar + +WORKDIR /kmod +COPY ./src/* ./ +RUN make all + +# Package +FROM alpine:3.5 +COPY --from=build /kmod/hello_world.ko / +COPY check.sh /check.sh +ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/016_kmod_4.14.x/check.sh b/test/cases/020_kernel/016_kmod_4.14.x/check.sh new file mode 100755 index 000000000..02e491624 --- /dev/null +++ b/test/cases/020_kernel/016_kmod_4.14.x/check.sh @@ -0,0 +1,15 @@ +#!/bin/sh +function failed { + printf "Kernel module test suite FAILED\n" + /sbin/poweroff -f +} + +uname -a +modinfo hello_world.ko || failed +insmod hello_world.ko || failed +[ -n "$(dmesg | grep -o 'Hello LinuxKit')" ] || failed +rmmod hello_world || failed + +printf "Kernel module test suite PASSED\n" + +/sbin/poweroff -f diff --git a/test/cases/020_kernel/016_kmod_4.14.x/src/Makefile b/test/cases/020_kernel/016_kmod_4.14.x/src/Makefile new file mode 100644 index 000000000..31c8215dd --- /dev/null +++ b/test/cases/020_kernel/016_kmod_4.14.x/src/Makefile @@ -0,0 +1,6 @@ +obj-m += hello_world.o +KVER=$(shell basename /usr/src/linux-headers-*) +all: + make -C /usr/src/$(KVER) M=$(PWD) modules +clean: + make -C /usr/src/$(KVER) M=$(PWD) clean diff --git a/test/cases/020_kernel/016_kmod_4.14.x/src/hello_world.c b/test/cases/020_kernel/016_kmod_4.14.x/src/hello_world.c new file mode 100644 index 000000000..7dd6d3ee2 --- /dev/null +++ b/test/cases/020_kernel/016_kmod_4.14.x/src/hello_world.c @@ -0,0 +1,22 @@ +/* + * A simple Hello World kernel module + */ +#include +#include + +int init_hello(void) +{ + printk(KERN_INFO "Hello LinuxKit\n"); + return 0; +} + +void exit_hello(void) +{ + printk(KERN_INFO "Goodbye LinuxKit.\n"); +} + +module_init(init_hello); +module_exit(exit_hello); +MODULE_AUTHOR("Rolf Neugebauer "); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("A simple Hello World kernel module for testing"); diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.sh b/test/cases/020_kernel/016_kmod_4.14.x/test.sh new file mode 100644 index 000000000..e845162e5 --- /dev/null +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# SUMMARY: Test build and insertion of kernel modules +# LABELS: +# REPEAT: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=kmod +IMAGE_NAME=kmod-test + +clean_up() { + docker rmi ${IMAGE_NAME} || true + rm -rf ${NAME}-* +} +trap clean_up EXIT + +# Make sure we have the latest kernel image +docker pull linuxkit/kernel:4.9.62 +# Build a package +docker build -t ${IMAGE_NAME} . + +# Build and run a LinuxKit image with kernel module (and test script) +linuxkit build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run ${NAME})" +echo "${RESULT}" | grep -q "Hello LinuxKit" + +exit 0 diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml new file mode 100644 index 000000000..b1b99d421 --- /dev/null +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -0,0 +1,20 @@ +kernel: + image: linuxkit/kernel:4.14.1 + cmdline: "console=ttyS0" +init: + - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 + - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d +onboot: + - name: check + image: kmod-test + binds: + - /dev:/dev + - /lib/modules:/lib/modules + capabilities: + - all + - name: poweroff + image: linuxkit/poweroff:280bd01daa8776fbe1f4d912977f1886b8374834 + command: ["/bin/sh", "/poweroff.sh", "3"] +trust: + org: + - linuxkit From 464a46d74ac750c31a56cc23139ddbfb7821a499 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 21 Nov 2017 17:19:42 +0000 Subject: [PATCH 13/13] Update YAML files to latest kernels. Signed-off-by: Rolf Neugebauer --- blueprints/docker-for-mac/base.yml | 2 +- docs/kernels.md | 2 +- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/openstack.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd.yml | 2 +- examples/vultr.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/etcd/etcd.yml | 2 +- projects/logging/examples/logging.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- test/cases/000_build/000_outputs/test.yml | 2 +- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- test/cases/020_kernel/000_config_4.4.x/test.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test.yml | 2 +- test/cases/020_kernel/005_config_4.13.x/test.yml | 2 +- test/cases/020_kernel/006_config_4.14.x/test.yml | 2 +- test/cases/020_kernel/010_kmod_4.4.x/test.sh | 2 +- test/cases/020_kernel/011_kmod_4.9.x/test.sh | 2 +- test/cases/020_kernel/015_kmod_4.13.x/test.sh | 2 +- test/cases/020_kernel/016_kmod_4.14.x/test.sh | 2 +- test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml | 2 +- test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml | 2 +- .../cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml | 2 +- .../cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- test/cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- 71 files changed, 71 insertions(+), 71 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 624cad8d7..81929e666 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -1,6 +1,6 @@ # This is a blueprint for building the open source components of Docker for Mac kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:15c56c57ac9a7adeec20b34f36f2bc165c347679 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host diff --git a/docs/kernels.md b/docs/kernels.md index dd3b2fe4a..8b40622cb 100644 --- a/docs/kernels.md +++ b/docs/kernels.md @@ -339,7 +339,7 @@ file: ``` kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - /zfs-kmod:4.9.47 diff --git a/examples/aws.yml b/examples/aws.yml index 7cdd3fe77..a08def5c7 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/azure.yml b/examples/azure.yml index d401ebf68..d3ad1f437 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/docker.yml b/examples/docker.yml index 7bd36ef61..3174c6931 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/gcp.yml b/examples/gcp.yml index da2a3fbde..5913e62e6 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/getty.yml b/examples/getty.yml index e1847de43..64370285f 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/minimal.yml b/examples/minimal.yml index 456e3abb0..a7708840c 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 2b61a96fa..109948539 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/openstack.yml b/examples/openstack.yml index ee894cc3f..d3d055ef2 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/packet.yml b/examples/packet.yml index bf410f12a..fd5fe7405 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS1 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 6a2e48fe0..c7af2d248 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -1,7 +1,7 @@ # Minimal YAML to run a redis server (used at DockerCon'17) # connect: nc localhost 6379 kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/sshd.yml b/examples/sshd.yml index 0e337c776..bcf76e561 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/swap.yml b/examples/swap.yml index f1908d0d1..07c5e5152 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/vmware.yml b/examples/vmware.yml index 52c679061..7eff0866a 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index e7a1e2085..3cf94e421 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 615fdc33c..349a2daa2 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/vultr.yml b/examples/vultr.yml index 454017a58..ace50dc48 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 0ddaceafe..f40bec9a3 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/linuxkit.yml b/linuxkit.yml index ce270751d..507e7510f 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 119852694..9a5961356 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 908b7a36b..55b17b6be 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index f298a5b69..6198ed3ce 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 945f0bea7..8256f627e 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 # with runc, logwrite, startmemlogd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index c2c4be47f..de2769db0 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 976be8c01..1c78e7d9b 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 99d383db9..b8165b90e 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 2a19ebcf8..7469e095e 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 21df08a1f..36e6b3203 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 2a19ebcf8..7469e095e 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 2a19ebcf8..7469e095e 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 2a19ebcf8..7469e095e 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 2a19ebcf8..7469e095e 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index d5c454d0c..e6052c4d9 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index 2a19ebcf8..7469e095e 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index f1d1705f9..903dd6763 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index abebd887d..aba563880 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.4.98 + image: linuxkit/kernel:4.4.100 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index 13b2db6e1..12c944c09 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/005_config_4.13.x/test.yml b/test/cases/020_kernel/005_config_4.13.x/test.yml index c763e89d1..1a8950000 100644 --- a/test/cases/020_kernel/005_config_4.13.x/test.yml +++ b/test/cases/020_kernel/005_config_4.13.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.13.13 + image: linuxkit/kernel:4.13.15 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index 81a225fde..519e03265 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.14 + image: linuxkit/kernel:4.14.1 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.sh b/test/cases/020_kernel/010_kmod_4.4.x/test.sh index e845162e5..e691879b8 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.sh +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.9.62 +docker pull linuxkit/kernel:4.9.64 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.sh b/test/cases/020_kernel/011_kmod_4.9.x/test.sh index e845162e5..e691879b8 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.sh +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.9.62 +docker pull linuxkit/kernel:4.9.64 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/015_kmod_4.13.x/test.sh b/test/cases/020_kernel/015_kmod_4.13.x/test.sh index e845162e5..e691879b8 100644 --- a/test/cases/020_kernel/015_kmod_4.13.x/test.sh +++ b/test/cases/020_kernel/015_kmod_4.13.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.9.62 +docker pull linuxkit/kernel:4.9.64 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.sh b/test/cases/020_kernel/016_kmod_4.14.x/test.sh index e845162e5..e691879b8 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.sh +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.9.62 +docker pull linuxkit/kernel:4.9.64 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml index 62575cb7c..e3ac51d08 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.4.98 + image: linuxkit/kernel:4.4.100 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml index f094248a9..78d844a45 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml index 62cba8a41..eb25f7cc0 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.13.13 + image: linuxkit/kernel:4.13.15 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml index 63775b16c..38f05c9f2 100644 --- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml +++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.14 + image: linuxkit/kernel:4.14.1 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index b884267e1..07c318107 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 10b200ba4..70ce2fc57 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 6ba350cd4..f9ea49efa 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index fa7bc95ea..3179f56ea 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 0646033f5..cbe21e483 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 176fd5e65..3529cc775 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 5ecc8d871..ab8deef5c 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index e79f0f5e3..4d8b2dec0 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 5cc6b7168..0e2f07391 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 4fc71f5df..c01138c02 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index b205d1f5b..848f3a8a3 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 0029fd798..40686f0f7 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index a7c7ba707..f277ed01f 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 5d382e537..3e697cefc 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 85c592cab..008a1653c 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index bc5e8eb88..2c8048ae3 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index f793236f1..4b9016231 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index ea20f9c95..a19ff6127 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index df203439f..3a9e98282 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index d352958d9..b0efaf5bc 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 4770a876a..a86c1b955 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 3f3044324..4a78dc25d 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 diff --git a/test/hack/test.yml b/test/hack/test.yml index da7522458..a86eb3267 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -1,7 +1,7 @@ # FIXME: This should use the minimal example # We continue to use the kernel-config-test as CI is currently expecting to see a success message kernel: - image: linuxkit/kernel:4.9.62 + image: linuxkit/kernel:4.9.64 cmdline: "console=ttyS0" init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558