From mboxrd@z Thu Jan 1 00:00:00 1970 From: Raslan Darawsheh Subject: [PATCH v2 2/4] net/failsafe: change back-reference from sub-device Date: Tue, 5 Mar 2019 09:52:05 +0000 Message-ID: <1551779507-10857-2-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 EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140070.outbound.protection.outlook.com [40.107.14.70]) by dpdk.org (Postfix) with ESMTP id 8B72E2BA7 for ; Tue, 5 Mar 2019 10:52:06 +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 sub-device structure is shared between processes. The reference to the failsafe device was a per process pointer. It's changed to port id which is the same for all processes. Signed-off-by: Raslan Darawsheh Signed-off-by: Thomas Monjalon --- v2: changed macro to an inline function --- drivers/net/failsafe/failsafe_eal.c | 2 +- drivers/net/failsafe/failsafe_ether.c | 15 ++++++++------- drivers/net/failsafe/failsafe_intr.c | 10 +++++----- drivers/net/failsafe/failsafe_private.h | 13 ++++++++++--- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/fai= lsafe_eal.c index 8a888b1..56d1669 100644 --- a/drivers/net/failsafe/failsafe_eal.c +++ b/drivers/net/failsafe/failsafe_eal.c @@ -114,7 +114,7 @@ fs_bus_init(struct rte_eth_dev *dev) } ETH(sdev) =3D &rte_eth_devices[pid]; SUB_ID(sdev) =3D i; - sdev->fs_dev =3D dev; + sdev->fs_port_id =3D dev->data->port_id; sdev->dev =3D ETH(sdev)->device; sdev->state =3D DEV_PROBED; } diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/f= ailsafe_ether.c index 1783165..d5b1488 100644 --- a/drivers/net/failsafe/failsafe_ether.c +++ b/drivers/net/failsafe/failsafe_ether.c @@ -298,7 +298,7 @@ fs_dev_remove(struct sub_device *sdev) break; } sdev->remove =3D 0; - failsafe_hotplug_alarm_install(sdev->fs_dev); + failsafe_hotplug_alarm_install(fsdev_from_subdev(sdev)); } =20 static void @@ -318,8 +318,9 @@ fs_dev_stats_save(struct sub_device *sdev) WARN("Using latest snapshot taken before %"PRIu64" seconds.\n", (rte_rdtsc() - timestamp) / rte_get_tsc_hz()); } - failsafe_stats_increment(&PRIV(sdev->fs_dev)->stats_accumulator, - err ? &sdev->stats_snapshot.stats : &stats); + failsafe_stats_increment + (&PRIV(fsdev_from_subdev(sdev))->stats_accumulator, + err ? &sdev->stats_snapshot.stats : &stats); memset(&sdev->stats_snapshot, 0, sizeof(sdev->stats_snapshot)); } =20 @@ -566,17 +567,17 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rt= e_unused, { struct sub_device *sdev =3D cb_arg; =20 - fs_lock(sdev->fs_dev, 0); + fs_lock(fsdev_from_subdev(sdev), 0); /* Switch as soon as possible tx_dev. */ - fs_switch_dev(sdev->fs_dev, sdev); + fs_switch_dev(fsdev_from_subdev(sdev), sdev); /* Use safe bursts in any case. */ - failsafe_set_burst_fn(sdev->fs_dev, 1); + failsafe_set_burst_fn(fsdev_from_subdev(sdev), 1); /* * Async removal, the sub-PMD will try to unregister * the callback at the source of the current thread context. */ sdev->remove =3D 1; - fs_unlock(sdev->fs_dev, 0); + fs_unlock(fsdev_from_subdev(sdev), 0); return 0; } =20 diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/fa= ilsafe_intr.c index 09aa3c6..d372d09 100644 --- a/drivers/net/failsafe/failsafe_intr.c +++ b/drivers/net/failsafe/failsafe_intr.c @@ -274,14 +274,14 @@ failsafe_eth_rx_intr_ctl_subdevice(struct sub_device = *sdev, int op) int rc; int ret =3D 0; =20 + fsdev =3D fsdev_from_subdev(sdev); if (sdev =3D=3D NULL || (ETH(sdev) =3D=3D NULL) || - sdev->fs_dev =3D=3D NULL || (PRIV(sdev->fs_dev) =3D=3D NULL)) { + fsdev =3D=3D NULL || (PRIV(fsdev) =3D=3D NULL)) { ERROR("Called with invalid arguments"); return -EINVAL; } dev =3D ETH(sdev); - fsdev =3D sdev->fs_dev; - epfd =3D PRIV(sdev->fs_dev)->rxp.efd; + epfd =3D PRIV(fsdev)->rxp.efd; pid =3D PORT_ID(sdev); =20 if (epfd <=3D 0) { @@ -330,7 +330,7 @@ int failsafe_rx_intr_install_subdevice(struct sub_devic= e *sdev) const struct rte_intr_conf *const intr_conf =3D Ð(sdev)->data->dev_conf.intr_conf; =20 - fsdev =3D sdev->fs_dev; + fsdev =3D fsdev_from_subdev(sdev); rxq =3D (struct rxq **)fsdev->data->rx_queues; if (intr_conf->rxq =3D=3D 0) return 0; @@ -368,7 +368,7 @@ void failsafe_rx_intr_uninstall_subdevice(struct sub_de= vice *sdev) struct rte_eth_dev *fsdev; struct rxq *fsrxq; =20 - fsdev =3D sdev->fs_dev; + fsdev =3D fsdev_from_subdev(sdev); for (qid =3D 0; qid < ETH(sdev)->data->nb_rx_queues; qid++) { if (qid < fsdev->data->nb_rx_queues) { fsrxq =3D fsdev->data->rx_queues[qid]; diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe= /failsafe_private.h index 29dfd40..84e847f 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h @@ -117,7 +117,7 @@ struct sub_device { /* Others are retrieved through a file descriptor */ char *fd_str; /* fail-safe device backreference */ - struct rte_eth_dev *fs_dev; + uint16_t fs_port_id; /* shared between processes*/ /* flag calling for recollection */ volatile unsigned int remove:1; /* flow isolation state */ @@ -324,7 +324,8 @@ extern int failsafe_mac_from_arg; */ #define FS_ATOMIC_RX(s, i) \ rte_atomic64_read( \ - &((struct rxq *)((s)->fs_dev->data->rx_queues[i]))->refcnt[(s)->sid] \ + &((struct rxq *) \ + (fsdev_from_subdev(s)->data->rx_queues[i]))->refcnt[(s)->sid] \ ) /** * s: (struct sub_device *) @@ -332,7 +333,8 @@ extern int failsafe_mac_from_arg; */ #define FS_ATOMIC_TX(s, i) \ rte_atomic64_read( \ - &((struct txq *)((s)->fs_dev->data->tx_queues[i]))->refcnt[(s)->sid] \ + &((struct txq *) \ + (fsdev_from_subdev(s)->data->tx_queues[i]))->refcnt[(s)->sid] \ ) =20 #ifdef RTE_EXEC_ENV_BSDAPP @@ -379,6 +381,11 @@ fs_find_next(struct rte_eth_dev *dev, return &subs[sid]; } =20 +static inline struct rte_eth_dev * +fsdev_from_subdev(struct sub_device *sdev) { + return &rte_eth_devices[sdev->fs_port_id]; +} + /* * Lock hot-plug mutex. * is_alarm means that the caller is, for sure, the hot-plug alarm mechani= sm. --=20 2.7.4