Skip to content

Commit cc77b95

Browse files
wei-w-wangsean-jc
authored andcommitted
kvm/eventfd: use list_for_each_entry when deassign ioeventfd
Simpify kvm_deassign_ioeventfd_idx to use list_for_each_entry as the loop just ends at the entry that's found and deleted. Note, coalesced_mmio_ops and ioeventfd_ops are the only instances of kvm_io_device_ops that implement a destructor, all other callers of kvm_io_bus_unregister_dev() are unaffected by this change. Suggested-by: Michal Luczaj <mhal@rbox.co> Signed-off-by: Wei Wang <wei.w.wang@intel.com> Reviewed-by: Sean Christopherson <seanjc@google.com> Link: https://lore.kernel.org/r/20230207123713.3905-3-wei.w.wang@intel.com [sean: call out that only select users implement a destructor] Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 5ea5ca3 commit cc77b95

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

virt/kvm/eventfd.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ static int
901901
kvm_deassign_ioeventfd_idx(struct kvm *kvm, enum kvm_bus bus_idx,
902902
struct kvm_ioeventfd *args)
903903
{
904-
struct _ioeventfd *p, *tmp;
904+
struct _ioeventfd *p;
905905
struct eventfd_ctx *eventfd;
906906
struct kvm_io_bus *bus;
907907
int ret = -ENOENT;
@@ -915,8 +915,7 @@ kvm_deassign_ioeventfd_idx(struct kvm *kvm, enum kvm_bus bus_idx,
915915

916916
mutex_lock(&kvm->slots_lock);
917917

918-
list_for_each_entry_safe(p, tmp, &kvm->ioeventfds, list) {
919-
918+
list_for_each_entry(p, &kvm->ioeventfds, list) {
920919
if (p->bus_idx != bus_idx ||
921920
p->eventfd != eventfd ||
922921
p->addr != args->addr ||

0 commit comments

Comments
 (0)