diff options
| author | Gerard Garcia <ggarcia@deic.uab.cat> | 2017-04-21 10:10:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-24 12:35:56 -0400 |
| commit | 82dfb540aeb277d945bf646ff780493b8a520d8a (patch) | |
| tree | a3cddfc8d7dc3bd71133e56e5a3d8005f58b0ad8 /drivers/vhost | |
| parent | 0b2e66448ba20eb30ea62345d6beb9ee2a1ce06b (diff) | |
| download | op-kernel-dev-82dfb540aeb277d945bf646ff780493b8a520d8a.zip op-kernel-dev-82dfb540aeb277d945bf646ff780493b8a520d8a.tar.gz | |
VSOCK: Add virtio vsock vsockmon hooks
The virtio drivers deal with struct virtio_vsock_pkt. Add
virtio_transport_deliver_tap_pkt(pkt) for handing packets to the
vsockmon device.
We call virtio_transport_deliver_tap_pkt(pkt) from
net/vmw_vsock/virtio_transport.c and drivers/vhost/vsock.c instead of
common code. This is because the drivers may drop packets before
handing them to common code - we still want to capture them.
Signed-off-by: Gerard Garcia <ggarcia@deic.uab.cat>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vsock.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 44eed8e..d939ac1 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -176,6 +176,11 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, restart_tx = true; } + /* Deliver to monitoring devices all correctly transmitted + * packets. + */ + virtio_transport_deliver_tap_pkt(pkt); + virtio_transport_free_pkt(pkt); } if (added) @@ -383,6 +388,9 @@ static void vhost_vsock_handle_tx_kick(struct vhost_work *work) len = pkt->len; + /* Deliver to monitoring devices all received packets */ + virtio_transport_deliver_tap_pkt(pkt); + /* Only accept correctly addressed packets */ if (le64_to_cpu(pkt->hdr.src_cid) == vsock->guest_cid) virtio_transport_recv_pkt(pkt); |
