From patchwork Fri Oct 6 11:03:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shukla X-Patchwork-Id: 29805 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 3904F1B2E6; Fri, 6 Oct 2017 13:05:09 +0200 (CEST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0061.outbound.protection.outlook.com [104.47.41.61]) by dpdk.org (Postfix) with ESMTP id BB89D1B2D2 for ; Fri, 6 Oct 2017 13:05:07 +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=clSTg82Kp4vXYcwKU8p4SlOuWZnlZFmuycLCnNrCmsw=; b=SZJRq98J5KTa/d2YBemJnk6DFhHmuzTxr+RTckKUEohkZCI01RvI1Qhjsjdq/44bg4XThat+g+24CQWsAZiWlAyOwXVyestyzUI1FGEIN10gS8oaHoV5se05Xyce3Yw2gXfTGZTT27mkxD+DV9WdLozkIZk2IcyHTQqb2l7L8mY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Santosh.Shukla@cavium.com; Received: from localhost.localdomain (111.93.218.67) by CY4PR07MB3094.namprd07.prod.outlook.com (10.172.115.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 6 Oct 2017 11:05:00 +0000 From: Santosh Shukla To: olivier.matz@6wind.com, dev@dpdk.org Cc: thomas@monjalon.net, jerin.jacob@caviumnetworks.com, hemant.agrawal@nxp.com, aconole@redhat.com, stephen@networkplumber.org, anatoly.burakov@intel.com, gaetan.rivet@6wind.com, shreyansh.jain@nxp.com, bruce.richardson@intel.com, sergio.gonzalez.monroy@intel.com, maxime.coquelin@redhat.com, Santosh Shukla Date: Fri, 6 Oct 2017 16:33:46 +0530 Message-Id: <20171006110346.13247-10-santosh.shukla@caviumnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171006110346.13247-1-santosh.shukla@caviumnetworks.com> References: <20170920112356.17629-1-santosh.shukla@caviumnetworks.com> <20171006110346.13247-1-santosh.shukla@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: CY4PR1201CA0022.namprd12.prod.outlook.com (10.172.75.32) To CY4PR07MB3094.namprd07.prod.outlook.com (10.172.115.8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be4b04d0-ab08-4d60-37f0-08d50caa19b9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:CY4PR07MB3094; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3094; 3:UGr61nzTlhxdKEnFDaD/cbsC4QCs5xkrrH6rYpv/GBQIHfV80CJ4XZ0fqI0REG8/MOLzXoPtwCYyd+1WveI1VL2Ml3NlmTczr8UcwbMtWA6CZhDHgK6ESUWwYa6ojpQb+Hwi4X5v+d/xgZGreXl9F631rgQJn4KKATWjl6RBd/tVpN4YNWHTmr6BfjfyQ4zUmOao173jEGUbWQ8g/XSVc0Mouz8V5uWoNtiVxQ7h6Cza0rbEmMr4E2Zvo5ktOEBI; 25:RdqBbaE7pyPR23PLrr6U1RGNSuHrx6S3luIFVlHhtKPHTsgL5Hg79VmU/RNNdOydmDrOUGpa5rmRpotRdG0ZwzQ8bsvE2291uAGzU02fr97M1FXK19lMhgALDklOcc8sKnGgg4Hps5pbdaQDc2TkRj4lWOlNTfmreeDaWuApWpKWXBOhKF54z0i/n2QS32RGmk2HdPO8pS1Dk9NOOg0QBO7gKoWt0tSrYXde0o/XBQfEzZuh8ZCgC9JsDoWGE62KLBJtfEYjD6rfjKXkk3/pgrEnvWDPEg2PR7F7IceSnOmhZAj/k8CmHm7M28nYH2/aIgEdfSGMVHRgdfdvpRc+qQ==; 31:Z2ePe2s00rQJuIFWNuwxJYeTOtEjetG8qWLD0PfP3nTC7FVOkaTF1rQFXPdSSXKC0xnJvMAzTXD2VJRmVG5+6uf0tAMLfszD7Uysw/lwuzZf5igT8+rzseEvwTrpzIJUVdrbST68tArx4ZHXxxpTy41bjZfZAmlBopoYLBAHA/5CM9a/l98Bll9mndLTVq3lIk6rk3nchm08WpVBQJsV1/tAeu7Wox3geF5dNh3ixBg= X-MS-TrafficTypeDiagnostic: CY4PR07MB3094: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3094; 20:FuErmQ330azRZu2/pAHBsHXVg2JMIp3+0sXlibwFa2kcThUDAY9Mdu0gh+SxTECuq3ZmhUOGJ09MLDr8w0xvBKujzL6FkmDTLk5wqTUn+hrQF9Sno6z1SX+KCk6YZ9b9+2wFqW9n/wosz9s4qmN/DmcBOxvQGJSqLL2FGc0XewZn/F5Ubrq8UnrM+TuFgTUQAFWsG6n8TTsJ3ara0Y8vL5UQLYw6nWNTuHgKaPkx6ZzayvcorXox269pIs/VVwppvaNpNMolsm9DMJ3/Z12kjFkAZfTIWryurIOluUheU+UCiHU9M5GeGlD/98VPTSULgZiF0nfhG0K0eRWUf4v9mQuE39QJVzSlCo7VfDdMZcwjvyilCgQCpSpm+/k+xVf2w3CChEi01bZCUFFcA6aX/P2VLoS/QIe+1XiYjo0lu3rvDZ+kpNZ1JfxlKKClbE9T8qaJNUcuKDg7UvR6snIMqGu9Cwd87gZ6zywdODIxcw6bn7aUhNrzNtGWRqHeW57Ip1WfYTLsSqML4oUU6vThPNGznmx3Z9n0WkBbKyurJVXdRTsDmMXWh9dZuETBR20IG0GRQv7hkYFbtROAyk+f37hwJHMpLvUwvafAKgtZ7v4= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(6041248)(20161123555025)(20161123564025)(20161123560025)(20161123558100)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR07MB3094; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR07MB3094; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3094; 4:WlW66XRxXbN0FbJhGtifckP3FP5i7IiXYCeNse3U7NYKtGXhFRYWtS6955n1gXz0mBHt43nHFgbW7BJUB9E3k37FU7ENr4ZF9BrQL7wDV+IRpX+pfz2DROKcAc+svrBTe73WP7CQlc2ay+RrMSkR5dIbHn8MDmL7OBoJHv0qeHCS207tuLuTlK+owuX8/oSWQyIhCPDSyMvyBDu+/L0qM3qk0UKHbC4lQMOCpn0xBVUkZOFUKzAPgvuTJnLxB0lmUFSx7hZlZPXtGwIQfLa+E56UEbhz64Yzf6uRWVXSaXckaZuv41MtMQHFjmtxZbUY2RMeA5HZMSrKY027iIETdA== X-Forefront-PRVS: 0452022BE1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(6069001)(346002)(376002)(189002)(199003)(97736004)(2950100002)(5660300001)(7416002)(105586002)(6512007)(53936002)(106356001)(478600001)(6666003)(50226002)(189998001)(8936002)(25786009)(81166006)(81156014)(8676002)(107886003)(2906002)(5003940100001)(6486002)(76176999)(305945005)(8656003)(50466002)(36756003)(4326008)(1076002)(68736007)(48376002)(7736002)(72206003)(3846002)(6506006)(316002)(33646002)(16526018)(5009440100003)(101416001)(66066001)(6116002)(47776003)(16586007)(50986999)(42882006); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3094; 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; CY4PR07MB3094; 23:k4OHTfjpQ9Nubm3YOipTmQGbWhCFbibKIpnvJXSO7?= 0R1HPvav1Ub1nAVkRkcK8SwpeGB6Pgw3ZazRFOt63XNJR3u8yJ5Serp8i6D6T3qRkoi7gVJUT2mPJKjY081RtB2MmfgWlifeAdjrXynkqQOySBSC5pzttnuEElR7Ax89IKNNCiJQzczSIdzq/fTKTMo4PgGj65yhp00/gHLc0iin/ttSHfjmkdZenwPKdrsySrYwMlSPhDIGVUubnekM2svvFOlZNSLt2wfliIkSJbCY1T/QjMpgxE8agIUGrm9/Y8pqYyY8NVSF0vGuf1yVxcoLykmKJvAz7/e7AVVmKM35jN0KbVnufbP3NQAb6EkN2cZQWN/+yuW0X2CAcQkfLPNRV62Lntsjff6VLXRc5Hi9jL8wdUTNo2zCHqEOHq1mBs88L/Qa+g++OxCoPRtO64Enb8RMECYCSPKgwSaGgLR5BT/WccrStSqDIPbqJ1AC6ZC9JxAw+0ZLOIILG5BcMIjGU5cHFXO3FLwa8uOq0N4iL1Ciq/jOjGawDtxkkwNSSJzQ5v1TBg7/3Gmmd9+G3079xfEfCjQdFzeZzmWdbEhAIhOr+jKg/EznfdUikvuu/kx0+s77yLCLATYay3CJ046poIkhHInSPse/KrIDm/FAqgsfqtLee8tWsbqOTTzxveQVUXYlfbI24xERYbF4J15Qqy+6cjL8w1c7f3luKXF3NZLDuvXu2EhwN2tgVzeOTle6lAOcStgLyc7sKiwrqYTfX6E5A+p2mMI1axmnipdt95HBmIh0+xqvk8/N1QT68Ah4JrPmuCZb6PLr3AqX1l/9pQdkWTYemR/q+C4kcJ3Gu6978sidenPyrS4QZ5ja46leqolvuHXaIx+7GrfKzoHe8fNugs51C3r1S7nmcj6lq0AXa2eBYc/DFpfXkW2dcIOWa63McjIGor2QvReRuqw9n1lukt0hw0ZLWs88mMGe+9OKSdW/WXlR0y1/IuuQBRE97SYQ9uDPwR3U4+nbtEdXcuCD+2pvpgwl6iyw7mR+zZWDjuzatEFatWMldbTu+PdH2w3iEqU3RIFzfmQl9qVwLwv5D0l6BrKXFrUVD9eACl7jWARpY0XfivItaRto/TJRxSj5BLUlKj/oMt43NbzDG7YIMODjEbLdomzawg4t/OB/PlIJBFUCR6Y3KLh+Ac= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3094; 6:uYfMbc/yLgnij43qk/FwAL5zxVdmmVRc+Ymit1HOMeliNVipAVqtdEd1GrOj1Ix4v1cp5C8bRxSgpJPWfw+quulb1WseYsNyWs3Z/8AnHCrCykTXx7S+UJgTH8vv/zxgpj8G0E7OVDyo/w4F2p3uzTeDHsxJsrYXAK4Lhz9Y3Rg49K/KdZsVbbWiDv7H7pkZZNVZuqW5pt2Wz9SphSwVePVyyOIQ37yiIOmMKdtzQyDxRgCycOqtdLSyDtUWjlTeKBGB61EoaqonZj/EtH/9McznEk1vTTkEluRCyLO8sLO5iGpP12H974L21H9TXTpmvY/KkSNMQNUaikvWHIi8sA==; 5:P85d/fU2ToQvVT1D0SKLHIQ0Mfx6asnnaprL6JfcIrHz+C8wOPxFlQuLCjDabgk93qh/lXPmGjEQctoYQ3RbyyGT9HKviRQlZpCoslG8LZve7Fx9Gh87AJA8mitnACUkmsaj1yzK9uikDdBBnk/n3A==; 24:NBqJ6MWM5emmFvv44mXBxnqIWKbU12EntuOjW7vCI0uNn7UkEsmZ7e+VaWW1whLANQKsRLW6j/DB4GQJ5sJdgt4AEs78ELlC6ttay2lPnho=; 7:8qbRiazlm2g7vmnEgjLfayMZDekwPPsCdxzG1bS7cCVCab8OVNz1jpCH3r5XkesO3+09dPs0O1oipzK21Yi+JLr3VISRdJrDrc6veI4BYAkuKBJX3EZmX1PRvHV1R+w/jAsi/E3LEGCTOv9d8Z/DuiLMuX8YDIomnTWrKQti7F2bqMuz2rmwQRXuuTNN3W4WsOTVxPtlX711v+tzRPlAO/+cXUmhNKftQ75ksUYCVXc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2017 11:05:00.6929 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3094 Subject: [dpdk-dev] [PATCH v10 9/9] 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 Reviewed-by: Anatoly Burakov Tested-by: Hemant Agrawal --- 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; }