Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp666016pxb; Tue, 5 Apr 2022 17:57:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAFOlsFnlPJNnXkEqDnjdumB8gLN1J4SaCy9YcaFzDHdAtMN4oJPSO/4sc2E8yiHOsvKoX X-Received: by 2002:a50:99c7:0:b0:419:225:80b6 with SMTP id n7-20020a5099c7000000b00419022580b6mr6334066edb.240.1649206658849; Tue, 05 Apr 2022 17:57:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649206658; cv=none; d=google.com; s=arc-20160816; b=eQMh3jziB2qdSKnrhJduqyWkbMce2hbsJcZKQWVp7K9SS41wx6kVAE6B0sFA0kLT+s r/kuze1o8i0x7Cw3VwYGQNRXeXsxLFME9Y2SKT1J7hKmLVO6DuT8K1Lt2v0LFZedUGhN xkqxnacQLeX521CotM+vXx5HzgONrTJluXETgqS6wH+3leT7KMpXKmtQMXcyThtZ0Jhr BkHNn4PbsQlhpdDiB7V/aKrQJS8TcNT6XPYqUoalOF6t5u/T+gybwQjMbAYDXRyaiLQE X9afbmSO6T5lYjP76H/jASrUaMZbzjqEfli5ISgMhWVEH6fJria4rj90Vp9TxtM9N28m mtGw== 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=VGlXJ6Vd+m0uSCtEy/eN7H5IQcbUPOdNK/ykzEh5EYM=; b=mCwtI7NjBTuu1gzTl05NwMjesqMnClr9hyXboLOn50T5z8sRy2VUgA11wS6X0FKM++ KNke/6z8iMIixny9UvKnfcEu8tCzZtFFxaaawvd6ruMs872U9C/lxUirGnkxGP1oDILe cjkrrd9IHH4kQ60sA4yOvjJQnn4QlLy/ftJfNuDP+6zHj8uSLUzN5zJ6h2TErlNJWGK3 1CvIOob14WTH+5YQTRmCqlF7yiB/YK7zVuvGKSWSdZbz6Xt0l0uR1ahPIvtPdIB9HkM1 xx4yWkRoENxD4Bq5Wt5rDVAvtuZvf0ugc81gHDmAKyOmo5L+HWdymWMauxX6YDoFKiNZ 8I8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Assyde6J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r11-20020a50c00b000000b00418c2b5bf1bsi9878695edb.509.2022.04.05.17.57.11; Tue, 05 Apr 2022 17:57:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Assyde6J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234690AbiDEMgi (ORCPT + 99 others); Tue, 5 Apr 2022 08:36:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235645AbiDEJCY (ORCPT ); Tue, 5 Apr 2022 05:02:24 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AA2613D1D; Tue, 5 Apr 2022 01:54:17 -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 B971CB81B92; Tue, 5 Apr 2022 08:54:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CED3C385A0; Tue, 5 Apr 2022 08:54:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649148854; bh=ABlTf+N6DH9ccUXpUU8Fl2Nw2NUrzJf1hK0bocX+03s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Assyde6JZhc49T7GdI8ZtDE7cAt0fJcfGf/VMhWbDx4MXtI06nbvOwcRsFaWDyMtg VS9MthIIj2BuK3GonxEXadZvSYYgNgE3Yskf+SSwVTe7dLBZVcHOnfqfJcPvksvDLX 0f8CdxhignlFmtnRfjP/vobSdhnBrhhVoqMvdlwg= 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.16 0504/1017] IB/cma: Allow XRC INI QPs to set their local ACK timeout Date: Tue, 5 Apr 2022 09:23:37 +0200 Message-Id: <20220405070409.259809614@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@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=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,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 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 41ec05c4b0d0..80a8e31e5b38 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -2642,7 +2642,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