From patchwork Wed Dec 7 15:14:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 9464657 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 BA9C46074E for ; Wed, 7 Dec 2016 15:14:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4AC9284F5 for ; Wed, 7 Dec 2016 15:14:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8312284D5; Wed, 7 Dec 2016 15:14:46 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 4A2BF284F5 for ; Wed, 7 Dec 2016 15:14:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932429AbcLGPOi (ORCPT ); Wed, 7 Dec 2016 10:14:38 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:32969 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932237AbcLGPOg (ORCPT ); Wed, 7 Dec 2016 10:14:36 -0500 Received: by mail-pg0-f66.google.com with SMTP id 3so23788018pgd.0; Wed, 07 Dec 2016 07:14:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yuuj1cQxuyOllRvO7J0ILGGMSXhv9iyQVEed/dIXTrM=; b=ZEmCR2op9grdqf8kcSFNwspAW7gRF9iPX5RHWAOy5rZlWrcn+S6A4V+dpe/lkEf7h3 Iqngqygkvmmro+t9dY3/6+PglhWjeE0GkHmpuGKcQV8mRJaOBoDcAlC1vl69K8BYxl5Y RCf5K59UNYb+arcKaGXyGVf24WyfyH3A4+kHKWoxn5v+9IVDKzHcKXcMoOaY0tpcfbBp 3VXcLDTUHpZOYx/5QYajghRfOCc9lDmTIi4T6DoShlJw/fndLW/9nfUDi+bhV9Jn65qS q7EDBF+YrihP/rcMq8iJnbl9ZROxklKVM/gRn0yXR0ThT7V0CpUv/5q9u97Nharb6mrp oKGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yuuj1cQxuyOllRvO7J0ILGGMSXhv9iyQVEed/dIXTrM=; b=CeHeuwNA/45KyQrlFcjJRRkVXWRzrXqMSrUoF0upo+IuIjoyj0ARCB9xt5SqTWc/65 dYNBgcnuKj4mYV1ptOVZ8JsyG3HfK308dmo2IN2ikkJ8qQ+90Hb27FUdZHXdcop/lYK3 zVmvrrP0cNOXJkKPsb6TsckQ8/A/umjghljIBL9RMaKzrD6Qqhut2LnJFpVookGOVqJr PAFDouc3pGB3co6821dvXysmCES32ym+IyBg3TpuMUse7qWmBitDbiF/GmE6pn4veFpS 8v/QjzAEQUCP9mrWOnpMT7NSKwjOuxIjmKTq9U4Jh2954UibkucjAfAEOJr/E6hPsyqQ AEew== X-Gm-Message-State: AKaTC00KIdReuO5xCXopYJoeMNiNVHeNPg5x4qg+xCFXOwC5P6gCTKMtvC+E+QSSLob66Q== X-Received: by 10.99.96.85 with SMTP id u82mr122998517pgb.47.1481123676018; Wed, 07 Dec 2016 07:14:36 -0800 (PST) Received: from lear.localdomain ([118.113.71.120]) by smtp.gmail.com with ESMTPSA id y189sm43433365pfy.32.2016.12.07.07.14.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Dec 2016 07:14:35 -0800 (PST) From: Peng Tao To: Stefan Hajnoczi Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, Peng Tao Subject: [PATCH v2 2/4] vhost-vsock: add pkt cancel capability Date: Wed, 7 Dec 2016 23:14:10 +0800 Message-Id: <1481123652-80603-3-git-send-email-bergwolf@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1481123652-80603-1-git-send-email-bergwolf@gmail.com> References: <1481123652-80603-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 To allow canceling all packets of a connection. Signed-off-by: Peng Tao Reviewed-by: Stefan Hajnoczi --- drivers/vhost/vsock.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/linux/virtio_vsock.h | 3 +++ 2 files changed, 44 insertions(+) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index a504e2e0..d01e4a4 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -218,6 +218,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->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); + } + + 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) @@ -698,6 +738,7 @@ static struct virtio_transport vhost_transport = { }, .send_pkt = vhost_transport_send_pkt, + .cancel_pkt = vhost_transport_cancel_pkt, }; static int __init vhost_vsock_init(void) diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index 6dd3242..b92e88d 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -72,6 +72,9 @@ struct virtio_transport { /* Takes ownership of the packet */ int (*send_pkt)(struct virtio_vsock_pkt *pkt); + + /* Cancel packets belonging the same vsock */ + int (*cancel_pkt)(struct vsock_sock *vsk); }; ssize_t