From owner-svn-src-stable-10@freebsd.org Mon Aug 7 12:38:06 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2446EDD0AA7; Mon, 7 Aug 2017 12:38:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 001D668EDC; Mon, 7 Aug 2017 12:38:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v77Cc5Ei086242; Mon, 7 Aug 2017 12:38:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v77Cc5Aa086239; Mon, 7 Aug 2017 12:38:05 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201708071238.v77Cc5Aa086239@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 7 Aug 2017 12:38:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r322145 - in stable/10/sys/dev/mlx5: . mlx5_core X-SVN-Group: stable-10 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in stable/10/sys/dev/mlx5: . mlx5_core X-SVN-Commit-Revision: 322145 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Aug 2017 12:38:06 -0000 Author: hselasky Date: Mon Aug 7 12:38:04 2017 New Revision: 322145 URL: https://svnweb.freebsd.org/changeset/base/322145 Log: MFC r312880: Wait for all VFs pages to be reclaimed before closing EQ pages. Sponsored by: Mellanox Technologies Modified: stable/10/sys/dev/mlx5/driver.h stable/10/sys/dev/mlx5/mlx5_core/mlx5_main.c stable/10/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/mlx5/driver.h ============================================================================== --- stable/10/sys/dev/mlx5/driver.h Mon Aug 7 12:36:48 2017 (r322144) +++ stable/10/sys/dev/mlx5/driver.h Mon Aug 7 12:38:04 2017 (r322145) @@ -43,6 +43,7 @@ #include #define MLX5_QCOUNTER_SETS_NETDEV 64 +#define MLX5_MAX_NUMBER_OF_VFS 128 enum { MLX5_BOARD_ID_LEN = 64, @@ -521,7 +522,7 @@ struct mlx5_priv { s64 fw_pages; atomic_t reg_pages; struct list_head free_list; - + s64 pages_per_func[MLX5_MAX_NUMBER_OF_VFS]; struct mlx5_core_health health; struct mlx5_srq_table srq_table; @@ -850,6 +851,7 @@ void mlx5_core_req_pages_handler(struct mlx5_core_dev s32 npages); int mlx5_satisfy_startup_pages(struct mlx5_core_dev *dev, int boot); int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev); +s64 mlx5_wait_for_reclaim_vfs_pages(struct mlx5_core_dev *dev); void mlx5_register_debugfs(void); void mlx5_unregister_debugfs(void); int mlx5_eq_init(struct mlx5_core_dev *dev); Modified: stable/10/sys/dev/mlx5/mlx5_core/mlx5_main.c ============================================================================== --- stable/10/sys/dev/mlx5/mlx5_core/mlx5_main.c Mon Aug 7 12:36:48 2017 (r322144) +++ stable/10/sys/dev/mlx5/mlx5_core/mlx5_main.c Mon Aug 7 12:38:04 2017 (r322145) @@ -851,6 +851,7 @@ static void mlx5_dev_cleanup(struct mlx5_core_dev *dev mlx5_cleanup_qp_table(dev); mlx5_cleanup_cq_table(dev); unmap_bf_area(dev); + mlx5_wait_for_reclaim_vfs_pages(dev); free_comp_eqs(dev); mlx5_stop_eqs(dev); mlx5_free_uuars(dev, &priv->uuari); Modified: stable/10/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c ============================================================================== --- stable/10/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c Mon Aug 7 12:36:48 2017 (r322144) +++ stable/10/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c Mon Aug 7 12:38:04 2017 (r322145) @@ -27,6 +27,7 @@ #include #include +#include #include #include "mlx5_core.h" @@ -282,6 +283,7 @@ retry: goto out_alloc; } dev->priv.fw_pages += npages; + dev->priv.pages_per_func[func_id] += npages; if (out.hdr.status) { err = mlx5_cmd_status_to_err(&out.hdr); @@ -355,7 +357,7 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u3 *nclaimed = num_claimed; dev->priv.fw_pages -= num_claimed; - + dev->priv.pages_per_func[func_id] -= num_claimed; for (i = 0; i < num_claimed; i++) { addr = be64_to_cpu(out->pas[i]); free_4k(dev, addr); @@ -422,6 +424,31 @@ int mlx5_satisfy_startup_pages(struct mlx5_core_dev *d enum { MLX5_BLKS_FOR_RECLAIM_PAGES = 12 }; + +s64 mlx5_wait_for_reclaim_vfs_pages(struct mlx5_core_dev *dev) +{ + int end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS); + s64 prevpages = 0; + s64 npages = 0; + + while (!time_after(jiffies, end)) { + /* exclude own function, VFs only */ + npages = dev->priv.fw_pages - dev->priv.pages_per_func[0]; + if (!npages) + break; + + if (npages != prevpages) + end = end + msecs_to_jiffies(100); + + prevpages = npages; + msleep(1); + } + + if (npages) + mlx5_core_warn(dev, "FW did not return all VFs pages, will cause to memory leak\n"); + + return -npages; +} static int optimal_reclaimed_pages(void) {