Message-ID: <CACGkMEtmvyJ93Xa0791KVSZEzqZgT9trzOkxz1OY+wOJ1xaR5A@mail.gmail.com>
Date: Thu, 19 Oct 2023 14:12:55 +0800
From: Jason Wang <jasowang@...hat.com>
To: Xuan Zhuo <xuanzhuo@...ux.alibaba.com>
Cc: netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>, 
	Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, 
	"Michael S. Tsirkin" <mst@...hat.com>, Alexei Starovoitov <ast@...nel.org>, Daniel Borkmann <daniel@...earbox.net>, 
	Jesper Dangaard Brouer <hawk@...nel.org>, John Fastabend <john.fastabend@...il.com>, 
	virtualization@...ts.linux-foundation.org, bpf@...r.kernel.org
Subject: Re: [PATCH net-next v1 04/19] virtio_net: move to virtio_net.h

On Mon, Oct 16, 2023 at 8:00 PM Xuan Zhuo <xuanzhuo@...ux.alibaba.com> wrote:
>
> Move some structure definitions and inline functions into the
> virtio_net.h file.

Some of the functions are not inline one before the moving. I'm not
sure what's the criteria to choose the function to be moved.


>
> Signed-off-by: Xuan Zhuo <xuanzhuo@...ux.alibaba.com>
> ---
>  drivers/net/virtio/main.c       | 252 +------------------------------
>  drivers/net/virtio/virtio_net.h | 256 ++++++++++++++++++++++++++++++++
>  2 files changed, 258 insertions(+), 250 deletions(-)
>  create mode 100644 drivers/net/virtio/virtio_net.h
>
> diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c
> index 6cf77b6acdab..d8b6c0d86f29 100644
> --- a/drivers/net/virtio/main.c
> +++ b/drivers/net/virtio/main.c
> @@ -6,7 +6,6 @@
>  //#define DEBUG
>  #include <linux/netdevice.h>
>  #include <linux/etherdevice.h>
> -#include <linux/ethtool.h>
>  #include <linux/module.h>
>  #include <linux/virtio.h>
>  #include <linux/virtio_net.h>
> @@ -16,7 +15,6 @@
>  #include <linux/if_vlan.h>
>  #include <linux/slab.h>
>  #include <linux/cpu.h>
> -#include <linux/average.h>
>  #include <linux/filter.h>
>  #include <linux/kernel.h>
>  #include <net/route.h>
> @@ -24,6 +22,8 @@
>  #include <net/net_failover.h>
>  #include <net/netdev_rx_queue.h>
>
> +#include "virtio_net.h"
> +
>  static int napi_weight = NAPI_POLL_WEIGHT;
>  module_param(napi_weight, int, 0444);
>
> @@ -45,15 +45,6 @@ module_param(napi_tx, bool, 0644);
>  #define VIRTIO_XDP_TX          BIT(0)
>  #define VIRTIO_XDP_REDIR       BIT(1)
>
> -#define VIRTIO_XDP_FLAG        BIT(0)
> -
> -/* RX packet size EWMA. The average packet size is used to determine the packet
> - * buffer size when refilling RX rings. As the entire RX ring may be refilled
> - * at once, the weight is chosen so that the EWMA will be insensitive to short-
> - * term, transient changes in packet size.
> - */
> -DECLARE_EWMA(pkt_len, 0, 64)
> -
>  #define VIRTNET_DRIVER_VERSION "1.0.0"
>
>  static const unsigned long guest_offloads[] = {
> @@ -74,36 +65,6 @@ static const unsigned long guest_offloads[] = {
>                                 (1ULL << VIRTIO_NET_F_GUEST_USO4) | \
>                                 (1ULL << VIRTIO_NET_F_GUEST_USO6))
>
> -struct virtnet_stat_desc {
> -       char desc[ETH_GSTRING_LEN];
> -       size_t offset;
> -};
> -
> -struct virtnet_sq_stats {
> -       struct u64_stats_sync syncp;
> -       u64 packets;
> -       u64 bytes;
> -       u64 xdp_tx;
> -       u64 xdp_tx_drops;
> -       u64 kicks;
> -       u64 tx_timeouts;
> -};
> -
> -struct virtnet_rq_stats {
> -       struct u64_stats_sync syncp;
> -       u64 packets;
> -       u64 bytes;
> -       u64 drops;
> -       u64 xdp_packets;
> -       u64 xdp_tx;
> -       u64 xdp_redirects;
> -       u64 xdp_drops;
> -       u64 kicks;
> -};
> -
> -#define VIRTNET_SQ_STAT(m)     offsetof(struct virtnet_sq_stats, m)
> -#define VIRTNET_RQ_STAT(m)     offsetof(struct virtnet_rq_stats, m)
> -
>  static const struct virtnet_stat_desc virtnet_sq_stats_desc[] = {
>         { "packets",            VIRTNET_SQ_STAT(packets) },
>         { "bytes",              VIRTNET_SQ_STAT(bytes) },
> @@ -127,80 +88,6 @@ static const struct virtnet_stat_desc virtnet_rq_stats_desc[] = {
>  #define VIRTNET_SQ_STATS_LEN   ARRAY_SIZE(virtnet_sq_stats_desc)
>  #define VIRTNET_RQ_STATS_LEN   ARRAY_SIZE(virtnet_rq_stats_desc)
>
> -struct virtnet_interrupt_coalesce {
> -       u32 max_packets;
> -       u32 max_usecs;
> -};
> -
> -/* The dma information of pages allocated at a time. */
> -struct virtnet_rq_dma {
> -       dma_addr_t addr;
> -       u32 ref;
> -       u16 len;
> -       u16 need_sync;
> -};
> -
> -/* Internal representation of a send virtqueue */
> -struct send_queue {
> -       /* Virtqueue associated with this send _queue */
> -       struct virtqueue *vq;
> -
> -       /* TX: fragments + linear part + virtio header */
> -       struct scatterlist sg[MAX_SKB_FRAGS + 2];
> -
> -       /* Name of the send queue: output.$index */
> -       char name[16];
> -
> -       struct virtnet_sq_stats stats;
> -
> -       struct virtnet_interrupt_coalesce intr_coal;
> -
> -       struct napi_struct napi;
> -
> -       /* Record whether sq is in reset state. */
> -       bool reset;
> -};
> -
> -/* Internal representation of a receive virtqueue */
> -struct receive_queue {
> -       /* Virtqueue associated with this receive_queue */
> -       struct virtqueue *vq;
> -
> -       struct napi_struct napi;
> -
> -       struct bpf_prog __rcu *xdp_prog;
> -
> -       struct virtnet_rq_stats stats;
> -
> -       struct virtnet_interrupt_coalesce intr_coal;
> -
> -       /* Chain pages by the private ptr. */
> -       struct page *pages;
> -
> -       /* Average packet length for mergeable receive buffers. */
> -       struct ewma_pkt_len mrg_avg_pkt_len;
> -
> -       /* Page frag for packet buffer allocation. */
> -       struct page_frag alloc_frag;
> -
> -       /* RX: fragments + linear part + virtio header */
> -       struct scatterlist sg[MAX_SKB_FRAGS + 2];
> -
> -       /* Min single buffer size for mergeable buffers case. */
> -       unsigned int min_buf_len;
> -
> -       /* Name of this receive queue: input.$index */
> -       char name[16];
> -
> -       struct xdp_rxq_info xdp_rxq;
> -
> -       /* Record the last dma info to free after new pages is allocated. */
> -       struct virtnet_rq_dma *last_dma;
> -
> -       /* Do dma by self */
> -       bool do_dma;
> -};
> -
>  /* This structure can contain rss message with maximum settings for indirection table and keysize
>   * Note, that default structure that describes RSS configuration virtio_net_rss_config
>   * contains same info but can't handle table values.
> @@ -234,88 +121,6 @@ struct control_buf {
>         struct virtio_net_ctrl_coal_vq coal_vq;
>  };
>
> -struct virtnet_info {
> -       struct virtio_device *vdev;
> -       struct virtqueue *cvq;
> -       struct net_device *dev;
> -       struct send_queue *sq;
> -       struct receive_queue *rq;
> -       unsigned int status;
> -
> -       /* Max # of queue pairs supported by the device */
> -       u16 max_queue_pairs;
> -
> -       /* # of queue pairs currently used by the driver */
> -       u16 curr_queue_pairs;
> -
> -       /* # of XDP queue pairs currently used by the driver */
> -       u16 xdp_queue_pairs;
> -
> -       /* xdp_queue_pairs may be 0, when xdp is already loaded. So add this. */
> -       bool xdp_enabled;
> -
> -       /* I like... big packets and I cannot lie! */
> -       bool big_packets;
> -
> -       /* number of sg entries allocated for big packets */
> -       unsigned int big_packets_num_skbfrags;
> -
> -       /* Host will merge rx buffers for big packets (shake it! shake it!) */
> -       bool mergeable_rx_bufs;
> -
> -       /* Host supports rss and/or hash report */
> -       bool has_rss;
> -       bool has_rss_hash_report;
> -       u8 rss_key_size;
> -       u16 rss_indir_table_size;
> -       u32 rss_hash_types_supported;
> -       u32 rss_hash_types_saved;
> -
> -       /* Has control virtqueue */
> -       bool has_cvq;
> -
> -       /* Host can handle any s/g split between our header and packet data */
> -       bool any_header_sg;
> -
> -       /* Packet virtio header size */
> -       u8 hdr_len;
> -
> -       /* Work struct for delayed refilling if we run low on memory. */
> -       struct delayed_work refill;
> -
> -       /* Is delayed refill enabled? */
> -       bool refill_enabled;
> -
> -       /* The lock to synchronize the access to refill_enabled */
> -       spinlock_t refill_lock;
> -
> -       /* Work struct for config space updates */
> -       struct work_struct config_work;
> -
> -       /* Does the affinity hint is set for virtqueues? */
> -       bool affinity_hint_set;
> -
> -       /* CPU hotplug instances for online & dead */
> -       struct hlist_node node;
> -       struct hlist_node node_dead;
> -
> -       struct control_buf *ctrl;
> -
> -       /* Ethtool settings */
> -       u8 duplex;
> -       u32 speed;
> -
> -       /* Interrupt coalescing settings */
> -       struct virtnet_interrupt_coalesce intr_coal_tx;
> -       struct virtnet_interrupt_coalesce intr_coal_rx;
> -
> -       unsigned long guest_offloads;
> -       unsigned long guest_offloads_capable;
> -
> -       /* failover when STANDBY feature enabled */
> -       struct failover *failover;
> -};
> -
>  struct padded_vnet_hdr {
>         struct virtio_net_hdr_v1_hash hdr;
>         /*
> @@ -337,45 +142,11 @@ struct virtio_net_common_hdr {
>  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 bool is_xdp_frame(void *ptr)
> -{
> -       return (unsigned long)ptr & VIRTIO_XDP_FLAG;
> -}
> -
>  static void *xdp_to_ptr(struct xdp_frame *ptr)
>  {
>         return (void *)((unsigned long)ptr | VIRTIO_XDP_FLAG);
>  }

Any reason for not moving this?

Thanks

>

Powered by blists - more mailing lists