From 16783aa5e2c5d68ccb1aab7091e01bb0e07924f9 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 8 Jun 2018 00:14:39 +0000 Subject: [PATCH] sys-kernel/coreos-sources: Backport an Azure net driver fix to 4.14 --- ...ebuild => coreos-kernel-4.14.48-r1.ebuild} | 2 +- ...build => coreos-modules-4.14.48-r1.ebuild} | 2 +- ...build => coreos-sources-4.14.48-r1.ebuild} | 1 + ...lative-path-for-KBUILD_SRC-from-CURD.patch | 2 +- .../z0002-Add-arm64-coreos-verity-hash.patch | 2 +- ...factor-out-__blkdev_issue_zero_pages.patch | 2 +- ...WRITE-ZEROES-failing-in-blkdev_issue.patch | 2 +- ...kefile-Don-t-fail-on-fallthrough-wit.patch | 2 +- ...e-a-different-mixing-algorithm-for-a.patch | 2 +- ...07-Revert-random-fix-crng_ready-test.patch | 2 +- ...ont-Fix-race-between-device-setup-an.patch | 2 +- ...network-regression-after-ifdown-ifup.patch | 43 +++++++++++++++++++ 12 files changed, 54 insertions(+), 10 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.14.48.ebuild => coreos-kernel-4.14.48-r1.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.14.48.ebuild => coreos-modules-4.14.48-r1.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.14.48.ebuild => coreos-sources-4.14.48-r1.ebuild} (95%) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0009-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.48.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.48-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.48.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.48-r1.ebuild index 77eaa0bc62..b66d13b93c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.48.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.14.48-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="" +COREOS_SOURCE_REVISION="-r1" inherit coreos-kernel DESCRIPTION="CoreOS Linux kernel" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.48.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.48-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.48.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.48-r1.ebuild index 685aa802e6..6c70281dca 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.48.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.14.48-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -COREOS_SOURCE_REVISION="" +COREOS_SOURCE_REVISION="-r1" inherit coreos-kernel savedconfig DESCRIPTION="CoreOS Linux kernel modules" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.48.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.48-r1.ebuild similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.48.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.48-r1.ebuild index 9c2d2cc852..2fb3865dac 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.48.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.48-r1.ebuild @@ -39,4 +39,5 @@ UNIPATCH_LIST=" ${PATCH_DIR}/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch \ ${PATCH_DIR}/z0007-Revert-random-fix-crng_ready-test.patch \ ${PATCH_DIR}/z0008-Revert-xen-netfront-Fix-race-between-device-setup-an.patch \ + ${PATCH_DIR}/z0009-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index caf53e1be0..49deb360dc 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,7 +1,7 @@ From 85863eb69634ad8d611e12dd472f8d7f139af69c Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/8] kbuild: derive relative path for KBUILD_SRC from CURDIR +Subject: [PATCH 1/9] kbuild: derive relative path for KBUILD_SRC from CURDIR This enables relocating source and build trees to different roots, provided they stay reachable relative to one another. Useful for diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch index 372c63bce9..8aa06fc177 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch @@ -1,7 +1,7 @@ From 661b1e34bcb98f85d5c6f1fbc0fa2874fa7ecc79 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 11 Nov 2016 17:28:52 -0800 -Subject: [PATCH 2/8] Add arm64 coreos verity hash +Subject: [PATCH 2/9] Add arm64 coreos verity hash Signed-off-by: Geoff Levand --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch index 7a5bdd174d..930dad628b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch @@ -1,7 +1,7 @@ From 3ecce65db8ffa2146e5d0a87923a6cdfe07e923c Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 16 Oct 2017 15:59:09 +0200 -Subject: [PATCH 3/8] block: factor out __blkdev_issue_zero_pages() +Subject: [PATCH 3/9] block: factor out __blkdev_issue_zero_pages() blkdev_issue_zeroout() will use this in !BLKDEV_ZERO_NOFALLBACK case. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch index 2e41ca1e1a..f3e7af2bf7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch @@ -1,7 +1,7 @@ From 61610a47fe443a5284873c710f3fdf7c50066310 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 16 Oct 2017 15:59:10 +0200 -Subject: [PATCH 4/8] block: cope with WRITE ZEROES failing in +Subject: [PATCH 4/9] block: cope with WRITE ZEROES failing in blkdev_issue_zeroout() sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 9eea68f97b..2ab070af5b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,7 +1,7 @@ From d7271cac112546fab49643d19dca96f9cd060d85 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 -Subject: [PATCH 5/8] tools/objtool/Makefile: Don't fail on fallthrough with +Subject: [PATCH 5/9] tools/objtool/Makefile: Don't fail on fallthrough with new GCCs --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch index 2c27032e60..08f1d5db5b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch @@ -1,7 +1,7 @@ From 10ef317e18e3ca2313fdf177ce798fea5efe0c91 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 2 May 2018 15:16:29 -0400 -Subject: [PATCH 6/8] Revert "random: use a different mixing algorithm for +Subject: [PATCH 6/9] Revert "random: use a different mixing algorithm for add_device_randomness()" This reverts commit 7b6b1f3a192372937164d1293b432c640ffc7c8f. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-Revert-random-fix-crng_ready-test.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-Revert-random-fix-crng_ready-test.patch index e9ebe22c9b..44ced6ce4e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-Revert-random-fix-crng_ready-test.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-Revert-random-fix-crng_ready-test.patch @@ -1,7 +1,7 @@ From bd0cf1510de786bd0840bd11250b1563431c4d96 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 2 May 2018 15:18:03 -0400 -Subject: [PATCH 7/8] Revert "random: fix crng_ready() test" +Subject: [PATCH 7/9] Revert "random: fix crng_ready() test" This reverts commit 6e513bc20ca63f594632eca4e1968791240b8f18. --- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0008-Revert-xen-netfront-Fix-race-between-device-setup-an.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0008-Revert-xen-netfront-Fix-race-between-device-setup-an.patch index 43b185f0a3..b681695210 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0008-Revert-xen-netfront-Fix-race-between-device-setup-an.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0008-Revert-xen-netfront-Fix-race-between-device-setup-an.patch @@ -1,7 +1,7 @@ From 2f5ffebbbb7859c7a83c9a3dfad205445d640b71 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Wed, 30 May 2018 17:45:35 -0700 -Subject: [PATCH 8/8] Revert "xen-netfront: Fix race between device setup and +Subject: [PATCH 8/9] Revert "xen-netfront: Fix race between device setup and open" This reverts commit 70f3461c23ffb394676cb53c2eb1095208a52327. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0009-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0009-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch new file mode 100644 index 0000000000..f679be851d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0009-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch @@ -0,0 +1,43 @@ +From ea2f94c7ae1ee12d97ea1e540219ef617be883c9 Mon Sep 17 00:00:00 2001 +From: Dexuan Cui +Date: Wed, 6 Jun 2018 21:32:51 +0000 +Subject: [PATCH 9/9] hv_netvsc: Fix a network regression after ifdown/ifup + +Recently people reported the NIC stops working after +"ifdown eth0; ifup eth0". It turns out in this case the TX queues are not +enabled, after the refactoring of the common detach logic: when the NIC +has sub-channels, usually we enable all the TX queues after all +sub-channels are set up: see rndis_set_subchannel() -> +netif_device_attach(), but in the case of "ifdown eth0; ifup eth0" where +the number of channels doesn't change, we also must make sure the TX queues +are enabled. The patch fixes the regression. + +Fixes: 7b2ee50c0cd5 ("hv_netvsc: common detach logic") +Signed-off-by: Dexuan Cui +Cc: Stephen Hemminger +Cc: K. Y. Srinivasan +Cc: Haiyang Zhang +Signed-off-by: David S. Miller +--- + drivers/net/hyperv/netvsc_drv.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c +index 3a7241c8713c..6890478a0851 100644 +--- a/drivers/net/hyperv/netvsc_drv.c ++++ b/drivers/net/hyperv/netvsc_drv.c +@@ -123,8 +123,10 @@ static int netvsc_open(struct net_device *net) + } + + rdev = nvdev->extension; +- if (!rdev->link_state) ++ if (!rdev->link_state) { + netif_carrier_on(net); ++ netif_tx_wake_all_queues(net); ++ } + + if (vf_netdev) { + /* Setting synthetic device up transparently sets +-- +2.14.4 +