github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-11-01 18:51:29 +00:00
Code Issues Projects Releases Wiki Activity

kernel: Update kernel to 4.4.45/4.9.17/4.10.5

Browse Source 
In 4.10.5 and 4.9.17 include a fix for the VMBus memory leak,
cherry-picked from char-misc: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/commit/?h=char-misc-linus&id=5e030d5ce9d99a899b648413139ff65bab12b038

This patch was tested with the 4.10.5 kernel and the Hyper-V
Socket stress test. It was forwarded to stable@vger to be
included in one of the next stable releases.

Also remove the CPU ACCT revert as 17.03.1-rc1 is out and has a fix

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer
2017-03-23 17:20:30 +01:00
parent 6bba73ec0b
commit 130e546fcf
58 changed files with 159 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/Makefile
View File

@@ -19,19 +19,19 @@ all: bzImage tag
#
# IMAGE_VERSION is used to determine if a new image should be pushed to hub.
ifeq ($(KERNEL),v4.4)
KERNEL_VERSION=4.4.55
IMAGE_VERSION=$(KERNEL_VERSION)-1
KERNEL_VERSION=4.4.56
IMAGE_VERSION=$(KERNEL_VERSION)-0
IMAGE_MAJOR_VERSION=4.4.x
DEPS=Dockerfile.4.4 Makefile kernel_config kernel_config.debug kernel_config.4.4 patches-4.4
else
ifeq ($(KERNEL),v4.10)
KERNEL_VERSION=4.10.4
KERNEL_VERSION=4.10.5
IMAGE_VERSION=$(KERNEL_VERSION)-0
IMAGE_MAJOR_VERSION=4.10.x
DEPS=Dockerfile.4.10 Makefile kernel_config kernel_config.debug patches-4.10
else
KERNEL_VERSION=4.9.16
IMAGE_VERSION=$(KERNEL_VERSION)-1
KERNEL_VERSION=4.9.17
IMAGE_VERSION=$(KERNEL_VERSION)-0
IMAGE_MAJOR_VERSION=4.9.x
DEPS=Dockerfile Makefile kernel_config kernel_config.debug patches-4.9
endif

4
kernel/patches-4.10/0001-hv_sock-introduce-Hyper-V-Sockets.patch
View File

@@ -1,7 +1,7 @@
From 539ff37d66b41b195368f4df3d4ce6525e5830af Mon Sep 17 00:00:00 2001
From acd67b5a33dc9c39bb76ef4788e59f412d39edb4 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Thu, 21 Jul 2016 16:04:38 -0600
Subject: [PATCH 1/3] hv_sock: introduce Hyper-V Sockets
Subject: [PATCH 1/4] hv_sock: introduce Hyper-V Sockets
Hyper-V Sockets (hv_sock) supplies a byte-stream based communication
mechanism between the host and the guest. It's somewhat like TCP over

4
kernel/patches-4.10/0002-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch
View File

@@ -1,7 +1,7 @@
From d4e5be67dc204637a5fc1cf96e8ab0135253e979 Mon Sep 17 00:00:00 2001
From f592e381a0231264f876d289f0947d42db01e3f6 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 2/3] Drivers: hv: vmbus: Use all supported IC versions to
Subject: [PATCH 2/4] Drivers: hv: vmbus: Use all supported IC versions to
negotiate
Previously, we were assuming that each IC protocol version was tied to a

4
kernel/patches-4.10/0003-Drivers-hv-Log-the-negotiated-IC-versions.patch
View File

@@ -1,7 +1,7 @@
From 632449112ef8796bbc874a19648ca537bfec11e9 Mon Sep 17 00:00:00 2001
From 22e8a7b1d3c4dd0f70ac49cf7ccd2ae84d759290 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 3/3] Drivers: hv: Log the negotiated IC versions.
Subject: [PATCH 3/4] Drivers: hv: Log the negotiated IC versions.
Log the negotiated IC versions.

47
kernel/patches-4.10/0004-Drivers-hv-vmbus-Don-t-leak-memory-when-a-channel-is.patch Normal file
View File

