From patchwork Mon Aug 14 16:10:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shukla X-Patchwork-Id: 27592 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 E58359179; Mon, 14 Aug 2017 18:13:21 +0200 (CEST) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0053.outbound.protection.outlook.com [104.47.32.53]) by dpdk.org (Postfix) with ESMTP id 359B39153 for ; Mon, 14 Aug 2017 18:13:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ZjvNwtVIDFQTVuPPLOb9/uKy2HebSubzUNOm+AZNsj0=; b=FAgCLI5hQCdAC0Ev0LN11J2XKl89JmF7JHiz83yIrl8RQsuN/hy26945QP25aj2POXL9M6zK6HQ4zcTHEtlugBK1DqdOav+UccS9vL7WSE4TsN+wbhS7IHfEW5/CEPDwkfABSJC8ir7HHSzHMkmJFhCyPlJVN44EaxM5CzS5zPM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Santosh.Shukla@cavium.com; Received: from localhost.localdomain (14.140.2.178) by CY4PR07MB3093.namprd07.prod.outlook.com (10.172.115.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1341.21; Mon, 14 Aug 2017 16:13:14 +0000 From: Santosh Shukla To: dev@dpdk.org Cc: olivier.matz@6wind.com, thomas@monjalon.net, jerin.jacob@caviumnetworks.com, hemant.agrawal@nxp.com, maxime.coquelin@redhat.com, sergio.gonzalez.monroy@intel.com, bruce.richardson@intel.com, shreyansh.jain@nxp.com, gaetan.rivet@6wind.com, anatoly.burakov@intel.com, stephen@networkplumber.org, Santosh Shukla Date: Mon, 14 Aug 2017 21:40:59 +0530 Message-Id: <20170814161059.6684-13-santosh.shukla@caviumnetworks.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170814161059.6684-1-santosh.shukla@caviumnetworks.com> References: <20170724084004.25542-1-santosh.shukla@caviumnetworks.com> <20170814161059.6684-1-santosh.shukla@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [14.140.2.178] X-ClientProxiedBy: PN1PR01CA0087.INDPRD01.PROD.OUTLOOK.COM (10.174.144.155) To CY4PR07MB3093.namprd07.prod.outlook.com (10.172.115.7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd634e58-2866-47b8-8807-08d4e32f60b3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR07MB3093; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3093; 3:4VY7CSQ/bjRySwWZZEG65hQV+nkBOeNztF0Z/9a0//fzFxHoCCjci3iSP0zIooSVJr7FeTFf5yZUAC6z6oabbPV2T99DsJvsSq7hxiD8TuibxtPFsQyU8skGHQenMfyn6xMBhchQboi5ke98Gs1XbeDPMIp+wgsjGufyxnPdtjWaei5Oeap3JuMJ0b9advhVXvGIiNfgjTkFW9l5sLv6UlhhW7jc/00u+Ch48SYnd4xmEFA2QiOfHS9hdIEEqG55; 25:DzGKe+FHxt0z8he96YAjSELbNH3iZe9TK3qI7fhuBxdThILe52oJbv/A45JZWHGnBAtvcJjcRF8ViXIdm9XcEGBryw/FNoodzFx05weirgQtw3YD0a9Hn8NQkYtKiWhR9dQW8rqzAAd6LqXvW9wh1vleR2Kx7Lyt1b0vhCpvccNIj49ASgA/aJc86L0+nSKR+o2xuzHOwG+OI0HBupRK8cYszMw3VEpcOdp8Hok26h203SOR7p0SotGhgBAPW87b4yXtT0GT3n0pbAkDbm9EWPgIANuRA+JGL/XSUMSF4PNKr6i4ZtOIV3nuQqX7gHTSzIJ3cr4sDaR7O21idQaA2g==; 31:U+ZmG8kqYU2Sfue1UL8xtReYWBhykm5Qqh31kmF8RZBG44y/+0U/lnJ3k34CPBF+VK+wIdA6rI3SZqz5fICvo9h5dZvQD7kmF85jMzGGUIOpwqD0On9jYgqO/OVXR0N0ja+fDiojVZoBQ5Jd8vfXFbw/tTrckODbQUyRCJ8NOy9jZ1ZHEB+3FtDfxfw7yatGGxyIvYRPXTXviuEX4rrcF/EA7giDYb6HcsLZiz5M4Lk= X-MS-TrafficTypeDiagnostic: CY4PR07MB3093: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3093; 20:YM3V0HENTSIaSJX0ko+uunNLlR85eDcd0QcpnP+IVJz6l5loDKxzJoV3vAiMlyTCWoxF0xcG2vHfDDZrEEDRRsIxzBJjDi+OgqBeZZtbHj9liW4oKNQxpaJewEpGs86QVZjAdiXVX7GZ/T0Uw7svy1NhVZxNBsqYwElGyHhnQA/B9AgcMHb/j3vZkENyRjo3TT8hpxkNb92glBeKP4clDtLYpYA8WH5gtvlqf4SkV9p4MXAaZ6DxNqHts2fMortDhW4ZhLkf+pypP9hYw8jPw061SO+0iZSQVKpyecWbxGFtT7DnnY5gAJ2bFlXUknTeHnwGbxvg7cddG6y26ww08yjezHMGx3TsoxBoeCWjAZzVepnP0X1nl5vNEz92Pas1Hp1vqydw/H1cLk6px3T4gIF6N+R6VENdmxijchuCjM27RTYEALELok/T6/JPCV/qhwPfJbqbnKZhs90fBONKP+3X3kb19zV7o9S7VqL7fowkgwlvx2EEkWWjPr3AdE0ekkDP3Qib60QJRNwJfERHTb2yZb58VscsYvkBMjv0mrIdRnsE1N6clE5oHLBOk8sCY2D5Ju0dCjjye0GATGZBTI9DbEhu/ygS8Y4cBPcPRHY=; 4:5sdXV/bSRBJegjmS4l50vxOIn+43/y3pKXozlQNSKz0y5T6ZsyY7bYjJwUzDzKWiY/iOrGBC7R3xwiy6tG13PU3KvfR1atO/AEiR+iXa85lVUE37TGIgpLdmdZFHWxdQXEylfC0Vozt3oUuAjOuaPOBnhIlM08vOwLNQwl9RRhkwz/tiqQrkTWQFotnqHOLAVdI7yfnoEcWTsmyesnPvoZaT13+ldb3QUYEJ/GyymnPpwfYuBRHYMd8gQ4HH0EWV X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(100000703101)(100105400095)(3002001)(10201501046)(6041248)(20161123562025)(20161123560025)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR07MB3093; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR07MB3093; X-Forefront-PRVS: 039975700A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6069001)(6009001)(189002)(199003)(76176999)(101416001)(1076002)(50986999)(8656003)(6116002)(66066001)(72206003)(7350300001)(5009440100003)(3846002)(107886003)(47776003)(110136004)(2361001)(8676002)(42186005)(6486002)(50466002)(48376002)(105586002)(106356001)(189998001)(4326008)(6506006)(5660300001)(2351001)(25786009)(6512007)(81156014)(478600001)(36756003)(33646002)(7416002)(5003940100001)(7736002)(305945005)(68736007)(97736004)(6666003)(50226002)(6916009)(42882006)(2906002)(2950100002)(81166006)(53936002)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3093; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3093; 23:rplrM4NkGydCyp3leuEVSqekxQWq0KyoJ1Ly5Oj/U?= P+gTda1sXiKyyJ/bOfptjEtkqj8j1ViAtApdA+ko0lSSxFV4WOLBKUCoKCRuoiyLomZ1/+4SWEiT4APIy/3Hu/hlgImucCueegKJMqbDLiVT3ULpHK82anOciacs8Jxso04FMwGYZE8eVRpK52Mpm5Hfj6kX6CfVL7pLPhgZmCUB3LnRZU9aXFBcudb2D+WGENY1GZ9yERLBx1JNFrkd8IyAmXbY+E8W01gzGqUerC7leAo4/v1TXrD7Mjl2KQr07z3iNtJQSiknnVxeVkTU/0XmKx5ebtCJ7tzAIXS9SZb6uYH7nFrzZrbgtgQU+lXhaTt7Kg3+4n4kM7F6eC+Z5R0bjdmACU0zE6wIih98pM+9TqEWRqq7oThQbtsLT09NlLZPwZB8jwe0DRv1Cw/wNw8xrHfnlrBmwgTbQzs4PnkpWfgwKy+okMky3zpnRHXMvLYn6F4F6fCM6b1RJ9gL9JyfTFLMr4KoGj3ZistMEtduh0w7TFhgDSAIQmtOs52zAKqSWqW69XpcAzUazWbryUw9pzNEHggEPU+iEEv8udGqR4uI6e+RxvTx0gWeEReKS61NPEkT/rT6W0F2PAkncKFhMtRSWsMOLYahYUlmB6lmulY5mNW12pnJdiFXcJTyBVDNOPLH2y9Zqn5nF2CTva1JM4v/4lsklQBi0gMbe/752SOQZmN5yWUj7s3MteO22E7uMEBhpPWMPPacv7iaUNkFtGWODYj7cSbnXZd2jl/ozwjOyaaph5wDDuFkS4BuN4UU2YkvCwNJs0yEgGa4VE4guMNyjkkSpLlNCzI71V70ZT3mr1QV8cEASpd3PwkDGR1xq7y/7XLTheJuTHK7yW4+oFrXboUIhZo3bXVj1IzmEyHsWRfhNyNcgTCTXMSCZik6TxcT21B9VojjPLiuqIsLsgxVqswdto8njtFzXHe9arN20xs5vhaup0B4IshSyM/3z7fmLNgXDxt3cVLvtY9j5YaL2pR2ZMOobCL4ZVvegceZauOBmdgo3QTEGm7M44nJsGP5zivuMo8qzgj9XW9KsGUDfA52/c91F1FScpjIrX+kHfG3os+BPbcKWRxwTSTq/lVQBVEkopVFruJmegQ/NldebpDLvOFmdyU+UiRbgzEzftJwdCvOTd00BPjW7v0ebf5dtTIl5i893EuIkQENadjmirJJY1DXq+2TXys518pZAywK6u0lFzuNPI7CbUwfMTl9uh7EdiUlPlRakRy3M6H6cHmCroZpWCgqoTgOQ== X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3093; 6:ZrPQeq0u3EqNvo7VacEalrZD7sXPvuP9kmARFu7grFq5svmXTIzzUUOG3YLSWFC7Cvy4IueSV0JET9U2MLeZ9d6WJoXze9QBmZ2I0XIBzyZ5I/X1wI0/eCmb5YqNhUhftQHZiJRPTTrjmXOj9pXFLXekgMznhN/fwV4guPttvCsob554zCMCKCEGMzyzbsUzsQXUU4YNxhFTFSAeSRZQuciwOQuUudXvdEpKOVVUB1SLnb+uB1+1k6joY93U8GWmElGAOvbzgCQ8Ap8sDRoJ+jZikmFfi9C8n97FNdLBRqVWxA04Xoe8STa+54ZZcgFlWc0Vg03eWe4cTtxk/8DrPA==; 5:7/OIqGiZd0oo3d7YcQw+a38vY0MmaJqrLS8uVk05KhGXtdWDnEDxFQKjdSTQsLjBz4xJseL6dyLNRzy5a94bMC4RfBMqx/GTPuI4amO+QVv3dR1jvI3TCFZNxQF/d0ThCSLjQRhuAPm8dgAanRwnvQ==; 24:cfRvtFQwRRMalSNQ3iL8zDYXHKuBeP4t9XE+8RybaymFjDc7toVTXomWlZSbz5iRang03EgjhkMDP234HdVULUK44OAoQ4yMHEnFil3PmpI=; 7:/Ys2L0LBGp2l3cydm9AqN9HsrnxOFklI1tASZz9u7ijthkSCSlHS43sb47SuxmWpz4lFlBrGQvEF03EmU87B+raJW5XT5yh5UkiYYkIHBQxROgeWVg9Wm71vdYYH2wAxnRYQFOaiXcGfcwJ3ErXMICRv3OS+LUEoxFWmxRiRoPMNMoKgKBsMHLD13MEAAFjQK3eqkxmdzh38qKq0U3oc/x0i2S4pgjpOpx0CYOFt1IY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2017 16:13:14.2928 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3093 Subject: [dpdk-dev] [PATCH v6 12/12] eal/rte_malloc: honor iova mode in virt2phy 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" Check iova mode and accordingly return phy addr. Signed-off-by: Santosh Shukla Signed-off-by: Jerin Jacob Reviewed-by: Maxime Coquelin --- lib/librte_eal/common/rte_malloc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c index 5c0627bf4..d65c05a4d 100644 --- a/lib/librte_eal/common/rte_malloc.c +++ b/lib/librte_eal/common/rte_malloc.c @@ -251,10 +251,17 @@ rte_malloc_set_limit(__rte_unused const char *type, phys_addr_t rte_malloc_virt2phy(const void *addr) { + phys_addr_t paddr; const struct malloc_elem *elem = malloc_elem_from_data(addr); if (elem == NULL) return RTE_BAD_PHYS_ADDR; if (elem->ms->phys_addr == RTE_BAD_PHYS_ADDR) return RTE_BAD_PHYS_ADDR; - return elem->ms->phys_addr + ((uintptr_t)addr - (uintptr_t)elem->ms->addr); + + if (rte_eal_iova_mode() == RTE_IOVA_VA) + paddr = (uintptr_t)addr; + else + paddr = elem->ms->phys_addr + + ((uintptr_t)addr - (uintptr_t)elem->ms->addr); + return paddr; }