From patchwork Wed Mar 1 03:56:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 9597635 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 038CE600CB for ; Wed, 1 Mar 2017 05:50:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF2DB28306 for ; Wed, 1 Mar 2017 05:50:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D26CB2842B; Wed, 1 Mar 2017 05:50:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6777528306 for ; Wed, 1 Mar 2017 05:50:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750988AbdCAFua (ORCPT ); Wed, 1 Mar 2017 00:50:30 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:33195 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750738AbdCAFu2 (ORCPT ); Wed, 1 Mar 2017 00:50:28 -0500 Received: by mail-pg0-f65.google.com with SMTP id x17so4625023pgi.0; Tue, 28 Feb 2017 21:49:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wc7SnjSXpF0a2Cqdjugn+mQtMh7w01zlk9TaF50hKjE=; b=FxDmr2yxJUyf6jRsiyNMH+sjYI65424Sqz84c6+VQ8ThENwU5drzADxc7aC5jLExBA 7E6NB5mYv11ajNOXH41XD1mbe45tcl9/XzrgGj2qGs7LHA7Htk19wUg+z2z9HJ/7LFFa //L6Stzu2lEAYKWMGJNqk+hlAvfJoFYXBjFmA7K7GIWv0aKjXPE533N/U1XjnNoq3tnO olrnSw2SDEPFydbxLKLyew7iI+Hf6FDtWi7F6iEKPa/v0X4T6/lTTQIIvNAK19qURqLs Ne8J6JwyZO7pTrjpscCAOAgB26g2XMNCYUEJr9UQSymEg31+EHt4Ekwgb1yk7LEgGopl hnvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Wc7SnjSXpF0a2Cqdjugn+mQtMh7w01zlk9TaF50hKjE=; b=QqJKSbGjzb8WL0WpGHl9um0fJ1eyB1NPCv0UMxw1Z37wcVyUxovL/ZxxnUFGBBw+hC 3QO/K5kVLav0cm8o/ib4rVx52UHC1uKBUFOvMKOwiAsWV601edGvojTduaGtiknQEFln HL1Q8Dg4t6QEacLWMaRfvUKxTVWiGrGebeSRR69+hBhQsVahhk4S6aQywEdZ0I2JKjHj qBefQPVY1yv26av7qFuXlXUnz/hi6Ic+2F+lFZTwsOohPzw2HICNyRC349w5QiB9ih+A aDqi7ASZAcmTHmUycV4J6HBZJ//SxQ37gdFOj5JK5ABU+Q4RkVvIm6d1Bp4QivEJ390C 2OHA== X-Gm-Message-State: AMke39kvtz7Rx8gUja7fpftlmOwBYaRDM0s5mq+ZN2K84r5WMpLLN3H+N/UcAQHUUaTvGA== X-Received: by 10.99.245.21 with SMTP id w21mr6387127pgh.117.1488340648574; Tue, 28 Feb 2017 19:57:28 -0800 (PST) Received: from hypervsock.localdomain (ec2-52-78-240-164.ap-northeast-2.compute.amazonaws.com. [52.78.240.164]) by smtp.gmail.com with ESMTPSA id n63sm6844703pfk.64.2017.02.28.19.57.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 19:57:27 -0800 (PST) From: Peng Tao To: David Miller Cc: netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, Stefan Hajnoczi , Jorgen Hansen , Peng Tao Subject: [PATCH-v4-RESEND 3/4] vsock: add pkt cancel capability Date: Wed, 1 Mar 2017 11:56:26 +0800 Message-Id: <1488340587-32416-4-git-send-email-bergwolf@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1488340587-32416-1-git-send-email-bergwolf@gmail.com> References: <1488340587-32416-1-git-send-email-bergwolf@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reviewed-by: Stefan Hajnoczi Signed-off-by: Peng Tao --- net/vmw_vsock/virtio_transport.c | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index 6788264..f5c44b5 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -213,6 +213,47 @@ 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; + } + + spin_lock_bh(&vsock->send_pkt_list_lock); + list_for_each_entry_safe(pkt, n, &vsock->send_pkt_list, list) { + if (pkt->cancel_token != 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); + } + + if (cnt) { + struct virtqueue *rx_vq = vsock->vqs[VSOCK_VQ_RX]; + int new_cnt; + + new_cnt = atomic_sub_return(cnt, &vsock->queued_replies); + if (new_cnt + cnt >= virtqueue_get_vring_size(rx_vq) && + new_cnt < virtqueue_get_vring_size(rx_vq)) + queue_work(virtio_vsock_workqueue, &vsock->rx_work); + } + + return 0; +} + static void virtio_vsock_rx_fill(struct virtio_vsock *vsock) { int buf_len = VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE; @@ -462,6 +503,7 @@ static struct virtio_transport virtio_transport = { .release = virtio_transport_release, .connect = virtio_transport_connect, .shutdown = virtio_transport_shutdown, + .cancel_pkt = virtio_transport_cancel_pkt, .dgram_bind = virtio_transport_dgram_bind, .dgram_dequeue = virtio_transport_dgram_dequeue,