@@ -0,0 +1,47 @@
From 51264740f74056be648834a1e96b3f4600d627e8 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Sun, 12 Mar 2017 20:00:30 -0700
Subject: [PATCH 4/4] Drivers: hv: vmbus: Don't leak memory when a channel is
rescinded
When we close a channel that has been rescinded, we will leak memory since
vmbus_teardown_gpadl() returns an error. Fix this so that we can properly
cleanup the memory allocated to the ring buffers.
Fixes: ccb61f8a99e6 ("Drivers: hv: vmbus: Fix a rescind handling bug")
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 5e030d5ce9d99a899b648413139ff65bab12b038)
---
drivers/hv/channel.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index be34547cdb68..1606e7f08f4b 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -506,12 +506,15 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
wait_for_completion(&info->waitevent);
- if (channel->rescind) {
- ret = -ENODEV;
- goto post_msg_err;
- }
-
post_msg_err:
+ /*
+ * If the channel has been rescinded;
+ * we will be awakened by the rescind
+ * handler; set the error code to zero so we don't leak memory.
+ */
+ if (channel->rescind)
+ ret = 0;
+
spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
list_del(&info->msglistentry);
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
--
2.11.0

2
kernel/patches-4.4/0001-virtio-make-find_vqs-checkpatch.pl-friendly.patch
View File

@@ -1,4 +1,4 @@
From 2608f291b5fc92668e1fee86e467a635e8499688 Mon Sep 17 00:00:00 2001
From 5e12acc5d38a33667498957b57d3b86e85d71f24 Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 17 Dec 2015 16:53:43 +0800
Subject: [PATCH 01/44] virtio: make find_vqs() checkpatch.pl-friendly

2
kernel/patches-4.4/0002-VSOCK-constify-vmci_transport_notify_ops-structures.patch
View File

@@ -1,4 +1,4 @@
From f8e48d3725c542c4ed7e02e30a1ca131ab6d1315 Mon Sep 17 00:00:00 2001
From 612f8312f280c0b87f855a270d33e9330cf68c86 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia.lawall@lip6.fr>
Date: Sat, 21 Nov 2015 18:39:17 +0100
Subject: [PATCH 02/44] VSOCK: constify vmci_transport_notify_ops structures

2
kernel/patches-4.4/0003-AF_VSOCK-Shrink-the-area-influenced-by-prepare_to_wa.patch
View File

@@ -1,4 +1,4 @@
From 418b9a6fbe08bab82e757d48212db39b0b5b3648 Mon Sep 17 00:00:00 2001
From cd1c3d1b54de4cc16c9069d09602b16f81c0dd91 Mon Sep 17 00:00:00 2001
From: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
Date: Tue, 22 Mar 2016 17:05:52 +0100
Subject: [PATCH 03/44] AF_VSOCK: Shrink the area influenced by prepare_to_wait

2
kernel/patches-4.4/0004-vsock-make-listener-child-lock-ordering-explicit.patch
View File

@@ -1,4 +1,4 @@
From 28e31fb06f095c1015582309f64b97b5b16c3374 Mon Sep 17 00:00:00 2001
From 232ab4b0f3fb1d2fcc1af5b527edfd147a611a83 Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 23 Jun 2016 16:28:58 +0100
Subject: [PATCH 04/44] vsock: make listener child lock ordering explicit

2
kernel/patches-4.4/0005-VSOCK-transport-specific-vsock_transport-functions.patch
View File

@@ -1,4 +1,4 @@
From 66ff6ed5e1f5a2874e5497cc185b00e28c524f50 Mon Sep 17 00:00:00 2001
From c86fe45425ee5a04601a232c0d4ffc17608eff45 Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 28 Jul 2016 15:36:30 +0100
Subject: [PATCH 05/44] VSOCK: transport-specific vsock_transport functions

2
kernel/patches-4.4/0006-VSOCK-defer-sock-removal-to-transports.patch
View File

@@ -1,4 +1,4 @@
From 6ecb356e372406307925c6f7cd53e15246c68e36 Mon Sep 17 00:00:00 2001
From 0194d0bb926846d6bca6cd9a7b9cd35483d872d2 Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 28 Jul 2016 15:36:31 +0100
Subject: [PATCH 06/44] VSOCK: defer sock removal to transports

2
kernel/patches-4.4/0007-VSOCK-Introduce-virtio_vsock_common.ko.patch
View File

@@ -1,4 +1,4 @@
From 81689f49cc2cb300ea29a2dc5dd40f8818debb11 Mon Sep 17 00:00:00 2001
From 09a9119cde42487ae8193fc97916f69574203af8 Mon Sep 17 00:00:00 2001
From: Asias He <asias@redhat.com>
Date: Thu, 28 Jul 2016 15:36:32 +0100
Subject: [PATCH 07/44] VSOCK: Introduce virtio_vsock_common.ko

