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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 5ACFEC43381 for ; Mon, 11 Mar 2019 20:11:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 225FB2087C for ; Mon, 11 Mar 2019 20:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552335085; bh=VD0DXGV3E5O++rimIXG/aJHcBmpV9GIikpsGdoU2kcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EaePdP8ekpxg/NoZjxzKE2DueTLPbMGuWQHt6HCR1ClGeSLaOnykvnkbvcEqToy6L pNrHhiQvCrWfyI9cFcdHgfnwmueHVoanK3j+YyvgPOTUA+EspwmicrIreDMsXGW54c vAOOzlk4Xys0dfmqWcOuRopAClE/ISz5MpVTd47g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728902AbfCKULY (ORCPT ); Mon, 11 Mar 2019 16:11:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:33556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728554AbfCKT4U (ORCPT ); Mon, 11 Mar 2019 15:56:20 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C197214AF; Mon, 11 Mar 2019 19:56:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552334180; bh=VD0DXGV3E5O++rimIXG/aJHcBmpV9GIikpsGdoU2kcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HfO+AL9GHTi6q6CPrRiPmM0vSU+Cp5tkd4pN1YDJY4k9rTFmU2odWcWT/1upmmM65 7YH/UoAnuCn48sXLTzXb/NvqaOD+yMo3WK4e7AF6KPlSKidltkZWpOzeOsBXoA2nz3 5fwGlTcEphZGdkUHAPw4hJ8Y6r2A9qg98pujSxL4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicolas Morey-Chaisemartin , Anna Schumaker , Sasha Levin , linux-nfs@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 35/52] xprtrdma: Make sure Send CQ is allocated on an existing compvec Date: Mon, 11 Mar 2019 15:54:59 -0400 Message-Id: <20190311195516.137772-35-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190311195516.137772-1-sashal@kernel.org> References: <20190311195516.137772-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicolas Morey-Chaisemartin [ Upstream commit a4cb5bdb754afe21f3e9e7164213e8600cf69427 ] Make sure the device has at least 2 completion vectors before allocating to compvec#1 Fixes: a4699f5647f3 (xprtrdma: Put Send CQ in IB_POLL_WORKQUEUE mode) Signed-off-by: Nicolas Morey-Chaisemartin Reviewed-by: Chuck Lever Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- net/sunrpc/xprtrdma/verbs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index dffedf1df02c..dd1839922f16 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -583,7 +583,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, sendcq = ib_alloc_cq(ia->ri_device, NULL, ep->rep_attr.cap.max_send_wr + 1, - 1, IB_POLL_WORKQUEUE); + ia->ri_device->num_comp_vectors > 1 ? 1 : 0, + IB_POLL_WORKQUEUE); if (IS_ERR(sendcq)) { rc = PTR_ERR(sendcq); dprintk("RPC: %s: failed to create send CQ: %i\n", -- 2.19.1