From mboxrd@z Thu Jan 1 00:00:00 1970 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) 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?bOi2UOOoLDr4BGRwy3w8En9iq3yTAAciZXef/JWQ6rn2doRIFTt4VnduFf?= =?iso-8859-1?Q?s2RLbAaGUmtGg7tojxYcPMkg8kmdSecBfT0NHTzgl+I9hyFjIRkk0LWxSq?= =?iso-8859-1?Q?4jVSj0aphVNKG1yh6YRsmln8fVJKQ3Qff4lpc8HflVJJjV8bEMv9BDSXKp?= =?iso-8859-1?Q?Mz64LjHTloTKwaVYz23T3OqzC7JrhWDBDTq11W7GOqB77w86rL28CDmXxC?= =?iso-8859-1?Q?1JkQHAYEqHhaAE0i6CcjqOtNK1zzhVdwFkqQwn431j+sbNmLEnqpOEgJJv?= =?iso-8859-1?Q?yJKu62rg0JAg4/8/DUbdvg+o5uN5SBN/p6fEJsMpamthRCSwrOyl74LGXV?= =?iso-8859-1?Q?P5AYOfmE+Nl7Jh1jslw2a0hNkMrKDxcWZsHoeGSPdjCEWeGz6MfqBCjz/q?= =?iso-8859-1?Q?jpv39Rw1HFLeGKwFR2YGrzNcLu2iHZ6CVynO8PM5EKTxLHVToV0b8LoY8k?= =?iso-8859-1?Q?LOImMi5C35Daj19QGmTlhELhckJesf6XpiXLJN8vrFbkK2Wvu18gOYXWhB?= =?iso-8859-1?Q?pZnu3Uzg+0z9KWWrQkXSLFCTapLk47rp982ptduxtBGxG6t4GgNTytb0Su?= =?iso-8859-1?Q?oQxOCevEsigg4xG9MLRLrgBe9O/1yzP7QqB9YdS51ycDJDKnG/EJ0kWAM0?= =?iso-8859-1?Q?2JxG63rRrqmGQvVilSbvrC/uoI8Zviohxm4vtVSk6kfZ8Ea/QTmUps87FA?= =?iso-8859-1?Q?W9+dSQ6lKQ7xztV107s7kH7vq4WRM7SlJAr4oiBfyEIboW78pno2xZXAY6?= =?iso-8859-1?Q?H6RrqZi7rqKKLu+QeTX8FzH2Lct60W4xDOGOy9udDYniOpQvEUhABAjbRs?= =?iso-8859-1?Q?2XDC+F7au+GQ2SOjHP1NK4GWdJMCs9/haLcGjtCrJk8z/jxEmDJVvFFBvg?= =?iso-8859-1?Q?23ZokIGyK8l/+KIWUSZjtR45QsHRvBfYiYro+lYzCpy7CwXkEjPninw91Y?= =?iso-8859-1?Q?rja+7Piib8gj7DNP7CLqBE9GMlCFkpS3U1zAlNW4S116nEKBotN7RMcp9n?= =?iso-8859-1?Q?SBcKiIOWDMjMrhna3QXHLPKRgHGchxgJTBUujRHocGRqUwNfxxnhj6jLvC?= =?iso-8859-1?Q?ChOomEvwVKXMt+WYvWX9IbmJd0A7lWsF3m3rPgQDrgzH6YZ7nVpPkRSISQ?= =?iso-8859-1?Q?3QZrcNcyhQx4EurN3fzK+wbOr/p28CvL7qpQ8ihs0f1IiOOv2Mb8vpCEgv?= =?iso-8859-1?Q?nTVTwBewX/PrK/TSO53L910fxkQjQLkV2tD4g94gu/iloIhVa+iwQXXGuS?= =?iso-8859-1?Q?n1eF85uyifo1tUqtD1Ii6AL?= 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= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable 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: , X-List-Received-Date: Tue, 05 Mar 2019 09:52:06 -0000 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