rebase patches on top of Ubuntu-5.0.0-22.23

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

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
index fff419e79318aaffa224c09c0e5db0048e46e0ee..5dfdc4340b3837887eb05c8b0a5ba0cf011254c0 100644 (file)
--- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
+++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
@@ -75,7 +75,7 @@ index 6de806c2e26c..a81214deec04 100644
                                Safety option to keep boot IRQs enabled. This
                                should never be necessary.
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 9ced8797ec1d..a9860b97e616 100644
+index c641af59dd41..67aeb07271fe 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
@@ -185,7 +185,7 @@ index 9ced8797ec1d..a9860b97e616 100644
  /*
   * Decoding should be disabled for a PCI device during BAR sizing to avoid
   * conflict. But doing so may cause problems on host bridge and perhaps other
-@@ -4549,6 +4649,8 @@ static const struct pci_dev_acs_enabled {
+@@ -4546,6 +4646,8 @@ static const struct pci_dev_acs_enabled {
        { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
        /* APM X-Gene */
        { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },

diff --git a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
index 3e30c3cc759c272acf4998e09cd7b0e966fb301e..14090acf0839c8cc6d411a68d3f67e2f686648d4 100644 (file)
--- a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
+++ b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index b4f2d892a1d3..414fcd130126 100644
+index b5238bcba72c..45851daaadbf 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -77,7 +77,7 @@ module_param(halt_poll_ns, uint, 0644);

diff --git a/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch
index 7e5c8dff782a8b8cbaaa6ff911be75bad4eee217..cd3599d62dfd7dfc544e5299f6b326cdd2b06935 100644 (file)
--- a/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch
+++ b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch
@@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
-index f14248f584b3..3c0972eb9e93 100644
+index df6e325b288b..2874cb9c41f5 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);

diff --git a/patches/kernel/0006-rbd-don-t-assert-on-writes-to-snapshots.patch b/patches/kernel/0006-rbd-don-t-assert-on-writes-to-snapshots.patch
new file mode 100644 (file)
index 0000000..0a69d63
--- /dev/null
+++ b/patches/kernel/0006-rbd-don-t-assert-on-writes-to-snapshots.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ilya Dryomov <idryomov@gmail.com>
+Date: Fri, 3 May 2019 17:27:03 +0200
+Subject: [PATCH] rbd: don't assert on writes to snapshots
+
+The check added in commit 721c7fc701c7 ("block: fail op_is_write()
+requests to read-only partitions") was lifted in commit a32e236eb93e
+("Partially revert "block: fail op_is_write() requests to read-only
+partitions"").  Basic things like user triggered writes and discards
+are still caught, but internal kernel users can submit anything.  In
+particular, ext4 will attempt to write to the superblock if it detects
+errors in the filesystem, even if the filesystem is mounted read-only
+on a read-only partition.
+
+The assert is overkill regardless.
+
+Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ drivers/block/rbd.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
+index 1e92b61d0bd5..339cdd4062bb 100644
+--- a/drivers/block/rbd.c
++++ b/drivers/block/rbd.c
+@@ -3664,8 +3664,12 @@ static void rbd_queue_workfn(struct work_struct *work)
+               goto err_rq;
+       }
+ 
+-      rbd_assert(op_type == OBJ_OP_READ ||
+-                 rbd_dev->spec->snap_id == CEPH_NOSNAP);
++      if (op_type != OBJ_OP_READ && rbd_dev->spec->snap_id != CEPH_NOSNAP) {
++              rbd_warn(rbd_dev, "%s on read-only snapshot",
++                       obj_op_name(op_type));
++              result = -EIO;
++              goto err;
++      }
+ 
+       /*
+        * Quit early if the mapped snapshot no longer exists.  It's

diff --git a/patches/kernel/0007-rbd-don-t-assert-on-writes-to-snapshots.patch b/patches/kernel/0007-rbd-don-t-assert-on-writes-to-snapshots.patch
deleted file mode 100644 (file)
index 0a69d63..0000000
--- a/patches/kernel/0007-rbd-don-t-assert-on-writes-to-snapshots.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ilya Dryomov <idryomov@gmail.com>
-Date: Fri, 3 May 2019 17:27:03 +0200
-Subject: [PATCH] rbd: don't assert on writes to snapshots
-
-The check added in commit 721c7fc701c7 ("block: fail op_is_write()
-requests to read-only partitions") was lifted in commit a32e236eb93e
-("Partially revert "block: fail op_is_write() requests to read-only
-partitions"").  Basic things like user triggered writes and discards
-are still caught, but internal kernel users can submit anything.  In
-particular, ext4 will attempt to write to the superblock if it detects
-errors in the filesystem, even if the filesystem is mounted read-only
-on a read-only partition.
-
-The assert is overkill regardless.
-
-Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- drivers/block/rbd.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
-index 1e92b61d0bd5..339cdd4062bb 100644
---- a/drivers/block/rbd.c
-+++ b/drivers/block/rbd.c
-@@ -3664,8 +3664,12 @@ static void rbd_queue_workfn(struct work_struct *work)
-               goto err_rq;
-       }
- 
--      rbd_assert(op_type == OBJ_OP_READ ||
--                 rbd_dev->spec->snap_id == CEPH_NOSNAP);
-+      if (op_type != OBJ_OP_READ && rbd_dev->spec->snap_id != CEPH_NOSNAP) {
-+              rbd_warn(rbd_dev, "%s on read-only snapshot",
-+                       obj_op_name(op_type));
-+              result = -EIO;
-+              goto err;
-+      }
- 
-       /*
-        * Quit early if the mapped snapshot no longer exists.  It's