From patchwork Wed Mar 1 03:56:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 734086 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vY4LR65Y6z9s81 for ; Wed, 1 Mar 2017 16:50:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GszORTKn"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751623AbdCAFul (ORCPT ); Wed, 1 Mar 2017 00:50:41 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:36612 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102AbdCAFuk (ORCPT ); Wed, 1 Mar 2017 00:50:40 -0500 Received: by mail-pg0-f67.google.com with SMTP id 25so4633698pgy.3; Tue, 28 Feb 2017 21:50:39 -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=d4wmW46VUmz+rr2qWU8B3mIKxJtlsM1+drPrewa5Z1o=; b=GszORTKnBlJA4rwSaBrz73K/Ry+d+4hSYDf64lxCOGJZwb1VvzOjjsq+BsPfpMX2cJ tdHakXq2teQOXCdCvQtxVkv9rRNDnlJHwwO6/qbgWvxgHUSsH0Vu9DSNZsU2AMoVUqYc cI56lXcZElQR4/z9CqB7X+Ach4I6H1IR+TgEzgzbG2kvDrkj4bwsEdwPW5GyNbcBzCFI KuD2fCnAXWrIwhJgetkK2gGvalYZ+wmvrAv+/pwJpRXuc58QOZZtgxans6fDFkIKp6c+ alT1a6PMVk9BPIOSCefXsFA31mUqvnGEjTYDpQWKcT7BTzx2rUsq7o24pVOCh9FUTfwF K2bA== 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=d4wmW46VUmz+rr2qWU8B3mIKxJtlsM1+drPrewa5Z1o=; b=NV20gEKXo4J+gWCTt/6cXiHTjyDe93eU+2KdPcK4BCCumvmqSXLkv3Pr2XOEq1hxbl nUCq8sf+mqsFWi3cDcE91yFIpsIBAzfKehnU5CQ+0J//bNSDycUADC1kF38WWXeIzS1o oxMuVftj5kLngQtwjKb00wFwgsihEXj6XoI+KWpbw1WONJH8nUeIysWO6m9DT/rXYjMG WS1LAXg5f9WonYFVQG2P3InaaR6Jlb6ZjkvbZajNZ69R5lRVtZUY5m9TrxVZ46ScZwIi ugOGVByr2UIqZN6u0cRtP9IPl919+Bcebs9Uvah3jUrzj0c/b77t26qsqyQCTZoUVFY3 7VAg== X-Gm-Message-State: AMke39kTvoy9G5X/t7K5WoBtmcnOxY6d9dwx3wz7nVI4wKz77xXDcFylK4Bj8y1S50848g== X-Received: by 10.84.232.1 with SMTP id h1mr7416657plk.95.1488340642341; Tue, 28 Feb 2017 19:57:22 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Feb 2017 19:57:21 -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 2/4] vhost-vsock: add pkt cancel capability Date: Wed, 1 Mar 2017 11:56:25 +0800 Message-Id: <1488340587-32416-3-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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To allow canceling all packets of a connection. Reviewed-by: Stefan Hajnoczi Reviewed-by: Jorgen Hansen Signed-off-by: Peng Tao --- drivers/vhost/vsock.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/net/af_vsock.h | 3 +++ 2 files changed, 44 insertions(+) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index ce5e63d..57babce 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -223,6 +223,46 @@ vhost_transport_send_pkt(struct virtio_vsock_pkt *pkt) return len; } +static int +vhost_transport_cancel_pkt(struct vsock_sock *vsk) +{ + struct vhost_vsock *vsock; + struct virtio_vsock_pkt *pkt, *n; + int cnt = 0; + LIST_HEAD(freeme); + + /* Find the vhost_vsock according to guest context id */ + vsock = vhost_vsock_get(vsk->remote_addr.svm_cid); + 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 vhost_virtqueue *tx_vq = &vsock->vqs[VSOCK_VQ_TX]; + int new_cnt; + + new_cnt = atomic_sub_return(cnt, &vsock->queued_replies); + if (new_cnt + cnt >= tx_vq->num && new_cnt < tx_vq->num) + vhost_poll_queue(&tx_vq->poll); + } + + return 0; +} + static struct virtio_vsock_pkt * vhost_vsock_alloc_pkt(struct vhost_virtqueue *vq, unsigned int out, unsigned int in) @@ -675,6 +715,7 @@ static struct virtio_transport vhost_transport = { .release = virtio_transport_release, .connect = virtio_transport_connect, .shutdown = virtio_transport_shutdown, + .cancel_pkt = vhost_transport_cancel_pkt, .dgram_enqueue = virtio_transport_dgram_enqueue, .dgram_dequeue = virtio_transport_dgram_dequeue, diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index f275896..f32ed9a 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -100,6 +100,9 @@ struct vsock_transport { void (*destruct)(struct vsock_sock *); void (*release)(struct vsock_sock *); + /* Cancel all pending packets sent on vsock. */ + int (*cancel_pkt)(struct vsock_sock *vsk); + /* Connections. */ int (*connect)(struct vsock_sock *);