From patchwork Thu Feb 2 09:03:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13125567 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C806C636D4 for ; Thu, 2 Feb 2023 09:03:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232272AbjBBJDc (ORCPT ); Thu, 2 Feb 2023 04:03:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232406AbjBBJDX (ORCPT ); Thu, 2 Feb 2023 04:03:23 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1B8854563 for ; Thu, 2 Feb 2023 01:03:17 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5A9806192B for ; Thu, 2 Feb 2023 09:03:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43E41C433EF; Thu, 2 Feb 2023 09:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675328596; bh=BLv0X8oB0G+4RyZ/NzLQim9FuHxKh/daMoqV0NvAgDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q/qPpeg69LrS1nlgJ+AZ/fGoB3W9JnoSxjhO9T3HpXrf8fhFE5j3e+KpmyBZ/80WM DcMTR1K0tOFvBLGZPa3QSZDmDNlPnVzHt1GYiObzf/bvnjioeo52BXg/PWLnQ1+hif RiXbrYxCfB7hNdyvC8AVEe6jr6Svn4x/s3WJQLPwSMY96vgAmA6IELu5bGZbBc+XaG jsLExdCVz73GvYNOMUbAIB5AtjFQ/nIhoORybHBC7FirmPJ5jMomO36p7nYLvMHv9X fDJVSqcJbc+dTTxUdwaMPKFRJZUP97ftiTHGIybPwJ3aCG6cvsBUbX3uq4Do4PchjF XVO3YhdQSp4cA== From: Leon Romanovsky To: Jason Gunthorpe Cc: Leon Romanovsky , linux-rdma@vger.kernel.org, Michael Guralnik Subject: [PATCH rdma-next 1/2] RDMA/mlx5: Fix MR cache debugfs in switchdev mode Date: Thu, 2 Feb 2023 11:03:06 +0200 Message-Id: <482a78c54acbcfa1742a0e06a452546428900ffa.1675328463.git.leon@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Leon Romanovsky Block MR cache debugfs creation while in switchdev mode and add missing debugfs cleanup in error path. This change fixes the following debugfs errors: bond0: (slave enp8s0f1): Enslaving as a backup interface with an up link mlx5_core 0000:08:00.0: lag map: port 1:1 port 2:1 mlx5_core 0000:08:00.0: shared_fdb:1 mode:queue_affinity mlx5_core 0000:08:00.0: Operation mode is single FDB debugfs: Directory '2' with parent '/' already present! ... debugfs: Directory '22' with parent '/' already present! Fixes: 73d09b2fe833 ("RDMA/mlx5: Introduce mlx5r_cache_rb_key") Signed-off-by: Michael Guralnik Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/mr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index 3a9a787184fc..3f410eef58e4 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -848,6 +848,9 @@ static void mlx5_mkey_cache_debugfs_add_ent(struct mlx5_ib_dev *dev, int order = order_base_2(ent->rb_key.ndescs); struct dentry *dir; + if (!mlx5_debugfs_root || dev->is_rep) + return; + if (ent->rb_key.access_mode == MLX5_MKC_ACCESS_MODE_KSM) order = MLX5_IMR_KSM_CACHE_ENTRY + 2; @@ -1006,6 +1009,7 @@ int mlx5_mkey_cache_init(struct mlx5_ib_dev *dev) err: mutex_unlock(&cache->rb_lock); + mlx5_mkey_cache_debugfs_cleanup(dev); mlx5_ib_warn(dev, "failed to create mkey cache entry\n"); return ret; } From patchwork Thu Feb 2 09:03:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13125568 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33E4EC61DA4 for ; Thu, 2 Feb 2023 09:03:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232157AbjBBJDd (ORCPT ); Thu, 2 Feb 2023 04:03:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232411AbjBBJD0 (ORCPT ); Thu, 2 Feb 2023 04:03:26 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABCCBA2 for ; Thu, 2 Feb 2023 01:03:21 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4A6AD6192B for ; Thu, 2 Feb 2023 09:03:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 353E4C433D2; Thu, 2 Feb 2023 09:03:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675328600; bh=nfiwIFCRHnnUF7GhQ58xsfp6Szun+7IZC8Ii9isYTNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oEt8lVidQtgVOuxfMRh/HWv2QVgjlLd4+RIuCvfzbTyR5aUOW2TkjjdoW2YWpKcfa vmDEGDsWVmkrm4eq+xIeK1Q7nxozbrMPghF3rrOshcCAE3a3LepZ2lzzp2ZXlRh2wh ZZW5xoiaowUINjkOT8Gzi5NRl9rMLvF96U+4XSyVhvUvQVNynn2DngOLBpxFyYHBEU njxY8w+3e4v6ff+VPmH4IjJKVylzMXJjeU/yAt7t5oa2X7niXm6cu2IBx8RIP20KcP Xz6gUhiYeH0/Om2VgJueoR+fvcyaREUmvxEKw4BtqnU62ifBPZadnXHUsRImHpugd7 +xTP4FGeswX5A== From: Leon Romanovsky To: Jason Gunthorpe Cc: Leon Romanovsky , linux-rdma@vger.kernel.org, Michael Guralnik Subject: [PATCH rdma-next 2/2] RDMA/mlx5: Remove impossible check of mkey cache cleanup failure Date: Thu, 2 Feb 2023 11:03:07 +0200 Message-Id: <1acd9528995d083114e7dec2a2afc59436406583.1675328463.git.leon@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Leon Romanovsky mlx5_mkey_cache_cleanup() can't fail and can be changed to be void. Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/main.c | 7 +------ drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +- drivers/infiniband/hw/mlx5/mr.c | 6 ++---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 10f12e9a4dc3..e252ba138690 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -4005,12 +4005,7 @@ static int mlx5_ib_stage_ib_reg_init(struct mlx5_ib_dev *dev) static void mlx5_ib_stage_pre_ib_reg_umr_cleanup(struct mlx5_ib_dev *dev) { - int err; - - err = mlx5_mkey_cache_cleanup(dev); - if (err) - mlx5_ib_warn(dev, "mr cache cleanup failed\n"); - + mlx5_mkey_cache_cleanup(dev); mlx5r_umr_resource_cleanup(dev); } diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h index 58d02e778c4b..93420b73bf20 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -1337,7 +1337,7 @@ void mlx5_ib_populate_pas(struct ib_umem *umem, size_t page_size, __be64 *pas, void mlx5_ib_copy_pas(u64 *old, u64 *new, int step, int num); int mlx5_ib_get_cqe_size(struct ib_cq *ibcq); int mlx5_mkey_cache_init(struct mlx5_ib_dev *dev); -int mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev); +void mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev); struct mlx5_cache_ent * mlx5r_cache_create_ent_locked(struct mlx5_ib_dev *dev, struct mlx5r_cache_rb_key rb_key, diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index 3f410eef58e4..68102297b9cb 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -1014,14 +1014,14 @@ int mlx5_mkey_cache_init(struct mlx5_ib_dev *dev) return ret; } -int mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev) +void mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev) { struct rb_root *root = &dev->cache.rb_root; struct mlx5_cache_ent *ent; struct rb_node *node; if (!dev->cache.wq) - return 0; + return; cancel_delayed_work_sync(&dev->cache.remove_ent_dwork); mutex_lock(&dev->cache.rb_lock); @@ -1048,8 +1048,6 @@ int mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev) destroy_workqueue(dev->cache.wq); del_timer_sync(&dev->delay_timer); - - return 0; } struct ib_mr *mlx5_ib_get_dma_mr(struct ib_pd *pd, int acc)