From patchwork Thu Feb 28 15:49:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 50652 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 71B144C9C; Thu, 28 Feb 2019 16:49:29 +0100 (CET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80041.outbound.protection.outlook.com [40.107.8.41]) by dpdk.org (Postfix) with ESMTP id 843CD44BE for ; Thu, 28 Feb 2019 16:49:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=38LIni2rl2oReIYD/hOCErzlPkOylAk7R5uHU6fCzZg=; b=na6zPQv7SvreIILwovDv7ZtBBcHR5dTmVzcIWTy4aH2jYygNcVjpj6mLTNTurhCmnguHtigb4peBvzbRRJdibO/AZ4nnFQXPHizL/Pg0goxyj032lwG2KR7WoCGM00jeInL7HFB4kstHQU+dsIeWmFDVhqIQ1pJ26Qga+iok73A= Received: from AM6PR05MB5926.eurprd05.prod.outlook.com (20.179.2.27) by AM6PR05MB5458.eurprd05.prod.outlook.com (20.177.118.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.16; Thu, 28 Feb 2019 15:49:26 +0000 Received: from AM6PR05MB5926.eurprd05.prod.outlook.com ([fe80::4d49:8512:d097:4a52]) by AM6PR05MB5926.eurprd05.prod.outlook.com ([fe80::4d49:8512:d097:4a52%4]) with mapi id 15.20.1643.022; Thu, 28 Feb 2019 15:49:26 +0000 From: Raslan Darawsheh To: "gaetan.rivet@6wind.com" CC: "dev@dpdk.org" , Thomas Monjalon , Raslan Darawsheh Thread-Topic: [PATCH 1/4] net/failsafe: replace local device with shared data Thread-Index: AQHUz30uklCFRK5rKUi+XcUCQDmtLg== Date: Thu, 28 Feb 2019 15:49:26 +0000 Message-ID: <1551368952-1871-2-git-send-email-rasland@mellanox.com> References: <1551368952-1871-1-git-send-email-rasland@mellanox.com> In-Reply-To: <1551368952-1871-1-git-send-email-rasland@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: LO2P265CA0431.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::35) To AM6PR05MB5926.eurprd05.prod.outlook.com (2603:10a6:20b:a9::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: fde37073-e5fe-4f02-670c-08d69d9450f2 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5458; x-ms-traffictypediagnostic: AM6PR05MB5458: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; AM6PR05MB5458; 23:lb6inJzpWyytmnCCSHrnprj+ju0pNgyYFVhd/Cv?= =?iso-8859-1?q?nvJ9T/yNa2fXWWfr7RSe8uLn4?= =?iso-8859-1?q?htz+Fdxlq2ubcvMOfPmIoqQOmjSDuMr3RzXuQwxwRr5HKxVevFF?= =?iso-8859-1?q?Wpa6LxQhnXcBlDaQJoR3Z/Z+6LyJ/ShGCM9FSnkRcxT4j4niGHd?= =?iso-8859-1?q?O4S3SN1zhlrjBYDlL+phMK/U2bWbh9olI6T000xP6TD3bvjTAiZ?= =?iso-8859-1?q?ieJKbtFbXisYGu1fzF4aV7h1Xp3c3rwcesjHROP0AncTdxJf3Kc?= =?iso-8859-1?q?spQISpWQE6hTl0oqGJjRmLUGLnqxy0GYQ/bJs4Zv1+ZrQCfMiR/?= =?iso-8859-1?q?LcfPkueWQabyPcUUOMMSHCs8WA4x9YlO78DK87yVRE0KWEJhZnq?= =?iso-8859-1?q?2rHIGHsidaq4tNJ3A5rxf8vC8KXIW9hs+B+VHpDfEwIKw73rnF7?= =?iso-8859-1?q?1EZAcbaETguKhOg1MqmNJx/RfRP0PcLEXax5W5xZ3/FR33cWVk+?= =?iso-8859-1?q?4NbHk8lvQMFXcbjcaQ4RFN/qWDtyqa7YH0pusB6uKbZ4nIDBk+n?= =?iso-8859-1?q?AiiSiLko9dn6/dEAGq5aMYuT/pg6k0KsXkGJupC+t5OvrqPjS+R?= =?iso-8859-1?q?7AbInGhxFb/0KIrWjRX8uPQk6c2QPE2PTUyLAqDrbEBzOYM+AiG?= =?iso-8859-1?q?qKg7spsXl+P84Xii15mzu9BGi/IJELEDC2Ggg5DmMiScqnFjNpN?= =?iso-8859-1?q?d13BukC4zXoXufIARR6rGNycDZWTzhGdtTMhVe5FtV3qKrrTp7f?= =?iso-8859-1?q?XDQK6ZLed0DuClFORI1IcoRp4VZUf9zy/G0W8FtUgY5raGkAE+O?= =?iso-8859-1?q?hp1ZQU/H9Oe/m5qoB3v2btBgX1ljapNNju5ocWQDTYjc8ZLkRWC?= =?iso-8859-1?q?2/7CDRFRD0g8SsRxS/dhxMF76cLBn6fwBxRZVxsaq+a7vV17YHF?= =?iso-8859-1?q?fOGGBxd6PTqJ1IfWoaoX/+xBgG+Tkc0vRN/jyltr2sd5aH6ZqBc?= =?iso-8859-1?q?ugVxjLQT4F35ZMQpnOmDf7fWpk1c8O6bYe3/hKdmCTz/FT9S93q?= =?iso-8859-1?q?0E/tAl5Bzx7yMDhMOCEi18IqCz+TBok4pgO2RSeoZWtKKN38gC2?= =?iso-8859-1?q?cYqwLM5wEpzByKmzvam2BUtLR62R2BxzSCASxt5T1haCqo/6GQ7?= =?iso-8859-1?q?GHN2C8PB3eelwsasODsefp3jEoyYFy9ZA+frTdOxbGDpajitPdH?= =?iso-8859-1?q?a21GmTjZvbjjDGDoHos5+dEHTscoBBOjyrZP4FsgyFQygLW9iNr?= =?iso-8859-1?q?kiO8rnH0h5D0nNtAVqZoyK17HXui0IIQ2ayO/aXgNlkfICj0ezd?= =?iso-8859-1?q?8O1u3Q55oeW+IK+LgN4TOXpegFFz4A5AKsZQa8mpBfEJb22sO1A?= =?iso-8859-1?q?0AtORgBSSzWKBw=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0962D394D2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(136003)(39860400002)(366004)(376002)(189003)(199004)(6116002)(3846002)(71200400001)(71190400001)(54906003)(25786009)(476003)(36756003)(478600001)(14454004)(2616005)(5660300002)(7736002)(305945005)(486006)(97736004)(6916009)(446003)(11346002)(50226002)(102836004)(8936002)(76176011)(52116002)(107886003)(81166006)(81156014)(8676002)(68736007)(186003)(386003)(2906002)(2501003)(6506007)(316002)(99286004)(53936002)(6436002)(6486002)(5640700003)(106356001)(2351001)(14444005)(256004)(66066001)(26005)(4326008)(6512007)(86362001)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5458; H:AM6PR05MB5926.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 07Hm1OTLuitPD3eEOhZ9j+QdUPIzSJCPfHw75ZIvQlLw5ZQL93Dcf0br88xZnfIEvE2H9MbQmxestVj/RJWxgeOGsYtycQqytmFryYFRQyyHZ265JjcOoqUFX350j7bZzcdedrcH8K3Xq6EEA5fLWtrBj52V6Z3sSOmHlPAGv8fZSLugVpTNyQC1I1Ee41EwIuvKXiMroMKf8O3k0gFhtEMdUVRodA6y4wmTNRpb8MAqxdH9Q2yA4bkZXmxYjNQQcNod5jFBl7grK46Bmn5EfdQpj+guorsCjvTYrGvq5ElVnKieiW6GokzIIog8nW9T5hNv5RuwOXbw5imVgip1UkiaGcNzb/aMmQsECCv+efWzVbulpdA8oPS/LOLFM/kbLfqV6JWe5t4FApB7hPSdDRpfxRfMunsHfykOMUHAkDM= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: fde37073-e5fe-4f02-670c-08d69d9450f2 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2019 15:49:25.3534 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5458 Subject: [dpdk-dev] [PATCH 1/4] net/failsafe: replace local device with shared data X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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 | 8 ++++++-- drivers/net/failsafe/failsafe_rxtx.c | 4 ++-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.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 = PRIV(dev); - priv->dev = dev; + priv->data = dev->data; dev->dev_ops = &failsafe_ops; dev->data->mac_addrs = &PRIV(dev)->mac_addrs[0]; dev->data->dev_link = eth_link; diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/failsafe_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 = priv->dev->data->numa_node; + priv->data->name); + service.socket_id = priv->data->numa_node; service.callback = fs_rx_event_proxy_routine; service.callback_userdata = priv; @@ -437,7 +437,7 @@ fs_rx_intr_vec_install(struct fs_priv *priv) unsigned int count; struct rte_intr_handle *intr_handle; - rxqs_n = priv->dev->data->nb_rx_queues; + rxqs_n = priv->data->nb_rx_queues; n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID); count = 0; intr_handle = &priv->intr_handle; @@ -452,7 +452,7 @@ fs_rx_intr_vec_install(struct fs_priv *priv) return -rte_errno; } for (i = 0; i < n; i++) { - struct rxq *rxq = priv->dev->data->rx_queues[i]; + struct rxq *rxq = priv->data->rx_queues[i]; /* Skip queues that cannot request interrupts. */ if (rxq == NULL || rxq->event_fd < 0) { @@ -521,7 +521,7 @@ failsafe_rx_intr_install(struct rte_eth_dev *dev) { struct fs_priv *priv = PRIV(dev); const struct rte_intr_conf *const intr_conf = - &priv->dev->data->dev_conf.intr_conf; + &priv->data->dev_conf.intr_conf; if (intr_conf->rxq == 0 || dev->intr_handle != NULL) return 0; diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_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 == NULL) return; rxq = queue; - dev = rxq->priv->dev; + dev = &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 == NULL) return; txq = queue; - dev = txq->priv->dev; + dev = &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 != NULL && diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h index 0dfea65..91b7167 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h @@ -128,14 +128,18 @@ struct sub_device { unsigned int lsc_callback:1; }; +/* + * 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 * any other is just another slave */ - struct sub_device *subs; + struct sub_device *subs; /* shared between processes */ uint8_t subs_head; /* if head == tail, no subs */ uint8_t subs_tail; /* first invalid */ uint8_t subs_tx; /* current emitting device */ diff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/failsafe_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; txq = queue; - sdev = TX_SUBDEV(txq->priv->dev); + sdev = TX_SUBDEV(&rte_eth_devices[txq->priv->data->port_id]); if (unlikely(fs_tx_unsafe(sdev))) return 0; sub_txq = ETH(sdev)->data->tx_queues[txq->qid]; @@ -147,7 +147,7 @@ failsafe_tx_burst_fast(void *queue, uint16_t nb_tx; txq = queue; - sdev = TX_SUBDEV(txq->priv->dev); + sdev = TX_SUBDEV(&rte_eth_devices[txq->priv->data->port_id]); RTE_ASSERT(!fs_tx_unsafe(sdev)); sub_txq = ETH(sdev)->data->tx_queues[txq->qid]; FS_ATOMIC_P(txq->refcnt[sdev->sid]); From patchwork Thu Feb 28 15:49:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 50653 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 155CB4CAF; Thu, 28 Feb 2019 16:49:32 +0100 (CET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80052.outbound.protection.outlook.com [40.107.8.52]) by dpdk.org (Postfix) with ESMTP id 6C13844BE for ; Thu, 28 Feb 2019 16:49:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HRy4Kuk4U/CZA+3ZjFi3b+Qpi9PpelS9e6mfPAAD1kQ=; b=FcXxAkItFIpaiNrAzj3+yEzW5z0enUQ4mfvZ8t8rabtMu4Pf+YIZixp3S5SOV62ywm47S+acN8pv6bM2KE985ggiRfydjQDXwjCiRB5UzCy571Ky/AgzeZ/U/Wtze8otDMx2stlGyZrNRe7aQcIQ5n0kkQ1UP5uqsHcNTCZSG5Y= Received: from AM6PR05MB5926.eurprd05.prod.outlook.com (20.179.2.27) by AM6PR05MB5458.eurprd05.prod.outlook.com (20.177.118.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.16; Thu, 28 Feb 2019 15:49:27 +0000 Received: from AM6PR05MB5926.eurprd05.prod.outlook.com ([fe80::4d49:8512:d097:4a52]) by AM6PR05MB5926.eurprd05.prod.outlook.com ([fe80::4d49:8512:d097:4a52%4]) with mapi id 15.20.1643.022; Thu, 28 Feb 2019 15:49:27 +0000 From: Raslan Darawsheh To: "gaetan.rivet@6wind.com" CC: "dev@dpdk.org" , Thomas Monjalon , Raslan Darawsheh Thread-Topic: [PATCH 2/4] net/failsafe: change back-reference from sub-device Thread-Index: AQHUz30vknUAmBEjI0WYbuxibRzVew== Date: Thu, 28 Feb 2019 15:49:26 +0000 Message-ID: <1551368952-1871-3-git-send-email-rasland@mellanox.com> References: <1551368952-1871-1-git-send-email-rasland@mellanox.com> In-Reply-To: <1551368952-1871-1-git-send-email-rasland@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: LO2P265CA0431.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::35) To AM6PR05MB5926.eurprd05.prod.outlook.com (2603:10a6:20b:a9::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 20dbeab9-7403-48b8-6e38-08d69d945173 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5458; x-ms-traffictypediagnostic: AM6PR05MB5458: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; AM6PR05MB5458; 23:na4Vt6qm+xkhUo5xk5IaBaaL9xNKtKhQbBdajIM?= =?iso-8859-1?q?8AN7QP8o4Bz5YUp+XMClGAxlA?= =?iso-8859-1?q?A55g5dO5grEoiu5ChfSN1Fw8b1TU2I7eNhZN+G1J2zEWkYqdfBF?= =?iso-8859-1?q?tU0kdojlZn7qjHyLZCSQfZ4nw7Wnp2paqkP8q0KB0i9m7q3rLUX?= =?iso-8859-1?q?cnfYHhWQpeadnEExVUi3QGJCGiAua3ZrmXA6sPDa3lpD3WtGRm1?= =?iso-8859-1?q?luEogPLEJn5i9uEQghaF/QhJfLiZCmv9u3oKCr+d7BhoPzmGHGZ?= =?iso-8859-1?q?uOUrgkNN/FHS0ZwSVocqZAxVXN81PSOX9fj11dXndkNxfQqbjtH?= =?iso-8859-1?q?JzQ1AD3XGjCJ3w7cnZh88+lNPWR3cJil8DTQx7ngMxdOgRFRW4+?= =?iso-8859-1?q?N7nPgyTTzHptl+Ejk/uv8TitLQhueOCnj1rU7q0qUgMegYk8h9A?= =?iso-8859-1?q?lDPOmvJ6b5e9z1n9eTQrhEe6B/NamANyAi3lSCxCu2Sh1BhsLfk?= =?iso-8859-1?q?+b707PrZjbtS865jIj8+Cqb3UJ0ZJLKzlpVMld8ryN1gEm4+21i?= =?iso-8859-1?q?h/DCl7bFNwVVH141olotVbL7cvXmKPG4OZMdCGcKhGasMCwtzzs?= =?iso-8859-1?q?9UJYUiya4smgwix589zJZc6f5CMhprkZJw+ria1fmf7jsX6ZRLx?= =?iso-8859-1?q?k9WZN0Gwf1N+kNVj12B492k4Fgj3O/b6dTZOXup7QiCiXuOgCKb?= =?iso-8859-1?q?Yxkbb/CfxAr/PGP50U/rvcCwlLZx604/3jGFKv+O3sCPU3dtvmH?= =?iso-8859-1?q?8ApkpoPblYpiz0CgTcGhItEVM8mAX/YbH/y097XUei6IelDQ1R6?= =?iso-8859-1?q?Eh3rBhf16Y5SGRqBTzSNpmf0ekvnxRGEwNWudNSVDk/lGfnypBk?= =?iso-8859-1?q?CwdLlyJxIMHCDi/Y5ObxKjqQjn4+9GnFFcE35zN3qFjI9KIF8Nt?= =?iso-8859-1?q?Fj0wxsbyLZKrGW2bw/3mDNk1uL6QcFiZYtkWWNCOVJ5bcvDzkFq?= =?iso-8859-1?q?BjNcYoFxWqA2ls0Y/BDi0BTNEB2Bc4MVvIlGgs7wpCv1I8xMeaJ?= =?iso-8859-1?q?Ykcp3OGA+RhLMMVXow2JQZlS1o8psRuHVJ+i1Fmcn0vcke1WfL9?= =?iso-8859-1?q?OZmjnDHFI+KtiBirtTMgPwRQlMXWeQLR6jICHTWR5Q3obEBoPOH?= =?iso-8859-1?q?WInRi4QEYWfZFJl8oJ3jSFSIdz5Oeyuf91/MKU/bM7TXQA4KxFp?= =?iso-8859-1?q?b/9DrXwOEb9TV2FSzT1OS6vk24JEKG4tE7pup0sPt4m+sOsgmeX?= =?iso-8859-1?q?rSu9YkHQIgHl+GRR8JoO4PtQyVKVCHkh6lbwDSkWrpLgES3QhGO?= =?iso-8859-1?q?mw03k24e8hBn7fT5ux2iA2wv+hNIHvMu3k9sI2lUDDUX91raNLl?= =?iso-8859-1?q?iWghDu8Tt/13mw=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0962D394D2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(136003)(39860400002)(366004)(376002)(189003)(199004)(6116002)(3846002)(71200400001)(71190400001)(54906003)(25786009)(476003)(36756003)(478600001)(14454004)(2616005)(5660300002)(7736002)(305945005)(486006)(97736004)(6916009)(446003)(11346002)(50226002)(102836004)(8936002)(76176011)(52116002)(107886003)(81166006)(81156014)(8676002)(68736007)(186003)(386003)(2906002)(2501003)(6506007)(316002)(99286004)(53936002)(6436002)(6486002)(5640700003)(106356001)(2351001)(14444005)(256004)(66066001)(26005)(4326008)(6512007)(86362001)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5458; H:AM6PR05MB5926.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: e64Rk+ePTtl1GA78MtMHY2BaQTLtANUKOX70EMWpZupzFQ+Mw8dPIm6xAnUBV1f9Yp0SLgduUyWR8nv+mggI5piOpN50BOLiAGxwZ7EdXcErYLGXzo5GBBsh8AZ64dcFnJUO3NOEL0N47xgnu3gAiOp1DagIIoM4Jh0lN6cWsj6JyPB2H+wFEQGhCy2BZG4rX63D7vlFTiU9x2SBRVnHxFMoSc7NVIr9eRtH1j1r9QlH01mDUJwFoJjckFD4Bmta0isZvAKMy4PFjgQXfH8yQD9UmgTgrhRWb2zBMrH1hzfDdaskjMpk2/psEw+mX3mB/zt0gkdXUgDKrNNWLHn/zkFyijI6exEdo9VRaQOh4WYHAVpOpupD+KIcqE9+BwbAEWYfxnMUgwDUXFonpDN75vaY0uZd1eMzA73kTTDr+x0= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20dbeab9-7403-48b8-6e38-08d69d945173 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2019 15:49:26.2220 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5458 Subject: [dpdk-dev] [PATCH 2/4] net/failsafe: change back-reference from sub-device X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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 --- 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 | 11 ++++++++--- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/failsafe_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) = &rte_eth_devices[pid]; SUB_ID(sdev) = i; - sdev->fs_dev = dev; + sdev->fs_port_id = dev->data->port_id; sdev->dev = ETH(sdev)->device; sdev->state = DEV_PROBED; } diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c index 1783165..8d958e0 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 = 0; - failsafe_hotplug_alarm_install(sdev->fs_dev); + failsafe_hotplug_alarm_install(FSDEV_FROM_SUBDEV(sdev)); } 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)); } @@ -566,17 +567,17 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused, { struct sub_device *sdev = cb_arg; - 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 = 1; - fs_unlock(sdev->fs_dev, 0); + fs_unlock(FSDEV_FROM_SUBDEV(sdev), 0); return 0; } diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/failsafe_intr.c index 09aa3c6..6fe5816 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 = 0; + fsdev = FSDEV_FROM_SUBDEV(sdev); if (sdev == NULL || (ETH(sdev) == NULL) || - sdev->fs_dev == NULL || (PRIV(sdev->fs_dev) == NULL)) { + fsdev == NULL || (PRIV(fsdev) == NULL)) { ERROR("Called with invalid arguments"); return -EINVAL; } dev = ETH(sdev); - fsdev = sdev->fs_dev; - epfd = PRIV(sdev->fs_dev)->rxp.efd; + epfd = PRIV(fsdev)->rxp.efd; pid = PORT_ID(sdev); if (epfd <= 0) { @@ -330,7 +330,7 @@ int failsafe_rx_intr_install_subdevice(struct sub_device *sdev) const struct rte_intr_conf *const intr_conf = Ð(sdev)->data->dev_conf.intr_conf; - fsdev = sdev->fs_dev; + fsdev = FSDEV_FROM_SUBDEV(sdev); rxq = (struct rxq **)fsdev->data->rx_queues; if (intr_conf->rxq == 0) return 0; @@ -368,7 +368,7 @@ void failsafe_rx_intr_uninstall_subdevice(struct sub_device *sdev) struct rte_eth_dev *fsdev; struct rxq *fsrxq; - fsdev = sdev->fs_dev; + fsdev = FSDEV_FROM_SUBDEV(sdev); for (qid = 0; qid < ETH(sdev)->data->nb_rx_queues; qid++) { if (qid < fsdev->data->nb_rx_queues) { fsrxq = fsdev->data->rx_queues[qid]; diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h index 91b7167..9b53a19 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 */ @@ -251,6 +251,9 @@ extern int failsafe_mac_from_arg; /* dev: (struct rte_eth_dev *) fail-safe device */ #define PRIV(dev) \ ((struct fs_priv *)(dev)->data->dev_private) +/* sdev: (struct sub_device *) */ +#define FSDEV_FROM_SUBDEV(sdev) \ + (&rte_eth_devices[sdev->fs_port_id]) /* sdev: (struct sub_device *) */ #define ETH(sdev) \ @@ -324,7 +327,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 +336,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] \ ) #ifdef RTE_EXEC_ENV_BSDAPP From patchwork Thu Feb 28 15:49:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 50654 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BE36D4CC7; Thu, 28 Feb 2019 16:49:33 +0100 (CET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80083.outbound.protection.outlook.com [40.107.8.83]) by dpdk.org (Postfix) with ESMTP id 2756E4C91 for ; Thu, 28 Feb 2019 16:49:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9WVxZ4r0Q9flE8hWE+TO8X+bUVPEVeGJyh5uABy7wa4=; b=k3H4CXqpg66MouVEJmgf8FQ8zoAVCWJceRmur4DNRl2wg+x+5g6KYp9k0fEFPzyC7e+tHuUXekUqFVWIcPf71N9hhGMhN/oSEA/wu/1q7Mwv3jg1TqJT8IUBJt3T0+VLjiPMpZ28gr488Z+VVHsD/TjgYCaNG+GlyKRgqKGcMGQ= Received: from AM6PR05MB5926.eurprd05.prod.outlook.com (20.179.2.27) by AM6PR05MB5458.eurprd05.prod.outlook.com (20.177.118.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.16; Thu, 28 Feb 2019 15:49:27 +0000 Received: from AM6PR05MB5926.eurprd05.prod.outlook.com ([fe80::4d49:8512:d097:4a52]) by AM6PR05MB5926.eurprd05.prod.outlook.com ([fe80::4d49:8512:d097:4a52%4]) with mapi id 15.20.1643.022; Thu, 28 Feb 2019 15:49:27 +0000 From: Raslan Darawsheh To: "gaetan.rivet@6wind.com" CC: "dev@dpdk.org" , Thomas Monjalon , Raslan Darawsheh Thread-Topic: [PATCH 3/4] net/failsafe: replace local sub-device with shared data Thread-Index: AQHUz30v78A8mrY2HEqbgkhSSjO7QA== Date: Thu, 28 Feb 2019 15:49:27 +0000 Message-ID: <1551368952-1871-4-git-send-email-rasland@mellanox.com> References: <1551368952-1871-1-git-send-email-rasland@mellanox.com> In-Reply-To: <1551368952-1871-1-git-send-email-rasland@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: LO2P265CA0431.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::35) To AM6PR05MB5926.eurprd05.prod.outlook.com (2603:10a6:20b:a9::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5c1c6f4d-128b-48e4-2b07-08d69d9451f2 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5458; x-ms-traffictypediagnostic: AM6PR05MB5458: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; AM6PR05MB5458; 23:/Y4TLgm2Nl+oqri2YOI24S/R8U6FG4seG+uwDmB?= =?iso-8859-1?q?yAvJWkd/nvgU59MXC2sU+wmza?= =?iso-8859-1?q?0Uz87fW855eCOtfSCjun/jNhBaD8KEQ/RC5h1IILmSPWK3IDfS5?= =?iso-8859-1?q?euDRkPN2QbzQDyJyBzGFLkNKQ4htOGIBX1i3/qb0RkZ8HiiuD1s?= =?iso-8859-1?q?GKE0JY2pLcim+9MJTWgqinojJmnC/28b5kqOHH2JzJEhWPL6bgK?= =?iso-8859-1?q?0XazgLRzRC/+ppWQcRBoK1cScQlbovrbalDquLeApQwsAlVBllc?= =?iso-8859-1?q?fYp2uFemcAASKxVVM+J+IGp5SOaZGjqP1ZqFvBB/tGdPju+jOpE?= =?iso-8859-1?q?BP6JHNGxakY6vKxR9fiBB16NF5zT3KSQzuyKVeM0IEGoHtkhdHX?= =?iso-8859-1?q?9FjkCxBznY5+LV/Emj2XZ+AtgjGrt/UF3WKSlA6sQ5Y8PkKqJV2?= =?iso-8859-1?q?MBZwy+b7HoWNsc4rNa6jIdvlNGM8/0aCqGlwEZVkl9VQZDx+2Yw?= =?iso-8859-1?q?0Kdl1wWiV1gsMcPF8gUoCWwuAKu6SXT3h43r1GBE7Hu9twgrDCb?= =?iso-8859-1?q?F+U6A8ZAto7m0D26q5VbWbt2LKG2aq85zuK3ID0UzZh7pK4at9S?= =?iso-8859-1?q?s2bO6OO3JTrDu8EVYaNRaPEEvzgSkQynBoWgnsSn8TvxGppuG6s?= =?iso-8859-1?q?5TKMp7u8rmGxnoQPzku6gJlYSAOCjHa2ai9Fw0on9LxN8sA3R4q?= =?iso-8859-1?q?BixqZFukD3Axq7qvMIljds7c1WGvgeYCaygU/1rhpbL9VgFViyz?= =?iso-8859-1?q?XGYbln5ro0R9R3fnGHrlVjJGpVrtgzPtJDRAHFTrmCaHV8y5Xkd?= =?iso-8859-1?q?GKQeAzhfhnnugkEnc3lrqLdc3jdc/+FSYlVe5R6pTCSj90l329l?= =?iso-8859-1?q?KVZVWItuHsVL5CKu/0McrTS2O2hDbtqs2qZNPWr2247NBTEkoHt?= =?iso-8859-1?q?+159QlNE8l8fNZWTtviTFS1nXROaB2ueVBauIZOMttzITRocJoI?= =?iso-8859-1?q?8g+G+HSYoOf2IAqmz3Cfg/P8oOyQy2kKJnG+nxcoUNA6Y1Faa7h?= =?iso-8859-1?q?K0/xZfW/chlfH6fT3y1/lQhkVsBzVMTKr8TYMPOJ1VWuK2rEzXJ?= =?iso-8859-1?q?6mPFzfyYK5gEjimoPiZOCSfIwNAKCuzBd6ynyiAfzjr+AjZhvQc?= =?iso-8859-1?q?esS0l7zFqFxVlOmAl/ARy804oeZMGdEwlgcpavFS/btnXGhhJqr?= =?iso-8859-1?q?y46+RzvTHn3PA7uq3PaNlY5avUx2glTnzLr4My9QqGAzfF3R0wu?= =?iso-8859-1?q?TfUdxtTXNf7/1swFGWQgPWZLUeGZk9vMitS6bhHeuVdLcC5U2bN?= =?iso-8859-1?q?ubyW9AIWxazh18+hRIfWEC2VvSLRw3uSnqfAK5mDAABfJY/OQuu?= =?iso-8859-1?q?xG40kN16Vd2YJg=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0962D394D2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(136003)(39860400002)(366004)(376002)(189003)(199004)(6116002)(3846002)(71200400001)(71190400001)(54906003)(25786009)(476003)(36756003)(478600001)(14454004)(2616005)(5660300002)(7736002)(305945005)(486006)(97736004)(6916009)(446003)(11346002)(50226002)(102836004)(8936002)(76176011)(52116002)(107886003)(81166006)(81156014)(8676002)(68736007)(186003)(386003)(2906002)(2501003)(6506007)(316002)(99286004)(53936002)(6436002)(6486002)(5640700003)(106356001)(2351001)(14444005)(256004)(66066001)(26005)(4326008)(6512007)(86362001)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5458; H:AM6PR05MB5926.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ZnOVVUnTP8PZpfABJYEdpE03Jp2krD+6KO5Ozzq4d7Q3v09AHK5HNkQi5wrWbOdYoArWeYprQTVhZfPc8H3XdV4PuKBcx1WuUBb5H8VgE8Tpyb70HV8PfMougjeLnIOhHCzdH0lITEIFapBS3fHFddfR1Tzp0BydwSfUP8UhjE9Dd2T5jHW5KnuQgqsnE87WX8k1lfHrq/BOK+nEyzSfLK/IfpFMVfWpEbcMllnUGKYg4KI+4USqCBi6y5arTmLOpT0rYn27ILrDs2yzJq3WZGT+CBV46JZaCbx9q6cdL97L5o+coetU3PQzip1GW1Nk3Gjszeid94u8oUHsi3IHlX5yNjjKhrMMAadOLhVd+UM/pyxFO3pBNVOktE4bASD3gqrlWELC2z5ZZbMXlsoJ8h5Ibx9EXUNcR6yxB9oULE8= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c1c6f4d-128b-48e4-2b07-08d69d9451f2 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2019 15:49:27.0566 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5458 Subject: [dpdk-dev] [PATCH 3/4] net/failsafe: replace local sub-device with shared data X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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 --- drivers/net/failsafe/failsafe_eal.c | 2 +- drivers/net/failsafe/failsafe_ether.c | 7 ++++--- drivers/net/failsafe/failsafe_private.h | 11 +++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/failsafe_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) = &rte_eth_devices[pid]; + sdev->data = rte_eth_devices[pid].data; SUB_ID(sdev) = i; sdev->fs_port_id = dev->data->port_id; sdev->dev = ETH(sdev)->device; diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c index 8d958e0..9b9753f 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 = ETH(sdev); if (sdev == 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 = 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 = 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 = DEV_PARSED; /* fallthrough */ diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h index 9b53a19..60ee0a7 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; }; +/* + * 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; @@ -257,7 +260,7 @@ extern int failsafe_mac_from_arg; /* sdev: (struct sub_device *) */ #define ETH(sdev) \ - ((sdev)->edev) + (sdev->data == NULL ? NULL : &rte_eth_devices[sdev->data->port_id]) /* sdev: (struct sub_device *) */ #define PORT_ID(sdev) \ From patchwork Thu Feb 28 15:49:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 50655 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D3FD14F94; Thu, 28 Feb 2019 16:49:34 +0100 (CET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00045.outbound.protection.outlook.com [40.107.0.45]) by dpdk.org (Postfix) with ESMTP id EB21C4C9F for ; Thu, 28 Feb 2019 16:49:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6wc7gGwpg4SaGbjlAVw8iInKXvfeBUo/OpdzN5pnqz8=; b=BRJxrwcNJ3Tl2Dw4omaOSi2fius6G5zLF7zrkPF6HO2AevbYnv2bwCHyg2JMfGlvLXaJmnMbxxjYmOvrJuYsvnMedLTQ+XpS8hfKtMSDv13xA5r/FZyQbTn59QR/Jx3juQ4Lh6Oz74nsDJPY2r9riys//xC/6u+Zf9QWlAz/q/k= Received: from AM6PR05MB5926.eurprd05.prod.outlook.com (20.179.2.27) by AM6PR05MB5458.eurprd05.prod.outlook.com (20.177.118.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.16; Thu, 28 Feb 2019 15:49:28 +0000 Received: from AM6PR05MB5926.eurprd05.prod.outlook.com ([fe80::4d49:8512:d097:4a52]) by AM6PR05MB5926.eurprd05.prod.outlook.com ([fe80::4d49:8512:d097:4a52%4]) with mapi id 15.20.1643.022; Thu, 28 Feb 2019 15:49:28 +0000 From: Raslan Darawsheh To: "gaetan.rivet@6wind.com" CC: "dev@dpdk.org" , Thomas Monjalon , Raslan Darawsheh Thread-Topic: [PATCH 4/4] net/failsafe: support secondary process Thread-Index: AQHUz30whb8G+kDBQ02sT2CHFEPznw== Date: Thu, 28 Feb 2019 15:49:28 +0000 Message-ID: <1551368952-1871-5-git-send-email-rasland@mellanox.com> References: <1551368952-1871-1-git-send-email-rasland@mellanox.com> In-Reply-To: <1551368952-1871-1-git-send-email-rasland@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: LO2P265CA0431.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::35) To AM6PR05MB5926.eurprd05.prod.outlook.com (2603:10a6:20b:a9::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a0445731-cc56-402d-ce82-08d69d945273 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5458; x-ms-traffictypediagnostic: AM6PR05MB5458: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; AM6PR05MB5458; 23:NRi6+H5lRP7hGU/NpYR6MjVkQ+BEvRIB4BtjYj2?= =?iso-8859-1?q?8wGFt6JLlmA/QF+ytR0Le+pwc?= =?iso-8859-1?q?XTU+CXUyO4cjVD002QPQagT9dVHB+GL1cRpBWyM5UV497qHfStp?= =?iso-8859-1?q?5tT3+Z8Uw503waWFKiid8k4erYXHN1T71+Jx3n078WIFsfJu8yf?= =?iso-8859-1?q?OX3wpLSzVOeH1rotwvqEuYsooig+Coizib0SWUprB6l8gLphdi/?= =?iso-8859-1?q?9JkzcLleyx31DV8rZfyMW8wswL+sf2XUaTa5yvK98gxU20fJ6Vw?= =?iso-8859-1?q?7ys8VA96K4NXLleiAjwsI2J5HCaSHJc+IpNbx3oyNepOJx3/GAn?= =?iso-8859-1?q?O/rd05/M1T05/GVJZADFhToGe5HIRGmsGzsBKL4jIHWq5y/wzuZ?= =?iso-8859-1?q?TIGLzv3K3HHh7I0HaSrOlXuufuAoVj1T1rT2uISK7yxGeNVYKVd?= =?iso-8859-1?q?wl1A//reHvmiIrw8q+Fq5YGeNf0Lg+XKC05/nxk7NEi55/KNv76?= =?iso-8859-1?q?XxuNUsc7iYz8MUOSuhMxpbSD2B8i38q5hyty9/bs0L6eFQ4EKOP?= =?iso-8859-1?q?ad+lfCPrA09akHRky98XWVQ/pFW6WTvboMKeaVOXBry/xtu+XWy?= =?iso-8859-1?q?frxkMr1FXfBmeyOhwam2UFyS3C+JJGv8i3AZ1ovwdw2xsdDUQ6Z?= =?iso-8859-1?q?nnfQdrWHd3xwCMXU/YqMwgRzqfsNTandMRBIuVJEyAA6nRje7a4?= =?iso-8859-1?q?INcWIA/GqKVSchXXgrs8gG7ZYSOqANNErB6PrCJ0EbWJWtKaSKo?= =?iso-8859-1?q?twNfEDZ0pCV1zrMsaahfdSrpa05a+d+Cu3mw/a4gzw5J+TBGhXN?= =?iso-8859-1?q?pVAvDLO4VJ4dAt8+UUZKiH6tiokWg7BSijBoaPm4EsN1ohQ3VWz?= =?iso-8859-1?q?Mm1vCa0z8aGwrtP9qAG5OWI+L5yDP6IpIMeJktXaBLw6DPGLAv/?= =?iso-8859-1?q?XuMqLGTOu0J3ZtyCSCQGhS1v1BmOGmfC3lHZJE/0lElq/hOhGSQ?= =?iso-8859-1?q?uP0OF4Q1d7qIdOcHqj+blGS3SoF5dlx8SBaFwvb+5Z6D6GcLn7F?= =?iso-8859-1?q?p8wKo6qVuxx3Egnj7eu0I25kFnv6cifjcM6IQQW/tn9Vy2EdNAG?= =?iso-8859-1?q?Ga9vvceo2wbQeOg5L6TEkHjH1Y6b8zFb9sO+scJr/KwMqqXeqQV?= =?iso-8859-1?q?ZX3A6/Q7U9Ur75ufsKKy7jpYMyBvpHS/b2ZaT7f3kL6tZkIkNlt?= =?iso-8859-1?q?uN2ee1wcOeqe606MU1A1QhumIGpL/AXaXWeLeaCoTpcU7b6Fgio?= =?iso-8859-1?q?BjsB0VtFDQ+4sHqcFyV4wdbmylwNfRIomL5PjAy51sI+fkQhrj/?= =?iso-8859-1?q?hhZub90xlPjPLRviPCWyNzXWYxf0EprBMSISaq9Vf1ZdgaiHurS?= =?iso-8859-1?q?+xKUoL/vc4hkr6IQV761Y4xCndiCDBahdOE=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0962D394D2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(136003)(39860400002)(366004)(376002)(189003)(199004)(6116002)(3846002)(71200400001)(71190400001)(54906003)(25786009)(476003)(36756003)(478600001)(14454004)(2616005)(5660300002)(7736002)(305945005)(486006)(97736004)(6916009)(446003)(11346002)(50226002)(102836004)(8936002)(76176011)(52116002)(107886003)(81166006)(81156014)(8676002)(68736007)(186003)(386003)(2906002)(2501003)(6506007)(316002)(99286004)(53936002)(6436002)(6486002)(5640700003)(106356001)(2351001)(14444005)(256004)(5024004)(66066001)(26005)(4326008)(6512007)(86362001)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5458; H:AM6PR05MB5926.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: RIwPu1rlKaWsLnigHCRP7XXUlKhrpc2OUAMHscUYm9OTCWjBr15BMO42hoeu3TR5inIqDQM+ualhfmMAN6fbZ/P0bgeHmcWYt4KeHBJL7AlYY6cmJqwyBFS7aCwjR2gyFQD0SKfi/TrwxsCnBGlGLVmaj2BaAUKhtRFK52DTXDdAzDehn8+UxVyE7d03qFmpVpt5TIDhQcAyVoa1YBJIFqzoZJOnj63OVRAxLhVsQMCstsnkY2i6sZxQdM/zHFo13v0/R5mjXy6DFMH/DAXt8ROFEII+7XQu2DOfGGff3vCKb2YJqCje1FysbW3NSuT8CbzpXqrh62L4vkf4faLh2Fw31+k8WJ6Ssp7sxPM+o/9uDr8aZ4T+bOvYE1jCIOH1dGw+05v6Lp92cIJlFpeEAPBy2UE/nMSAOwMJWPRmHeM= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0445731-cc56-402d-ce82-08d69d945273 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2019 15:49:27.9062 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5458 Subject: [dpdk-dev] [PATCH 4/4] net/failsafe: support secondary process X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add implementation for probe in secondary. Failsafe will attempt to attach all the sub-devices in secondary process. Signed-off-by: Raslan Darawsheh Signed-off-by: Thomas Monjalon --- drivers/net/failsafe/failsafe.c | 43 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c index 68926ca..fa083fa 100644 --- a/drivers/net/failsafe/failsafe.c +++ b/drivers/net/failsafe/failsafe.c @@ -313,10 +313,27 @@ fs_rte_eth_free(const char *name) } static int +devargs_already_listed(struct rte_devargs *devargs) +{ + struct rte_devargs *list_da; + + RTE_EAL_DEVARGS_FOREACH(devargs->bus->name, list_da) { + if (strcmp(list_da->name, devargs->name) == 0) + /* devargs already in the list */ + return 1; + } + return 0; +} + +static int rte_pmd_failsafe_probe(struct rte_vdev_device *vdev) { const char *name; struct rte_eth_dev *eth_dev; + struct sub_device *sdev; + struct rte_devargs devargs; + uint8_t i; + int ret; name = rte_vdev_device_name(vdev); INFO("Initializing " FAILSAFE_DRIVER_NAME " for %s", @@ -329,9 +346,33 @@ rte_pmd_failsafe_probe(struct rte_vdev_device *vdev) ERROR("Failed to probe %s", name); return -1; } - /* TODO: request info from primary to set up Rx and Tx */ eth_dev->dev_ops = &failsafe_ops; eth_dev->device = &vdev->device; + eth_dev->rx_pkt_burst = (eth_rx_burst_t)&failsafe_rx_burst; + eth_dev->tx_pkt_burst = (eth_tx_burst_t)&failsafe_tx_burst; + /* + * Failsafe will attempt to probe all of its sub-devices. + * Any failure in sub-devices is not a fatal error. + * A sub-device can be plugged later. + */ + FOREACH_SUBDEV(sdev, i, eth_dev) { + /* rebuild devargs to be able to get the bus name. */ + ret = rte_devargs_parse(&devargs, + sdev->devargs.name); + if (ret != 0) { + ERROR("Failed to parse devargs %s", + devargs.name); + continue; + } + if (!devargs_already_listed(&devargs)) { + ret = rte_dev_probe(devargs.name); + if (ret != 0) { + ERROR("Failed to probe devargs %s", + devargs.name); + continue; + } + } + } rte_eth_dev_probing_finish(eth_dev); return 0; }