2
kernel/patches-4.4/0008-VSOCK-Introduce-virtio_transport.ko.patch
View File

@@ -1,4 +1,4 @@
From 86621576edb48e80700ddc5df40f906eb35f61fe Mon Sep 17 00:00:00 2001
From 2acff6b7a935a385a0999db2f31f48efaca9fd74 Mon Sep 17 00:00:00 2001
From: Asias He <asias@redhat.com>
Date: Thu, 28 Jul 2016 15:36:33 +0100
Subject: [PATCH 08/44] VSOCK: Introduce virtio_transport.ko

2
kernel/patches-4.4/0009-VSOCK-Introduce-vhost_vsock.ko.patch
View File

@@ -1,4 +1,4 @@
From 1354149dcaf2cc806654bd0e2e3b8d11d4a49229 Mon Sep 17 00:00:00 2001
From 26b96af0185d0dfcbf2cb3afa1862a12d1ba9266 Mon Sep 17 00:00:00 2001
From: Asias He <asias@redhat.com>
Date: Thu, 28 Jul 2016 15:36:34 +0100
Subject: [PATCH 09/44] VSOCK: Introduce vhost_vsock.ko

2
kernel/patches-4.4/0010-VSOCK-Add-Makefile-and-Kconfig.patch
View File

@@ -1,4 +1,4 @@
From 23b80e476d7119cb50a58e052c5fa833e72b0786 Mon Sep 17 00:00:00 2001
From 295b275545b3a0b70e95a41b36ea8d7efb5e4118 Mon Sep 17 00:00:00 2001
From: Asias He <asias@redhat.com>
Date: Thu, 28 Jul 2016 15:36:35 +0100
Subject: [PATCH 10/44] VSOCK: Add Makefile and Kconfig

2
kernel/patches-4.4/0011-VSOCK-Use-kvfree.patch
View File

@@ -1,4 +1,4 @@
From b5cd63bd82ec41c36b7244fb4cee69de26eb1521 Mon Sep 17 00:00:00 2001
From 879a69af16683d9a094559ec2265e7b377866306 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Tue, 2 Aug 2016 13:50:42 +0000
Subject: [PATCH 11/44] VSOCK: Use kvfree()

2
kernel/patches-4.4/0012-vhost-vsock-fix-vhost-virtio_vsock_pkt-use-after-fre.patch
View File

@@ -1,4 +1,4 @@
From 15e39e11970dfa73e5971825fe17775b052a9321 Mon Sep 17 00:00:00 2001
From 9e02eb938fd8f565615e638c088fa66bc1aef706 Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 4 Aug 2016 14:52:53 +0100
Subject: [PATCH 12/44] vhost/vsock: fix vhost virtio_vsock_pkt use-after-free

2
kernel/patches-4.4/0013-virtio-vsock-fix-include-guard-typo.patch
View File

@@ -1,4 +1,4 @@
From 007a4299e193abaaa952f2fc9ff4087c4c00aee1 Mon Sep 17 00:00:00 2001
From 8766952865ef882300fffdaf15b92c9f7d55b10b Mon Sep 17 00:00:00 2001
From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Fri, 5 Aug 2016 13:52:09 +0100
Subject: [PATCH 13/44] virtio-vsock: fix include guard typo

2
kernel/patches-4.4/0014-vhost-vsock-drop-space-available-check-for-TX-vq.patch
View File

@@ -1,4 +1,4 @@
From 6af3200815319e1c8372eb94aa896383f1fb1852 Mon Sep 17 00:00:00 2001
From 1db43ebf78e63c1aa6aec286762e124985e159e0 Mon Sep 17 00:00:00 2001
From: Gerard Garcia <ggarcia@deic.uab.cat>
Date: Wed, 10 Aug 2016 17:24:34 +0200
Subject: [PATCH 14/44] vhost/vsock: drop space available check for TX vq

2
kernel/patches-4.4/0015-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch
View File

@@ -1,4 +1,4 @@
From af5470567d140b196cbfdcf105b1f3b70f0bb2de Mon Sep 17 00:00:00 2001
From 93842085264c9dbc2ccf2a783f6af7ef7ea1c122 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Mon, 4 Apr 2016 14:50:10 +0100
Subject: [PATCH 15/44] VSOCK: Only allow host network namespace to use

2
kernel/patches-4.4/0016-drivers-hv-Define-the-channel-type-for-Hyper-V-PCI-E.patch
View File

