From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932185AbcAXWDx (ORCPT ); Sun, 24 Jan 2016 17:03:53 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:60564 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754412AbcAXWCb (ORCPT ); Sun, 24 Jan 2016 17:02:31 -0500 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Sagi Grimberg , Doug Ledford , Luis Henriques Subject: [PATCH 3.16.y-ckt 027/128] IB/srp: Fix possible send queue overflow Date: Sun, 24 Jan 2016 21:59:42 +0000 Message-Id: <1453672883-2708-28-git-send-email-luis.henriques@canonical.com> In-Reply-To: <1453672883-2708-1-git-send-email-luis.henriques@canonical.com> References: <1453672883-2708-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.7-ckt23 -stable review patch. If anyone has any objections, please let me know. ---8<------------------------------------------------------------ From: Sagi Grimberg commit 09c0c0bea500a9ad362589990ee316c9b2482f44 upstream. When using work request based memory registration (fast_reg) we must reserve SQ entries for registration and invalidation in addition to send operations. Each IO consumes 3 SQ entries (registration, send, invalidation) so we need to allocate 3x larger send-queue instead of 2x. Signed-off-by: Sagi Grimberg Reviewed-by: Christoph Hellwig Signed-off-by: Doug Ledford [ luis: backported to 3.16: - change function srp_create_target_ib() instead of srp_create_ch_ib() - adjusted context ] Signed-off-by: Luis Henriques --- drivers/infiniband/ulp/srp/ib_srp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 767000811cf9..36876960f97e 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -451,7 +451,7 @@ static int srp_create_target_ib(struct srp_target_port *target) struct ib_qp *qp; struct ib_fmr_pool *fmr_pool = NULL; struct srp_fr_pool *fr_pool = NULL; - const int m = 1 + dev->use_fast_reg; + const int m = dev->use_fast_reg ? 3 : 1; int ret; init_attr = kzalloc(sizeof *init_attr, GFP_KERNEL);