/* Maximum packet size we can receive from tap device: header + 64k */
#define VIRTIO_NET_MAX_BUFSIZE (sizeof(struct virtio_net_hdr) + (64 << 10))
-
struct virtio_net_hdr {
uint8_t flags;
}__attribute__((packed));
-
-
#define QUEUE_SIZE 256
#define CTRL_QUEUE_SIZE 64
-
#define ETH_ALEN 6
struct virtio_net_config
{
- uint8_t mac[ETH_ALEN];
- // See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above
+ uint8_t mac[ETH_ALEN]; //VIRTIO_NET_F_MAC
uint16_t status;
} __attribute__((packed));
struct virtio_net_config net_cfg;
struct virtio_config virtio_cfg;
- //struct vm_device * pci_bus;
- struct pci_device * pci_dev;
+ struct pci_device * pci_dev;
+ int io_range_size;
struct virtio_queue rx_vq; //index 0, rvq in Linux virtio driver, handle packet to guest
struct virtio_queue tx_vq; //index 1, svq in Linux virtio driver, handle packet from guest
struct v3_dev_net_ops * net_ops;
void * backend_data;
-
struct virtio_dev_state * virtio_dev;
-
struct list_head dev_link;
-
- int io_range_size;
-
- void * private_data;
};
#if 1
v3_hexdump(pkt, size, NULL, 0);
}
+static struct virtio_net_state *temp_net_states[3];
+static int net_idx = 0;
+
+static int __virtio_dev_send(uchar_t * buf, uint32_t size, void *private_data);
+
static int send(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *dest_dev)
{
- PrintDebug("Virito NIC: In sending stub\n");
+ PrintDebug("Virito NIC: In sending stub, guest %p\n", private_data);
print_packet(buf, count);
+ struct virtio_net_state *virtio_state = (struct virtio_net_state *)private_data;
+ if (virtio_state == temp_net_states[0])
+ __virtio_dev_send(buf, count, temp_net_states[1]);
+
return count;
}
return 0;
}
-
#endif
static int virtio_free(struct vm_device * dev)
virtio->virtio_cfg.host_features = 0;
//virtio->virtio_cfg.status = VIRTIO_NET_S_LINK_UP;
virtio->virtio_cfg.pci_isr = 0;
- virtio->private_data = NULL;
return 0;
}
uint8_t * buf = NULL;
uint32_t len = buf_desc->length;
- PrintDebug("Handling Virtio Net write\n");
+ PrintDebug("Handling Virtio Net write, net_state: %p\n", virtio);
if (guest_pa_to_host_va(virtio->virtio_dev->vm, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) {
PrintError("Could not translate buffer address\n");
//send data to guest
-static int send_pkt_to_guest(struct vm_device * dev, uchar_t * buf, uint_t size, int raw, void * private_data)
+static int send_pkt_to_guest(struct virtio_net_state * virtio, uchar_t * buf, uint_t size, int raw, void * private_data)
{
- // TODO: This should not be like this
- struct virtio_net_state * virtio = (struct virtio_net_state *)dev->private_data;
struct virtio_queue * q = &(virtio->rx_vq);
struct virtio_net_hdr hdr;
uint32_t hdr_len = sizeof(struct virtio_net_hdr);
uint32_t data_len = size;
uint32_t offset = 0;
- PrintDebug("VIRTIO Handle RX: cur_index=%d (mod=%d), avail_index=%d\n",
+ PrintDebug("VIRTIO NIC: Handle RX: cur_index=%d (mod=%d), avail_index=%d\n",
q->cur_avail_idx, q->cur_avail_idx % q->queue_size, q->avail->index);
-
+ PrintDebug("VIRTIO NIC: sending packet to net_state %p, size:%d", virtio, size);
if (!raw) {
data_len -= hdr_len;
//copy header to the header descriptor
memcpy((void *)hdr_addr, &hdr, sizeof(struct virtio_net_hdr));
+ //Zheng 01/02/2010: zero payload
+ if (offset >= data_len) {
+ hdr_desc->flags &= ~VIRTIO_NEXT_FLAG;
+ }
+
//copy data to the next descriptors
- for (buf_idx = 0; offset < data_len; buf_idx = q->desc[hdr_idx].next) {
+ //Zheng 01/02/2010: put data into the next descriptor, rather than 0!
+ for (buf_idx = hdr_desc->next; offset < data_len; buf_idx = q->desc[hdr_idx].next) {
+ // for (buf_idx = 0; offset < data_len; buf_idx = q->desc[hdr_idx].next) {
struct vring_desc * buf_desc = &(q->desc[buf_idx]);
uint32_t len = 0;
- buf_desc->flags = VIRTIO_NEXT_FLAG;
+ //Zheng 01/02/2010: commented this - we need to check
+ // if there still is some data left
+ //buf_desc->flags = VIRTIO_NEXT_FLAG;
len = copy_data_to_desc(virtio, buf_desc, buf + offset, data_len - offset);
offset += len;
+
+ //Zheng 01/02/2010: check if there still is some data left
+ if (offset < data_len) {
+ buf_desc->flags = VIRTIO_NEXT_FLAG;
+ }
+
buf_desc->length = len; // TODO: do we need this?
}
}
-int virtio_send(struct vm_device * dev, uchar_t * buf, uint_t size) {
- return send_pkt_to_guest(dev, buf, size, 1, NULL);
+// TODO:
+int virtio_send(struct guest_info * vm, char *dev_name, uchar_t * buf, uint_t size) {
+ struct vm_device * virtio_dev = v3_find_dev(vm, dev_name);
+
+ // TODO: how to get virtio net state from device??
+ // this is not right now
+ struct virtio_net_state * virtio_state = (struct virtio_net_state *)virtio_dev->private_data;
+
+ return send_pkt_to_guest(virtio_state, buf, size, 1, NULL);
}
+static int __virtio_dev_send(uchar_t * buf, uint32_t size, void *private_data) {
+ struct virtio_net_state *virtio_state = (struct virtio_net_state *)private_data;
+
+ return send_pkt_to_guest(virtio_state, buf, size, 1, NULL);
+}
+
static int get_desc_count(struct virtio_queue * q, int index) {
struct vring_desc * tmp_desc = &(q->desc[index]);
int cnt = 1;
int port_idx = port % virtio->io_range_size;
- PrintDebug("VIRTIO NIC Write for port %d (index=%d) len=%d, value=%x\n",
+ PrintDebug("VIRTIO NIC %p Write for port %d (index=%d) len=%d, value=%x\n", private_data,
port, port_idx, length, *(uint32_t *)src);
int port_idx = port % virtio->io_range_size;
uint16_t queue_idx = virtio->virtio_cfg.vring_queue_selector;
- PrintDebug("VIRTIO NIC Read for port %d (index =%d), length=%d",
+ PrintDebug("Virtio NIC %p: Read for port %d (index =%d), length=%d", private_data,
port, port_idx, length);
switch (port_idx) {
break;
default:
- PrintError("Read of Unhandled Virtio Read\n");
+ PrintError("Virtio NIC: Read of Unhandled Virtio Read\n");
return -1;
}
NULL, NULL, NULL, net_state);
if (!pci_dev) {
- PrintError("Could not register PCI Device\n");
+ PrintError("Virtio NIC: Could not register PCI Device\n");
return -1;
}
- PrintDebug("Virtio-NIC registered to PCI bus\n");
+ PrintDebug("Virtio NIC: registered to PCI bus\n");
pci_dev->config_header.vendor_id = VIRTIO_VENDOR_ID;
pci_dev->config_header.subsystem_vendor_id = VIRTIO_SUBVENDOR_ID;
struct virtio_dev_state * virtio_state = NULL;
char * name = v3_cfg_val(cfg, "name");
- PrintDebug("Initializing VIRTIO Network device\n");
+ PrintDebug("Virtio NIC: Initializing VIRTIO Network device: %s\n", name);
if (pci_bus == NULL) {
- PrintError("VirtIO devices require a PCI Bus");
+ PrintError("Virtio NIC: VirtIO devices require a PCI Bus");
return -1;
}
struct vm_device * dev = v3_allocate_device(name, &dev_ops, virtio_state);
if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", name);
+ PrintError("Virtio NIC: Could not attach device %s\n", name);
return -1;
}
if (v3_dev_add_net_frontend(vm, name, connect_fn, (void *)virtio_state) == -1) {
- PrintError("Could not register %s as net frontend\n", name);
+ PrintError("Virtio NIC: Could not register %s as net frontend\n", name);
return -1;
}
register_dev(virtio_state, net_state);
- PrintDebug("Virtio NIC After register Device: queue size: %d, %d\n",
+ PrintDebug("Virtio NIC After register Device %s: queue size: %d, %d\n", dev->name,
net_state->rx_vq.queue_size, net_state->tx_vq.queue_size);
+ temp_net_states[net_idx ++] = net_state;
+ PrintDebug("Net_states: 0: %p, 1: %p, 2: %p\n", temp_net_states[0], temp_net_states[1], temp_net_states[2]);
+
#endif
return 0;