From e140ab4acc5a0f795aaa242dda69b2b0f02aa48c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 28 Dec 2017 14:48:20 +0000 Subject: [PATCH] kernel: Update to 4.14.8/4.9.71/4.4.107 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.4.x-aarch64 | 2 +- kernel/config-4.4.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 | 18 ++++++++--------- ...peration-timeouts-should-match-host-.patch | 6 +++--- ...-Use-all-supported-IC-versions-to-ne.patch | 20 +++++++++---------- ...rs-hv-Log-the-negotiated-IC-versions.patch | 16 +++++++-------- ...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 +- 20 files changed, 50 insertions(+), 50 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 94ab615e3..efe952367 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.14.7,4.14.x,$(EXTRA))) -$(eval $(call kernel,4.14.7,4.14.x,-dbg)) -$(eval $(call kernel,4.9.70,4.9.x,$(EXTRA))) -$(eval $(call kernel,4.9.70,4.9.x,-dbg)) -$(eval $(call kernel,4.4.106,4.4.x,$(EXTRA))) +$(eval $(call kernel,4.14.8,4.14.x,$(EXTRA))) +$(eval $(call kernel,4.14.8,4.14.x,-dbg)) +$(eval $(call kernel,4.9.71,4.9.x,$(EXTRA))) +$(eval $(call kernel,4.9.71,4.9.x,-dbg)) +$(eval $(call kernel,4.4.107,4.4.x,$(EXTRA))) # Target for kernel config kconfig: | sources diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index e1aacdadd..e744029c2 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.7 Kernel Configuration +# Linux/arm64 4.14.8 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 43a668395..8b85d99ab 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.7 Kernel Configuration +# Linux/x86 4.14.8 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.4.x-aarch64 b/kernel/config-4.4.x-aarch64 index 117ea5796..acef6e460 100644 --- a/kernel/config-4.4.x-aarch64 +++ b/kernel/config-4.4.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.4.106 Kernel Configuration +# Linux/arm64 4.4.107 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.4.x-x86_64 b/kernel/config-4.4.x-x86_64 index b5d563f08..d02540996 100644 --- a/kernel/config-4.4.x-x86_64 +++ b/kernel/config-4.4.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.106 Kernel Configuration +# Linux/x86 4.4.107 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 f442fe8fb..bb8dcdcf1 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.70 Kernel Configuration +# Linux/arm64 4.9.71 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 8a6f9ea33..99dbe2211 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.70 Kernel Configuration +# Linux/x86 4.9.71 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 ae5741f46..3268513d8 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 6609bcceff41b236a7bac382f31c32b722c861b4 Mon Sep 17 00:00:00 2001 +From d81d8b133b53f898629854ca738dba758d9da25e 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 d43ec93c6..12a5be295 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 83cc3adf460a9bbea17baa9e6c495988a84034ad Mon Sep 17 00:00:00 2001 +From 32594d25b2302b5a5bdb3d8c1619f79d0cb1ffe2 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 2 Mar 2017 12:55:49 -0300 Subject: [PATCH 01/12] 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 47e75f52b..116a98eec 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 0021c8fb28a83fa4c61f30b4ef22358f2effbed6 Mon Sep 17 00:00:00 2001 +From 3edb8c07d2bfe6880a4f2f47ad01a49d3ddfc43c Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 13 Oct 2016 17:12:35 -0300 Subject: [PATCH 02/12] 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 5c2e4dca3..7fe945931 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 efea47108405d3a80ccb22c15a10a1a0bbbd51e5 Mon Sep 17 00:00:00 2001 +From a3b78a378b0fc8e8c0bfbadd29d82e42c52d8985 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sat, 23 Jul 2016 01:35:51 +0000 Subject: [PATCH 03/12] 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 b171a9c99..883a6d55e 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 a7d3eb77302c36c84f9a23372e27752830120414 Mon Sep 17 00:00:00 2001 +From e698b624c986d34bf0eac51f46184c0ddc0157d1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 23 May 2016 18:55:45 +0100 Subject: [PATCH 04/12] 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 026a7976d..b266f5ef5 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 67c0eb9c20e98f633fb7ae12b46fcef8256a2483 Mon Sep 17 00:00:00 2001 +From a153535809e046b345e92cb8d89f9035ab52cfab Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:07 -0800 Subject: [PATCH 05/12] 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 7404d6c9a..7d585a572 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 596d4b9ad2b8a1a14de8dd71b11c30fb9ee476b6 Mon Sep 17 00:00:00 2001 +From 081ef9a996c8f6024d474881da9f2a2359bd80cc Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:10 -0800 Subject: [PATCH 06/12] Drivers: hv: vss: Improve log messages. @@ -16,10 +16,10 @@ Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c -index a76e3db0d01f..b1446d51ef45 100644 +index a6707133c297..5c95ba1e2ecf 100644 --- a/drivers/hv/hv_snapshot.c +++ b/drivers/hv/hv_snapshot.c -@@ -121,7 +121,7 @@ static int vss_handle_handshake(struct hv_vss_msg *vss_msg) +@@ -120,7 +120,7 @@ static int vss_handle_handshake(struct hv_vss_msg *vss_msg) default: return -EINVAL; } @@ -28,7 +28,7 @@ index a76e3db0d01f..b1446d51ef45 100644 return 0; } -@@ -129,8 +129,10 @@ static int vss_on_msg(void *msg, int len) +@@ -128,8 +128,10 @@ static int vss_on_msg(void *msg, int len) { struct hv_vss_msg *vss_msg = (struct hv_vss_msg *)msg; @@ -40,7 +40,7 @@ index a76e3db0d01f..b1446d51ef45 100644 if (vss_msg->vss_hdr.operation == VSS_OP_REGISTER || vss_msg->vss_hdr.operation == VSS_OP_REGISTER1) { -@@ -138,8 +140,11 @@ static int vss_on_msg(void *msg, int len) +@@ -137,8 +139,11 @@ static int vss_on_msg(void *msg, int len) * Don't process registration messages if we're in the middle * of a transaction processing. */ @@ -53,7 +53,7 @@ index a76e3db0d01f..b1446d51ef45 100644 return vss_handle_handshake(vss_msg); } else if (vss_transaction.state == HVUTIL_USERSPACE_REQ) { vss_transaction.state = HVUTIL_USERSPACE_RECV; -@@ -156,7 +161,7 @@ static int vss_on_msg(void *msg, int len) +@@ -155,7 +160,7 @@ static int vss_on_msg(void *msg, int len) } } else { /* This is a spurious call! */ @@ -62,7 +62,7 @@ index a76e3db0d01f..b1446d51ef45 100644 return -EINVAL; } return 0; -@@ -169,8 +174,10 @@ static void vss_send_op(void) +@@ -168,8 +173,10 @@ static void vss_send_op(void) struct hv_vss_msg *vss_msg; /* The transaction state is wrong. */ @@ -74,7 +74,7 @@ index a76e3db0d01f..b1446d51ef45 100644 vss_msg = kzalloc(sizeof(*vss_msg), GFP_KERNEL); if (!vss_msg) -@@ -211,9 +218,13 @@ static void vss_handle_request(struct work_struct *dummy) +@@ -210,9 +217,13 @@ static void vss_handle_request(struct work_struct *dummy) case VSS_OP_HOT_BACKUP: if (vss_transaction.state < HVUTIL_READY) { /* Userspace is not registered yet */ @@ -88,7 +88,7 @@ index a76e3db0d01f..b1446d51ef45 100644 vss_transaction.state = HVUTIL_HOSTMSG_RECEIVED; vss_send_op(); return; -@@ -356,8 +367,10 @@ hv_vss_init(struct hv_util_service *srv) +@@ -353,8 +364,10 @@ hv_vss_init(struct hv_util_service *srv) hvt = hvutil_transport_init(vss_devname, CN_VSS_IDX, CN_VSS_VAL, vss_on_msg, vss_on_reset); 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 4f8686446..fed3f6ddc 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 2cfda6eac2e1597529c8047ddc81b2f9acb8521d Mon Sep 17 00:00:00 2001 +From 5371f45540aeac631924e9bab7d6495208f50786 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:11 -0800 Subject: [PATCH 07/12] Drivers: hv: vss: Operation timeouts should match host @@ -18,7 +18,7 @@ Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c -index b1446d51ef45..4e543dbb731a 100644 +index 5c95ba1e2ecf..eee238cc60bd 100644 --- a/drivers/hv/hv_snapshot.c +++ b/drivers/hv/hv_snapshot.c @@ -31,7 +31,10 @@ @@ -33,7 +33,7 @@ index b1446d51ef45..4e543dbb731a 100644 /* * Global state maintained for transaction that is being processed. For a class -@@ -187,7 +190,8 @@ static void vss_send_op(void) +@@ -186,7 +189,8 @@ static void vss_send_op(void) vss_transaction.state = HVUTIL_USERSPACE_REQ; 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 d8536362b..7d9c271e4 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 ce256433a38cddf67f26bb0003bf2508b519388a Mon Sep 17 00:00:00 2001 +From 54fe1ea197bb6d2790792a90f8e8147056536d13 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:17 -0700 Subject: [PATCH 08/12] Drivers: hv: vmbus: Use all supported IC versions to @@ -162,7 +162,7 @@ index 8df02f3ca0b2..e7949b64bfbc 100644 negop->icversion_data[0].minor = icframe_minor; negop->icversion_data[1].major = icmsg_major; diff --git a/drivers/hv/hv_fcopy.c b/drivers/hv/hv_fcopy.c -index 75126e4e3f05..0713c6aaa33a 100644 +index 44420073edda..f1e0d0358206 100644 --- a/drivers/hv/hv_fcopy.c +++ b/drivers/hv/hv_fcopy.c @@ -31,6 +31,16 @@ @@ -182,7 +182,7 @@ index 75126e4e3f05..0713c6aaa33a 100644 /* * Global state maintained for transaction that is being processed. * For a class of integration services, including the "file copy service", -@@ -232,8 +242,6 @@ void hv_fcopy_onchannelcallback(void *context) +@@ -231,8 +241,6 @@ void hv_fcopy_onchannelcallback(void *context) u64 requestid; struct hv_fcopy_hdr *fcopy_msg; struct icmsg_hdr *icmsghdr; @@ -191,7 +191,7 @@ index 75126e4e3f05..0713c6aaa33a 100644 int fcopy_srv_version; if (fcopy_transaction.state > HVUTIL_READY) -@@ -247,10 +255,10 @@ void hv_fcopy_onchannelcallback(void *context) +@@ -246,10 +254,10 @@ void hv_fcopy_onchannelcallback(void *context) icmsghdr = (struct icmsg_hdr *)&recv_buffer[ sizeof(struct vmbuspipe_hdr)]; if (icmsghdr->icmsgtype == ICMSGTYPE_NEGOTIATE) { @@ -207,7 +207,7 @@ index 75126e4e3f05..0713c6aaa33a 100644 fcopy_msg = (struct hv_fcopy_hdr *)&recv_buffer[ sizeof(struct vmbuspipe_hdr) + diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c -index 3abfc5983c97..2cc670442f6c 100644 +index 5e1fdc8d32ab..70c28b8806de 100644 --- a/drivers/hv/hv_kvp.c +++ b/drivers/hv/hv_kvp.c @@ -46,6 +46,19 @@ @@ -230,7 +230,7 @@ index 3abfc5983c97..2cc670442f6c 100644 /* * Global state maintained for transaction that is being processed. For a class * of integration services, including the "KVP service", the specified protocol -@@ -610,8 +623,6 @@ void hv_kvp_onchannelcallback(void *context) +@@ -609,8 +622,6 @@ void hv_kvp_onchannelcallback(void *context) struct hv_kvp_msg *kvp_msg; struct icmsg_hdr *icmsghdrp; @@ -239,7 +239,7 @@ index 3abfc5983c97..2cc670442f6c 100644 int kvp_srv_version; static enum {NEGO_NOT_STARTED, NEGO_IN_PROGRESS, -@@ -640,28 +651,10 @@ void hv_kvp_onchannelcallback(void *context) +@@ -639,28 +650,10 @@ void hv_kvp_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { @@ -273,7 +273,7 @@ index 3abfc5983c97..2cc670442f6c 100644 kvp_msg = (struct hv_kvp_msg *)&recv_buffer[ sizeof(struct vmbuspipe_hdr) + diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c -index 4e543dbb731a..d14f10b924a0 100644 +index eee238cc60bd..8e62bf7f6265 100644 --- a/drivers/hv/hv_snapshot.c +++ b/drivers/hv/hv_snapshot.c @@ -31,6 +31,16 @@ @@ -293,7 +293,7 @@ index 4e543dbb731a..d14f10b924a0 100644 /* * Timeout values are based on expecations from host */ -@@ -297,7 +307,6 @@ void hv_vss_onchannelcallback(void *context) +@@ -296,7 +306,6 @@ void hv_vss_onchannelcallback(void *context) struct icmsg_hdr *icmsghdrp; @@ -301,7 +301,7 @@ index 4e543dbb731a..d14f10b924a0 100644 if (vss_transaction.state > HVUTIL_READY) return; -@@ -310,9 +319,10 @@ void hv_vss_onchannelcallback(void *context) +@@ -309,9 +318,10 @@ void hv_vss_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { 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 fe7264323..4f122669a 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 919ed3a9c042a7fd014110aa6ec9b0b4dfedb749 Mon Sep 17 00:00:00 2001 +From d9d31a33ca6d4b7680af0b2fa864460fa744077a Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:18 -0700 Subject: [PATCH 09/12] Drivers: hv: Log the negotiated IC versions. @@ -18,10 +18,10 @@ Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/drivers/hv/hv_fcopy.c b/drivers/hv/hv_fcopy.c -index 0713c6aaa33a..94f4f090ceea 100644 +index f1e0d0358206..e0ce0753c568 100644 --- a/drivers/hv/hv_fcopy.c +++ b/drivers/hv/hv_fcopy.c -@@ -255,10 +255,15 @@ void hv_fcopy_onchannelcallback(void *context) +@@ -254,10 +254,15 @@ void hv_fcopy_onchannelcallback(void *context) icmsghdr = (struct icmsg_hdr *)&recv_buffer[ sizeof(struct vmbuspipe_hdr)]; if (icmsghdr->icmsgtype == ICMSGTYPE_NEGOTIATE) { @@ -40,10 +40,10 @@ index 0713c6aaa33a..94f4f090ceea 100644 fcopy_msg = (struct hv_fcopy_hdr *)&recv_buffer[ sizeof(struct vmbuspipe_hdr) + diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c -index 2cc670442f6c..de263712e247 100644 +index 70c28b8806de..a1adfe2cfb34 100644 --- a/drivers/hv/hv_kvp.c +++ b/drivers/hv/hv_kvp.c -@@ -651,10 +651,14 @@ void hv_kvp_onchannelcallback(void *context) +@@ -650,10 +650,14 @@ void hv_kvp_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { @@ -61,10 +61,10 @@ index 2cc670442f6c..de263712e247 100644 kvp_msg = (struct hv_kvp_msg *)&recv_buffer[ sizeof(struct vmbuspipe_hdr) + diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c -index d14f10b924a0..bcc03f0748d6 100644 +index 8e62bf7f6265..e659d1b94a57 100644 --- a/drivers/hv/hv_snapshot.c +++ b/drivers/hv/hv_snapshot.c -@@ -304,7 +304,7 @@ void hv_vss_onchannelcallback(void *context) +@@ -303,7 +303,7 @@ void hv_vss_onchannelcallback(void *context) u32 recvlen; u64 requestid; struct hv_vss_msg *vss_msg; @@ -73,7 +73,7 @@ index d14f10b924a0..bcc03f0748d6 100644 struct icmsg_hdr *icmsghdrp; -@@ -319,10 +319,15 @@ void hv_vss_onchannelcallback(void *context) +@@ -318,10 +318,15 @@ void hv_vss_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { 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 a56a47309..67fa80168 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 ecd9adcba4da55f85247cd1ca6507e4f4786eb34 Mon Sep 17 00:00:00 2001 +From c5e60faa9376ce0ca54cbbe0f4e979b31d40fe85 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sun, 26 Mar 2017 16:42:20 +0800 Subject: [PATCH 10/12] 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 ad090cba8..b8d3f6bde 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 25dc167a82ccf312e6b3bac682637acefc53262f Mon Sep 17 00:00:00 2001 +From 3f509ad6cb3d8a128bab8d9b048cdbbc51c2565e Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 29 Mar 2017 18:37:10 +0800 Subject: [PATCH 11/12] 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 bb57c3b52..e6d827479 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 283bd035d158afe9b99d7842c4f9e42e026c19eb Mon Sep 17 00:00:00 2001 +From f485fbcfe0eae520e92f162dbf9132511b47cfa9 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 24 Mar 2017 20:53:18 +0800 Subject: [PATCH 12/12] vmbus: dynamically enqueue/dequeue the channel on