From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 55A28A034F for ; Wed, 11 Aug 2021 10:31:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1EDBA40040; Wed, 11 Aug 2021 10:31:58 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id 9F4C040040 for ; Wed, 11 Aug 2021 10:31:56 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DE6DF106F; Wed, 11 Aug 2021 01:31:55 -0700 (PDT) Received: from net-x86-dell-8268.shanghai.arm.com (net-x86-dell-8268.shanghai.arm.com [10.169.210.99]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C98483F70D; Wed, 11 Aug 2021 01:31:53 -0700 (PDT) From: Feifei Wang To: christian.ehrhardt@canonical.com Cc: stable@dpdk.org, nd@arm.com, Feifei Wang , shahafs@mellanox.com, Ruifeng Wang Date: Wed, 11 Aug 2021 16:31:46 +0800 Message-Id: <20210811083146.2048667-1-feifei.wang2@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 19.11] net/mlx5: fix incorrect r/w lock usage in DMA unmap X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" [ upstream commit 1c196da274b82e6f1642bde7b1c407a2066caee1 ] For mlx5 DMA unmap, write lock should be used for rebuilding memory region cache table rather than read lock. Fixes: 989e999d9305 ("net/mlx5: support PCI device DMA map and unmap") Cc: shahafs@mellanox.com Cc: stable@dpdk.org Signed-off-by: Feifei Wang Reviewed-by: Ruifeng Wang --- drivers/net/mlx5/mlx5_mr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c index 54a11bd5d1..71c2254c91 100644 --- a/drivers/net/mlx5/mlx5_mr.c +++ b/drivers/net/mlx5/mlx5_mr.c @@ -1397,10 +1397,10 @@ mlx5_dma_unmap(struct rte_pci_device *pdev, void *addr, } priv = dev->data->dev_private; sh = priv->sh; - rte_rwlock_read_lock(&sh->mr.rwlock); + rte_rwlock_write_lock(&sh->mr.rwlock); mr = mr_lookup_dev_list(sh, &entry, (uintptr_t)addr); if (!mr) { - rte_rwlock_read_unlock(&sh->mr.rwlock); + rte_rwlock_write_unlock(&sh->mr.rwlock); DRV_LOG(WARNING, "address 0x%" PRIxPTR " wasn't registered " "to PCI device %p", (uintptr_t)addr, (void *)pdev); @@ -1424,7 +1424,7 @@ mlx5_dma_unmap(struct rte_pci_device *pdev, void *addr, ++sh->mr.dev_gen; DEBUG("broadcasting local cache flush, gen=%d", sh->mr.dev_gen); rte_smp_wmb(); - rte_rwlock_read_unlock(&sh->mr.rwlock); + rte_rwlock_write_unlock(&sh->mr.rwlock); return 0; } -- 2.25.1