kernel: Update 4.9.x patches

- Remove patch to prevent non-host network namespace to use VSOCK
  This is now handled by SECOMP profiles by docker
- rebase the VMBUS version cherry-picks to Linus' tree.
  This will make it easier to get them into stable

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-03-07 14:04:53 +00:00
parent cf809a6eb8
commit 1041f95a6e
9 changed files with 16 additions and 46 deletions

View File

@ -1,30 +0,0 @@
From c088eaac7036b89716a83870cb62a2f69e27359d 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 1/9] VSOCK: Only allow host network namespace to use AF_VSOCK.
The VSOCK addressing schema does not really lend itself to simply creating an
alternative end point address within a namespace.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
net/vmw_vsock/af_vsock.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 8a398b3fb532..0edc54c5e6ed 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1852,6 +1852,9 @@ static const struct proto_ops vsock_stream_ops = {
static int vsock_create(struct net *net, struct socket *sock,
int protocol, int kern)
{
+ if (!net_eq(net, &init_net))
+ return -EAFNOSUPPORT;
+
if (!sock)
return -EINVAL;
--
2.11.0

View File

@ -1,7 +1,7 @@
From 6ba8e6943e39be44f7fe16a5368ea39e5f0fc6b0 Mon Sep 17 00:00:00 2001
From a05e78c17f0efb88f2dca0c91b577930ec8fceef Mon Sep 17 00:00:00 2001
From: Dexuan Cui <decui@microsoft.com>
Date: Sat, 23 Jul 2016 01:35:51 +0000
Subject: [PATCH 2/9] hv_sock: introduce Hyper-V Sockets
Subject: [PATCH 1/8] 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

View File

@ -1,7 +1,7 @@
From bedfd965a8792a64b4abe568399a4137de241994 Mon Sep 17 00:00:00 2001
From 0d87652417884b13270151b427e060f26e59c375 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 3/9] vmbus: Don't spam the logs with unknown GUIDs
Subject: [PATCH 2/8] vmbus: Don't spam the logs with unknown GUIDs
With Hyper-V sockets device types are introduced on the fly. The pr_info()
then prints a message on every connection, which is way too verbose. Since

View File

@ -1,7 +1,7 @@
From 8ab2322a422619e3af01691da0ae93ad05e81d39 Mon Sep 17 00:00:00 2001
From d59f45195664c102c5b9f135627a2da5d1427034 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 4/9] Drivers: hv: utils: Fix the mapping between host version
Subject: [PATCH 3/8] Drivers: hv: utils: Fix the mapping between host version
and protocol to use
We should intentionally declare the protocols to use for every known host

View File

@ -1,7 +1,7 @@
From bca6dab1d28ea5c4beb7fa49af364bfc17bdf8c2 Mon Sep 17 00:00:00 2001
From 04695dd9fb11a46597a6b4cb4e9ba7f5f0ec0cea 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 5/9] Drivers: hv: vss: Improve log messages.
Subject: [PATCH 4/8] Drivers: hv: vss: Improve log messages.
Adding log messages to help troubleshoot error cases and transaction
handling.

View File

@ -1,7 +1,7 @@
From 36f78e01194e66716f0ad391954e8884279d40af Mon Sep 17 00:00:00 2001
From 461049b10ecef001bc7fb056539d2e96578bf133 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 6/9] Drivers: hv: vss: Operation timeouts should match host
Subject: [PATCH 5/8] Drivers: hv: vss: Operation timeouts should match host
expectation
Increase the timeout of backup operations. When system is under I/O load,

View File

@ -1,7 +1,7 @@
From 869073f9decdffdccd5357b08f5722c75f283cfe Mon Sep 17 00:00:00 2001
From 54ac3db2f284a4f4885f319f90ca8e23bf5e1c05 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 7/9] Drivers: hv: vmbus: Use all supported IC versions to
Subject: [PATCH 6/8] Drivers: hv: vmbus: Use all supported IC versions to
negotiate
Previously, we were assuming that each IC protocol version was tied to a

View File

@ -1,7 +1,7 @@
From c75f93299cbfb34210840e1ec4aecd0c8e3fa756 Mon Sep 17 00:00:00 2001
From 9152d9869acc43f61cb8070219a1da678a51ea32 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 8/9] Drivers: hv: Log the negotiated IC versions.
Subject: [PATCH 7/8] Drivers: hv: Log the negotiated IC versions.
Log the negotiated IC versions.

View File

@ -1,7 +1,7 @@
From ba848e33943d29bc4f50175b8a6a947fcc9c32c8 Mon Sep 17 00:00:00 2001
From 3fc81fca77e4368e219e528880d9fcd871506bf0 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 9/9] Revert "sched/cpuacct: Show all possible CPUs in cpuacct
Subject: [PATCH 8/8] Revert "sched/cpuacct: Show all possible CPUs in cpuacct
output"
This reverts commit 5ca3726af7f66a8cc71ce4414cfeb86deb784491.