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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0656EC61DA4 for ; Fri, 3 Feb 2023 08:49:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230343AbjBCIt0 (ORCPT ); Fri, 3 Feb 2023 03:49:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229914AbjBCItZ (ORCPT ); Fri, 3 Feb 2023 03:49:25 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CC0C6B036 for ; Fri, 3 Feb 2023 00:48:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675414124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZAKc94Ixe1rZj/Kzn4+Ft2huDa+LD1uWLCdlu0GoQEk=; b=ISsnwsNXy7WqQ5He2Gil1Nhf3F7Nh5mU4xBuW1Hri+uFzJ1bAva5A6olDWc8muUtdlVKz9 AkWbIOwb29YsxYL23tywZ22z/gs+in09NrvsdMGJC0KbakZQRXhI2m/ERDw5tcRp3ddGgo KLzirggBXfAly5KT1SgYEB7dRvRlgZM= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-646-q8XLCWpMN8uePMpzbiOUcw-1; Fri, 03 Feb 2023 03:48:43 -0500 X-MC-Unique: q8XLCWpMN8uePMpzbiOUcw-1 Received: by mail-ed1-f70.google.com with SMTP id b6-20020aa7c906000000b004a25542075eso3114992edt.3 for ; Fri, 03 Feb 2023 00:48:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZAKc94Ixe1rZj/Kzn4+Ft2huDa+LD1uWLCdlu0GoQEk=; b=w6A0Y+2/mdW4xN4/Eyxhrh+pXt4aY4mZCODgEiEsTnMmw7BB8sTrS3m2RHSVSTKrXm jrcujSsQM0fh/1z1e/KFytngOSEUXmtrr8QLj/JCrpJ47gBbjXSchD18nmfHIkmtDVrp zHgElgdczx8/cyTo3StK3vzv3osr4BdRYAtKM05h08RnIH/vIzyJ7cJrod7yfLLuy/fO WR78IuvRrZ12AqDKhDa5018bRLmLDs+N6X9PjK8A8qDrdzhmVJfNVWGNaT9PMGAMCizu BObcwoDsrxTDohgaf02cfhJ9pnbXR3c9WfD7KRER3IHemw1X2D4MkP0NoONcoSDaVdCU F07g== X-Gm-Message-State: AO0yUKXe6pMxijXdMNzFKgmHOrj/eTACtyxZkeTuDWEyve6re+rzfj2k 4BjerM3MQFup/cg9hduJOmNaB2r7jeUqp/DF7qoxT1kUCW4Ez+t1ulck2g1LkE+k6+lukJ55Yrv EHK0hoQbsXJmxJNUN X-Received: by 2002:a17:907:6087:b0:887:5f45:d688 with SMTP id ht7-20020a170907608700b008875f45d688mr9561672ejc.41.1675414118818; Fri, 03 Feb 2023 00:48:38 -0800 (PST) X-Google-Smtp-Source: AK7set89lm9S151OquZnuoyt8nL85dYjqpw2IBo88NRgrkXAApp4gVR7Yo3jPOqbvdp2IEZXVkmbZQ== X-Received: by 2002:a17:907:6087:b0:887:5f45:d688 with SMTP id ht7-20020a170907608700b008875f45d688mr9561666ejc.41.1675414118604; Fri, 03 Feb 2023 00:48:38 -0800 (PST) Received: from redhat.com ([2.52.156.122]) by smtp.gmail.com with ESMTPSA id n24-20020a170906841800b00889310a3fcbsm1035683ejx.210.2023.02.03.00.48.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 00:48:37 -0800 (PST) Date: Fri, 3 Feb 2023 03:48:33 -0500 From: "Michael S. Tsirkin" To: Xuan Zhuo Cc: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jason Wang , =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= , Magnus Karlsson , Maciej Fijalkowski , Jonathan Lemon , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Sebastian Andrzej Siewior , Menglong Dong , Kuniyuki Iwashima , Petr Machata , virtualization@lists.linux-foundation.org, bpf@vger.kernel.org Subject: Re: [PATCH 20/33] virtio_net: xsk: introduce virtnet_rq_bind_xsk_pool() Message-ID: <20230203034642-mutt-send-email-mst@kernel.org> References: <20230202110058.130695-1-xuanzhuo@linux.alibaba.com> <20230202110058.130695-21-xuanzhuo@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230202110058.130695-21-xuanzhuo@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Feb 02, 2023 at 07:00:45PM +0800, Xuan Zhuo wrote: > This function is used to bind or unbind xsk pool to virtnet rq. > > Signed-off-by: Xuan Zhuo > --- > drivers/net/virtio/Makefile | 2 +- > drivers/net/virtio/main.c | 8 ++--- > drivers/net/virtio/virtio_net.h | 16 ++++++++++ > drivers/net/virtio/xsk.c | 56 +++++++++++++++++++++++++++++++++ > 4 files changed, 76 insertions(+), 6 deletions(-) > create mode 100644 drivers/net/virtio/xsk.c > > diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile > index 15ed7c97fd4f..8c2a884d2dba 100644 > --- a/drivers/net/virtio/Makefile > +++ b/drivers/net/virtio/Makefile > @@ -5,4 +5,4 @@ > > obj-$(CONFIG_VIRTIO_NET) += virtio_net.o > > -virtio_net-y := main.o > +virtio_net-y := main.o xsk.o > diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c > index 049a3bb9d88d..0ee23468b795 100644 > --- a/drivers/net/virtio/main.c > +++ b/drivers/net/virtio/main.c > @@ -110,7 +110,6 @@ struct padded_vnet_hdr { > char padding[12]; > }; > > -static void virtnet_rq_free_unused_buf(struct virtqueue *vq, void *buf); > static void virtnet_sq_free_unused_buf(struct virtqueue *vq, void *buf); > > static void *xdp_to_ptr(struct xdp_frame *ptr) > @@ -1351,8 +1350,7 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, > * before we're receiving packets, or from refill_work which is > * careful to disable receiving (using napi_disable). > */ > -static bool try_fill_recv(struct virtnet_info *vi, struct receive_queue *rq, > - gfp_t gfp) > +bool try_fill_recv(struct virtnet_info *vi, struct receive_queue *rq, gfp_t gfp) > { > int err; > bool oom; > @@ -1388,7 +1386,7 @@ static void skb_recv_done(struct virtqueue *rvq) > virtqueue_napi_schedule(&rq->napi, rvq); > } > > -static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *napi) > +void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *napi) > { > napi_enable(napi); > > @@ -3284,7 +3282,7 @@ static void virtnet_sq_free_unused_buf(struct virtqueue *vq, void *buf) > xdp_return_frame(ptr_to_xdp(buf)); > } > > -static void virtnet_rq_free_unused_buf(struct virtqueue *vq, void *buf) > +void virtnet_rq_free_unused_buf(struct virtqueue *vq, void *buf) If you are making this an API now you better document what it does. Same applies to other stuff you are making non-static. > { > struct virtnet_info *vi = vq->vdev->priv; > int i = vq2rxq(vq); > diff --git a/drivers/net/virtio/virtio_net.h b/drivers/net/virtio/virtio_net.h > index b46f083a630a..4a7633714802 100644 > --- a/drivers/net/virtio/virtio_net.h > +++ b/drivers/net/virtio/virtio_net.h > @@ -168,6 +168,12 @@ struct send_queue { > > /* Record whether sq is in reset state. */ > bool reset; > + > + struct { > + struct xsk_buff_pool __rcu *pool; > + > + dma_addr_t hdr_dma_address; > + } xsk; > }; > > /* Internal representation of a receive virtqueue */ > @@ -200,6 +206,13 @@ struct receive_queue { > char name[16]; > > struct xdp_rxq_info xdp_rxq; > + > + struct { > + struct xsk_buff_pool __rcu *pool; > + > + /* xdp rxq used by xsk */ > + struct xdp_rxq_info xdp_rxq; > + } xsk; > }; > > static inline bool is_xdp_raw_buffer_queue(struct virtnet_info *vi, int q) > @@ -274,4 +287,7 @@ int virtnet_xdp_handler(struct bpf_prog *xdp_prog, struct xdp_buff *xdp, > unsigned int *xdp_xmit, > struct virtnet_rq_stats *stats); > int virtnet_tx_reset(struct virtnet_info *vi, struct send_queue *sq); > +bool try_fill_recv(struct virtnet_info *vi, struct receive_queue *rq, gfp_t gfp); > +void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *napi); > +void virtnet_rq_free_unused_buf(struct virtqueue *vq, void *buf); > #endif > diff --git a/drivers/net/virtio/xsk.c b/drivers/net/virtio/xsk.c > new file mode 100644 > index 000000000000..e01ff2abea11 > --- /dev/null > +++ b/drivers/net/virtio/xsk.c > @@ -0,0 +1,56 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * virtio-net xsk > + */ > + > +#include "virtio_net.h" > + > +static int virtnet_rq_bind_xsk_pool(struct virtnet_info *vi, struct receive_queue *rq, > + struct xsk_buff_pool *pool, struct net_device *dev) This static function is unused after this patch, so compiler will complain. Yes it's just a warning but still not nice. > +{ > + bool running = netif_running(vi->dev); > + int err, qindex; > + > + qindex = rq - vi->rq; > + > + if (pool) { > + err = xdp_rxq_info_reg(&rq->xsk.xdp_rxq, dev, qindex, rq->napi.napi_id); > + if (err < 0) > + return err; > + > + err = xdp_rxq_info_reg_mem_model(&rq->xsk.xdp_rxq, > + MEM_TYPE_XSK_BUFF_POOL, NULL); > + if (err < 0) { > + xdp_rxq_info_unreg(&rq->xsk.xdp_rxq); > + return err; > + } > + > + xsk_pool_set_rxq_info(pool, &rq->xsk.xdp_rxq); > + } else { > + xdp_rxq_info_unreg(&rq->xsk.xdp_rxq); > + } > + > + if (running) > + napi_disable(&rq->napi); > + > + err = virtqueue_reset(rq->vq, virtnet_rq_free_unused_buf); > + if (err) > + netdev_err(vi->dev, "reset rx fail: rx queue index: %d err: %d\n", qindex, err); > + > + if (pool) { > + if (err) > + xdp_rxq_info_unreg(&rq->xsk.xdp_rxq); > + else > + rcu_assign_pointer(rq->xsk.pool, pool); > + } else { > + rcu_assign_pointer(rq->xsk.pool, NULL); > + } > + > + if (!try_fill_recv(vi, rq, GFP_KERNEL)) > + schedule_delayed_work(&vi->refill, 0); > + > + if (running) > + virtnet_napi_enable(rq->vq, &rq->napi); > + > + return err; > +} > -- > 2.32.0.3.g01195cf9f