Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp2071381pxb; Wed, 9 Feb 2022 10:15:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJztqWgiLqQxmSOf/iUX5DWSxh+S9YUIyuG9dLGVSosN+8c6ek9Bs80ZcEMpRet/Zj3mRKpv X-Received: by 2002:a17:90b:512:: with SMTP id r18mr4774671pjz.232.1644430509569; Wed, 09 Feb 2022 10:15:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644430509; cv=none; d=google.com; s=arc-20160816; b=K3dXjOGHnIJ24L7ywwawrnoLyRfjF1h7PDkqFQBrRJP6+ufSIBDNxl0Uq/7gESL2PC ZVptCgNoYaOs9s/6US1IJtd0Joj3/c1I1NNjQpSmEqcFS34tZ5TqjPU1U0nAaNFgPSOe VcxW6w/Eg9N76q06VFE1GsAhJSEJbP0IZAEW3Ms+TDUVXDKBIoI4l7PAyZI2n5nNwM0X 05VKQHAQO06Y9VfL3VG2BwIhoanMyZB7UihVJU1bAXJ+X4NLw7VS1Nn21QyDNUIw1WpJ Ebvbyd0OzZgKrAdYkE4GC6OQNyXJlumcLPVxYdy6OjmCiZbBd8/PzEvobaZfm9GOG7+o VyLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=863BwFAgoaC2JnBu4gSCW8/vsPzH4hffHnxl4KQnG5E=; b=nADEWSzvC3soUgCo50qyrtbZRxcuSPzUmArQ+7s9nS3YktBNYnFY92tVLqECR9ZeEm gcVn2PhKJPK9QQNY+xG1oCyF4irXoovUwIpabD7O4N4uW8D8F9fmBJPeYoN9Jpc3PaRH GMkNwMSp+RX91q41Pzbi4fsbicpyE3JGbE14TKXg1+F3rda7I6317mbvn1OwuqRLknVT j/T6W48tDUmlN818cM/R3QliU82pnf7NwLT17QYe/msWPByFHHgdtuCfRsTn28NilgHD fGc17KTfkzbEboZ/0zt2XsAdzqmfnFa12DlaroNJl1OXRthFdte0oOtXm9Z9XaRaIr4l TVrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2021-07-09 header.b=ulW27q09; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mw12si6845889pjb.180.2022.02.09.10.14.50; Wed, 09 Feb 2022 10:15:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2021-07-09 header.b=ulW27q09; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236123AbiBIPjo (ORCPT + 99 others); Wed, 9 Feb 2022 10:39:44 -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=20Bugge?= 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- 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); -- 1.8.3.1