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

kernel/vfio: improve cleanup

Browse source 
Signed-off-by: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
This commit is contained in:
Niklas Eiling 2022-12-01 15:05:04 +01:00 • committed by Steffen Vogel
parent 2f5488d56c
commit eb45f7a0ab
2 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
common/include/villas/kernel/vfio.hpp
View file

@ -27,20 +27,9 @@ namespace villas {
namespace kernel {
namespace pci {
/* Forward declarations */
struct Device;
}
namespace vfio {
/* Forward declarations */
class Container;
class Group;
class Device {
friend class Container;
public:
Device(const std::string &name, Group &group) :
name(name),
@ -110,6 +99,12 @@ public:
static std::unique_ptr<Group>
attach(Container &container, int groupIndex);
std::list<std::unique_ptr<Device>>& getDevices()
{ return devices; }
int getFd()
{ return fd; }
private:
/// VFIO group file descriptor
int fd;
@ -159,10 +154,12 @@ public:
const int &getFd() const
{ return fd; }
std::list<std::unique_ptr<Group>> &getGroups()
{ return groups; }
private:
Group & getOrAttachGroup(int index);
private:
int fd;
int version;
int extensions;

24
common/lib/kernel/vfio.cpp
View file

@ -59,11 +59,27 @@ static const char *vfio_pci_irq_names[] = {
namespace villas {
void panicResetEverything()
{
int ret = 0;
for (auto& group : container->getGroups()) {
for (auto& device : group->getDevices()) {
ret += device->reset();
}
if (group->getFd() > 0) {
ret += ioctl(group->getFd(), VFIO_GROUP_UNSET_CONTAINER);
}
}
if (ret > 0)
logging.get("kernel:vfio")->error("panic reset return errors.");
}
Container::Container()
: iova_next(0)
{
Logger logger = logging.get("kernel:vfio");
spdlog::set_level(spdlog::level::debug);
static constexpr const char* requiredKernelModules[] = {
"vfio", "vfio_pci", "vfio_iommu_type1"
@ -107,6 +123,11 @@ Container::Container()
logger->debug("Version: {:#x}", version);
logger->debug("Extensions: {:#x}", extensions);
logger->debug("IOMMU: {}", hasIommu ? "yes" : "no");
container = this;
std::atexit([](){
panicResetEverything();
});
}
@ -417,6 +438,7 @@ Device::~Device()
for (auto &region : regions) {
regionUnmap(region.index);
}
reset();
int ret = close(fd);
if (ret != 0) {
@ -428,6 +450,7 @@ Device::~Device()
bool
Device::reset()
{
logging.get("kernel:vfio")->debug("Resetting device.");
if (this->info.flags & VFIO_DEVICE_FLAGS_RESET)
return ioctl(this->fd, VFIO_DEVICE_RESET) == 0;
else
@ -735,6 +758,7 @@ Group::~Group()
if (fd < 0)
logger->debug("Destructing group that has not been attached");
else {
logger->debug("unsetting group container");
int ret = ioctl(fd, VFIO_GROUP_UNSET_CONTAINER);
if (ret != 0)
logger->error("Cannot unset container for group fd {}", fd);