On 10/27/2020 2:20 PM, Jason Gunthorpe wrote:
There are two flows for handling RDMA_CM_EVENT_ROUTE_RESOLVED, either the handler triggers a completion and another thread does rdma_connect() or the handler directly calls rdma_connect(). In all cases rdma_connect() needs to hold the handler_mutex, but when handler's are invoked this is already held by the core code. This causes ULPs using the 2nd method to deadlock. Provide a rdma_connect_locked() and have all ULPs call it from their handlers. Link: https://lore.kernel.org/r/[email protected] Reported-and-tested-by: Guoqing Jiang <[email protected]> Fixes: 2a7cec538169 ("RDMA/cma: Fix locking for the RDMA_CM_CONNECT state") Acked-by: Santosh Shilimkar <[email protected]> Acked-by: Jack Wang <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]> --- drivers/infiniband/core/cma.c | 40 +++++++++++++++++++++--- drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 4 +-- drivers/nvme/host/rdma.c | 4 +-- include/rdma/rdma_cm.h | 14 ++------- net/rds/ib_cm.c | 5 +-- 6 files changed, 46 insertions(+), 23 deletions(-) v2: - Remove extra code from nvme (Chao) - Fix long lines (CH) I've applied this version to rdma-rc - expecting to get these ULPs unbroken for rc2 release Thanks, Jason
iser and nvme/rdma looks good to me, Reviewed-by: Max Gurtovoy <[email protected]>