@@ -1,4 +1,4 @@
From 0fe8dfab0c42d5f4e6b2283b957ada5bd91a2aee Mon Sep 17 00:00:00 2001
From cc421fff7dfb83519158eeccd348ca3b968c8da4 Mon Sep 17 00:00:00 2001
From: Jake Oshins <jakeo@microsoft.com>
Date: Mon, 14 Dec 2015 16:01:41 -0800
Subject: [PATCH 16/44] drivers:hv: Define the channel type for Hyper-V PCI

2
kernel/patches-4.4/0017-Drivers-hv-vmbus-Use-uuid_le-type-consistently.patch
View File

@@ -1,4 +1,4 @@
From b6cb77ae277f5861a6316999dc5a257b95d70632 Mon Sep 17 00:00:00 2001
From f676eae840f5b6ce74421de82fbdaf912fb7fae9 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Mon, 14 Dec 2015 16:01:43 -0800
Subject: [PATCH 17/44] Drivers: hv: vmbus: Use uuid_le type consistently

2
kernel/patches-4.4/0018-Drivers-hv-vmbus-Use-uuid_le_cmp-for-comparing-GUIDs.patch
View File

@@ -1,4 +1,4 @@
From 9b1dac440716a018afeecc26a514ebeac3af147c Mon Sep 17 00:00:00 2001
From f952ef62880a08a1cc3359659ced549efa9a0d32 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Mon, 14 Dec 2015 16:01:44 -0800
Subject: [PATCH 18/44] Drivers: hv: vmbus: Use uuid_le_cmp() for comparing

2
kernel/patches-4.4/0019-Drivers-hv-vmbus-do-sanity-check-of-channel-state-in.patch
View File

@@ -1,4 +1,4 @@
From 38aaac06b68a7b9788d79c427ba91f2c3bd78562 Mon Sep 17 00:00:00 2001
From 117a02eb9d9b39deb531f13d41cdf9c94529e194 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Mon, 14 Dec 2015 16:01:48 -0800
Subject: [PATCH 19/44] Drivers: hv: vmbus: do sanity check of channel state in

2
kernel/patches-4.4/0020-Drivers-hv-vmbus-release-relid-on-error-in-vmbus_pro.patch
View File

@@ -1,4 +1,4 @@
From 5ff6ad376dc49bc436b8aaa325123d275f57d7df Mon Sep 17 00:00:00 2001
From da2a577174d79446488b2c4a3043ad61ec5b805d Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Mon, 14 Dec 2015 16:01:50 -0800
Subject: [PATCH 20/44] Drivers: hv: vmbus: release relid on error in

2
kernel/patches-4.4/0021-Drivers-hv-vmbus-channge-vmbus_connection.channel_lo.patch
View File

@@ -1,4 +1,4 @@
From c97ea5cc87a58ee3abf6482662caea21ce15acae Mon Sep 17 00:00:00 2001
From 608be9f80b46b13603f454a099516914c8ca5251 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Mon, 14 Dec 2015 16:01:51 -0800
Subject: [PATCH 21/44] Drivers: hv: vmbus: channge

2
kernel/patches-4.4/0022-Drivers-hv-remove-code-duplication-between-vmbus_rec.patch
View File

@@ -1,4 +1,4 @@
From b82beb1ca4c48107402ff5f97efc054f201bdc2c Mon Sep 17 00:00:00 2001
From 519c5f0747e3e01ec2d001c821783b5e489c216b Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Mon, 14 Dec 2015 19:02:00 -0800
Subject: [PATCH 22/44] Drivers: hv: remove code duplication between

2
kernel/patches-4.4/0023-Drivers-hv-vmbus-fix-the-building-warning-with-hyper.patch
View File

@@ -1,4 +1,4 @@
From 52999b55e36c8ace069ea1028d371672bd19c1d3 Mon Sep 17 00:00:00 2001
From 069f9c45cd43deed1a4be96fdbda43c5c4a4b9ea Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Mon, 21 Dec 2015 12:21:22 -0800
Subject: [PATCH 23/44] Drivers: hv: vmbus: fix the building warning with

2
kernel/patches-4.4/0024-Drivers-hv-vmbus-Treat-Fibre-Channel-devices-as-perf.patch
View File

@@ -1,4 +1,4 @@
From 484486544fb5a47f4c70aa001454c1095663d9ac Mon Sep 17 00:00:00 2001
From 78982eba129722cc52e93a653a488e2808dbc378 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Tue, 15 Dec 2015 16:27:27 -0800
Subject: [PATCH 24/44] Drivers: hv: vmbus: Treat Fibre Channel devices as

2
kernel/patches-4.4/0025-Drivers-hv-vmbus-Add-vendor-and-device-atttributes.patch
View File

@@ -1,4 +1,4 @@
From 5730cdc3918e527669089a37f8381556dfe74235 Mon Sep 17 00:00:00 2001
From 42ecff880b8b4eddaabadebc98a09dff0addb50e Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Fri, 25 Dec 2015 20:00:30 -0800
Subject: [PATCH 25/44] Drivers: hv: vmbus: Add vendor and device atttributes

2
kernel/patches-4.4/0026-Drivers-hv-vmbus-add-a-helper-function-to-set-a-chan.patch
View File

@@ -1,4 +1,4 @@
From b929dc35e17d8708b27e458ec37727bac548e8b6 Mon Sep 17 00:00:00 2001
From 16e153c452824c7a2dd3fa2fd57268cbd2b379a9 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Wed, 27 Jan 2016 22:29:37 -0800
Subject: [PATCH 26/44] Drivers: hv: vmbus: add a helper function to set a

2
kernel/patches-4.4/0027-Drivers-hv-vmbus-define-the-new-offer-type-for-Hyper.patch
View File

@@ -1,4 +1,4 @@
From 812345b253e890694a2aac7b426c65bcbd5dc256 Mon Sep 17 00:00:00 2001
From 1c95c1cc09e4dafccb0cd338979d20e73a0b22f3 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Wed, 27 Jan 2016 22:29:38 -0800
Subject: [PATCH 27/44] Drivers: hv: vmbus: define the new offer type for

2
kernel/patches-4.4/0028-Drivers-hv-vmbus-vmbus_sendpacket_ctl-hvsock-avoid-u.patch
View File

@@ -1,4 +1,4 @@
From 4cfa66eb6da21cd44906cb3aa056a5dd06866ae1 Mon Sep 17 00:00:00 2001
From 1a1b2e1d15bea2b37e4f683cfc6dc95426be15db Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Wed, 27 Jan 2016 22:29:39 -0800
Subject: [PATCH 28/44] Drivers: hv: vmbus: vmbus_sendpacket_ctl: hvsock: avoid

2
kernel/patches-4.4/0029-Drivers-hv-vmbus-define-a-new-VMBus-message-type-for.patch
View File

@@ -1,4 +1,4 @@
From 167fd0be929164590061e079dca1d9c74cc9b002 Mon Sep 17 00:00:00 2001
From 4b861e32386a9cfc1d24faae4ee3f06f44281cb1 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Wed, 27 Jan 2016 22:29:40 -0800
Subject: [PATCH 29/44] Drivers: hv: vmbus: define a new VMBus message type for

2
kernel/patches-4.4/0030-Drivers-hv-vmbus-add-a-hvsock-flag-in-struct-hv_driv.patch
View File

@@ -1,4 +1,4 @@
From c3b62e53148bd58cc18eef10814e6dd32613598e Mon Sep 17 00:00:00 2001
From 1aa9eab5b9303e3a5d3e95e3cac6d7c5055462c4 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Wed, 27 Jan 2016 22:29:41 -0800
Subject: [PATCH 30/44] Drivers: hv: vmbus: add a hvsock flag in struct

2
kernel/patches-4.4/0031-Drivers-hv-vmbus-add-a-per-channel-rescind-callback.patch
View File

@@ -1,4 +1,4 @@
From 35e942d17ef78d6ec0961752dce54a546bd319e8 Mon Sep 17 00:00:00 2001
From 193cdd556c56f5e3680e569c03bb8e6a7fe96d81 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Wed, 27 Jan 2016 22:29:42 -0800
Subject: [PATCH 31/44] Drivers: hv: vmbus: add a per-channel rescind callback

2
kernel/patches-4.4/0032-Drivers-hv-vmbus-add-an-API-vmbus_hvsock_device_unre.patch
View File

@@ -1,4 +1,4 @@
From 7b543ef6ce63fb10f3a3f984629d953fe3ef6a1b Mon Sep 17 00:00:00 2001
From 18fa7fe2daa6b3b17b64dfdded56b26c38481ec5 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Wed, 27 Jan 2016 22:29:43 -0800
Subject: [PATCH 32/44] Drivers: hv: vmbus: add an API

2
kernel/patches-4.4/0033-Drivers-hv-vmbus-Give-control-over-how-the-ring-acce.patch
View File

