From mboxrd@z Thu Jan 1 00:00:00 1970 From: Raslan Darawsheh Subject: [PATCH v2 3/4] net/failsafe: replace local sub-device with shared data Date: Tue, 5 Mar 2019 09:52:05 +0000 Message-ID: <1551779507-10857-3-git-send-email-rasland@mellanox.com> References: <1551779507-10857-1-git-send-email-rasland@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: "dev@dpdk.org" , Thomas Monjalon , Raslan Darawsheh , "stephen@networkplumber.org" To: "gaetan.rivet@6wind.com" Return-path: Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10084.outbound.protection.outlook.com [40.107.1.84]) by dpdk.org (Postfix) with ESMTP id AFCF227D for ; Tue, 5 Mar 2019 10:52:07 +0100 (CET) In-Reply-To: <1551779507-10857-1-git-send-email-rasland@mellanox.com> Content-Language: en-US List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In multiprocess context, the pointer to sub-device is shared between processes. Previously, it was a pointer to per process eth_dev so it's needed to replace this dependency. Signed-off-by: Thomas Monjalon Signed-off-by: Raslan Darawsheh --- v2: - moved comment in fs_sdev about subs to this commit - added parenthesis around macro arguments. --- drivers/net/failsafe/failsafe_eal.c | 2 +- drivers/net/failsafe/failsafe_ether.c | 7 ++++--- drivers/net/failsafe/failsafe_private.h | 13 ++++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/fai= lsafe_eal.c index 56d1669..6fac4b6 100644 --- a/drivers/net/failsafe/failsafe_eal.c +++ b/drivers/net/failsafe/failsafe_eal.c @@ -112,7 +112,7 @@ fs_bus_init(struct rte_eth_dev *dev) continue; } } - ETH(sdev) =3D &rte_eth_devices[pid]; + sdev->data =3D rte_eth_devices[pid].data; SUB_ID(sdev) =3D i; sdev->fs_port_id =3D dev->data->port_id; sdev->dev =3D ETH(sdev)->device; diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/f= ailsafe_ether.c index d5b1488..e1fff59 100644 --- a/drivers/net/failsafe/failsafe_ether.c +++ b/drivers/net/failsafe/failsafe_ether.c @@ -267,18 +267,19 @@ static void fs_dev_remove(struct sub_device *sdev) { int ret; + struct rte_eth_dev *edev =3D ETH(sdev); =20 if (sdev =3D=3D NULL) return; switch (sdev->state) { case DEV_STARTED: failsafe_rx_intr_uninstall_subdevice(sdev); - rte_eth_dev_stop(PORT_ID(sdev)); + rte_eth_dev_stop(edev->data->port_id); sdev->state =3D DEV_ACTIVE; /* fallthrough */ case DEV_ACTIVE: failsafe_eth_dev_unregister_callbacks(sdev); - rte_eth_dev_close(PORT_ID(sdev)); + rte_eth_dev_close(edev->data->port_id); sdev->state =3D DEV_PROBED; /* fallthrough */ case DEV_PROBED: @@ -287,7 +288,7 @@ fs_dev_remove(struct sub_device *sdev) ERROR("Bus detach failed for sub_device %u", SUB_ID(sdev)); } else { - rte_eth_dev_release_port(ETH(sdev)); + rte_eth_dev_release_port(edev); } sdev->state =3D DEV_PARSED; /* fallthrough */ diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe= /failsafe_private.h index 84e847f..1e2ad2d 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h @@ -100,13 +100,16 @@ struct fs_stats { uint64_t timestamp; }; =20 +/* + * Allocated in shared memory. + */ struct sub_device { /* Exhaustive DPDK device description */ struct sub_device *next; struct rte_devargs devargs; - struct rte_bus *bus; - struct rte_device *dev; - struct rte_eth_dev *edev; + struct rte_bus *bus; /* per process. */ + struct rte_device *dev; /* per process. */ + struct rte_eth_dev_data *data; /* shared between processes */ uint8_t sid; /* Device state machine */ enum dev_state state; @@ -139,7 +142,7 @@ struct fs_priv { * subs[0] is the preferred device * any other is just another slave */ - struct sub_device *subs; + struct sub_device *subs; /* shared between processes */ uint8_t subs_head; /* if head =3D=3D tail, no subs */ uint8_t subs_tail; /* first invalid */ uint8_t subs_tx; /* current emitting device */ @@ -254,7 +257,7 @@ extern int failsafe_mac_from_arg; =20 /* sdev: (struct sub_device *) */ #define ETH(sdev) \ - ((sdev)->edev) + ((sdev)->data =3D=3D NULL ? NULL : &rte_eth_devices[(sdev)->data->port_id= ]) =20 /* sdev: (struct sub_device *) */ #define PORT_ID(sdev) \ --=20 2.7.4