Add VFIO interrupt support for ixy driver.

Author: tzwickl

CMakeLists.txt

@@ -17,7 +17,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 
-set(SOURCE_COMMON src/pci.c src/memory.c src/stats.c src/driver/device.c src/driver/ixgbe.c src/driver/virtio.c src/libixy-vfio.c)
+set(SOURCE_COMMON src/pci.c src/memory.c src/stats.c src/interrupts.c src/driver/device.c src/driver/ixgbe.c src/driver/virtio.c src/libixy-vfio.c)
 
 add_executable(ixy-pktgen src/app/ixy-pktgen.c ${SOURCE_COMMON})
 add_executable(ixy-fwd src/app/ixy-fwd.c ${SOURCE_COMMON})

src/app/ixy-fwd.c

@@ -32,8 +32,8 @@ int main(int argc, char* argv[]) {
 		return 1;
 	}
 
-	struct ixy_device* dev1 = ixy_init(argv[1], 1, 1);
-	struct ixy_device* dev2 = ixy_init(argv[2], 1, 1);
+	struct ixy_device* dev1 = ixy_init(argv[1], 1, 1, -1);
+	struct ixy_device* dev2 = ixy_init(argv[2], 1, 1, 0);
 
 	uint64_t last_stats_printed = monotonic_time();
 	struct device_stats stats1, stats1_old;

src/app/ixy-pktgen.c

@@ -72,7 +72,7 @@ int main(int argc, char* argv[]) {
 	}
 
 	struct mempool* mempool = init_mempool();
-	struct ixy_device* dev = ixy_init(argv[1], 1, 1);
+	struct ixy_device* dev = ixy_init(argv[1], 1, 1, 0);
 
 	uint64_t last_stats_printed = monotonic_time();
 	uint64_t counter = 0;

src/driver/device.c

@@ -5,7 +5,7 @@
 #include "driver/virtio.h"
 #include "pci.h"
 
-struct ixy_device* ixy_init(const char* pci_addr, uint16_t rx_queues, uint16_t tx_queues) {
+struct ixy_device* ixy_init(const char* pci_addr, uint16_t rx_queues, uint16_t tx_queues, int interrupt_timeout) {
 	// Read PCI configuration space
 	// For VFIO, we could access the config space another way
 	// (VFIO_PCI_CONFIG_REGION_INDEX). This is not needed, though, because
@@ -23,6 +23,6 @@ struct ixy_device* ixy_init(const char* pci_addr, uint16_t rx_queues, uint16_t t
 		return virtio_init(pci_addr, rx_queues, tx_queues);
 	} else {
 		// Our best guess is to try ixgbe
-		return ixgbe_init(pci_addr, rx_queues, tx_queues);
+		return ixgbe_init(pci_addr, rx_queues, tx_queues, interrupt_timeout);
 	}
 }

src/driver/device.h

@@ -6,6 +6,7 @@
 
 #include "log.h"
 #include "memory.h"
+#include "../interrupts.h"
 
 #define MAX_QUEUES 64
 
@@ -42,9 +43,10 @@ struct ixy_device {
 	uint32_t (*get_link_speed) (const struct ixy_device* dev);
 	bool vfio;
 	int vfio_fd; // device fd
+	struct interrupts interrupts;
 };
 
-struct ixy_device* ixy_init(const char* pci_addr, uint16_t rx_queues, uint16_t tx_queues);
+struct ixy_device* ixy_init(const char* pci_addr, uint16_t rx_queues, uint16_t tx_queues, int interrupt_timeout);
 
 // Public stubs that forward the calls to the driver-specific implementations
 static inline uint32_t ixy_rx_batch(struct ixy_device* dev, uint16_t queue_id, struct pkt_buf* bufs[], uint32_t num_bufs) {