From patchwork Tue Oct 10 09:34:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 30028 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 309C41B202; Tue, 10 Oct 2017 11:22:55 +0200 (CEST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0082.outbound.protection.outlook.com [104.47.41.82]) by dpdk.org (Postfix) with ESMTP id 8CBB81B1FD for ; Tue, 10 Oct 2017 11:22:53 +0200 (CEST) Received: from BN3PR03CA0056.namprd03.prod.outlook.com (10.167.1.144) by CY4PR03MB2696.namprd03.prod.outlook.com (10.173.43.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 10 Oct 2017 09:22:51 +0000 Received: from BL2FFO11OLC016.protection.gbl (2a01:111:f400:7c09::184) by BN3PR03CA0056.outlook.office365.com (2a01:111:e400:7a4d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Tue, 10 Oct 2017 09:22:51 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp1.onmicrosoft.com; dkim=none (message not signed) header.d=none;nxp1.onmicrosoft.com; dmarc=fail action=none header.from=nxp.com; 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 BL2FFO11OLC016.mail.protection.outlook.com (10.173.160.82) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Tue, 10 Oct 2017 09:22:51 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.39]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v9A9Mkxc032048; Tue, 10 Oct 2017 02:22:47 -0700 From: Shreyansh Jain To: CC: , , , Shreyansh Jain , Date: Tue, 10 Oct 2017 15:04:58 +0530 Message-ID: <20171010093458.19861-1-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171010070155.17412-1-shreyansh.jain@nxp.com> References: <20171010070155.17412-1-shreyansh.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131521009716615286; (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)(7966004)(376002)(39380400002)(346002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(8656003)(106466001)(2950100002)(498600001)(8936002)(2351001)(6916009)(33646002)(316002)(50466002)(85426001)(36756003)(97736004)(16586007)(4326008)(54906003)(53936002)(5660300001)(69596002)(48376002)(50226002)(189998001)(68736007)(5003940100001)(50986999)(356003)(104016004)(105606002)(81156014)(81166006)(6666003)(1076002)(77096006)(76176999)(86362001)(575784001)(8676002)(47776003)(2906002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2696; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC016; 1:R53lQKlc2VfFY0TGVa1k2ZS0OqgkLPZJIeIppYHcMIl+IykvAxP+UkVQ0V+vbmwU6gz7YGXykxNxfeMumcCtvsGQZOpDi6WDsEe78W3Y+28EF+hQH62j8DqeWgu1xFvX MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9f2d050-fff8-4e8c-d876-08d50fc07b1f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017052603199)(201703131430075)(201703131517081); SRVR:CY4PR03MB2696; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2696; 3:/V8FLaxpEsJJTmvphs+mfACjJXb4JDV1zvPJKXkhgEvewV6as7if4LTmNWy1WM+ztrqw0U++IGja40o+6NJLobBwgQA35brcntDr/sWUMqIWJIU8tcvWZ0CUxHbOshsBcaITWLgrfkcsNZnfgjWtYbXQQGI9+aTuqAKMTpY0Pd420J87cACjQ923J5fOFlBdQp38gIuOLjJIq/0lHqVXP0V9dz1D3JO6zPyTCCbHHwti4wws/KHQFEH3SjoDaC13FwZ8U9QNJw7Yeta7STUCLhv/uQM6gxDV1YYQ1Xb7NUHyNC6hB6Ob4jc6PY1pkmtcJna1qPUNTo/Zcs8WJ4bLrg==; 25:uPpyOTC91TjkNmzEE/Tx1+ebfpA9sycq9LSZfzXyDYZZtSCkYmP2fq6JE8+HxrND8i98aO4YBduvYsD/lgrCSRcFK3P2a9XRSGzx1WLNOpHdnUzZeaUmHRZA12d8uY/aaQpyK/iEqHQGCBWp31odiAR1yHe9RKY8BBlWa9Gn6KCWuh9SjNOimLriDyiRuLAl+XMeNXNEVrGkinx9cnz2v0Oc8mfheh6tXL9JhtrYVovD3cMT4D3JNi7j7KP00rOTadzgO01yaOOpaNugTxpOnu1/OBkiXqm85LfvB1yXpdhKpvq3LXJwBc5TpwtDiKJTEgqCBhdjUxB7/EY8YFzAMQ==; 31:Tp7xgZ/uH9skpwFt2/X8YjqBAzx5JuXBB3VTHZ7Xrl46IsCqJU6FqPi+cQXU1XX8i4ZBw8vc9pdzY9LsPbrBCm2N8uw6zPW9Thwm0baKeRKIVBVjv0ADmY8MERpzSP83N2MDTlfOUBSwqtMSTgv4XspQEU4WDfweS5dlpW50yuzAa3d0z8vqrScGmUHCLlEbxQK3YvfQ2hkfe/7orTt5WnwOrGmbmOuQs6cG8uuvSio= X-MS-TrafficTypeDiagnostic: CY4PR03MB2696: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123559100)(20161123556025)(20161123565025)(20161123561025)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR03MB2696; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR03MB2696; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2696; 4:mUiYRrJEYeZhw17eEddV0iEKOeSrBsOMWl3Dg/cvbfs8HKOfXUxuVCQ/qRzJlFDNpqQzBrSBe8nvTJivagMSZ0oxK0mNliiDsgTfe/IiX70XKk3WVgOD3EgEuXQDye7ys6AhEl98VgHC4NDKhq8Zor1JuNDmepI64EnVnzSEro0oKcMkuV4+SJnKzaNKd82zWkLAtDYZ0jtijhdCm6zu83TxBTClxA068V6gRv+D6x0wuX8PMoaL766Jg+pXknEwNqbGcV+QEz18to/ke+HFe00XqnX4uZ6hq+QqGiRzd9k= X-Forefront-PRVS: 04569283F9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2696; 23:zONYBPSK+6IAty5X8fvNyJgiso0/wPv/we+uui11a?= +qC82lU+1YyN0ios0s/+dYc4dn/FeSkXMqM3tqE+ei6WsWFbP1uRzEraWb+kJzog8vftYubuP3W+hZmgL+alemGdwsl9osHdmr4UV09zM2jaCY5uCjIL8rbGUCZbck9ZOUAUJOLqOYGBgSvGCOVIzEHq7U9kEc0E/OSYmwi9IpfTLedQbeQ/cpTJz4Gkji2kbKqQ/INqYJ6dGLCTx6vsCnSGUosj/zD/9LTkkrR1+AZh9zcxpviWTcvH/oATsqxFazHOu2eZE+kQn2XBb8R84pLFQ9Ebrw2t/vHQchVRNknM9ehNVU4PxQU9XNjK0qgJKz4evaBJEFpRfoh6rq+rsNhue0LWVWXoo3imvz2NVnz/4EmFSz7xe1uaB8PRIBT3wnlbWxS7slz8QUalmt5Uec/l/qD+ZnhkWxisAjWnySQXs4DhTkOzym4+wr4wQhpFtBZPlVBT1AJmmTK5+HxH9R6Z+gw+YXzFvorwytwm1cgwsozLKQFmCK8I3iGIXnDGSNH+O+VmKXOD9v2E4a+CejOKYokzDTAvxs4R/7e/u/Lk/y0PhhxankfN0q4ujrxhgTeQzP0/SnJexHTgEOShMI5AYp56Kta6G6vHDWyIUvpV3Y16L9/GMiQ8NpjSRbcrxIfaQQ9tcSRU8/NfKy3cTsHzwI/DAlGDCHk5sdfKAKjrqDPT2zc/QrGxLNtPNp4kSSQYKrsokXBxTpITvAcoSAGtCXCqCGMofq9KtM15GKei37xyXGhLlAtoUlyZ13iO9G8D6e+Ob06pzaDvTRrqhAJ9zzGrBmzZCqnOclHQVFV4fqt9c5z36/BI43Cz8RP3zPnD6idOFrcSyh72isptudOIIDRw2axIfTCdzRChFT4/bfj7bjnZSN1RAN4kTZbEDWBy53RuefujdqYd+ReaEoDCo/NT88x007FsQLAkG7pqzmNkoeJJEf9BdrnWotSMTGEh0NrkkxB8b7eHaXoR6p3iwXSy8QElgnftnVm4kHtlBLonxTLmVky8797reBsoraZobbgh4RUHS+pcywHAxhfQjH5weJ60o42IDR8rPWbgPqgL4Hl/UQqsF02G1ivW1ihGBphik4h6w7ZaXRCiO77TI1GiKCBwn8gh2Zq5UwpIlEtC7xar07RKMCLIQGSVzwZUuOYzNVfmNgXyjwY8+jZc1UnrPA6NDghSSZf+hwuLcjtJzzVgimEzCC8jd/UV7U= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2696; 6:rutkcOUJ7x4XhrohljW2mZZXTOWxPqkm5v4LUJ+M6La9T3o6Bi+VVMpGTK1B6mha8Xax7vwp/qK4ejsMQw5bcsb07CN5Y2WTWxm1Wd+B0wTKrh0j/eUOQOJNdMh44MDYK0dqZsPSdpBIzypWwBXQPC11utr5SJQGgya/tCL91kqK7dA3OWIrbc4Z+TT12JR5T6AwnrbnMVYJ4mppyrJg+6OFg+YQ4x70aUzYM34ZX+8Qsi2X829j26zKUr/0H8OlK8tNcZYy4u8HasDbp36DMZtf1rkZijH7ngL5O2t2oh9NHa5uJWotTZxsY1j1YSS1DhgPecmAVlAckYBrF6o/6g==; 5:mkPmAj8ls8mqEDTfWmiTPjWBb6ujdwXQ6BqfUhZtBsG5drmV+j4lpPJcbgwCyxMOaZNAb9ZCmlAF04QTWu8viAx24fHHvKuGy4hOioKaVO83JbD/K7k1sC3J1DpH5A62L12fjObxUWQHOK6/vZys1A==; 24:7Uy/swemuRrwb1FDLSwROvA1IR4aBcQz8SAkSqqNFVqMPMHR2Bk0CSadKjoLbx0/JvL5Pjea86oHg1OKR0NtfM0EDmHGTaWV/FDgkVK2DDA=; 7:wSKrxlFmCBhtEM1p+w4SxAQrtTK0tJ2DY5wlt8OtAx0uHhhtrXPJCNCBTY7582mQWJYJINxy9sPrGRXlDobmVN7jGGykH8s5P6zQodlMQW+Qq58Q4plubY5xUkjahEft2SW/euU7S6JmdvemCfijMVCMMB9fqF41Nn8EPfiz2PqYmAGciEVLtPgLml06y/8YxV7oub3dxI12bSHdXn1VZoLS+9dYyBQAF7UztvIc/oQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2017 09:22:51.4275 (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: CY4PR03MB2696 Subject: [dpdk-dev] [PATCH v2] bus/dpaa: fix memory allocation during bus scan 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" With the IOVA auto detection changes, bus scan is performed before memory initialization. DPAA bus scan must not use rte_malloc in its path. Fixes: cf408c22476c ("eal: auto detect IOVA mode") Cc: santosh.shukla@caviumnetworks.com Signed-off-by: Shreyansh Jain --- v2: Changed the Fixes line to correct commit Correct position of fixes line drivers/bus/dpaa/base/fman/fman.c | 15 ++++++++------- drivers/net/dpaa/dpaa_ethdev.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c index d0a8ee4..3816dba 100644 --- a/drivers/bus/dpaa/base/fman/fman.c +++ b/drivers/bus/dpaa/base/fman/fman.c @@ -42,8 +42,6 @@ #include #include -#include - /* This header declares the driver interface we implement */ #include #include @@ -72,15 +70,18 @@ if_destructor(struct __fman_if *__if) { struct fman_if_bpool *bp, *tmpbp; + if (!__if) + return; + if (__if->__if.mac_type == fman_offline) goto cleanup; list_for_each_entry_safe(bp, tmpbp, &__if->__if.bpool_list, node) { list_del(&bp->node); - rte_free(bp); + free(bp); } cleanup: - rte_free(__if); + free(__if); } static int @@ -208,7 +209,7 @@ fman_if_init(const struct device_node *dpa_node) mprop = "fsl,fman-mac"; /* Allocate an object for this network interface */ - __if = rte_malloc(NULL, sizeof(*__if), RTE_CACHE_LINE_SIZE); + __if = malloc(sizeof(*__if)); if (!__if) { FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*__if)); goto err; @@ -464,7 +465,7 @@ fman_if_init(const struct device_node *dpa_node) uint64_t bpool_host[6] = {0}; const char *pname; /* Allocate an object for the pool */ - bpool = rte_malloc(NULL, sizeof(*bpool), RTE_CACHE_LINE_SIZE); + bpool = malloc(sizeof(*bpool)); if (!bpool) { FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*bpool)); goto err; @@ -603,7 +604,7 @@ fman_finish(void) -errno, strerror(errno)); printf("Tearing down %s\n", __if->node_path); list_del(&__if->__if.node); - rte_free(__if); + free(__if); } close(fman_ccsr_map_fd); diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 8dad97e..9f33e44 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -921,7 +921,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) /* reset bpool list, initialize bpool dynamically */ list_for_each_entry_safe(bp, tmp_bp, &cfg->fman_if->bpool_list, node) { list_del(&bp->node); - rte_free(bp); + free(bp); } /* Populate ethdev structure */