rebase patches on top of Ubuntu-6.5.0-32.32
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
cedbc0c701
commit
28fb508c82
@ -75,7 +75,7 @@ index 90ddf08e8409..eedfabda597f 100644
|
|||||||
Safety option to keep boot IRQs enabled. This
|
Safety option to keep boot IRQs enabled. This
|
||||||
should never be necessary.
|
should never be necessary.
|
||||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||||
index 47e8ee1f6429..6c7351c444b0 100644
|
index c7a5718e5729..901f55b9ac64 100644
|
||||||
--- a/drivers/pci/quirks.c
|
--- a/drivers/pci/quirks.c
|
||||||
+++ b/drivers/pci/quirks.c
|
+++ b/drivers/pci/quirks.c
|
||||||
@@ -287,6 +287,106 @@ static int __init pci_apply_final_quirks(void)
|
@@ -287,6 +287,106 @@ static int __init pci_apply_final_quirks(void)
|
||||||
@ -185,7 +185,7 @@ index 47e8ee1f6429..6c7351c444b0 100644
|
|||||||
/*
|
/*
|
||||||
* Decoding should be disabled for a PCI device during BAR sizing to avoid
|
* 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
|
* conflict. But doing so may cause problems on host bridge and perhaps other
|
||||||
@@ -5075,6 +5175,8 @@ static const struct pci_dev_acs_enabled {
|
@@ -5091,6 +5191,8 @@ static const struct pci_dev_acs_enabled {
|
||||||
{ PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs },
|
{ PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs },
|
||||||
/* APM X-Gene */
|
/* APM X-Gene */
|
||||||
{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
|
{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
|
||||||
|
@ -14,7 +14,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/net/core/dev.c b/net/core/dev.c
|
diff --git a/net/core/dev.c b/net/core/dev.c
|
||||||
index 855173c77581..80b4a639c32c 100644
|
index 4811937f572d..8850f9be9044 100644
|
||||||
--- a/net/core/dev.c
|
--- a/net/core/dev.c
|
||||||
+++ b/net/core/dev.c
|
+++ b/net/core/dev.c
|
||||||
@@ -10355,7 +10355,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list)
|
@@ -10355,7 +10355,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list)
|
||||||
|
@ -1,57 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sean Christopherson <seanjc@google.com>
|
|
||||||
Date: Wed, 18 Oct 2023 12:41:03 -0700
|
|
||||||
Subject: [PATCH] Revert "nSVM: Check for reserved encodings of TLB_CONTROL in
|
|
||||||
nested VMCB"
|
|
||||||
|
|
||||||
Revert KVM's made-up consistency check on SVM's TLB control. The APM says
|
|
||||||
that unsupported encodings are reserved, but the APM doesn't state that
|
|
||||||
VMRUN checks for a supported encoding. Unless something is called out
|
|
||||||
in "Canonicalization and Consistency Checks" or listed as MBZ (Must Be
|
|
||||||
Zero), AMD behavior is typically to let software shoot itself in the foot.
|
|
||||||
|
|
||||||
This reverts commit 174a921b6975ef959dd82ee9e8844067a62e3ec1.
|
|
||||||
|
|
||||||
Fixes: 174a921b6975 ("nSVM: Check for reserved encodings of TLB_CONTROL in nested VMCB")
|
|
||||||
Reported-by: Stefan Sterz <s.sterz@proxmox.com>
|
|
||||||
Closes: https://lkml.kernel.org/r/b9915c9c-4cf6-051a-2d91-44cc6380f455%40proxmox.com
|
|
||||||
Cc: stable@vger.kernel.org
|
|
||||||
Signed-off-by: Sean Christopherson <seanjc@google.com>
|
|
||||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
||||||
---
|
|
||||||
arch/x86/kvm/svm/nested.c | 15 ---------------
|
|
||||||
1 file changed, 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
|
|
||||||
index 36482780a42f..43481f26a34b 100644
|
|
||||||
--- a/arch/x86/kvm/svm/nested.c
|
|
||||||
+++ b/arch/x86/kvm/svm/nested.c
|
|
||||||
@@ -247,18 +247,6 @@ static bool nested_svm_check_bitmap_pa(struct kvm_vcpu *vcpu, u64 pa, u32 size)
|
|
||||||
kvm_vcpu_is_legal_gpa(vcpu, addr + size - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static bool nested_svm_check_tlb_ctl(struct kvm_vcpu *vcpu, u8 tlb_ctl)
|
|
||||||
-{
|
|
||||||
- /* Nested FLUSHBYASID is not supported yet. */
|
|
||||||
- switch(tlb_ctl) {
|
|
||||||
- case TLB_CONTROL_DO_NOTHING:
|
|
||||||
- case TLB_CONTROL_FLUSH_ALL_ASID:
|
|
||||||
- return true;
|
|
||||||
- default:
|
|
||||||
- return false;
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu,
|
|
||||||
struct vmcb_ctrl_area_cached *control)
|
|
||||||
{
|
|
||||||
@@ -278,9 +266,6 @@ static bool __nested_vmcb_check_controls(struct kvm_vcpu *vcpu,
|
|
||||||
IOPM_SIZE)))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
- if (CC(!nested_svm_check_tlb_ctl(vcpu, control->tlb_ctl)))
|
|
||||||
- return false;
|
|
||||||
-
|
|
||||||
if (CC((control->int_ctl & V_NMI_ENABLE_MASK) &&
|
|
||||||
!vmcb12_is_intercept(control, INTERCEPT_NMI))) {
|
|
||||||
return false;
|
|
@ -23,7 +23,7 @@ Signed-off-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
|
|||||||
1 file changed, 13 insertions(+), 8 deletions(-)
|
1 file changed, 13 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
|
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
|
||||||
index 5246b408cf0c..e3b942664842 100644
|
index 2690d47a9ea2..9ff8ea02f79d 100644
|
||||||
--- a/fs/ext4/mballoc.c
|
--- a/fs/ext4/mballoc.c
|
||||||
+++ b/fs/ext4/mballoc.c
|
+++ b/fs/ext4/mballoc.c
|
||||||
@@ -2894,14 +2894,19 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)
|
@@ -2894,14 +2894,19 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)
|
Loading…
Reference in New Issue
Block a user