From patchwork Wed Feb 9 15:39:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Haakon Bugge X-Patchwork-Id: 12740405 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26FC9C433F5 for ; Wed, 9 Feb 2022 15:39:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234760AbiBIPjl (ORCPT ); Wed, 9 Feb 2022 10:39:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236113AbiBIPjl (ORCPT ); Wed, 9 Feb 2022 10:39:41 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EB5BC05CB82; Wed, 9 Feb 2022 07:39:42 -0800 (PST) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 219Ekbp6013360; Wed, 9 Feb 2022 15:39:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : mime-version : content-type : content-transfer-encoding; s=corp-2021-07-09; bh=863BwFAgoaC2JnBu4gSCW8/vsPzH4hffHnxl4KQnG5E=; b=ulW27q099SdFZlEV6lHLwhyiNq9smYnMasmA3+z9M9H9KcbO0s4lc6Z7HS2DCD51scfm FqiAzIXQksxvvgw4GhAYCW65NS3wL+RLlAU3NsYHRrdofP1ojcq5kaaBmLH6fK9vWrQz iMRHOhqjy46WsWFi9zkDJrjf2PWZu9JyzNYJh10rPSIYn9116cs+yN6eMN1JFOWmDcjT AcmXM9/Y5Sni6ckpPg8/d3GGcC6yl34imk1Z5XqmpLnsX7TdmLAIaDFpu9JLfOovHcYd B190j+kcngWpbuSmUGY++CxKAeRafjGWuRFYUDs34fDv//cq2f+mcigtMA3enGgeUCV9 zQ== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3e368tx6an-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 09 Feb 2022 15:39:38 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 219FHdmB175021; Wed, 9 Feb 2022 15:39:37 GMT Received: from lab02.no.oracle.com (lab02.no.oracle.com [10.172.144.56]) by aserp3020.oracle.com with ESMTP id 3e1h28dqgf-1; Wed, 09 Feb 2022 15:39:37 +0000 From: =?utf-8?q?H=C3=A5kon_Bugge?= To: Jason Gunthorpe , Leon Romanovsky Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH for-rc v2] IB/cma: Allow XRG INI QPs to set their local ACK timeout Date: Wed, 9 Feb 2022 16:39:35 +0100 Message-Id: <1644421175-31943-1-git-send-email-haakon.bugge@oracle.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10252 signatures=673431 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 bulkscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202090087 X-Proofpoint-ORIG-GUID: ASi-MLhSNGP42rhxbelcYXs2Zm2jYl3u X-Proofpoint-GUID: ASi-MLhSNGP42rhxbelcYXs2Zm2jYl3u Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org XRC INI QPs should be able to adjust their local ACK timeout. Fixes: 2c1619edef61 ("IB/cma: Define option to set ack timeout and pack tos_set") Signed-off-by: Håkon Bugge Suggested-by: Avneesh Pant Reviewed-by: Leon Romanovsky --- v1 -> v2: * Removed WARN_ON as suggested by Leon --- drivers/infiniband/core/cma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 0f5f0d7..7adacd1 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -2811,7 +2811,7 @@ int rdma_set_ack_timeout(struct rdma_cm_id *id, u8 timeout) { struct rdma_id_private *id_priv; - if (id->qp_type != IB_QPT_RC) + if (id->qp_type != IB_QPT_RC && id->qp_type != IB_QPT_XRC_INI) return -EINVAL; id_priv = container_of(id, struct rdma_id_private, id);