From owner-svn-src-stable@freebsd.org Fri Mar 30 18:55:15 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4F16F5741A; Fri, 30 Mar 2018 18:55:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 76D4A7834A; Fri, 30 Mar 2018 18:55:14 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71B204E60; Fri, 30 Mar 2018 18:55:14 +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 w2UItEaA089024; Fri, 30 Mar 2018 18:55:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2UItEkw089021; Fri, 30 Mar 2018 18:55:14 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803301855.w2UItEkw089021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 30 Mar 2018 18:55:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r331803 - stable/11/sys/dev/mlx5/mlx5_en X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/dev/mlx5/mlx5_en X-SVN-Commit-Revision: 331803 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@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2018 18:55:15 -0000 Author: hselasky Date: Fri Mar 30 18:55:13 2018 New Revision: 331803 URL: https://svnweb.freebsd.org/changeset/base/331803 Log: MFC r331437: Create designated workqueue for each mlx5en(4) device instance. The mlx5e_destroy_ifp() function may be called from the system workqueue and in this case trying to flush all works will cause a dead lock. Instead of using the system workqueue, create a designated workqueue for each mlx5en(4) device instance. Submitted by: slavash@ Sponsored by: Mellanox Technologies Modified: stable/11/sys/dev/mlx5/mlx5_en/en.h stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/mlx5/mlx5_en/en.h ============================================================================== --- stable/11/sys/dev/mlx5/mlx5_en/en.h Fri Mar 30 18:53:58 2018 (r331802) +++ stable/11/sys/dev/mlx5/mlx5_en/en.h Fri Mar 30 18:55:13 2018 (r331803) @@ -759,6 +759,8 @@ struct mlx5e_priv { struct mlx5e_stats stats; int counter_set_id; + struct workqueue_struct *wq; + eventhandler_tag vlan_detach; eventhandler_tag vlan_attach; struct ifmedia media; Modified: stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c ============================================================================== --- stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Fri Mar 30 18:53:58 2018 (r331802) +++ stable/11/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Fri Mar 30 18:55:13 2018 (r331803) @@ -640,7 +640,7 @@ mlx5e_update_stats(void *arg) { struct mlx5e_priv *priv = arg; - schedule_work(&priv->update_stats_work); + queue_work(priv->wq, &priv->update_stats_work); callout_reset(&priv->watchdog, hz, &mlx5e_update_stats, priv); } @@ -652,7 +652,7 @@ mlx5e_async_event_sub(struct mlx5e_priv *priv, switch (event) { case MLX5_DEV_EVENT_PORT_UP: case MLX5_DEV_EVENT_PORT_DOWN: - schedule_work(&priv->update_carrier_work); + queue_work(priv->wq, &priv->update_carrier_work); break; default: @@ -2585,7 +2585,7 @@ mlx5e_set_rx_mode(struct ifnet *ifp) { struct mlx5e_priv *priv = ifp->if_softc; - schedule_work(&priv->set_rx_mode_work); + queue_work(priv->wq, &priv->set_rx_mode_work); } static int @@ -3425,11 +3425,20 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev) goto err_free_sysctl; } mlx5e_build_ifp_priv(mdev, priv, ncv); + + snprintf(unit, sizeof(unit), "mce%u_wq", + device_get_unit(mdev->pdev->dev.bsddev)); + priv->wq = alloc_workqueue(unit, 0, 1); + if (priv->wq == NULL) { + if_printf(ifp, "%s: alloc_workqueue failed\n", __func__); + goto err_free_sysctl; + } + err = mlx5_alloc_map_uar(mdev, &priv->cq_uar); if (err) { if_printf(ifp, "%s: mlx5_alloc_map_uar failed, %d\n", __func__, err); - goto err_free_sysctl; + goto err_free_wq; } err = mlx5_core_alloc_pd(mdev, &priv->pdn); if (err) { @@ -3544,6 +3553,9 @@ err_dealloc_pd: err_unmap_free_uar: mlx5_unmap_free_uar(mdev, &priv->cq_uar); +err_free_wq: + destroy_workqueue(priv->wq); + err_free_sysctl: sysctl_ctx_free(&priv->sysctl_ctx); @@ -3604,7 +3616,7 @@ mlx5e_destroy_ifp(struct mlx5_core_dev *mdev, void *vp mlx5_core_dealloc_pd(priv->mdev, priv->pdn); mlx5_unmap_free_uar(priv->mdev, &priv->cq_uar); mlx5e_disable_async_events(priv); - flush_scheduled_work(); + destroy_workqueue(priv->wq); mlx5e_priv_mtx_destroy(priv); free(priv, M_MLX5EN); }