@@ -1,4 +1,4 @@
From 2eff38a174562531fcd554e35dceabacf6f0acfe Mon Sep 17 00:00:00 2001
From 6dff61b3ec25d9d10e248688e1a8e58a5f9d6dfe Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Wed, 27 Jan 2016 22:29:45 -0800
Subject: [PATCH 33/44] Drivers: hv: vmbus: Give control over how the ring

2
kernel/patches-4.4/0034-Drivers-hv-vmbus-avoid-wait_for_completion-on-crash.patch
View File

@@ -1,4 +1,4 @@
From c3a27c706fbd03ad4a3a700d62d3413766aedeb5 Mon Sep 17 00:00:00 2001
From b69e0416edf6d148c25b0098f6bf53bf583ab1a1 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Fri, 26 Feb 2016 15:13:16 -0800
Subject: [PATCH 34/44] Drivers: hv: vmbus: avoid wait_for_completion() on

2
kernel/patches-4.4/0035-Drivers-hv-vmbus-avoid-unneeded-compiler-optimizatio.patch
View File

@@ -1,4 +1,4 @@
From 082e684244d37cef4d7945ccada6ff67d4cfec1c Mon Sep 17 00:00:00 2001
From 5d1d4b91557b1da1616c609bb4ddf6d5c69aba64 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Fri, 26 Feb 2016 15:13:18 -0800
Subject: [PATCH 35/44] Drivers: hv: vmbus: avoid unneeded compiler

2
kernel/patches-4.4/0036-kcm-Kernel-Connection-Multiplexor-module.patch
View File

@@ -1,4 +1,4 @@
From d1e2a92112691a0e53d1ec14d5f64edf951f6746 Mon Sep 17 00:00:00 2001
From 6cf39464182a478b0b970bb61beb951c1403c870 Mon Sep 17 00:00:00 2001
From: Tom Herbert <tom@herbertland.com>
Date: Mon, 7 Mar 2016 14:11:06 -0800
Subject: [PATCH 36/44] kcm: Kernel Connection Multiplexor module

2
kernel/patches-4.4/0037-net-add-the-AF_KCM-entries-to-family-name-tables.patch
View File

@@ -1,4 +1,4 @@
From 9b8cd1d19760525a28ea49867ed637ee2543faec Mon Sep 17 00:00:00 2001
From 1626059f9c292ab2efb0a43bfd9aa471ee6f414c Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Mon, 21 Mar 2016 02:51:09 -0700
Subject: [PATCH 37/44] net: add the AF_KCM entries to family name tables

2
kernel/patches-4.4/0038-net-Add-Qualcomm-IPC-router.patch
View File

@@ -1,4 +1,4 @@
From e187f4a9dc55acd37dc7236a74ac37db7dc5de69 Mon Sep 17 00:00:00 2001
From 2ed9956f8a8aca0459c1d750da67e9fae83a8c7a Mon Sep 17 00:00:00 2001
From: Courtney Cavin <courtney.cavin@sonymobile.com>
Date: Wed, 27 Apr 2016 12:13:03 -0700
Subject: [PATCH 38/44] net: Add Qualcomm IPC router

2
kernel/patches-4.4/0039-hv_sock-introduce-Hyper-V-Sockets.patch
View File

@@ -1,4 +1,4 @@
From 1786cbb086d587775d53c786f3ef248f4b983800 Mon Sep 17 00:00:00 2001
From e2163449aa0c1e0b7ca58beaff4a0e4da1b76bca Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Sun, 15 May 2016 09:53:11 -0700
Subject: [PATCH 39/44] hv_sock: introduce Hyper-V Sockets

2
kernel/patches-4.4/0040-net-add-the-AF_HYPERV-entries-to-family-name-tables.patch
View File

@@ -1,4 +1,4 @@
From af06e1760885eb631e8cac983d9141ae939cf6f3 Mon Sep 17 00:00:00 2001
From c10ff3a93c84f1d801df6c9f4296e07a9824cadd Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Mon, 21 Mar 2016 02:53:08 -0700
Subject: [PATCH 40/44] net: add the AF_HYPERV entries to family name tables

2
kernel/patches-4.4/0041-Drivers-hv-vmbus-fix-the-race-when-querying-updating.patch
View File

