From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0083.outbound.protection.outlook.com [104.47.34.83]) by dpdk.org (Postfix) with ESMTP id 4E00AF968 for ; Wed, 18 Jan 2017 11:35:19 +0100 (CET) Received: from BN6PR03CA0064.namprd03.prod.outlook.com (10.173.137.26) by BY2PR0301MB0742.namprd03.prod.outlook.com (10.160.63.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Wed, 18 Jan 2017 10:35:17 +0000 Received: from BL2FFO11FD007.protection.gbl (2a01:111:f400:7c09::162) by BN6PR03CA0064.outlook.office365.com (2603:10b6:404:4c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12 via Frontend Transport; Wed, 18 Jan 2017 10:35:16 +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 BL2FFO11FD007.mail.protection.outlook.com (10.173.161.3) 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 10:35:15 +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 v0IAYYhU003396; Wed, 18 Jan 2017 03:35:13 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Wed, 18 Jan 2017 16:07:50 +0530 Message-ID: <1484735880-17178-3-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484735880-17178-1-git-send-email-shreyansh.jain@nxp.com> References: <1484660264-6531-1-git-send-email-shreyansh.jain@nxp.com> <1484735880-17178-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131292093161591032; (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)(336005)(7916002)(39380400002)(39400400002)(39850400002)(39410400002)(39450400003)(39860400002)(39840400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(575784001)(105606002)(5003940100001)(2351001)(5890100001)(86362001)(189998001)(76176999)(50986999)(106466001)(33646002)(356003)(92566002)(5660300001)(305945005)(626004)(53936002)(110136003)(47776003)(104016004)(97736004)(6916009)(48376002)(4326007)(38730400001)(36756003)(6666003)(50466002)(81156014)(2906002)(85426001)(50226002)(8936002)(77096006)(54906002)(8676002)(8656002)(68736007)(81166006)(2950100002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0742; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD007; 1:E8p8f0CXxEDb/mnM7XJxyanHPhX7UQe2x6b+oTdJfPMMe/uFKPrFMmHKbB8HNFTz3hh4LmuIokKNc+i4a5gXh/Q5zBEn4n0qcg4To/wDPYiC0hBwJOLqPxAm77wkYbT7cEHPhvAtC5iy8DDAErW6xYo9fiMs42WI2wwFmwM0beG+gZuiSdRPA4kkb2sYVK436H+Db6VYrYoDt4o/nhQoh3u27sCimMhmeBP0FZSk4daSS4KM7dQzPcwG8ONmv/v87M8PAzqXH57spJqpWOPB7ztaSJwqm4MncN9606XmqWNOj3IhaAN2Llmr6WSIJ5nrJjpkOC/ndNJAAifWiZ0lpOb4SKQqgCLQrV09s3saoenvrlXc8gBAmiJT4HP3wBjN5pmziNAWv54axYAANs83xfs1jhQIwdu41mDFKcwDR8+hZnGkE0/ei+JUomDJMfxFk/HPQQhVcc1NMvQbM7/qeyY3RXzDHr20RYZOlkHQ7NKfSpw3jMg2nEk88tgQBIdHsp2qPprvxvl5UtYxazDkbkCYdqL+0KQ0HzVxch3l+k9GUS3u3dFMiD9MQu0XUrsRQX4WunupOxOqCfpDcvTQ5g6Bvn08a2wymRR7Hj8C0OrzEi2wLqL1CyI85k9cxiQd1NHoBoueLuLo5kwFMaO92S66muEZ6ShoNGCRE1u0jY6i3hEmZdgANZZSgbAUbfZlC9VFgSNAaQnkJ/u3PIx3bQ== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: d3c8acd2-6f8d-44b2-d0f8-08d43f8db12d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 3:nOqbBIyUOqESEPaF5FrIGFuggdVEgzHGa7coGTmJL2cHIovH32WdlZJP/zda33hac/BL6HtYNBdsyx2AVzXT894ydOOD212xsslCUQ3UEhU3kLiUswRjnMNSNfAaGFJxzIaypxv4izQxCSqR8+ZwA7HyGCv06mSCyDTsNvY77g8Y6Uc8oTln9ZfWKglJfRLiz8Pm14gkGAVYDR5WYlYUey1sRJ1RHb5TiseMf4hipFO2QBRdz31qdh1aDr3u7+706Zs3AeGOZes7ufZl0rUL768qMYjVQ07ItV7lc7nPPxGj+8CTC84LGuq4Mewkp+EJQu+Yq6OKf/2pKEds1EozJtaofY83uKMuAqg5SQVbn3anc3MvcQIrgRvJ2k5EyiT4; 25:Ge3xF4ICGH+MgyK7BRTYvABfPBxpi8cFn9XkN3mUgixOaamN0lzvC8GurfALkSME25aVtVXKluEoAroUdrQtbpSGK7QQwfLGVLJaBs8bTd0R2ZAOrM9oa30g2mVN4OgGuStZyTQ/o0KMvIxwS0EW/WeI+Bx212Oisk7m2YO2jq5HWFD5ayWlDq+ohe871GmOiPUul0CG/ON0wsKiDJcghNLijFoWx/LRahfmie/cpAabt2v+6G18UyT4oSz90Y3CgkzFj1FozGmepRxerLTqFnqwAZGyVNs07Bn8WDPCwQVI2V4bXbQpqjtBDX6U2roXZ5Vqt4OOUddYLbDoj+ilRV2ULmhvMvVRyAo00fHfBI60f7VS8WH0/omzAhK/LTLLrMoUEcxJVbp+82VNeb4W0rK0wySwpouV6+p/Uv7vuKB6mtkRyNeW0dQVl1f3Fpp3Rv5Qsk+d2Wwq0I8t6p2ajA== X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 31:anAWtn6NFYIOt7FXERHlj53RYGnqGrfgrI2EwonGaA4P/HFNz5TexFllhdQ/xV/5xM7IKruYpVgv1xu+1x3UWtMkb3BudRmlZRFbCc2LUxentRIVsCRcFLdnkr0qsjH+Z1v/b4yrd0m5hWCvgyNtaX2we0tT7E6AejOSmjXh8qQBBjFo5h7qCKrglnauMUBSsUWLsJBTfkNOqRKEV0jvxSnJ8G42BYeXJGIuavNTn/SjCOprDVgs4jTORJUaUPo0KGRJV2opMsBySDPK6Osguw== 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:BY2PR0301MB0742; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 4:bk/A0zMcc5mGT0s4uDUqb2jMEvTzaeYar27wa49Q1QVHSHnZXGmB2RUru2Fp278lJyohw7P86D4zlrmMKSJeO/mm45gkE9/FdpZpyYiN25Ay6qSTjIptjs8LYGf4Z7uPXErNnCP3Z7S/wMZzsDQuibvV5bVfBiTGP6jUGejGlEAg8lXfGVhJpE+o7de7w6pbluEqSJTh1UGCCJJSE6MIlmxW5i7wcXQnZ7uw+3RaCYSnHud3byWi7i73qDkfPakKebM/QqkoClyFde/A/oz9TDiH52gvLorGPJyINGglKBS8yJqRp6GsryFo5kyOcNMCVr53RLiad6IcRUlBR9hvaMOSf3Tw1ltHKUGnx3cODFrDQ6eAlRTaEOJfTWFfI9SSJ8vfRj5LmNOjvBvjxf2C60AYY7+8s11HhYgnOf42xRvGKq85veCfBUIrv/Rc5/7Q7BRCCdY8h4O6Nx7I5WMOm2LNCV+Svxy4WhYKXhI8bnqFIaP6s69/LUZr7QFQwm7mqbOVDb+c+qYZJmfE2p21X/+AcmgY7OQg3vfXTRlNsh6xh7aXubqZvUi3OHIdlWyuAb3NCxJww+yN3yAE44oClMWqVNNRmbv53FqyoOyWv9nWTsL/8BSDWF8wcWYvxkYNrFvJ0G1g1tluJLoh3gXBtxcMgNnv5wOD0wXbRtgoRielckYrqFJZhB26znsHYYfrdTf2KooG3VFNNv2GJbBf6HoM5dwLG+onMI3imdv8N5y3bHtz03+h6bt1DmDwXgCYrCu/z7ntuIiQQDjj/AxzoQ== X-Forefront-PRVS: 01917B1794 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0742; 23:SsasItro51FMY8M2XpGBndgt1I6pCY97euZfxE9?= =?us-ascii?Q?kBOsPCFZBJVbG/aQoUcrOTQr/crp8dMzGZz4AgY6oe9NOPW8D0EY0GrvRAEq?= =?us-ascii?Q?m1eMW720XcfFh2X0q/QPZrkGE1pmT8ZmwggLQVtkNHdF/+fINX49lzYVkAJ+?= =?us-ascii?Q?xCFJf10D182VuRgVt4manIY9Axxdu/m2Xf7DmPMedttJtUcnMLi4seufbFsj?= =?us-ascii?Q?MuUKQeaL7NyAArRWHff+3VeAvNBEtYDhvrBne/Mvnwg44Gbf8LstWS5zvTzK?= =?us-ascii?Q?PbKjAZCNGkAoViImBVWDk5taB+zS8jBtwBAI0EfqDUXIy+zkgrmMvJmxomQU?= =?us-ascii?Q?Cn2n7mMNBp5xOFwVkgvnLT7BESmLtPZccwEusb6BTrlAqsfoXyK+Ii06lN82?= =?us-ascii?Q?8FFamhzsyvPUvzj/fU21KAigge5MWDZDrrKWLh4e3u2L4GvyndmPMDaSbEwu?= =?us-ascii?Q?hj9F3NZFx7CyYK4LJGfk6SIO6MqjBgFPY3FslO8ovoasbmgL3/nqD+2KjEOP?= =?us-ascii?Q?O37oTmZJuM1Wb2vPWsF/IqgfK4VaJmvB27fxyUa+qqfbkeGo8beG4WvDPDG5?= =?us-ascii?Q?zOPvEJjuAW9PyRnljYoKrkKxZt5bxPFeDNNowhItbJgcfV7rYabCrhuQs/+G?= =?us-ascii?Q?HZNjfM7R3oCYYx/IO5Prl0a20LePoYazKq0IZvmFSuyKQFcrC2A1LbVYJp2U?= =?us-ascii?Q?DvAsCXU7GDkcieEuU/+QGXSn5g5En8Z3fOlszH40JUWrf5uH9MSzMAZmCEzn?= =?us-ascii?Q?LQ11BfFbeW2C5Soq7RDfMTSQDw4hV3aCiRZGBogyI5Y8fwrrFhU4tnUFGJPf?= =?us-ascii?Q?RSV9R58nKRQpJ6GoCagZHo3Q+JdBcLrirRZ3yzKa5pehtG47U/He0lJsB7hs?= =?us-ascii?Q?Bwv7Yk4ED8ECPPJMryl5Q8T39baBSSYAo/79ZBE9FgpPuYf15peodLzBqjVa?= =?us-ascii?Q?O4+u/4bUJeN8d1Vc5CL1wEL4lLOadQtW/sRYPev3BqMRGMRH5YtJ7+vLk4cv?= =?us-ascii?Q?PE7e5r6jl1oGhDyopnNARSjp/+zX1r9OWtlSWFr71EB83G2i3A3u9sQyX2+/?= =?us-ascii?Q?14BPy5ihUiDffxk1KfPrgcNFcOzlysY3T6EHehObU/Ve13BJRHCDpZM/X2mC?= =?us-ascii?Q?aq7kykiwKT8hur5pPW1ohFnA1IFGyZK6yMoAT+71ElWw6ZejGC5W9y+Jmt8L?= =?us-ascii?Q?8obm+WAfCyznXCzBoXQVjYba/lpeTmfLZZW9z/j1W+Da5TPsif55Qc9gr+Le?= =?us-ascii?Q?2E4aW0tXvNQYkKdh17EyJIh6zotCCemtcwfm0SyX07UjDWSjXPJhcFHmIYTD?= =?us-ascii?Q?4YW+7/giQRlVZnaHVtU089OwPR60Q3nyZfvZ/XGCI9GP8dLjiybW250ioaz+?= =?us-ascii?Q?ZTR+xKA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 6:YVoktTlPdfUbFKHnQKMDA1CaedGjCV3G0STPGhsnIg5yWzITgeqMuG6QZ5rKc+g1o5kCst+vrjbuKmX2yt0ooxCMvG3zEwcxkQOpSTsBFyQ5q99olsY0MEkjD1Ywly5jnKibb0f/UhJePKFIkd6lV3/jzdyD6gRv4qQNt56Tc2P/j/7p2UDPQw1ONTYbSQ3SsDnM4sZt5Y8itt/h/XUkR5h7uq4+wfcu6b/Fh85/JQmvGXpZ5GWt5m8DqOqjSSmPyjM1r0GMnHko6tj9UdCiAsub6qjd+Wjzv9Z//AtjsdHNfZsHezpwWriy7hk5nPmTZL2G1FY3ITevwgO4z0COGkXHo/dCbja3p5c8S4ZuB3P42tgo5h3kG9c4kvWFxfmn3Ux+usJwCOZPV0Tx7xEJmYrDFOtGEljzZc1l5DY3u1oEesmGJQaz8hOLq0Ge2nVC; 5:Rw92ImbYzqjwMGJNriCww0hm9S4gja5hnTD1GIlW/94/aDC2X/fQ0HC1rRxM/hFCW8UWHf0wLp/OLDidBBtS28nWR3O8jHaOQe0zf3N3qOOh7PAVlsWO9cew156Y2chFrYu/KeFu8x+2F86SPfiMyktxR5KFdPnQLWyP7C3p3qsnunVV/NrhWdxe1erUg/0T; 24:RE0jMqWhYtbdAKgtPdVt8JcJnpMh6q33eiIL3M0NROVvmR67nnL8PGVFGkOtShSqlVI4+pMj/Rc0tAQZgh+VXRdsvlSnUaVuj9mgv/QUOiQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 7:rNYwvO6VVN8oEZ5tiGABOi7gUVF1dC1chmIgHSbsSBlXzoadx/IF2XhkHLtfs1j6egRRFTf1AgdragtoBka6PTr2E/g9Vk9cWICMo0CzOEKAAKRz3nL605Lp3XA2O6zxyCAFEpTugWoDTOKgjuB0cc1Sj1R4sXYIQZxiOePc/lM/tX4GOcJ/5T3N/LkDf7+dmBJQMHJ7LG0pPh164oAalM8/i9ddzK1HR1TXx/Vi5FaKBWsdwWIueMdUvOlEUvMQWWZvi/zz1T/RMXBopJmsHREvoRBETG/aoiBWCrAxo+RGc21Cmvuftpn28Em75ttP0jpT8Dt/uUjmyGfKN8FwO8ih3eK1kpjdnpbnO8F6M8j9D8VIw8K3boPetjSIO/mAWP1Scd5bczyaeacIDpqgjolKXh3FXFt+tG9NQs2bo9eTHa1y+e+J8e4I7lMo9+SjgfP6+yHMh8fK5SiVcSPr0A== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2017 10:35:15.9875 (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: BY2PR0301MB0742 Subject: [dpdk-dev] [PATCH v9 02/12] 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 10:35:20 -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/common/include/rte_bus.h | 3 + 5 files changed, 371 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/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. */ -- 2.7.4