struct virtio_net_state * virtio_state,
int quote)
{
- struct virtio_queue *q = &(virtio_state->tx_vq);
+ struct virtio_queue * q;
int txed = 0, left = 0;
unsigned long flags;
+ q = &(virtio_state->tx_vq);
if (!q->ring_avail_addr) {
return -1;
}
- flags = v3_lock_irqsave(virtio_state->tx_lock);
- while (q->cur_avail_idx != q->avail->index) {
- struct virtio_net_hdr_mrg_rxbuf * hdr = NULL;
+ while (1) {
struct vring_desc * hdr_desc = NULL;
addr_t hdr_addr = 0;
- uint16_t desc_idx = q->avail->ring[q->cur_avail_idx % q->queue_size];
- int desc_cnt = get_desc_count(q, desc_idx);
+ uint16_t desc_idx, tmp_idx;
+ int desc_cnt;
+
+ flags = v3_lock_irqsave(virtio_state->tx_lock);
+
+ if(q->cur_avail_idx == q->avail->index ||
+ (quote > 0 && txed >= quote)) {
+ left = (q->cur_avail_idx != q->avail->index);
+ v3_unlock_irqrestore(virtio_state->tx_lock, flags);
+ break;
+ }
+
+ desc_idx = q->avail->ring[q->cur_avail_idx % q->queue_size];
+ tmp_idx = q->cur_avail_idx ++;
+
+ v3_unlock_irqrestore(virtio_state->tx_lock, flags);
+ desc_cnt = get_desc_count(q, desc_idx);
if(desc_cnt != 2){
PrintError("VNIC: merged rx buffer not supported, desc_cnt %d\n", desc_cnt);
- goto exit_error;
}
hdr_desc = &(q->desc[desc_idx]);
- if (v3_gpa_to_hva(core, hdr_desc->addr_gpa, &(hdr_addr)) == -1) {
- PrintError("Could not translate block header address\n");
- goto exit_error;
- }
-
- hdr = (struct virtio_net_hdr_mrg_rxbuf *)hdr_addr;
- desc_idx = hdr_desc->next;
+ if (v3_gpa_to_hva(core, hdr_desc->addr_gpa, &(hdr_addr)) != -1) {
+ struct virtio_net_hdr_mrg_rxbuf * hdr;
+ struct vring_desc * buf_desc;
- V3_Net_Print(2, "Virtio NIC: TX hdr count : %d\n", hdr->num_buffers);
+ hdr = (struct virtio_net_hdr_mrg_rxbuf *)hdr_addr;
+ desc_idx = hdr_desc->next;
- /* here we assumed that one ethernet pkt is not splitted into multiple buffer */
- struct vring_desc * buf_desc = &(q->desc[desc_idx]);
- if (tx_one_pkt(core, virtio_state, buf_desc) == -1) {
- PrintError("Virtio NIC: Fails to send packet\n");
- }
- if(buf_desc->next & VIRTIO_NEXT_FLAG){
- PrintError("Virtio NIC: TX more buffer need to read\n");
+ /* here we assumed that one ethernet pkt is not splitted into multiple buffer */
+ buf_desc = &(q->desc[desc_idx]);
+ if (tx_one_pkt(core, virtio_state, buf_desc) == -1) {
+ PrintError("Virtio NIC: Fails to send packet\n");
+ }
+ } else {
+ PrintError("Could not translate block header address\n");
}
+
+ flags = v3_lock_irqsave(virtio_state->tx_lock);
q->used->ring[q->used->index % q->queue_size].id =
- q->avail->ring[q->cur_avail_idx % q->queue_size];
-
- q->used->ring[q->used->index % q->queue_size].length =
- buf_desc->length; /* What do we set this to???? */
+ q->avail->ring[tmp_idx % q->queue_size];
q->used->index ++;
- q->cur_avail_idx ++;
- if(++txed >= quote && quote > 0){
- left = (q->cur_avail_idx != q->avail->index);
- break;
- }
+ v3_unlock_irqrestore(virtio_state->tx_lock, flags);
+
+ txed ++;
}
-
- v3_unlock_irqrestore(virtio_state->tx_lock, flags);
-
+
if (txed && !(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
v3_pci_raise_irq(virtio_state->virtio_dev->pci_bus,
- 0, virtio_state->pci_dev);
+ virtio_state->pci_dev, 0);
virtio_state->virtio_cfg.pci_isr = 0x1;
virtio_state->stats.rx_interrupts ++;
}
- if(txed > 0) {
- V3_Net_Print(2, "Virtio Handle TX: txed pkts: %d, left %d\n", txed, left);
- }
-
return left;
-
- exit_error:
-
- v3_unlock_irqrestore(virtio_state->tx_lock, flags);
- return -1;
}
*(uint8_t *)dst = virtio->virtio_cfg.pci_isr;
virtio->virtio_cfg.pci_isr = 0;
v3_pci_lower_irq(virtio->virtio_dev->pci_bus,
- 0, virtio->pci_dev);
+ virtio->pci_dev, 0);
break;
case VIRTIO_NET_CONFIG ... VIRTIO_NET_CONFIG + ETH_ALEN:
virtio->pci_dev->config_header.intr_line);
virtio->virtio_cfg.pci_isr = 0x1;
- v3_pci_raise_irq(virtio->virtio_dev->pci_bus, 0, virtio->pci_dev);
+ v3_pci_raise_irq(virtio->virtio_dev->pci_bus, virtio->pci_dev, 0);
virtio->stats.rx_interrupts ++;
}
pci_dev = v3_pci_register_device(virtio->pci_bus, PCI_STD_DEVICE,
0, PCI_AUTO_DEV_NUM, 0,
"LNX_VIRTIO_NIC", bars,
- NULL, NULL, NULL, net_state);
+ NULL, NULL, NULL, NULL, net_state);
if (!pci_dev) {
PrintError("Virtio NIC: Could not register PCI Device\n");
return 0;
}
+#if 0
#define RATE_UPPER_THRESHOLD 10 /* 10000 pkts per second, around 100Mbits */
#define RATE_LOWER_THRESHOLD 1
#define PROFILE_PERIOD 10000 /*us*/
static struct v3_timer_ops timer_ops = {
.update_timer = virtio_nic_timer,
};
-
+#endif
static int connect_fn(struct v3_vm_info * info,
void * frontend_data,
struct virtio_dev_state * virtio = (struct virtio_dev_state *)frontend_data;
struct virtio_net_state * net_state = (struct virtio_net_state *)V3_Malloc(sizeof(struct virtio_net_state));
+ if (!net_state) {
+ PrintError("Cannot allocate in connect\n");
+ return -1;
+ }
+
memset(net_state, 0, sizeof(struct virtio_net_state));
register_dev(virtio, net_state);
net_state->tx_notify = 1;
net_state->rx_notify = 1;
- net_state->timer = v3_add_timer(&(info->cores[0]),
- &timer_ops,net_state);
+ //net_state->timer = v3_add_timer(&(info->cores[0]), &timer_ops,net_state);
ops->recv = virtio_rx;
ops->poll = virtio_poll;
ops->config.poll = 1;
ops->config.quote = 64;
ops->config.fnt_mac = V3_Malloc(ETH_ALEN);
+
+ if (!ops->config.fnt_mac) {
+ PrintError("Cannot allocate in connect\n");
+ // should unregister here
+ return -1;
+ }
+
memcpy(ops->config.fnt_mac, virtio->mac, ETH_ALEN);
return 0;
}
virtio_state = (struct virtio_dev_state *)V3_Malloc(sizeof(struct virtio_dev_state));
+
+ if (!virtio_state) {
+ PrintError("Cannot allocate in init\n");
+ return -1;
+ }
+
memset(virtio_state, 0, sizeof(struct virtio_dev_state));
INIT_LIST_HEAD(&(virtio_state->dev_list));
