From patchwork Tue Jan 17 13:37:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 19607 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 8A9C637B2; Tue, 17 Jan 2017 14:35:11 +0100 (CET) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0079.outbound.protection.outlook.com [104.47.34.79]) by dpdk.org (Postfix) with ESMTP id 1628637AC for ; Tue, 17 Jan 2017 14:35:00 +0100 (CET) Received: from BN3PR0301CA0005.namprd03.prod.outlook.com (10.160.180.143) by CY4PR03MB2470.namprd03.prod.outlook.com (10.168.163.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Tue, 17 Jan 2017 13:34:58 +0000 Received: from BN1AFFO11FD020.protection.gbl (2a01:111:f400:7c10::196) by BN3PR0301CA0005.outlook.office365.com (2a01:111:e400:4000::15) 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; Tue, 17 Jan 2017 13:34:58 +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 BN1AFFO11FD020.mail.protection.outlook.com (10.58.52.80) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Tue, 17 Jan 2017 13:34:57 +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 v0HDYI2g005071; Tue, 17 Jan 2017 06:34:54 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Tue, 17 Jan 2017 19:07:37 +0530 Message-ID: <1484660264-6531-3-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484660264-6531-1-git-send-email-shreyansh.jain@nxp.com> References: <1484647774-28984-1-git-send-email-shreyansh.jain@nxp.com> <1484660264-6531-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131291336976247625; (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)(39860400002)(39840400002)(39850400002)(39410400002)(39380400002)(39450400003)(39400400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(76176999)(50226002)(50986999)(5003940100001)(8936002)(97736004)(33646002)(77096006)(2950100002)(68736007)(5660300001)(30001)(47776003)(36756003)(2906002)(6666003)(6916009)(38730400001)(4326007)(626004)(48376002)(189998001)(110136003)(50466002)(5890100001)(105606002)(2351001)(104016004)(8656002)(92566002)(106466001)(54906002)(305945005)(81156014)(575784001)(81166006)(86362001)(85426001)(8676002)(356003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2470; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD020; 1:i3jqg91mu+uvUddqxhoi1CD9Osqz9sJB7ETuAjiBVpJa1jTBaLNfIGd7Uu1P7UWUiBA82YNv05jLHx8BFiIruNc24NFmtrGaPW9pcs0LyQz6yidSjJStfrNgDPgisoQ7oXD+IM/NcTFgGWnGTHJKYk0WACAp3183HO/C4eroyaZKc6JPPn8X12MQRxBiv0k+FYiU0xCHsaTgWt9bLaPk/yZQ9BWAukUJOPwWo6BYyoykmdp1xMi3OfxoY3YqcBZr8TCRzbujL4EM3fniXbG8W+B8LE8LsezLys5r9RaCfSX0+pA1F+9r0zsgHeKTvWkwozyDhFbs2iyr43D4WYHiEi7HsMWfJ9tNopZUAi2TPFEnad07J+IJYX1+PGIKcHpD/mUPClAcKG+jLl79Sc1daa1kwEHo/MrpL/WG/9aLnOGF6ShhV4bT0oBaLpTQl02d1qozU1wLTXfsRzb+49x19RdlxIfcRgTW+qo165BUwmHhq/1ng+ikfzcmnMLfLVU8jhEH5S4rJXkXCGTt2DjvllN/MFKKqeYWKLeQXKPqZVQnmXUpx/I6+RcCnkSqIvs72SmFdupr3nbPq07o5Nat7EUxggYjn3lq/GQqHa0mLd2RGqyKK3E68ihzW18HMNYp124Ssm0gWZyQ59VtlcdJ5coadyoDVf+Uy2vLHBx9dsVOmojuxFYOPU3WZfY+9y9lg/GHinjUhmq6GJL8yEsprw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 4ec914f2-21b6-461d-2b49-08d43edda105 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY4PR03MB2470; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 3:KYef3xHvMB8hR8o66ffOC0PAmwuxMbiEzyIu9SDDh3uBsDMQR+DtAAk9jeJCqWXRenHQUKZkHRlXVcEbNJiWPs9OLLPJFTRY1JCsgutUnx5cPyZzPC/H+8dYl8lNcDzBj1LQ1Wkn71blaDcPFKG7H3LocdAGX8hVOYS3bFglXBJRm/NYJgCINxSzdp9DcBVch5tSY5m4uAwF75XHP/Zh/3hWCOa93a3BD71aUiOjl/WDSFDA64/EasxWtASotW9EY/YOyZPGm34KjCrxnunB8UGq4gzmSVf2l8B6zOynvI9a8tqDiVWXrRihEPJY9P2dvV5xKNkVsD9sW8Van7r74OfjlkrMGB2s3WmHlCAYwfh5fwEOh8tcokYIKfAXNZDE X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 25:9NyanJNlJnexg1KMq2/ScJUb6TL2WRE01ceRaPpVVzx5hnZ5rmIIxVJvT8Y+oiD6M8m59wZPQkxpSmZU/CFWEA+iwiIxt3ZyfeuFH1V/GWvWX/ZEC5q9FWc4tHP5NtQllDT1uuEdm1mBdSGuZIarezND71RAGO7dXi7lt7mkVfE3ufRUEhrsfpFNEGcnbwYlMq5405W9gA5GQySpQSfqTbpn1mCvZH51y/xo88+tkUu4Sq7Rogc+tdBKdD1GRS09x705RQkw84JZT7aYTsMqiYdNwbfdsXjgXbwzDnB4occf/0wkSyqikttG+fkMVWqbFoif3jUIREcoX0gsCisR+Oga3eZZAOUdt2F6G4ynHIJmVpHvWm5AuYER60CQuaJhbObMT6V8spKqQ5mlpvAwaOBxXCEJixec0LtM708uMgIzDVgSHbfuBbe3hNhtDqpu0aW9ljtQZ0NJY+NMhwFBS/wkhw+nBd3F+dsEAcSmKvA1XGJKFEEvriWnWfr/6OKWKrjeWy0s1gQVj08BmLqhbHabROBcyR2W/4JDzLTAWAf+OJAnP4B2UxlLyI2q+U7MP4Hfu4Fu1MB5UvDiRZPtScGZ83TC3PzPSG5G8fUq1Wy4b2iNdh/lrPPPM8snx3jqrITb3GooTVx4lxLIJd98jr2F2k+dmi2XOJNeJpBSDPi6SlOUVR/3uT7Qz5yUJX0dYFWs1HT52lp+40XV3AzsNIT/wCR0QLvoj2b3fl1tIzTvawNZjze1GZ0sPMm8jQKuVphfobivna9rNiWLSWcA8vLWogVpGsFSqlY+9I8v/Lk= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 31:t0+wUeKRFh+qVs+cgXDg70QW8xCRIc2xO+FFqRcK+Xh6eDb6elONhAcKNBkgWzZZ0VMPDfDJr3U1gRl/AXwDfLU5lUlP06q/iQzJuWzb5RNAH0nbyyJus+3V5b8bddvgYrfjzmXNHpWHs6mx2MQEUVStADGgc/Q03PhZfnqr0rEoHZKfy9FNjQ3PUX4GVzAU6jEXO73malWViTEyx+6VYQZAdm9Z9mTOnnHoLPY2dXhYGAed5NjAXX+VPWNTj10VUkoY/CPZ2ygxOWh35BT3zp4kFg8SWoRx1+/xHO+DFYo= 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)(5005006)(8121501046)(13017025)(13023025)(13024025)(13015025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123563025)(20161123556025)(20161123561025)(20161123559025); SRVR:CY4PR03MB2470; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2470; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 4:YCMzh/x5JpHeWOPGSuqmEqCTOX7mfP2LpTtodsC4AUV8kgTqc5VL4fKk1JYTrcF+/zECq8PP0ryXfAiGIMX3xRtNOmL16kLL+zM9lTbZQw1i7AwuKVJzh8w+ywJClNnqOawp+TFtC7cSkv7fHXaz5yNB+FgzUJhcTerBsHy08rXMV7ttR78GQwfxUhqhH4dM23J2VOosJgwNa2NHsChUfLhwYfz9o9a0YAK/6axg8h913Lb3is1YZ4LrOGIelBi+T6kccTy59CVWFO5x8ezWSGf871EwyQwHQ/Rx51q04ZNNg1br/6VONPstnBZ5H7nnqCAinWxc9RCim5GtcwGC/yZ/idRump/hue7EySGPJXkJyw6ufbMxAYuoPiit4JmHOr61RkEtJBNoiXISozfwPzzlzQi50v/PmU8jAeNwgRYX9jNPIQU6mxFDjJqyzdsDVpaLy05fyXhmMVjVjuV0oCOw9UiFN4n2j7pd6hqfT0RD9rLP9Whl+ZqJHgXYIw/yu/lN9MxhCPM6aqO2fihOV8lg7IwKt+rXN1y1GqfCIqVvhgtk5xCE3Dcoi+j0EOvsPktWslYvx9STquPZpYiNV0LEUH4Ul3wXHfO59DN8ceq9TZ4vuch9hy/NK0qtogDvm4Y90XT9LT18RbGsqvWmVLFxxDxNC0MNX0KoUVvJLrYEP/bgN9mq6M5OshygZr/XH+4UjUJEWjkqTneLxeIK2LwrpfWsPbSaq5Y0thK1biraZwfxxu/Ui6OneQfVSI4pj7Wcmjh4chkGiwEDjHFmHg== X-Forefront-PRVS: 01901B3451 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2470; 23:I0dpo61uFFm+NMJw5X0GGL20xoYzrQD9AaUl98+Dt?= GJSSDEJ6ZH80HI0E6M4dHIthOYpfqTnr3yagTsCV1l1DrGOm/so0x820qJ/9UOotZ175EMphE+kTLhqGxQYWRu9Zfzo26FUHenWYud9m6Hi1asyO+VtV/IHGLhu55aosqbQkaLkYDRvYA51J+0VzjP5dJ64anVxPKShMqe7DplVK5zQT29e/JGhCDGS5DjQHqQsaMEBL6XXmTA6wqdWRZfrb/YMqHnvlhlmy79aB7fBS89JDFRIBnkhstboQsy+NYq6g9SJ3nDzX4nSnwXLOyAA52sb4NQ8H5fpeT8M6ELxE7f6jW+QWBW6x6QNZdvwVkLDM1cmeN8iSadSIl9MdYcz46sOM7fiSJEBrBuJpl+xZRApoCeGMYWv96FPcWxhgMEp5hmRWPbLiPhbOXMO5QMV+V5n1FcE1ieFuMIQx7lbIlE6iJUIX5xq7RfLFZjYir8P0NTsSFhUk+7oz6g2gOFjboEoEn2+hkYXhuIjzXNT8TOIqpb22jGNCVmRJzgE8/SI/gopkqPU/a5zz77AwXPndmpnUpkI4Tt4C5dLMvR0c3ll4yMjIpGIAh2fozyFsUb/8TOQvp/ZmmAFiAnTXsqVSqJroDk0+Csx8LxCeHEunsmWGkfCroewsaqFohCHQC9yhr8S6gQfaA70465956433ZETDPhzlITUh8feN0r+yczyvecZWCuh1sykFwRD+LSIROVwyEnAeRXKulKFYRgTm9061641JXbtl7ntnO1NKozsk4EJqxwoZX563Qvq8kAPl2ckhroQAogJTJfPhI0w/IVBEnjw4wKLuGnypMRWxRPu9ZlHSgMtLqTf/6aVc4XGOXHdt29jFZ16bdZ+s1hzG/NTeVFVGtVfnYTsikZyIk6Ui3nM7naUbgHd7ma/n86rRyA7xSY32YG0LXqmSam8cVGVZrCvxH1WsVl7fxvHj5tZNwf+yNy2LkiK+NLNds5HsOp4fRfsvrZOxgGi73YOphqO3Q7Derf8L4JjLpMmGGCcZyEEz/V8GIZrBvBhYAqKhB3ZUljSZ+zXqeD1SdCH0Mk3L5Rg9gjjdcx2+wD59T9dPjMn62XWUGGQjLzvga5z+kzKK3W79rwklaiJRabTKAqCMeD089GGUmgsAtQ4QuIpxy8HWWxggXibKJkdgww33ow2L5V1I8mUbanpKW0uRosT2QWgX7RL73TMT5WCBYcJhmfAYeP6hRpxuwklsbNTDQoDTTH8p5qn24/hKowx2lEmr3skXW+MJuRBoQK16NEJADXCUBnb7AaJ8WakuD5lxMg016ciBD0t/+e0f6ICXlj9q6disEmXmmjixIMVEQ== X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 6:mKl3HbxnXD+y4CSd9rSUFbdL8V1IE6F/w7ICOGe78NR6UEIgDjQ31YeWTF1m4PKDvW6wM3bkaSlK2nr3M2kBBJvUADMsFcG9LL5qZ+7KgoSmzxxLgPwUNz1btUOZF4M67U5K9nNRubvZG086qfD73eXYj8H+sxoIBrJw15YvsTe4VLajs40s09zXi/Y9Q1prXWaZoxDnEm4QKbtbnchyAkQKjsB3b+5LxPqF3hkpwdS3waYn36qH7S1gwgz/DOOhKmCXkz22xD4ndTJYGH3Rt/ZScyoQStzokzUVI8k938wBTxO3NKDIO7WVhlIe58nYOdzhpNyHZ0ma5l3ZLWV6sXbgdiuxnQoro2zK3nw7xIY8KpDdHytJoI1GH4gAOEx/kn6pCQM03qF6T0WbtqYRWri20RlCNqTywLbG9L8BMWMWh5IxrbHoq44eanrdQkUm; 5:FF64qChHPUwwMa6uRvjdgHLQwZdu7OLM2K9AXg/Iew3eHZM02IDG9XRNaCpgiicgy7yW7F73JpSvd0M+q2932EnHCWNZ0VNsjWnMzdXikffMf+Xtl8O13vY57lGDiALcmNFiBTCUjPyT/tmmbZKnkrWS9jsHQkc5pG4YyYmqmHmiqx8VxL2qmee09daO6qb4; 24:FVj/JxK/WM5lk0uCJkt7bv66oPK7ASdMns+hky6S8I2uJTLB2fUjx1qv06tNArkNSsPra13yDpiQi8pCfUL0emR0s2EoGXf+TNRtH4lFiNQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2470; 7:cQ3kcyGUd/qwfMNAaZV2n/6S/NfV2jIS3I+eoap0epFD3IpEqf7LnmVMCRAhfKxx3xFu7UfCYHlZd4MkGgjEtSqYo7HHh4pMlsBWa0O0qq/WyQHIAXNRwU/iS+xyEaOmCRZ/Wk2u4TLJEGDnZ9JHQh8sGuW1xKoFzavebDKOBE+YKDqAnu4f2TyOMzlhehbktHXV6A/C3m94JBVMng8AjmhALxlmVPFgmyIorHQpUUJu8eyi8Zyp0VK0mPRwMO+1w53/DhktY0E6BMrAfsnjuDV5+yHCboLb4TEfCbzJyJGZBVegKQwAnCrCgGI8zC3bYomx1i38JYFZ1sIMKxrav7eQjUKKBXzbWCaXc1SW2sGAwfppWM6oGei+lMa3zZHgrmQkE1IFTngcI1JVlBLwIOmyne5boZKHrW1ZOv76MgUgaVivpLDvtaLxl3o56PV2JI9RZo0L+3mbv7CVxctrdg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 13:34:57.1879 (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: CY4PR03MB2470 Subject: [dpdk-dev] [PATCH v8 2/9] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Verification of bus registration, deregistration methods. Signed-off-by: Shreyansh Jain Reviewed-by: Ferruh Yigit --- app/test/Makefile | 2 +- app/test/test.h | 2 + app/test/test_bus.c | 359 ++++++++++++++++++++++++++++++++ lib/librte_eal/common/include/rte_bus.h | 3 + 4 files changed, 365 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/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 2250269..fe0f69d 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. */