mptcp: properly annotate nested lock
authorPaolo Abeni <pabeni@redhat.com>
Wed, 16 Dec 2020 11:48:33 +0000 (12:48 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 17 Dec 2020 18:24:47 +0000 (10:24 -0800)
commit3f8b2667f257c21a992bda33bfb919ee164a429c
tree834ba5fc000948bdca0c0a44a34ff7fa77426c96
parent0c14846032f2c0a3b63234e1fc2759f4155b6067
mptcp: properly annotate nested lock

MPTCP closes the subflows while holding the msk-level lock.
While acquiring the subflow socket lock we need to use the
correct nested annotation, or we can hit a lockdep splat
at runtime.

Reported-and-tested-by: Geliang Tang <geliangtang@gmail.com>
Fixes: e16163b6e2b7 ("mptcp: refactor shutdown and close")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/protocol.c