diff options
| author |   Stefano Garzarella <sgarzare@redhat.com> | 2021-11-22 17:35:25 +0100 |
|---|---|---|
| committer |   Michael S. Tsirkin <mst@redhat.com> | 2021-11-24 19:00:28 -0500 |
| commit | 11708ff92c1dba9aaa59168c46c5317677595942 (patch) | |
| tree | b9969fbb2ace02b0fcd87489c320b6796ad6f8b8 | |
| parent | vhost/vsock: fix incorrect used length reported to the guest (diff) | |
| download | linux-dev-11708ff92c1dba9aaa59168c46c5317677595942.tar.xz linux-dev-11708ff92c1dba9aaa59168c46c5317677595942.zip | |
vhost/vsock: cleanup removing `len` variable
We can increment `total_len` directly and remove `len` since it
is no longer used for vhost_add_used().
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Link: https://lore.kernel.org/r/20211122163525.294024-3-sgarzare@redhat.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | drivers/vhost/vsock.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 4e3b95af7ee4..d6ca1c7ad513 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -511,8 +511,6 @@ static void vhost_vsock_handle_tx_kick(struct vhost_work *work) vhost_disable_notify(&vsock->dev, vq); do { - u32 len; - if (!vhost_vsock_more_replies(vsock)) { /* Stop tx until the device processes already * pending replies. Leave tx virtqueue @@ -540,7 +538,7 @@ static void vhost_vsock_handle_tx_kick(struct vhost_work *work) continue; } - len = pkt->len; + total_len += sizeof(pkt->hdr) + pkt->len; /* Deliver to monitoring devices all received packets */ virtio_transport_deliver_tap_pkt(pkt); @@ -553,9 +551,7 @@ static void vhost_vsock_handle_tx_kick(struct vhost_work *work) else virtio_transport_free_pkt(pkt); - len += sizeof(pkt->hdr); vhost_add_used(vq, head, 0); - total_len += len; added = true; } while(likely(!vhost_exceeds_weight(vq, ++pkts, total_len))); |