@@ -1,4 +1,4 @@
From 0cdb04b23dc9553cac43ffeb47bfed0ecf43bbaa Mon Sep 17 00:00:00 2001
From c36c66b25dccf64c56b32800ec295176207f1106 Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Sat, 21 May 2016 16:55:50 +0800
Subject: [PATCH 41/44] Drivers: hv: vmbus: fix the race when querying &

2
kernel/patches-4.4/0042-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch
View File

@@ -1,4 +1,4 @@
From 1aab772fd54f45e916f8a82e294fdc9c955e4419 Mon Sep 17 00:00:00 2001
From d8f67c520bfaa33ef0bb64411b70f51ace68fd6a 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 42/44] vmbus: Don't spam the logs with unknown GUIDs

2
kernel/patches-4.4/0043-fs-add-filp_clone_open-API.patch
View File

@@ -1,4 +1,4 @@
From 8be9e66c88ba645303ab1321244e383ff87d36b2 Mon Sep 17 00:00:00 2001
From c21ddf0ef2ed8a9e05d7ea906d85aee86a2184ea Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Wed, 17 Feb 2016 16:49:38 -0800
Subject: [PATCH 43/44] fs: add filp_clone_open API

2
kernel/patches-4.4/0044-binfmt_misc-add-persistent-opened-binary-handler-for.patch
View File

@@ -1,4 +1,4 @@
From f2effe2b92fcfad7b5db5cfadb18f3d1e5534e69 Mon Sep 17 00:00:00 2001
From ffafa45734a36cfe27d10ff731785440c39f53fc Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Wed, 17 Feb 2016 16:51:16 -0800
Subject: [PATCH 44/44] binfmt_misc: add persistent opened binary handler for

6
kernel/patches-4.9/0001-hv_sock-introduce-Hyper-V-Sockets.patch
View File

@@ -1,4 +1,4 @@
From 41cf7c7ea77a3c51b023aefa912f96654c293bfd Mon Sep 17 00:00:00 2001
From 6ebb6fc113b41112479233a32ba7845bf0765fef Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Sat, 23 Jul 2016 01:35:51 +0000
Subject: [PATCH 1/8] hv_sock: introduce Hyper-V Sockets
@@ -56,10 +56,10 @@ index 63cefa62324c..e64920219d88 100644
F: Documentation/ABI/stable/sysfs-bus-vmbus
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 192eef2fd766..4148c98dba24 100644
index d596a076da11..489ad74c1e6e 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -1623,5 +1623,18 @@ static inline void commit_rd_index(struct vmbus_channel *channel)
@@ -1613,5 +1613,18 @@ static inline void commit_rd_index(struct vmbus_channel *channel)
hv_signal_on_read(channel);
}

2
kernel/patches-4.9/0002-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch
View File

@@ -1,4 +1,4 @@
From 4d10e16196f7c219540a96a486447c7c8eee0d3c Mon Sep 17 00:00:00 2001
From 81ffd549906270aec7cf38aa098f8f0296c4fe92 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 2/8] vmbus: Don't spam the logs with unknown GUIDs

2
kernel/patches-4.9/0003-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch
View File

@@ -1,4 +1,4 @@
From e6fc7be9a7d041de632c5306d4872e27b26bd74f Mon Sep 17 00:00:00 2001
From f9946a9224a088c80e6340696b0f9cdc4da5847c 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 3/8] Drivers: hv: utils: Fix the mapping between host version

2
kernel/patches-4.9/0004-Drivers-hv-vss-Improve-log-messages.patch
View File

@@ -1,4 +1,4 @@
From 286360c75fcfdfdaa9da2016d61ac41f23a39546 Mon Sep 17 00:00:00 2001
From 5a3d8779d9a335409e9343b6255f0ec76eed11cd 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 4/8] Drivers: hv: vss: Improve log messages.

2
kernel/patches-4.9/0005-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch
View File

@@ -1,4 +1,4 @@
From 6ddf71aef1f50115da8f54e296e6cfdd84e998a3 Mon Sep 17 00:00:00 2001
From 0b2d379f07a067e1ce673658273cbd61cf2fea20 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 5/8] Drivers: hv: vss: Operation timeouts should match host

4
kernel/patches-4.9/0006-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch
View File

