From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peng Tao Subject: [PATCH 3/4] vsock: add pkt cancel capability Date: Wed, 7 Dec 2016 18:00:20 +0800 Message-ID: <1481104821-77294-4-git-send-email-bergwolf@gmail.com> References: <1481104821-77294-1-git-send-email-bergwolf@gmail.com> Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, Peng Tao To: Stefan Hajnoczi Return-path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:33817 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752247AbcLGKCv (ORCPT ); Wed, 7 Dec 2016 05:02:51 -0500 In-Reply-To: <1481104821-77294-1-git-send-email-bergwolf@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Peng Tao --- net/vmw_vsock/virtio_transport.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index 936d7ee..f88b6ed 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -170,6 +170,41 @@ virtio_transport_send_pkt(struct virtio_vsock_pkt *pkt) return len; } +static int +virtio_transport_cancel_pkt(struct vsock_sock *vsk) +{ + struct virtio_vsock *vsock; + struct virtio_vsock_pkt *pkt, *n; + int cnt = 0; + LIST_HEAD(freeme); + + vsock = virtio_vsock_get(); + if (!vsock) { + return -ENODEV; + } + + if (pkt->reply) + cnt++; + + spin_lock_bh(&vsock->send_pkt_list_lock); + list_for_each_entry_safe(pkt, n, &vsock->send_pkt_list, list) { + if (pkt->vsk != vsk) + continue; + list_move(&pkt->list, &freeme); + } + spin_unlock_bh(&vsock->send_pkt_list_lock); + + list_for_each_entry_safe(pkt, n, &freeme, list) { + if (pkt->reply) + cnt++; + list_del(&pkt->list); + virtio_transport_free_pkt(pkt); + } + atomic_sub(cnt, &vsock->queued_replies); + + return 0; +} + static void virtio_vsock_rx_fill(struct virtio_vsock *vsock) { int buf_len = VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE; @@ -453,6 +488,7 @@ static struct virtio_transport virtio_transport = { }, .send_pkt = virtio_transport_send_pkt, + .cancel_pkt = virtio_transport_cancel_pkt, }; static int virtio_vsock_probe(struct virtio_device *vdev) -- 2.7.4