From patchwork Mon Jan 16 15:38:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 19427 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 6DE182BF3; Mon, 16 Jan 2017 16:35:23 +0100 (CET) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0054.outbound.protection.outlook.com [104.47.40.54]) by dpdk.org (Postfix) with ESMTP id 3600B152A for ; Mon, 16 Jan 2017 16:35:20 +0100 (CET) Received: from BLUPR0301CA0027.namprd03.prod.outlook.com (10.162.113.165) 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; Mon, 16 Jan 2017 15:35:18 +0000 Received: from BN1AFFO11FD027.protection.gbl (2a01:111:f400:7c10::178) by BLUPR0301CA0027.outlook.office365.com (2a01:111:e400:5259::37) 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; Mon, 16 Jan 2017 15:35:17 +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 BN1AFFO11FD027.mail.protection.outlook.com (10.58.52.87) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Mon, 16 Jan 2017 15:35:16 +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 v0GFZ4mi019448; Mon, 16 Jan 2017 08:35:14 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Mon, 16 Jan 2017 21:08:21 +0530 Message-ID: <1484581107-2025-3-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484581107-2025-1-git-send-email-shreyansh.jain@nxp.com> References: <1484581107-2025-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131290545169603224; (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)(39410400002)(39380400002)(39860400002)(39450400003)(39840400002)(39850400002)(39400400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(105606002)(2351001)(86362001)(106466001)(575784001)(104016004)(5003940100001)(76176999)(50986999)(189998001)(33646002)(5660300001)(110136003)(356003)(626004)(305945005)(92566002)(97736004)(47776003)(2950100002)(6666003)(6916009)(27001)(48376002)(50466002)(54906002)(8656002)(2906002)(4326007)(85426001)(81156014)(77096006)(38730400001)(68736007)(8676002)(5890100001)(8936002)(36756003)(81166006)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0742; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD027; 1:DABgAzgn5BEZET5dG+xLM1UKpcc3p0y1fWlR7WW4X1Wl1Dr+s7d4FEZnvooKjUfeAuz68gZ1r+c0DwYRJal00775TC7dCr3X8hUxidQ/WIbftshu4bUKArubDwE1pQ87UZ5nMbefF34cu/To4SrEFkUJ/0Qft9mYgZo521symKUUIAqjTDnWSNCVdrkUAl13qs+p3cnurcVq2rKVH8gr/CHCh8qbAmcOQVl6I6BfvVg+O+8LKsWDT2SPXBIB79iGcwCdlkgUb3/hRvX2b8vG8hFqy34ii98G/z32jkriFk6UXe4zGuD1L3ASmwwbG703hHKV11Gl4gn8Ol400RPqqwmlWU7tvBXWcFxaEtKKSFXhfxhl0jGxCDXEGO8BHmc0Xzve0lrqLxoju4DPUsDByIb//dJ/398gq9ZDU27XxKkbF7aOo4DCmZw6ZNOxeoBPVdY0TTDxQD23o4RXGuF3K3OFbKLcLGddoqJrhj57BFpBhDvSC8gith/wOxMaP/OXaqyFTkmi3ZD5juMhCzbymp4EF0gWnnfu6WS9KlgaLQjQ9Kp1NQesJy3znWoIKrVUr4XSUT5vW3dFSRVhZDkY5TlBxu+Wq8feg8IqtQpF2FMukBb4gQrAuBkcnKOOzlev+0LfJjqwU71YtfwAoX6Ws9zJfNmiuaEu1YqGNAI1MfPAahjuWj3BrYcZBVoFU0jMzpm9hiBYZAPoiOZjcQ/KzQ== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b0202b5e-6fcd-41f1-393b-08d43e2545a8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 3:uCtPjND1Iz+sGwVk0iiBj7bPIapDXAmZsP0/c1n/QYPIwy/G44AbDG2a/3GeSKg1VgOrFX21xp3T/PsxDgSShqQSthQc5YtkxZigFVd5UsODmFMDeXSAoFRy+XeleGMQt3JEjt4nkdjmcqm8tGgCT8oJQKo1DwMe2qdICuprSxchspmrEU527g1VdFsc/WvaP6KC8EEK6ncD6l1JAzCLA4KP3AC8l2+VJ7N/CXirukyvX8aho2VFK09CqDkqf6zOsTZ4qM2+wsY0OCQt47uKKst5M6UizQ/v/MiRmA7GTfdYMsQNWAKy8d9RFYJspEfNyKqLnA/Ja24GnCcOi8W9NnoEZ476ReOqDCLVM3XlBWfv9OuLWJjqH0pVxCZbYbwz X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 25:2+x860LLUPcSoSwZmp4kDVqsmddYKCc/demZsXDlytX9fXmdwVLHFlNF08PjbxCFTCF5FW1Mp/CBO6BwrdIA1rYu3vKtnxllzJt7N0BFGeIxKUDw2n3+jjO4w4FzKQkxQkszCD2xmw8m44f1Bxrn86VbVXbaGfqLVA6OoFxa8UitIYWw9/pSdtz4xrQct+ZYa47511JbCgNMbAdka+tIDEM+1xc5vWfDenw1beJiOsEd2ZQd02FiWyOAzxNKqhbWaHpu5/H1DW06dk1amfvkep7/DP8HOUpDpksm3Sfhbz6Ra4ABROoup2cZYoj2kJL9vxThZf2sBe01c9os2rkDIhFA5vWon1zNgv68LMOql+4ouQXLjhwDO2PI99UQRBmBUm3t10170uoVlbkmdhi2T93ll1rbOBKxrscUS5vAulc0azFCqhb8sAAEJbPEjRlE1me8LM+joN51tfQyeBegKswbx9fRJoLd19mluTvancQwCboQmTxEJaiBXeGhASc5lYNbOaLUr+53D6v3ctMjP2Gd62ua6468t2v39smAM60o3bnsfEbJZBf8CsTjwdl8eyELms1pZjs09eI+4MIASl0n54o5uvPV6NIH1cn8RpMnbw1Z8zJSl6438MlVueB3VeG/IaOah5BOSTUFPGKXOYLEcOGNsUmt+/b7/lIXA7SvoUl+Q3F6WVKUljfpJ0IUizRLkmk2J1VYj4C2KXXgmgjBMlIdWHvvtrmyprbqwg+Yz0JxLLQcjxrYaZN/TNLfX+ztvtbwEH24y+Pr4Vd8h5WhoJNc18hGT2bS81iDExg= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 31:feZrwcsqM04yoaf59LTdFn/L/SSNeHbBWFf4wV6is8bC0E1o4woHRc/+zhqVKtpuYb074ytweEPo2PBamI7hQQjNyCDFoze+2Ko6yyGh4FHtCaKD36QIbV8JWNOShDFrN8MEkD9Pl9u9qHfywk+bjQm2ILkEokZA3LxCsoTjoQCauieOqqiAYzjvpGn4upFgtK3NCuoQke9xVJQ9PJcFcVZhAB/Ea5n4FBiZOmluXhzZF0lLuYQ5PbcXaWiOxavzUB/Cb1c/4glHHnej9SlSL9eF0sz60JiLG0qilssykcc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:BY2PR0301MB0742; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0742; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 4:sbYfq3DltbzHBAm9hD6KkBGtK7c6gQCltp7GHK+pwBFq0R5wjADQts8fPlrusxveuF7+CxsBuxKEq+QsMlz+zbvlLZzqAWDZmb+zhVOVNF+AkhqiYxRrrSEeK747FEL4bYBclLSFobH3ISUbvwsgMrbE7Z8pD7dX9ruckGWjJFUNflMXou4RE9MFrtOhwycvmDRFcTjxYhXJuOiaR7M7OB5/xrQAPHWSYoM9pKcCDNvaZOPFIM7E7oQ1ErW810Yw2zJtm2zoqIdRaHp2udwwt6x+pE3iRP5u/UU7gy7ZvJWXSrQkfcC68zHRbtfSRrDozMd6uyNnbSuxRlV5WxSzXR7Gxw7ZFEWgGJYZ3eT4Lfe9XwotxoqIfiCry9ZxKy/nUWcWDWNiHizjUjM/YkWbowGj4DWN5RA671I0y8ktoA73Z7JXIuWU/k1wRtO2qr0E5dtNMMASUH766+DJ/jkewbLNdC/RWD+r7aT93NaYvLjM97xjRAiJbZxKY0f/r8W+niAW6/9uO0IHRYaM9enKfGSnG72n+st6i1zrdYGm05W92VnqP0H65Arv5kVDr/fYLHtAzgzAUVjNVomjl6mvAwD6nQa6c2YPefFD7onWYUa2w59yV/p02Hq2iDiN86qp2aZSMkRMwYpvjwdXOec3K+LVBH29GPbhOV3XFQfkKaEZ/EKhOg2yhdgjzvJOX9zZcEg/vDw1d6keoPRpRU6MLfocXMkjkw5xFdptvlzuBiy7jjep27HYG0aKHLqq0Jz7 X-Forefront-PRVS: 01894AD3B8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0742; 23:XXBbUHWKAp20a4hUCtiEF3i6QwXE5RJltmvoMII?= Fbtdj9i7SDhsYu6nanYLqlm3pCx54oZkCkYdbBoPJHfNJvWe8DhTiQnXpxK1rtpGyMu+FO/iYmRfMH8amgqj7VHy81JWZ6ASrTrywQFJPig9Y6jbbYgVv0B/4/84+QXXLWKrWSaVk4AS1gEnNmOk0ROhiAv0pyvgrWcHT0RlAxes32n6ryBkD0zpAJeZJLIx2fmZEr5IO2YC+9AW6mYHNYadmEpF3deKjVtjOjgR3fTxTodBru7moOn2s5lxJYRKYQX09pLeC2oTcjghde0Q19QL7zuYJ3+XyR285sWRHoDu3kVKEKBw1f5gF/QGp9/h+FL2wMnBsxDmEtDmyplL1VcvUk3IQp0xS2kBLDm1sYhV2gqHLwrtwwNS41AWBxzU3dxlrohGAYBSLRy6op+XGQwWDjOMGLs2AT+p1WfMQX8BAUVhDVfp/B97JukNqjzsOD5QlqDzYm6PF2qN06X8Eg24rbwFKkyBIMZ4xYcIGZT6HTOYKXKcoFiEgAN/IB5da7FCYd4IyA8tHkcFFkrUHU9TrS1N2pRR7Mai48VkxvMCRMSPa/z7jXIcyUN8V+/Ak6fKMSjxaE2+SiHwHRGdoLEeznaMHF2lZ+Yh6usDJZ1y2EIDMI/f663/S1T9Ja07/MSeO7NB8PuQuDDZGdAoKNFGuaDgudh6ZDV2Hw1h9Eze14AJ4pWwZQe8MiUcsEDXQp9rVzn3168PPfqyx0SzUq7Vv8XAKGCHxtcnV3McUZS6cboucxjosV6txPEinVsXSnjbJi2skw3oFSCHCqJXIr2FPX3uOSv22ridHAM836guVhxRkPZEYPqyJ4AsW1YdT6t/+lZNIL4wKaRqRRiNrOsPcNJBzvyR3lmpc/hbr5DVCOvJfITpOLrDMTOsAxKxB1lvNrAv8FHSr+mdQg6F/3fldwgNJspG4cYhOWU8hs+icrwNEGdcLg9ZMUL3Y+NEnlKuxWxZMCANFPb34EVWN+aILoSaH66OUvktj49duDPGurNvkSrHZmrOoH7UUhq/6vj9LPrtakFvyiBNUjliWyS9XkmxQykxJBQ8K4XHZVF4TAD70yzfMhGxXb3iiDkYrIuVx3eCi0Olu/sPjGNT2g/wbLkUSUL/3ox100J2Y7s2U8FSHaaNGsI4vILjq+617oh1LXv+HJBpiHrpihAlTQ0GkUw92mNhuJOazHvrfSD5ozRuMreiz39SKu6yIv7l0DXU629A9cYDIPgVOjCFdpSDnnaAfIP6uVFPZwzYqraO1xvdEvQVIwYD8VZ5KRXe0yacKZSHC67lO/x/ELgMqbJ5kZ5MN6RlD9PEtuI6jnFK+Zg== X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 6:5QxxHimTa0XjPy3G+TpFIzPwQAJZhNz0pd+m/wp7HKS1jMT1enT5GNxFUiXSnJkPgLxK4TzRbrMVw9ZFX8kt8LzkWAfqKSGkNjA1nVbsdddCHn6TLVNIHAvDBHKI//j8jQNxoNnlaVxvyS+9/aFSdIfm61vXym/V25YW+ksy4igOy/ufjbLUMlM5EqcEsCnTAJzPvcWpHU+o8McL6sw5O2H0NJDoxGtJv8cudZfimE0jmHX0OQpjZjZM/zljXW9cwPZnupePY/+RManjl3244lPgJBdPE1LAKH/JeuGjw39lHxfuRshf9kOc+Xzox2D+hhFyXCbRzBQ8G9dBEAzrmoPilpEVQ5kkspfundAobAsBsZ6o8BJufHRBx6aE31NMJE+AxFDs/6Kado8dPtWlUO2I8/cE6EUS0q0Sy8E4w1wTYVvTYcVwQIJLXtcQbYlB; 5:xk0YL2aBMY/iCy9CTcrnEkC867DkhGOjAEPiC8vgKetWzJVE7wuUx0RDoABWNu3SXo7xqTg6W0ybeIzd0kvqBnuiysAnDHDpztt7P0hlbtqIGhXv1UOofTxzee6UFFk1JnnLDDDfswz1GphLZmOuICstfNb+gjTg/QMqJAPgmNV3Y47m9uIq/x42XpGIHObR; 24:eD2NnEnNJIF+bNHhchrL7CZ01+xeURhZvYHe/Tpm4HkrO6dJwXY3qpQkxLul5uLBjUHuoaBF5FHiGCKGF89ajoMX+27hDeHLtLgp9celjMw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0742; 7:cGkkaBzhy1uG6EYAPq2rK0rL1+ROaEVUT8k2NcZyTj/iSi2BVwVSdK3et3xe56eaAei08wGJEvrfHOSDI1kcyK1DCgGne/ZFDufPCmC4mAPcUb+xmgmjUmArHOCo759+nw8avSQDFof9/j5yalJ1ukjsXoOqewp1RHJkP5KcVg4yaSocmqsZ0G7SuD14Mhh4D4IiVOkVAucY7urWFgvTn85k/5w4wtiH8hxZUfadfkAiJG+mSSRP+sfVKvgrZhuW/H7GS0bj2mZX6YcrWmt/xZ9iedOFioZ9734PXgndjwEOv9zgl6lEQVLHYMde4rZC2yeF+82X8Yb4CDR9FfIV814FjHOctxyHveBz8XSro7U3oL1iQzFkVCy3kyrzZiFLU0KhCyEKhXhR5e/fd4yHrkmMoPK7mrGl8xT1fL4s2IaalX54ozIThCoZzVSab8IkbHLG/QMUhA335E5ppVICTw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2017 15:35:16.7731 (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 v6 2/8] 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 --- 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. */