From patchwork Mon Aug 14 16:10:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shukla X-Patchwork-Id: 27590 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 7642C90F6; Mon, 14 Aug 2017 18:13:10 +0200 (CEST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0043.outbound.protection.outlook.com [104.47.41.43]) by dpdk.org (Postfix) with ESMTP id 3863A7D7E for ; Mon, 14 Aug 2017 18:13:09 +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=RWhBL1OPCW3nlepuVmdYjjVpezN08cvBSrKaJPu0XY4=; b=hn+i99h3PKLKGKiEQib18V4PQwJTr8us2d6q8FRQ3qWn0Z5GX9Nmg9xHRQIEAC2iPM1cyEoGCL8WsU4kOKtzTT5x5MmeK/6kw9tofu4hWpnDH26QdSlx8CnrDGZ2Xkn+CBPo0A/G335FlabS8GeJDPdURpUR1SjAdN+MNSonDBs= 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:03 +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:57 +0530 Message-Id: <20170814161059.6684-11-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: 4d3b3293-8ba5-405e-4f82-08d4e32f5a1e 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:tqThE1NmKfO9W5xg5fY6rN0/VMqxwc8gpXqzXMY5sw+ZI1xphHvTy126o+aNnph8hoOI+dMoAqMFo7nH6X+s5N9XrCd62e0oIbdCI7g+aBBwj5S59jbX0wSyUCczYY8onf839uFZDWPol0BzGAixzvUDHEMe+fb4k6u9Ajvx2UzzvhtQAEOA7P1VSZjVL8JanKYwsSPLb/Z/Jbu49BDG3xzgd35xya/ODywl2KSvHwNe4+wLCIxDunBUWolHhWEp; 25:UEuZgvra5oYDCGXNbAYYnTojcDUAKGTcxpaKt0UYeD8c9SRcgv34XO+7HEGDARQBcZ7MYLebM1HW1aRWku8M76qRWx8jwRZgv/YSHFw7zwqAyBQB8QFEVeiIjbW035+A8kr29akHp/n0gptg8wFzYlCWk6W4QPxurN76aH8PiW4NVNVU6gdjyNl4u8XYc7tCRS/3NpO/knCyjIzTZ0ZP3Fd2hVJr9Mjvfgr3WX9EBevf/qQ2+6RH8oe0FRSnVhNhtNbNeUct+bjQ6q+NpUsWqM0SZLuRjAd9Fz2f9sYkkD1J+ipexnfLYprSJMyoC6cPkeW/UNlyGudW0fi/CDvmWA==; 31:nINkPU7Hbr+6uvZPSZrSbi2xRnxd6YObysuffPDz5iyiKL9VoYsVOsVIsmS6sq2/IYehwcJ03U1eTWPmLMCehvlTcUYLIEKdoktXkAY/Z3LVg1i0ecWahml6AjI/jk1jcoZasU92cAx0h4AiMD5HXQUDmTLFM2wUr4rxLXYi9Lq5UFQGDceulSieJVOwLf6+1pLBb7UzjFdYbVaN/Mi4HA3koYqUhzvo3azP1CdDo9w= X-MS-TrafficTypeDiagnostic: CY4PR07MB3093: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3093; 20:Y+m3dSa0HzmfFph9pnIdB5q7ctS5ilM1wpX4GMu8EkoqAzDZulvj6T8WGkgatOmA1KDAt2JJNiZiBC/X/tkgAVSU6OAe2dkofD/6nUWh8l0yB5a3/HrH3tAgWvrhsQHEwpXL6h/wRebb9PhiNagduAZax0jNoPeR3/OvkDhsfQ1+d68+EyFwEgYpRgNxYC2TQcmvRYhENwuWXIT9AXmmIypecXiZufERF7+o03EBzFc1vhQFnZ2HjKBOIRd8oil89q4uVKtjSaac4KimU2x0pTjni9tNyjIj5E66/775Z+qTR1RAHOq6D8Wu3MP9H+UHAVi1QvBlVP6s/ugAD3/IRTiw4RNmZCS40AO2XOaazEsrb0fxTg8MwSJPRqH5cpUHwW7ELfyGEbAB+7q/v2ukK9S4Qymkwpro1XDs2v74S2pmAiBGkgRfApD4Y1bMWI+GAjcEeJM4LW1VKMHx4sfn/pDD5vB4HZF7X4B3gRF/u8kqGBuST1s85AEmBKg+mmDzSgDOF+ccflFXOa+r72gd6/CANO4p6I/fzP2N+RghHLo5c3hIzWDp7NqJQleUgy+I5QqYNx4i0vGgjBU9WSiYWCjnOWXgYSti/wVlnMSfpFc=; 4:H/hLCcPNwlo3cU9FieM38X+oeqVjD+xl/IUUzVcDg5loBBOUv5SGOSehVMwW/N3Ss9fEh008qBzbkE5AtEwc/WYWxjXrOJp3X4zlwvTf3Up2goNbWthiH4Dx4rtASLzUz6v310VRhz50r/Q2AqI2IEmmM4ZNu0nk6NPygEqqaEuRrEtmD15BO2+cXSAvbrzHnKB4quQH9gfWvJDk0cXMZmUhff+xyNUEU2SlVrefxjmQkhSu8gOfgo5x6N/F/fKT 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:Wevv4HRV8glsgKjguWBdHwUjYu/tFb75TMoKGQyCJ?= Iwk2yTc6JNgz/1kTp667YfRWakUnsXL4LR4N0wFup1P8xMKi/QBOm8qPKYA4c0+//DUm/wKyLqNycpkDOdKeZPR5LljsTuxLP+DN519QlZgXFn0D4VlWYtzh4VNPsxydDar1j/g9OPZ19qnCmboKRdUNQ9rnR9ZX/9NmT2nM7tno9EwaIJOPRp8lZ7stilu3Y+XG/wFkxu/m+kKzzOs9kBnkgPZ2YVUCBMyQbXqlnfIg87PIDUanQsBTjZOEoPhKVH8XUHZ64e2kRicuTMfdbdPcpBnKhN5EBsc+bjisj8tgW43KoE0Ziielw4oTeOLqeErNmWq91gs4D06Wb1rJfXpmGyF2F4fpOgAADO+yoRp+zHO3jXTC70wkvg0s36JURGXqiO21fI7luM0/geZBGJXSBOYNjALhXoYrZpNQyeNUa2hGc+FkNsm1Mnj71UHniofjI0H63RNSXEHMzk+WrK0vSPknNAwjOufBjEyToUEJNQl90d8LwdB7Bx/pWcWRu7ejXc9cyLEIKUx2Awd1dqzbC4EwGJaZmpu2aCG6uqi9IiIdIpuF4zSKjeRai5Gt/la9qw7xj+pio7xq1V0IJaYtXbz4FqcHwbYfYC4WV83NKemk290G2LcFKHbI7DAhlyAEGTHRdwC/BW2F7WrgIVhFZ+w6SjnsjYKacOBadt38iTRSvPHK1dYA9QSx8T0jMAfYw5xgHVPJ2oLesSpxR5+I1Uj7/1YJyl3d4AFHbb0W9TgTduiLo7U3oVm4Z7wT0oMIu+x1+webGtrWyANhrwKAMPtfJJ9MP6OpoFkBBpB8Hw+Te7ujYjzFptBTIsTanOCfmPgYRwCMqb73tZCFVFm2zb7uEcMCEUpr7//sny3QwD/MhGAc55tGPl9RF7XGbZWgm6/Xyfi/yha2UbvXqT1KLmYZSpEXMTVhPzVZYNC20dis6s47HvLNAt3/dQkKktOi0j6jWf79Yf7WF8c9Ckg1HfgypdfBOttfaj1i82+wIZLODNxvoJ4fNvXRdQovzONLWbeJVLoIUUzaDHeRdY3cRyjU9pbMxpAnL5XyWcJyXLwZ+jRL6EhBrqkSLA6w5vdMOVEa0b6iZezrhE342rK4EVUWIbwsIxet6lin6ofI/3VO+x6CEwAmEi2JpkophIcPPXFc5TZ8jnVKpPxzUHZAWLoOYLfeociWqIxzyUtWB29kEo0vRTtwp9V5Z2vji0FLrq0jnT4w0Piq5XigCZMdaZNqyndul35kRzOcoZrHA== X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3093; 6:bp6eIPl/QdJqpHLfGoZRbAx3D9JxCeI7jwndq2EXkLLgH+BqsC3Rqyc5wwpla40cTiBjrSPYWN7a0i4xd/w2c1K6MirwPyhijr6dUw+xQwJ9x2jyNDRPz3nTZTO7ZuiYgxpYbAyi4ZHP2oBmDiWMAS9nLsi46Wdhcit4MZFsrg5785Opns3/qPfIK/c2gTychu4ng11OyBGqyf5YrXcUaozG+NLjvxbu1ukNzkS3p4MXGqxbW56EB3jka3SQw2Dxc2yZxKqIBb11R7Mvrp6hMx92sKL7ItP7BtHhexkxFk2sUeqhqOtkfmDY6OtQu1nuocmEkevQlfb5EiMU/jPK9g==; 5:97dznWhpkT+5ObK/ZPytiMV0JaAXwtenTpJ/RfL3Wut2RufjYmZGfCKHHJskY0MHNGq1JuyZUxC7fSetWx6c/+ae71RncCChfSWuvMwkJ6z7wFf/AlBOLm4Aevqu7/gW1o6Veba7/kt+tfvCwx96Wg==; 24:19XjqA+EC6eVyOVxbVzG0P+2u3ipTvyix9l8Wa+J9kQdHimnG4QBxVaZx19fJlLDieS5rtZzm7/wjefcZKJs+RztXhcVLuepi0HaN4dxMBc=; 7:sxlnfbsijCV7E+DNK2gYtlw5CNCVNZwbbUhA4mIhZomhtjB29I+HPDpQRKaDcF5A+Ri5lo4+rUEPTnlGA4UdsqKGeM6ION/4w3ERJxszMRQORLatbiDja15pxXUzpBgOK8UrsYHC6Gs9jXUnxr2T81/5DT64mMBbQUUwKLIJNpl1yMqTp1LZYDHJ0g52jiroNX4leqNCtw/i1cZvDqpvf6CND+cnixILupNjBOCUlUE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2017 16:13:03.2395 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3093 Subject: [dpdk-dev] [PATCH v6 10/12] linuxapp/eal_vfio: honor iova mode before mapping 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 map iova to pa or va. Signed-off-by: Santosh Shukla Signed-off-by: Jerin Jacob Reviewed-by: Maxime Coquelin --- lib/librte_eal/linuxapp/eal/eal_vfio.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c index c8a97b7e7..b32cd09a2 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c @@ -706,7 +706,10 @@ vfio_type1_dma_map(int vfio_container_fd) dma_map.argsz = sizeof(struct vfio_iommu_type1_dma_map); dma_map.vaddr = ms[i].addr_64; dma_map.size = ms[i].len; - dma_map.iova = ms[i].phys_addr; + if (rte_eal_iova_mode() == RTE_IOVA_VA) + dma_map.iova = dma_map.vaddr; + else + dma_map.iova = ms[i].phys_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); @@ -792,7 +795,10 @@ vfio_spapr_dma_map(int vfio_container_fd) dma_map.argsz = sizeof(struct vfio_iommu_type1_dma_map); dma_map.vaddr = ms[i].addr_64; dma_map.size = ms[i].len; - dma_map.iova = ms[i].phys_addr; + if (rte_eal_iova_mode() == RTE_IOVA_VA) + dma_map.iova = dma_map.vaddr; + else + dma_map.iova = ms[i].phys_addr; dma_map.flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE;