From mboxrd@z Thu Jan 1 00:00:00 1970 From: Raslan Darawsheh Subject: [PATCH v2 1/4] net/failsafe: replace local device with shared data Date: Tue, 5 Mar 2019 09:52:04 +0000 Message-ID: <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 5B6B027D for ; Tue, 5 Mar 2019 10:52:06 +0100 (CET) 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 private structure is shared between processes. The back reference from private to generic data was using a pointer to a per process eth_dev. It's now changed to a reference of the shared data. Signed-off-by: Raslan Darawsheh Signed-off-by: Thomas Monjalon --- drivers/net/failsafe/failsafe.c | 2 +- drivers/net/failsafe/failsafe_intr.c | 10 +++++----- drivers/net/failsafe/failsafe_ops.c | 4 ++-- drivers/net/failsafe/failsafe_private.h | 6 +++++- drivers/net/failsafe/failsafe_rxtx.c | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsaf= e.c index 06e859e..68926ca 100644 --- a/drivers/net/failsafe/failsafe.c +++ b/drivers/net/failsafe/failsafe.c @@ -181,7 +181,7 @@ fs_eth_dev_create(struct rte_vdev_device *vdev) return -1; } priv =3D PRIV(dev); - priv->dev =3D dev; + priv->data =3D dev->data; dev->dev_ops =3D &failsafe_ops; dev->data->mac_addrs =3D &PRIV(dev)->mac_addrs[0]; dev->data->dev_link =3D eth_link; diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/fa= ilsafe_intr.c index 1c2cb71..09aa3c6 100644 --- a/drivers/net/failsafe/failsafe_intr.c +++ b/drivers/net/failsafe/failsafe_intr.c @@ -133,8 +133,8 @@ fs_rx_event_proxy_service_install(struct fs_priv *priv) /* prepare service info */ memset(&service, 0, sizeof(struct rte_service_spec)); snprintf(service.name, sizeof(service.name), "%s_Rx_service", - priv->dev->data->name); - service.socket_id =3D priv->dev->data->numa_node; + priv->data->name); + service.socket_id =3D priv->data->numa_node; service.callback =3D fs_rx_event_proxy_routine; service.callback_userdata =3D priv; =20 @@ -437,7 +437,7 @@ fs_rx_intr_vec_install(struct fs_priv *priv) unsigned int count; struct rte_intr_handle *intr_handle; =20 - rxqs_n =3D priv->dev->data->nb_rx_queues; + rxqs_n =3D priv->data->nb_rx_queues; n =3D RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID); count =3D 0; intr_handle =3D &priv->intr_handle; @@ -452,7 +452,7 @@ fs_rx_intr_vec_install(struct fs_priv *priv) return -rte_errno; } for (i =3D 0; i < n; i++) { - struct rxq *rxq =3D priv->dev->data->rx_queues[i]; + struct rxq *rxq =3D priv->data->rx_queues[i]; =20 /* Skip queues that cannot request interrupts. */ if (rxq =3D=3D NULL || rxq->event_fd < 0) { @@ -521,7 +521,7 @@ failsafe_rx_intr_install(struct rte_eth_dev *dev) { struct fs_priv *priv =3D PRIV(dev); const struct rte_intr_conf *const intr_conf =3D - &priv->dev->data->dev_conf.intr_conf; + &priv->data->dev_conf.intr_conf; =20 if (intr_conf->rxq =3D=3D 0 || dev->intr_handle !=3D NULL) return 0; diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/fai= lsafe_ops.c index e3add40..65957a2 100644 --- a/drivers/net/failsafe/failsafe_ops.c +++ b/drivers/net/failsafe/failsafe_ops.c @@ -452,7 +452,7 @@ fs_rx_queue_release(void *queue) if (queue =3D=3D NULL) return; rxq =3D queue; - dev =3D rxq->priv->dev; + dev =3D &rte_eth_devices[rxq->priv->data->port_id]; fs_lock(dev, 0); if (rxq->event_fd > 0) close(rxq->event_fd); @@ -636,7 +636,7 @@ fs_tx_queue_release(void *queue) if (queue =3D=3D NULL) return; txq =3D queue; - dev =3D txq->priv->dev; + dev =3D &rte_eth_devices[txq->priv->data->port_id]; fs_lock(dev, 0); FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) { if (ETH(sdev)->data->tx_queues !=3D NULL && diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe= /failsafe_private.h index 0dfea65..29dfd40 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h @@ -128,8 +128,12 @@ struct sub_device { unsigned int lsc_callback:1; }; =20 +/* + * This is referenced by eth_dev->data->dev_private + * This is shared between processes. + */ struct fs_priv { - struct rte_eth_dev *dev; + struct rte_eth_dev_data *data; /* backreference to shared data. */ /* * Set of sub_devices. * subs[0] is the preferred device diff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/fa= ilsafe_rxtx.c index 034f47b..231c832 100644 --- a/drivers/net/failsafe/failsafe_rxtx.c +++ b/drivers/net/failsafe/failsafe_rxtx.c @@ -126,7 +126,7 @@ failsafe_tx_burst(void *queue, uint16_t nb_tx; =20 txq =3D queue; - sdev =3D TX_SUBDEV(txq->priv->dev); + sdev =3D TX_SUBDEV(&rte_eth_devices[txq->priv->data->port_id]); if (unlikely(fs_tx_unsafe(sdev))) return 0; sub_txq =3D ETH(sdev)->data->tx_queues[txq->qid]; @@ -147,7 +147,7 @@ failsafe_tx_burst_fast(void *queue, uint16_t nb_tx; =20 txq =3D queue; - sdev =3D TX_SUBDEV(txq->priv->dev); + sdev =3D TX_SUBDEV(&rte_eth_devices[txq->priv->data->port_id]); RTE_ASSERT(!fs_tx_unsafe(sdev)); sub_txq =3D ETH(sdev)->data->tx_queues[txq->qid]; FS_ATOMIC_P(txq->refcnt[sdev->sid]); --=20 2.7.4