Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp964610pxb; Wed, 6 Apr 2022 05:29:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2z4QZVl2UUanGF/5xJZgVKSG0yfV7JqP0FVyHxFvvMGCQeq7wB6nO4hNSAD/ANejRC+OP X-Received: by 2002:a17:902:d511:b0:156:b9f5:6470 with SMTP id b17-20020a170902d51100b00156b9f56470mr8311011plg.133.1649248167482; Wed, 06 Apr 2022 05:29:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649248167; cv=none; d=google.com; s=arc-20160816; b=x0qvoi5VLJ48lNdxbfu2h1eFD7eyWA74v+8yBhgLzEG+y15ZRcqWCN2gcFzsuRvRnK 1H+tW06BJ7QwR4FFNoMOwiha/u1KaxG4cZq5Z+9k4FF12BD8c3nK6WkJqE+j0ieHBb9r EA+JY2tx+zFollfEugnGy8lD6P1AU60i2OL3PD7Aeif+Zy/XEqBq4Tm0mWVudVZQDEui hSlE8/NcaG0lPkB+Hqa5Zpld400/tIor/csWWNHHz5C4pCUukLpz4x+NrvObaDOvSbfq xWz0IlQvLoxJ6BLp9vnUOx8a/+U/RSLAV8d3NgU+Amhu9H5bNxxV2u5z/trSAxev1eiW a5Hg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HeQ+Zzi5+sMYeV3OGe1+EjWvE5q3E6tC8txFSCkBUVw=; b=SDHadhiZzLd6PtS4lidzLELyHaTM622xBC1+4PfRTaBo1iK6UoaIODCyUjDFDzNSCC wpvWUKhCpRjPWdS0/CuyOGCS0ojMzSjJzvNt8brW4n8freYIZWOpocAofc/pUqhsyjhB QprpXL/i+Tz1OBWe9xIN/7wdgDSdBT7a++MzPldQABPL2uX38dIzRWJ4buPxmpQCECed nbHWcyIkSLAcIrfsSlzcZVguNOmGPRA6+Eh7bEI8YXEjUq8cOclEyxamSlw0uncCYNdg d6j2QkhVffpfSJBQpbM3h26sE/pcObJsWE39m2og27oMu+p6zlfJnL+Ea8YPYRSqlwWc nxXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NOGHZfgw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id k16-20020a63ff10000000b003862e2b721dsi15578705pgi.129.2022.04.06.05.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:29:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NOGHZfgw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 607E36FC941; Wed, 6 Apr 2022 04:40:38 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242918AbiDEVA1 (ORCPT + 99 others); Tue, 5 Apr 2022 17:00:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349123AbiDEJtL (ORCPT ); Tue, 5 Apr 2022 05:49:11 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 698B5AA033; Tue, 5 Apr 2022 02:41:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 240BCB81B7F; Tue, 5 Apr 2022 09:41:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 824DAC385A2; Tue, 5 Apr 2022 09:41:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649151664; bh=30UmqNFwoai9wgFjVcF4BvLOQMim/OFKlunka15uq0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NOGHZfgwIzRsYpnx9LOMeSdUdMs3cF5z5QgxTRx0HzhbmqqxvexC1ZkP6LfAQMNva Y4AtC+X1q87d85AShPJ1M8ymJOliK9yiIW5TAoQdZef59Pq80StJlQ6zZdvuYuVpU0 pSBHSBZTRMhaPNFmj+kz53TVx/kzo4VC6+TrSM0g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?H=C3=A5kon=20Bugge?= , Avneesh Pant , Leon Romanovsky , Jason Gunthorpe , Sasha Levin Subject: [PATCH 5.15 459/913] IB/cma: Allow XRC INI QPs to set their local ACK timeout Date: Tue, 5 Apr 2022 09:25:21 +0200 Message-Id: <20220405070353.607388366@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070339.801210740@linuxfoundation.org> References: <20220405070339.801210740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Håkon Bugge [ Upstream commit 748663c8ccf6b2e5a800de19127c2cc1c4423fd2 ] 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") Link: https://lore.kernel.org/r/1644421175-31943-1-git-send-email-haakon.bugge@oracle.com Signed-off-by: Håkon Bugge Suggested-by: Avneesh Pant Reviewed-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- 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 db7b5de3bc76..a814dabcdff4 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -2640,7 +2640,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); -- 2.34.1