From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 7E03EC433F1 for ; Tue, 14 Jul 2020 19:05:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4D12C20773 for ; Tue, 14 Jul 2020 19:05:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753524; bh=gYrUy+2BPIkfxEAcimiUvhDES1CyrM816VquNjMev6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QNA0Ca7RerYzg9sdrE76C1vglHxh783ffdLw1eUVnoPNtPKsp1WmT8YMp769LYVKZ y5T4Ujs9FsrtEori5uo7I2XWJe4vOKpXBD9cSvgmOA0i8JHhsw560B2QNHdR1+t/N2 Hu/LUhZMxHQlL6ADAfKO+0c7qCiImbrwaAdbP7rs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730804AbgGNSyw (ORCPT ); Tue, 14 Jul 2020 14:54:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:52382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730799AbgGNSyv (ORCPT ); Tue, 14 Jul 2020 14:54:51 -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 7E76822BF3; Tue, 14 Jul 2020 18:54:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752891; bh=gYrUy+2BPIkfxEAcimiUvhDES1CyrM816VquNjMev6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kP67fMjXkmPRGUVYtqjmUM2Pj7W/bHY+32gdKYkawlO7rZh7m2tYlREzXxHQXOsOI ybCEHxahgi8NjP2uE+n9roA2/9N+60DAS/ldhW9rjBM/TTY2eEDk5ctyvg7Y6U504Z k1K7kxqhYpXXgppaCpVkNAnT0OkUM1DSHfqluVOQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Max Gurtovoy , Christoph Hellwig , Sasha Levin Subject: [PATCH 5.7 040/166] nvme-rdma: assign completion vector correctly Date: Tue, 14 Jul 2020 20:43:25 +0200 Message-Id: <20200714184117.797576293@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Max Gurtovoy [ Upstream commit 032a9966a22a3596addf81dacf0c1736dfedc32a ] The completion vector index that is given during CQ creation can't exceed the number of support vectors by the underlying RDMA device. This violation currently can accure, for example, in case one will try to connect with N regular read/write queues and M poll queues and the sum of N + M > num_supported_vectors. This will lead to failure in establish a connection to remote target. Instead, in that case, share a completion vector between queues. Signed-off-by: Max Gurtovoy Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/rdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index cac8a930396a0..1f9a45145d0d3 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -443,7 +443,7 @@ static int nvme_rdma_create_queue_ib(struct nvme_rdma_queue *queue) * Spread I/O queues completion vectors according their queue index. * Admin queues can always go on completion vector 0. */ - comp_vector = idx == 0 ? idx : idx - 1; + comp_vector = (idx == 0 ? idx : idx - 1) % ibdev->num_comp_vectors; /* Polling queues need direct cq polling context */ if (nvme_rdma_poll_queue(queue)) -- 2.25.1