From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0072.outbound.protection.outlook.com [104.47.32.72]) by dpdk.org (Postfix) with ESMTP id 5D547F92D for ; Thu, 29 Dec 2016 06:14:58 +0100 (CET) Received: from BN6PR03CA0049.namprd03.prod.outlook.com (10.173.137.11) by DM5PR03MB2475.namprd03.prod.outlook.com (10.168.233.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11; Thu, 29 Dec 2016 05:14:56 +0000 Received: from BY2FFO11FD002.protection.gbl (2a01:111:f400:7c0c::186) by BN6PR03CA0049.outlook.office365.com (2603:10b6:404:4c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10 via Frontend Transport; Thu, 29 Dec 2016 05:14:56 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) 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.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD002.mail.protection.outlook.com (10.1.14.124) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.789.10 via Frontend Transport; Thu, 29 Dec 2016 05:14:53 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.87]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBT5DOHr010218; Wed, 28 Dec 2016 22:14:49 -0700 From: Shreyansh Jain To: CC: , , , , , Hemant Agrawal Date: Thu, 29 Dec 2016 10:46:30 +0530 Message-ID: <1482988612-6638-12-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482988612-6638-1-git-send-email-shreyansh.jain@nxp.com> References: <1482180853-18823-1-git-send-email-hemant.agrawal@nxp.com> <1482988612-6638-1-git-send-email-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131274620957842458; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7916002)(39380400002)(39860400002)(39400400002)(39410400002)(39450400003)(39850400002)(39840400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(2950100002)(69596002)(5003940100001)(626004)(2351001)(97736004)(6666003)(5660300001)(4326007)(8936002)(50226002)(47776003)(106466001)(77096006)(33646002)(8676002)(48376002)(6916009)(38730400001)(305945005)(50466002)(36756003)(189998001)(92566002)(104016004)(110136003)(105606002)(356003)(86362001)(8656002)(50986999)(85426001)(2906002)(81166006)(81156014)(68736007)(76176999)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2475; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD002; 1:HoiNfE5lbpcfRVDrBSQieiZxBQfW86KeHz9Tx1hSxJA8NC7GpeQIiCcSEI6tSy9KfRHZvPKorzOYZ/DjMLpoFtT1H5ZRdSBfOahYIvlodiobRVnTzIXPMIhsa8jw4ol5LJS48wbuSttDyv9mwzTbjzqAjVE4E/hrxtqiueBgDXpcm6iXUkWiYoAJeY9eNGjL4e0vLeV6LDIQhHuimkaCxbBLbvt7JYlVcFjwIJMIerbZRCyAN26b8pj4OeB94L4s92qWhuex731ORitpqfpo8FX/aNYfCM96P8fFgB8WkDKwvbuZDbyQ1Z7i86JJSECPBI6Os7/gtwCU2cXyeS5C51rnwuk7JVZbDKoDIfkoXcHOrAb3396bZ+cTo84tBmioarfwRbCbAWGa/zaXI85M1Qw9ydGJFbEpqhUuE5fxJLV1es/NFG3ftdOZFslj8mveI2VxuKI1Xk4oLybTNUsLsyuwbW97zUoPrDYrTR8VBxeaKncDkRK+nvqSJJkzhtF5QcvBI+6oFGb4WYhD8iLM7DUsCRQ3Cuwqj+wHxxrq/ziqvfP0uiFL2EngpUYROY2FFRD1K2FN4+xeU5OCjz4REo512AlPC6Qm9spXc1ogFmdDooyTRXFyE6RaMY8h4zxTiFrAe4ZuJ5ZLXv6cfn0hYxqqWoPMeYwndSOQXRkoXNTZVezk/T8aatvakZTTrzb/tDJYsWhmESKpvINrnqCT4alRVDSb4WBgNny9ZBOjYHbnje+h0/g6LuIdcwQWzWLOTuyZfLClF1TMH1IE6mwJhSWRHTZD0RBCBTEyfuBsQsk= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: cf12f07b-6df3-4b8e-5112-08d42fa9a09b X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DM5PR03MB2475; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 3:RowYkB7J0yhRN9KovdRwPpAnskNscMknhkPMXmFPndbI3XUWCbxYt2MG3gkOIHQUlAvl4InVyheEQXerInHhI/+MSXH8DdNbGRsDpiZXTZJgKVJjc1wfcdO32JHNbQ9npVf5ZGk9kO+zuO0Zg0zLTsC+GoyibnrC8AkZ9bySjaBafNDKcGuNXKzzyiF6H5p9ytbOOltHCTepONHFhAPw4DYP7DAum5CyERgsfYPo0AhLT8s/6PMkvNHLXhXbJciyTE2Ye5Igfdj4PlTI5+UvJGszpxsNGaBkeh9c9GMlXWjbnMk/Ga7ylUXt7ya5VBc2h6wZq9WoJqvgfgk0hGGj9jU+429DA1wJ9hVlYHeppVM= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 25:e8uc9CDPYr6U2PlevsXanTbnyVTC3BK+thxJxzUwfMUD6Zlqy8SozoxRyiN8gXShhSa7AOP6kHLQGbW8GGHqDWRI1JPHCpwB9+qhQWkOlKfs1f9BqhvbEIti494JAgVO0suRNUDYVXdLhoTkAK21hEDXHwMUybpWt0+4DMGF9uXfYWkJKXrs28B4ZAMux63pJaW7VA82CYK+GfZRpabdXI9l7Tl7FObEinqsf1H8JABM+F2B9hiGucGCHELQxzlLLAVWgEqNi5RRh+BFpcB7ciaXbWfEWV41opxNKtOPDL/bISoSqxWsqJt6qClght7c28INAGv5wPWrFbEy6hX5eQCiFnrnJ7XovWK/YG0btDWqBMqRJ1oVN/1j1zvWxPAShbh16T8NXu4TFh8va/nUj8enRJAHk6YjizpGcRFuEtnivFbeYHJ8tYBR4B4whlvnZ1fFQb7cq/aPgXT46+EpJ69xz3JB67unv+OzaHYFkAoO4u7Dz3erlnb5CF/GJqTuz4Q/Apee+4L/pTFX77zdEGd0eIqIRxsYxFivvPWRJ5CqBTPuSFKbD7qJmmfEBEe+Yp2wiLOVRPfELMYmAxRZiagqLZN/CvXZ8/wqctzTeBqCl04j6IvZV33iCCDrEviEbnRhbW0nxmLXiGyFelpqphh+rjPjzcXD9PtdI3z72qgsZkr3yzzGKI56dU7z2dLrI67/uSrweb5wv/JaC20szl/Nw/U9Aq1C4D3bZzzuxgZ5SYmJsN3FjnA7phKGa4gS1lCWS9sM6UKJThNqztPNig== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 31:8KttrUVtOVcKZfIFaE4kSjrV1/Z2sw38M6LOsZXCI9agLarE6jLZkSoay5I4SAzuf2iTwKqI+bbe0R6KVwztNAIAUlBRnqXeKjQvL0t1mvmiyhbLjFBddCzBnTlzSaQQWR1RWsXKhFxnLVgXQtEb0A0LJUO8ISlepJ7xGCIjiiWcreGUQUC2s5Wbla7tirtAwM2Ub8jSKx5RiRTt3sa8bTJ1yP4LWd7X2psS9vgwNOQgm3xFUzEIQUlAFffkx8P4vkZHX4aihL3jrhBmtFjgMOA6a3mqSB5ZGnC4SE/LS4g= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684)(21532816269658); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13024025)(13023025)(13015025)(13017025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123565025)(20161123563025); SRVR:DM5PR03MB2475; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2475; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 4:BtoiaU4DMrN9TUc872TFHqTZjWM+ZuoLHHSyDQ9IRGQpWOek/KsXsX2A2GzwkggfVvgGwG+j8Fgy5MF6N8aAUNNNDIisidkUpnE7gX06KlUqm41MFzfkeSMeK7eUsqs9rBPWT5NijiEe0M0qnN+ji3t+mUgAy9C5s/CIKuxL4q8S4I+R2CE5TPW9DInf1e4hd4Fr5ZazLREneCR5KTefDYKcQWlubi7fAaFhVXk2IWEt/GpgkPf68FGR2VkbtIZ+tsi/3Y9K/tXV/dt7M9aACjff+MY5qF2KQp8gPiuaCw5VJXuAg1P5o2eH4IdJ+WBcDqMItIPisBEA4Y3TWZ0sp6CamSGWHeQ/e+wdyy5/Q1Oj7vNR+TFWAQn35lZNeaE3FObjzKAfpIH3/f3JM+s1Rd2lj21EoQDqL+PvqAMR42CS1Jz7zlyz7HFjYhcE3oiFGh1onowkIBP5kAi2FFA19QFzDpKZr/SuIooD0fyAbnGJ2mKHBOneOMqMq00FJuWr9Vm1njMBz1idxC6WtXqp1LqxpKKDRYmS9vMymsESFEV+Tw+nVFWRb7P38x7IEvGfK0Badc5nNUBl4aLZy26DOs5WcdDT49yuzgaD2jrQFVt5ZFpMitBEMUYUn5ynNY2UZguWp9XKdKvuIsg7WFE8e1LOyxdHlbN4j5qo54NCwR9a2EfnQbuOwoRcg8wLaNVII2O8OGyaLoDSTO4TCPaPP4C1G6UVwS7BWtoL1BNEXOfkkHUZBIXp6yoLrJsI1GqtecHoW9kWHU8AO6O7P1lgvyjHxN5crirtcj0H/brfIX0e1YPbvnItYmNa9Dc7i+H7 X-Forefront-PRVS: 01713B2841 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2475; 23:YQWADgEZK5/kD1yXa6DyIiPSZaTPvpPysP6OnMAr8?= =?us-ascii?Q?B3ZJGQfrcY+RmJiCJPSjwzxfoMwBRCamNk5NY3StaFrQEryfy0li0NfuBJ9a?= =?us-ascii?Q?O6DZU+teiKeGeKummaZ+c7QR2zepO9o6QFEx5k9oGg9fwHTACVMy/XNznxhz?= =?us-ascii?Q?k9H5+dlXQr0HV1DN6qqadQzjG7lZMjgSGdTiLNyhg1KgSK/zmCCAg4g0+eB3?= =?us-ascii?Q?BCTiafG7IJd+Y6dfH5By1Qqno0G0W2IrQ0rEJJUMZ76izeYa8RbAeLPk5rA1?= =?us-ascii?Q?9qx6e/HNb47uShPTgiKg86nITWcBXhNwaIEqEZthj46cGbdZaJl4yDZlN0ht?= =?us-ascii?Q?jO2qPx9ukdPTrbHL19hYkHWGlfuAzN5ucuDddyyxUY2pl6db8JuzOeSucFe5?= =?us-ascii?Q?CVoa/+6EhTMDTbxemq5EXMjidGjTNX11SCQlRXGasFmTw44GlT6OpKfnnshD?= =?us-ascii?Q?zvQJQjGqgL1EREI/Xw6lcAnoKPeBqDRE+BIRjLnozBjBDluY4KeHP1oRttPw?= =?us-ascii?Q?pWzpWOGzTuVPxkovciUL7qvTavVXK/zCC0/Zh5vOOfOBVrxlD6f/f42d1F4A?= =?us-ascii?Q?BUMiUdS02/nbpUwXs70ojojW+qnGEgU4mF/hNtVQ6ULTD3DYbQu+M9TLcPcs?= =?us-ascii?Q?e2hdmDnJ1LFp/iFmwuUTUj2R5bkCj4WqoslphcTbP7X6+QQiNhnJPDeYhy84?= =?us-ascii?Q?VNkNqKoVlNvHszYlLfBMI/DEjx1vTKckPc/ayuv6LfzNshJVG5lzmWJtb9KG?= =?us-ascii?Q?wQ5lgWOKDn66eI42+2JeOLTQSdPvIua680wbQlyM/OVgX9loVt70G02RMkLf?= =?us-ascii?Q?QdEKc3cSuKjki47hIz6+kSxMpQ8HbbYYjIBl+gcwtfdd3lmSS3sOPgcYbi1T?= =?us-ascii?Q?frSnJIogP7UZ+iLePKwaZoVEM0H/s+AWtHE68Qt0Gvx7k42xbvPcHb+PKQIq?= =?us-ascii?Q?KxVmkO42gt8OD8YXoASbWXvBuBxCPqs54i9ztoR4/D/MSOKto0WoaWpYBBTU?= =?us-ascii?Q?feLGN6CJVxeKc1ChM/cJ5ggq1Y9vlmSRyPyxsru+q2A4u6GuaWpC2Q+C7FXP?= =?us-ascii?Q?IUi9SokkxMKA+Gu+WP0KV/GfzRJAH5cqlmj15G9kx17Mrvnq2oRODD7xtmpC?= =?us-ascii?Q?92WRq7TayaBv+NtTJw8Pin9glv6bt5v2dT4qX1PRK7cmuZZoD9aBLA/OJKP1?= =?us-ascii?Q?aMzAWNfjyN10msN7z4q3OA7QvroziBS5a+y1SLKc0r/c5e3znlhjOxlz0fMP?= =?us-ascii?Q?A7JrtdHsbOEMAy9s7gNsLJZBEZI9iaZ6dltf9BMIqDxRHAxv8+xvt/r+tjQr?= =?us-ascii?Q?rjI0YRMjq7BJIjdXypUMtQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 6:oNeiT7mcONi/r82W4FPquqpw8cvI1DSP0+FRDjhVJaXaxI4IzwSpe+s2s5OLl/0wvfhbsNE4P8VHh79Mppb331MT/Nfxjjnro7kw/KhX3D3DYvRpUxuaTZpk4mR+QYMdDLTTQZw+VBO7MMnbjP061ZViB+T9PS5WJipmkBR0bzbff3ZN/HE8T8UdI+0F69tr/xHQD1wIftYgKD3iLjfulG6t2eBJhCKdicBrODbACVQVZJGqsclxMeeY+bJ5HzMAFeg6lSyeFMkJe1A6GdNQPh4VOToB4WkXCmKYId0JiHjvY40+0ByxzJYF86u0SpV0LBIc9lHgg+LEgnkEmqYQ5zX3SngSv836Ibxy9EVr07Sbk+gnJ8noMlzbO/0/s1J4bDpE0l8csLrw4/wWFNd2u69xRuNHzzZt8PhdfwRvs4ceJ7lS+UABTNyj+vdLSP7f; 5:l59WVFw03KIONUAmCkgvR8UcrOAF9I5gyzh1WGxdnf1P572pL4ITCETOMA3xSMxOwUOLy9K/CwDn9AQo1eDFrhfsh4BYFKfr3sm7IMTOx6Ddj3PP5GBnYgR0W6xpGpNt5CMoeeR41NReQznQ406/xBZEi0Kd8jaMs6DBm5GyRjPmh0v51k9napG5XKkruLxC; 24:drT6oTDG2eEyP+73hiCxfGgBykN26gKn8u5u1X7NXYzVz+lZbJM7qfaMyP0Jp8RqsFvWDiAShcywNwaySD6OELU7gk4eMy8p/rcIBIp8Js0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2475; 7:gRura/TbHXZw00qpoI/1DWGHOMy7cy2P6HwUFQKozfnFnDz0EjhhRFWD/5RmnxU2XYb5EM1S7Jz8ebqwaHvv39HkP55dn5wsT95RNrVayV55qKTvbIo735+lVJNdyiof53vTO/N8JoXc/hnwydIjc8YSSezgw3FzwZJq1aNt/SKC83wLQrSRuUsYYhoyuzcgiO5bKTM08XbmgnNPHwzxILL4p9wTFbga9TY6GdYpBZbiJpl26kkmqUTl9Cw+e1mlfcOiRyoeqd2SSXmZYX5rUgDPBKs7938rRk1vK8Qvro2UGwgSG81flZrLUvkVDI05QnxXrkp0OWpVgMXlvjFaGqyI/yhiHPQIoSs9bePOGvduv6A6o1qFPozzCXo8C7K2P3zIAdpAm/VrFtSx9u1+VvVY+6sh1fSCw7BV/YugquAF0cKW9cWINaF1DVIz5wCQAmA0a/tfrPJjGL29FPmHdw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Dec 2016 05:14:53.1010 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2475 Subject: [dpdk-dev] [PATCH v3 11/33] bus/fslmc: add vfio support 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: Thu, 29 Dec 2016 05:14:59 -0000 From: Hemant Agrawal Add support for using VFIO for dpaa2 based fsl-mc bus. There are some differences in the way vfio used for fsl-mc bus from the eal vfio. - The scanning of bus for individual objects on the basis of the DPRC container. - The use and mapping of MC portal for object access With the evolution of bus model, they canbe further aligned with eal vfio code. Signed-off-by: Hemant Agrawal --- doc/guides/nics/features/dpaa2.ini | 1 + drivers/bus/fslmc/Makefile | 2 + drivers/bus/fslmc/fslmc_bus.c | 26 +- drivers/bus/fslmc/fslmc_vfio.c | 450 +++++++++++++++++++++++++ drivers/bus/fslmc/fslmc_vfio.h | 74 ++++ drivers/bus/fslmc/rte_pmd_fslmcbus_version.map | 2 + 6 files changed, 551 insertions(+), 4 deletions(-) create mode 100644 drivers/bus/fslmc/fslmc_vfio.c create mode 100644 drivers/bus/fslmc/fslmc_vfio.h diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini index b2ad6ec..b176208 100644 --- a/doc/guides/nics/features/dpaa2.ini +++ b/doc/guides/nics/features/dpaa2.ini @@ -4,5 +4,6 @@ ; Refer to default.ini for the full list of available PMD features. ; [Features] +Linux VFIO = Y ARMv8 = Y Usage doc = Y diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile index e422861..a5a05de 100644 --- a/drivers/bus/fslmc/Makefile +++ b/drivers/bus/fslmc/Makefile @@ -41,6 +41,7 @@ CFLAGS += "-Wno-strict-aliasing" CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal # versioning export map EXPORT_MAP := rte_pmd_fslmcbus_version.map @@ -55,6 +56,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ mc/dpio.c \ mc/mc_sys.c +SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_vfio.c SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_bus.c # library dependencies diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index 5d01b7c..d90f2b6 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -42,21 +42,39 @@ #include #include "rte_fslmc.h" +#include "fslmc_vfio.h" #define FSLMC_BUS_LOG(level, fmt, args...) \ RTE_LOG(level, EAL, "%s(): " fmt "\n", __func__, ##args) static -int rte_fslmc_scan(struct rte_bus *bus_d __rte_unused) +int rte_fslmc_scan(struct rte_bus *bus_d) { + if (fslmc_vfio_setup_group()) { + FSLMC_BUS_LOG(ERR, "fslmc: Unable to setup VFIO"); + return -1; + } + if (fslmc_vfio_process_group(bus_d)) { + FSLMC_BUS_LOG(ERR, "fslmc: Unable to setup devices"); + return -1; + } + RTE_LOG(INFO, EAL, "fslmc: Bus scan completed"); return 0; } static -int rte_fslmc_match(struct rte_driver *drv __rte_unused, - struct rte_device *dev __rte_unused) +int rte_fslmc_match(struct rte_driver *drv, struct rte_device *dev) { - return 0; + struct rte_dpaa2_driver *dpaa2_drv; + struct rte_dpaa2_device *dpaa2_dev; + + dpaa2_drv = container_of(drv, struct rte_dpaa2_driver, driver); + dpaa2_dev = container_of(dev, struct rte_dpaa2_device, device); + + if (dpaa2_drv->drv_type == dpaa2_dev->dev_type) + return 0; + + return 1; } struct rte_bus fslmc_bus = { diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c new file mode 100644 index 0000000..54467d3 --- /dev/null +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -0,0 +1,450 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved. + * 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 Freescale Semiconductor, Inc 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 +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "rte_fslmc.h" +#include "fslmc_vfio.h" + +#define VFIO_MAX_CONTAINERS 1 + +#define FSLMC_VFIO_LOG(level, fmt, args...) \ + RTE_LOG(level, EAL, "%s(): " fmt "\n", __func__, ##args) + +/** Pathname of FSL-MC devices directory. */ +#define SYSFS_FSL_MC_DEVICES "/sys/bus/fsl-mc/devices" + +/* Number of VFIO containers & groups with in */ +static struct fslmc_vfio_group vfio_groups[VFIO_MAX_GRP]; +static struct fslmc_vfio_container vfio_containers[VFIO_MAX_CONTAINERS]; +static int container_device_fd; +void *(*mcp_ptr_list); +static uint32_t mcp_id; + +static int vfio_connect_container(struct fslmc_vfio_group *vfio_group) +{ + struct fslmc_vfio_container *container; + int i, fd, ret; + + /* Try connecting to vfio container if already created */ + for (i = 0; i < VFIO_MAX_CONTAINERS; i++) { + container = &vfio_containers[i]; + if (!ioctl(vfio_group->fd, VFIO_GROUP_SET_CONTAINER, + &container->fd)) { + FSLMC_VFIO_LOG(INFO, "Container pre-exists with" + " FD[0x%x] for this group", + container->fd); + vfio_group->container = container; + return 0; + } + } + + /* Opens main vfio file descriptor which represents the "container" */ + fd = vfio_get_container_fd(); + if (fd < 0) { + FSLMC_VFIO_LOG(ERR, "Failed to open VFIO container"); + return -errno; + } + + /* Check whether support for SMMU type IOMMU present or not */ + if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU)) { + /* Connect group to container */ + ret = ioctl(vfio_group->fd, VFIO_GROUP_SET_CONTAINER, &fd); + if (ret) { + FSLMC_VFIO_LOG(ERR, "Failed to setup group container"); + close(fd); + return -errno; + } + + ret = ioctl(fd, VFIO_SET_IOMMU, VFIO_TYPE1_IOMMU); + if (ret) { + FSLMC_VFIO_LOG(ERR, "Failed to setup VFIO iommu"); + close(fd); + return -errno; + } + } else { + FSLMC_VFIO_LOG(ERR, "No supported IOMMU available"); + close(fd); + return -EINVAL; + } + + container = NULL; + for (i = 0; i < VFIO_MAX_CONTAINERS; i++) { + if (vfio_containers[i].used) + continue; + FSLMC_VFIO_LOG(DEBUG, "Unused container at index %d", i); + container = &vfio_containers[i]; + } + if (!container) { + FSLMC_VFIO_LOG(ERR, "No free container found"); + close(fd); + return -ENOMEM; + } + + container->used = 1; + container->fd = fd; + container->group_list[container->index] = vfio_group; + vfio_group->container = container; + container->index++; + return 0; +} + +int vfio_dmamap_mem_region(uint64_t vaddr, + uint64_t iova, + uint64_t size) +{ + struct fslmc_vfio_group *group; + struct vfio_iommu_type1_dma_map dma_map = { + .argsz = sizeof(dma_map), + .flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE, + }; + + dma_map.vaddr = vaddr; + dma_map.size = size; + dma_map.iova = iova; + + /* SET DMA MAP for IOMMU */ + group = &vfio_groups[0]; + if (ioctl(group->container->fd, VFIO_IOMMU_MAP_DMA, &dma_map)) { + FSLMC_VFIO_LOG(ERR, "VFIO_IOMMU_MAP_DMA (errno = %d)", errno); + return -1; + } + return 0; +} +static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj) +{ + int64_t v_addr = (int64_t)MAP_FAILED; + int32_t ret, mc_fd; + + struct vfio_device_info d_info = { .argsz = sizeof(d_info) }; + struct vfio_region_info reg_info = { .argsz = sizeof(reg_info) }; + + /* getting the mcp object's fd*/ + mc_fd = ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, mcp_obj); + if (mc_fd < 0) { + FSLMC_VFIO_LOG(ERR, "error in VFIO get device %s fd from group" + " %d", mcp_obj, group->fd); + return v_addr; + } + + /* getting device info*/ + ret = ioctl(mc_fd, VFIO_DEVICE_GET_INFO, &d_info); + if (ret < 0) { + FSLMC_VFIO_LOG(ERR, "error in VFIO getting DEVICE_INFO"); + goto MC_FAILURE; + } + + /* getting device region info*/ + ret = ioctl(mc_fd, VFIO_DEVICE_GET_REGION_INFO, ®_info); + if (ret < 0) { + FSLMC_VFIO_LOG(ERR, "error in VFIO getting REGION_INFO"); + goto MC_FAILURE; + } + + FSLMC_VFIO_LOG(DEBUG, "region offset = %llx , region size = %llx", + reg_info.offset, reg_info.size); + + v_addr = (uint64_t)mmap(NULL, reg_info.size, + PROT_WRITE | PROT_READ, MAP_SHARED, + mc_fd, reg_info.offset); + +MC_FAILURE: + close(mc_fd); + + return v_addr; +} + +/* Following function shall fetch total available list of MC devices + * from VFIO container & populate private list of devices and other + * data structures + */ +int fslmc_vfio_process_group(struct rte_bus *bus __rte_unused) +{ + struct fslmc_vfio_device *vdev; + struct vfio_device_info device_info = { .argsz = sizeof(device_info) }; + char *temp_obj, *object_type __rte_unused, *mcp_obj, *dev_name; + int32_t object_id, i, dev_fd; + DIR *d; + struct dirent *dir; + char path[PATH_MAX]; + int64_t v_addr; + int ndev_count; + struct fslmc_vfio_group *group = &vfio_groups[0]; + static int process_once; + + /* if already done once */ + if (process_once) { + FSLMC_VFIO_LOG(DEBUG, "Already scanned once - re-scan " + "not supported"); + return 0; + } + process_once = 0; + + sprintf(path, "/sys/kernel/iommu_groups/%d/devices", group->groupid); + + d = opendir(path); + if (!d) { + FSLMC_VFIO_LOG(ERR, "Unable to open directory %s", path); + return -1; + } + + /*Counting the number of devices in a group and getting the mcp ID*/ + ndev_count = 0; + mcp_obj = NULL; + while ((dir = readdir(d)) != NULL) { + if (dir->d_type == DT_LNK) { + ndev_count++; + if (!strncmp("dpmcp", dir->d_name, 5)) { + if (mcp_obj) + free(mcp_obj); + mcp_obj = malloc(sizeof(dir->d_name)); + if (!mcp_obj) { + FSLMC_VFIO_LOG(ERR, "mcp obj:Unable to" + " allocate memory"); + return -ENOMEM; + } + strcpy(mcp_obj, dir->d_name); + temp_obj = strtok(dir->d_name, "."); + temp_obj = strtok(NULL, "."); + sscanf(temp_obj, "%d", &mcp_id); + } + } + } + closedir(d); + + if (!mcp_obj) { + FSLMC_VFIO_LOG(ERR, "DPAA2 MCP Object not Found"); + return -ENODEV; + } + RTE_LOG(INFO, EAL, "fslmc: DPRC contains = %d devices\n", ndev_count); + + /* Allocate the memory depends upon number of objects in a group*/ + group->vfio_device = (struct fslmc_vfio_device *)malloc(ndev_count * + sizeof(struct fslmc_vfio_device)); + if (!(group->vfio_device)) { + FSLMC_VFIO_LOG(ERR, "vfio device: Unable to allocate memory\n"); + free(mcp_obj); + return -ENOMEM; + } + + /* Allocate memory for MC Portal list */ + mcp_ptr_list = malloc(sizeof(void *) * 1); + if (!mcp_ptr_list) { + FSLMC_VFIO_LOG(ERR, "portal list: Unable to allocate memory!"); + free(mcp_obj); + goto FAILURE; + } + + v_addr = vfio_map_mcp_obj(group, mcp_obj); + free(mcp_obj); + if (v_addr == (int64_t)MAP_FAILED) { + FSLMC_VFIO_LOG(ERR, "Error mapping region (errno = %d)", errno); + goto FAILURE; + } + + FSLMC_VFIO_LOG(DEBUG, "DPAA2 MC has VIR_ADD = %ld", v_addr); + + mcp_ptr_list[0] = (void *)v_addr; + + d = opendir(path); + if (!d) { + FSLMC_VFIO_LOG(ERR, "Unable to open %s Directory", path); + goto FAILURE; + } + + i = 0; + FSLMC_VFIO_LOG(DEBUG, "DPAA2 - Parsing devices:"); + /* Parsing each object and initiating them*/ + while ((dir = readdir(d)) != NULL) { + if (dir->d_type != DT_LNK) + continue; + if (!strncmp("dprc", dir->d_name, 4) || + !strncmp("dpmcp", dir->d_name, 5)) + continue; + dev_name = malloc(sizeof(dir->d_name)); + if (!dev_name) { + FSLMC_VFIO_LOG(ERR, "name: Unable to allocate memory"); + goto FAILURE; + } + strcpy(dev_name, dir->d_name); + object_type = strtok(dir->d_name, "."); + temp_obj = strtok(NULL, "."); + sscanf(temp_obj, "%d", &object_id); + FSLMC_VFIO_LOG(DEBUG, " - %s ", dev_name); + + /* getting the device fd*/ + dev_fd = ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, dev_name); + if (dev_fd < 0) { + FSLMC_VFIO_LOG(ERR, "VFIO_GROUP_GET_DEVICE_FD error" + " Device fd: %s, Group: %d", + dev_name, group->fd); + free(dev_name); + goto FAILURE; + } + + free(dev_name); + vdev = &group->vfio_device[group->object_index++]; + vdev->fd = dev_fd; + vdev->index = i; + i++; + /* Get Device inofrmation */ + if (ioctl(vdev->fd, VFIO_DEVICE_GET_INFO, &device_info)) { + FSLMC_VFIO_LOG(ERR, "DPAA2 VFIO_DEVICE_GET_INFO fail"); + goto FAILURE; + } + } + closedir(d); + + return 0; + +FAILURE: + free(group->vfio_device); + group->vfio_device = NULL; + return -1; +} + + +int fslmc_vfio_setup_group(void) +{ + struct fslmc_vfio_group *group = NULL; + int groupid; + int ret, i; + char *container; + struct vfio_group_status status = { .argsz = sizeof(status) }; + + /* if already done once */ + if (container_device_fd) + return 0; + + container = getenv("DPRC"); + + if (container == NULL) { + FSLMC_VFIO_LOG(ERR, "VFIO container not set in env DPRC"); + return -1; + } + /* get group number */ + ret = vfio_get_group_no(SYSFS_FSL_MC_DEVICES, container, &groupid); + if (ret == 0) { + RTE_LOG(WARNING, EAL, " %s not managed by VFIO driver, skipping\n", + container); + return 1; + } + + /* if negative, something failed */ + if (ret < 0) + return -1; + + FSLMC_VFIO_LOG(DEBUG, "VFIO iommu group id = %d", groupid); + + /* Check if group already exists */ + for (i = 0; i < VFIO_MAX_GRP; i++) { + group = &vfio_groups[i]; + if (group->groupid == groupid) { + FSLMC_VFIO_LOG(ERR, "groupid already exists %d", + groupid); + return 0; + } + } + + /* get the actual group fd */ + group->fd = vfio_get_group_fd(groupid); + if (group->fd < 0) + return -1; + + /* + * at this point, we know that this group is viable (meaning, all devices + * are either bound to VFIO or not bound to anything) + */ + + if (ioctl(group->fd, VFIO_GROUP_GET_STATUS, &status)) { + FSLMC_VFIO_LOG(ERR, " VFIO error getting group status"); + close(group->fd); + return -1; + } + if (!(status.flags & VFIO_GROUP_FLAGS_VIABLE)) { + FSLMC_VFIO_LOG(ERR, "VFIO group not viable"); + close(group->fd); + return -1; + } + /* Since Group is VIABLE, Store the groupid */ + group->groupid = groupid; + + /* check if group does not have a container yet */ + if (!(status.flags & VFIO_GROUP_FLAGS_CONTAINER_SET)) { + /* Now connect this IOMMU group to given container */ + if (vfio_connect_container(group)) { + FSLMC_VFIO_LOG(ERR, "VFIO error connecting container" + " with groupid %d", groupid); + close(group->fd); + return -1; + } + } + + /* Get Device information */ + ret = ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, container); + if (ret < 0) { + FSLMC_VFIO_LOG(ERR, "VFIO error getting device %s fd from" + " group %d", container, group->groupid); + return ret; + } + container_device_fd = ret; + FSLMC_VFIO_LOG(DEBUG, "VFIO Container FD is [0x%X]", + container_device_fd); + + return 0; +} diff --git a/drivers/bus/fslmc/fslmc_vfio.h b/drivers/bus/fslmc/fslmc_vfio.h new file mode 100644 index 0000000..c5a42fe --- /dev/null +++ b/drivers/bus/fslmc/fslmc_vfio.h @@ -0,0 +1,74 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved. + * 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 Freescale Semiconductor, Inc 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. + */ + +#ifndef _FSLMC_VFIO_H_ +#define _FSLMC_VFIO_H_ + +#include "eal_vfio.h" + +#define DPAA2_VENDOR_ID 0x1957 +#define DPAA2_MC_DPNI_DEVID 7 +#define DPAA2_MC_DPSECI_DEVID 3 + +#define VFIO_MAX_GRP 1 + +typedef struct fslmc_vfio_device { + int fd; /* fslmc root container device ?? */ + int index; /*index of child object */ + struct fslmc_vfio_device *child; /* Child object */ +} fslmc_vfio_device; + +typedef struct fslmc_vfio_group { + int fd; /* /dev/vfio/"groupid" */ + int groupid; + struct fslmc_vfio_container *container; + int object_index; + struct fslmc_vfio_device *vfio_device; +} fslmc_vfio_group; + +typedef struct fslmc_vfio_container { + int fd; /* /dev/vfio/vfio */ + int used; + int index; /* index in group list */ + struct fslmc_vfio_group *group_list[VFIO_MAX_GRP]; +} fslmc_vfio_container; + +int vfio_dmamap_mem_region( + uint64_t vaddr, + uint64_t iova, + uint64_t size); + +int fslmc_vfio_setup_group(void); +int fslmc_vfio_process_group(struct rte_bus *bus); + +#endif /* _FSLMC_VFIO_H_ */ diff --git a/drivers/bus/fslmc/rte_pmd_fslmcbus_version.map b/drivers/bus/fslmc/rte_pmd_fslmcbus_version.map index c4b3408..411200c 100644 --- a/drivers/bus/fslmc/rte_pmd_fslmcbus_version.map +++ b/drivers/bus/fslmc/rte_pmd_fslmcbus_version.map @@ -45,8 +45,10 @@ DPDK_17.02 { dpseci_open; dpseci_reset; dpseci_set_rx_queue; + mcp_ptr_list; rte_fslmc_driver_register; rte_fslmc_driver_unregister; + vfio_dmamap_mem_region; local: *; }; -- 2.7.4