From patchwork Tue Mar 5 09:52:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 50808 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 5196A2BA7; Tue, 5 Mar 2019 10:52:08 +0100 (CET) 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) 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=TnzPXLe7FsBQ7jlGaz8G7XP8aOC/CHXono1Mf9dKV2Y=; b=AO3HqJzPmEsQ/u1y53cJvqXuv/OHLW66VnBNEaTReJqjh6x+s9uCJRh0lKa9lYy7kliDdjtMq5byTVUZHsVOe/RquMB2/2GxDGzUUD9Y4Q+a1FKpiHX+QrzTSc4LgrznOXwPLrbA0mRLHu6HImDOHfzCCPbKcocLM5eNSEPWvH8= Received: from AM6PR05MB5926.eurprd05.prod.outlook.com (20.179.2.27) by AM6PR05MB4487.eurprd05.prod.outlook.com (52.135.162.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.18; Tue, 5 Mar 2019 09:52:04 +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.1665.020; Tue, 5 Mar 2019 09:52:04 +0000 From: Raslan Darawsheh To: "gaetan.rivet@6wind.com" CC: "dev@dpdk.org" , Thomas Monjalon , Raslan Darawsheh , "stephen@networkplumber.org" Thread-Topic: [PATCH v2 1/4] net/failsafe: replace local device with shared data Thread-Index: AQHU0zkWpQQ0tJBEq0y+SFUxHGBAuw== Date: Tue, 5 Mar 2019 09:52:04 +0000 Message-ID: <1551779507-10857-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: LO2P265CA0426.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::30) 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: 921d3de5-e6fb-4f2b-cb08-08d6a1503889 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:AM6PR05MB4487; x-ms-traffictypediagnostic: AM6PR05MB4487: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; AM6PR05MB4487; 23:aZ90nKzJxCiURdr1tGnvs/qaWT5gLnOBiI36RLo?= =?iso-8859-1?q?+ZgbjlPWqUZpWdxAqGJ879Tr0?= =?iso-8859-1?q?15yyE4+VbZk4f4MDneGKnuPWX6yjLThi7UR/akEWqY8c9u7f8h5?= =?iso-8859-1?q?UmRUNMu/agbvgUWs57UTnzpeQHKyRBf2spYDJM4ly2MO3SRyNA4?= =?iso-8859-1?q?5bH/NYI+ACPuzfufbaoWxS7OM+iDlbfcEpvnkgxQVDSllYn5LrG?= =?iso-8859-1?q?Kpim4azMmOeucqHiJPgQtdPSVQtYyzfyBFHwcoERrTum97ZElDC?= =?iso-8859-1?q?hFpi/sUxvLdN8hMtHY2NVAr/DK2DecnToiuNrtburBktwmoTIOp?= =?iso-8859-1?q?Sdo/ckytACxXgG0JD2Aqe6P6LG6NupXUxXOWth/IkmuopOzt9Uz?= =?iso-8859-1?q?Q8WJFS7qfCyQ6EC0UFJ+sShlbDa8AKjpxhTzCgQXnhaULRb6GQ4?= =?iso-8859-1?q?7tc5sBf/lxVDX5DR8/OKRaD4oT1NG4nFp42t6vsouB0/VhBX8Ta?= =?iso-8859-1?q?R1yufAz1XvtjnG96VEqmVzNWqIlnYw81uK1mXj0WKL3sbih2ibj?= =?iso-8859-1?q?U8AbTZm8UW58xyoSpyI2/y3pIE0k0JPlY/2fFc0eA8PmoKQeIfa?= =?iso-8859-1?q?BpvXmKxuJOhANx6li6K7QDivcy56k3tabsrKJPGqNOAIqMUd1/6?= =?iso-8859-1?q?B/hGMyc5nij+3Gf95IoerFfDiFir00d3xbqoP86xRr8cAV/m/rQ?= =?iso-8859-1?q?RgBNaCJf1fwhMM0uzBp1BTWJsnLl13/vmugdQwiTtCsjgyYNJgq?= =?iso-8859-1?q?ZqY6h5Lg0sFhpZQQgPrmgxH0GGKMSYtWSnl/MHzG4/8hkVfjBqB?= =?iso-8859-1?q?429JoSdNid5hj029s/yIgDWWxaAjlOaOQdXTMt2aX5VIqDqHipX?= =?iso-8859-1?q?ZOVwdKT0i8fkrCbuGMB153aReiyna2RMXvxbuKIJCAUyYc4FoEB?= =?iso-8859-1?q?ERQNYEH4PwJ8+k168dmuXs+uYz0kGTzIvTUoZ1ZqhgV85wZWeEw?= =?iso-8859-1?q?5bC/oi4aaVG+mCDc6qgARlvjor//loWxTFRF+HAVBuUqYvZDR2i?= =?iso-8859-1?q?Q3UcYIONQEhbz2u87V8nsHRyePu+jWZruu6VaASvEbi2how428Z?= =?iso-8859-1?q?PU2GEGdDK2Kouu0pohuWukS16m7dGYB8gKyywoUvrioFOnhzOMu?= =?iso-8859-1?q?ehFR3Pko3dQCdMhfSn8nRzgJfOXhmXKJQZRqOchWtzvLCIVwDas?= =?iso-8859-1?q?X+aMIPTOwb+KlD1MFEjl7Y+WGTR4uKZXnupwxTWezHMThkthHz8?= =?iso-8859-1?q?GiA9OsUwBx7Wo55r+YiyX9quBb2gY4?= x-microsoft-antispam-prvs: x-forefront-prvs: 0967749BC1 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(366004)(136003)(346002)(189003)(199004)(25786009)(486006)(8936002)(6916009)(3846002)(53936002)(6512007)(52116002)(102836004)(2351001)(2906002)(5660300002)(2501003)(66066001)(97736004)(478600001)(99286004)(305945005)(106356001)(186003)(6486002)(386003)(26005)(14454004)(50226002)(316002)(4326008)(6506007)(68736007)(71190400001)(54906003)(71200400001)(105586002)(476003)(5640700003)(7736002)(256004)(36756003)(14444005)(86362001)(6116002)(8676002)(6436002)(2616005)(81166006)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4487; 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: KIN+CxrtnM2Fp9ZQInlylveEbG98NENQjkdhTkeH7b42fmyL57ubO9IeiXFnw4dKsxRs5puhpacUx807vVDj8n4jZoxJSJoQ9bEu4Qo59Bik3vqUo6Aa3vtFnHb1jhTWrvx0N7fQdtUtLMD0OKj1PRNbc8sR++WMq02OVg/0eyqw1Hax62dkV08KX3m6NVekZ6AWDnnSvfCAmLbhuwnOgprV5nugRSoYC44qHwPUGPmpK1MFFcXz8Cx1MZnhfGM20bKcZHfGeBHam6G1g5ff2DxwUdZP/tCglejCPA7UIy4UI6+ob+Yxq1tUHLXhQouyUmQf8KAouaf73PMpV2b4kjmy0XGGe0nw0FPbKwBcUgzZrnkOO8RC0zsWan9AMExU+1Dj6hRY/idv9qPclYBNj1FY3lPuLLjc6dbsZtP7Wls= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 921d3de5-e6fb-4f2b-cb08-08d6a1503889 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Mar 2019 09:52:04.1486 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4487 Subject: [dpdk-dev] [PATCH v2 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 | 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/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..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; }; +/* + * 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/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 Tue Mar 5 09:52:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 50809 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 0144747CE; Tue, 5 Mar 2019 10:52:10 +0100 (CET) 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) 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=R4fi2oYifbrhiDaLhxEBwkbuCTSZSIFMWWl2s2fWta4=; b=bBNYu/Hd4p+qObWBn3VSqAGnRc1iusnKYBPb0d0laBPf8b79dPikyDwgqHqKaJcQvmAUpt7PaC/BtSO4KImzYDuWWn4H1y+9/H62/TrJWxDujlReLARZiRiTPErCLfUnRV5RxRlJgggGKXFuf7PEU6S4ARoo686Hd+foONhWmro= Received: from AM6PR05MB5926.eurprd05.prod.outlook.com (20.179.2.27) by AM6PR05MB4487.eurprd05.prod.outlook.com (52.135.162.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.18; Tue, 5 Mar 2019 09:52:05 +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.1665.020; Tue, 5 Mar 2019 09:52:05 +0000 From: Raslan Darawsheh To: "gaetan.rivet@6wind.com" CC: "dev@dpdk.org" , Thomas Monjalon , Raslan Darawsheh , "stephen@networkplumber.org" Thread-Topic: [PATCH v2 2/4] net/failsafe: change back-reference from sub-device Thread-Index: AQHU0zkWSunmH/Ws/UiUZsH01gVz4w== 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> In-Reply-To: <1551779507-10857-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: LO2P265CA0426.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::30) 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: f196fa4b-9a1e-415f-cb4e-08d6a1503922 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:AM6PR05MB4487; x-ms-traffictypediagnostic: AM6PR05MB4487: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; AM6PR05MB4487; 23:jhWxgMmbnMG2SjXeLZMlbqGfzsHIk0KfF3DVuzH?= =?iso-8859-1?q?bOi2UOOoLDr4BGRwy3w8En9iq?= =?iso-8859-1?q?3yTAAciZXef/JWQ6rn2doRIFTt4VnduFfs2RLbAaGUmtGg7tojx?= =?iso-8859-1?q?YcPMkg8kmdSecBfT0NHTzgl+I9hyFjIRkk0LWxSq4jVSj0aphVN?= =?iso-8859-1?q?KG1yh6YRsmln8fVJKQ3Qff4lpc8HflVJJjV8bEMv9BDSXKpMz64?= =?iso-8859-1?q?LjHTloTKwaVYz23T3OqzC7JrhWDBDTq11W7GOqB77w86rL28CDm?= =?iso-8859-1?q?XxC1JkQHAYEqHhaAE0i6CcjqOtNK1zzhVdwFkqQwn431j+sbNmL?= =?iso-8859-1?q?EnqpOEgJJvyJKu62rg0JAg4/8/DUbdvg+o5uN5SBN/p6fEJsMpa?= =?iso-8859-1?q?mthRCSwrOyl74LGXVP5AYOfmE+Nl7Jh1jslw2a0hNkMrKDxcWZs?= =?iso-8859-1?q?HoeGSPdjCEWeGz6MfqBCjz/qjpv39Rw1HFLeGKwFR2YGrzNcLu2?= =?iso-8859-1?q?iHZ6CVynO8PM5EKTxLHVToV0b8LoY8kLOImMi5C35Daj19QGmTl?= =?iso-8859-1?q?hELhckJesf6XpiXLJN8vrFbkK2Wvu18gOYXWhBpZnu3Uzg+0z9K?= =?iso-8859-1?q?WWrQkXSLFCTapLk47rp982ptduxtBGxG6t4GgNTytb0SuoQxOCe?= =?iso-8859-1?q?vEsigg4xG9MLRLrgBe9O/1yzP7QqB9YdS51ycDJDKnG/EJ0kWAM?= =?iso-8859-1?q?02JxG63rRrqmGQvVilSbvrC/uoI8Zviohxm4vtVSk6kfZ8Ea/QT?= =?iso-8859-1?q?mUps87FAW9+dSQ6lKQ7xztV107s7kH7vq4WRM7SlJAr4oiBfyEI?= =?iso-8859-1?q?boW78pno2xZXAY6H6RrqZi7rqKKLu+QeTX8FzH2Lct60W4xDOGO?= =?iso-8859-1?q?y9udDYniOpQvEUhABAjbRs2XDC+F7au+GQ2SOjHP1NK4GWdJMCs?= =?iso-8859-1?q?9/haLcGjtCrJk8z/jxEmDJVvFFBvg23ZokIGyK8l/+KIWUSZjtR?= =?iso-8859-1?q?45QsHRvBfYiYro+lYzCpy7CwXkEjPninw91Yrja+7Piib8gj7DN?= =?iso-8859-1?q?P7CLqBE9GMlCFkpS3U1zAlNW4S116nEKBotN7RMcp9nSBcKiIOW?= =?iso-8859-1?q?DMjMrhna3QXHLPKRgHGchxgJTBUujRHocGRqUwNfxxnhj6jLvCC?= =?iso-8859-1?q?hOomEvwVKXMt+WYvWX9IbmJd0A7lWsF3m3rPgQDrgzH6YZ7nVpP?= =?iso-8859-1?q?kRSISQ3QZrcNcyhQx4EurN3fzK+wbOr/p28CvL7qpQ8ihs0f1Ii?= =?iso-8859-1?q?OOv2Mb8vpCEgvnTVTwBewX/PrK/TSO53L910fxkQjQLkV2tD4g9?= =?iso-8859-1?q?4gu/iloIhVa+iwQXXGuSn1eF85uyifo1tUqtD1Ii6AL?= x-microsoft-antispam-prvs: x-forefront-prvs: 0967749BC1 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(366004)(136003)(346002)(189003)(199004)(25786009)(486006)(8936002)(6916009)(3846002)(53936002)(6512007)(52116002)(102836004)(2351001)(2906002)(5660300002)(446003)(2501003)(66066001)(97736004)(478600001)(11346002)(99286004)(305945005)(106356001)(186003)(6486002)(386003)(26005)(14454004)(50226002)(316002)(4326008)(6506007)(68736007)(71190400001)(54906003)(71200400001)(76176011)(105586002)(476003)(5640700003)(7736002)(256004)(36756003)(14444005)(86362001)(6116002)(8676002)(6436002)(2616005)(81166006)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4487; 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: nwo/Tb7hy1OZmMV8IZZ1P60vavwOMMPjPIdQJF+iV03CdRzzvI03J1kDmgohKbFINBVHX+V5VCS97UD+s3RBq1p1N1cRxzCoz9U6iQKkqHMOzjFIPFclXmSCDzOYR3xZ+x6pCEYDSz+cYQ40TduCqOFnSOKWZKxCfsqXCjOZhziCLx2ovmnvvbnBZGdiXK2aBuxqY0HvmiUbZ+wrY1W2IuwigwYzpmQVm08FLEzkpZf3m5gtdJ5Thr60kGxSdVhDF+yyZ5dAgckrYmRX5ClUvy3w+r8liY9uZgMPSJRHkwVDE1ZQSQLvPKb1Npd53k3cGev/pJ9M2YDaZHiJSnbwZ7fMM2AVOzYXv63ZKO/jkdVZv6bCQwILJiZVlpmm0NwRlEbMuBD6KmSH8d7UtHlPCGyaMY3621uh460wE01ovGs= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f196fa4b-9a1e-415f-cb4e-08d6a1503922 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Mar 2019 09:52:05.0683 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4487 Subject: [dpdk-dev] [PATCH v2 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 --- 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/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..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 = 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..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 = 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 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] \ ) #ifdef RTE_EXEC_ENV_BSDAPP @@ -379,6 +381,11 @@ fs_find_next(struct rte_eth_dev *dev, return &subs[sid]; } +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 mechanism. From patchwork Tue Mar 5 09:52:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 50810 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 861D24CA7; Tue, 5 Mar 2019 10:52:11 +0100 (CET) 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) 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=/U3iRRKBj1NjL+IHZIakG7mGiFZ9Jk59fWlRLYx7ht4=; b=Rd3u4bq8D/KiLMwZSWNxDX7zymkKMLwaG4HaQ4OW9C/kl0I04UMCFwmY7PdYmE5CQmP+BpXZW1HpLg+kNLkcrsVK23lwuixgMDb1n9rKBOJOW4U9wcwDQGwnY5SO8DptmxFnqQUGz2oKBSNa4pLxlxSAUy4vt14BD9E7NVAWzlY= Received: from AM6PR05MB5926.eurprd05.prod.outlook.com (20.179.2.27) by AM6PR05MB4487.eurprd05.prod.outlook.com (52.135.162.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.18; Tue, 5 Mar 2019 09:52:06 +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.1665.020; Tue, 5 Mar 2019 09:52:06 +0000 From: Raslan Darawsheh To: "gaetan.rivet@6wind.com" CC: "dev@dpdk.org" , Thomas Monjalon , Raslan Darawsheh , "stephen@networkplumber.org" Thread-Topic: [PATCH v2 3/4] net/failsafe: replace local sub-device with shared data Thread-Index: AQHU0zkXnxxf40CUoEe2KJZ0xt62sg== 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> In-Reply-To: <1551779507-10857-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: LO2P265CA0426.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::30) 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: 6c3eb1c4-1fc8-4e74-bb6f-08d6a15039af 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:AM6PR05MB4487; x-ms-traffictypediagnostic: AM6PR05MB4487: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; AM6PR05MB4487; 23:1BF15DOLmrKoq3G1+S02YMKC3p9ry1kiEhPspj/?= =?iso-8859-1?q?hDDmW/NZ+hxvGHKfyhmEHmLGW?= =?iso-8859-1?q?VqzFC1vTuq3xUeDFc1h1DIpFXt07f0IMdLUMHyL7JuzOhZMULbp?= =?iso-8859-1?q?FnCWjMG1+YLyXTpM0MNjNmsKGX4LMDXSFSR9uzYIyslYTZ0IlLH?= =?iso-8859-1?q?nw2Vo8WSZ7yo0DawYx2aA/0egILbnYSKWfPxy86pQThBIZX9bOR?= =?iso-8859-1?q?NW1za7EGsIJndWrDQSpFS3tWX+S59dzyRRZ7aNK4FUd8gm5uQ2P?= =?iso-8859-1?q?HyPzJRfjRyUJ+Im+nCvgtc4t7fSI5VFAdZHpn7vRqxLsePwfl3n?= =?iso-8859-1?q?fRKykurNoa8QsKSCJSh5vFREBMVcFtKalGe5b//6BYPKTLWdC2Q?= =?iso-8859-1?q?uWrjsmk53Gozbns039HCE6pQ2h4UsIFHDbLdEWDsTGRifVC69pW?= =?iso-8859-1?q?80eEiHgHDA2l6z1nvZqlHDjwGYERmHufrZK6VbRD2zIO+ULiR6J?= =?iso-8859-1?q?ulHdLIluAYGCNxwspjr664gSv/QN2szO2U4dpWPbV/PsuBzBfyB?= =?iso-8859-1?q?36C1uq0L8GmfCNYJFsdACkfZm26dSFDVnTjGm/NSzSv0YV3RTMt?= =?iso-8859-1?q?D2nSoa4IEk6ZJMuffTBdyKKLpDJRq2R8lD/2jlsgxQaHHe/LAxn?= =?iso-8859-1?q?/kbJjECVzZZa6+t7CrjYMnBB9eYx0qpCT+9SN6aHPn5CbT1irxJ?= =?iso-8859-1?q?R40iZncAPiB4IF4V7TVo3muIub+BjvbVVHvXpIsqVmAsIkAOE3p?= =?iso-8859-1?q?VA/5xk5yKEc6FS/DTwi7EkRNVJgdFOQcbkOZ8v1i9diSgbyt/zL?= =?iso-8859-1?q?rq+iSpMiZXjkRelYpmrnQfKNp7V7obznoUJiM0pXH6jMlUoEiIq?= =?iso-8859-1?q?Jpd49iCZ3t1qHmOqqLGvW+vlkdkqZSZY0CXxi6tLNUDjxUtNmzT?= =?iso-8859-1?q?GD3SH+y29NSGfRHtydeeLhWGnvvz9TYIikM+qwSAGRYRWrH/288?= =?iso-8859-1?q?+UX30JJeBNeganfQwd1X/moJkizH6sXNo8lFijeSr+Hu2aa8MQ0?= =?iso-8859-1?q?1Jw8Aa5YevrXO4pCJ2jVKdCp3UDQb3KNzrDFZGqBmXMERvBqUM6?= =?iso-8859-1?q?oo3G/5qHFRgHeZVKeuQi6uRgYT90DN67D6oIfFv/FNr97T9PFJU?= =?iso-8859-1?q?CwslPis19SbFblv95OByVTCd0RBspcHD+XqJI0gHYOO4eGyML6B?= =?iso-8859-1?q?62NAt2QaXZ6x+03sZUHNctqqkdTtekoX4F9hTqD7Awp8m4yjJVa?= =?iso-8859-1?q?jEwyrSjYNcT1djawDAv/hbLhx+F4mskupZf7VREjAL9WO7jCNTq?= =?iso-8859-1?q?aIpYA69lbLa8SF4F/t7z9Z+I+r7uGRZVDcYFatoZWVb?= x-microsoft-antispam-prvs: x-forefront-prvs: 0967749BC1 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(366004)(136003)(346002)(189003)(199004)(25786009)(486006)(8936002)(6916009)(3846002)(53936002)(6512007)(52116002)(102836004)(2351001)(2906002)(5660300002)(446003)(2501003)(66066001)(97736004)(478600001)(11346002)(99286004)(305945005)(106356001)(186003)(6486002)(386003)(26005)(14454004)(50226002)(316002)(4326008)(6506007)(68736007)(71190400001)(54906003)(71200400001)(76176011)(105586002)(476003)(5640700003)(7736002)(256004)(36756003)(14444005)(86362001)(6116002)(8676002)(6436002)(2616005)(81166006)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4487; 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: gqGwUjNPZVfvpLptbYGGI4lAfxMKb4OnslNyzUNJDAInZM8T1dosQa8EtULAp8WCfC00Gy8g/ukaOhM0Cigai/+M3whwCY1rHrF9CrO44n0GXEsdYM0vRAL6Qik3jyNVKdwLxNys2ft8+FdaV+I+VKvKfOSFcLiVFMh7SXk9KZgMrtmASX9+6POaGJLIPJqQVPfJzxhx8idHdVD6sbSgU04wqImtXwLFN+FIf3l8gb9yrFUZZqNaH2dBvy+SW4v3bReE7C1e+UkpK0w/nd0dCoPaak5TLp6xPR9f0zV2rVyFJnpXmV+GZHXraZ2zfyePn0O5ZQviIWJtvXcx7gblDWaj5BDbWOM1c/33jO6kmpZrPb3nxkbZMlO2RGA1c8XXz5QhO9FOIGO1lV0PCMA1aaDVvxsk88KsERZLKcJiB4I= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c3eb1c4-1fc8-4e74-bb6f-08d6a15039af X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Mar 2019 09:52:05.9889 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4487 Subject: [dpdk-dev] [PATCH v2 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 --- 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/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 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 = 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 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; }; +/* + * 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 == 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; /* 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 Tue Mar 5 09:52:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 50811 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 9634B4CB5; Tue, 5 Mar 2019 10:52:12 +0100 (CET) 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 E8CA52BA7 for ; Tue, 5 Mar 2019 10:52:07 +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=xEcXBW+IUCvFAnXlPiNo2IFbxSgwUgO7h7T15qw9glY=; b=iJlsNvuDK/4vGBZRyOW5wZp9ajRg5AyxO2BfUTbByFF9dVzM4lfAYQygQ7dV2s+70a0maN+547UoGy290/OazBt7j4Yb5oa9nWB9fqPBhjOc9+N1MJOiCLPVHyR30ajeRZ0z73Op0cR2cHBrw6Lu4H32inMXTxQHB6TEJdejUuQ= Received: from AM6PR05MB5926.eurprd05.prod.outlook.com (20.179.2.27) by AM6PR05MB4487.eurprd05.prod.outlook.com (52.135.162.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.18; Tue, 5 Mar 2019 09:52:06 +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.1665.020; Tue, 5 Mar 2019 09:52:06 +0000 From: Raslan Darawsheh To: "gaetan.rivet@6wind.com" CC: "dev@dpdk.org" , Thomas Monjalon , Raslan Darawsheh , "stephen@networkplumber.org" Thread-Topic: [PATCH v2 4/4] net/failsafe: support secondary process Thread-Index: AQHU0zkXhY0FlFYgQkqdSZXMlvag9Q== Date: Tue, 5 Mar 2019 09:52:06 +0000 Message-ID: <1551779507-10857-4-git-send-email-rasland@mellanox.com> References: <1551779507-10857-1-git-send-email-rasland@mellanox.com> In-Reply-To: <1551779507-10857-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: LO2P265CA0426.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::30) 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: 91dcda68-7137-453d-b96c-08d6a1503a3f 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:AM6PR05MB4487; x-ms-traffictypediagnostic: AM6PR05MB4487: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; AM6PR05MB4487; 23:yCE4LX4IJH4HIgakpRejP94afqUXcNfWPakUEHU?= =?iso-8859-1?q?fWrsuRGW9Ycm4J4NfOf45SkPv?= =?iso-8859-1?q?MFqv1bHfyaXtWwf7UIDnMGHmZkiHvb3nq0cvkcHHOiieWuAmxmQ?= =?iso-8859-1?q?Es7OwiYXtv8Z0+hfXogWtlmqrYLgzatb14hMJjXrYFl1Q2bXYsj?= =?iso-8859-1?q?/liLkFee4bcx2fo9YDo+ths9R4qAGj4y8QAM+LUZtKAednS8bFT?= =?iso-8859-1?q?O5Rhs37M0M0tk+C1QtW/QaYzFQ6xLFpEUbrsFD+uAJAFISVYUoh?= =?iso-8859-1?q?j0wDIATXPNQ9ovDuTaAGW3hZA7C4ZQ49lu9vwk8hvI+jQQawgOM?= =?iso-8859-1?q?ukgH1NiwppA0v+nJ9+Pp25cG4VXG2i4AzUOBfrl2THjKIS5KaTJ?= =?iso-8859-1?q?DifuIuXQdblYyyMCvKV7jv7hDUdQNLaF1hiB+G4W7iY6MeFBGRA?= =?iso-8859-1?q?FWCqJ6ii9LVEuDQw0raB5Y+mZf562/2kAxHVAUI6nqYFclVFgoz?= =?iso-8859-1?q?YYPRnaYVjDnem3meoqIXVxfnUN32LkbQvi+10mF8tjhnu63XJc1?= =?iso-8859-1?q?n1VXr6NjT8Djl1coytcpbjPFiNuhd1/rqwhNd0uD30NtA3gRHUw?= =?iso-8859-1?q?1ukkxkx/LNsXkNUndq576JdETPJ5vmdI1UCg40zcNFvTTSUWxOX?= =?iso-8859-1?q?xisnRs0mNcy4q3VOtFRm6xm0Zm1QlogidEPYtfvJqcHU5UwqTdE?= =?iso-8859-1?q?Ufzs+UjwyJzWAfYGxpOly2qZ0O1s5BBYrhE86KV6uCG+9dxcbax?= =?iso-8859-1?q?dLlT6IE/TnprZ6y4aYxgVStSxgjIPw72M4VH2za9i5KZuFWYhDn?= =?iso-8859-1?q?1OmNuyHr297KxaJR8i10g81jWSolSS8Bb31+zWJhSdmiuiHnRgx?= =?iso-8859-1?q?EiajyPh6ieagBkqhSqUvfIs6EZDOjZne1DRmoOLJxqzb3qTOWb/?= =?iso-8859-1?q?//7yRpitmdueIBFv1dG4mDqQdkWAtnAJdTasxPXJWtVGOsT85PF?= =?iso-8859-1?q?g7pVnGtwZ9zdWYBq83q2QfvIzI7zLDhCPltnhXxmcfPrN2yUz5m?= =?iso-8859-1?q?bQQU4lDEYsUqhnMqlbxIqkgPcM9sUOrrHTNpCtaEaqwn7SEQfGF?= =?iso-8859-1?q?TY4BOHCf3luAAJ9PY6gN0ziDALJZKx+1T6qQC7cbps1Pvy7xCR6?= =?iso-8859-1?q?JQ82KTMogWJSNSFW2gDbtQnwnwp0pk95TRstZTOtC/WFO1+7gwl?= =?iso-8859-1?q?af9RqBbuUCb1+fiaXbJGur3cZrriWvHa+2mG2xr2PmD1AbfSDBr?= =?iso-8859-1?q?ghk+rV71vf9B27puLVGWksrviWYZXqQMH9KJFSqO7mA4j/CF4bn?= =?iso-8859-1?q?KYGm49O9Uyj8V+gu+sB7AzJsALqlz4e6SCzgOBQZGrtIsZNaX+a?= =?iso-8859-1?q?MONWrLu8LXhOVQ=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0967749BC1 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(366004)(136003)(346002)(189003)(199004)(25786009)(486006)(8936002)(6916009)(3846002)(53936002)(6512007)(52116002)(102836004)(2351001)(2906002)(5660300002)(446003)(2501003)(66066001)(97736004)(478600001)(11346002)(99286004)(305945005)(106356001)(186003)(6486002)(386003)(26005)(14454004)(50226002)(316002)(4326008)(6506007)(68736007)(71190400001)(54906003)(71200400001)(76176011)(105586002)(476003)(5640700003)(7736002)(256004)(36756003)(14444005)(86362001)(6116002)(8676002)(6436002)(2616005)(5024004)(81166006)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4487; 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: lc1T3tMWXBnzMxtee3JBI8KmM9nxoG+yr9M+1lTNQ+cgKXvvibq2sUIEFXcm7JKLXje3quX0OCN17FUnj2jNCxmMmU/sRb7HotKSfYWcti3HBlsgkBnkbpUxrL539LnuZ5C7K8d1yWWljSegnrNlmKu1YmtLrcGHcXVr4foXrLhVevcxxnaS5S6qnlTFiHN2oriNDEQ3PupWKlo8htKRCXK9+iIgFFaxdXJQpitd2tkWs9RuT+vWO1c5LGZ51uwinxIHxdnnFJzEGEIXuGe8XR5TimnmI9fA7cOoM/1Wm+3tcnTs/qisAZG4xPO/n2zc8kZfxkfw+zcygTXq3JbFCfnJatRvlX1qa39v+I02hwvyJNUBoi9lDQicgMzGf6G7DcdTROWtOiTmxyEW7lMpUER5ncUXwpTUwmR1wALT/vY= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91dcda68-7137-453d-b96c-08d6a1503a3f X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Mar 2019 09:52:06.8966 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4487 Subject: [dpdk-dev] [PATCH v2 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 --- v2: changed devargs_alread_listed return value to be bool. --- drivers/net/failsafe/failsafe.c | 45 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c index 68926ca..c3f568b 100644 --- a/drivers/net/failsafe/failsafe.c +++ b/drivers/net/failsafe/failsafe.c @@ -3,6 +3,8 @@ * Copyright 2017 Mellanox Technologies, Ltd */ +#include + #include #include #include @@ -312,11 +314,28 @@ fs_rte_eth_free(const char *name) return ret; } +static bool +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 true; + } + return false; +} + 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 +348,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; }