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, 6 insertions, 3 deletions

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 6d58fa8a65fd..2ee5e63195c0 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1434,10 +1434,12 @@ static inline void skb_zcopy_clear(struct sk_buff *skb, bool zerocopy)
         struct ubuf_info *uarg = skb_zcopy(skb);
 
         if (uarg) {
-                if (uarg->callback == sock_zerocopy_callback) {
+                if (skb_zcopy_is_nouarg(skb)) {
+                        /* no notification callback */
+                } else if (uarg->callback == sock_zerocopy_callback) {
                         uarg->zerocopy = uarg->zerocopy && zerocopy;
                         sock_zerocopy_put(uarg);
-                } else if (!skb_zcopy_is_nouarg(skb)) {
+                } else {
                         uarg->callback(uarg, zerocopy);
                 }
 
@@ -2691,7 +2693,8 @@ static inline int skb_orphan_frags(struct sk_buff *skb, gfp_t gfp_mask)
 {
         if (likely(!skb_zcopy(skb)))
                 return 0;
-        if (skb_uarg(skb)->callback == sock_zerocopy_callback)
+        if (!skb_zcopy_is_nouarg(skb) &&
+            skb_uarg(skb)->callback == sock_zerocopy_callback)
                 return 0;
         return skb_copy_ubufs(skb, gfp_mask);
 }