Move some core structures (send_queue, receive_queue, virtnet_info)
definitions and the relative structures definitions into the
virtio_net.h file.

That will be used by the other c code files.

Signed-off-by: Xuan Zhuo <xuanz...@linux.alibaba.com>
Acked-by: Jason Wang <jasow...@redhat.com>
---
 drivers/net/virtio/main.c       | 189 +------------------------------
 drivers/net/virtio/virtio_net.h | 193 ++++++++++++++++++++++++++++++++
 2 files changed, 195 insertions(+), 187 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 b01afd19061f..c104cfa801e8 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);
 
@@ -47,13 +47,6 @@ module_param(napi_tx, bool, 0644);
 
 #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[] = {
@@ -79,28 +72,6 @@ struct virtnet_stat_desc {
        size_t offset;
 };
 
-struct virtnet_sq_stats {
-       struct u64_stats_sync syncp;
-       u64_stats_t packets;
-       u64_stats_t bytes;
-       u64_stats_t xdp_tx;
-       u64_stats_t xdp_tx_drops;
-       u64_stats_t kicks;
-       u64_stats_t tx_timeouts;
-};
-
-struct virtnet_rq_stats {
-       struct u64_stats_sync syncp;
-       u64_stats_t packets;
-       u64_stats_t bytes;
-       u64_stats_t drops;
-       u64_stats_t xdp_packets;
-       u64_stats_t xdp_tx;
-       u64_stats_t xdp_redirects;
-       u64_stats_t xdp_drops;
-       u64_stats_t kicks;
-};
-
 #define VIRTNET_SQ_STAT(m)     offsetof(struct virtnet_sq_stats, m)
 #define VIRTNET_RQ_STAT(m)     offsetof(struct virtnet_rq_stats, m)
 
@@ -127,80 +98,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 +131,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;
        /*
diff --git a/drivers/net/virtio/virtio_net.h b/drivers/net/virtio/virtio_net.h
new file mode 100644
index 000000000000..38061e15d494
--- /dev/null
+++ b/drivers/net/virtio/virtio_net.h
@@ -0,0 +1,193 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __VIRTIO_NET_H__
+#define __VIRTIO_NET_H__
+
+#include <linux/ethtool.h>
+#include <linux/average.h>
+
+/* 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)
+
+struct virtnet_sq_stats {
+       struct u64_stats_sync syncp;
+       u64_stats_t packets;
+       u64_stats_t bytes;
+       u64_stats_t xdp_tx;
+       u64_stats_t xdp_tx_drops;
+       u64_stats_t kicks;
+       u64_stats_t tx_timeouts;
+};
+
+struct virtnet_rq_stats {
+       struct u64_stats_sync syncp;
+       u64_stats_t packets;
+       u64_stats_t bytes;
+       u64_stats_t drops;
+       u64_stats_t xdp_packets;
+       u64_stats_t xdp_tx;
+       u64_stats_t xdp_redirects;
+       u64_stats_t xdp_drops;
+       u64_stats_t kicks;
+};
+
+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;
+};
+
+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;
+};
+#endif
-- 
2.32.0.3.g01195cf9f


Reply via email to