From 1920ff7faa64133ac9dd03e14f943afa6ace88f7 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 9 Sep 2024 08:43:37 -0400 Subject: [PATCH] Drop irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch Signed-off-by: Sasha Levin --- ...ake-sure-a-vpe-is-locked-when-vmapp-.patch | 53 ------------------- queue-6.1/series | 1 - ...ake-sure-a-vpe-is-locked-when-vmapp-.patch | 53 ------------------- queue-6.10/series | 1 - ...ake-sure-a-vpe-is-locked-when-vmapp-.patch | 53 ------------------- queue-6.6/series | 1 - 6 files changed, 162 deletions(-) delete mode 100644 queue-6.1/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch delete mode 100644 queue-6.10/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch delete mode 100644 queue-6.6/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch diff --git a/queue-6.1/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch b/queue-6.1/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch deleted file mode 100644 index 790ca5acc65..00000000000 --- a/queue-6.1/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 95832f86976b9c6720c01a74fd38f07c03e4c787 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 5 Jul 2024 10:31:55 +0100 -Subject: irqchip/gic-v4: Make sure a VPE is locked when VMAPP is issued - -From: Marc Zyngier - -[ Upstream commit a84a07fa3100d7ad46a3d6882af25a3df9c9e7e3 ] - -In order to make sure that vpe->col_idx is correctly sampled when a VMAPP -command is issued, the vpe_lock must be held for the VPE. This is now -possible since the introduction of the per-VM vmapp_lock, which can be -taken before vpe_lock in the correct locking order. - -Signed-off-by: Marc Zyngier -Signed-off-by: Thomas Gleixner -Tested-by: Nianyao Tang -Link: https://lore.kernel.org/r/20240705093155.871070-4-maz@kernel.org -Signed-off-by: Sasha Levin ---- - drivers/irqchip/irq-gic-v3-its.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index 009e0fb43738..81c91035687a 100644 ---- a/drivers/irqchip/irq-gic-v3-its.c -+++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -1801,7 +1801,9 @@ static void its_map_vm(struct its_node *its, struct its_vm *vm) - for (i = 0; i < vm->nr_vpes; i++) { - struct its_vpe *vpe = vm->vpes[i]; - -- its_send_vmapp(its, vpe, true); -+ scoped_guard(raw_spinlock, &vpe->vpe_lock) -+ its_send_vmapp(its, vpe, true); -+ - its_send_vinvall(its, vpe); - } - } -@@ -1822,8 +1824,10 @@ static void its_unmap_vm(struct its_node *its, struct its_vm *vm) - if (!--vm->vlpi_count[its->list_nr]) { - int i; - -- for (i = 0; i < vm->nr_vpes; i++) -+ for (i = 0; i < vm->nr_vpes; i++) { -+ guard(raw_spinlock)(&vm->vpes[i]->vpe_lock); - its_send_vmapp(its, vm->vpes[i], false); -+ } - } - - raw_spin_unlock_irqrestore(&vmovp_lock, flags); --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index bafb71751b7..2e0a1d96d76 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -113,7 +113,6 @@ riscv-set-trap-vector-earlier.patch pci-add-missing-bridge-lock-to-pci_bus_lock.patch tcp-don-t-drop-syn-ack-for-simultaneous-connect.patch net-dpaa-avoid-on-stack-arrays-of-nr_cpus-elements.patch -irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch i3c-mipi-i3c-hci-error-out-instead-on-bug_on-in-ibi-.patch kselftests-dmabuf-heaps-ensure-the-driver-name-is-nu.patch btrfs-initialize-location-to-fix-wmaybe-uninitialize.patch diff --git a/queue-6.10/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch b/queue-6.10/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch deleted file mode 100644 index a6b004aa3b7..00000000000 --- a/queue-6.10/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch +++ /dev/null @@ -1,53 +0,0 @@ -From abc4c9e0864960d0d138a410ae1c57118bdeaa39 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 5 Jul 2024 10:31:55 +0100 -Subject: irqchip/gic-v4: Make sure a VPE is locked when VMAPP is issued - -From: Marc Zyngier - -[ Upstream commit a84a07fa3100d7ad46a3d6882af25a3df9c9e7e3 ] - -In order to make sure that vpe->col_idx is correctly sampled when a VMAPP -command is issued, the vpe_lock must be held for the VPE. This is now -possible since the introduction of the per-VM vmapp_lock, which can be -taken before vpe_lock in the correct locking order. - -Signed-off-by: Marc Zyngier -Signed-off-by: Thomas Gleixner -Tested-by: Nianyao Tang -Link: https://lore.kernel.org/r/20240705093155.871070-4-maz@kernel.org -Signed-off-by: Sasha Levin ---- - drivers/irqchip/irq-gic-v3-its.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index a00c5e8c4ea6..eb906d3789b1 100644 ---- a/drivers/irqchip/irq-gic-v3-its.c -+++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -1810,7 +1810,9 @@ static void its_map_vm(struct its_node *its, struct its_vm *vm) - for (i = 0; i < vm->nr_vpes; i++) { - struct its_vpe *vpe = vm->vpes[i]; - -- its_send_vmapp(its, vpe, true); -+ scoped_guard(raw_spinlock, &vpe->vpe_lock) -+ its_send_vmapp(its, vpe, true); -+ - its_send_vinvall(its, vpe); - } - } -@@ -1831,8 +1833,10 @@ static void its_unmap_vm(struct its_node *its, struct its_vm *vm) - if (!--vm->vlpi_count[its->list_nr]) { - int i; - -- for (i = 0; i < vm->nr_vpes; i++) -+ for (i = 0; i < vm->nr_vpes; i++) { -+ guard(raw_spinlock)(&vm->vpes[i]->vpe_lock); - its_send_vmapp(its, vm->vpes[i], false); -+ } - } - - raw_spin_unlock_irqrestore(&vmovp_lock, flags); --- -2.43.0 - diff --git a/queue-6.10/series b/queue-6.10/series index e3848c4ed2b..c2721b8367a 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -250,7 +250,6 @@ pci-add-missing-bridge-lock-to-pci_bus_lock.patch tcp-don-t-drop-syn-ack-for-simultaneous-connect.patch bluetooth-btnxpuart-fix-null-pointer-dereference-in-.patch net-dpaa-avoid-on-stack-arrays-of-nr_cpus-elements.patch -irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch drm-amdgpu-add-mutex-to-protect-ras-shared-memory.patch loongarch-use-correct-api-to-map-cmdline-in-relocate.patch regmap-maple-work-around-gcc-14.1-false-positive-war.patch diff --git a/queue-6.6/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch b/queue-6.6/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch deleted file mode 100644 index fd8b1dbb0e3..00000000000 --- a/queue-6.6/irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1a232324773145ff7ce59b6a1b52b3247223f9d4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 5 Jul 2024 10:31:55 +0100 -Subject: irqchip/gic-v4: Make sure a VPE is locked when VMAPP is issued - -From: Marc Zyngier - -[ Upstream commit a84a07fa3100d7ad46a3d6882af25a3df9c9e7e3 ] - -In order to make sure that vpe->col_idx is correctly sampled when a VMAPP -command is issued, the vpe_lock must be held for the VPE. This is now -possible since the introduction of the per-VM vmapp_lock, which can be -taken before vpe_lock in the correct locking order. - -Signed-off-by: Marc Zyngier -Signed-off-by: Thomas Gleixner -Tested-by: Nianyao Tang -Link: https://lore.kernel.org/r/20240705093155.871070-4-maz@kernel.org -Signed-off-by: Sasha Levin ---- - drivers/irqchip/irq-gic-v3-its.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c -index e25dea0e50c7..1e0f0e1bf481 100644 ---- a/drivers/irqchip/irq-gic-v3-its.c -+++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -1804,7 +1804,9 @@ static void its_map_vm(struct its_node *its, struct its_vm *vm) - for (i = 0; i < vm->nr_vpes; i++) { - struct its_vpe *vpe = vm->vpes[i]; - -- its_send_vmapp(its, vpe, true); -+ scoped_guard(raw_spinlock, &vpe->vpe_lock) -+ its_send_vmapp(its, vpe, true); -+ - its_send_vinvall(its, vpe); - } - } -@@ -1825,8 +1827,10 @@ static void its_unmap_vm(struct its_node *its, struct its_vm *vm) - if (!--vm->vlpi_count[its->list_nr]) { - int i; - -- for (i = 0; i < vm->nr_vpes; i++) -+ for (i = 0; i < vm->nr_vpes; i++) { -+ guard(raw_spinlock)(&vm->vpes[i]->vpe_lock); - its_send_vmapp(its, vm->vpes[i], false); -+ } - } - - raw_spin_unlock_irqrestore(&vmovp_lock, flags); --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index fa1d8fa40d1..eceb23b78fb 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -172,7 +172,6 @@ pci-add-missing-bridge-lock-to-pci_bus_lock.patch tcp-don-t-drop-syn-ack-for-simultaneous-connect.patch bluetooth-btnxpuart-fix-null-pointer-dereference-in-.patch net-dpaa-avoid-on-stack-arrays-of-nr_cpus-elements.patch -irqchip-gic-v4-make-sure-a-vpe-is-locked-when-vmapp-.patch loongarch-use-correct-api-to-map-cmdline-in-relocate.patch regmap-maple-work-around-gcc-14.1-false-positive-war.patch vfs-fix-potential-circular-locking-through-setxattr-.patch -- 2.47.3