From: David Woodhouse <dwmw@amazon.co.uk>
Date: Tue, 27 Oct 2020 13:43:46 +0000 (+0000)
Subject: kvm/eventfd: Drain events from eventfd in irqfd_wakeup()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=21dbe99d028bc50260830a4a23a73d92e64b38ed;p=users%2Fdwmw2%2Flinux.git

kvm/eventfd: Drain events from eventfd in irqfd_wakeup()

Don't allow the events to accumulate in the eventfd counter, drain them
as they are handled.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---

diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index d6408bb497dc1..87fe943553508 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -193,6 +193,9 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key)
 	int idx;
 
 	if (flags & EPOLLIN) {
+		u64 cnt;
+		eventfd_ctx_do_read(irqfd->eventfd, &cnt);
+
 		idx = srcu_read_lock(&kvm->irq_srcu);
 		do {
 			seq = read_seqcount_begin(&irqfd->irq_entry_sc);