Browse Source

rebase patches on top of Ubuntu-5.0.0-28.30

(generated with debian/scripts/import-upstream-tag)

Signed-off-by: Thomas Lamprecht <[email protected]>
Thomas Lamprecht 6 năm trước cách đây
mục cha
commit
b671e62ef8

+ 1 - 1
patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch

@@ -55,7 +55,7 @@ Signed-off-by: Thomas Lamprecht <[email protected]>
  2 files changed, 111 insertions(+)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index b1645c11b384..2e19a7b0bea6 100644
+index 3dda6833f586..241de26a2f17 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
 @@ -3287,6 +3287,15 @@

+ 1 - 1
patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch

@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 4cc0d8a46891..c0a9369be8be 100644
+index f48f911d4663..5d906fc47e98 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -77,7 +77,7 @@ module_param(halt_poll_ns, uint, 0644);

+ 1 - 1
patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch

@@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
-index df6e325b288b..2874cb9c41f5 100644
+index fb467d310c99..3759f52b5966 100644
 --- a/arch/x86/kvm/vmx/vmx.c
 +++ b/arch/x86/kvm/vmx/vmx.c
 @@ -106,7 +106,7 @@ module_param(enable_apicv, bool, S_IRUGO);

+ 0 - 40
patches/kernel/0007-vhost_net-disable-zerocopy-by-default.patch

@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Wang <[email protected]>
-Date: Mon, 17 Jun 2019 05:20:54 -0400
-Subject: [PATCH] vhost_net: disable zerocopy by default
-
-[ Upstream commit 098eadce3c622c07b328d0a43dda379b38cf7c5e ]
-
-Vhost_net was known to suffer from HOL[1] issues which is not easy to
-fix. Several downstream disable the feature by default. What's more,
-the datapath was split and datacopy path got the support of batching
-and XDP support recently which makes it faster than zerocopy part for
-small packets transmission.
-
-It looks to me that disable zerocopy by default is more
-appropriate. It cold be enabled by default again in the future if we
-fix the above issues.
-
-[1] https://patchwork.kernel.org/patch/3787671/
-
-Signed-off-by: Jason Wang <[email protected]>
-Acked-by: Michael S. Tsirkin <[email protected]>
-Signed-off-by: David S. Miller <[email protected]>
-Signed-off-by: Sasha Levin <[email protected]>
----
- drivers/vhost/net.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
-index 2d9df786a9d3..21e0805e5e60 100644
---- a/drivers/vhost/net.c
-+++ b/drivers/vhost/net.c
-@@ -36,7 +36,7 @@
- 
- #include "vhost.h"
- 
--static int experimental_zcopytx = 1;
-+static int experimental_zcopytx = 0;
- module_param(experimental_zcopytx, int, 0444);
- MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;"
- 		                       " 1 -Enable; 0 - Disable");