From owner-svn-src-all@freebsd.org Tue Apr 30 10:41:22 2019 Return-Path: Delivered-To: svn-src-all@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 E97B8158C69E; Tue, 30 Apr 2019 10:41:21 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8DAF469A68; Tue, 30 Apr 2019 10:41:21 +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 68D2A8604; Tue, 30 Apr 2019 10:41:21 +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 x3UAfLZq054369; Tue, 30 Apr 2019 10:41:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3UAfLvj054368; Tue, 30 Apr 2019 10:41:21 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201904301041.x3UAfLvj054368@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 30 Apr 2019 10:41:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r346958 - head/sys/compat/linuxkpi/common/src X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/compat/linuxkpi/common/src X-SVN-Commit-Revision: 346958 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8DAF469A68 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2019 10:41:22 -0000 Author: hselasky Date: Tue Apr 30 10:41:20 2019 New Revision: 346958 URL: https://svnweb.freebsd.org/changeset/base/346958 Log: Reduce the number of mutexes after r346645 in the LinuxKPI. Make function macro wrappers for locking and unlocking to ease readability. No functional change. Discussed with: kib@, tychon@ and zeising@ Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/src/linux_pci.c Modified: head/sys/compat/linuxkpi/common/src/linux_pci.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_pci.c Tue Apr 30 09:38:22 2019 (r346957) +++ head/sys/compat/linuxkpi/common/src/linux_pci.c Tue Apr 30 10:41:20 2019 (r346958) @@ -78,11 +78,12 @@ static device_method_t pci_methods[] = { struct linux_dma_priv { uint64_t dma_mask; - struct mtx dma_lock; + struct mtx lock; bus_dma_tag_t dmat; - struct mtx ptree_lock; struct pctrie ptree; }; +#define DMA_PRIV_LOCK(priv) mtx_lock(&(priv)->lock) +#define DMA_PRIV_UNLOCK(priv) mtx_unlock(&(priv)->lock) static int linux_pdev_dma_init(struct pci_dev *pdev) @@ -92,9 +93,8 @@ linux_pdev_dma_init(struct pci_dev *pdev) priv = malloc(sizeof(*priv), M_DEVBUF, M_WAITOK | M_ZERO); pdev->dev.dma_priv = priv; - mtx_init(&priv->dma_lock, "linux_dma", NULL, MTX_DEF); + mtx_init(&priv->lock, "lkpi-priv-dma", NULL, MTX_DEF); - mtx_init(&priv->ptree_lock, "linux_dma_ptree", NULL, MTX_DEF); pctrie_init(&priv->ptree); return (0); @@ -108,8 +108,7 @@ linux_pdev_dma_uninit(struct pci_dev *pdev) priv = pdev->dev.dma_priv; if (priv->dmat) bus_dma_tag_destroy(priv->dmat); - mtx_destroy(&priv->dma_lock); - mtx_destroy(&priv->ptree_lock); + mtx_destroy(&priv->lock); free(priv, M_DEVBUF); pdev->dev.dma_priv = NULL; return (0); @@ -500,37 +499,34 @@ linux_dma_map_phys(struct device *dev, vm_paddr_t phys obj = uma_zalloc(linux_dma_obj_zone, 0); + DMA_PRIV_LOCK(priv); if (bus_dmamap_create(priv->dmat, 0, &obj->dmamap) != 0) { + DMA_PRIV_UNLOCK(priv); uma_zfree(linux_dma_obj_zone, obj); return (0); } nseg = -1; - mtx_lock(&priv->dma_lock); if (_bus_dmamap_load_phys(priv->dmat, obj->dmamap, phys, len, BUS_DMA_NOWAIT, &seg, &nseg) != 0) { bus_dmamap_destroy(priv->dmat, obj->dmamap); - mtx_unlock(&priv->dma_lock); + DMA_PRIV_UNLOCK(priv); uma_zfree(linux_dma_obj_zone, obj); return (0); } - mtx_unlock(&priv->dma_lock); KASSERT(++nseg == 1, ("More than one segment (nseg=%d)", nseg)); obj->dma_addr = seg.ds_addr; - mtx_lock(&priv->ptree_lock); error = LINUX_DMA_PCTRIE_INSERT(&priv->ptree, obj); - mtx_unlock(&priv->ptree_lock); if (error != 0) { - mtx_lock(&priv->dma_lock); bus_dmamap_unload(priv->dmat, obj->dmamap); bus_dmamap_destroy(priv->dmat, obj->dmamap); - mtx_unlock(&priv->dma_lock); + DMA_PRIV_UNLOCK(priv); uma_zfree(linux_dma_obj_zone, obj); return (0); } - + DMA_PRIV_UNLOCK(priv); return (obj->dma_addr); } @@ -542,19 +538,16 @@ linux_dma_unmap(struct device *dev, dma_addr_t dma_add priv = dev->dma_priv; - mtx_lock(&priv->ptree_lock); + DMA_PRIV_LOCK(priv); obj = LINUX_DMA_PCTRIE_LOOKUP(&priv->ptree, dma_addr); if (obj == NULL) { - mtx_unlock(&priv->ptree_lock); + DMA_PRIV_UNLOCK(priv); return; } LINUX_DMA_PCTRIE_REMOVE(&priv->ptree, dma_addr); - mtx_unlock(&priv->ptree_lock); - - mtx_lock(&priv->dma_lock); bus_dmamap_unload(priv->dmat, obj->dmamap); bus_dmamap_destroy(priv->dmat, obj->dmamap); - mtx_unlock(&priv->dma_lock); + DMA_PRIV_UNLOCK(priv); uma_zfree(linux_dma_obj_zone, obj); } @@ -575,7 +568,9 @@ linux_dma_map_sg_attrs(struct device *dev, struct scat obj = uma_zalloc(linux_dma_obj_zone, 0); + DMA_PRIV_LOCK(priv); if (bus_dmamap_create(priv->dmat, 0, &obj->dmamap) != 0) { + DMA_PRIV_UNLOCK(priv); uma_zfree(linux_dma_obj_zone, obj); return (0); } @@ -583,6 +578,7 @@ linux_dma_map_sg_attrs(struct device *dev, struct scat sg = sgl; dma_sg = sg; dma_nents = 0; + while (nents > 0) { seg_phys = sg_phys(sg); seg_len = sg->length; @@ -595,17 +591,15 @@ linux_dma_map_sg_attrs(struct device *dev, struct scat } nseg = -1; - mtx_lock(&priv->dma_lock); if (_bus_dmamap_load_phys(priv->dmat, obj->dmamap, seg_phys, seg_len, BUS_DMA_NOWAIT, &seg, &nseg) != 0) { bus_dmamap_unload(priv->dmat, obj->dmamap); bus_dmamap_destroy(priv->dmat, obj->dmamap); - mtx_unlock(&priv->dma_lock); + DMA_PRIV_UNLOCK(priv); uma_zfree(linux_dma_obj_zone, obj); return (0); } - mtx_unlock(&priv->dma_lock); KASSERT(++nseg == 1, ("More than one segment (nseg=%d)", nseg)); sg_dma_address(dma_sg) = seg.ds_addr; @@ -617,18 +611,15 @@ linux_dma_map_sg_attrs(struct device *dev, struct scat obj->dma_addr = sg_dma_address(sgl); - mtx_lock(&priv->ptree_lock); error = LINUX_DMA_PCTRIE_INSERT(&priv->ptree, obj); - mtx_unlock(&priv->ptree_lock); if (error != 0) { - mtx_lock(&priv->dma_lock); bus_dmamap_unload(priv->dmat, obj->dmamap); bus_dmamap_destroy(priv->dmat, obj->dmamap); - mtx_unlock(&priv->dma_lock); + DMA_PRIV_UNLOCK(priv); uma_zfree(linux_dma_obj_zone, obj); return (0); } - + DMA_PRIV_UNLOCK(priv); return (dma_nents); } @@ -641,19 +632,16 @@ linux_dma_unmap_sg_attrs(struct device *dev, struct sc priv = dev->dma_priv; - mtx_lock(&priv->ptree_lock); + DMA_PRIV_LOCK(priv); obj = LINUX_DMA_PCTRIE_LOOKUP(&priv->ptree, sg_dma_address(sgl)); if (obj == NULL) { - mtx_unlock(&priv->ptree_lock); + DMA_PRIV_UNLOCK(priv); return; } LINUX_DMA_PCTRIE_REMOVE(&priv->ptree, sg_dma_address(sgl)); - mtx_unlock(&priv->ptree_lock); - - mtx_lock(&priv->dma_lock); bus_dmamap_unload(priv->dmat, obj->dmamap); bus_dmamap_destroy(priv->dmat, obj->dmamap); - mtx_unlock(&priv->dma_lock); + DMA_PRIV_UNLOCK(priv); uma_zfree(linux_dma_obj_zone, obj); } @@ -661,13 +649,15 @@ linux_dma_unmap_sg_attrs(struct device *dev, struct sc struct dma_pool { struct device *pool_device; uma_zone_t pool_zone; - struct mtx pool_dma_lock; + struct mtx pool_lock; bus_dma_tag_t pool_dmat; size_t pool_entry_size; - struct mtx pool_ptree_lock; struct pctrie pool_ptree; }; +#define DMA_POOL_LOCK(pool) mtx_lock(&(pool)->pool_lock) +#define DMA_POOL_UNLOCK(pool) mtx_unlock(&(pool)->pool_lock) + static inline int dma_pool_obj_ctor(void *mem, int size, void *arg, int flags) { @@ -677,11 +667,11 @@ dma_pool_obj_ctor(void *mem, int size, void *arg, int bus_dma_segment_t seg; nseg = -1; - mtx_lock(&pool->pool_dma_lock); + DMA_POOL_LOCK(pool); error = _bus_dmamap_load_phys(pool->pool_dmat, obj->dmamap, vtophys(obj->vaddr), pool->pool_entry_size, BUS_DMA_NOWAIT, &seg, &nseg); - mtx_unlock(&pool->pool_dma_lock); + DMA_POOL_UNLOCK(pool); if (error != 0) { return (error); } @@ -697,9 +687,9 @@ dma_pool_obj_dtor(void *mem, int size, void *arg) struct linux_dma_obj *obj = mem; struct dma_pool *pool = arg; - mtx_lock(&pool->pool_dma_lock); + DMA_POOL_LOCK(pool); bus_dmamap_unload(pool->pool_dmat, obj->dmamap); - mtx_unlock(&pool->pool_dma_lock); + DMA_POOL_UNLOCK(pool); } static int @@ -778,10 +768,7 @@ linux_dma_pool_create(char *name, struct device *dev, dma_pool_obj_dtor, NULL, NULL, dma_pool_obj_import, dma_pool_obj_release, pool, 0); - mtx_init(&pool->pool_dma_lock, "linux_dma_pool", NULL, MTX_DEF); - - mtx_init(&pool->pool_ptree_lock, "linux_dma_pool_ptree", NULL, - MTX_DEF); + mtx_init(&pool->pool_lock, "lkpi-dma-pool", NULL, MTX_DEF); pctrie_init(&pool->pool_ptree); return (pool); @@ -793,8 +780,7 @@ linux_dma_pool_destroy(struct dma_pool *pool) uma_zdestroy(pool->pool_zone); bus_dma_tag_destroy(pool->pool_dmat); - mtx_destroy(&pool->pool_ptree_lock); - mtx_destroy(&pool->pool_dma_lock); + mtx_destroy(&pool->pool_lock); kfree(pool); } @@ -808,13 +794,13 @@ linux_dma_pool_alloc(struct dma_pool *pool, gfp_t mem_ if (obj == NULL) return (NULL); - mtx_lock(&pool->pool_ptree_lock); + DMA_POOL_LOCK(pool); if (LINUX_DMA_PCTRIE_INSERT(&pool->pool_ptree, obj) != 0) { - mtx_unlock(&pool->pool_ptree_lock); + DMA_POOL_UNLOCK(pool); uma_zfree_arg(pool->pool_zone, obj, pool); return (NULL); } - mtx_unlock(&pool->pool_ptree_lock); + DMA_POOL_UNLOCK(pool); *handle = obj->dma_addr; return (obj->vaddr); @@ -825,14 +811,14 @@ linux_dma_pool_free(struct dma_pool *pool, void *vaddr { struct linux_dma_obj *obj; - mtx_lock(&pool->pool_ptree_lock); + DMA_POOL_LOCK(pool); obj = LINUX_DMA_PCTRIE_LOOKUP(&pool->pool_ptree, dma_addr); if (obj == NULL) { - mtx_unlock(&pool->pool_ptree_lock); + DMA_POOL_UNLOCK(pool); return; } LINUX_DMA_PCTRIE_REMOVE(&pool->pool_ptree, dma_addr); - mtx_unlock(&pool->pool_ptree_lock); + DMA_POOL_UNLOCK(pool); uma_zfree_arg(pool->pool_zone, obj, pool); }