From d42edf2d6212947643aa8694546b290e857b40c5 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 8 Jun 2018 00:16:21 +0000 Subject: [PATCH] sys-kernel/coreos-sources: Backport an Azure net driver fix to 4.16 --- ...ebuild => coreos-kernel-4.16.14-r1.ebuild} | 2 +- ...build => coreos-modules-4.16.14-r1.ebuild} | 2 +- ...build => coreos-sources-4.16.14-r1.ebuild} | 1 + ...lative-path-for-KBUILD_SRC-from-CURD.patch | 2 +- .../z0002-Add-arm64-coreos-verity-hash.patch | 2 +- ...kefile-Don-t-fail-on-fallthrough-wit.patch | 2 +- ...e-a-different-mixing-algorithm-for-a.patch | 2 +- ...05-Revert-random-fix-crng_ready-test.patch | 2 +- ...ont-Fix-race-between-device-setup-an.patch | 2 +- ...network-regression-after-ifdown-ifup.patch | 43 +++++++++++++++++++ 10 files changed, 52 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.16.14.ebuild => coreos-kernel-4.16.14-r1.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.16.14.ebuild => coreos-modules-4.16.14-r1.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.16.14.ebuild => coreos-sources-4.16.14-r1.ebuild} (94%) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0007-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.16.14.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.14-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.14.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.14-r1.ebuild index 77eaa0bc62..b66d13b93c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.14.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.16.14-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.16.14.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.16.14-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.16.14.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.16.14-r1.ebuild index 685aa802e6..6c70281dca 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.16.14.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.16.14-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.16.14.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.16.14-r1.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.16.14.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.16.14-r1.ebuild index d093d750e9..575c6df223 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.16.14.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.16.14-r1.ebuild @@ -41,4 +41,5 @@ UNIPATCH_LIST=" ${PATCH_DIR}/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch \ ${PATCH_DIR}/z0005-Revert-random-fix-crng_ready-test.patch \ ${PATCH_DIR}/z0006-Revert-xen-netfront-Fix-race-between-device-setup-an.patch \ + ${PATCH_DIR}/z0007-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.16/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.16/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch index ae9b12894e..b22f3f8c6d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/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.16/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -1,7 +1,7 @@ From e988d32ad0be491ed638b405803d6d90f4e0983c Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/6] kbuild: derive relative path for KBUILD_SRC from CURDIR +Subject: [PATCH 1/7] 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.16/z0002-Add-arm64-coreos-verity-hash.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0002-Add-arm64-coreos-verity-hash.patch index 5e32ea9b2b..2ce05160ac 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0002-Add-arm64-coreos-verity-hash.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0002-Add-arm64-coreos-verity-hash.patch @@ -1,7 +1,7 @@ From 13637bc042a3637121bb42e98afee1bcb64ffb52 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Fri, 11 Nov 2016 17:28:52 -0800 -Subject: [PATCH 2/6] Add arm64 coreos verity hash +Subject: [PATCH 2/7] 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.16/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch index 249425aabe..df48336d9b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch @@ -1,7 +1,7 @@ From bdb78a5c8dac2aa636a3e6a9a45f2919643e3607 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 21:23:12 -0500 -Subject: [PATCH 3/6] tools/objtool/Makefile: Don't fail on fallthrough with +Subject: [PATCH 3/7] 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.16/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch index c603598ccc..6b8c369082 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch @@ -1,7 +1,7 @@ From b6b0a705fb6a55b8f8eaeb4af83a344a8127dd7d Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 2 May 2018 15:16:29 -0400 -Subject: [PATCH 4/6] Revert "random: use a different mixing algorithm for +Subject: [PATCH 4/7] Revert "random: use a different mixing algorithm for add_device_randomness()" This reverts commit 89b59f050347d376c2ace8b1ceb908a218cfdc2e. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0005-Revert-random-fix-crng_ready-test.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0005-Revert-random-fix-crng_ready-test.patch index a6fbed0654..99906dc58b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0005-Revert-random-fix-crng_ready-test.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0005-Revert-random-fix-crng_ready-test.patch @@ -1,7 +1,7 @@ From 987574c9a8aacb5037b1d2e738047362664c75e0 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 2 May 2018 15:18:03 -0400 -Subject: [PATCH 5/6] Revert "random: fix crng_ready() test" +Subject: [PATCH 5/7] Revert "random: fix crng_ready() test" This reverts commit cd8d7a5778a4abf76ee8fe8f1bfcf78976029f8d. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0006-Revert-xen-netfront-Fix-race-between-device-setup-an.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0006-Revert-xen-netfront-Fix-race-between-device-setup-an.patch index f0b1cd7914..9b31f82d04 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0006-Revert-xen-netfront-Fix-race-between-device-setup-an.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0006-Revert-xen-netfront-Fix-race-between-device-setup-an.patch @@ -1,7 +1,7 @@ From d2aca47ce3032da206665265a90909ea3d4d7d92 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Wed, 30 May 2018 17:50:37 -0700 -Subject: [PATCH 6/6] Revert "xen-netfront: Fix race between device setup and +Subject: [PATCH 6/7] Revert "xen-netfront: Fix race between device setup and open" This reverts commit f599c64fdf7d9c108e8717fb04bc41c680120da4. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0007-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0007-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch new file mode 100644 index 0000000000..da5dc62707 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0007-hv_netvsc-Fix-a-network-regression-after-ifdown-ifup.patch @@ -0,0 +1,43 @@ +From 9c7946f2aa97ce59d71f41052ef3a8b76b35ea72 Mon Sep 17 00:00:00 2001 +From: Dexuan Cui +Date: Wed, 6 Jun 2018 21:32:51 +0000 +Subject: [PATCH 7/7] 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 2a7752c113df..adbfa82b76e9 100644 +--- a/drivers/net/hyperv/netvsc_drv.c ++++ b/drivers/net/hyperv/netvsc_drv.c +@@ -126,8 +126,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 +