mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 17:26:28 +00:00
Merge pull request #1726 from rneugeba/kern-up3
kernel: Update to 4.4.64/4.9.25/4.10.13
This commit is contained in:
commit
3a668d8caf
@ -59,6 +59,6 @@ endef
|
||||
#
|
||||
# Build Targets
|
||||
#
|
||||
$(eval $(call kernel,4.10.12,4.10.x))
|
||||
$(eval $(call kernel,4.9.24,4.9.x))
|
||||
$(eval $(call kernel,4.4.63,4.4.x))
|
||||
$(eval $(call kernel,4.10.13,4.10.x))
|
||||
$(eval $(call kernel,4.9.25,4.9.x))
|
||||
$(eval $(call kernel,4.4.64,4.4.x))
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a5b57e31314513a6d41b043cb6b48f60362e1da7 Mon Sep 17 00:00:00 2001
|
||||
From 619e73aadf2a24f58cbc5aed2622d35ac4cf5182 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/6] hv_sock: introduce Hyper-V Sockets
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 846bf0eabd07fcc4a5f4b7c4eef48e6f28f7756b Mon Sep 17 00:00:00 2001
|
||||
From 9ab0abb7cbbfd39bae399909d6e7e08284f58090 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/6] Drivers: hv: vmbus: Use all supported IC versions to
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 412aa4f68e14cc5924becc66777827456d24696e Mon Sep 17 00:00:00 2001
|
||||
From 207cbe08e87497d5b405892d6879808600103e52 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/6] Drivers: hv: Log the negotiated IC versions.
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 02549a9d1cc1a02366f18ea9624b74bf29cfb536 Mon Sep 17 00:00:00 2001
|
||||
From 81e07cf983050fdbf27115f757a337c29fe8e3b4 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Sun, 26 Mar 2017 16:42:20 +0800
|
||||
Subject: [PATCH 4/6] vmbus: fix missed ring events on boot
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 12762441b4f1f1eecd11706d72cece620006c2c7 Mon Sep 17 00:00:00 2001
|
||||
From 849282cf210be7d3aa84725857e08e62238e4473 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 29 Mar 2017 18:37:10 +0800
|
||||
Subject: [PATCH 5/6] vmbus: remove "goto error_clean_msglist" in vmbus_open()
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 209e1b22599796d8e9d5457fa005a43c9cb6f81e Mon Sep 17 00:00:00 2001
|
||||
From b3f63e4dfcc3aa79c7d4e4d966505ff3fd697211 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Fri, 24 Mar 2017 20:53:18 +0800
|
||||
Subject: [PATCH 6/6] vmbus: dynamically enqueue/dequeue the channel on
|
||||
|
@ -1,4 +1,4 @@
|
||||
From c36c33d159fb6b5def77bd4b2376b58a982f0e5e Mon Sep 17 00:00:00 2001
|
||||
From eeff53eb03d6e8df082972ddf6b3eae916152861 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 40fbffcc0f9c24643d7621a53f5ba5c2f40c8157 Mon Sep 17 00:00:00 2001
|
||||
From 1a4874138d5a55e193d9e9f85c9ce2b2234a8b4d 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 130548cc3488f31ed49f642a2da5ac4f4d2f28f7 Mon Sep 17 00:00:00 2001
|
||||
From ebdc8464ade61005dc0896a43bc940483f462d60 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2e0bbfab3b7d647f3e44290698d84e46b1b30d6d Mon Sep 17 00:00:00 2001
|
||||
From 8a79000b20ddd6abf0d77758fb0b7029625d30ba 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6588ab7a939a75c016c81357e4219c3698b25326 Mon Sep 17 00:00:00 2001
|
||||
From a83a0a9a221657fb84e5e97f9382b45c54f8da82 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a42aaacf46cee7eb5f24df7ea9537308f24b1ed9 Mon Sep 17 00:00:00 2001
|
||||
From 9ad46b96863f47ae1bcf0db7600a3839c378701e 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
|
||||
@ -66,7 +66,7 @@ index e34d96f8bde2..17dbbe64cd73 100644
|
||||
|
||||
lock_sock(sk);
|
||||
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
|
||||
index 0a369bb440e7..706991e00e93 100644
|
||||
index 662bdd20a748..5f8c99eb104c 100644
|
||||
--- a/net/vmw_vsock/vmci_transport.c
|
||||
+++ b/net/vmw_vsock/vmci_transport.c
|
||||
@@ -1644,6 +1644,8 @@ static void vmci_transport_destruct(struct vsock_sock *vsk)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2e00a63d8effe207c3ab15e935fd8bc94a7e3d8e Mon Sep 17 00:00:00 2001
|
||||
From 5f2c7a423a485fe4e24e989aa21f2959a76a623d 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d3c5f85a345f54045b3939c113600a80517d6e62 Mon Sep 17 00:00:00 2001
|
||||
From 96f038468e83e7e7858c9f32ce3120db2144f92d 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7c64aff9f0e522576d16f1330c0227088bdb2fe5 Mon Sep 17 00:00:00 2001
|
||||
From 3c2473d53f9afbd823c683e2521efed9e4b060e2 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 594495ce92e66626ffce11726e5ecf1c177bd3ef Mon Sep 17 00:00:00 2001
|
||||
From a36ef67c2ed26c1c3151be7625192d049f2a794c 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3a6a556e2153af041a94e5e6c6c93ed661844b82 Mon Sep 17 00:00:00 2001
|
||||
From 006d210eabf16ba1f6ef9a3eb0e90248497aa243 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()
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2cd6f260e74da094f976c5dbe8ebdc237b82721e Mon Sep 17 00:00:00 2001
|
||||
From ea89836d72c75be2ff88a3cf31166ea7ddf20d73 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 27612f581276ed74d73256d2a1988f8ac6cc989d Mon Sep 17 00:00:00 2001
|
||||
From 1e5eb9e80811f5d2cbb007905d7e41639ea5e68c 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 5492dc8c7941fbe5b1d834a4fc339281ce3dcd21 Mon Sep 17 00:00:00 2001
|
||||
From c4ab863d63168ebab6a1bedd349cd29edcd8b638 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From c3be98972d5838afd36ee53cb64a95ce41367991 Mon Sep 17 00:00:00 2001
|
||||
From e267778b94b9feb553c59452aae780863aee6b0d 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d8da02bac2538f20a3750bef9e506393937d733f Mon Sep 17 00:00:00 2001
|
||||
From 8742dfd301cc4243c04b37fc1a8a913560b3d2b3 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f0ba83939795a8001c9d0ef4bc6ddc06b0a2179e Mon Sep 17 00:00:00 2001
|
||||
From 0dc712fbdd40447428c31a0f50e4aec94126b98e 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7467f14c41898e09493976148c7622eead588105 Mon Sep 17 00:00:00 2001
|
||||
From 5c893a47dffb979011848a9764a4e944372537f6 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2e9d0312a7cdeffc7c8587eba9cfde4d4d8c053a Mon Sep 17 00:00:00 2001
|
||||
From 47f183f5dc2b326a5894c303591567fe84c656db 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
|
||||
@ -15,10 +15,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
|
||||
index 1ef37c727572..2889d97c03b1 100644
|
||||
index d037454fe7b8..b00cdfb725de 100644
|
||||
--- a/drivers/hv/channel.c
|
||||
+++ b/drivers/hv/channel.c
|
||||
@@ -512,6 +512,18 @@ static int vmbus_close_internal(struct vmbus_channel *channel)
|
||||
@@ -514,6 +514,18 @@ static int vmbus_close_internal(struct vmbus_channel *channel)
|
||||
tasklet = hv_context.event_dpc[channel->target_cpu];
|
||||
tasklet_disable(tasklet);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 39e7bffc0410f823a835f184324ce1317c1dc1d5 Mon Sep 17 00:00:00 2001
|
||||
From 4c288b912b8c801c672602781141ba2bee267e90 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From c4ed24265ff63770c8e2aa13fd9a343f7e082d55 Mon Sep 17 00:00:00 2001
|
||||
From 0b50537d8322491c2e46f566aaa449955a07d3cf 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
|
||||
@ -64,7 +64,7 @@ index 8529dd2ebc3d..306c7dff6c77 100644
|
||||
if (newchannel->target_cpu != get_cpu()) {
|
||||
put_cpu();
|
||||
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
|
||||
index 4fc2e8836e60..521f48ed188e 100644
|
||||
index 2bbc53025549..c0c0aaf88228 100644
|
||||
--- a/drivers/hv/connection.c
|
||||
+++ b/drivers/hv/connection.c
|
||||
@@ -146,7 +146,7 @@ int vmbus_connect(void)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From eec959fe413a0e01513cfbf35b00b856b6bb90d0 Mon Sep 17 00:00:00 2001
|
||||
From 3fe16c66afb8d13c0ac3606b69b06d008612031e 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
|
||||
@ -21,10 +21,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
1 file changed, 22 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
|
||||
index 2889d97c03b1..dd6de7fc442f 100644
|
||||
index b00cdfb725de..def21d34f3ea 100644
|
||||
--- a/drivers/hv/channel.c
|
||||
+++ b/drivers/hv/channel.c
|
||||
@@ -922,8 +922,10 @@ EXPORT_SYMBOL_GPL(vmbus_sendpacket_multipagebuffer);
|
||||
@@ -924,8 +924,10 @@ EXPORT_SYMBOL_GPL(vmbus_sendpacket_multipagebuffer);
|
||||
*
|
||||
* Mainly used by Hyper-V drivers.
|
||||
*/
|
||||
@ -37,7 +37,7 @@ index 2889d97c03b1..dd6de7fc442f 100644
|
||||
{
|
||||
struct vmpacket_descriptor desc;
|
||||
u32 packetlen;
|
||||
@@ -941,27 +943,34 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
|
||||
@@ -943,27 +945,34 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
|
||||
return 0;
|
||||
|
||||
packetlen = desc.len8 << 3;
|
||||
@ -81,7 +81,7 @@ index 2889d97c03b1..dd6de7fc442f 100644
|
||||
}
|
||||
EXPORT_SYMBOL(vmbus_recvpacket);
|
||||
|
||||
@@ -972,37 +981,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
|
||||
@@ -974,37 +983,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
|
||||
u32 bufferlen, u32 *buffer_actual_len,
|
||||
u64 *requestid)
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 84d3c6c116c4e7f3806b81c1290af8ce2b0e72ca Mon Sep 17 00:00:00 2001
|
||||
From 5336b713b328a0180f0c1ab3edb8e7f1dd860df4 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 1881e6b9392e8708be2946be73fa65efb3008494 Mon Sep 17 00:00:00 2001
|
||||
From ee4e8a79acdef56d8ff31df5f115fdf6f2313568 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From bd787175abbc0caf2184aaf226be1997911e07d9 Mon Sep 17 00:00:00 2001
|
||||
From 70bb489cdc6f3c9d90990ad9aa42083232bbdd94 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 8c5e0c23e2c3e6f7671116156bf7ede8e1ab5254 Mon Sep 17 00:00:00 2001
|
||||
From ca1b5a78aec64678f8b196366dd1510320479d47 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3b21028392e39753286b1868cc1245dd213dc7a4 Mon Sep 17 00:00:00 2001
|
||||
From 428502fe653251603431c6e450fe404c83a00fbb 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a44136941cd9a14ed3862733215b0cd9d05405ca Mon Sep 17 00:00:00 2001
|
||||
From 071ef6098a5c485c00463711bb7de80cfe241dd9 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
|
||||
@ -17,10 +17,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
|
||||
index dd6de7fc442f..128dcf22e459 100644
|
||||
index def21d34f3ea..a42104ed0b59 100644
|
||||
--- a/drivers/hv/channel.c
|
||||
+++ b/drivers/hv/channel.c
|
||||
@@ -659,6 +659,9 @@ int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer,
|
||||
@@ -661,6 +661,9 @@ int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer,
|
||||
* If we cannot write to the ring-buffer; signal the host
|
||||
* even if we may not have written anything. This is a rare
|
||||
* enough condition that it should not matter.
|
||||
@ -30,7 +30,7 @@ index dd6de7fc442f..128dcf22e459 100644
|
||||
*/
|
||||
|
||||
if (channel->signal_policy)
|
||||
@@ -666,7 +669,8 @@ int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer,
|
||||
@@ -668,7 +671,8 @@ int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer,
|
||||
else
|
||||
kick_q = true;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 87c1e6106d038f24305d498eb20c617f3c64dd03 Mon Sep 17 00:00:00 2001
|
||||
From eca5fc2f7461ac64a9b6a3d102c2d1edefa74dc8 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
|
||||
@ -20,10 +20,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
3 files changed, 32 insertions(+)
|
||||
|
||||
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
|
||||
index 128dcf22e459..415f6c7d92a6 100644
|
||||
index a42104ed0b59..b27054e4eac2 100644
|
||||
--- a/drivers/hv/channel.c
|
||||
+++ b/drivers/hv/channel.c
|
||||
@@ -219,6 +219,21 @@ error0:
|
||||
@@ -214,6 +214,21 @@ error0:
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vmbus_open);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ae144762504313d3ef91584b2dfa8c5671b444a7 Mon Sep 17 00:00:00 2001
|
||||
From 47b4dc5a8f640977d39640b918298ef1b91fa1c3 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 8cd0a07327d9a76d2fd2b9b133632edd38dcd82e Mon Sep 17 00:00:00 2001
|
||||
From 347e9e7f4997fe428fbdc58555e6de052311ff66 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ed49f87f8a1d5c750ebd5d998cc5ccb83002f157 Mon Sep 17 00:00:00 2001
|
||||
From 00f2a6e60fbfd79b5c8b891e6a19c310c90d91fd 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
|
||||
@ -114,7 +114,7 @@ index 76864c98a110..cf311be88cb4 100644
|
||||
* vmbus_onoffers_delivered -
|
||||
* This is invoked when all offers have been delivered.
|
||||
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
|
||||
index 521f48ed188e..09c08b56e3dc 100644
|
||||
index c0c0aaf88228..4a1679d54c1f 100644
|
||||
--- a/drivers/hv/connection.c
|
||||
+++ b/drivers/hv/connection.c
|
||||
@@ -285,7 +285,8 @@ struct vmbus_channel *relid2channel(u32 relid)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3fb0c2d93fed61f62937316842f64f4cbff1162b Mon Sep 17 00:00:00 2001
|
||||
From 99735e5a356d8a2d409872f8062e9e89ed2fb377 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
|
||||
@ -24,10 +24,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
5 files changed, 37 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
|
||||
index 415f6c7d92a6..57a1b659d05f 100644
|
||||
index b27054e4eac2..4077e7243151 100644
|
||||
--- a/drivers/hv/channel.c
|
||||
+++ b/drivers/hv/channel.c
|
||||
@@ -639,6 +639,7 @@ int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer,
|
||||
@@ -641,6 +641,7 @@ int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer,
|
||||
u64 aligned_data = 0;
|
||||
int ret;
|
||||
bool signal = false;
|
||||
@ -35,7 +35,7 @@ index 415f6c7d92a6..57a1b659d05f 100644
|
||||
int num_vecs = ((bufferlen != 0) ? 3 : 1);
|
||||
|
||||
|
||||
@@ -658,7 +659,7 @@ int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer,
|
||||
@@ -660,7 +661,7 @@ int vmbus_sendpacket_ctl(struct vmbus_channel *channel, void *buffer,
|
||||
bufferlist[2].iov_len = (packetlen_aligned - packetlen);
|
||||
|
||||
ret = hv_ringbuffer_write(&channel->outbound, bufferlist, num_vecs,
|
||||
@ -44,7 +44,7 @@ index 415f6c7d92a6..57a1b659d05f 100644
|
||||
|
||||
/*
|
||||
* Signalling the host is conditional on many factors:
|
||||
@@ -738,6 +739,7 @@ int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
|
||||
@@ -740,6 +741,7 @@ int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
|
||||
struct kvec bufferlist[3];
|
||||
u64 aligned_data = 0;
|
||||
bool signal = false;
|
||||
@ -52,7 +52,7 @@ index 415f6c7d92a6..57a1b659d05f 100644
|
||||
|
||||
if (pagecount > MAX_PAGE_BUFFER_COUNT)
|
||||
return -EINVAL;
|
||||
@@ -774,7 +776,8 @@ int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
|
||||
@@ -776,7 +778,8 @@ int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
|
||||
bufferlist[2].iov_base = &aligned_data;
|
||||
bufferlist[2].iov_len = (packetlen_aligned - packetlen);
|
||||
|
||||
@ -62,7 +62,7 @@ index 415f6c7d92a6..57a1b659d05f 100644
|
||||
|
||||
/*
|
||||
* Signalling the host is conditional on many factors:
|
||||
@@ -837,6 +840,7 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
|
||||
@@ -839,6 +842,7 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
|
||||
struct kvec bufferlist[3];
|
||||
u64 aligned_data = 0;
|
||||
bool signal = false;
|
||||
@ -70,7 +70,7 @@ index 415f6c7d92a6..57a1b659d05f 100644
|
||||
|
||||
packetlen = desc_size + bufferlen;
|
||||
packetlen_aligned = ALIGN(packetlen, sizeof(u64));
|
||||
@@ -856,7 +860,8 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
|
||||
@@ -858,7 +862,8 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
|
||||
bufferlist[2].iov_base = &aligned_data;
|
||||
bufferlist[2].iov_len = (packetlen_aligned - packetlen);
|
||||
|
||||
@ -80,7 +80,7 @@ index 415f6c7d92a6..57a1b659d05f 100644
|
||||
|
||||
if (ret == 0 && signal)
|
||||
vmbus_setevent(channel);
|
||||
@@ -881,6 +886,7 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
|
||||
@@ -883,6 +888,7 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
|
||||
struct kvec bufferlist[3];
|
||||
u64 aligned_data = 0;
|
||||
bool signal = false;
|
||||
@ -88,7 +88,7 @@ index 415f6c7d92a6..57a1b659d05f 100644
|
||||
u32 pfncount = NUM_PAGES_SPANNED(multi_pagebuffer->offset,
|
||||
multi_pagebuffer->len);
|
||||
|
||||
@@ -919,7 +925,8 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
|
||||
@@ -921,7 +927,8 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
|
||||
bufferlist[2].iov_base = &aligned_data;
|
||||
bufferlist[2].iov_len = (packetlen_aligned - packetlen);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 71f4e7a785f9a8e44ff66a778cf652d8d539929b Mon Sep 17 00:00:00 2001
|
||||
From b7443966e422f409f0ee950941512755e446e855 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
|
||||
@ -48,7 +48,7 @@ index b40f429aaa13..f70e35278b94 100644
|
||||
else
|
||||
vmbus_wait_for_unload();
|
||||
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
|
||||
index 09c08b56e3dc..78b8be87844c 100644
|
||||
index 4a1679d54c1f..46cc9c639775 100644
|
||||
--- a/drivers/hv/connection.c
|
||||
+++ b/drivers/hv/connection.c
|
||||
@@ -233,7 +233,7 @@ void vmbus_disconnect(void)
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7ce72cc9264de1bab07123813c95914931455ecb Mon Sep 17 00:00:00 2001
|
||||
From a65542279ae59bc1fb200dc38c1e52359d3f3d39 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0075101abb0553041e205862a4c1207d12b42050 Mon Sep 17 00:00:00 2001
|
||||
From b611485932f9b600fcaa82566d3e3cd76ec1169e 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 096d29688451b97f41bdce1a404150f8a4873b4b Mon Sep 17 00:00:00 2001
|
||||
From e3cfc8c926cfa77dba1406252dae1240e63b00b8 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0efb7488ad9b93fe4018fd8d27e62f388c3a91e9 Mon Sep 17 00:00:00 2001
|
||||
From f137c7e4c47b16d42642b5b250fd3cb4107a2c28 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 5f51aa36a46f5b6cf4ff31860fd7386f32fb25c7 Mon Sep 17 00:00:00 2001
|
||||
From 89ecdc58887d046cc18be9ecb1b10b76a4d192b1 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7f2fb6f968e8f353c7d73a8d920e0555fe7a9a3d Mon Sep 17 00:00:00 2001
|
||||
From 6b9b4fcb0bfad2550c9b82a0e1b0e5cbeed3443a 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 73602650e735f0f4c405ef8ce9ef1b73bd75cda6 Mon Sep 17 00:00:00 2001
|
||||
From 5550ad5e1a94401410f32ed9fb91763f6aa3bd00 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 &
|
||||
@ -28,10 +28,10 @@ Origin: https://github.com/dcui/linux/commit/fbcca73228b9b90911ab30fdf75f532b2b7
|
||||
2 files changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
|
||||
index 57a1b659d05f..da76a2e9199a 100644
|
||||
index 4077e7243151..a19aadc4a297 100644
|
||||
--- a/drivers/hv/channel.c
|
||||
+++ b/drivers/hv/channel.c
|
||||
@@ -592,6 +592,7 @@ static int vmbus_close_internal(struct vmbus_channel *channel)
|
||||
@@ -594,6 +594,7 @@ static int vmbus_close_internal(struct vmbus_channel *channel)
|
||||
|
||||
out:
|
||||
tasklet_enable(tasklet);
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ae0b6afacad988e2e9bc3ed7a8093a84270b29a9 Mon Sep 17 00:00:00 2001
|
||||
From fe3d65a319af8c5a6f8789090c25ac2675df9dae 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 7b584ab45d3e33513d9e6ad8fd4232809d4546c8 Mon Sep 17 00:00:00 2001
|
||||
From c9ee576f3b8d39bf7b00355b07632af8af6e0d55 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a225bf5041889da9fcf6e3b32f72585bba3f736c Mon Sep 17 00:00:00 2001
|
||||
From 0f832c404d8307d31a66f841d9bb07476ed3684f 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
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 729b57b5e668474ef418a4204bfc8a5152f41bb7 Mon Sep 17 00:00:00 2001
|
||||
From bebcadfcf570ed3339f40cebeff53c79e1e6edb6 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Sat, 23 Jul 2016 01:35:51 +0000
|
||||
Subject: [PATCH 01/10] hv_sock: introduce Hyper-V Sockets
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d94510d8f2b525b65d629742c621bd9042994d38 Mon Sep 17 00:00:00 2001
|
||||
From 22e169b0a7a89a4185fa24b616e8f2c8176b00bc 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 02/10] vmbus: Don't spam the logs with unknown GUIDs
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 1787ad024ba27520b9824808b29a138bc877f27a Mon Sep 17 00:00:00 2001
|
||||
From b1469b9da1d5cc11b859c68150b86fe63fd2fb63 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 03/10] Drivers: hv: utils: Fix the mapping between host
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 08e3ac37083ef3c183ba5a5259b2c4ee9d7dee4e Mon Sep 17 00:00:00 2001
|
||||
From 42b0b930525dd64fa971301202a0e258de87c852 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 04/10] Drivers: hv: vss: Improve log messages.
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0de89e2d318378cd7969f18c3b1a19800e853340 Mon Sep 17 00:00:00 2001
|
||||
From 07edc21bf8fd9935767548acb8053c20bf94122e 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 05/10] Drivers: hv: vss: Operation timeouts should match host
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f7c9fd62ae2aec6930bff03de7c8d04ffb662076 Mon Sep 17 00:00:00 2001
|
||||
From 4de61bfff1dad61236e61206b0da9b310e5cff3f 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 06/10] Drivers: hv: vmbus: Use all supported IC versions to
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 36cbc0ad8b6e2ff0eb4f8f2b9ed9b69e64f51993 Mon Sep 17 00:00:00 2001
|
||||
From 4af1b7aeac8800fd387e05b808b850a80ba81800 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 07/10] Drivers: hv: Log the negotiated IC versions.
|
||||
|
@ -1,4 +1,4 @@
|
||||
From eaa6c8c32bbcf67d0a2d11eed8d3592d9a38f766 Mon Sep 17 00:00:00 2001
|
||||
From 39a8a807834cbacf175f0a4d8f934918aa96b652 Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Sun, 26 Mar 2017 16:42:20 +0800
|
||||
Subject: [PATCH 08/10] vmbus: fix missed ring events on boot
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ed8c3b9dbf906dff306091af172252dced5a0fdf Mon Sep 17 00:00:00 2001
|
||||
From 6103845814b39c73c1745898e9bb785c0b40b81d Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Wed, 29 Mar 2017 18:37:10 +0800
|
||||
Subject: [PATCH 09/10] vmbus: remove "goto error_clean_msglist" in
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 95a74119fb1927c5e31c746787dbe48ffdc94ce8 Mon Sep 17 00:00:00 2001
|
||||
From b6c139b4368a30b22fae95abff5233e3c8cec10c Mon Sep 17 00:00:00 2001
|
||||
From: Dexuan Cui <decui@microsoft.com>
|
||||
Date: Fri, 24 Mar 2017 20:53:18 +0800
|
||||
Subject: [PATCH 10/10] vmbus: dynamically enqueue/dequeue the channel on
|
||||
|
Loading…
Reference in New Issue
Block a user