From 43ba6de1471d9742d63560c2ed099dc3f0719fea Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 13 Feb 2018 17:22:23 +0000 Subject: [PATCH 1/3] kernel: Update to 4.15.3/4.14.19/4.9.81 Drop the hack for the microcode division by 0 on GCP as a proper fix is in upstream as: 2760f452a718 ("x86/microcode: Do the family check first") Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 10 +-- kernel/config-4.14.x-aarch64 | 2 +- kernel/config-4.14.x-x86_64 | 2 +- kernel/config-4.15.x-aarch64 | 2 +- kernel/config-4.15.x-x86_64 | 2 +- kernel/config-4.9.x-aarch64 | 2 +- kernel/config-4.9.x-x86_64 | 2 +- ...ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch | 2 +- ...ools-build-Add-test-for-sched_getcpu.patch | 2 +- ...returning-garbage-for-a-ret-variable.patch | 2 +- ...03-hv_sock-introduce-Hyper-V-Sockets.patch | 2 +- ...n-t-spam-the-logs-with-unknown-GUIDs.patch | 2 +- ...-Fix-the-mapping-between-host-versio.patch | 2 +- ...-Drivers-hv-vss-Improve-log-messages.patch | 2 +- ...peration-timeouts-should-match-host-.patch | 2 +- ...-Use-all-supported-IC-versions-to-ne.patch | 2 +- ...rs-hv-Log-the-negotiated-IC-versions.patch | 2 +- ...vmbus-fix-missed-ring-events-on-boot.patch | 2 +- ...to-error_clean_msglist-in-vmbus_open.patch | 2 +- ...y-enqueue-dequeue-the-channel-on-vmb.patch | 2 +- ...crocode-intel-Avoid-division-by-zero.patch | 80 ------------------- 21 files changed, 24 insertions(+), 104 deletions(-) delete mode 100644 kernel/patches-4.9.x/0013-x86-microcode-intel-Avoid-division-by-zero.patch diff --git a/kernel/Makefile b/kernel/Makefile index 8b0c93639..aef79d4fb 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -204,11 +204,11 @@ endef # Build Targets # Debug targets only for latest stable and LTS stable # -$(eval $(call kernel,4.15.2,4.15.x,$(EXTRA))) -$(eval $(call kernel,4.14.18,4.14.x,$(EXTRA))) -$(eval $(call kernel,4.14.18,4.14.x,-dbg)) -$(eval $(call kernel,4.9.80,4.9.x,$(EXTRA))) -$(eval $(call kernel,4.9.80,4.9.x,-dbg)) +$(eval $(call kernel,4.15.3,4.15.x,$(EXTRA))) +$(eval $(call kernel,4.14.19,4.14.x,$(EXTRA))) +$(eval $(call kernel,4.14.19,4.14.x,-dbg)) +$(eval $(call kernel,4.9.81,4.9.x,$(EXTRA))) +$(eval $(call kernel,4.9.81,4.9.x,-dbg)) $(eval $(call kernel,4.4.115,4.4.x,$(EXTRA))) # Target for kernel config diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index ce9e01144..bc0da868a 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.18 Kernel Configuration +# Linux/arm64 4.14.19 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 cd68159c9..c9dfca35e 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.18 Kernel Configuration +# Linux/x86 4.14.19 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.15.x-aarch64 b/kernel/config-4.15.x-aarch64 index e2c64199e..f358040b1 100644 --- a/kernel/config-4.15.x-aarch64 +++ b/kernel/config-4.15.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.15.2 Kernel Configuration +# Linux/arm64 4.15.3 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.15.x-x86_64 b/kernel/config-4.15.x-x86_64 index 0b8428131..dcf8050b1 100644 --- a/kernel/config-4.15.x-x86_64 +++ b/kernel/config-4.15.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.15.2 Kernel Configuration +# Linux/x86 4.15.3 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 10d455eeb..f60d1fab0 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.80 Kernel Configuration +# Linux/arm64 4.9.81 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 90e734416..9b0668e43 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.80 Kernel Configuration +# Linux/x86 4.9.81 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch index bb4e18d89..41b1c39d5 100644 --- a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch +++ b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch @@ -1,4 +1,4 @@ -From 68f097990b84f65ddf63e483f59f7a33810dbeda Mon Sep 17 00:00:00 2001 +From 6bbdbaead3d12453aec28a37cb33bff2485a148a Mon Sep 17 00:00:00 2001 From: Cheng-mean Liu Date: Tue, 11 Jul 2017 16:58:26 -0700 Subject: [PATCH] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB (page 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 972e7365a..dc62d2af0 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 9586bfc77ee58cc2e9ae399f18d32bc05e4b6ffc Mon Sep 17 00:00:00 2001 +From 7edc1c0dc75b0446fc6b6df432d9dd4a0d8e9d47 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 2 Mar 2017 12:55:49 -0300 Subject: [PATCH 01/13] 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 b3a39885b..9c61b272f 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 310ac1363fe5f87ce56c63e7a7a7d46a84be8d3f Mon Sep 17 00:00:00 2001 +From 2f47053913fa5b998866088095e0a1fb751ab99b Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 13 Oct 2016 17:12:35 -0300 Subject: [PATCH 02/13] 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 1c739cfec..a491a980b 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 a39417812083d3474b98134d139e72d6d79bc492 Mon Sep 17 00:00:00 2001 +From 2140adc1f00021ae260cf327a44709503fc7a3db Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sat, 23 Jul 2016 01:35:51 +0000 Subject: [PATCH 03/13] 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 e4d2165bc..07f86def7 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 1e0c2c94321b412be54c6b9a1cecf376c633780b Mon Sep 17 00:00:00 2001 +From 7537735a26af23f71550b2b501b5e22edada9b8b Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 23 May 2016 18:55:45 +0100 Subject: [PATCH 04/13] 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 81ef268e6..9fb330b48 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 5f0fcc042a7e5287406c958776f49ff6fac00b73 Mon Sep 17 00:00:00 2001 +From 3daee26f7a4c6a4ff771719e46c2e3cf26f1fbe3 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:07 -0800 Subject: [PATCH 05/13] 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 c3c60451e..512fe7793 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 b8b4ae687821bc86381482a77ea3140670cf132e Mon Sep 17 00:00:00 2001 +From 805443d8e0f0d7131b8fd094218cce1dbd3ffe27 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:10 -0800 Subject: [PATCH 06/13] 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 f961883da..ba7f6be74 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 298283fe160246b6e36d7c38da55a89b016e4a0b Mon Sep 17 00:00:00 2001 +From a83e50896887ffb69b493692e030efea95756def Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:11 -0800 Subject: [PATCH 07/13] 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 99a596a7d..78b27f2b6 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 517d5ea9d31325d2d77018f6814c8a1344e48a00 Mon Sep 17 00:00:00 2001 +From 257104242b1ab8b555ca1a02b5df595bba192464 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:17 -0700 Subject: [PATCH 08/13] 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 9f11fc2bf..21f970abb 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 440b0cedc63f8db6db248d4aad884250433eae1a Mon Sep 17 00:00:00 2001 +From aced8de6941e375ff038e44e8be2d4374a60025a Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:18 -0700 Subject: [PATCH 09/13] 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 3cbda1831..9ed786747 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 c82e7bcadba81fb8c9f7edd330589d95dca1d7f5 Mon Sep 17 00:00:00 2001 +From f87005a13376088b6eae2236f2e9353e5f5c5b6a Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sun, 26 Mar 2017 16:42:20 +0800 Subject: [PATCH 10/13] 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 8ffc94507..a1ebf279b 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 c9344407111f75bbe709dd00f67be7f941798d29 Mon Sep 17 00:00:00 2001 +From 68e114a437c754cd2752e531ed904b94f4e45c88 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 29 Mar 2017 18:37:10 +0800 Subject: [PATCH 11/13] 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 206d98781..11ef39a0d 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 2855f13f45de54ca67a3f438d8c62d75fa99c7ca Mon Sep 17 00:00:00 2001 +From 47a067250e8a959e49a968879e5ed1488d717586 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 24 Mar 2017 20:53:18 +0800 Subject: [PATCH 12/13] vmbus: dynamically enqueue/dequeue the channel on diff --git a/kernel/patches-4.9.x/0013-x86-microcode-intel-Avoid-division-by-zero.patch b/kernel/patches-4.9.x/0013-x86-microcode-intel-Avoid-division-by-zero.patch deleted file mode 100644 index eecfe220d..000000000 --- a/kernel/patches-4.9.x/0013-x86-microcode-intel-Avoid-division-by-zero.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 207fa9a93a6708071fecec462915570a52641c78 Mon Sep 17 00:00:00 2001 -From: Rolf Neugebauer -Date: Tue, 6 Feb 2018 13:02:57 +0000 -Subject: [PATCH 13/13] x86/microcode/intel: Avoid division by zero - -The backport of 7e702d17ed1 ("x86/microcode/intel: Extend BDW -late-loading further with LLC size check") introduced a division -by zero panic on some platforms, specifically on machine types -with one vCPU on Google Cloud (e.g., g1-small and n1-standard-1): - -[ 1.591435] divide error: 0000 [#1] SMP -[ 1.591961] Modules linked in: -[ 1.592546] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.9.79-linuxkit #1 -[ 1.593461] Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 -[ 1.595135] task: ffffa01b2b63c040 task.stack: ffffb24f40010000 -[ 1.596683] RIP: 0010:[] [] init_intel_microcode+0x49/0x5a -[ 1.598018] RSP: 0000:ffffb24f40013e48 EFLAGS: 00010206 -[ 1.599016] RAX: 0000000001400000 RBX: 00000000ffffffea RCX: 0000000000000000 -[ 1.600093] RDX: 0000000000000000 RSI: ffffa01b2fffa9a8 RDI: ffffffffb7d8888b -[ 1.601222] RBP: 00000000ffffffff R08: ffffa01b2fffa9a1 R09: 000000000000005f -[ 1.602330] R10: 0000000000000067 R11: ffffa01b22164177 R12: 0000000000000000 -[ 1.603291] R13: ffffffffb7d787b6 R14: 0000000000000000 R15: 0000000000000000 -[ 1.604406] FS: 0000000000000000(0000) GS:ffffa01b2fc00000(0000) knlGS:0000000000000000 -[ 1.606154] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 -[ 1.607493] CR2: 0000000000000000 CR3: 000000002ac0a000 CR4: 0000000000040630 -[ 1.609310] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 -[ 1.611122] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 -[ 1.613008] Stack: -[ 1.613445] ffffffffb7d888c1 0000000000000000 ffffffffb7d1ba40 0000000000000000 -[ 1.615423] 0000000000000000 ffffffffb7d787b6 0000000000000000 0000000000000000 -[ 1.617049] ffffffffb74fed89 00000000fffffff4 00000000ffffffff 4eae7bc133547c47 -[ 1.617904] Call Trace: -[ 1.618198] [] ? microcode_init+0x36/0x1de -[ 1.619264] [] ? set_debug_rodata+0xc/0xc -[ 1.620143] [] ? driver_register+0xaf/0xb4 -[ 1.621841] [] ? save_microcode_in_initrd+0x3c/0x3c -[ 1.623424] [] ? do_one_initcall+0x98/0x130 -[ 1.624659] [] ? set_debug_rodata+0xc/0xc -[ 1.626303] [] ? kernel_init_freeable+0x166/0x1e7 -[ 1.627674] [] ? rest_init+0x6e/0x6e -[ 1.628942] [] ? kernel_init+0xa/0xe6 -[ 1.630243] [] ? ret_from_fork+0x57/0x70 -[ 1.631592] Code: 16 0f b6 35 a0 ac fb ff 48 c7 c7 c4 ea 99 b7 e8 82 3e 41 ff 31 c0 c3 8b 05 3b ad fb ff 0f b7 0d 54 ad fb ff 31 d2 c1 e0 0a 48 98 <48> f7 f1 89 05 f4 6a 14 00 48 c7 c0 00 d8 c2 b7 c3 4c 8d 54 24 -[ 1.638875] RIP [] init_intel_microcode+0x49/0x5a -[ 1.640382] RSP -[ 1.641320] ---[ end trace e88ef332e19594b9 ]--- -[ 1.642418] Kernel panic - not syncing: Fatal exception -[ 1.644581] Kernel Offset: 0x36000000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) -[ 1.647312] ---[ end Kernel panic - not syncing: Fatal exception - -On these platforms x86_max_cores is 0: - -[ 0.227977] ftrace: allocating 35563 entries in 139 pages -[ 0.273941] smpboot: x86_max_cores == zero !?!? -[ 0.274645] smpboot: Max logical packages: 1 - -Here, we check x86_max_core before calculating the llc_size. - -Signed-off-by: Rolf Neugebauer ---- - arch/x86/kernel/cpu/microcode/intel.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c -index f90f17610f62..a5dd9e5db4ce 100644 ---- a/arch/x86/kernel/cpu/microcode/intel.c -+++ b/arch/x86/kernel/cpu/microcode/intel.c -@@ -1134,6 +1134,9 @@ static int __init calc_llc_size_per_core(struct cpuinfo_x86 *c) - { - u64 llc_size = c->x86_cache_size * 1024; - -+ if (!c->x86_max_cores) -+ return 0; -+ - do_div(llc_size, c->x86_max_cores); - - return (int)llc_size; --- -2.16.0 - From bf18c1366bf026f32724b04b1a5beadc9c6ef02a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 13 Feb 2018 18:00:39 +0000 Subject: [PATCH 2/3] kernel: Add Hyper-V socket trace points to 4.14 kernel This should make debugging a lot easier. Note, 991f8f1c6eb6 ("hyper-v: trace channel events"), patch 18, required some minor modifications from upstream as another patch was not easy to cherry-pick. Signed-off-by: Rolf Neugebauer --- ...ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch | 4 +- .../0002-hyper-v-trace-vmbus_on_msg_dpc.patch | 111 ++++++++++++++++++ .../0003-hyper-v-trace-vmbus_on_message.patch | 49 ++++++++ .../0004-hyper-v-trace-vmbus_onoffer.patch | 80 +++++++++++++ ...-hyper-v-trace-vmbus_onoffer_rescind.patch | 51 ++++++++ ...06-hyper-v-trace-vmbus_onopen_result.patch | 60 ++++++++++ ...-hyper-v-trace-vmbus_ongpadl_created.patch | 60 ++++++++++ ...hyper-v-trace-vmbus_ongpadl_torndown.patch | 51 ++++++++ ...per-v-trace-vmbus_onversion_response.patch | 55 +++++++++ ...0-hyper-v-trace-vmbus_request_offers.patch | 55 +++++++++ .../0011-hyper-v-trace-vmbus_open.patch | 70 +++++++++++ ...2-hyper-v-trace-vmbus_close_internal.patch | 58 +++++++++ ...-hyper-v-trace-vmbus_establish_gpadl.patch | 96 +++++++++++++++ ...4-hyper-v-trace-vmbus_teardown_gpadl.patch | 61 ++++++++++ ...yper-v-trace-vmbus_negotiate_version.patch | 70 +++++++++++ ...16-hyper-v-trace-vmbus_release_relid.patch | 68 +++++++++++ ...-trace-vmbus_send_tl_connect_request.patch | 74 ++++++++++++ .../0018-hyper-v-trace-channel-events.patch | 101 ++++++++++++++++ 18 files changed, 1172 insertions(+), 2 deletions(-) create mode 100644 kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch create mode 100644 kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch create mode 100644 kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch create mode 100644 kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch create mode 100644 kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch create mode 100644 kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch create mode 100644 kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch create mode 100644 kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch create mode 100644 kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch create mode 100644 kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch create mode 100644 kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch create mode 100644 kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch create mode 100644 kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch create mode 100644 kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch create mode 100644 kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch create mode 100644 kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch create mode 100644 kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch diff --git a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch index 41b1c39d5..dbb0a6b91 100644 --- a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch +++ b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch @@ -1,8 +1,8 @@ From 6bbdbaead3d12453aec28a37cb33bff2485a148a Mon Sep 17 00:00:00 2001 From: Cheng-mean Liu Date: Tue, 11 Jul 2017 16:58:26 -0700 -Subject: [PATCH] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB (page - size) +Subject: [PATCH 01/18] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB + (page size) Signed-off-by: Cheng-mean Liu Origin: https://github.com/Microsoft/opengcs/blob/master/kernelconfig/4.11/patch_lower-the-minimum-PMEM-size.patch diff --git a/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch b/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch new file mode 100644 index 000000000..519cc9a89 --- /dev/null +++ b/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch @@ -0,0 +1,111 @@ +From 4e238653b5403128c184405dd84787f99ef12d77 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:00 -0700 +Subject: [PATCH 02/18] hyper-v: trace vmbus_on_msg_dpc() + +Add tracing subsystem to Hyper-V VMBus module and add tracepoint +to vmbus_on_msg_dpc() which is called when we receive a message from host. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit c9fe0f8fa4136c2451dcc012e48fbf4470d6b592) +--- + drivers/hv/Makefile | 4 +++- + drivers/hv/hv_trace.c | 4 ++++ + drivers/hv/hv_trace.h | 29 +++++++++++++++++++++++++++++ + drivers/hv/hyperv_vmbus.h | 2 ++ + drivers/hv/vmbus_drv.c | 2 ++ + 5 files changed, 40 insertions(+), 1 deletion(-) + create mode 100644 drivers/hv/hv_trace.c + create mode 100644 drivers/hv/hv_trace.h + +diff --git a/drivers/hv/Makefile b/drivers/hv/Makefile +index e7b1d796ba2e..14c22786b519 100644 +--- a/drivers/hv/Makefile ++++ b/drivers/hv/Makefile +@@ -3,7 +3,9 @@ obj-$(CONFIG_HYPERV) += hv_vmbus.o + obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o + obj-$(CONFIG_HYPERV_BALLOON) += hv_balloon.o + ++CFLAGS_hv_trace.o = -I$(src) ++ + hv_vmbus-y := vmbus_drv.o \ + hv.o connection.o channel.o \ +- channel_mgmt.o ring_buffer.o ++ channel_mgmt.o ring_buffer.o hv_trace.o + hv_utils-y := hv_util.o hv_kvp.o hv_snapshot.o hv_fcopy.o hv_utils_transport.o +diff --git a/drivers/hv/hv_trace.c b/drivers/hv/hv_trace.c +new file mode 100644 +index 000000000000..df47acd01a81 +--- /dev/null ++++ b/drivers/hv/hv_trace.c +@@ -0,0 +1,4 @@ ++#include "hyperv_vmbus.h" ++ ++#define CREATE_TRACE_POINTS ++#include "hv_trace.h" +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +new file mode 100644 +index 000000000000..9c2772922c76 +--- /dev/null ++++ b/drivers/hv/hv_trace.h +@@ -0,0 +1,29 @@ ++#undef TRACE_SYSTEM ++#define TRACE_SYSTEM hyperv ++ ++#if !defined(_HV_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) ++#define _HV_TRACE_H ++ ++#include ++ ++DECLARE_EVENT_CLASS(vmbus_hdr_msg, ++ TP_PROTO(const struct vmbus_channel_message_header *hdr), ++ TP_ARGS(hdr), ++ TP_STRUCT__entry(__field(unsigned int, msgtype)), ++ TP_fast_assign(__entry->msgtype = hdr->msgtype;), ++ TP_printk("msgtype=%u", __entry->msgtype) ++); ++ ++DEFINE_EVENT(vmbus_hdr_msg, vmbus_on_msg_dpc, ++ TP_PROTO(const struct vmbus_channel_message_header *hdr), ++ TP_ARGS(hdr) ++); ++ ++#undef TRACE_INCLUDE_PATH ++#define TRACE_INCLUDE_PATH . ++#undef TRACE_INCLUDE_FILE ++#define TRACE_INCLUDE_FILE hv_trace ++#endif /* _HV_TRACE_H */ ++ ++/* This part must be outside protection */ ++#include +diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h +index 49569f8fe038..82eb082f3302 100644 +--- a/drivers/hv/hyperv_vmbus.h ++++ b/drivers/hv/hyperv_vmbus.h +@@ -31,6 +31,8 @@ + #include + #include + ++#include "hv_trace.h" ++ + /* + * Timeout for services such as KVP and fcopy. + */ +diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c +index 2cd134dd94d2..9687e462fd43 100644 +--- a/drivers/hv/vmbus_drv.c ++++ b/drivers/hv/vmbus_drv.c +@@ -833,6 +833,8 @@ void vmbus_on_msg_dpc(unsigned long data) + + hdr = (struct vmbus_channel_message_header *)msg->u.payload; + ++ trace_vmbus_on_msg_dpc(hdr); ++ + if (hdr->msgtype >= CHANNELMSG_COUNT) { + WARN_ONCE(1, "unknown msgtype=%d\n", hdr->msgtype); + goto msg_handled; +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch b/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch new file mode 100644 index 000000000..774a20801 --- /dev/null +++ b/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch @@ -0,0 +1,49 @@ +From c87244e9cba6dc88b82cbe0a5d4ada4f9951e319 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:01 -0700 +Subject: [PATCH 03/18] hyper-v: trace vmbus_on_message() + +Add tracepoint to vmbus_on_message() which is called when we start +processing a blocking from work context. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 716fa52fb474a36ddd3cbc981108f93610c973ef) +--- + drivers/hv/channel_mgmt.c | 2 ++ + drivers/hv/hv_trace.h | 5 +++++ + 2 files changed, 7 insertions(+) + +diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c +index 65c6d6bdce4c..7948fff52a6d 100644 +--- a/drivers/hv/channel_mgmt.c ++++ b/drivers/hv/channel_mgmt.c +@@ -1169,6 +1169,8 @@ void vmbus_onmessage(void *context) + hdr = (struct vmbus_channel_message_header *)msg->u.payload; + size = msg->header.payload_size; + ++ trace_vmbus_on_message(hdr); ++ + if (hdr->msgtype >= CHANNELMSG_COUNT) { + pr_err("Received invalid channel message type %d size %d\n", + hdr->msgtype, size); +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 9c2772922c76..d432aba5df8a 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -19,6 +19,11 @@ DEFINE_EVENT(vmbus_hdr_msg, vmbus_on_msg_dpc, + TP_ARGS(hdr) + ); + ++DEFINE_EVENT(vmbus_hdr_msg, vmbus_on_message, ++ TP_PROTO(const struct vmbus_channel_message_header *hdr), ++ TP_ARGS(hdr) ++); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch b/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch new file mode 100644 index 000000000..949cc9723 --- /dev/null +++ b/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch @@ -0,0 +1,80 @@ +From b37f6409b9cb749a1f1dd00fbdc080290b8c88ab Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:02 -0700 +Subject: [PATCH 04/18] hyper-v: trace vmbus_onoffer() + +Add tracepoint to CHANNELMSG_OFFERCHANNEL handler. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 03b81e66c78b076bfc127714ce6fd25655784600) +--- + drivers/hv/channel_mgmt.c | 2 ++ + drivers/hv/hv_trace.h | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 39 insertions(+) + +diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c +index 7948fff52a6d..1909c5c571d1 100644 +--- a/drivers/hv/channel_mgmt.c ++++ b/drivers/hv/channel_mgmt.c +@@ -806,6 +806,8 @@ static void vmbus_onoffer(struct vmbus_channel_message_header *hdr) + + offer = (struct vmbus_channel_offer_channel *)hdr; + ++ trace_vmbus_onoffer(offer); ++ + /* Allocate the channel object and save this offer. */ + newchannel = alloc_channel(); + if (!newchannel) { +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index d432aba5df8a..488b873b563e 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -24,6 +24,43 @@ DEFINE_EVENT(vmbus_hdr_msg, vmbus_on_message, + TP_ARGS(hdr) + ); + ++TRACE_EVENT(vmbus_onoffer, ++ TP_PROTO(const struct vmbus_channel_offer_channel *offer), ++ TP_ARGS(offer), ++ TP_STRUCT__entry( ++ __field(u32, child_relid) ++ __field(u8, monitorid) ++ __field(u16, is_ddc_int) ++ __field(u32, connection_id) ++ __array(char, if_type, 16) ++ __array(char, if_instance, 16) ++ __field(u16, chn_flags) ++ __field(u16, mmio_mb) ++ __field(u16, sub_idx) ++ ), ++ TP_fast_assign(__entry->child_relid = offer->child_relid; ++ __entry->monitorid = offer->monitorid; ++ __entry->is_ddc_int = offer->is_dedicated_interrupt; ++ __entry->connection_id = offer->connection_id; ++ memcpy(__entry->if_type, ++ &offer->offer.if_type.b, 16); ++ memcpy(__entry->if_instance, ++ &offer->offer.if_instance.b, 16); ++ __entry->chn_flags = offer->offer.chn_flags; ++ __entry->mmio_mb = offer->offer.mmio_megabytes; ++ __entry->sub_idx = offer->offer.sub_channel_index; ++ ), ++ TP_printk("child_relid 0x%x, monitorid 0x%x, is_dedicated %d, " ++ "connection_id 0x%x, if_type %pUl, if_instance %pUl, " ++ "chn_flags 0x%x, mmio_megabytes %d, sub_channel_index %d", ++ __entry->child_relid, __entry->monitorid, ++ __entry->is_ddc_int, __entry->connection_id, ++ __entry->if_type, __entry->if_instance, ++ __entry->chn_flags, __entry->mmio_mb, ++ __entry->sub_idx ++ ) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch b/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch new file mode 100644 index 000000000..044656a80 --- /dev/null +++ b/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch @@ -0,0 +1,51 @@ +From 635e04ba7b3f11d986f8657aaf8eba8ed72762e4 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:03 -0700 +Subject: [PATCH 05/18] hyper-v: trace vmbus_onoffer_rescind() + +Add tracepoint to CHANNELMSG_RESCIND_CHANNELOFFER handler. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 5175167c77afb19993bd86ab8b4be63d9cb4a928) +--- + drivers/hv/channel_mgmt.c | 2 ++ + drivers/hv/hv_trace.h | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c +index 1909c5c571d1..54235b32ac82 100644 +--- a/drivers/hv/channel_mgmt.c ++++ b/drivers/hv/channel_mgmt.c +@@ -849,6 +849,8 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr) + + rescind = (struct vmbus_channel_rescind_offer *)hdr; + ++ trace_vmbus_onoffer_rescind(rescind); ++ + /* + * The offer msg and the corresponding rescind msg + * from the host are guranteed to be ordered - +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 488b873b563e..dbbed1d1f327 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -61,6 +61,14 @@ TRACE_EVENT(vmbus_onoffer, + ) + ); + ++TRACE_EVENT(vmbus_onoffer_rescind, ++ TP_PROTO(const struct vmbus_channel_rescind_offer *offer), ++ TP_ARGS(offer), ++ TP_STRUCT__entry(__field(u32, child_relid)), ++ TP_fast_assign(__entry->child_relid = offer->child_relid), ++ TP_printk("child_relid 0x%x", __entry->child_relid) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch b/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch new file mode 100644 index 000000000..8a6b17dbf --- /dev/null +++ b/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch @@ -0,0 +1,60 @@ +From ec7221a006dc8537f684a0f5164227ed6a4cc362 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:04 -0700 +Subject: [PATCH 06/18] hyper-v: trace vmbus_onopen_result() + +Add tracepoint to CHANNELMSG_OPENCHANNEL_RESULT handler. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 9f23ce1a23b6bf471d5920bdca5cc40940419e60) +--- + drivers/hv/channel_mgmt.c | 2 ++ + drivers/hv/hv_trace.h | 17 +++++++++++++++++ + 2 files changed, 19 insertions(+) + +diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c +index 54235b32ac82..66aa6b079b2e 100644 +--- a/drivers/hv/channel_mgmt.c ++++ b/drivers/hv/channel_mgmt.c +@@ -979,6 +979,8 @@ static void vmbus_onopen_result(struct vmbus_channel_message_header *hdr) + + result = (struct vmbus_channel_open_result *)hdr; + ++ trace_vmbus_onopen_result(result); ++ + /* + * Find the open msg, copy the result and signal/unblock the wait event + */ +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index dbbed1d1f327..9757c19d1c08 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -69,6 +69,23 @@ TRACE_EVENT(vmbus_onoffer_rescind, + TP_printk("child_relid 0x%x", __entry->child_relid) + ); + ++TRACE_EVENT(vmbus_onopen_result, ++ TP_PROTO(const struct vmbus_channel_open_result *result), ++ TP_ARGS(result), ++ TP_STRUCT__entry( ++ __field(u32, child_relid) ++ __field(u32, openid) ++ __field(u32, status) ++ ), ++ TP_fast_assign(__entry->child_relid = result->child_relid; ++ __entry->openid = result->openid; ++ __entry->status = result->status; ++ ), ++ TP_printk("child_relid 0x%x, openid %d, status %d", ++ __entry->child_relid, __entry->openid, __entry->status ++ ) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch b/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch new file mode 100644 index 000000000..1ef5fcdbd --- /dev/null +++ b/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch @@ -0,0 +1,60 @@ +From 1cae1a53932c3357f3f6ee3f5d1635a6280f4408 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:05 -0700 +Subject: [PATCH 07/18] hyper-v: trace vmbus_ongpadl_created() + +Add tracepoint to CHANNELMSG_GPADL_CREATED handler. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit a13bf0ea4a60a7946bf335bd57e60adc344033bd) +--- + drivers/hv/channel_mgmt.c | 2 ++ + drivers/hv/hv_trace.h | 17 +++++++++++++++++ + 2 files changed, 19 insertions(+) + +diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c +index 66aa6b079b2e..ca5eccd3dceb 100644 +--- a/drivers/hv/channel_mgmt.c ++++ b/drivers/hv/channel_mgmt.c +@@ -1025,6 +1025,8 @@ static void vmbus_ongpadl_created(struct vmbus_channel_message_header *hdr) + + gpadlcreated = (struct vmbus_channel_gpadl_created *)hdr; + ++ trace_vmbus_ongpadl_created(gpadlcreated); ++ + /* + * Find the establish msg, copy the result and signal/unblock the wait + * event +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 9757c19d1c08..20734b7b341b 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -86,6 +86,23 @@ TRACE_EVENT(vmbus_onopen_result, + ) + ); + ++TRACE_EVENT(vmbus_ongpadl_created, ++ TP_PROTO(const struct vmbus_channel_gpadl_created *gpadlcreated), ++ TP_ARGS(gpadlcreated), ++ TP_STRUCT__entry( ++ __field(u32, child_relid) ++ __field(u32, gpadl) ++ __field(u32, status) ++ ), ++ TP_fast_assign(__entry->child_relid = gpadlcreated->child_relid; ++ __entry->gpadl = gpadlcreated->gpadl; ++ __entry->status = gpadlcreated->creation_status; ++ ), ++ TP_printk("child_relid 0x%x, gpadl 0x%x, creation_status %d", ++ __entry->child_relid, __entry->gpadl, __entry->status ++ ) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch b/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch new file mode 100644 index 000000000..929a21648 --- /dev/null +++ b/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch @@ -0,0 +1,51 @@ +From 69f601d5d2b8cbf98c72bfd4881d3e90baa6fa8e Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:06 -0700 +Subject: [PATCH 08/18] hyper-v: trace vmbus_ongpadl_torndown() + +Add tracepoint to CHANNELMSG_GPADL_TORNDOWN handler. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 602a8c525c8c7b2ff446894fc6b21f42471c952f) +--- + drivers/hv/channel_mgmt.c | 2 ++ + drivers/hv/hv_trace.h | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c +index ca5eccd3dceb..1e8b0ebe1b9e 100644 +--- a/drivers/hv/channel_mgmt.c ++++ b/drivers/hv/channel_mgmt.c +@@ -1075,6 +1075,8 @@ static void vmbus_ongpadl_torndown( + + gpadl_torndown = (struct vmbus_channel_gpadl_torndown *)hdr; + ++ trace_vmbus_ongpadl_torndown(gpadl_torndown); ++ + /* + * Find the open msg, copy the result and signal/unblock the wait event + */ +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 20734b7b341b..84c08cdf7235 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -103,6 +103,14 @@ TRACE_EVENT(vmbus_ongpadl_created, + ) + ); + ++TRACE_EVENT(vmbus_ongpadl_torndown, ++ TP_PROTO(const struct vmbus_channel_gpadl_torndown *gpadltorndown), ++ TP_ARGS(gpadltorndown), ++ TP_STRUCT__entry(__field(u32, gpadl)), ++ TP_fast_assign(__entry->gpadl = gpadltorndown->gpadl), ++ TP_printk("gpadl 0x%x", __entry->gpadl) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch b/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch new file mode 100644 index 000000000..d1d756e6a --- /dev/null +++ b/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch @@ -0,0 +1,55 @@ +From 21b6485093fe73933793d024f5fc07d17fb4f564 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:07 -0700 +Subject: [PATCH 09/18] hyper-v: trace vmbus_onversion_response() + +Add tracepoint to CHANNELMSG_VERSION_RESPONSE handler. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit c7924fb07a2646c9ff661efcad1167a1106d6019) +--- + drivers/hv/channel_mgmt.c | 3 +++ + drivers/hv/hv_trace.h | 11 +++++++++++ + 2 files changed, 14 insertions(+) + +diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c +index 1e8b0ebe1b9e..26d5452ee2be 100644 +--- a/drivers/hv/channel_mgmt.c ++++ b/drivers/hv/channel_mgmt.c +@@ -1120,6 +1120,9 @@ static void vmbus_onversion_response( + unsigned long flags; + + version_response = (struct vmbus_channel_version_response *)hdr; ++ ++ trace_vmbus_onversion_response(version_response); ++ + spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags); + + list_for_each_entry(msginfo, &vmbus_connection.chn_msg_list, +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 84c08cdf7235..2a046547107f 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -111,6 +111,17 @@ TRACE_EVENT(vmbus_ongpadl_torndown, + TP_printk("gpadl 0x%x", __entry->gpadl) + ); + ++TRACE_EVENT(vmbus_onversion_response, ++ TP_PROTO(const struct vmbus_channel_version_response *response), ++ TP_ARGS(response), ++ TP_STRUCT__entry( ++ __field(u8, ver) ++ ), ++ TP_fast_assign(__entry->ver = response->version_supported; ++ ), ++ TP_printk("version_supported %d", __entry->ver) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch b/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch new file mode 100644 index 000000000..b6eab3250 --- /dev/null +++ b/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch @@ -0,0 +1,55 @@ +From e171d5a3845680154bdc51a663e419543e9eb823 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:08 -0700 +Subject: [PATCH 10/18] hyper-v: trace vmbus_request_offers() + +Add tracepoint to CHANNELMSG_REQUESTOFFERS sender. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit d6706e63367a9c783974db4b94cf8980d31c4cb2) +--- + drivers/hv/channel_mgmt.c | 4 +++- + drivers/hv/hv_trace.h | 8 ++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c +index 26d5452ee2be..51156ee83b93 100644 +--- a/drivers/hv/channel_mgmt.c ++++ b/drivers/hv/channel_mgmt.c +@@ -1217,9 +1217,11 @@ int vmbus_request_offers(void) + + msg->msgtype = CHANNELMSG_REQUESTOFFERS; + +- + ret = vmbus_post_msg(msg, sizeof(struct vmbus_channel_message_header), + true); ++ ++ trace_vmbus_request_offers(ret); ++ + if (ret != 0) { + pr_err("Unable to request offers - %d\n", ret); + +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 2a046547107f..566ac0f2fe56 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -122,6 +122,14 @@ TRACE_EVENT(vmbus_onversion_response, + TP_printk("version_supported %d", __entry->ver) + ); + ++TRACE_EVENT(vmbus_request_offers, ++ TP_PROTO(int ret), ++ TP_ARGS(ret), ++ TP_STRUCT__entry(__field(int, ret)), ++ TP_fast_assign(__entry->ret = ret), ++ TP_printk("sending ret %d", __entry->ret) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch b/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch new file mode 100644 index 000000000..66d07ce26 --- /dev/null +++ b/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch @@ -0,0 +1,70 @@ +From ab0cedcde1c60fee6ea7baac4f563ef314cb81a2 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:09 -0700 +Subject: [PATCH 11/18] hyper-v: trace vmbus_open() + +Add tracepoint to CHANNELMSG_OPENCHANNEL sender. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 9202d771ca37514bfbc2c3a8fdcb018f40a6bd8a) +--- + drivers/hv/channel.c | 2 ++ + drivers/hv/hv_trace.h | 27 +++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c +index 05964347008d..b562a7fb4c42 100644 +--- a/drivers/hv/channel.c ++++ b/drivers/hv/channel.c +@@ -185,6 +185,8 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, + ret = vmbus_post_msg(open_msg, + sizeof(struct vmbus_channel_open_channel), true); + ++ trace_vmbus_open(open_msg, ret); ++ + if (ret != 0) { + err = ret; + goto error_clean_msglist; +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 566ac0f2fe56..38fedb803bd8 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -130,6 +130,33 @@ TRACE_EVENT(vmbus_request_offers, + TP_printk("sending ret %d", __entry->ret) + ); + ++TRACE_EVENT(vmbus_open, ++ TP_PROTO(const struct vmbus_channel_open_channel *msg, int ret), ++ TP_ARGS(msg, ret), ++ TP_STRUCT__entry( ++ __field(u32, child_relid) ++ __field(u32, openid) ++ __field(u32, gpadlhandle) ++ __field(u32, target_vp) ++ __field(u32, offset) ++ __field(int, ret) ++ ), ++ TP_fast_assign( ++ __entry->child_relid = msg->child_relid; ++ __entry->openid = msg->openid; ++ __entry->gpadlhandle = msg->ringbuffer_gpadlhandle; ++ __entry->target_vp = msg->target_vp; ++ __entry->offset = msg->downstream_ringbuffer_pageoffset; ++ __entry->ret = ret; ++ ), ++ TP_printk("sending child_relid 0x%x, openid %d, " ++ "gpadlhandle 0x%x, target_vp 0x%x, offset 0x%x, ret %d", ++ __entry->child_relid, __entry->openid, ++ __entry->gpadlhandle, __entry->target_vp, ++ __entry->offset, __entry->ret ++ ) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch b/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch new file mode 100644 index 000000000..2298394b7 --- /dev/null +++ b/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch @@ -0,0 +1,58 @@ +From 2398d2a0e00a57022e2b43bb248ad8262ba63649 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:10 -0700 +Subject: [PATCH 12/18] hyper-v: trace vmbus_close_internal() + +Add tracepoint to CHANNELMSG_CLOSECHANNEL sender. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 633b005df0dff555c0d4f22b5f1f8b04dba67ac5) +--- + drivers/hv/channel.c | 2 ++ + drivers/hv/hv_trace.h | 15 +++++++++++++++ + 2 files changed, 17 insertions(+) + +diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c +index b562a7fb4c42..70babce00ddc 100644 +--- a/drivers/hv/channel.c ++++ b/drivers/hv/channel.c +@@ -591,6 +591,8 @@ static int vmbus_close_internal(struct vmbus_channel *channel) + ret = vmbus_post_msg(msg, sizeof(struct vmbus_channel_close_channel), + true); + ++ trace_vmbus_close_internal(msg, ret); ++ + if (ret) { + pr_err("Close failed: close post msg return is %d\n", ret); + /* +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 38fedb803bd8..302bd4e964f0 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -157,6 +157,21 @@ TRACE_EVENT(vmbus_open, + ) + ); + ++TRACE_EVENT(vmbus_close_internal, ++ TP_PROTO(const struct vmbus_channel_close_channel *msg, int ret), ++ TP_ARGS(msg, ret), ++ TP_STRUCT__entry( ++ __field(u32, child_relid) ++ __field(int, ret) ++ ), ++ TP_fast_assign( ++ __entry->child_relid = msg->child_relid; ++ __entry->ret = ret; ++ ), ++ TP_printk("sending child_relid 0x%x, ret %d", __entry->child_relid, ++ __entry->ret) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch b/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch new file mode 100644 index 000000000..ddeaf1f61 --- /dev/null +++ b/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch @@ -0,0 +1,96 @@ +From 02a9a8babb01ccd78337756138ced187ab13fa26 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:11 -0700 +Subject: [PATCH 13/18] hyper-v: trace vmbus_establish_gpadl() + +Add tracepoint to CHANNELMSG_GPADL_HEADER/CHANNELMSG_GPADL_BODY sender. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 69edbd5f4729a58e11437b2804103bf8ea52745c) +--- + drivers/hv/channel.c | 6 ++++++ + drivers/hv/hv_trace.h | 42 ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 48 insertions(+) + +diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c +index 70babce00ddc..a7ac16c091a9 100644 +--- a/drivers/hv/channel.c ++++ b/drivers/hv/channel.c +@@ -435,6 +435,9 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, + + ret = vmbus_post_msg(gpadlmsg, msginfo->msgsize - + sizeof(*msginfo), true); ++ ++ trace_vmbus_establish_gpadl_header(gpadlmsg, ret); ++ + if (ret != 0) + goto cleanup; + +@@ -450,6 +453,9 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, + ret = vmbus_post_msg(gpadl_body, + submsginfo->msgsize - sizeof(*submsginfo), + true); ++ ++ trace_vmbus_establish_gpadl_body(gpadl_body, ret); ++ + if (ret != 0) + goto cleanup; + +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 302bd4e964f0..978e70bdc7c5 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -172,6 +172,48 @@ TRACE_EVENT(vmbus_close_internal, + __entry->ret) + ); + ++TRACE_EVENT(vmbus_establish_gpadl_header, ++ TP_PROTO(const struct vmbus_channel_gpadl_header *msg, int ret), ++ TP_ARGS(msg, ret), ++ TP_STRUCT__entry( ++ __field(u32, child_relid) ++ __field(u32, gpadl) ++ __field(u16, range_buflen) ++ __field(u16, rangecount) ++ __field(int, ret) ++ ), ++ TP_fast_assign( ++ __entry->child_relid = msg->child_relid; ++ __entry->gpadl = msg->gpadl; ++ __entry->range_buflen = msg->range_buflen; ++ __entry->rangecount = msg->rangecount; ++ __entry->ret = ret; ++ ), ++ TP_printk("sending child_relid 0x%x, gpadl 0x%x, range_buflen %d " ++ "rangecount %d, ret %d", ++ __entry->child_relid, __entry->gpadl, ++ __entry->range_buflen, __entry->rangecount, __entry->ret ++ ) ++ ); ++ ++TRACE_EVENT(vmbus_establish_gpadl_body, ++ TP_PROTO(const struct vmbus_channel_gpadl_body *msg, int ret), ++ TP_ARGS(msg, ret), ++ TP_STRUCT__entry( ++ __field(u32, msgnumber) ++ __field(u32, gpadl) ++ __field(int, ret) ++ ), ++ TP_fast_assign( ++ __entry->msgnumber = msg->msgnumber; ++ __entry->gpadl = msg->gpadl; ++ __entry->ret = ret; ++ ), ++ TP_printk("sending msgnumber %d, gpadl 0x%x, ret %d", ++ __entry->msgnumber, __entry->gpadl, __entry->ret ++ ) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch b/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch new file mode 100644 index 000000000..6b0b75ac9 --- /dev/null +++ b/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch @@ -0,0 +1,61 @@ +From ee9c6f7bcee6f9e224910b9d6e1416d14e8a2148 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:12 -0700 +Subject: [PATCH 14/18] hyper-v: trace vmbus_teardown_gpadl() + +Add tracepoint to CHANNELMSG_GPADL_TEARDOWN sender. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 09cdf8f87c15dbe9a3eeb6de04aaafd0cd922d6d) +--- + drivers/hv/channel.c | 2 ++ + drivers/hv/hv_trace.h | 18 ++++++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c +index a7ac16c091a9..ba4b4eceb563 100644 +--- a/drivers/hv/channel.c ++++ b/drivers/hv/channel.c +@@ -519,6 +519,8 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle) + ret = vmbus_post_msg(msg, sizeof(struct vmbus_channel_gpadl_teardown), + true); + ++ trace_vmbus_teardown_gpadl(msg, ret); ++ + if (ret) + goto post_msg_err; + +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 978e70bdc7c5..cd33a52ef27f 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -214,6 +214,24 @@ TRACE_EVENT(vmbus_establish_gpadl_body, + ) + ); + ++TRACE_EVENT(vmbus_teardown_gpadl, ++ TP_PROTO(const struct vmbus_channel_gpadl_teardown *msg, int ret), ++ TP_ARGS(msg, ret), ++ TP_STRUCT__entry( ++ __field(u32, child_relid) ++ __field(u32, gpadl) ++ __field(int, ret) ++ ), ++ TP_fast_assign( ++ __entry->child_relid = msg->child_relid; ++ __entry->gpadl = msg->gpadl; ++ __entry->ret = ret; ++ ), ++ TP_printk("sending child_relid 0x%x, gpadl 0x%x, ret %d", ++ __entry->child_relid, __entry->gpadl, __entry->ret ++ ) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch b/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch new file mode 100644 index 000000000..a506f0b60 --- /dev/null +++ b/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch @@ -0,0 +1,70 @@ +From d25867a69fbb2602c717d54485afd16f526ff1aa Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:13 -0700 +Subject: [PATCH 15/18] hyper-v: trace vmbus_negotiate_version() + +Add tracepoint to CHANNELMSG_INITIATE_CONTACT sender. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 034ebf552e0a3403eeb7e7f8a3a502fc0c70a24c) +--- + drivers/hv/connection.c | 3 +++ + drivers/hv/hv_trace.h | 26 ++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c +index f41901f80b64..5e36f86d0b0c 100644 +--- a/drivers/hv/connection.c ++++ b/drivers/hv/connection.c +@@ -117,6 +117,9 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo, + ret = vmbus_post_msg(msg, + sizeof(struct vmbus_channel_initiate_contact), + true); ++ ++ trace_vmbus_negotiate_version(msg, ret); ++ + if (ret != 0) { + spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags); + list_del(&msginfo->msglistentry); +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index cd33a52ef27f..f06284d64a8c 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -232,6 +232,32 @@ TRACE_EVENT(vmbus_teardown_gpadl, + ) + ); + ++TRACE_EVENT(vmbus_negotiate_version, ++ TP_PROTO(const struct vmbus_channel_initiate_contact *msg, int ret), ++ TP_ARGS(msg, ret), ++ TP_STRUCT__entry( ++ __field(u32, ver) ++ __field(u32, target_vcpu) ++ __field(int, ret) ++ __field(u64, int_page) ++ __field(u64, mon_page1) ++ __field(u64, mon_page2) ++ ), ++ TP_fast_assign( ++ __entry->ver = msg->vmbus_version_requested; ++ __entry->target_vcpu = msg->target_vcpu; ++ __entry->int_page = msg->interrupt_page; ++ __entry->mon_page1 = msg->monitor_page1; ++ __entry->mon_page2 = msg->monitor_page2; ++ __entry->ret = ret; ++ ), ++ TP_printk("sending vmbus_version_requested %d, target_vcpu 0x%x, " ++ "pages %llx:%llx:%llx, ret %d", ++ __entry->ver, __entry->target_vcpu, __entry->int_page, ++ __entry->mon_page1, __entry->mon_page2, __entry->ret ++ ) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch b/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch new file mode 100644 index 000000000..7e9a2bf9d --- /dev/null +++ b/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch @@ -0,0 +1,68 @@ +From c04ba9625defb6a199e554b6a5fc73fcb3ddf557 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:14 -0700 +Subject: [PATCH 16/18] hyper-v: trace vmbus_release_relid() + +Add tracepoint to CHANNELMSG_RELID_RELEASED sender. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 259cc665e9c08d054549a877c1b53b793de15753) +--- + drivers/hv/channel_mgmt.c | 7 +++++-- + drivers/hv/hv_trace.h | 16 ++++++++++++++++ + 2 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c +index 51156ee83b93..9263e3c86476 100644 +--- a/drivers/hv/channel_mgmt.c ++++ b/drivers/hv/channel_mgmt.c +@@ -374,12 +374,15 @@ static void percpu_channel_deq(void *arg) + static void vmbus_release_relid(u32 relid) + { + struct vmbus_channel_relid_released msg; ++ int ret; + + memset(&msg, 0, sizeof(struct vmbus_channel_relid_released)); + msg.child_relid = relid; + msg.header.msgtype = CHANNELMSG_RELID_RELEASED; +- vmbus_post_msg(&msg, sizeof(struct vmbus_channel_relid_released), +- true); ++ ret = vmbus_post_msg(&msg, sizeof(struct vmbus_channel_relid_released), ++ true); ++ ++ trace_vmbus_release_relid(&msg, ret); + } + + void hv_process_channel_removal(u32 relid) +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index f06284d64a8c..f0e437c3522f 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -258,6 +258,22 @@ TRACE_EVENT(vmbus_negotiate_version, + ) + ); + ++TRACE_EVENT(vmbus_release_relid, ++ TP_PROTO(const struct vmbus_channel_relid_released *msg, int ret), ++ TP_ARGS(msg, ret), ++ TP_STRUCT__entry( ++ __field(u32, child_relid) ++ __field(int, ret) ++ ), ++ TP_fast_assign( ++ __entry->child_relid = msg->child_relid; ++ __entry->ret = ret; ++ ), ++ TP_printk("sending child_relid 0x%x, ret %d", ++ __entry->child_relid, __entry->ret ++ ) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch b/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch new file mode 100644 index 000000000..4ffa4e583 --- /dev/null +++ b/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch @@ -0,0 +1,74 @@ +From a19d56b5c3f5bb6fc2eae083b53191f9235c7899 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:15 -0700 +Subject: [PATCH 17/18] hyper-v: trace vmbus_send_tl_connect_request() + +Add tracepoint to CHANNELMSG_TL_CONNECT_REQUEST sender. + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +(cherry picked from commit 98f31a0050ca8ba47b57c6d67599013cdbdd2122) +--- + drivers/hv/channel.c | 7 ++++++- + drivers/hv/hv_trace.h | 20 ++++++++++++++++++++ + 2 files changed, 26 insertions(+), 1 deletion(-) + +diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c +index ba4b4eceb563..218d16c7fbae 100644 +--- a/drivers/hv/channel.c ++++ b/drivers/hv/channel.c +@@ -236,13 +236,18 @@ int vmbus_send_tl_connect_request(const uuid_le *shv_guest_servie_id, + const uuid_le *shv_host_servie_id) + { + struct vmbus_channel_tl_connect_request conn_msg; ++ int ret; + + memset(&conn_msg, 0, sizeof(conn_msg)); + conn_msg.header.msgtype = CHANNELMSG_TL_CONNECT_REQUEST; + conn_msg.guest_endpoint_id = *shv_guest_servie_id; + conn_msg.host_service_id = *shv_host_servie_id; + +- return vmbus_post_msg(&conn_msg, sizeof(conn_msg), true); ++ ret = vmbus_post_msg(&conn_msg, sizeof(conn_msg), true); ++ ++ trace_vmbus_send_tl_connect_request(&conn_msg, ret); ++ ++ return ret; + } + EXPORT_SYMBOL_GPL(vmbus_send_tl_connect_request); + +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index f0e437c3522f..5382d9630306 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -274,6 +274,26 @@ TRACE_EVENT(vmbus_release_relid, + ) + ); + ++TRACE_EVENT(vmbus_send_tl_connect_request, ++ TP_PROTO(const struct vmbus_channel_tl_connect_request *msg, ++ int ret), ++ TP_ARGS(msg, ret), ++ TP_STRUCT__entry( ++ __array(char, guest_id, 16) ++ __array(char, host_id, 16) ++ __field(int, ret) ++ ), ++ TP_fast_assign( ++ memcpy(__entry->guest_id, &msg->guest_endpoint_id.b, 16); ++ memcpy(__entry->host_id, &msg->host_service_id.b, 16); ++ __entry->ret = ret; ++ ), ++ TP_printk("sending guest_endpoint_id %pUl, host_service_id %pUl, " ++ "ret %d", ++ __entry->guest_id, __entry->host_id, __entry->ret ++ ) ++ ); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +-- +2.16.0 + diff --git a/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch b/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch new file mode 100644 index 000000000..fc081bb29 --- /dev/null +++ b/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch @@ -0,0 +1,101 @@ +From 6581af57280de139734ea6ddda9448a74899eaf7 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Sun, 29 Oct 2017 12:21:16 -0700 +Subject: [PATCH 18/18] hyper-v: trace channel events + +Added an additional set of trace points for when channel gets notified +or signals host. + +Slightly modified as 6981fbf37803("Drivers: hv: vmbus: Expose per-channel +interrupts and events counters") is not fully applied and caused a +cherry-pick conflict. + +Suggested-by: Stephen Hemminger +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: K. Y. Srinivasan +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Rolf Neugebauer +(cherry picked from commit 991f8f1c6eb634688952fa6a03cc0ce949b6e363) +--- + drivers/hv/channel.c | 2 ++ + drivers/hv/connection.c | 2 ++ + drivers/hv/hv_trace.h | 23 +++++++++++++++++++++++ + drivers/hv/vmbus_drv.c | 2 ++ + 4 files changed, 29 insertions(+) + +diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c +index 218d16c7fbae..262ffbafeb52 100644 +--- a/drivers/hv/channel.c ++++ b/drivers/hv/channel.c +@@ -43,6 +43,8 @@ void vmbus_setevent(struct vmbus_channel *channel) + { + struct hv_monitor_page *monitorpage; + ++ trace_vmbus_setevent(channel); ++ + /* + * For channels marked as in "low latency" mode + * bypass the monitor page mechanism. +diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c +index 5e36f86d0b0c..8acd2e0e7c8e 100644 +--- a/drivers/hv/connection.c ++++ b/drivers/hv/connection.c +@@ -322,6 +322,8 @@ void vmbus_on_event(unsigned long data) + struct vmbus_channel *channel = (void *) data; + unsigned long time_limit = jiffies + 2; + ++ trace_vmbus_on_event(channel); ++ + do { + void (*callback_fn)(void *); + +diff --git a/drivers/hv/hv_trace.h b/drivers/hv/hv_trace.h +index 5382d9630306..d635ee95b20d 100644 +--- a/drivers/hv/hv_trace.h ++++ b/drivers/hv/hv_trace.h +@@ -294,6 +294,29 @@ TRACE_EVENT(vmbus_send_tl_connect_request, + ) + ); + ++DECLARE_EVENT_CLASS(vmbus_channel, ++ TP_PROTO(const struct vmbus_channel *channel), ++ TP_ARGS(channel), ++ TP_STRUCT__entry(__field(u32, relid)), ++ TP_fast_assign(__entry->relid = channel->offermsg.child_relid), ++ TP_printk("relid 0x%x", __entry->relid) ++); ++ ++DEFINE_EVENT(vmbus_channel, vmbus_chan_sched, ++ TP_PROTO(const struct vmbus_channel *channel), ++ TP_ARGS(channel) ++); ++ ++DEFINE_EVENT(vmbus_channel, vmbus_setevent, ++ TP_PROTO(const struct vmbus_channel *channel), ++ TP_ARGS(channel) ++); ++ ++DEFINE_EVENT(vmbus_channel, vmbus_on_event, ++ TP_PROTO(const struct vmbus_channel *channel), ++ TP_ARGS(channel) ++); ++ + #undef TRACE_INCLUDE_PATH + #define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE +diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c +index 9687e462fd43..27d5efd696ad 100644 +--- a/drivers/hv/vmbus_drv.c ++++ b/drivers/hv/vmbus_drv.c +@@ -944,6 +944,8 @@ static void vmbus_chan_sched(struct hv_per_cpu_context *hv_cpu) + if (channel->rescind) + continue; + ++ trace_vmbus_chan_sched(channel); ++ + switch (channel->callback_mode) { + case HV_CALL_ISR: + vmbus_channel_isr(channel); +-- +2.16.0 + From 1ebe545e81df110f3faa90cc8732fef5c884fed0 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 14 Feb 2018 09:48:57 +0000 Subject: [PATCH 3/3] Update YAMLs to latest kernels Signed-off-by: Rolf Neugebauer --- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/cadvisor.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/hostmount-writeable-overlay.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/openstack.yml | 2 +- examples/packet.arm64.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-containerd.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/logging/examples/logging.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- test/cases/000_build/000_formats/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/001_config_4.9.x/test.yml | 2 +- test/cases/020_kernel/006_config_4.14.x/test.yml | 2 +- test/cases/020_kernel/007_config_4.15.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/Dockerfile | 2 +- test/cases/020_kernel/011_kmod_4.9.x/test.sh | 2 +- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 2 +- test/cases/020_kernel/016_kmod_4.14.x/Dockerfile | 2 +- test/cases/020_kernel/016_kmod_4.14.x/test.sh | 2 +- test/cases/020_kernel/016_kmod_4.14.x/test.yml | 2 +- test/cases/020_kernel/017_kmod_4.15.x/Dockerfile | 2 +- test/cases/020_kernel/017_kmod_4.15.x/test.sh | 2 +- test/cases/020_kernel/017_kmod_4.15.x/test.yml | 2 +- test/cases/020_kernel/110_namespace/001_kernel-4.9.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 +- 74 files changed, 74 insertions(+), 74 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index 414d2c69a..d3cca16bc 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/azure.yml b/examples/azure.yml index 00a27092f..b5303a8c9 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index b00400e86..ab456035a 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 7b5a7633c..1a8d6b636 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -1,6 +1,6 @@ # This is an example for building the open source components of Docker for Mac kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:v0.2 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host diff --git a/examples/docker.yml b/examples/docker.yml index c2b7c0b59..c715d6bb5 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/gcp.yml b/examples/gcp.yml index c339f7310..b2965570e 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/getty.yml b/examples/getty.yml index c36cabfe1..02b2dba2e 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 7bc237173..5b68b391a 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/minimal.yml b/examples/minimal.yml index 1e6dbd302..2721ea8c8 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index e987bf515..8503bfa4a 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/openstack.yml b/examples/openstack.yml index 48f528041..e01fbeba8 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/packet.arm64.yml b/examples/packet.arm64.yml index 84cb69b31..e26fffd79 100644 --- a/examples/packet.arm64.yml +++ b/examples/packet.arm64.yml @@ -5,7 +5,7 @@ # for arm64 then the 'ucode' line in the kernel section can be left # out. kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyAMA0" ucode: "" onboot: diff --git a/examples/packet.yml b/examples/packet.yml index 1b85fb2d2..aa669df44 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: console=ttyS1 ucode: intel-ucode.cpio init: diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 6742d9a6f..354f97180 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/sshd.yml b/examples/sshd.yml index 72b61b1e5..9294c6975 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/swap.yml b/examples/swap.yml index 84c442f2b..902a834fa 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/vmware.yml b/examples/vmware.yml index 0b8064e7d..a01139a4a 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index bab84b695..1b9801d25 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index b565485a2..2fb4cfd41 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/vultr.yml b/examples/vultr.yml index c339f7310..b2965570e 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 9ee18f51d..5a0c9e11d 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/linuxkit.yml b/linuxkit.yml index f1f7a439c..1ea67a061 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 1e66f4020..8d75fc61f 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 66bcfb291..58e6a3653 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index e7feff392..70fa73b15 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 # with runc, logwrite, startmemlogd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index ed8074d2d..41a48a23b 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index e6abc5be6..37671a20a 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 f18a2b0e2..474dcad1c 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 f1f624e69..c3b0b104a 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 88007af6e..9e9599f79 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 88007af6e..9e9599f79 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 88007af6e..9e9599f79 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 88007af6e..9e9599f79 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 2cb8fee46..4cfe2a963 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 88007af6e..9e9599f79 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 f56193bb4..5590fffff 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 84f17f6dc..16c86997f 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 4464315d6..e6df9f6c1 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.18 + image: linuxkit/kernel:4.14.19 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/020_kernel/007_config_4.15.x/test.yml b/test/cases/020_kernel/007_config_4.15.x/test.yml index 37c2f8489..8d0f4933e 100644 --- a/test/cases/020_kernel/007_config_4.15.x/test.yml +++ b/test/cases/020_kernel/007_config_4.15.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.15.2 + image: linuxkit/kernel:4.15.3 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 f2d2d0fd2..c5e2b6cef 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.80 +docker pull linuxkit/kernel:4.9.81 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index 1d452364e..cf4344d2c 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.9.80 AS ksrc +FROM linuxkit/kernel:4.9.81 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build 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 f2d2d0fd2..c5e2b6cef 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.80 +docker pull linuxkit/kernel:4.9.81 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index 650cea297..9f79ac109 100644 --- a/test/cases/020_kernel/011_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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile index 4e630c21d..988cae3a4 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.14.18 AS ksrc +FROM linuxkit/kernel:4.14.19 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build 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 f2d2d0fd2..c5e2b6cef 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.80 +docker pull linuxkit/kernel:4.9.81 # Build a package docker build -t ${IMAGE_NAME} . 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 index 57d9d34e9..f1a7ac358 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.14.18 + image: linuxkit/kernel:4.14.19 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/020_kernel/017_kmod_4.15.x/Dockerfile b/test/cases/020_kernel/017_kmod_4.15.x/Dockerfile index 183bc429e..3884b8f93 100644 --- a/test/cases/020_kernel/017_kmod_4.15.x/Dockerfile +++ b/test/cases/020_kernel/017_kmod_4.15.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.15.2 AS ksrc +FROM linuxkit/kernel:4.15.3 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build diff --git a/test/cases/020_kernel/017_kmod_4.15.x/test.sh b/test/cases/020_kernel/017_kmod_4.15.x/test.sh index f2d2d0fd2..c5e2b6cef 100644 --- a/test/cases/020_kernel/017_kmod_4.15.x/test.sh +++ b/test/cases/020_kernel/017_kmod_4.15.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.80 +docker pull linuxkit/kernel:4.9.81 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/017_kmod_4.15.x/test.yml b/test/cases/020_kernel/017_kmod_4.15.x/test.yml index 8801c65b0..34c6d84ce 100644 --- a/test/cases/020_kernel/017_kmod_4.15.x/test.yml +++ b/test/cases/020_kernel/017_kmod_4.15.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.15.2 + image: linuxkit/kernel:4.15.3 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 0a4b6b5af..c0896012a 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 5995d6b4f..4e6b72ed1 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.18 + image: linuxkit/kernel:4.14.19 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index a993615c1..0e03629de 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index ccdbbafae..5bc2cd725 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 77721609b..1bf364bd8 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 319293ca8..de0411b57 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 784707a10..1ae4f853a 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 36b28f65f..6bb3ecd6f 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 cb185f04d..c7039a3af 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 6cd06d5cf..7e9bace26 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 7a03e98a0..a7c355654 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 fb8b6c438..a4aa1e724 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 928c250f1..58137001c 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 368a7cd4e..e159b25f1 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 4498a23d9..d3db29d5d 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 30c76e36a..ad6442662 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 21a03eb58..c65ab6e89 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 11023732d..fce9cc44b 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 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 c71fd6c22..85101c022 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index ae6fba837..8882fa0cd 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 81810d827..b4490df50 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 7920a8956..1cefb9b3e 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 50a4118a5..d83fd7a48 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 6e71e71c8..d476ad2b3 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782 diff --git a/test/hack/test.yml b/test/hack/test.yml index 30a6eb66a..62d09cbd7 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.80 + image: linuxkit/kernel:4.9.81 cmdline: "console=ttyS0" init: - linuxkit/init:6061875ba11fd9c563fda6234b103ed9997ff782