From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <thomas@monjalon.net>
Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com
[66.111.4.27]) by dpdk.org (Postfix) with ESMTP id D2A8DCFFE
for <stable@dpdk.org>; Wed, 9 May 2018 11:31:17 +0200 (CEST)
Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
by mailout.nyi.internal (Postfix) with ESMTP id 82BC2228BC;
Wed, 9 May 2018 05:31:17 -0400 (EDT)
Received: from mailfrontend1 ([10.202.2.162])
by compute1.internal (MEProxy); Wed, 09 May 2018 05:31:17 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
cc:date:from:in-reply-to:message-id:references:subject:to
:x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=XNCEzINWU6zyRh
QH1jzMYfCxNCS9fxCqCjlyB330tSg=; b=ArFdARTKmx5ieQfMQcUkVvpTQXRqgX
vxWBVTIEZ7bq5DnDG8lg5zzRFSOWCuYGlvHsz4J824O3Astc5GvuWQZT/aQyxbi1
AkQdzT+GIe0+96xMXkZFOviWawbIxfVJRIJRdKdWuqOD3K9EW2o7g9eiM5llXUcZ
sDhk74xrYkbIg=
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:date:from:in-reply-to:message-id
:references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=
fm2; bh=XNCEzINWU6zyRhQH1jzMYfCxNCS9fxCqCjlyB330tSg=; b=OyIlC72f
8IxO/ccXXU2WxrLu4bHPWDbmeNbMYzZW4bAlkj3jC+4tp78sI9LpOBx/tAhBSEYv
ZUfyGgHepaaxR8q1j3pYwu3sY/DqQySDoGORD+1vyrLOVLYsaWUUsmG2zHly8bOw
Gn6TtOc8hwjaW7n0fNNmKJP3z01o4/1KL5vOnewfSC3aavcd6zlRVTYdi2f9TBoH
EGT+kmHhSQZ2OP/qhRy7+zKRGS6iKFcH1r30FAKcCm4TBzUri0c07Nnd+IOzVHRo
s8x7djMpqPK3W4H79RYDOx06ofjH9sX8ZmqLEMI7k+6GOnJ3qUDcNEb8zNLMl+6D
H2kAF6BQhRULKg==
X-ME-Sender: <xms:5b_yWsPXzsoG3FBT3ozEEJmszlNe8YJ9dlJ9MR527hL4pdrZLqlxWA>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id D91EAE4EEF;
Wed, 9 May 2018 05:31:16 -0400 (EDT)
From: Thomas Monjalon <thomas@monjalon.net>
To: matan@mellanox.com
Cc: stable@dpdk.org
Date: Wed, 9 May 2018 11:31:00 +0200
Message-Id: <20180509093105.25984-7-thomas@monjalon.net>
X-Mailer: git-send-email 2.16.2
In-Reply-To: <20180509093105.25984-1-thomas@monjalon.net>
References: <20180509093105.25984-1-thomas@monjalon.net>
Subject: [dpdk-stable] [PATCH 06/11] ethdev: allow ownership operations on
unused port
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 09 May 2018 09:31:18 -0000
From: Matan Azrad <matan@mellanox.com>
When the state will be updated later than in allocation,
we may need to update the ownership of a port which is
still in state unused.
It will be used to take ownership of a port before it is
declared as available for other entities.
Cc: stable@dpdk.org
Signed-off-by: Matan Azrad <matan@mellanox.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
---
lib/librte_ethdev/rte_ethdev.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 6071e3a9b..ae86d0ba7 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -414,10 +414,14 @@ static int
_rte_eth_dev_owner_set(const uint16_t port_id, const uint64_t old_owner_id,
const struct rte_eth_dev_owner *new_owner)
{
+ struct rte_eth_dev *ethdev = &rte_eth_devices[port_id];
struct rte_eth_dev_owner *port_owner;
int sret;
- RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+ if (port_id >= RTE_MAX_ETHPORTS || ethdev->data->name[0] == '\0') {
+ RTE_PMD_DEBUG_TRACE("Port id %"PRIu16" is not allocated.\n", port_id);
+ return -ENODEV;
+ }
if (!rte_eth_is_valid_owner_id(new_owner->id) &&
!rte_eth_is_valid_owner_id(old_owner_id))
@@ -481,16 +485,17 @@ rte_eth_dev_owner_unset(const uint16_t port_id, const uint64_t owner_id)
void __rte_experimental
rte_eth_dev_owner_delete(const uint64_t owner_id)
{
- uint16_t port_id;
+ uint32_t port_id;
rte_eth_dev_shared_data_prepare();
rte_spinlock_lock(&rte_eth_dev_shared_data->ownership_lock);
if (rte_eth_is_valid_owner_id(owner_id)) {
- RTE_ETH_FOREACH_DEV_OWNED_BY(port_id, owner_id)
- memset(&rte_eth_devices[port_id].data->owner, 0,
- sizeof(struct rte_eth_dev_owner));
+ for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++)
+ if (rte_eth_devices[port_id].data->owner.id == owner_id)
+ memset(&rte_eth_devices[port_id].data->owner, 0,
+ sizeof(struct rte_eth_dev_owner));
RTE_PMD_DEBUG_TRACE("All port owners owned by %016"PRIX64
" identifier have removed.\n", owner_id);
}
@@ -502,17 +507,17 @@ int __rte_experimental
rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)
{
int ret = 0;
+ struct rte_eth_dev *ethdev = &rte_eth_devices[port_id];
rte_eth_dev_shared_data_prepare();
rte_spinlock_lock(&rte_eth_dev_shared_data->ownership_lock);
- if (!rte_eth_dev_is_valid_port(port_id)) {
- RTE_PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+ if (port_id >= RTE_MAX_ETHPORTS || ethdev->data->name[0] == '\0') {
+ RTE_PMD_DEBUG_TRACE("Port id %"PRIu16" is not allocated.\n", port_id);
ret = -ENODEV;
} else {
- rte_memcpy(owner, &rte_eth_devices[port_id].data->owner,
- sizeof(*owner));
+ rte_memcpy(owner, ðdev->data->owner, sizeof(*owner));
}
rte_spinlock_unlock(&rte_eth_dev_shared_data->ownership_lock);
--
2.16.2