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 BEAA2C47404 for ; Sat, 12 Oct 2019 01:54:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B9662084C for ; Sat, 12 Oct 2019 01:54:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="c6CLaCLT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728797AbfJLByk (ORCPT ); Fri, 11 Oct 2019 21:54:40 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:33914 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726903AbfJLByk (ORCPT ); Fri, 11 Oct 2019 21:54:40 -0400 Received: by mail-pl1-f193.google.com with SMTP id k7so5274338pll.1; Fri, 11 Oct 2019 18:54:39 -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 :mime-version:content-transfer-encoding; bh=dPo81eWB3SH6wvvgmzlALNsFkjGRiym0izSWC/MTDYo=; b=c6CLaCLT46gM6CwtW+TxMhE5P2iCIewgvTbbwDViw21SaJz02FVl1aWZZ18sxAwA10 gbUWsspYsP9kS+jB8ClEYwnQsectw1OdHpuJ6PKvcsq9J+0E0rrwY+V7kU1IOxkLBYWp 52L2XOQr4C/05VEJODnInJsAVgWLVyDQBA2O2OglRav2ZcC36aVK7nQGAQN3tbSRi/RA 9hMm90cRQm3MxjHqimCHIs54+yEvjhbHXGZfhBTipnkKXHmca0sUGeTWBCwnRGz44r5z y3J0cFpnKfAK4DMyV5hazc7zaxugaqlHYtcUeW/dEsXR4DwzziT0p8Ix1YEsnZZhJyu6 3Vtg== 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:mime-version:content-transfer-encoding; bh=dPo81eWB3SH6wvvgmzlALNsFkjGRiym0izSWC/MTDYo=; b=JIHqCW6YkgPs+jly4chM7TyXLTcVywrGpjvTDKCIRu/8aoX5g0zh2bfqsMPWqSsyGu lT5w4VsPL/ZjdYfZ/OXkRzCI9n07iPU1Y0ZF1VykQyFR0Vrw46BSvh+t29cKK4Pg/1es UXk1CstZJO4/bCNsa0bY659zUZwZu1XsKvZkTejYSwjvflcLXT1EtVLPpyZ03sregbl6 MZnuENFp5a0wyWB5ooMGYJad5qaNGzOgxsu5QzPv2RYv7qLOETE3Pl/7Tm4+anrzSdV4 /QWRz90OPRbmmW2FimDkdl8WovdZrssGeFiiUFdedcHHulgJ3sJDxgjgQVvbmvQA1Yb0 Yqtw== X-Gm-Message-State: APjAAAWsuVY5+22VLoPyQ3hMbPOc2ehAfmL2yznb6BknQqUmL4SqdSEH UjIydNLqI4Ac2DF7H0fNgs8= X-Google-Smtp-Source: APXvYqww6jTojlyIyGmb9SUDcOgGFzhAqy2k87gYOMUYH6FfRioiuv2og4D3Z4zcY5eDDZN8ImI4ng== X-Received: by 2002:a17:902:6e17:: with SMTP id u23mr16558566plk.209.1570845279515; Fri, 11 Oct 2019 18:54:39 -0700 (PDT) Received: from localhost.localdomain (KD124211219252.ppp-bb.dion.ne.jp. [124.211.219.252]) by smtp.gmail.com with ESMTPSA id e127sm10992187pfe.37.2019.10.11.18.54.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2019 18:54:39 -0700 (PDT) From: prashantbhole.linux@gmail.com To: "Michael S . Tsirkin" , Jason Wang , "David S . Miller" Cc: Prashant Bhole , David Ahern , kvm@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next 2/3] vhost_net: user tap recvmsg api to access ptr ring Date: Sat, 12 Oct 2019 10:53:56 +0900 Message-Id: <20191012015357.1775-3-prashantbhole.linux@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191012015357.1775-1-prashantbhole.linux@gmail.com> References: <20191012015357.1775-1-prashantbhole.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Prashant Bhole Currently vhost_net directly accesses ptr ring of tap driver to fetch Rx packet pointers. In order to avoid it this patch modifies tap driver's recvmsg api to do additional task of fetching Rx packet pointers. A special struct tun_msg_ctl is already being usedd via msg_control for tun Rx XDP batching. This patch extends tun_msg_ctl usage to send sub commands to recvmsg api. recvmsg can now produce/unproduce pointers from ptr ring as an additional task. This will be useful in future in implementation of virtio-net XDP offload feature. Where packets will be XDP batch processed in tun_recvmsg. Signed-off-by: Prashant Bhole --- drivers/net/tap.c | 22 +++++++++++++++++++- drivers/net/tun.c | 24 +++++++++++++++++++++- drivers/vhost/net.c | 46 +++++++++++++++++++++++++++++++++--------- include/linux/if_tun.h | 3 +++ 4 files changed, 83 insertions(+), 12 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 01bd260ce60c..3d0bf382dbbc 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -1234,8 +1234,28 @@ static int tap_recvmsg(struct socket *sock, struct msghdr *m, size_t total_len, int flags) { struct tap_queue *q = container_of(sock, struct tap_queue, sock); - struct sk_buff *skb = m->msg_control; + struct tun_msg_ctl *ctl = m->msg_control; + struct sk_buff *skb = NULL; int ret; + + if (ctl) { + switch (ctl->cmd) { + case TUN_CMD_PACKET: + skb = ctl->ptr; + break; + case TUN_CMD_PRODUCE_PTRS: + return ptr_ring_consume_batched(&q->ring, + ctl->ptr_array, + ctl->num); + case TUN_CMD_UNPRODUCE_PTRS: + ptr_ring_unconsume(&q->ring, ctl->ptr_array, ctl->num, + tun_ptr_free); + return 0; + default: + return -EINVAL; + } + } + if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) { kfree_skb(skb); return -EINVAL; diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 29711671959b..7d4886f53389 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2577,7 +2577,8 @@ static int tun_recvmsg(struct socket *sock, struct msghdr *m, size_t total_len, { struct tun_file *tfile = container_of(sock, struct tun_file, socket); struct tun_struct *tun = tun_get(tfile); - void *ptr = m->msg_control; + struct tun_msg_ctl *ctl = m->msg_control; + void *ptr = NULL; int ret; if (!tun) { @@ -2585,6 +2586,27 @@ static int tun_recvmsg(struct socket *sock, struct msghdr *m, size_t total_len, goto out_free; } + if (ctl) { + switch (ctl->cmd) { + case TUN_CMD_PACKET: + ptr = ctl->ptr; + break; + case TUN_CMD_PRODUCE_PTRS: + ret = ptr_ring_consume_batched(&tfile->tx_ring, + ctl->ptr_array, + ctl->num); + goto out; + case TUN_CMD_UNPRODUCE_PTRS: + ptr_ring_unconsume(&tfile->tx_ring, ctl->ptr_array, + ctl->num, tun_ptr_free); + ret = 0; + goto out; + default: + ret = -EINVAL; + goto out_put_tun; + } + } + if (flags & ~(MSG_DONTWAIT|MSG_TRUNC|MSG_ERRQUEUE)) { ret = -EINVAL; goto out_put_tun; diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 5946d2775bd0..5e5c1063606c 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -175,24 +175,44 @@ static void *vhost_net_buf_consume(struct vhost_net_buf *rxq) static int vhost_net_buf_produce(struct vhost_net_virtqueue *nvq) { + struct vhost_virtqueue *vq = &nvq->vq; + struct socket *sock = vq->private_data; struct vhost_net_buf *rxq = &nvq->rxq; + struct tun_msg_ctl ctl = { + .cmd = TUN_CMD_PRODUCE_PTRS, + .ptr_array = rxq->queue, + .num = VHOST_NET_BATCH, + }; + struct msghdr msg = { + .msg_control = &ctl, + }; rxq->head = 0; - rxq->tail = ptr_ring_consume_batched(nvq->rx_ring, rxq->queue, - VHOST_NET_BATCH); + rxq->tail = sock->ops->recvmsg(sock, &msg, 0, 0); + if (rxq->tail < 0) + rxq->tail = 0; + return rxq->tail; } static void vhost_net_buf_unproduce(struct vhost_net_virtqueue *nvq) { + struct vhost_virtqueue *vq = &nvq->vq; + struct socket *sock = vq->private_data; struct vhost_net_buf *rxq = &nvq->rxq; + struct tun_msg_ctl ctl = { + .cmd = TUN_CMD_UNPRODUCE_PTRS, + .ptr_array = rxq->queue + rxq->head, + .num = vhost_net_buf_get_size(rxq), + }; + struct msghdr msg = { + .msg_control = &ctl, + }; - if (nvq->rx_ring && !vhost_net_buf_is_empty(rxq)) { - ptr_ring_unconsume(nvq->rx_ring, rxq->queue + rxq->head, - vhost_net_buf_get_size(rxq), - tun_ptr_free); - rxq->head = rxq->tail = 0; - } + if (!vhost_net_buf_is_empty(rxq)) + sock->ops->recvmsg(sock, &msg, 0, 0); + + rxq->head = rxq->tail = 0; } static int vhost_net_buf_peek_len(void *ptr) @@ -1109,6 +1129,9 @@ static void handle_rx(struct vhost_net *net) .flags = 0, .gso_type = VIRTIO_NET_HDR_GSO_NONE }; + struct tun_msg_ctl ctl = { + .cmd = TUN_CMD_PACKET, + }; size_t total_len = 0; int err, mergeable; s16 headcount; @@ -1166,8 +1189,11 @@ static void handle_rx(struct vhost_net *net) goto out; } busyloop_intr = false; - if (nvq->rx_ring) - msg.msg_control = vhost_net_buf_consume(&nvq->rxq); + if (nvq->rx_ring) { + ctl.cmd = TUN_CMD_PACKET; + ctl.ptr = vhost_net_buf_consume(&nvq->rxq); + msg.msg_control = &ctl; + } /* On overrun, truncate and discard */ if (unlikely(headcount > UIO_MAXIOV)) { iov_iter_init(&msg.msg_iter, READ, vq->iov, 1, 1); diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index bdfa671612db..8608d4095143 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h @@ -13,10 +13,13 @@ #define TUN_CMD_PACKET 1 #define TUN_CMD_BATCH 2 +#define TUN_CMD_PRODUCE_PTRS 3 +#define TUN_CMD_UNPRODUCE_PTRS 4 struct tun_msg_ctl { unsigned short cmd; unsigned short num; void *ptr; + void **ptr_array; }; struct tun_xdp_hdr { -- 2.21.0