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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 E8614C43381 for ; Fri, 22 Mar 2019 12:46:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B2AFF218E2 for ; Fri, 22 Mar 2019 12:46:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553258818; bh=W3R0H/osxmZswlZ8lpgINOQOY5etppCBdq3PRPZBaBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Da1GAZpB+6ol1/KaOycNidfzLeMiZt1OkHkxGCUIgC/iePTQNim1gwlJrSA30qBoz bsMOub1JMxYTJClGP4qEw25k90dCuYWVQsydUBm6NaCaF8AsoJ9+cap+9r6/Ns0FFI o8l+Y/faQ/36vPoXAalvDT58deNtuhkymkr9IEH8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733212AbfCVL6m (ORCPT ); Fri, 22 Mar 2019 07:58:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:35430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387864AbfCVL6i (ORCPT ); Fri, 22 Mar 2019 07:58:38 -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 4CACE20850; Fri, 22 Mar 2019 11:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553255917; bh=W3R0H/osxmZswlZ8lpgINOQOY5etppCBdq3PRPZBaBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bAkW9cIbAfCFIetrsCspyMHRu/uceYI1H/UBWHfbEVNlFUPTlKQzrscdp8xwzoibM tQt6USK+s4UOkHxcMBVh1uDedMLVTCWxbocsAbI31x/Ob0E9lL4ICK8ablFUsd+gDd ZLvKOTamMJ4imBSwTsHEDVCkrNqPiRogJdH1PpeY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Morey-Chaisemartin , Chuck Lever , Anna Schumaker , Sasha Levin Subject: [PATCH 4.19 054/280] xprtrdma: Make sure Send CQ is allocated on an existing compvec Date: Fri, 22 Mar 2019 12:13:27 +0100 Message-Id: <20190322111309.327834156@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111306.356185024@linuxfoundation.org> References: <20190322111306.356185024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 3d6bf790cf1f..5ddbf227e7c6 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -546,7 +546,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