From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by dpdk.org (Postfix) with ESMTP id 6150B36E for ; Thu, 23 Feb 2017 06:28:48 +0100 (CET) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v1N5Odbp082272 for ; Thu, 23 Feb 2017 00:28:47 -0500 Received: from e23smtp05.au.ibm.com (e23smtp05.au.ibm.com [202.81.31.147]) by mx0a-001b2d01.pphosted.com with ESMTP id 28sf6kpt8v-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 23 Feb 2017 00:28:47 -0500 Received: from localhost by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 23 Feb 2017 15:28:44 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 23 Feb 2017 15:28:42 +1000 Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 4EE912CE8057 for ; Thu, 23 Feb 2017 16:28:42 +1100 (EST) Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v1N5SYkg39518296 for ; Thu, 23 Feb 2017 16:28:42 +1100 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v1N5SANd011443 for ; Thu, 23 Feb 2017 16:28:10 +1100 Received: from [9.79.208.138] ([9.79.208.138]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v1N5S7BJ011027; Thu, 23 Feb 2017 16:28:08 +1100 To: dev@dpdk.org References: Cc: Chao Zhu , Thomas Monjalon , Anatoly Burakov , Pradeep From: gowrishankar muthukrishnan Date: Thu, 23 Feb 2017 10:57:51 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17022305-0016-0000-0000-0000021CFAE2 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17022305-0017-0000-0000-00000677F5E5 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-02-23_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702230052 Subject: Re: [dpdk-dev] [PATCH] eal: sPAPR IOMMU support in pci probing for vfio-pci in ppc64le 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: Thu, 23 Feb 2017 05:28:48 -0000 Hi, Could this be reviewed for few more acks (though changes are only for ppc64le) ?. If needed. I can send release notes update separately for this support. Regards, Gowrishankar On Friday 10 February 2017 11:48 AM, Gowrishankar wrote: > From: Gowrishankar Muthukrishnan > > Below changes adds pci probing support for vfio-pci devices in power8. > > Signed-off-by: Gowrishankar Muthukrishnan > Acked-by: Chao Zhu > --- > lib/librte_eal/linuxapp/eal/eal_vfio.c | 88 ++++++++++++++++++++++++++++++++++ > lib/librte_eal/linuxapp/eal/eal_vfio.h | 1 + > 2 files changed, 89 insertions(+) > > diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c > index 702f7a2..1d4fea6 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c > +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c > @@ -50,12 +50,15 @@ > static struct vfio_config vfio_cfg; > > static int vfio_type1_dma_map(int); > +static int vfio_spapr_dma_map(int); > static int vfio_noiommu_dma_map(int); > > /* IOMMU types we support */ > static const struct vfio_iommu_type iommu_types[] = { > /* x86 IOMMU, otherwise known as type 1 */ > { RTE_VFIO_TYPE1, "Type 1", &vfio_type1_dma_map}, > + /* ppc64 IOMMU, otherwise known as spapr */ > + { RTE_VFIO_SPAPR, "sPAPR", &vfio_spapr_dma_map}, > /* IOMMU-less mode */ > { RTE_VFIO_NOIOMMU, "No-IOMMU", &vfio_noiommu_dma_map}, > }; > @@ -540,6 +543,91 @@ int vfio_setup_device(const char *sysfs_base, const char *dev_addr, > } > > static int > +vfio_spapr_dma_map(int vfio_container_fd) > +{ > + const struct rte_memseg *ms = rte_eal_get_physmem_layout(); > + int i, ret; > + > + struct vfio_iommu_spapr_register_memory reg = { > + .argsz = sizeof(reg), > + .flags = 0 > + }; > + struct vfio_iommu_spapr_tce_info info = { > + .argsz = sizeof(info), > + }; > + struct vfio_iommu_spapr_tce_create create = { > + .argsz = sizeof(create), > + }; > + struct vfio_iommu_spapr_tce_remove remove = { > + .argsz = sizeof(remove), > + }; > + > + /* query spapr iommu info */ > + ret = ioctl(vfio_container_fd, VFIO_IOMMU_SPAPR_TCE_GET_INFO, &info); > + if (ret) { > + RTE_LOG(ERR, EAL, " cannot get iommu info, " > + "error %i (%s)\n", errno, strerror(errno)); > + return -1; > + } > + > + /* remove default DMA of 32 bit window */ > + remove.start_addr = info.dma32_window_start; > + ret = ioctl(vfio_container_fd, VFIO_IOMMU_SPAPR_TCE_REMOVE, &remove); > + if (ret) { > + RTE_LOG(ERR, EAL, " cannot remove default DMA window, " > + "error %i (%s)\n", errno, strerror(errno)); > + return -1; > + } > + > + /* calculate window size based on number of hugepages configured */ > + create.window_size = rte_eal_get_physmem_size(); > + create.page_shift = __builtin_ctzll(ms->hugepage_sz); > + create.levels = 2; > + > + ret = ioctl(vfio_container_fd, VFIO_IOMMU_SPAPR_TCE_CREATE, &create); > + if (ret) { > + RTE_LOG(ERR, EAL, " cannot create new DMA window, " > + "error %i (%s)\n", errno, strerror(errno)); > + return -1; > + } > + > + /* map all DPDK segments for DMA. use 1:1 PA to IOVA mapping */ > + for (i = 0; i < RTE_MAX_MEMSEG; i++) { > + struct vfio_iommu_type1_dma_map dma_map; > + > + if (ms[i].addr == NULL) > + break; > + > + reg.vaddr = (uintptr_t) ms[i].addr; > + reg.size = ms[i].len; > + ret = ioctl(vfio_container_fd, VFIO_IOMMU_SPAPR_REGISTER_MEMORY, ®); > + if (ret) { > + RTE_LOG(ERR, EAL, " cannot register vaddr for IOMMU, " > + "error %i (%s)\n", errno, strerror(errno)); > + return -1; > + } > + > + memset(&dma_map, 0, sizeof(dma_map)); > + 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; > + dma_map.flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE; > + > + ret = ioctl(vfio_container_fd, VFIO_IOMMU_MAP_DMA, &dma_map); > + > + if (ret) { > + RTE_LOG(ERR, EAL, " cannot set up DMA remapping, " > + "error %i (%s)\n", errno, strerror(errno)); > + return -1; > + } > + > + } > + > + return 0; > +} > + > +static int > vfio_noiommu_dma_map(int __rte_unused vfio_container_fd) > { > /* No-IOMMU mode does not need DMA mapping */ > diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.h b/lib/librte_eal/linuxapp/eal/eal_vfio.h > index 29f7f3e..533b854 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_vfio.h > +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.h > @@ -53,6 +53,7 @@ > #endif > > #define RTE_VFIO_TYPE1 VFIO_TYPE1_IOMMU > +#define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU > > #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) > #define RTE_VFIO_NOIOMMU 8