Commit ca60a42c authored by Rusty Russell's avatar Rusty Russell

lguest: don't force VIRTIO_F_NOTIFY_ON_EMPTY

VIRTIO_F_NOTIFY_ON_EMPTY indicates to the Guest that we will hit them with
an interrupt every time the xmit queue is emptied.

Because it results in lots of tx interrupts, modern Guests probably don't
want it, so let's only force it when they accept the option.
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 6c189d83
...@@ -134,6 +134,9 @@ struct device { ...@@ -134,6 +134,9 @@ struct device {
/* Is it operational */ /* Is it operational */
bool running; bool running;
/* Does Guest want an intrrupt on empty? */
bool irq_on_empty;
/* Device-specific data. */ /* Device-specific data. */
void *priv; void *priv;
}; };
...@@ -624,10 +627,13 @@ static void trigger_irq(struct virtqueue *vq) ...@@ -624,10 +627,13 @@ static void trigger_irq(struct virtqueue *vq)
return; return;
vq->pending_used = 0; vq->pending_used = 0;
/* If they don't want an interrupt, don't send one, unless empty. */ /* If they don't want an interrupt, don't send one... */
if ((vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT) if (vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT) {
&& lg_last_avail(vq) != vq->vring.avail->idx) /* ... unless they've asked us to force one on empty. */
return; if (!vq->dev->irq_on_empty
|| lg_last_avail(vq) != vq->vring.avail->idx)
return;
}
/* Send the Guest an interrupt tell them we used something up. */ /* Send the Guest an interrupt tell them we used something up. */
if (write(lguest_fd, buf, sizeof(buf)) != 0) if (write(lguest_fd, buf, sizeof(buf)) != 0)
...@@ -1043,6 +1049,15 @@ static void create_thread(struct virtqueue *vq) ...@@ -1043,6 +1049,15 @@ static void create_thread(struct virtqueue *vq)
close(vq->eventfd); close(vq->eventfd);
} }
static bool accepted_feature(struct device *dev, unsigned int bit)
{
const u8 *features = get_feature_bits(dev) + dev->feature_len;
if (dev->feature_len < bit / CHAR_BIT)
return false;
return features[bit / CHAR_BIT] & (1 << (bit % CHAR_BIT));
}
static void start_device(struct device *dev) static void start_device(struct device *dev)
{ {
unsigned int i; unsigned int i;
...@@ -1056,6 +1071,8 @@ static void start_device(struct device *dev) ...@@ -1056,6 +1071,8 @@ static void start_device(struct device *dev)
verbose(" %02x", get_feature_bits(dev) verbose(" %02x", get_feature_bits(dev)
[dev->feature_len+i]); [dev->feature_len+i]);
dev->irq_on_empty = accepted_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);
for (vq = dev->vq; vq; vq = vq->next) { for (vq = dev->vq; vq; vq = vq->next) {
if (vq->service) if (vq->service)
create_thread(vq); create_thread(vq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment