[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: e9649129d33dca561305fc590a7c4ba8c3e5675a
WARNING: Author mismatch between patch and upstream commit: Backport author: Jing Zhang jingzhangos@google.com Commit author: Kunkun Jiang jiangkunkun@huawei.com
Status in newer kernel trees: 6.12.y | Present (different SHA1: 3b47865d395e) 6.11.y | Present (different SHA1: 78e981b6b725) 6.6.y | Present (different SHA1: 026af3ce08de) 6.1.y | Not found 5.15.y | Not found 5.10.y | Not found 5.4.y | Not found 4.19.y | Not found
Note: The patch differs from the upstream commit: --- 1: e9649129d33dc ! 1: a171225845234 KVM: arm64: vgic-its: Clear DTE when MAPD unmaps a device @@ Metadata ## Commit message ## KVM: arm64: vgic-its: Clear DTE when MAPD unmaps a device
+ commit e9649129d33dca561305fc590a7c4ba8c3e5675a upstream. + vgic_its_save_device_tables will traverse its->device_list to save DTE for each device. vgic_its_restore_device_tables will traverse each entry of device table and check if it is valid. @@ Commit message Link: https://lore.kernel.org/r/20241107214137.428439-5-jingzhangos@google.com Signed-off-by: Oliver Upton oliver.upton@linux.dev
- ## arch/arm64/kvm/vgic/vgic-its.c ## -@@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, + ## virt/kvm/arm/vgic/vgic-its.c ## +@@ virt/kvm/arm/vgic/vgic-its.c: static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, bool valid = its_cmd_get_validbit(its_cmd); u8 num_eventid_bits = its_cmd_get_size(its_cmd); gpa_t itt_addr = its_cmd_get_ittaddr(its_cmd); @@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_cmd_handle_mapd(struct kvm * return E_ITS_MAPD_DEVICE_OOR;
if (valid && num_eventid_bits > VITS_TYPER_IDBITS) -@@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, +@@ virt/kvm/arm/vgic/vgic-its.c: static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, * is an error, so we are done in any case. */ if (!valid) ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-4.19.y | Success | Success |