From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <Santosh.Shukla@cavium.com>
Received: from NAM02-CY1-obe.outbound.protection.outlook.com
(mail-cys01nam02on0070.outbound.protection.outlook.com [104.47.37.70])
by dpdk.org (Postfix) with ESMTP id 704831AEF6
for <dev@dpdk.org>; Wed, 20 Sep 2017 13:25:38 +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=bAEkPIm1JFPcWRSD73FbY1Xo0RqdPOzc9jkd3mUj3f0QP2G19/jMOvBgRgaSX0bunLYIsMjxtCak1dLheok6WLGMY9NggfDpNWbBdxf46l9LgW1r8uvGN2AAt1DR1bn/eJaf5o7QigectcPKD29kjkI9LgMznXrlHUg9tTs/NOA=
Authentication-Results: spf=none (sender IP is )
smtp.mailfrom=Santosh.Shukla@cavium.com;
Received: from localhost.localdomain (111.93.218.67) by
DM5PR07MB3098.namprd07.prod.outlook.com (10.172.85.8) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id
15.20.77.7; Wed, 20 Sep 2017 11:25:31 +0000
From: Santosh Shukla <santosh.shukla@caviumnetworks.com>
To: dev@dpdk.org
Cc: olivier.matz@6wind.com, 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 <santosh.shukla@caviumnetworks.com>
Date: Wed, 20 Sep 2017 16:53:56 +0530
Message-Id: <20170920112356.17629-10-santosh.shukla@caviumnetworks.com>
X-Mailer: git-send-email 2.14.1
In-Reply-To: <20170920112356.17629-1-santosh.shukla@caviumnetworks.com>
References: <20170918104234.9149-1-santosh.shukla@caviumnetworks.com>
<20170920112356.17629-1-santosh.shukla@caviumnetworks.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [111.93.218.67]
X-ClientProxiedBy: BM1PR01CA0076.INDPRD01.PROD.OUTLOOK.COM (10.174.208.144) To
DM5PR07MB3098.namprd07.prod.outlook.com (10.172.85.8)
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: c25fafe2-f8b9-47b5-024e-08d5001a50de
X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0;
RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);
SRVR:DM5PR07MB3098;
X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3098;
3:f8o1954263fzInnXRmmqTnDZRDWr0jmx/czuA2VlegyNnu5JHHP7aMka1vlEt04QmfQFAQXkg7r74j1QIdl0dud1bJYgysCYY2+QqU7zr3qTVEa33VskbGVVTjeS34AR3lZPG3/+uTRhJJVoPJTFG6PyX4ZPaXDPUqoM9IukL6AwTcI4jRX9sTq4hdBbwEur/2KsOk/v2zbHM6Xgau9ZhTFvOdVM52igTlv9rdChRtPzd7FNjZca06l7l9XyD6hc;
25:K4B1qk87JrxsWvCx+STrwYziJBWtK3X1YKOvIxvHj+1G1bo5JKMKkaSZ070LvEzZ0Q2EN0kdbzIKF6THfNYzdbHtdVy8H1BL398d6xgsiSJq0Fp+owyZGL7cQMsa8wErvXrZlsKpuHB2Vd3Utf31AnduBKPYrWGnNSFTYV1SyIBVu89Jeb/KgBIqIJasPUV5v5FF7fJhJ1nvQFvXuy3ZbaLZNAYDtKd7aQgAQuNidZnFguXLrYEEIEq7MwEuX+R61mO+o3X3jp7750k/sNDjho3wCp0EMO4L9vo9PyBph2dMdCCjZqOgz762T9MoAwOdsj+Ymfr6O/KZXqYy3bdcdQ==;
31:HxW8LyHSxi2BqOKvDXp6TILneNcGNi6JYocnYtGY+9LPy4eDXipSREFnvI/1jtBx0Hd7LkZ9Krvv+2tYVVIQJbmXjW9dQd020Tr/Gwcx18xTDK1+FQtUvnCmp8Sa2YRWf5qc8+XFGTTd9bcsp/6bRzInW2ueeKD2H+GOgxfNZkTpNTtg+3eZKzuq32jevCUpKcZh4oTzhnpKdL2+eArR4q+/nroRIlPLrPg4Hes6U1c=
X-MS-TrafficTypeDiagnostic: DM5PR07MB3098:
X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3098;
20:lY0HlZ9PNlTVe3FvHpxw3BTPYpZDvDz+eCvG3OEBLAi3ZB4LBiO0DqNHv8VjJu6+bU4aUtI5YXgGwDLpWfGlHsbnSUjRVXy/sC+5A4zKy1tWroj8az1lBYkIaKugqZP1ZiQefbzpwkSBh9FsuFOowp5TAGMFW7lTzD0rBEqV5I3YPu1rlramNG1T30GWHwr6EZZkJ27BbpyF/amwaXqjvdLCdPadA8Oa6W/36upzNPq2hu8KBZXjnOZji7j7aE7ugE0fzGV9R7+4Ud8ijt0st198HjyYQVhhDqWHkS7w0VJ/0WBsEQS4ffw94vdmWKoQaN0QNO/Znp8P3B/eXh61Fl9uGpAVNJ6cjSac5mNV/67m5d9+wKNsq/H7JYBbWm5rKKsDU/n+djxXTWFYWnpQwtVAtHe6NfHnYibcZJX+b0mbB8APYkLt7INatpGF9TcvdRjeiUO1kHjL9sseStP1c1bHt6owOCghtEVqp+8QkwesK7FVwMpZh+wkq5Tf52w1YDfUEugy6exKa/7IlH9Q6nnAAMkY3WaxiyMkupCUaywOLq3xiEz7Pym4VPLuTgXskHTfRGjUNE4ieFCL4tbjWb79ZJLTLiF0Wmfr9ZXEvHM=
X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(228905959029699);
X-Microsoft-Antispam-PRVS: <DM5PR07MB3098A4CF7F6A81647B2C0A46EA610@DM5PR07MB3098.namprd07.prod.outlook.com>
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(93006095)(3002001)(6041248)(20161123564025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);
SRVR:DM5PR07MB3098; BCL:0; PCL:0;
RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);
SRVR:DM5PR07MB3098;
X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3098;
4:Y6Nw+33s6ttDZIiEJEYuL+g5C9c2VN8Os+zAvJ76h0ZgrsPJWCnduyaw27LoO7ig3tFh/so/3dcwXGlP2wtNUOe1zcm0gfHvRt9b01rvSEIZ/HWQ5NCmsWFRMq2JJ06pxbD1ZVr2dDblxjXuT6bIR7XKebmVAJokRYfIgJII+VtqUU/lRbmVLo8GqdyZ9dsb1xaK03KloDD+VsZwzB1MQEvUEL9L33UQ3G/oUTS3DWT2BO7HAkyq4oHQSZyRvuWz/ICjkdGqRQ2bMVWwyvauLP4pmyrFgCi2CeQ77BUSioAqRLSPOotnfU+W09cD6OWvPU/G88k7jytArYVy9TnWDA==
X-Forefront-PRVS: 04362AC73B
X-Forefront-Antispam-Report: SFV:NSPM;
SFS:(10009020)(6009001)(6069001)(346002)(376002)(189002)(199003)(66066001)(3846002)(106356001)(8936002)(7736002)(2361001)(33646002)(6506006)(2351001)(47776003)(25786009)(105586002)(53936002)(6116002)(316002)(36756003)(6486002)(107886003)(68736007)(5009440100003)(6666003)(101416001)(6512007)(81156014)(81166006)(97736004)(4326008)(50986999)(76176999)(16526017)(8676002)(2906002)(16586007)(189998001)(305945005)(478600001)(72206003)(2950100002)(5003940100001)(1076002)(48376002)(50226002)(6916009)(42882006)(50466002)(5660300001)(8656003)(7416002);
DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3098; 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; DM5PR07MB3098;
23:T2tgNRQ86ACCMNws9L8639P93tUNcXyaztsiHtCao?=
=?us-ascii?Q?A2iA8ElW6uWf1ZSOXdhe72+qszn5Q5Mqsy3kURl1qZ4PBJz0PvONgLHD1g5I?=
=?us-ascii?Q?ZUqbTShz+gLYI3dPAkIxyVYxE5QS808Z07v9RN2JbRQaH7ZzjcuV3qS+Mopc?=
=?us-ascii?Q?wYadYYF2RWOzn47UPxDhDUdygiaPQ8kQr05LXPlRWTnyCDqq1BCNj/FHWYks?=
=?us-ascii?Q?3P3QMkLItcHYBy5HkEQ5ZjZiZUvAuX0z5gLMXelNi1aJv0omK61li53TwCys?=
=?us-ascii?Q?9aEWdZXih8tS+5mT4VgNlmVtMmOxkLhHjc/YJAK3F2LacBrvKqsnGg4GhTEO?=
=?us-ascii?Q?+XtJb2mWULUf2Y9OYsc+H0hVkkKqmBFgtlbKVSZfg6qKuxx5HAFSeRLpHtrD?=
=?us-ascii?Q?bnGWIpM8r7vXa1kzHZ+/VIFYuEkBiN/5Faqf7ZT0aQXSht3bPHRqakYKdI6F?=
=?us-ascii?Q?/4I2yOQSKlzyHJmXZJIzffA7tppinBxKyRDCeIwmV8FKt98rhuDlYy+EuFUH?=
=?us-ascii?Q?rTYAXqJSPyT68XByzJ+S/D66kgHdEi7cOmwaZWeSzlRGHuYMNrPWwIRO3Hjw?=
=?us-ascii?Q?kfUy71J9X5Uua0Y1xHmXOj77B9cRHKUGMy4r3wijXQezBY9q4EKLOxzKB+pN?=
=?us-ascii?Q?XgO/jD5p+PW390paHmbFGPaAtnU7TJCwH+N33E74bEGr6zwzRU61dded0Tp1?=
=?us-ascii?Q?qIuPztXRVrSz4oAfV0TtEXN3yBLcHpHd0TL7vrrfFCOCn3kINPXgTpWfEFib?=
=?us-ascii?Q?C6WbyZQdJku9IAA5Rl1LNLX4+vmdJ6jvnzeuLO5Oj3OYnd9B1CZKeTCIMIr6?=
=?us-ascii?Q?MPE4HjAiK/eUiWhsoJfuyFLMk1Matq8DDQzORJydI6AcA/31YmqD87u7PKws?=
=?us-ascii?Q?bxniLXhcfEvwBfwU03gUOVVOYOzJ6MK5P+lwEM/TG/9V2z1Zs4/jNiBlD8WB?=
=?us-ascii?Q?+s8lNJ38J2/tx1ytwWgj406XrzHhXJzU7oZRYYwYUhSw102/vG0yhecOcQmZ?=
=?us-ascii?Q?A2cvrCCmjzLKbTX9NK2hVek5PbEHWJ/jLuQyB4xDkNrmeJYvTiXoEXRxb5Kg?=
=?us-ascii?Q?bp6GW0W0Oc4wLaf8WjO5hNURsKdzBKqqhe9hFw8FfBIP/GKJw7HLjnP5BWdi?=
=?us-ascii?Q?3ZT9zcvWJQDhRiwp27kBsYjbPgG1c/8WxBbaKHHxWTM5qmmb4yNCYunPcTZx?=
=?us-ascii?Q?xDqqGsUq4aUODLdzgFpV/iD+KLbsPx80Ekc9TYSLNkVAGCjhWjB9/K6tUDO3?=
=?us-ascii?Q?cU5AwiYBFQ7LANGW0M=3D?=
X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3098;
6:rvKXxkWXgf8G0fTAt9jFh3zbnv6bOicfS+hY+74pTbeYpRKYsUvD890wXv1ejX5QLJb1AtUY9MHXJcPmgApIJ+Mq/LWLRNIoXMyfZtuvhps0rGNLBaLb95F8dtb0LIc7t3MfYxryxAxQuxztEGFHcugX944ThUAaRdvh9u98vCQnl/Nt/yejGLaQDMtraMUbhYE6cd0AXWdffgh9xpwsMUexVOTiq4vQm3OkLX0LRAk5hxPxCeD7AGqREQwxCfXx7ZJCiRCI3bBbe51Ttr4FRlD9VdV0COXgzmvs722CUwL+252FFj4wlJyQC1MYV1uL+OcxfP6h2c+gAxhnI9YMHw==;
5:sBOEDwHKbQhvyJKlx1V9yKXxdh9fe7/sNRgvV7xlPqJifuOLjEZ/xcBIuAPZFl6Ji2fZ8vlrpQwKWH07VcvIn93p/9q4FTSdomolJlogH5gergkGEmgSg3Z700t6t4RHF/HcVzgJLZscxkklResRpA==;
24:qTIYHxt0Sp94Qw1quE5/wP6L2LXHH4vDJEM6t5I3QBcdaigLVfS2JGZuHhyo71nrfUzXYxrUGNbz84am0afIdhvfA2HNdBiWMO8uggpswYY=;
7:c3AcUmgm4Y7fE//Gi+9bgeu3J+ZmjtzolWpThyt0pyuo7XQDNyuIzTEDKd8eLHOqDvtM3vkHyrl8kHHwFy9WgcuK9/koYEX2m3v2ESdsO+m3WsdIOj9hN0VB8aAPr+dW0EUN2FpmZhuj+mBZud0+QDwY70nQXDmuGu7Xv20xW+DaDUumEIkhnflACMBJUTRKoemtz+O4ybyJTX0tD7updGKjtjwfVJmbogPDS14zLK4=
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-OriginatorOrg: caviumnetworks.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2017 11:25:31.9919 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3098
Subject: [dpdk-dev] [PATCH v9 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 <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Sep 2017 11:25:39 -0000
Check iova mode and accordingly return phy addr.
Signed-off-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
Tested-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
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;
}
--
2.14.1