From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0049.outbound.protection.outlook.com [104.47.42.49]) by dpdk.org (Postfix) with ESMTP id 941551B248 for ; Fri, 20 Oct 2017 14:32:24 +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=IhvMhtLCEICEbFn6cVBTwbsALknAo/NVnixJB89JPag=; b=SzKVTlMh3efpEClrrZT4G34WyDEykn4phwX7fkYxMSDKEh4/slQxUfUCIYlbt1ROhnpbO/v1BZpElFCNvC7168vak3XAPS+NOJ3IbM3CxIHAMXy8g0Ijj6afYfH9UUBwKbVPTw0wawRnI0IRoLNlkFzULl0UncpY+fzfFm7FZQM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Santosh.Shukla@cavium.com; Received: from localhost.localdomain (14.140.2.178) by DM5PR07MB3100.namprd07.prod.outlook.com (10.172.85.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.156.4; Fri, 20 Oct 2017 12:32:20 +0000 From: Santosh Shukla To: dev@dpdk.org Cc: olivier.matz@6wind.com, thomas@monjalon.net, jerin.jacob@caviumnetworks.com, hemant.agrawal@nxp.com, anatoly.burakov@intel.com, Santosh Shukla Date: Fri, 20 Oct 2017 18:01:33 +0530 Message-Id: <20171020123136.10557-4-santosh.shukla@caviumnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171020123136.10557-1-santosh.shukla@caviumnetworks.com> References: <20170905103119.20511-1-santosh.shukla@caviumnetworks.com> <20171020123136.10557-1-santosh.shukla@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.140.2.178] X-ClientProxiedBy: BM1PR01CA0110.INDPRD01.PROD.OUTLOOK.COM (10.174.208.26) To DM5PR07MB3100.namprd07.prod.outlook.com (10.172.85.10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b2a077fa-954b-4a0e-293a-08d517b69d51 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199); SRVR:DM5PR07MB3100; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3100; 3:o2EHhxO2Yx/tPBtOhiahVrwr3Rlfhn7Xr7BKQaQKcAQ65jiKF/XK/KMFnoMYCH5DUSz+pCTxMSxRrNeixzXeHG94Ey8mUYLp9PbDjjuavnI/d3jDr8z0PhT+O/rVlVyn7kKVBBLoE/+C4Bw+1zOPS5/ygX2jqkhGvbCJab3Cr8BOPqiSkIMkp2WRDzOrtqGwrZFb0I94I7y8y2vXzIexVvYVoJPHMh7oFKusFce6xpCY+8HafS8LdFzx5hSFaa2L; 25:1KjHPwQS848k7DA88GpnD30rWwgL+FA1rkkWzsKPKr82t6RdDqNaeWv7eEBqsoBKrufV5m1Cp/e4/W5E4UcHNyXT11OxSSByD9BwMPGhCL6hcUe2TwyzyNo7teeWKJBUDGDSWpMq5nsxkyaKl2yWc2s0joeu5ysfBsEJ3LdLspjWBKpmZQmF8kILfAZ8HvVLkGo4C26JzS+wM7XFmvOJA35MMT+KPKHYNfipnM1U5AZoJoPZ2V9klUhYXtTBz65vtJd5by/ifOyDmQbzBrbM4xF2WTEyQrUT+cO0wQLuvpb+0zlYSWVa+znhwyM4ULTLIqQKDv8Ls4vCeHzsQCMnfQ==; 31:URHvukFluSKjxJquFJOpkzQTgobrpRhkDmsMgKNOK+KOHYfT13pjtz1hWAND4F/poFncH7oyyAmXSDketcBdxgopApDNsaOYww6xasfGuReQKGoQm08D5B/FyBxUDKI5FZqOLjW2wjEMsXKytst7BfAlZNhkwXfQCsyWDRjRnB5W3ZkzFkH9WIqELxpXo/qGhERRa88BnClP1rEvrC4PpCZ4jlYEfyvcWI6Lrw+78ZQ= X-MS-TrafficTypeDiagnostic: DM5PR07MB3100: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3100; 20:OHtBRXRe+rfOuTFYn/1kEHl7TRyoaFvKtGziYBlm34VUsZAbEMczOT0021e7xDgO2SGTgr3svLyIFN2zVQRdA3xXEXQWllJJryS91whKFvXSpppGMZzcRX2znnHbrkBqWHjUJzU4lLYwKVf6rfcKCl/CMZI+C/SShIY2wP6pE1vU34XFAWC31rLZlNl7NBZenhdfnkgjejP3Ot8NBhN0xJ1ODoppiKJeMrL4XVmR3zv/ZlGA1BUH7odB08+7tjUaJ+8KN9mI3w4t9fgwTOhyN7HusuaeKT515SOZ2wqzAOjDhBHp3CAHwBj42XGm4g7O3gGwNkDgifEMif6yz4ty9eTVCpdipu5EboXFRCTRH4gtPIOWCJP8iZNtbVQier/IO3i5xdo0FmYJzohIjVGykGwt9w6eN/9BZsMBZvpMe88TozW9/AUkbcGhIDa9XBQB8+fzt0LuVmbYdvbTX0Nkz5Xmik0Zdlfz6dvpJSxgdTZrbU0x7wF+frK0+DaxxFALyQtWRvJAiwI1IHXAxgOHeu46bKAgiacYhfmxYh/Ulfd2vOPpQkFF8V4iuJ3hSeUDYNuMhJI7uiq6DUuviG8jSonJAaScg+kwb/tDJWgItW8=; 4:FRO6fNIgVtfW1KV/1pwe2X4U2at7gGBKXgPg4cg9Z3dPgoNp7cf5LwyncDRU9TnAoPivpgbs2E+5mNWarOPj78jIJE57ltXcdHbguSOZa7a/dectB7wcG0EBaAkEO3IOsWgxQ8ZeDbKOVoMy8mjh6HhM0dE0lSxzEEM2y7eBkzZ00Kk++/5gO/h5/JECA4AdXpOur5k2vAAEfPXSP3wHZQ2Rrni1JjgA4KCMRqz4jrKQ7Ci4iYjfVVditYTR3g4uJRhBhtN/OsmQkGxRgmKVi2va+MVHeoymznFyMXOTeOs= X-Exchange-Antispam-Report-Test: UriScan:(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(10201501046)(3231020)(93006095)(3002001)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR07MB3100; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR07MB3100; X-Forefront-PRVS: 0466CA5A45 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(6009001)(376002)(346002)(189002)(199003)(81156014)(81166006)(2351001)(2361001)(66066001)(105586002)(47776003)(5003940100001)(16586007)(97736004)(107886003)(6916009)(42882006)(72206003)(478600001)(5660300001)(33646002)(2950100002)(6666003)(16526018)(106356001)(53936002)(8656005)(8656005)(6486002)(6506006)(50226002)(36756003)(189998001)(5009440100003)(50466002)(4326008)(6512007)(68736007)(25786009)(8936002)(8676002)(316002)(76176999)(101416001)(3846002)(1076002)(48376002)(50986999)(6116002)(305945005)(7736002)(2906002)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3100; 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; DM5PR07MB3100; 23:XgtBxQA2DxKyhHXPoZeEIllpcM32IlLrwWB4K2NB8?= =?us-ascii?Q?Ll33qL0xnfCYebjP2oe30fajzVH70R7p0chC9I/EFwk5qVTQmjN/utGrj7qw?= =?us-ascii?Q?ayzMtk6u2HAVQOoS89kwxiGlkQPWMIWpVlQxiclu7O5MyOZowQ8MFvVdp9bA?= =?us-ascii?Q?QV8qkHvt0Gj1bunOp6EPVyvl88Uwpg7tiEAxpAr51RxntcESoJGTNGlrEHJM?= =?us-ascii?Q?2HL6Mpw9pcpBG5WtR3XO7UWW/CTLI5lV4BwmsBjdow+xCr0gsOzFL8uBfFdS?= =?us-ascii?Q?oq4WhQ1NIdKgU5BjP1D+Mvd7Ghh43EpKXRTym1UWJBECz9DH+rl9DtLt1kDS?= =?us-ascii?Q?8n/hE7uYy1R85Q+kUmDL57ZF+IQUK35VoUHZlrY15XJcqcdVCh4UPJ2tPdr+?= =?us-ascii?Q?W8k9QALLi6K2RmFg/WwwJT1BJrmgUdDM6YejlmT8cNsvAcVpswkGnzTgiiqF?= =?us-ascii?Q?TWQdHGxzkL6A8NQQMyiYHY2twqP9+UflLJgqrkAAFxN9y/cA4lLoJ9QNx0Qq?= =?us-ascii?Q?4wqokZYjsnHN6rJYRKFHLJZ9dazmOy1BUom8pojXBKQAQfvc/zGVUp3r9uMp?= =?us-ascii?Q?lMW8GGoGW8kMmwnnClMZYBMJpp7PT//Szx2bsHgKymWa7oRnV23pTu9bS/7P?= =?us-ascii?Q?UMeMtainl0Yx12DLkuh7o4cEvbrcGNrltDycofKiF+2TUUDGQXv6FX3dsyjo?= =?us-ascii?Q?YUMdiSeuWNi7cJyq7uyUFdSGl9b4IyTjDAJ9rqGGcRIliQ7xjvIzeR0tbT9s?= =?us-ascii?Q?omg7JUzKUPiieP9V9fkTif/Iz0MdGX6q77Kiw1NH1m+NzllnLdtGodZV+6JQ?= =?us-ascii?Q?2f7dlMMS1WCmoPFq1ECHhI06dyKMqMs9ZHYZLduUSRQ5SU2NNe+wUwAZwUXg?= =?us-ascii?Q?epnHSGPcy9ef4EbJHbDXs+ieO7coVtnkxc/YI05esPrCY3Idl/ZKNGT91//I?= =?us-ascii?Q?vLAWVdi3wlrR6K2pqA8k/31N74ZNOHpWhPGU7wZXmMo+ez8MU08ielMhwrzu?= =?us-ascii?Q?4ao5KqBX72FIM1+hEIhr33ewt3HUrMWxwhy/JNu2+ny4grOsGs5bYwBb9sRT?= =?us-ascii?Q?WLLWXxzwwSSQiHhujV/F9zEyJbH6QUKOCGDiwOMYfO0QAC5P+RPHuSvw5pIs?= =?us-ascii?Q?G+aiSBZHZunyzBC/7AgAzUDCcA+qNE2cYst/gTMcnvLKCRHXBm3QEsAaAkEn?= =?us-ascii?Q?aLNpBe+jWZs5vEOKE9DhVTqdXfyy96F3hyJoICLvDv6DHpwB/Qn8jwfy61nJ?= =?us-ascii?Q?gMDr1si6GMEVXvKpYo+PABLAlO8i2U6BOkF0w9T?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3100; 6:DcSZaoZ4qXMyKbDfaI762Slj/2FT6ZzPZC6GWiNwWsOeFJR02j+os87wdC7SSSkDUUoiJ+5ivXRti2W2nQHCOMTeIW+t7Q15efLMzpMxuMkQaskuS4Ge/K2Rh1nx2aJn6+H7y84VOueL2i9Xpn10AtGJrjpal1+5rcG0xg06IXvUEIHiHOAOWjNgeWhKlx6PmSkVHyyUpiVqIVfNwMymyuMbrmrd0zPACzaEKS0pnyudo1nGAQnsYX0yCt2xYHYgMthPpQiXaE3JIsK+ofoqk4q3m0DSBBF6x4BabkUposeeZ9fK864sCbhWdbLl3Lu2bO2ZUdPCNkn+bRLVKCSXvw==; 5:OmUXLAN+sMAeg4Dkl3maYuCARPhKOMskWp3blCg1TBcv5PML0ZUIhQhasXg8+qSnXmV9rbJyHMVTh4c2gxYPnT4s4mv/9J0S6X/q6DdyBojlyBoSIFKxfRYD+lZzJk6qO7mS7qxi03dhxoFbznKFjg==; 24:kaa0sCJxDiR3R61Fv+4O9H9V2M4XeMerJfz13W45VQHBvzMzx1b8vBVt77C55wqAx2CbEw/8eXYRgy2W86kmPpKkr2zaAbwbT39V7q9cUC4=; 7:p8alr6ZekrmxtSLsEZ91w/Ilje3iTBi+cutQQri/xqd52k7Yn/o4gnV53usoccGAxCpqB9jL0BGN8hhLjNGszBuyNBgtKsRysCt6FK7NVuwhOvIBLkr2c2QHEG0WERaWIrsooz91Q0OyckZ+lJ2DeWwND8AHYRM5BsG7cROD6sqXbi8i4YXeLlDANQnIKFc3+/j1+k725hrAjQbglDlOWvsyIz/9oHYQRmgw2npEdiU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2017 12:32:20.6121 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b2a077fa-954b-4a0e-293a-08d517b69d51 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3100 Subject: [dpdk-dev] [PATCH v3 3/6] eal/memory: rename memseg member phys to iova addr 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: Fri, 20 Oct 2017 12:32:25 -0000 Renaming rte_memseg {.phys_addr} to {.iova_addr} Signed-off-by: Santosh Shukla Reviewed-by: Anatoly Burakov --- lib/librte_eal/bsdapp/eal/eal_memory.c | 4 ++-- lib/librte_eal/common/eal_common_memory.c | 2 +- lib/librte_eal/common/include/rte_memory.h | 4 ++-- lib/librte_eal/common/rte_malloc.c | 4 ++-- lib/librte_eal/linuxapp/eal/eal_memory.c | 8 ++++---- lib/librte_eal/linuxapp/eal/eal_vfio.c | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c index 10c2e121f..d8882dcef 100644 --- a/lib/librte_eal/bsdapp/eal/eal_memory.c +++ b/lib/librte_eal/bsdapp/eal/eal_memory.c @@ -73,7 +73,7 @@ rte_eal_hugepage_init(void) /* for debug purposes, hugetlbfs can be disabled */ if (internal_config.no_hugetlbfs) { addr = malloc(internal_config.memory); - mcfg->memseg[0].phys_addr = (iova_addr_t)(uintptr_t)addr; + mcfg->memseg[0].iova_addr = (iova_addr_t)(uintptr_t)addr; mcfg->memseg[0].addr = addr; mcfg->memseg[0].hugepage_sz = RTE_PGSIZE_4K; mcfg->memseg[0].len = internal_config.memory; @@ -114,7 +114,7 @@ rte_eal_hugepage_init(void) seg = &mcfg->memseg[seg_idx++]; seg->addr = addr; - seg->phys_addr = physaddr; + seg->iova_addr = (iova_addr_t)physaddr; seg->hugepage_sz = hpi->hugepage_sz; seg->len = hpi->hugepage_sz; seg->nchannel = mcfg->nchannel; diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c index 996877ef5..5ed83d20a 100644 --- a/lib/librte_eal/common/eal_common_memory.c +++ b/lib/librte_eal/common/eal_common_memory.c @@ -100,7 +100,7 @@ rte_dump_physmem_layout(FILE *f) "virt:%p, socket_id:%"PRId32", " "hugepage_sz:%"PRIu64", nchannel:%"PRIx32", " "nrank:%"PRIx32"\n", i, - mcfg->memseg[i].phys_addr, + mcfg->memseg[i].iova_addr, mcfg->memseg[i].len, mcfg->memseg[i].addr, mcfg->memseg[i].socket_id, diff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h index d05f53ad7..93e7a819f 100644 --- a/lib/librte_eal/common/include/rte_memory.h +++ b/lib/librte_eal/common/include/rte_memory.h @@ -94,14 +94,14 @@ enum rte_page_sizes { */ #define __rte_cache_min_aligned __rte_aligned(RTE_CACHE_LINE_MIN_SIZE) -typedef uint64_t iova_addr_t; /**< Physical address definition. */ +typedef uint64_t iova_addr_t; /**< Iova address definition. */ #define RTE_BAD_PHYS_ADDR ((iova_addr_t)-1) /** * Physical memory segment descriptor. */ struct rte_memseg { - iova_addr_t phys_addr; /**< Start physical address. */ + iova_addr_t iova_addr; /**< Start iova(_pa or _va) address. */ RTE_STD_C11 union { void *addr; /**< Start virtual address. */ diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c index e817d70ca..506d7a415 100644 --- a/lib/librte_eal/common/rte_malloc.c +++ b/lib/librte_eal/common/rte_malloc.c @@ -255,13 +255,13 @@ rte_malloc_virt2phy(const void *addr) 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) + if (elem->ms->iova_addr == RTE_BAD_PHYS_ADDR) return RTE_BAD_PHYS_ADDR; if (rte_eal_iova_mode() == RTE_IOVA_VA) paddr = (uintptr_t)addr; else - paddr = elem->ms->phys_addr + + paddr = elem->ms->iova_addr + ((uintptr_t)addr - (uintptr_t)elem->ms->addr); return paddr; } diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c index 9c94c4ca9..603164d77 100644 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c @@ -1031,9 +1031,9 @@ rte_eal_hugepage_init(void) return -1; } if (rte_eal_iova_mode() == RTE_IOVA_VA) - mcfg->memseg[0].phys_addr = (uintptr_t)addr; + mcfg->memseg[0].iova_addr = (uintptr_t)addr; else - mcfg->memseg[0].phys_addr = RTE_BAD_PHYS_ADDR; + mcfg->memseg[0].iova_addr = RTE_BAD_PHYS_ADDR; mcfg->memseg[0].addr = addr; mcfg->memseg[0].hugepage_sz = RTE_PGSIZE_4K; mcfg->memseg[0].len = internal_config.memory; @@ -1282,7 +1282,7 @@ rte_eal_hugepage_init(void) if (j == RTE_MAX_MEMSEG) break; - mcfg->memseg[j].phys_addr = hugepage[i].physaddr; + mcfg->memseg[j].iova_addr = hugepage[i].physaddr; mcfg->memseg[j].addr = hugepage[i].final_va; mcfg->memseg[j].len = hugepage[i].size; mcfg->memseg[j].socket_id = hugepage[i].socket_id; @@ -1293,7 +1293,7 @@ rte_eal_hugepage_init(void) #ifdef RTE_ARCH_PPC_64 /* Use the phy and virt address of the last page as segment * address for IBM Power architecture */ - mcfg->memseg[j].phys_addr = hugepage[i].physaddr; + mcfg->memseg[j].iova_addr = hugepage[i].physaddr; mcfg->memseg[j].addr = hugepage[i].final_va; #endif mcfg->memseg[j].len += mcfg->memseg[j].hugepage_sz; diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c index 9d66247bc..32b090325 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c @@ -709,7 +709,7 @@ vfio_type1_dma_map(int vfio_container_fd) if (rte_eal_iova_mode() == RTE_IOVA_VA) dma_map.iova = dma_map.vaddr; else - dma_map.iova = ms[i].phys_addr; + dma_map.iova = ms[i].iova_addr; dma_map.flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE; ret = ioctl(vfio_container_fd, VFIO_IOMMU_MAP_DMA, &dma_map); @@ -768,7 +768,7 @@ vfio_spapr_dma_map(int vfio_container_fd) break; create.window_size = RTE_MAX(create.window_size, - ms[i].phys_addr + ms[i].len); + ms[i].iova_addr + ms[i].len); } /* sPAPR requires window size to be a power of 2 */ @@ -812,7 +812,7 @@ vfio_spapr_dma_map(int vfio_container_fd) if (rte_eal_iova_mode() == RTE_IOVA_VA) dma_map.iova = dma_map.vaddr; else - dma_map.iova = ms[i].phys_addr; + dma_map.iova = ms[i].iova_addr; dma_map.flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE; -- 2.14.1