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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 B203FC76188 for ; Tue, 23 Jul 2019 06:57:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 871D82239E for ; Tue, 23 Jul 2019 06:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563865066; bh=sZr034tUfJRLNdTwSHE4kz0qQKlA6rbSz6skp3ytAwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K6gPnVl6JKqTcDJThI/3b7GouzHXu8Km288TX6CoEI8CXU/LVzDKscHYy5u1khaf2 f6J+TxuVVjtA304Lo2VyRf/BfKaXH4qd/AN2v+nzXCaJm3nKHBmw9obKomq3kgMN6+ Z4jJqaLB634fmwRRM1dSE6/kND5j8l9jZZ+/m1bk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730299AbfGWG5q (ORCPT ); Tue, 23 Jul 2019 02:57:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:42440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729469AbfGWG5p (ORCPT ); Tue, 23 Jul 2019 02:57:45 -0400 Received: from localhost (unknown [193.47.165.251]) (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 479E72190F; Tue, 23 Jul 2019 06:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563865064; bh=sZr034tUfJRLNdTwSHE4kz0qQKlA6rbSz6skp3ytAwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p3a1W3sb/QfCsgC8McrWb2bI0dZvyiyt5SSHs8qpq38RPgBvJ99n1aQpEuYsA+og7 ILRlqf5+ZnzdHOwQF0UVzu/k+3iIPJsS8/ivIfw3Tw/imQl8aVBiTswn9w/DwZ9nD6 NLR+MfZ7BPGoXGNtc/LCZ1LjYIhl7lAk7av6JuKw= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Alex Vainman , Artemy Kovalyov , Daniel Jurgens , Eli Cohen , Haggai Eran , Mark Zhang , Moni Shoua , Parav Pandit , Sagi Grimberg , Yishai Hadas Subject: [PATCH rdma-rc 03/10] IB/mlx5: Use direct mkey destroy command upon UMR unreg failure Date: Tue, 23 Jul 2019 09:57:26 +0300 Message-Id: <20190723065733.4899-4-leon@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723065733.4899-1-leon@kernel.org> References: <20190723065733.4899-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Yishai Hadas Use direct firmware command to destroy the mkey in case the unreg UMR operation has failed. This prevents a case that an mkey will leak out from the cache post a failure to be destroyed by a UMR WR. In case the MR cache limit didn't reach a call to add another entry to the cache instead of the destroyed one is issued. In addition, replaced a warn message to WARN_ON() as this flow is fatal and can't happen unless some bug around. Cc: # 4.10 Fixes: 49780d42dfc9 ("IB/mlx5: Expose MR cache for mlx5_ib") Signed-off-by: Yishai Hadas Reviewed-by: Artemy Kovalyov Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/mr.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index 266edaf8029d..b83361aebf28 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -545,13 +545,16 @@ void mlx5_mr_cache_free(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr) return; c = order2idx(dev, mr->order); - if (c < 0 || c >= MAX_MR_CACHE_ENTRIES) { - mlx5_ib_warn(dev, "order %d, cache index %d\n", mr->order, c); - return; - } + WARN_ON(c < 0 || c >= MAX_MR_CACHE_ENTRIES); - if (unreg_umr(dev, mr)) + if (unreg_umr(dev, mr)) { + mr->allocated_from_cache = false; + destroy_mkey(dev, mr); + ent = &cache->ent[c]; + if (ent->cur < ent->limit) + queue_work(cache->wq, &ent->work); return; + } ent = &cache->ent[c]; spin_lock_irq(&ent->lock); -- 2.20.1