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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable 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 A7012C32792 for ; Mon, 30 Sep 2019 14:12:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8635820679 for ; Mon, 30 Sep 2019 14:12:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731452AbfI3OMp (ORCPT ); Mon, 30 Sep 2019 10:12:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35234 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731441AbfI3OMm (ORCPT ); Mon, 30 Sep 2019 10:12:42 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 30538368B1 for ; Mon, 30 Sep 2019 14:12:41 +0000 (UTC) Received: by mail-wr1-f69.google.com with SMTP id j3so4566189wrn.7 for ; Mon, 30 Sep 2019 07:12:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=U7Vi6scFOY6hhqVA0cemS3cQSEC3brtnkAsLJZs+8us=; b=I131zXnV/oi59fFiYUzwB5x+UhXaT2HCVkS5Kg3pblU6eRhistv8BHM0WgNWxHbdw2 z4sMbQbOR12AUsWQkXe8uYQLoAi0h+lSxhU975SZ2vstXOcM3g65JqPJhpqKN3k5vV8G 2L1uXU5VZMdiDTmzSaV9T2W+pzwXFwSaZaSqzZMUj1kpu9XfT47VYxWXSiR3YWXop+0K ZdI/o0aFvAb4S9u/qaF/w6RGn4peZDVbehYWESCDA0dLLXIr/A8JtWdO9ZGeBlgJuPcS IL8siSX6zk9OrZPrrsDHt7TBCfAFaWYzUd26LX5rqWCwfCyFchKTlIvn/690IplabYd9 G2yw== X-Gm-Message-State: APjAAAWiKjrNHY9PEL6JHOxrWsFsm14pZ6S/jFbkrIbS1XReQNr/xrgw tBwEh5VIV6uPGcdX3fvZVzMEP8m6Wa+AIks8zZwQQgmXJkrbDjfsfYDcwj46+ww4daK3Cy8N/R3 mZWKP/FG382LOur59 X-Received: by 2002:a5d:4a52:: with SMTP id v18mr12746634wrs.368.1569852759890; Mon, 30 Sep 2019 07:12:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqyuBZfGK6lRi6GwfXTgTA8HHpv68vhrm6ZMForGt3w+ZiwRNEldTnLZexHFnR0clNvNiDrJgw== X-Received: by 2002:a5d:4a52:: with SMTP id v18mr12746617wrs.368.1569852759679; Mon, 30 Sep 2019 07:12:39 -0700 (PDT) Received: from steredhat (host174-200-dynamic.52-79-r.retail.telecomitalia.it. [79.52.200.174]) by smtp.gmail.com with ESMTPSA id u11sm14385252wmd.32.2019.09.30.07.12.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 07:12:38 -0700 (PDT) Date: Mon, 30 Sep 2019 16:12:36 +0200 From: Stefano Garzarella To: Matias Ezequiel Vara Larsen Cc: stefanha@redhat.com, davem@davemloft.net, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, eric.dumazet@gmail.com Subject: Re: [PATCH v2] vsock/virtio: add support for MSG_PEEK Message-ID: <20190930141236.lp3nroal33k63vlg@steredhat> References: <1569522214-28223-1-git-send-email-matiasevara@gmail.com> <1569602663-16815-1-git-send-email-matiasevara@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1569602663-16815-1-git-send-email-matiasevara@gmail.com> User-Agent: NeoMutt/20180716 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Matias, On Fri, Sep 27, 2019 at 04:44:23PM +0000, Matias Ezequiel Vara Larsen wrote: > 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(-) The patch LGTM. As David pointed out, this patch should go into net-next. Since now net-next is open, you can resend with net-next tag [1] and with: Reviewed-by: Stefano Garzarella Tested-by: Stefano Garzarella Thanks, Stefano [1] https://www.kernel.org/doc/Documentation/networking/netdev-FAQ.txt > > 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 > --