X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Fvirtio%2Fpci.h;h=0cada61d9b8d3566250d215ac3d7a2ac12093b22;hb=9a9604b09f15691d7c4ddf29afd99a31e7e31eed;hp=f9a58280aae854a1c30ea76060fa6285898a2f1b;hpb=379aac395a2cc78847d8f14264a22a3ee99fc1c2;p=vpp.git diff --git a/src/vnet/devices/virtio/pci.h b/src/vnet/devices/virtio/pci.h index f9a58280aae..0cada61d9b8 100644 --- a/src/vnet/devices/virtio/pci.h +++ b/src/vnet/devices/virtio/pci.h @@ -19,20 +19,20 @@ /* VirtIO ABI version, this must match exactly. */ #define VIRTIO_PCI_ABI_VERSION 0 +/* VirtIO device IDs. */ +#define VIRTIO_ID_NETWORK 0x01 + /* * Vector value used to disable MSI for queue. * define in include/linux/virtio_pci.h - * #define VIRTIO_MSI_NO_VECTOR 0xFFFF */ +#define VIRTIO_MSI_NO_VECTOR 0xFFFF /* The bit of the ISR which indicates a device has an interrupt. */ #define VIRTIO_PCI_ISR_INTR 0x1 /* The bit of the ISR which indicates a device configuration change. */ #define VIRTIO_PCI_ISR_CONFIG 0x2 -/* VirtIO device IDs. */ -#define VIRTIO_ID_NETWORK 0x01 - /* Status byte for guest to report progress. */ #define foreach_virtio_config_status_flags \ _ (VIRTIO_CONFIG_STATUS_RESET, 0x00) \ @@ -50,46 +50,19 @@ typedef enum #undef _ } virtio_config_status_flags_t; -#define foreach_virtio_net_feature_flags \ - _ (VIRTIO_NET_F_CSUM, 0) /* Host handles pkts w/ partial csum */ \ - _ (VIRTIO_NET_F_GUEST_CSUM, 1) /* Guest handles pkts w/ partial csum */ \ - _ (VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, 2) /* Dynamic offload configuration. */ \ - _ (VIRTIO_NET_F_MTU, 3) /* Initial MTU advice. */ \ - _ (VIRTIO_NET_F_MAC, 5) /* Host has given MAC address. */ \ - _ (VIRTIO_NET_F_GSO, 6) /* Host handles pkts w/ any GSO. */ \ - _ (VIRTIO_NET_F_GUEST_TSO4, 7) /* Guest can handle TSOv4 in. */ \ - _ (VIRTIO_NET_F_GUEST_TSO6, 8) /* Guest can handle TSOv6 in. */ \ - _ (VIRTIO_NET_F_GUEST_ECN, 9) /* Guest can handle TSO[6] w/ ECN in. */ \ - _ (VIRTIO_NET_F_GUEST_UFO, 10) /* Guest can handle UFO in. */ \ - _ (VIRTIO_NET_F_HOST_TSO4, 11) /* Host can handle TSOv4 in. */ \ - _ (VIRTIO_NET_F_HOST_TSO6, 12) /* Host can handle TSOv6 in. */ \ - _ (VIRTIO_NET_F_HOST_ECN, 13) /* Host can handle TSO[6] w/ ECN in. */ \ - _ (VIRTIO_NET_F_HOST_UFO, 14) /* Host can handle UFO in. */ \ - _ (VIRTIO_NET_F_MRG_RXBUF, 15) /* Host can merge receive buffers. */ \ - _ (VIRTIO_NET_F_STATUS, 16) /* virtio_net_config.status available */ \ - _ (VIRTIO_NET_F_CTRL_VQ, 17) /* Control channel available */ \ - _ (VIRTIO_NET_F_CTRL_RX, 18) /* Control channel RX mode support */ \ - _ (VIRTIO_NET_F_CTRL_VLAN, 19) /* Control channel VLAN filtering */ \ - _ (VIRTIO_NET_F_CTRL_RX_EXTRA, 20) /* Extra RX mode control support */ \ - _ (VIRTIO_NET_F_GUEST_ANNOUNCE, 21) /* Guest can announce device on the network */ \ - _ (VIRTIO_NET_F_MQ, 22) /* Device supports Receive Flow Steering */ \ - _ (VIRTIO_NET_F_CTRL_MAC_ADDR, 23) /* Set MAC address */ \ - _ (VIRTIO_F_NOTIFY_ON_EMPTY, 24) \ - _ (VHOST_F_LOG_ALL, 26) /* Log all write descriptors */ \ - _ (VIRTIO_F_ANY_LAYOUT, 27) /* Can the device handle any descripor layout */ \ - _ (VIRTIO_RING_F_INDIRECT_DESC, 28) /* Support indirect buffer descriptors */ \ - _ (VIRTIO_RING_F_EVENT_IDX, 29) /* The Guest publishes the used index for which it expects an interrupt \ - * at the end of the avail ring. Host should ignore the avail->flags field. */ \ -/* The Host publishes the avail index for which it expects a kick \ - * at the end of the used ring. Guest should ignore the used->flags field. */ \ - _ (VHOST_USER_F_PROTOCOL_FEATURES, 30) \ - _ (VIRTIO_F_VERSION_1, 32) \ - -#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS 2 -#define VIRTIO_NET_F_MTU 3 + #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ #define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */ +#define VIRTIO_NET_OK 0 +#define VIRTIO_NET_ERR 1 + +/* If multiqueue is provided by host, then we support it. */ +#define VIRTIO_NET_CTRL_MQ 4 +#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET 0 +#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN 1 +#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX 0x8000 + /* * Control network offloads * Reconfigures the network offloads that Guest can handle. @@ -114,7 +87,7 @@ typedef enum #define VIRTIO_PCI_QUEUE_ADDR_SHIFT 12 -#define VIRTIO_PCI_VRING_ALIGN 4096 +#define VNET_VIRTIO_PCI_VRING_ALIGN 4096 typedef enum { @@ -138,7 +111,7 @@ typedef struct typedef struct { - struct virtio_pci_cap cap; + virtio_pci_cap_t cap; u32 notify_off_multiplier; /* Multiplier for queue_notify_off. */ } virtio_pci_notify_cap_t; @@ -174,35 +147,29 @@ typedef struct u16 mtu; } virtio_net_config_t; -typedef struct -{ - u64 addr; - u32 len; - u16 flags; - u16 next; -} vring_desc_t; - -typedef struct +/* + * Control virtqueue data structures + * + * The control virtqueue expects a header in the first sg entry + * and an ack/status response in the last entry. Data for the + * command goes in between. + */ +/* *INDENT-OFF* */ +typedef CLIB_PACKED (struct { - u16 flags; - u16 idx; - u16 ring[0]; - /* u16 used_event; */ -} vring_avail_t; + u8 class; + u8 cmd; +}) virtio_net_ctrl_hdr_t; +/* *INDENT-ON* */ -typedef struct -{ - u32 id; - u32 len; -} vring_used_elem_t; +typedef u8 virtio_net_ctrl_ack_t; typedef struct { - u16 flags; - u16 idx; - vring_used_elem_t ring[0]; - /* u16 avail_event; */ -} vring_used_t; + virtio_net_ctrl_hdr_t ctrl; + virtio_net_ctrl_ack_t status; + u8 data[1024]; +} virtio_ctrl_msg_t; typedef struct _virtio_pci_func { @@ -225,10 +192,13 @@ typedef struct _virtio_pci_func u16 (*get_queue_size) (vlib_main_t * vm, virtio_if_t * vif, u16 queue_id); void (*set_queue_size) (vlib_main_t * vm, virtio_if_t * vif, u16 queue_id, u16 queue_size); - u8 (*setup_queue) (vlib_main_t * vm, virtio_if_t * vif, u16 queue_id, - void *p); + u8 (*setup_queue) (vlib_main_t *vm, virtio_if_t *vif, u16 queue_id, + vnet_virtio_vring_t *vring); void (*del_queue) (vlib_main_t * vm, virtio_if_t * vif, u16 queue_id); - void (*notify_queue) (vlib_main_t * vm, virtio_if_t * vif, u16 queue_id); + u16 (*get_queue_notify_off) (vlib_main_t * vm, virtio_if_t * vif, + u16 queue_id); + void (*notify_queue) (vlib_main_t * vm, virtio_if_t * vif, u16 queue_id, + u16 queue_notify_offset); u16 (*set_config_irq) (vlib_main_t * vm, virtio_if_t * vif, u16 vec); u16 (*set_queue_irq) (vlib_main_t * vm, virtio_if_t * vif, u16 vec, @@ -242,6 +212,28 @@ typedef struct _virtio_pci_func void (*device_debug_config_space) (vlib_main_t * vm, virtio_if_t * vif); } virtio_pci_func_t; +#define foreach_virtio_flags \ + _ (GSO, 0) \ + _ (CSUM_OFFLOAD, 1) \ + _ (GRO_COALESCE, 2) \ + _ (PACKED, 3) \ + _ (IN_ORDER, 4) \ + _ (BUFFERING, 5) + +typedef enum +{ +#define _(a, b) VIRTIO_FLAG_##a = (1 << b), + foreach_virtio_flags +#undef _ +} virtio_flag_t; + +typedef enum +{ + VIRTIO_BIND_NONE = 0, + VIRTIO_BIND_DEFAULT = 1, + VIRTIO_BIND_FORCE = 2, +} __clib_packed virtio_bind_t; + typedef struct { u32 addr; @@ -253,6 +245,9 @@ typedef struct u64 features; u8 gso_enabled; u8 checksum_offload_enabled; + virtio_bind_t bind; + u32 buffering_size; + u32 virtio_flags; clib_error_t *error; } virtio_pci_create_if_args_t;