Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

vfio: fix compatability with older kernels (4.19) found on OPAL RT-Linux targets

Browse source 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
This commit is contained in:
Steffen Vogel 2023-01-05 14:38:00 +00:00 • committed by Steffen Vogel
parent 3b2d3fb3fb
commit 33da5e4ff7
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/include/villas/kernel/vfio_container.hpp
View file

@ -24,7 +24,14 @@ namespace villas {
namespace kernel {
namespace vfio {
// Backwards compatability with older kernels
#ifdef VFIO_UPDATE_VADDR
static constexpr size_t EXTENSION_SIZE = VFIO_UPDATE_VADDR+1;
#elif defined(VFIO_UNMAP_ALL)
static constexpr size_t EXTENSION_SIZE = VFIO_UNMAP_ALL+1;
#else
static constexpr size_t EXTENSION_SIZE = VFIO_NOIOMMU_IOMMU+1;
#endif
class Container {
public:

5
common/lib/kernel/vfio_container.cpp
View file

@ -52,8 +52,13 @@ static std::array<std::string, EXTENSION_SIZE> construct_vfio_extension_str() {
ret[VFIO_TYPE1_NESTING_IOMMU] = "Type 1 Nesting";
ret[VFIO_SPAPR_TCE_v2_IOMMU] = "SPAPR TCE v2";
ret[VFIO_NOIOMMU_IOMMU] = "No IOMMU";
// Backwards compatability with older kernels
#ifdef VFIO_UNMAP_ALL
ret[VFIO_UNMAP_ALL] = "Unmap all";
#endif
#ifdef VFIO_UPDATE_VADDR
ret[VFIO_UPDATE_VADDR] = "Update vaddr";
#endif
return ret;
}

5
common/lib/kernel/vfio_device.cpp
View file

@ -79,8 +79,8 @@ Device::Device(const std::string &name, int groupFileDescriptor, const kernel::p
if (ret < 0)
throw RuntimeError("Failed to get VFIO device info for: {}", name);
log->debug("device info: flags: 0x{:x}, num_regions: {}, num_irqs: {}, cap_offset: 0x{:x}",
info.flags, info.num_regions, info.num_irqs, info.cap_offset);
log->debug("device info: flags: 0x{:x}, num_regions: {}, num_irqs: {}",
info.flags, info.num_regions, info.num_irqs);
// device_info.num_region reports always 9 and includes a VGA region, which is only supported on
// certain device IDs. So for non-VGA devices VFIO_PCI_CONFIG_REGION_INDEX will be the highest
@ -110,7 +110,6 @@ Device::Device(const std::string &name, int groupFileDescriptor, const kernel::p
regions[i] = region;
}
// Get device IRQs
for (size_t i = 0; i < info.num_irqs; i++) {
struct vfio_irq_info irq;