From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 4B8AAA04DD;
Wed, 28 Oct 2020 10:02:18 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 2E768BE9F;
Wed, 28 Oct 2020 10:02:17 +0100 (CET)
Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])
by dpdk.org (Postfix) with ESMTP id F2CFCBE4B
for <dev@dpdk.org>; Wed, 28 Oct 2020 10:02:14 +0100 (CET)
Received: from Internal Mail-Server by MTLPINE1 (envelope-from
suanmingm@nvidia.com) with SMTP; 28 Oct 2020 11:00:45 +0200
Received: from nvidia.com (mtbc-r640-04.mtbc.labs.mlnx [10.75.70.9])
by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 09S90Jm8024495;
Wed, 28 Oct 2020 11:00:39 +0200
From: Suanming Mou <suanmingm@nvidia.com>
To: Matan Azrad <matan@nvidia.com>, Shahaf Shuler <shahafs@nvidia.com>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Cc: dev@dpdk.org, rasland@nvidia.com
Date: Wed, 28 Oct 2020 16:59:49 +0800
Message-Id: <1603875616-272798-9-git-send-email-suanmingm@nvidia.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1603875616-272798-1-git-send-email-suanmingm@nvidia.com>
References: <1601984948-313027-1-git-send-email-suanmingm@nvidia.com>
<1603875616-272798-1-git-send-email-suanmingm@nvidia.com>
Subject: [dpdk-dev] [PATCH v5 08/34] net/mlx5: make VLAN network interface
thread safe
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
This commit protects the VLAN VM workaround area using a spinlock
in multiple-thread flow insertion to make it thread safe.
Signed-off-by: Suanming Mou <suanmingm@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
drivers/common/mlx5/linux/mlx5_nl.h | 1 +
drivers/net/mlx5/linux/mlx5_vlan_os.c | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/drivers/common/mlx5/linux/mlx5_nl.h b/drivers/common/mlx5/linux/mlx5_nl.h
index 53021e1..15129ff 100644
--- a/drivers/common/mlx5/linux/mlx5_nl.h
+++ b/drivers/common/mlx5/linux/mlx5_nl.h
@@ -25,6 +25,7 @@ struct mlx5_nl_vlan_dev {
struct mlx5_nl_vlan_vmwa_context {
int nl_socket;
uint32_t vf_ifindex;
+ rte_spinlock_t sl;
struct mlx5_nl_vlan_dev vlan_dev[4096];
};
diff --git a/drivers/net/mlx5/linux/mlx5_vlan_os.c b/drivers/net/mlx5/linux/mlx5_vlan_os.c
index 92fc17d..40e895e 100644
--- a/drivers/net/mlx5/linux/mlx5_vlan_os.c
+++ b/drivers/net/mlx5/linux/mlx5_vlan_os.c
@@ -44,12 +44,14 @@
if (!vlan->created || !vmwa)
return;
vlan->created = 0;
+ rte_spinlock_lock(&vmwa->sl);
MLX5_ASSERT(vlan_dev[vlan->tag].refcnt);
if (--vlan_dev[vlan->tag].refcnt == 0 &&
vlan_dev[vlan->tag].ifindex) {
mlx5_nl_vlan_vmwa_delete(vmwa, vlan_dev[vlan->tag].ifindex);
vlan_dev[vlan->tag].ifindex = 0;
}
+ rte_spinlock_unlock(&vmwa->sl);
}
/**
@@ -72,6 +74,7 @@
MLX5_ASSERT(priv->vmwa_context);
if (vlan->created || !vmwa)
return;
+ rte_spinlock_lock(&vmwa->sl);
if (vlan_dev[vlan->tag].refcnt == 0) {
MLX5_ASSERT(!vlan_dev[vlan->tag].ifindex);
vlan_dev[vlan->tag].ifindex =
@@ -82,6 +85,7 @@
vlan_dev[vlan->tag].refcnt++;
vlan->created = 1;
}
+ rte_spinlock_unlock(&vmwa->sl);
}
/*
@@ -131,6 +135,7 @@
" for VLAN workaround context");
return NULL;
}
+ rte_spinlock_init(&vmwa->sl);
vmwa->nl_socket = mlx5_nl_init(NETLINK_ROUTE);
if (vmwa->nl_socket < 0) {
DRV_LOG(WARNING,
--
1.8.3.1