kernel: Update to 4.15.5/4.14.21/4.9.83/4.4.117

Also remove the 4.4 patch which should have been removed by
231cead2cc ("kernel: Update to 4.15.4/4.14.20/4.9.82/4.4.116")

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2018-02-23 18:06:18 +00:00
parent f5d7b33986
commit 5c68ca489d
39 changed files with 42 additions and 122 deletions

View File

@ -214,14 +214,14 @@ endef
# Build Targets
# Debug targets only for latest stable and LTS stable
#
$(eval $(call kernel,4.15.4,4.15.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.14.20,4.14.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.14.20,4.14.x,,-dbg))
$(eval $(call kernel,4.15.5,4.15.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.14.21,4.14.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.14.21,4.14.x,,-dbg))
$(eval $(call kernel,4.14.18,4.14.x,-rt,))
$(eval $(call kernel,4.9.82,4.9.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.9.83,4.9.x,$(EXTRA),$(DEBUG)))
ifeq ($(ARCH),x86_64)
$(eval $(call kernel,4.4.116,4.4.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,4.4.117,4.4.x,$(EXTRA),$(DEBUG)))
endif
# Target for kernel config

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.14.20 Kernel Configuration
# Linux/arm64 4.14.21 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.14.20 Kernel Configuration
# Linux/x86 4.14.21 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.15.4 Kernel Configuration
# Linux/arm64 4.15.5 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.15.4 Kernel Configuration
# Linux/x86 4.15.5 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.4.116 Kernel Configuration
# Linux/x86 4.4.117 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.9.82 Kernel Configuration
# Linux/arm64 4.9.83 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.9.82 Kernel Configuration
# Linux/x86 4.9.83 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y

View File

@ -1,4 +1,4 @@
From 9db56d90a2c022102673a7d5dde6fb1254e81b8c Mon Sep 17 00:00:00 2001
From a0e536c53329f3d1151648502d4f05731aea6bd6 Mon Sep 17 00:00:00 2001
From: Cheng-mean Liu <soccerl@microsoft.com>
Date: Tue, 11 Jul 2017 16:58:26 -0700
Subject: [PATCH 01/18] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB

View File

@ -1,4 +1,4 @@
From 9a4231144b1059e1c4fd766f2604ad1566eef616 Mon Sep 17 00:00:00 2001
From 47ec9159b91cc5cd79d9ef67059bd2d4b1071f9a Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:00 -0700
Subject: [PATCH 02/18] hyper-v: trace vmbus_on_msg_dpc()

View File

@ -1,4 +1,4 @@
From 3312c5ba6da8b2f8c5853d9dca442cdd7a2d689b Mon Sep 17 00:00:00 2001
From 2b9b2d3c2c1cd584d2e872138e38722ce33dc70b Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:01 -0700
Subject: [PATCH 03/18] hyper-v: trace vmbus_on_message()

View File

@ -1,4 +1,4 @@
From dff3d386c05fdbf3a8ae6ecafd8897d84477a897 Mon Sep 17 00:00:00 2001
From 31b6b222540c4f568d90cde7c49864cd1454b4b2 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:02 -0700
Subject: [PATCH 04/18] hyper-v: trace vmbus_onoffer()

View File

@ -1,4 +1,4 @@
From 4a69ee9009ffb573783771285b14005073669096 Mon Sep 17 00:00:00 2001
From b5eb617651f32cd0041373ae911522f011c5324e Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:03 -0700
Subject: [PATCH 05/18] hyper-v: trace vmbus_onoffer_rescind()

View File

@ -1,4 +1,4 @@
From ff164c1e4e1318f35e5b23136fa0421ad0e4e76b Mon Sep 17 00:00:00 2001
From ad3ecbe9a490c2ffe3fc89f26bb25afdaf7f28e5 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:04 -0700
Subject: [PATCH 06/18] hyper-v: trace vmbus_onopen_result()

View File

@ -1,4 +1,4 @@
From 3342b734fbd056b35249e41b5977c053305e7e75 Mon Sep 17 00:00:00 2001
From 9000a561bec11c234f5c8b34ec5619840a1e6d74 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:05 -0700
Subject: [PATCH 07/18] hyper-v: trace vmbus_ongpadl_created()

View File

@ -1,4 +1,4 @@
From 7a202befd1c7f6b2adc551e8a3ceda6f6af9a0b1 Mon Sep 17 00:00:00 2001
From c888580372c480c88dbec13ecf0102612566b466 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:06 -0700
Subject: [PATCH 08/18] hyper-v: trace vmbus_ongpadl_torndown()

View File

@ -1,4 +1,4 @@
From e6c6699107d772dcbd530be5068d5c302181aa22 Mon Sep 17 00:00:00 2001
From feff89e90c204b8dfef463c93791fc58e547c385 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:07 -0700
Subject: [PATCH 09/18] hyper-v: trace vmbus_onversion_response()

View File

