[ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 7602ffd1d5e8927fadd5187cb4aed2fdc9c47143 WARNING: Author mismatch between patch and upstream commit: Backport author: Jing Zhang <jingzhangos@xxxxxxxxxx> Commit author: Kunkun Jiang <jiangkunkun@xxxxxxxxxx> Status in newer kernel trees: 6.12.y | Present (different SHA1: 98b18dff427f) 6.11.y | Present (different SHA1: 85272e522655) 6.6.y | Present (different SHA1: 9359737ade6c) 6.1.y | Present (different SHA1: 1f6c9a5c3b12) 5.15.y | Present (different SHA1: 04e670725c10) 5.10.y | Present (different SHA1: e428da1e025c) Note: The patch differs from the upstream commit: --- 1: 7602ffd1d5e89 ! 1: 8bb3836356136 KVM: arm64: vgic-its: Clear ITE when DISCARD frees an ITE @@ Metadata ## Commit message ## KVM: arm64: vgic-its: Clear ITE when DISCARD frees an ITE + commit 7602ffd1d5e8927fadd5187cb4aed2fdc9c47143 upstream. + When DISCARD frees an ITE, it does not invalidate the corresponding ITE. In the scenario of continuous saves and restores, there may be a situation where an ITE is not saved @@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_cmd_handle_discard(struct kv * Though the spec talks about removing the pending state, we * don't bother here since we clear the ITTE anyway and the @@ arch/arm64/kvm/vgic/vgic-its.c: static int vgic_its_cmd_handle_discard(struct kvm *kvm, struct vgic_its *its, - vgic_its_invalidate_cache(its); + vgic_its_invalidate_cache(kvm); its_free_ite(kvm, ite); - return 0; --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.10.y | Success | Success |