Merge tag 'kvm-ppc-fixes-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master

PPC KVM fixes for 5.2

- Several bug fixes for the new XIVE-native code.
- Replace kvm->lock by other mutexes in several places where we hold a
  vcpu mutex, to avoid lock order inversions.
- Fix a lockdep warning on guest entry for radix-mode guests.
- Fix a bug causing user-visible corruption of SPRG3 on the host.

1 files changed, 4 insertions, 1 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index ad3ccf82f31d..cb5440b02e82 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -808,7 +808,10 @@ static int map_lookup_elem(union bpf_attr *attr)
                 err = map->ops->map_peek_elem(map, value);
         } else {
                 rcu_read_lock();
-                ptr = map->ops->map_lookup_elem(map, key);
+                if (map->ops->map_lookup_elem_sys_only)
+                        ptr = map->ops->map_lookup_elem_sys_only(map, key);
+                else
+                        ptr = map->ops->map_lookup_elem(map, key);
                 if (IS_ERR(ptr)) {
                         err = PTR_ERR(ptr);
                 } else if (!ptr) {