@@ -1,4 +1,4 @@
From ca8e4da18726bb6263ff4ed22e2f8d106ae0f29e Mon Sep 17 00:00:00 2001
From 526abebd5a31f44b7819f2e9fc92073297b8b59c 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 6/8] Drivers: hv: vmbus: Use all supported IC versions to
@@ -469,7 +469,7 @@ index e7707747f56d..f3797c07be10 100644
srv->util_cb, dev->channel);
if (ret)
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 4148c98dba24..514cdf390370 100644
index 489ad74c1e6e..956acfc93487 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -1453,9 +1453,10 @@ struct hyperv_service_callback {

2
kernel/patches-4.9/0007-Drivers-hv-Log-the-negotiated-IC-versions.patch
View File

@@ -1,4 +1,4 @@
From 918e18d6946733e1391fc5cec714d51febe59e8e Mon Sep 17 00:00:00 2001
From f124575a9f1bfe890a2307211afc433ec9d6bd38 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 7/8] Drivers: hv: Log the negotiated IC versions.

47
kernel/patches-4.9/0008-Drivers-hv-vmbus-Don-t-leak-memory-when-a-channel-is.patch Normal file
View File

@@ -0,0 +1,47 @@
From ba6078e0069da20c0aebcab38a6d76e371d61da6 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Sun, 12 Mar 2017 20:00:30 -0700
Subject: [PATCH 8/8] Drivers: hv: vmbus: Don't leak memory when a channel is
rescinded
When we close a channel that has been rescinded, we will leak memory since
vmbus_teardown_gpadl() returns an error. Fix this so that we can properly
cleanup the memory allocated to the ring buffers.
Fixes: ccb61f8a99e6 ("Drivers: hv: vmbus: Fix a rescind handling bug")
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 5e030d5ce9d99a899b648413139ff65bab12b038)
---
drivers/hv/channel.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index be34547cdb68..1606e7f08f4b 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -506,12 +506,15 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle)
wait_for_completion(&info->waitevent);
- if (channel->rescind) {
- ret = -ENODEV;
- goto post_msg_err;
- }
-
post_msg_err:
+ /*
+ * If the channel has been rescinded;
+ * we will be awakened by the rescind
+ * handler; set the error code to zero so we don't leak memory.
+ */
+ if (channel->rescind)
+ ret = 0;
+
spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);
list_del(&info->msglistentry);
spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags);
--
2.11.0

65
kernel/patches-4.9/0008-Revert-sched-cpuacct-Show-all-possible-CPUs-in-cpuac.patch
View File

@@ -1,65 +0,0 @@
From 52b289d7080701cd0d67e8070888c0f8e0649c92 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Fri, 17 Feb 2017 11:45:31 +0000
Subject: [PATCH 8/8] Revert "sched/cpuacct: Show all possible CPUs in cpuacct
output"
This reverts commit 5ca3726af7f66a8cc71ce4414cfeb86deb784491.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
kernel/sched/cpuacct.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
index bc0b309c3f19..64d2115f3564 100644
--- a/kernel/sched/cpuacct.c
+++ b/kernel/sched/cpuacct.c
@@ -169,7 +169,7 @@ static u64 __cpuusage_read(struct cgroup_subsys_state *css,
u64 totalcpuusage = 0;
int i;
- for_each_possible_cpu(i)
+ for_each_present_cpu(i)
totalcpuusage += cpuacct_cpuusage_read(ca, i, index);
return totalcpuusage;
@@ -204,7 +204,7 @@ static int cpuusage_write(struct cgroup_subsys_state *css, struct cftype *cft,
if (val)
return -EINVAL;
- for_each_possible_cpu(cpu)
+ for_each_present_cpu(cpu)
cpuacct_cpuusage_write(ca, cpu, 0);
return 0;
@@ -217,7 +217,7 @@ static int __cpuacct_percpu_seq_show(struct seq_file *m,
u64 percpu;
int i;
- for_each_possible_cpu(i) {
+ for_each_present_cpu(i) {
percpu = cpuacct_cpuusage_read(ca, i, index);
seq_printf(m, "%llu ", (unsigned long long) percpu);
}
@@ -251,7 +251,7 @@ static int cpuacct_all_seq_show(struct seq_file *m, void *V)
seq_printf(m, " %s", cpuacct_stat_desc[index]);
seq_puts(m, "\n");
- for_each_possible_cpu(cpu) {
+ for_each_online_cpu(cpu) {
struct cpuacct_usage *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
seq_printf(m, "%d", cpu);
@@ -284,7 +284,7 @@ static int cpuacct_stats_show(struct seq_file *sf, void *v)
int stat;
memset(val, 0, sizeof(val));
- for_each_possible_cpu(cpu) {
+ for_each_online_cpu(cpu) {
u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat;
val[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER];
--
2.11.0