Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 579cd6fe authored by Jason Wang's avatar Jason Wang Committed by Alistair Strachan
Browse files

UPSTREAM: vhost_net: add missing lock nesting notation



[ Upstream commit aaa3149bbee9ba9b4e6f0bd6e3e7d191edeae942 ]

We try to hold TX virtqueue mutex in vhost_net_rx_peek_head_len()
after RX virtqueue mutex is held in handle_rx(). This requires an
appropriate lock nesting notation to calm down deadlock detector.

Fixes: 0308813724606 ("vhost_net: basic polling support")
Reported-by: default avatar <syzbot+7f073540b1384a614e09@syzkaller.appspotmail.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 1cb81756b7c3813f7d65d3c6bb1133cb53b69775)
Bug: 121166534
Test: Ran cuttlefish with android-4.4 + VSOCKETS, VMWARE_VMCI_VSOCKETS
Signed-off-by: default avatarAlistair Strachan <astrachan@google.com>

Change-Id: Ia72badca8f5f92095cfad91051fe47f76e6b03b7
parent b2696b4a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment