From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 2 Dec 2022 19:00:53 +0000 (-0500)
Subject: Merge branch 'gpc-fixes' of git://git.infradead.org/users/dwmw2/linux into HEAD
X-Git-Tag: v6.2-rc1~77^2~1^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5656374b168c98377b6feee8d7500993eebda230;p=linux-block.git

Merge branch 'gpc-fixes' of git://git.infradead.org/users/dwmw2/linux into HEAD

Pull Xen-for-KVM changes from David Woodhouse:

* add support for 32-bit guests in SCHEDOP_poll

* the rest of the gfn-to-pfn cache API cleanup

"I still haven't reinstated the last of those patches to make gpc->len
immutable."

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

5656374b168c98377b6feee8d7500993eebda230
diff --cc arch/x86/kvm/xen.c
index 2f21fa5ee7de,5208e05ca9a6..d7af40240248
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@@ -1165,9 -1152,9 +1152,9 @@@ static bool wait_pending_event(struct k
  	bool ret = true;
  	int idx, i;
  
 -	read_lock_irqsave(&gpc->lock, flags);
  	idx = srcu_read_lock(&kvm->srcu);
 +	read_lock_irqsave(&gpc->lock, flags);
- 	if (!kvm_gpc_check(kvm, gpc, gpc->gpa, PAGE_SIZE))
+ 	if (!kvm_gpc_check(gpc, PAGE_SIZE))
  		goto out_rcu;
  
  	ret = false;