From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D0AA1CAAC for ; Thu, 9 Nov 2023 11:59:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HkeY8JSQ" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3DD53853 for ; Thu, 9 Nov 2023 03:59:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699531196; 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=XBwh9BfcsGwN4p/3iVkVIw7CCYFfvzovBsgfhDaKJj0=; b=HkeY8JSQMTnT5lSoHkBwTjWnEBkV1igEFYJIa1h0ymQpGltqG/1GT5edLSKRrbbhTh1y3h H88k7k2SGDwoR5DiPxbl+VsoCHC0hB6ATGcFmNrV2qwznFE9x/oiNR42HNtCr41nEII2r5 sek1g1VklG+Z6tBMspWgGmtPX0h5L4E= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-453-WYG65DtCPbuJyO2Dc4wU3Q-1; Thu, 09 Nov 2023 06:59:54 -0500 X-MC-Unique: WYG65DtCPbuJyO2Dc4wU3Q-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9ae0601d689so61808666b.0 for ; Thu, 09 Nov 2023 03:59:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699531193; x=1700135993; 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=XBwh9BfcsGwN4p/3iVkVIw7CCYFfvzovBsgfhDaKJj0=; b=n8bLt4d7aVU9UzzF4N2GbxmpRYBngPDMDoZ+lOGsQqoRAUtODrC70igInG6Gq0JGE7 G9dY9HxC360daqy6QW0iR7y03iJeEblInJ9DUgIfF+pxheg4VYLaU3G6uCnRMKINvmtl AOtKg4W4QPkFT36f7jsz/El7gjJAAMIL4+gzRCNm9zVjEsTS6l2WKBdi6sgiZyY7Dd01 10A1rQXS/iUaaCrap0IUSVKT1fCUsSRx80bLFoVnHXoh4McIXEiiMMRlk+W2fNQHaCx+ nuZOL9TYvpnOmgwW0iL65WRWrSrtujjZJU2Hz/r+xITliOw9uZsneGrSy7Y2k7wkDTch 6//g== X-Gm-Message-State: AOJu0YxQ/T1We0uAUE4Bxim/B5KFG2wngDrY0qM88iALPZKMlili1fKW /dhPrSpFg2/SgseNbQb/5FQIi3JY8G2pSzLN52KWOvxDEKJFczkfxttupm9Wob0/nJSosj10NCE 2YJSwWgjBwCAeYfZV X-Received: by 2002:a17:907:744:b0:9de:32bb:faab with SMTP id xc4-20020a170907074400b009de32bbfaabmr3907929ejb.32.1699531193522; Thu, 09 Nov 2023 03:59:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IFMY+vJ5AkmDkv/+cqz1oiQHT3s2m2UmdbF1nYIjYe0sBg3Jp/+950PgPxklsw5ykh2i/4Kyw== X-Received: by 2002:a17:907:744:b0:9de:32bb:faab with SMTP id xc4-20020a170907074400b009de32bbfaabmr3907913ejb.32.1699531193110; Thu, 09 Nov 2023 03:59:53 -0800 (PST) Received: from redhat.com ([2a02:14f:1f4:2044:be5a:328c:4b98:1420]) by smtp.gmail.com with ESMTPSA id ss24-20020a170907039800b009de3fd8cbfasm2450555ejb.0.2023.11.09.03.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 03:59:52 -0800 (PST) Date: Thu, 9 Nov 2023 06:59:48 -0500 From: "Michael S. Tsirkin" To: Xuan Zhuo Cc: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jason Wang , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , virtualization@lists.linux-foundation.org, bpf@vger.kernel.org Subject: Re: [PATCH net-next v2 14/21] virtio_net: xsk: tx: virtnet_free_old_xmit() distinguishes xsk buffer Message-ID: <20231109065912-mutt-send-email-mst@kernel.org> References: <20231107031227.100015-1-xuanzhuo@linux.alibaba.com> <20231107031227.100015-15-xuanzhuo@linux.alibaba.com> <20231109061056-mutt-send-email-mst@kernel.org> <1699528568.0674586-6-xuanzhuo@linux.alibaba.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1699528568.0674586-6-xuanzhuo@linux.alibaba.com> On Thu, Nov 09, 2023 at 07:16:08PM +0800, Xuan Zhuo wrote: > On Thu, 9 Nov 2023 06:11:49 -0500, "Michael S. Tsirkin" wrote: > > On Tue, Nov 07, 2023 at 11:12:20AM +0800, Xuan Zhuo wrote: > > > virtnet_free_old_xmit distinguishes three type ptr(skb, xdp frame, xsk > > > buffer) by the last bits of the pointer. > > > > > > Signed-off-by: Xuan Zhuo > > > --- > > > drivers/net/virtio/virtio_net.h | 18 ++++++++++++++++-- > > > drivers/net/virtio/xsk.h | 5 +++++ > > > 2 files changed, 21 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/net/virtio/virtio_net.h b/drivers/net/virtio/virtio_net.h > > > index a431a2c1ee47..a13d6d301fdb 100644 > > > --- a/drivers/net/virtio/virtio_net.h > > > +++ b/drivers/net/virtio/virtio_net.h > > > @@ -225,6 +225,11 @@ struct virtnet_info { > > > struct failover *failover; > > > }; > > > > > > +static inline bool virtnet_is_skb_ptr(void *ptr) > > > +{ > > > + return !((unsigned long)ptr & VIRTIO_XMIT_DATA_MASK); > > > +} > > > + > > > static inline bool virtnet_is_xdp_frame(void *ptr) > > > { > > > return (unsigned long)ptr & VIRTIO_XDP_FLAG; > > > @@ -235,6 +240,8 @@ static inline struct xdp_frame *virtnet_ptr_to_xdp(void *ptr) > > > return (struct xdp_frame *)((unsigned long)ptr & ~VIRTIO_XDP_FLAG); > > > } > > > > > > +static inline u32 virtnet_ptr_to_xsk(void *ptr); > > > + > > > > I don't understand why you need this here. > > The below function virtnet_free_old_xmit needs this. > > Thanks. I don't understand why is virtnet_free_old_xmit inline, either. > > > > > > > static inline void *virtnet_sq_unmap(struct virtnet_sq *sq, void *data) > > > { > > > struct virtnet_sq_dma *next, *head; > > > @@ -261,11 +268,12 @@ static inline void *virtnet_sq_unmap(struct virtnet_sq *sq, void *data) > > > static inline void virtnet_free_old_xmit(struct virtnet_sq *sq, bool in_napi, > > > u64 *bytes, u64 *packets) > > > { > > > + unsigned int xsknum = 0; > > > unsigned int len; > > > void *ptr; > > > > > > while ((ptr = virtqueue_get_buf(sq->vq, &len)) != NULL) { > > > - if (!virtnet_is_xdp_frame(ptr)) { > > > + if (virtnet_is_skb_ptr(ptr)) { > > > struct sk_buff *skb; > > > > > > if (sq->do_dma) > > > @@ -277,7 +285,7 @@ static inline void virtnet_free_old_xmit(struct virtnet_sq *sq, bool in_napi, > > > > > > *bytes += skb->len; > > > napi_consume_skb(skb, in_napi); > > > - } else { > > > + } else if (virtnet_is_xdp_frame(ptr)) { > > > struct xdp_frame *frame; > > > > > > if (sq->do_dma) > > > @@ -287,9 +295,15 @@ static inline void virtnet_free_old_xmit(struct virtnet_sq *sq, bool in_napi, > > > > > > *bytes += xdp_get_frame_len(frame); > > > xdp_return_frame(frame); > > > + } else { > > > + *bytes += virtnet_ptr_to_xsk(ptr); > > > + ++xsknum; > > > } > > > (*packets)++; > > > } > > > + > > > + if (xsknum) > > > + xsk_tx_completed(sq->xsk.pool, xsknum); > > > } > > > > > > static inline bool virtnet_is_xdp_raw_buffer_queue(struct virtnet_info *vi, int q) > > > diff --git a/drivers/net/virtio/xsk.h b/drivers/net/virtio/xsk.h > > > index 1bd19dcda649..7ebc9bda7aee 100644 > > > --- a/drivers/net/virtio/xsk.h > > > +++ b/drivers/net/virtio/xsk.h > > > @@ -14,6 +14,11 @@ static inline void *virtnet_xsk_to_ptr(u32 len) > > > return (void *)(p | VIRTIO_XSK_FLAG); > > > } > > > > > > +static inline u32 virtnet_ptr_to_xsk(void *ptr) > > > +{ > > > + return ((unsigned long)ptr) >> VIRTIO_XSK_FLAG_OFFSET; > > > +} > > > + > > > int virtnet_xsk_pool_setup(struct net_device *dev, struct netdev_bpf *xdp); > > > bool virtnet_xsk_xmit(struct virtnet_sq *sq, struct xsk_buff_pool *pool, > > > int budget); > > > -- > > > 2.32.0.3.g01195cf9f > > > >