From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0047.outbound.protection.outlook.com [104.47.34.47]) by dpdk.org (Postfix) with ESMTP id 7915CFA5C for ; Wed, 18 Jan 2017 15:03:35 +0100 (CET) Received: from DM2PR03CA0006.namprd03.prod.outlook.com (10.141.96.16) by DM2PR0301MB0749.namprd03.prod.outlook.com (10.160.97.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13; Wed, 18 Jan 2017 14:03:33 +0000 Received: from BY2FFO11FD016.protection.gbl (2a01:111:f400:7c0c::131) by DM2PR03CA0006.outlook.office365.com (2a01:111:e400:2428::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13 via Frontend Transport; Wed, 18 Jan 2017 14:03:32 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD016.mail.protection.outlook.com (10.1.14.148) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Wed, 18 Jan 2017 14:03:31 +0000 Received: from tophie.ap.freescale.net ([10.232.14.39]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0IE250u026776; Wed, 18 Jan 2017 07:03:30 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Wed, 18 Jan 2017 19:35:18 +0530 Message-ID: <1484748329-5418-3-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484748329-5418-1-git-send-email-shreyansh.jain@nxp.com> References: <1484735880-17178-1-git-send-email-shreyansh.jain@nxp.com> <1484748329-5418-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131292218119729602; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(336005)(39410400002)(39400400002)(39860400002)(39380400002)(39450400003)(39850400002)(39840400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(48376002)(53936002)(2950100002)(6916009)(33646002)(77096006)(626004)(2351001)(5660300001)(76176999)(6666003)(575784001)(38730400001)(86362001)(106466001)(92566002)(50226002)(105606002)(8936002)(356003)(305945005)(47776003)(5003940100001)(68736007)(50986999)(2906002)(189998001)(4326007)(81156014)(104016004)(81166006)(50466002)(36756003)(8676002)(5890100001)(97736004)(110136003)(8656002)(54906002)(85426001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0749; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD016; 1:Iz/yJJuYvFMwSAXu+6+WsihkNF3t2qXCVXYrn9NQvLoYRspZDSTQPxDFWmU9LhLELu3/Z/IG/AScvCgqrnIaitv16VxMMtkWxdU8hUf3B1+WmOxDVPEhcxpFDvZiv9xAYOi5I0mEUYs9H8TZCT0kF1Y++uJB8AKa9hMadij4+MKkjm7Q9CbfKjdWXPGkX/1y1heGoYC5pAZaE3OYhYJCxRMB19rBImdjHmZGy8a1R1tBmYHIzLdFEQkJBFW90acoqzURag3qsMJpYq6IQjjspEEKvXqtnEXOIt07SzYbGaCicPpBfMs/iBmACm9f+IAz8yps3Vwd6kr4nWJNsZDpYxjHqm/qH7QJoVDhzOk+7P4YFZ+VsYhMZMGhXXMXNTMNw4v1IGMj+gnrQ14ei4J6NKOrkokEYj/IO/31SsFMKCYN7fr9xx+oIHgol348aKa1khUNO1Ru4pesTQqe0ppE4+4dqZXzzvcCVHTEfSscKSYwjMLslLYkGYWFNCiERzcFo4lB0P9NqlhQIfehtoxzjmTa/HTlfb8RPlDPkigV5UaH7E4HsGTfLCxhMQ78YAf83edMWgQeElf8nOwRKwL9SKb/6nED0+1nVuBOHi3/CysGgQKlVvEuF0x/H68JKbY53R6vjJaEMKptOB4+P3IhDVBiih5zJmhIL6fwsWKT6EyQtsv150fMA09Lc9p2h6bIry1WyytDMxqQT09QUp4Yog== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 13f2b1b3-6398-4697-5064-08d43faac941 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0749; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 3:vkS5AuWiABdPmHnSXRSWMiASUfeVMklRtdaOMPCvWQiA34yGXYxlA3Bb6hjDd6EBAzcEYv7IpQltHXeFrs2bebzjApJDU+YTuTf1Kic4S/u2OyZyyiep9dHButmhNnojMNMoV4yPhoCdiiNQKDrl+ZfKytVJ3GcWYKGZDFJqjYQdfrDBKvH5oVfNczH5vGkNu47t2KRbye+qlQqjtR//kByvb+3SjE3p8vTqfPtVR4iqOt314laQMpBuB2scdykqJc0exu0go9GqyGRp4ayQHd/55nNw+P+CF4rzaxtqX011ZrsBBPXM9wYpHXI5zqLVqIl/kq7RV2+eZwh5RaL7VbyHGIFfHz8zeS4ldsOFV/p7QChhxQOOrBf8HeQFCwQ3 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 25:CQv4cylCRc7x+DHuBKzaX1ddHXQ6RUJYu+prBnoRxcnDZuv0aFZDy+W8pDr2efOq1e38/SUrSPibpeniUPfwNkRexXZr55sYgBDbQ7SWg6a33tON5hUBxAeXT54UnWqrme4VbMtIcgyaYOALe6+8iPn/SgwF9BNFvc50C8b+T5BObRY5ALX9pxhDvKOrZHWhkQOLl32HMgtikzm3JCckStgc5nRnzPBoGzsyiX+7u4RQzQwY7mJDxyugzDFO9VePYy9v6HxLmQdM2nD+EksZCugQhlFE53OwJ0ymFf2yeiQFHHPcfoNyWMW7i1E0vnLXIZNlNf8e63F211Zqz9EXUY1FhBYyBdzH3ox3/5tDc0cTxSEDdCWsgsdeTzQPaCkjX9lt+4T2YHnXE8q1uZjkg0xuA9WDRho7egNArWzFb8BLzPy3B9P5Lf47chksKlQDZ9xPGKKH88pIz/gtRZzRMAREq1PRHH/N4gK+AxwmdnsYpq5Fi7hXxJ5X7IhoaUgb7ZBkqjwugC0qQhCthcPUSDYHSIznXj9j7pFQZsfUqnRtbrdAYQiHxA55jffhdZrNH7g20576dCTYO8DRf8WU0LgDJN3VJy5OA/7FJD1G7ytlfLAlvQLFfxEz0V7hRR4qe2Y+rVEvflf7wzZBh36k2uZ5qrcys08D6DE4d8zQVSahTfBbGoNIzZf+Jv+ovsgSwx4ZoujHfcrqxvZVMdFpx0wC1PcynzxYpFvyOSEomZRzHxZyg1mfEaCp/R3LJrzJiNQagIp7GIdvATY3qug4ybVF+uyje4WOjqZG/2XfaCE= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 31:Ra6VwwLnVrDIqmBUfyjVg+Nj+a/iQcLb/fZvYhONcXa8FB/pYaBjbHSMmzzH2TuMgrvusopvbnX3qr1GNUE7WYgO9qv+sQY2SjMCp2rt3etrEgFoNrWzKTGDL8/wI/lzbMue9Cq8pSfqY21L7KGd+EpXkXgAvlOtR3/oH5DfvHQWW9schehEATu1DELmCn15tHSmMgj2a9r6qmZ2egik13SyLb9/E5yzTF1rbWclIyA2EYPSwb1Bo2HTX3LhK66RtSeqXb52bKD55+rHzmTEog== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13015025)(13024025)(13023025)(13018025)(13017025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123563025)(20161123556025)(20161123561025)(20161123559025); SRVR:DM2PR0301MB0749; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0749; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 4:kGvzaufgnNPbWCLoo+RX/Nv61C+LA81aZvLvpAV+ZN7KDHFtCf4tpIm83G52HSLIo9wTy8Tbx5zdU1pUo20OiEdSnnO8GJhk1vKpmzmmnMfFlguTuLT6xwkRb25udbQBmoZn6JXtHD58O7Tn7nsaWGiECu4m/k5cr4Y9Qly1BZqIGrOBwSYGscfePOt0E7eaVdIEMEGwtI7Jpm2Kt2Q5f8DvRSXN9Zr+JUL62tvM8Bslw/8HKm2YHFVfor6cVaEMxhALpH5bhPtJHm1Mfbi/cMYNp7LiueoW0Zn84JkH5fv8riJ5/wyBQZDYcSisxRkeprYDbRBjHodA9kiMdYmhwRfzMXzWNOgDw/q03JIpruBfJMhDwPooiaQspUOgm1oiL+H3490Y0ccWDF0h1/UUMyqWNBXKDQaFRx5BtEZ7F7DtNTyYa+dPUvEX4LGX9kVlRfWPXSrWppiptmKj405uLr5NtcbwhCdb2iFmnEZfL4EcYHEXyGQDCph0qN8H8u2saSawFfIUMpQc9q2OWAQfrVG9F3ejBzd3sTapA509OnH3uMLw9Uf4vtwKQP5/TW708TFXA5UBECLe9Zm6qFRK1rL3dAc2ugT8KVYOSkKPjDsLOJrpyTA0/IkVscsRnYcbVQ/CVIsc90WA0xQMS66WZuvRhoC3FdWTwXiHNvMRRL36jdNIK6fica/x5lMN2vO7QERKmf7OApqYgpb+OUG+/35HbqsAut4YQQO5l7AXbORkdb6JI8fEZlzRJHcRLnImhQSm3IklKB2RH4PqhA0UgQ== X-Forefront-PRVS: 01917B1794 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0749; 23:ZVWU3DhmyV2yconlXub9CD34BBC2PBeUidLWrhn?= =?us-ascii?Q?+Ds9EtKZ8GeM/RzU23D5vB6PUVVT6olUHr51GKRfNuociZumkvQoZSlF0wOX?= =?us-ascii?Q?NWzFlivkh3FM49eapTfelw3HcFR5sNVjSbnWbjgd2yi1hFxNRvJX+m3v1jnk?= =?us-ascii?Q?bYrYuh1TGMnKS0hZUoAUQ8RApxjrVxumGcmaWUCx6TyXdtOn1Oof57subMxx?= =?us-ascii?Q?weFEn6ZgXSuqWkC+a8xcXFnNSpeOeDLy6YFKPTrFLnNHcR4DMsHlTdhpEBJc?= =?us-ascii?Q?hQGWz3fStlHgFBOnLbEDz/g3nXuXGPSiTpNwvKycO+10DJEkYptKm9i4Qwe4?= =?us-ascii?Q?Yh/L6UcZRyEwaOUiH5YggJrXf/MMaUJPMvK66lqZvJuj8/1OM5Ezq8pHD2hq?= =?us-ascii?Q?EK9C+SnRpqKaHdPC8PyzmKpa67uGls4tkrdixmfb4Il/9dn4LbnhVE0ax1LC?= =?us-ascii?Q?VbuVgSkuV2LGLqglBwuTYANzSgoxVW3obrF0rSIKOEzmK2OC0LA/NJb6hwJN?= =?us-ascii?Q?FPf0XxouZ+pUeTGx+aTIzZ8KVF1gL2prs04/wTVVXnr8ixuCJN9mKnfDQ1Vs?= =?us-ascii?Q?z1viq1Vu4eu3MnXYwOto4QZtnIbkd4g96DBAIPeyev2yWEVs2hFjrgZOde7l?= =?us-ascii?Q?3lf20Jz2J/DXmO/+ApO/s9JJIpEK8AcM0/YvTPMlSCTNw/bevOPLvYOHfthS?= =?us-ascii?Q?w6JqTZBkT7O/0px7XObXSQgUYTwgVBCS3fieX0Ut1nWDvdkNkoJXI92J1ybB?= =?us-ascii?Q?AD/A+baXGqNvWLwNXxV6t/IxIwXhn0Cc2MlDVDiIu/1PG9H9vOBEMcYPqp1s?= =?us-ascii?Q?w7oC1fdZ1FPXZWcwcXO1zWQ/nqI6QD29QuAyBjrYzDl8aG6/sMoMYsLfVKIn?= =?us-ascii?Q?T+P5ce97O+JCHygcMzuUezBF9EISTVWvpUNtMVhcpt9CApFMBWHgkbU1XcDA?= =?us-ascii?Q?0alFTNQeDVJaccHXCConTwJS1em09XW3s6usmEcBGXOGVS6d7LEISbdwZa9x?= =?us-ascii?Q?hCcBpd+Q85ELhb5oEdAp3+cMDa/f/XXg4Vgn0bgmPL2Kz51vao+hZ/XrxiLR?= =?us-ascii?Q?z1mZHCbk/303ogm+9kOnyERS07fNZtHeFCCrCleEW3rUjswTdAveBSs1jGgM?= =?us-ascii?Q?Ng6XH6WP/B27dhdPQtULEfYNmpmn0F/4e/YKPb2d/I9V/x5VMGXQk2IK2Oia?= =?us-ascii?Q?SDJRK0VbCfg7steKFtpb3LI+oVb6MK+ykrq720klhABI6to9oh/PCbs8dBRw?= =?us-ascii?Q?jUKAZiIpTasiNngNTvmP+c+QAA6EegQCawAu3sOA4f9LkwcOwxuxlUnv0Ago?= =?us-ascii?Q?45/RVx/ExBRPXlcpT767QXkz5P2lapxQIWPy2CKE3qlMHqRIwD0J8kijd+BS?= =?us-ascii?Q?25sbiEw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 6:Cw/phgpm2ZVCxNAZdsOOKuAkSm2q0KE7OfCb2AP941+2YHherHS76S4+eyp5tAISQSZprA1Qf9hgz/HXXcwbgrEglB3EfJWc2C2VdAv2U6VoTafqfuohro3v6K0d4mDsMrGPXnep9qkWApa275ZKTmoRjXL33GxcX5rTNpxQvZ6PdS7KbXWawxgqGB0bu5GJE3Li6znestxfwKJG3kM7OM5yQ2K8njPYdAj4tFkaXHNuH/5aMIaXWK+zC2gL6rxmtDmsSUZk0zovmvPOSFZoCskTnfCcHs65cPC+P1R83P458N0HXeV6Xf9AbNruUzbosXuoO9Xwg67U3RFD4SUt4Vr+9PAJ/mt9ZnhcagkhVlmgvrrFQPHuLD9B1Bwch2dI8MpPRoPuvUFvYZC+KS0h9sIr+iuICFiVwrChOC+x28H9vrzH4IxtC4lCjhcxeQQ0; 5:UTf30uCMmnUbnru96WXC82J0mOiL7jCyxdsvsu1UlKNYAPBZdHTVttaj+Q0Snp+w5J2LdSceJ4xX4WA6MGZZdVmDuna6+w1IcXyItoqs/D3d6ues27SAK2Hi2wOfHBFPAahYvK19rSovV47434wUgXytnPlNons/HC9L2C2ln9MJ/+NyaS3zdw6w4hwM8pBx; 24:g5vOvrx41SLggdVshmsBCzSGLE0CIzsSPqtEj5KCo+5DFJZr26pQ67/VqvzuiWk6u6+M8M60H/AHhvVjB5zV34N0FuKxfWFYyOgXfXmZ7Vw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 7:BKkWmle35RAfjeqe862WBk0a7Rf2F1nlcjfBc+9UaMa+MvF2mxn3tYvgh9/sfbuEES8fQKopLxwkfMwSDGwN/zOWk4PUyLvEv6cXVU+yFjhBS0+Z9EF5OxnYqcr4GMIiJ0KgsrvpxmFyjQS3jiqtcpXH01VZL+cm7nIh70+udVKxxtcPYhKNULHEzquIjfQtNFte+Ctt077ybyHtobz4f/QCmwKKUUivpwNBgaL9yeQ0OSRJ61M2pMaljuzNF6v4/PLw27QQVnVJ1Tgo6dQEdWv5G8E2a4Sa3Q8dWUPyNieJRhbh5QJrsbbOsxzX4aDfhgrb9r9R+pEeM0RB5VxHcPjoTUvI1pjdHCHBn5ams2ekWid5opCLmMc2TK4CvsELa68jmi1obs20lUS0p23odLuB1ZdXLvFgq/WFXNOaqBhTkkjljipC1iRRWEKc1BXi9+uEmviuzAvkPItwVv8eow== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2017 14:03:31.7233 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0749 Subject: [dpdk-dev] [PATCH v10 02/13] test: add basic bus infrastructure tests 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: Wed, 18 Jan 2017 14:03:36 -0000 Verification of bus registration, deregistration methods. Signed-off-by: Shreyansh Jain Reviewed-by: Ferruh Yigit --- app/test/Makefile | 2 +- app/test/autotest_data.py | 6 + app/test/test.h | 2 + app/test/test_bus.c | 359 ++++++++++++++++++++++++ lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 + lib/librte_eal/common/include/rte_bus.h | 3 + lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 + 7 files changed, 373 insertions(+), 1 deletion(-) create mode 100644 app/test/test_bus.c diff --git a/app/test/Makefile b/app/test/Makefile index 5be023a..ca0f106 100644 --- a/app/test/Makefile +++ b/app/test/Makefile @@ -94,7 +94,7 @@ SRCS-y += test_cycles.c SRCS-y += test_spinlock.c SRCS-y += test_memory.c SRCS-y += test_memzone.c - +SRCS-y += test_bus.c SRCS-y += test_ring.c SRCS-y += test_ring_perf.c SRCS-y += test_pmd_perf.c diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py index 0cd598b..ea8f9ca 100644 --- a/app/test/autotest_data.py +++ b/app/test/autotest_data.py @@ -239,6 +239,12 @@ def per_sockets(num): "Func": default_autotest, "Report": None, }, + { + "Name": "Bus autotest", + "Command": "bus_autotest", + "Func": default_autotest, + "Report": None, + }, ] }, { diff --git a/app/test/test.h b/app/test/test.h index 82831f4..c8ec43f 100644 --- a/app/test/test.h +++ b/app/test/test.h @@ -236,6 +236,8 @@ int commands_init(void); int test_pci(void); int test_pci_run; +int test_bus(void); + int test_mp_secondary(void); int test_set_rxtx_conf(cmdline_fixed_string_t mode); diff --git a/app/test/test_bus.c b/app/test/test_bus.c new file mode 100644 index 0000000..9680bac --- /dev/null +++ b/app/test/test_bus.c @@ -0,0 +1,359 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2016 NXP. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of NXP nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include + +#include +#include +#include + +#include "test.h" +#include "resource.h" + +/* Visualizing following bus-device-driver model for test + * + * ===.===========.===========.=========,= busA + * | | . | + * devA1 devA2 . '____CPU_ + * `-----------`-------> driverA | + * ' + * ===.===========.===========.=========|= busB + * | | . + * devB1 devB2 . + * `-----------`-------> driverB + * + */ + +#define MAX_DEVICES_ON_BUS 10 +#define MAX_DRIVERS_ON_BUS 10 + +struct dummy_driver; +struct dummy_device; +struct dummy_bus; + +TAILQ_HEAD(dummy_device_list, dummy_device); /**< List of dummy devices */ +TAILQ_HEAD(dummy_driver_list, dummy_driver); /**< List of dummy drivers */ + +/* A structure representing a ethernet/crypto device, embedding + * the rte_device. + */ +struct dummy_device { + TAILQ_ENTRY(dummy_device) next; + const char *name; + struct rte_device dev; +}; + +/* A structure representing a PMD driver of a particular type, + * for e.g. PCI. + */ +struct dummy_driver { + TAILQ_ENTRY(dummy_driver) next; + const char *name; + struct rte_driver drv; +}; + +struct dummy_bus { + TAILQ_ENTRY(dummy_bus) next; + const char *name; + struct rte_bus bus; + struct dummy_driver_list driver_list; + struct dummy_device_list device_list; +}; + +/* Structure representing a Bus with devices attached to it, and drivers + * for those devices + */ +struct dummy_bus_map { + const char *name; + struct dummy_bus *dbus; + struct dummy_driver *ddrivers[MAX_DRIVERS_ON_BUS]; + struct dummy_device *ddevices[MAX_DEVICES_ON_BUS]; +}; + +struct rte_bus_list orig_bus_list = + TAILQ_HEAD_INITIALIZER(orig_bus_list); + +struct dummy_bus busA = { + .name = "busA_impl", /* busA */ + .bus = { + .name = "busA", + }, +}; + +struct dummy_bus busB = { + .name = "busB_impl", /* busB */ + .bus = { + .name = "busB", + }, +}; + +struct dummy_driver driverA = { + .name = "driverA_impl", + .drv = { + .name = "driverA", + }, +}; + +struct dummy_device devA1 = { + .name = "devA1", + .dev = { + .bus = NULL, + .driver = NULL, + } +}; + +struct dummy_device devA2 = { + .name = "devA2", + .dev = { + .bus = NULL, + .driver = NULL, + } +}; + +struct dummy_driver driverB = { + .name = "driverB_impl", + .drv = { + .name = "driverB", + }, +}; + +struct dummy_device devB1 = { + .name = "devB1", + .dev = { + .bus = NULL, + .driver = NULL, + } +}; + +struct dummy_device devB2 = { + .name = "devB2", + .dev = { + .bus = NULL, + .driver = NULL, + } +}; + +struct dummy_bus_map bus_map[] = { + { + .name = "busA", + .dbus = &busA, + .ddrivers = {&driverA, NULL}, + .ddevices = {&devA1, &devA2, NULL}, + }, + { + .name = "busB", + .dbus = &busB, + .ddrivers = {&driverB, NULL}, + .ddevices = {&devB1, &devB2, NULL}, + }, + {NULL, NULL, {NULL,}, {NULL,}, }, +}; + +/* @internal + * Dump the device tree + */ +static void +dump_device_tree(void) +{ + int i; + struct dummy_bus_map *db; + struct rte_bus *bus; + struct dummy_bus *dbus; + struct dummy_driver *ddriver; + struct dummy_device *ddevice; + + printf("------>8-------\n"); + printf("Device Tree:\n"); + for (i = 0; bus_map[i].name; i++) { + db = &bus_map[i]; + + bus = &db->dbus->bus; + if (!bus) + return; + + dbus = container_of(bus, struct dummy_bus, bus); + printf(" Bus: %s (Implementation name: %s)\n", + bus->name, dbus->name); + + printf(" Drivers on bus:\n"); + TAILQ_FOREACH(ddriver, &dbus->driver_list, next) { + printf(" %s\n", ddriver->name); + } + + printf(" Devices on bus:\n"); + TAILQ_FOREACH(ddevice, &dbus->device_list, next) { + printf(" Addr: %p\n", ddevice); + if (ddevice->dev.driver) + printf(" Driver = %s\n", + ddevice->dev.driver->name); + else + printf(" Driver = None\n"); + } + } + printf("------>8-------\n"); +} + +static int +test_bus_setup(void) +{ + struct rte_bus *bus_p = NULL; + + /* Preserve the original bus list before executing test */ + while (!TAILQ_EMPTY(&rte_bus_list)) { + bus_p = TAILQ_FIRST(&rte_bus_list); + TAILQ_REMOVE(&rte_bus_list, bus_p, next); + TAILQ_INSERT_TAIL(&orig_bus_list, bus_p, next); + } + + return 0; +} + +static int +test_bus_cleanup(void) +{ + struct rte_bus *bus_p = NULL; + + /* Cleanup rte_bus_list before restoring entries */ + while (!TAILQ_EMPTY(&rte_bus_list)) { + bus_p = TAILQ_FIRST(&rte_bus_list); + rte_bus_unregister(bus_p); + TAILQ_REMOVE(&rte_bus_list, bus_p, next); + } + + bus_p = NULL; + /* Restore original entries */ + while (!TAILQ_EMPTY(&orig_bus_list)) { + bus_p = TAILQ_FIRST(&orig_bus_list); + TAILQ_REMOVE(&orig_bus_list, bus_p, next); + TAILQ_INSERT_TAIL(&rte_bus_list, bus_p, next); + } + + return 0; +} + +static int +test_bus_registration(void) +{ + int i; + int ret; + struct rte_bus *bus = NULL; + + for (i = 0; bus_map[i].name != NULL; i++) { + bus = &(bus_map[i].dbus->bus); + rte_bus_register(bus); + printf("Registered Bus %s\n", bus_map[i].name); + } + + /* Verify that all buses have been successfully registered */ + i = 0; + TAILQ_FOREACH(bus, &rte_bus_list, next) { + /* Or, if the name of the bus is NULL */ + if (!bus->name) { + /* Incorrect entry in list */ + printf("Incorrect bus registered.\n"); + return -1; + } + + /* Or, if the bus name doesn't match that of bus_map */ + ret = strcmp(bus->name, bus_map[i].name); + if (ret) { + /* Bus name doesn't match */ + printf("Unable to correctly register bus (%s).\n", + bus_map[i].name); + return -1; + } + i++; + } + + /* Current value of bus_map[i] should be the NULL entry */ + if (bus_map[i].name != NULL) { + printf("Not all buses were registered. For e.g. (%s)\n", + bus_map[i].name); + return -1; + } + + printf("Buses registered are:\n"); + rte_bus_dump(stdout); + + return 0; +} + +static int +test_bus_unregistration(void) +{ + int i; + struct rte_bus *bus = NULL; + + for (i = 0; bus_map[i].name != NULL; i++) { + bus = &(bus_map[i].dbus->bus); + if (bus) { + printf("Unregistering bus: '%s'\n", bus->name); + rte_bus_unregister(bus); + } + } + + if (!TAILQ_EMPTY(&rte_bus_list)) { + /* Unable to unregister all dummy buses */ + printf("Unable to unregister all buses\n"); + return -1; + } + + printf("All buses have been unregistered.\n"); + dump_device_tree(); + return 0; +} + +int +test_bus(void) +{ + /* Make necessary arrangements before starting test */ + if (test_bus_setup()) + return -1; + + if (test_bus_registration()) + return -1; + + if (test_bus_unregistration()) + return -1; + + /* Restore the original environment/settings */ + if (test_bus_cleanup()) + return -1; + + return 0; +} + +REGISTER_TEST_COMMAND(bus_autotest, test_bus); diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index 12298f2..4dcf653 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -178,6 +178,7 @@ DPDK_16.11 { DPDK_17.02 { global: + rte_bus_list; rte_bus_dump; rte_bus_register; rte_bus_unregister; diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h index 2dc9bef..204e576 100644 --- a/lib/librte_eal/common/include/rte_bus.h +++ b/lib/librte_eal/common/include/rte_bus.h @@ -56,6 +56,9 @@ extern "C" { /** Double linked list of buses */ TAILQ_HEAD(rte_bus_list, rte_bus); +/* Bus list exposed */ +extern struct rte_bus_list rte_bus_list; + /** * A structure describing a generic bus. */ diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index d996cbc..b553b13 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -182,6 +182,7 @@ DPDK_16.11 { DPDK_17.02 { global: + rte_bus_list; rte_bus_dump; rte_bus_register; rte_bus_unregister; -- 2.7.4