From patchwork Tue Jun 23 19:55:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223130 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48C89C433DF for ; Tue, 23 Jun 2020 21:30:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1777F20724 for ; Tue, 23 Jun 2020 21:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592947809; bh=X1Fz7wCTOgVSWRvarBEikRrwLRPmf9rhqqpX0+S5nug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WbtAfsaftY2IwlQCHBSqpd6zu145A74NIYqu/JZOeWE+i/E4gr4T1mzlG+uGmd6J/ R1Uyu+bLsg2vHJHCZ/vIrvj6Cjveh0/Ym9p/ndR0QPUsVUEFuqz0ZmnFfUMhBPRE21 e183hyqNpDTE9jnINuWqDOc77lwrtPNGquEG3gtI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391018AbgFWV37 (ORCPT ); Tue, 23 Jun 2020 17:29:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:56598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389183AbgFWUOP (ORCPT ); Tue, 23 Jun 2020 16:14:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EDBA02073E; Tue, 23 Jun 2020 20:14:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943255; bh=X1Fz7wCTOgVSWRvarBEikRrwLRPmf9rhqqpX0+S5nug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lv2XQHnvbfuTftpL3jaZRiPr/nf0L4wEr1oI9GBMjFrHZAAbrc/XkVvM7s5y4lcO6 nJwhCrGxfwOrkDhyZKHeukE5X1otO1xWyhmSTOC3zhkmN2XDvlBjjzQ9P3PufIYdS8 Ds/7NXvPxuz18PdUYCfeoePnYygLVqVdH/daZH5Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ka-Cheong Poon , Jason Gunthorpe , Sasha Levin Subject: [PATCH 5.7 320/477] RDMA/cm: Spurious WARNING triggered in cm_destroy_id() Date: Tue, 23 Jun 2020 21:55:17 +0200 Message-Id: <20200623195422.657923835@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ka-Cheong Poon [ Upstream commit fba97dc7fc76b2c9a909fa0b3786d30a9899f5cf ] If the cm_id state is IB_CM_REP_SENT when cm_destroy_id() is called, it calls cm_send_rej_locked(). In cm_send_rej_locked(), it calls cm_enter_timewait() and the state is changed to IB_CM_TIMEWAIT. Now back to cm_destroy_id(), it breaks from the switch statement, and the next call is WARN_ON(cm_id->state != IB_CM_IDLE). This triggers a spurious warning. Instead, the code should goto retest after returning from cm_send_rej_locked() to move the state to IDLE. Fixes: 67b3c8dceac6 ("RDMA/cm: Make sure the cm_id is in the IB_CM_IDLE state in destroy") Link: https://lore.kernel.org/r/1591191218-9446-1-git-send-email-ka-cheong.poon@oracle.com Signed-off-by: Ka-Cheong Poon Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/core/cm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 17f14e0eafe4d..1c2bf18cda9f6 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -1076,7 +1076,9 @@ retest: case IB_CM_REP_SENT: case IB_CM_MRA_REP_RCVD: ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg); - /* Fall through */ + cm_send_rej_locked(cm_id_priv, IB_CM_REJ_CONSUMER_DEFINED, NULL, + 0, NULL, 0); + goto retest; case IB_CM_MRA_REQ_SENT: case IB_CM_REP_RCVD: case IB_CM_MRA_REP_SENT: