vfio: fix build errors on old Linux
PATCH 1/1 vfio: fix build errors on old Linux
The commit db90b4969e2e ("vfio: retry creating sPAPR DMA window") introduced a build breakage on old Linux. Linux <4.2 does not define ddw in struct vfio_iommu_spapr_tce_info. Without ddw, we cannot change window size and so should give up the creation. I just exculuded the retrying code if ddw is not supported.
--- lib/librte_eal/linux/eal/eal_vfio.c | 2 ++ 1 file changed, 2 insertions(+)
lib/librte_eal/linux/eal/eal_vfio.c +2 -0
@@ -1445,6 +1445,7 @@ vfio_spapr_create_new_dma_window(int vfio_container_fd,/* create new DMA window */ ret =ioctl (vfio_container_fd,VFIO_IOMMU_SPAPR_TCE_CREATE , create);if (ret) { +#ifdef VFIO_IOMMU_SPAPR_INFO_DDW /* try possible page_shift and levels for workaround */ uint32_t levels;
@@ -1463,6 +1464,7 @@ vfio_spapr_create_new_dma_window(int vfio_container_fd,if (!ret) break; } +#endif if (ret) {RTE_LOG (ERR ,EAL ," cannot create new DMA window, " "error %i (%s)\n" , errno,strerror (errno));
Signature · 1 line
2.17.2 (Apple Git-113)
Quoted 10 lines · Takeshi Yoshimura
The commit
db90b4969e2e("vfio: retry creating sPAPR DMA window") introduced a build breakage on old Linux. Linux <4.2 does not define ddw in structvfio_iommu_spapr_tce_info. Without ddw, we cannot change window size and so should give up the creation. I just exculuded the retrying code if ddw is not supported.Fixes db90b4969e2e ("vfio: retry creating sPAPR DMA window")Signed-off-by Takeshi Yoshimura <[email protected]>---
Signature · 2 lines
Thanks, Anatoly
Thomas Monjalon
Applied11/07/2019 11:17, Burakov, Anatoly:
Quoted 7 lines · Takeshi Yoshimura
Quoted 6 lines
The commit
db90b4969e2e("vfio: retry creating sPAPR DMA window") introduced a build breakage on old Linux. Linux <4.2 does not define ddw in structvfio_iommu_spapr_tce_info. Without ddw, we cannot change window size and so should give up the creation. I just exculuded the retrying code if ddw is not supported.
Quoted 5 lines
Quoted 3 lines
Fixes db90b4969e2e ("vfio: retry creating sPAPR DMA window")Signed-off-by Takeshi Yoshimura <[email protected]>Tested-by Anatoly Burakov <[email protected]>
Applied, thanks