@ -1,4 +1,4 @@
From ba3163b941ccb538c3669ea8ad25ba0971acba48 Mon Sep 17 00:00:00 2001
From 2efb73a07187534495c724581a20abf0a2e2cd74 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:08 -0700
Subject: [PATCH 10/18] hyper-v: trace vmbus_request_offers()

View File

@ -1,4 +1,4 @@
From 7b3406fcc9ed4771cbeeb5212feed5543d65f503 Mon Sep 17 00:00:00 2001
From 56b912afd624f8f301ecda2abea87f594e3e5f1a Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:09 -0700
Subject: [PATCH 11/18] hyper-v: trace vmbus_open()

View File

@ -1,4 +1,4 @@
From ad61b9991121a12a0f2d95c738161574803dd805 Mon Sep 17 00:00:00 2001
From 9ddfa0bbeb4eabfea596e86fcf0e87c6f72e3fba Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:10 -0700
Subject: [PATCH 12/18] hyper-v: trace vmbus_close_internal()

View File

@ -1,4 +1,4 @@
From f31253a1103d0232ccbe14e266a01fd5bf0eda1b Mon Sep 17 00:00:00 2001
From f562cb9d024bf2f74e30049451f74b1f78f02e5b Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:11 -0700
Subject: [PATCH 13/18] hyper-v: trace vmbus_establish_gpadl()

View File

@ -1,4 +1,4 @@
From e3b4068bf338e4babaa24892f2b017601b990de2 Mon Sep 17 00:00:00 2001
From c3dcd43344b49c6c7fcbd3959da2739789202dbc Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:12 -0700
Subject: [PATCH 14/18] hyper-v: trace vmbus_teardown_gpadl()

View File

@ -1,4 +1,4 @@
From 514f6e35e8b37b662f4d27bd8bbc0ea66a789c21 Mon Sep 17 00:00:00 2001
From 0ce29cdfe579868af5071ff4d4840b68696e5493 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:13 -0700
Subject: [PATCH 15/18] hyper-v: trace vmbus_negotiate_version()

View File

@ -1,4 +1,4 @@
From 911c0d3e59afb1132d8f8d9fb23c362da6f55fc4 Mon Sep 17 00:00:00 2001
From 77e1bebf1a10e38cf0435c24df955bb647759a06 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:14 -0700
Subject: [PATCH 16/18] hyper-v: trace vmbus_release_relid()

View File

@ -1,4 +1,4 @@
From f723f8d909078a1c4a61c2d7a6de1bacd13a612c Mon Sep 17 00:00:00 2001
From 3d03749f056ce1e2491704eac40e8718017c4da5 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:15 -0700
Subject: [PATCH 17/18] hyper-v: trace vmbus_send_tl_connect_request()

View File

@ -1,4 +1,4 @@
From 83c25cfa84e44f2adbeaf63be479aeb865dd5418 Mon Sep 17 00:00:00 2001
From 3ed410245f0f54cc8bcb0248dcdfe085f44d752d Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Sun, 29 Oct 2017 12:21:16 -0700
Subject: [PATCH 18/18] hyper-v: trace channel events

View File

@ -1,80 +0,0 @@
From d2a1904b00892fbaa2c679f11b3ecaaafd33af58 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
Date: Tue, 6 Feb 2018 13:02:57 +0000
Subject: [PATCH] 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:[<ffffffffb7d88ce3>] [<ffffffffb7d88ce3>] 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] [<ffffffffb7d888c1>] ? microcode_init+0x36/0x1de
[ 1.619264] [<ffffffffb7d787b6>] ? set_debug_rodata+0xc/0xc
[ 1.620143] [<ffffffffb74fed89>] ? driver_register+0xaf/0xb4
[ 1.621841] [<ffffffffb7d8888b>] ? save_microcode_in_initrd+0x3c/0x3c
[ 1.623424] [<ffffffffb70021b7>] ? do_one_initcall+0x98/0x130
[ 1.624659] [<ffffffffb7d787b6>] ? set_debug_rodata+0xc/0xc
[ 1.626303] [<ffffffffb7d79091>] ? kernel_init_freeable+0x166/0x1e7
[ 1.627674] [<ffffffffb77ce3d7>] ? rest_init+0x6e/0x6e
[ 1.628942] [<ffffffffb77ce3e1>] ? kernel_init+0xa/0xe6
[ 1.630243] [<ffffffffb77d8587>] ? 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 [<ffffffffb7d88ce3>] init_intel_microcode+0x49/0x5a
[ 1.640382] RSP <ffffb24f40013e48>
[ 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 <rolf.neugebauer@docker.com>
---
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 2c76a1801393..2a581170ac0b 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -1077,6 +1077,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

View File

@ -1,4 +1,4 @@
From fd2b9b42ac5efc34f9364bd9c589cafafca9d465 Mon Sep 17 00:00:00 2001
From 69af62a0695f923312b10a1d06ee366498f7bc99 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Thu, 2 Mar 2017 12:55:49 -0300
Subject: [PATCH 01/12] tools build: Add test for sched_getcpu()

View File

@ -1,4 +1,4 @@
From a1139366365041e7dfea3594f246704e3374293b Mon Sep 17 00:00:00 2001
From 1b106154b8dc141725574418068757a33101fafa Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Thu, 13 Oct 2016 17:12:35 -0300
Subject: [PATCH 02/12] perf jit: Avoid returning garbage for a ret variable

View File

@ -1,4 +1,4 @@
From bce8036bd70545869857fb72a92a12e93699f342 Mon Sep 17 00:00:00 2001
From c25ce9b04bae954bc2499aa1959040f7263e7c8f Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Sat, 23 Jul 2016 01:35:51 +0000
Subject: [PATCH 03/12] hv_sock: introduce Hyper-V Sockets

View File

@ -1,4 +1,4 @@
From 0eb62b0f906b7422458dccc4a1f0bea1cc35a86a Mon Sep 17 00:00:00 2001
From 4a32d2c0b488d324187830bb08f5d7a482fe8a46 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
Date: Mon, 23 May 2016 18:55:45 +0100
Subject: [PATCH 04/12] vmbus: Don't spam the logs with unknown GUIDs

View File

@ -1,4 +1,4 @@
From dd9bb42ba100f6d6317a1f578ecca255778b6aca Mon Sep 17 00:00:00 2001
From db80467cf24492e7b4a0afe6430bb79bd7a5cb58 Mon Sep 17 00:00:00 2001
From: Alex Ng <alexng@messages.microsoft.com>
Date: Sun, 6 Nov 2016 13:14:07 -0800
Subject: [PATCH 05/12] Drivers: hv: utils: Fix the mapping between host

View File

@ -1,4 +1,4 @@
From 37e2d1c4a80a09035ba9e6f5f337e6d7add0e30e Mon Sep 17 00:00:00 2001
From 2e0d996c7ec01a9ebb3c823be22843fcd8646f4e Mon Sep 17 00:00:00 2001
From: Alex Ng <alexng@messages.microsoft.com>
Date: Sun, 6 Nov 2016 13:14:10 -0800
Subject: [PATCH 06/12] Drivers: hv: vss: Improve log messages.

View File

@ -1,4 +1,4 @@
From 321b0cc6df8e583e7dfd0e6c423d1fb04c542018 Mon Sep 17 00:00:00 2001
From e6b8a27e9895b8c28fb0bfb99acb44aaa4c803e9 Mon Sep 17 00:00:00 2001
From: Alex Ng <alexng@messages.microsoft.com>
Date: Sun, 6 Nov 2016 13:14:11 -0800
Subject: [PATCH 07/12] Drivers: hv: vss: Operation timeouts should match host

View File

@ -1,4 +1,4 @@
From 48721d2c9409a416769795fec0cf5092b431c563 Mon Sep 17 00:00:00 2001
From 26a166c53fe6f92761c4d259563662eeb68aeee8 Mon Sep 17 00:00:00 2001
From: Alex Ng <alexng@messages.microsoft.com>
Date: Sat, 28 Jan 2017 12:37:17 -0700
Subject: [PATCH 08/12] Drivers: hv: vmbus: Use all supported IC versions to

View File

@ -1,4 +1,4 @@
From 19c775a9af9ce7d53882a146923f457b58210a97 Mon Sep 17 00:00:00 2001
From 2b4774e14c5e73f6c513871474f4cabf024b0b00 Mon Sep 17 00:00:00 2001
From: Alex Ng <alexng@messages.microsoft.com>
Date: Sat, 28 Jan 2017 12:37:18 -0700
Subject: [PATCH 09/12] Drivers: hv: Log the negotiated IC versions.

View File

@ -1,4 +1,4 @@
From 6740dfbcea580de39f74bbc14fd0e0252b730884 Mon Sep 17 00:00:00 2001
From 7064bc29c4b5b6c8e15eff31a074ef74fb78e2f0 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Sun, 26 Mar 2017 16:42:20 +0800
Subject: [PATCH 10/12] vmbus: fix missed ring events on boot

View File

@ -1,4 +1,4 @@
From 3945e75c7be54cb193b05558d3118f0ec2e62c1d Mon Sep 17 00:00:00 2001
From 286395ae613f01ca446e9d4579bcd9bbab5e93f2 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Wed, 29 Mar 2017 18:37:10 +0800
Subject: [PATCH 11/12] vmbus: remove "goto error_clean_msglist" in

View File

@ -1,4 +1,4 @@
From b75bc03e222e4584e081709299c7f78a088dd8be Mon Sep 17 00:00:00 2001
From 3f0c984de3e914155fd50727a9eb8fe9ab2e21bb Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Fri, 24 Mar 2017 20:53:18 +0800
Subject: [PATCH 12/12] vmbus: dynamically enqueue/dequeue the channel on