mirror of
https://github.com/xcat2/xNBA.git
synced 2026-09-12 04:16:21 +00:00
Stefan Hajnoczi
e4419ff97c
This patch adds a native iPXE virtio-net driver and removes the legacy Etherboot virtio-net driver. The main reasons for doing this are: 1. Multiple virtio-net NICs are now supported by iPXE. The legacy driver kept global state and caused issues in virtual machines with more than one virtio-net device. 2. Faster downloads. The native iPXE driver downloads 100 MB over HTTP in 12s, the legacy Etherboot driver in 37s. This simple benchmark uses KVM with tap networking and the Python SimpleHTTPServer both running on the same host. Changes to core virtio code reduce vring descriptors to 256 (QEMU uses 128 for virtio-blk and 256 for virtio-net) and change the opaque token from u16 to void*. Lowering the descriptor count reduces memory consumption. The void* opaque token change makes driver code simpler. Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Michael Brown <mcb30@ipxe.org>
102 lines
2.7 KiB
C
102 lines
2.7 KiB
C
#ifndef _VIRTIO_PCI_H_
|
|
# define _VIRTIO_PCI_H_
|
|
|
|
/* A 32-bit r/o bitmask of the features supported by the host */
|
|
#define VIRTIO_PCI_HOST_FEATURES 0
|
|
|
|
/* A 32-bit r/w bitmask of features activated by the guest */
|
|
#define VIRTIO_PCI_GUEST_FEATURES 4
|
|
|
|
/* A 32-bit r/w PFN for the currently selected queue */
|
|
#define VIRTIO_PCI_QUEUE_PFN 8
|
|
|
|
/* A 16-bit r/o queue size for the currently selected queue */
|
|
#define VIRTIO_PCI_QUEUE_NUM 12
|
|
|
|
/* A 16-bit r/w queue selector */
|
|
#define VIRTIO_PCI_QUEUE_SEL 14
|
|
|
|
/* A 16-bit r/w queue notifier */
|
|
#define VIRTIO_PCI_QUEUE_NOTIFY 16
|
|
|
|
/* An 8-bit device status register. */
|
|
#define VIRTIO_PCI_STATUS 18
|
|
|
|
/* An 8-bit r/o interrupt status register. Reading the value will return the
|
|
* current contents of the ISR and will also clear it. This is effectively
|
|
* a read-and-acknowledge. */
|
|
#define VIRTIO_PCI_ISR 19
|
|
|
|
/* The bit of the ISR which indicates a device configuration change. */
|
|
#define VIRTIO_PCI_ISR_CONFIG 0x2
|
|
|
|
/* The remaining space is defined by each driver as the per-driver
|
|
* configuration space */
|
|
#define VIRTIO_PCI_CONFIG 20
|
|
|
|
/* Virtio ABI version, this must match exactly */
|
|
#define VIRTIO_PCI_ABI_VERSION 0
|
|
|
|
static inline u32 vp_get_features(unsigned int ioaddr)
|
|
{
|
|
return inl(ioaddr + VIRTIO_PCI_HOST_FEATURES);
|
|
}
|
|
|
|
static inline void vp_set_features(unsigned int ioaddr, u32 features)
|
|
{
|
|
outl(features, ioaddr + VIRTIO_PCI_GUEST_FEATURES);
|
|
}
|
|
|
|
static inline void vp_get(unsigned int ioaddr, unsigned offset,
|
|
void *buf, unsigned len)
|
|
{
|
|
u8 *ptr = buf;
|
|
unsigned i;
|
|
|
|
for (i = 0; i < len; i++)
|
|
ptr[i] = inb(ioaddr + VIRTIO_PCI_CONFIG + offset + i);
|
|
}
|
|
|
|
static inline u8 vp_get_status(unsigned int ioaddr)
|
|
{
|
|
return inb(ioaddr + VIRTIO_PCI_STATUS);
|
|
}
|
|
|
|
static inline void vp_set_status(unsigned int ioaddr, u8 status)
|
|
{
|
|
if (status == 0) /* reset */
|
|
return;
|
|
outb(status, ioaddr + VIRTIO_PCI_STATUS);
|
|
}
|
|
|
|
static inline u8 vp_get_isr(unsigned int ioaddr)
|
|
{
|
|
return inb(ioaddr + VIRTIO_PCI_ISR);
|
|
}
|
|
|
|
static inline void vp_reset(unsigned int ioaddr)
|
|
{
|
|
outb(0, ioaddr + VIRTIO_PCI_STATUS);
|
|
(void)inb(ioaddr + VIRTIO_PCI_ISR);
|
|
}
|
|
|
|
static inline void vp_notify(unsigned int ioaddr, int queue_index)
|
|
{
|
|
outw(queue_index, ioaddr + VIRTIO_PCI_QUEUE_NOTIFY);
|
|
}
|
|
|
|
static inline void vp_del_vq(unsigned int ioaddr, int queue_index)
|
|
{
|
|
/* select the queue */
|
|
|
|
outw(queue_index, ioaddr + VIRTIO_PCI_QUEUE_SEL);
|
|
|
|
/* deactivate the queue */
|
|
|
|
outl(0, ioaddr + VIRTIO_PCI_QUEUE_PFN);
|
|
}
|
|
|
|
int vp_find_vq(unsigned int ioaddr, int queue_index,
|
|
struct vring_virtqueue *vq);
|
|
#endif /* _VIRTIO_PCI_H_ */
|