From patchwork Tue Dec 2 10:26:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Cohen X-Patchwork-Id: 416812 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C9F6A140213 for ; Tue, 2 Dec 2014 21:27:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932223AbaLBK1D (ORCPT ); Tue, 2 Dec 2014 05:27:03 -0500 Received: from mail-wi0-f176.google.com ([209.85.212.176]:40278 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754479AbaLBK0x (ORCPT ); Tue, 2 Dec 2014 05:26:53 -0500 Received: by mail-wi0-f176.google.com with SMTP id ex7so27533705wid.3 for ; Tue, 02 Dec 2014 02:26:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sF9awznal0I2cO8hG9i+mMo/zis6s2Zy48bQNWKJBug=; b=aRvtjqbQ4LeO5e8EfIKguqARKKqQ3bqK6wiu7mdjfpu1AZOMjx1W9wLUqZAsbYMf4b XUBJyLqZzFTGDL3hEe7YPmjLwDEQ76OSSintCuhV6r4LWrvF72KTJg0GXrvaTYstCXHa Rku3dbY7RlJS4z+dzupCpz+pLUXRwshLrf1gJGe/scQN0wM7saJrYQvGRvA2C3q/RmTQ 5jq4Q6DkasC+KJkWmVStUlRtVjHhNBpb2dvkXS5q0fxa9UjbFii+rhweHEaOY7YsCiLG dYQnBAzr39gljjV9hhZtHYM/ehmhcD4aqAcfa+//In+gzopZnLUl66/RjdGa3SuBuXef FD7w== X-Gm-Message-State: ALoCoQmUGeb41IXcpmtgvL6sZlIvblONKzCzOjg7FpA8eD6hCV2D6/T6ykfFKTZ9XY3Px48wBz2g X-Received: by 10.180.73.175 with SMTP id m15mr4133860wiv.0.1417516011909; Tue, 02 Dec 2014 02:26:51 -0800 (PST) Received: from localhost (out.voltaire.com. [193.47.165.251]) by mx.google.com with ESMTPSA id p1sm31306316wjy.22.2014.12.02.02.26.51 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Dec 2014 02:26:51 -0800 (PST) From: Eli Cohen X-Google-Original-From: Eli Cohen To: davem@davemloft.net Cc: roland@kernel.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, ogerlitz@mellanox.com, amirv@mellanox.com, Eli Cohen Subject: [PATCH net-next 9/9] mlx5: Fix error flow in add_keys Date: Tue, 2 Dec 2014 12:26:19 +0200 Message-Id: <1417515979-22418-10-git-send-email-eli@mellanox.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1417515979-22418-1-git-send-email-eli@mellanox.com> References: <1417515979-22418-1-git-send-email-eli@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If mlx5_core_create_mkey fails, decrease the pending counter to undo the previous increment. Signed-off-by: Eli Cohen --- drivers/infiniband/hw/mlx5/mr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index 4c89b64aa9cf..5a80dd993761 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -159,6 +159,9 @@ static int add_keys(struct mlx5_ib_dev *dev, int c, int num) sizeof(*in), reg_mr_callback, mr, &mr->out); if (err) { + spin_lock_irq(&ent->lock); + ent->pending--; + spin_unlock_irq(&ent->lock); mlx5_ib_warn(dev, "create mkey failed %d\n", err); kfree(mr); break;