From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BA20C388F4 for ; Fri, 27 Sep 2019 16:45:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 32DE6207E0 for ; Fri, 27 Sep 2019 16:45:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RcW3JOWX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727976AbfI0QpL (ORCPT ); Fri, 27 Sep 2019 12:45:11 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39125 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726251AbfI0QpK (ORCPT ); Fri, 27 Sep 2019 12:45:10 -0400 Received: by mail-wr1-f66.google.com with SMTP id r3so3942678wrj.6; Fri, 27 Sep 2019 09:45:07 -0700 (PDT) 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=og90qbQAXOicdq5w4qtLw6dYo5vnyUk8y6wc3hp/goU=; b=RcW3JOWX3CaxFUDNoQDHbdGdVcFVnBOj7k7rc3z1VvB6lT5ldwqAICaj7FIaWmmLBa E3822z+bFuwc702xgCM2HYqCKR9wEOFKHpYR/ZP6ZTdL2lvmPnI6k3K9hvJQgeRY5yTC yMA5u4+AINc1hPUvJkP6yjv18x6r1XpxWZsXDcsqcGsGVCWWGTGlWudM0Ti6KMQoXvQf gL6MmMMALNqvxqz0Gg5Uq0k7NSNR+drcdLv5LJSN5eVRCkmMN0XiKC29r7quWU2erzOe xfNdMTKgKJs89lS7tv4BTRQhubJS/UTaAzzDX+mXoZc7ZTyvy8uqF98Zryq8oEGAWHgN cVwQ== 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=og90qbQAXOicdq5w4qtLw6dYo5vnyUk8y6wc3hp/goU=; b=j2PElocYRW0Krd2xB3KV5FYDdDbGWQwsjohA8ivRvoxQ+yggRVCPJofldnYnErNlKp szWWV0UaFt3xyUTnJAaV/jJiEy/Vk7cpGGKnn58qn9wIxYoo+LeOdD1hgqEvz3G+2LOf V692jqoG6hu6c9gVKLwsr9ijI5mYazEeqs0XMmoVhjuauK00Fo5gW3/pn3kCAOhlN88F QiFXuXoPYfAM9igXfAr88Q6pV1vSWgfTYWm346tDJcmIbNmLmPXb1rBwBa38+jCZBl8V K1O1nRgD1qk5fAkQqBxnL5dRZ8d1H4nEPDjN3KDSshvG5I0LuHesz6zvwxmE3MTVSh4L 5Bcg== X-Gm-Message-State: APjAAAUot2x48quyhH/cfrtu7oVLcd3Rl/VLfaEhT2kg19fnM/EuEVyZ kEwigqDMOTHsAnqHlqZKxLk= X-Google-Smtp-Source: APXvYqzB8omaq85cbWYuSm9buXKmXpapBFdkbhwBVUoZfj9O4XopENPYw/IDgrNoGyrxG2qggAUQdQ== X-Received: by 2002:a1c:cb05:: with SMTP id b5mr7750360wmg.79.1569602706717; Fri, 27 Sep 2019 09:45:06 -0700 (PDT) Received: from scw-93ddc8.cloud.online.net ([2001:bc8:4400:2400::302d]) by smtp.googlemail.com with ESMTPSA id h125sm11889243wmf.31.2019.09.27.09.45.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Sep 2019 09:45:05 -0700 (PDT) From: Matias Ezequiel Vara Larsen To: stefanha@redhat.com Cc: davem@davemloft.net, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, matiasevara@gmail.com, sgarzare@redhat.com, eric.dumazet@gmail.com Subject: [PATCH v2] vsock/virtio: add support for MSG_PEEK Date: Fri, 27 Sep 2019 16:44:23 +0000 Message-Id: <1569602663-16815-1-git-send-email-matiasevara@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569522214-28223-1-git-send-email-matiasevara@gmail.com> References: <1569522214-28223-1-git-send-email-matiasevara@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds support for MSG_PEEK. In such a case, packets are not removed from the rx_queue and credit updates are not sent. Signed-off-by: Matias Ezequiel Vara Larsen --- net/vmw_vsock/virtio_transport_common.c | 55 +++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 94cc0fa..cf15751 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -264,6 +264,55 @@ static int virtio_transport_send_credit_update(struct vsock_sock *vsk, } static ssize_t +virtio_transport_stream_do_peek(struct vsock_sock *vsk, + struct msghdr *msg, + size_t len) +{ + struct virtio_vsock_sock *vvs = vsk->trans; + struct virtio_vsock_pkt *pkt; + size_t bytes, total = 0, off; + int err = -EFAULT; + + spin_lock_bh(&vvs->rx_lock); + + list_for_each_entry(pkt, &vvs->rx_queue, list) { + off = pkt->off; + + if (total == len) + break; + + while (total < len && off < pkt->len) { + bytes = len - total; + if (bytes > pkt->len - off) + bytes = pkt->len - off; + + /* sk_lock is held by caller so no one else can dequeue. + * Unlock rx_lock since memcpy_to_msg() may sleep. + */ + spin_unlock_bh(&vvs->rx_lock); + + err = memcpy_to_msg(msg, pkt->buf + off, bytes); + if (err) + goto out; + + spin_lock_bh(&vvs->rx_lock); + + total += bytes; + off += bytes; + } + } + + spin_unlock_bh(&vvs->rx_lock); + + return total; + +out: + if (total) + err = total; + return err; +} + +static ssize_t virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, struct msghdr *msg, size_t len) @@ -330,9 +379,9 @@ virtio_transport_stream_dequeue(struct vsock_sock *vsk, size_t len, int flags) { if (flags & MSG_PEEK) - return -EOPNOTSUPP; - - return virtio_transport_stream_do_dequeue(vsk, msg, len); + return virtio_transport_stream_do_peek(vsk, msg, len); + else + return virtio_transport_stream_do_dequeue(vsk, msg, len); } EXPORT_SYMBOL_GPL(virtio_transport_stream_dequeue); -- 2.7.4