We move some structures to the header file, but these structures do not
prefixed with virtnet. This patch adds virtnet for these.

Signed-off-by: Xuan Zhuo <xuanz...@linux.alibaba.com>
---
 drivers/net/virtio/main.c       | 106 ++++++++++++++++----------------
 drivers/net/virtio/virtio_net.h |  12 ++--
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c
index d7c685cf164f..ac3a529c7729 100644
--- a/drivers/net/virtio/main.c
+++ b/drivers/net/virtio/main.c
@@ -167,7 +167,7 @@ static struct xdp_frame *ptr_to_xdp(void *ptr)
        return (struct xdp_frame *)((unsigned long)ptr & ~VIRTIO_XDP_FLAG);
 }
 
-static void __free_old_xmit(struct send_queue *sq, bool in_napi,
+static void __free_old_xmit(struct virtnet_sq *sq, bool in_napi,
                            u64 *bytes, u64 *packets)
 {
        unsigned int len;
@@ -224,7 +224,7 @@ skb_vnet_common_hdr(struct sk_buff *skb)
  * private is used to chain pages for big packets, put the whole
  * most recent used list in the beginning for reuse
  */
-static void give_pages(struct receive_queue *rq, struct page *page)
+static void give_pages(struct virtnet_rq *rq, struct page *page)
 {
        struct page *end;
 
@@ -234,7 +234,7 @@ static void give_pages(struct receive_queue *rq, struct 
page *page)
        rq->pages = page;
 }
 
-static struct page *get_a_page(struct receive_queue *rq, gfp_t gfp_mask)
+static struct page *get_a_page(struct virtnet_rq *rq, gfp_t gfp_mask)
 {
        struct page *p = rq->pages;
 
@@ -248,7 +248,7 @@ static struct page *get_a_page(struct receive_queue *rq, 
gfp_t gfp_mask)
 }
 
 static void virtnet_rq_free_buf(struct virtnet_info *vi,
-                               struct receive_queue *rq, void *buf)
+                               struct virtnet_rq *rq, void *buf)
 {
        if (vi->mergeable_rx_bufs)
                put_page(virt_to_head_page(buf));
@@ -349,7 +349,7 @@ static struct sk_buff *virtnet_build_skb(void *buf, 
unsigned int buflen,
 
 /* Called from bottom half context */
 static struct sk_buff *page_to_skb(struct virtnet_info *vi,
-                                  struct receive_queue *rq,
+                                  struct virtnet_rq *rq,
                                   struct page *page, unsigned int offset,
                                   unsigned int len, unsigned int truesize,
                                   unsigned int headroom)
@@ -448,7 +448,7 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
        return skb;
 }
 
-static void virtnet_rq_unmap(struct receive_queue *rq, void *buf, u32 len)
+static void virtnet_rq_unmap(struct virtnet_rq *rq, void *buf, u32 len)
 {
        struct page *page = virt_to_head_page(buf);
        struct virtnet_rq_dma *dma;
@@ -477,7 +477,7 @@ static void virtnet_rq_unmap(struct receive_queue *rq, void 
*buf, u32 len)
        put_page(page);
 }
 
-static void *virtnet_rq_get_buf(struct receive_queue *rq, u32 *len, void **ctx)
+static void *virtnet_rq_get_buf(struct virtnet_rq *rq, u32 *len, void **ctx)
 {
        void *buf;
 
@@ -488,7 +488,7 @@ static void *virtnet_rq_get_buf(struct receive_queue *rq, 
u32 *len, void **ctx)
        return buf;
 }
 
-static void virtnet_rq_init_one_sg(struct receive_queue *rq, void *buf, u32 
len)
+static void virtnet_rq_init_one_sg(struct virtnet_rq *rq, void *buf, u32 len)
 {
        struct virtnet_rq_dma *dma;
        dma_addr_t addr;
@@ -513,7 +513,7 @@ static void virtnet_rq_init_one_sg(struct receive_queue 
*rq, void *buf, u32 len)
        rq->sg[0].length = len;
 }
 
-static void *virtnet_rq_alloc(struct receive_queue *rq, u32 size, gfp_t gfp)
+static void *virtnet_rq_alloc(struct virtnet_rq *rq, u32 size, gfp_t gfp)
 {
        struct page_frag *alloc_frag = &rq->alloc_frag;
        struct virtnet_rq_dma *dma;
@@ -590,7 +590,7 @@ static void virtnet_rq_set_premapped(struct virtnet_info 
*vi)
 static void virtnet_rq_unmap_free_buf(struct virtqueue *vq, void *buf)
 {
        struct virtnet_info *vi = vq->vdev->priv;
-       struct receive_queue *rq;
+       struct virtnet_rq *rq;
        int i = vq2rxq(vq);
 
        rq = &vi->rq[i];
@@ -601,7 +601,7 @@ static void virtnet_rq_unmap_free_buf(struct virtqueue *vq, 
void *buf)
        virtnet_rq_free_buf(vi, rq, buf);
 }
 
-static void free_old_xmit(struct send_queue *sq, bool in_napi)
+static void free_old_xmit(struct virtnet_sq *sq, bool in_napi)
 {
        u64 bytes = 0, packets = 0;
 
@@ -631,7 +631,7 @@ static bool is_xdp_raw_buffer_queue(struct virtnet_info 
*vi, int q)
 
 static void check_sq_full_and_disable(struct virtnet_info *vi,
                                      struct net_device *dev,
-                                     struct send_queue *sq)
+                                     struct virtnet_sq *sq)
 {
        bool use_napi = sq->napi.weight;
        int qnum;
@@ -665,7 +665,7 @@ static void check_sq_full_and_disable(struct virtnet_info 
*vi,
 }
 
 static int __virtnet_xdp_xmit_one(struct virtnet_info *vi,
-                                  struct send_queue *sq,
+                                  struct virtnet_sq *sq,
                                   struct xdp_frame *xdpf)
 {
        struct virtio_net_hdr_mrg_rxbuf *hdr;
@@ -754,10 +754,10 @@ static int virtnet_xdp_xmit(struct net_device *dev,
                            int n, struct xdp_frame **frames, u32 flags)
 {
        struct virtnet_info *vi = netdev_priv(dev);
-       struct receive_queue *rq = vi->rq;
+       struct virtnet_rq *rq = vi->rq;
        u64 bytes = 0, packets = 0;
        struct bpf_prog *xdp_prog;
-       struct send_queue *sq;
+       struct virtnet_sq *sq;
        int nxmit = 0;
        int kicks = 0;
        int ret;
@@ -897,7 +897,7 @@ static unsigned int virtnet_get_headroom(struct 
virtnet_info *vi)
  * across multiple buffers (num_buf > 1), and we make sure buffers
  * have enough headroom.
  */
-static struct page *xdp_linearize_page(struct receive_queue *rq,
+static struct page *xdp_linearize_page(struct virtnet_rq *rq,
                                       int *num_buf,
                                       struct page *p,
                                       int offset,
@@ -978,7 +978,7 @@ static struct sk_buff *receive_small_build_skb(struct 
virtnet_info *vi,
 
 static struct sk_buff *receive_small_xdp(struct net_device *dev,
                                         struct virtnet_info *vi,
-                                        struct receive_queue *rq,
+                                        struct virtnet_rq *rq,
                                         struct bpf_prog *xdp_prog,
                                         void *buf,
                                         unsigned int xdp_headroom,
@@ -1065,7 +1065,7 @@ static struct sk_buff *receive_small_xdp(struct 
net_device *dev,
 
 static struct sk_buff *receive_small(struct net_device *dev,
                                     struct virtnet_info *vi,
-                                    struct receive_queue *rq,
+                                    struct virtnet_rq *rq,
                                     void *buf, void *ctx,
                                     unsigned int len,
                                     unsigned int *xdp_xmit,
@@ -1112,7 +1112,7 @@ static struct sk_buff *receive_small(struct net_device 
*dev,
 
 static struct sk_buff *receive_big(struct net_device *dev,
                                   struct virtnet_info *vi,
-                                  struct receive_queue *rq,
+                                  struct virtnet_rq *rq,
                                   void *buf,
                                   unsigned int len,
                                   struct virtnet_rq_stats *stats)
@@ -1133,7 +1133,7 @@ static struct sk_buff *receive_big(struct net_device *dev,
        return NULL;
 }
 
-static void mergeable_buf_free(struct receive_queue *rq, int num_buf,
+static void mergeable_buf_free(struct virtnet_rq *rq, int num_buf,
                               struct net_device *dev,
                               struct virtnet_rq_stats *stats)
 {
@@ -1207,7 +1207,7 @@ static struct sk_buff *build_skb_from_xdp_buff(struct 
net_device *dev,
 /* TODO: build xdp in big mode */
 static int virtnet_build_xdp_buff_mrg(struct net_device *dev,
                                      struct virtnet_info *vi,
-                                     struct receive_queue *rq,
+                                     struct virtnet_rq *rq,
                                      struct xdp_buff *xdp,
                                      void *buf,
                                      unsigned int len,
@@ -1295,7 +1295,7 @@ static int virtnet_build_xdp_buff_mrg(struct net_device 
*dev,
 }
 
 static void *mergeable_xdp_get_buf(struct virtnet_info *vi,
-                                  struct receive_queue *rq,
+                                  struct virtnet_rq *rq,
                                   struct bpf_prog *xdp_prog,
                                   void *ctx,
                                   unsigned int *frame_sz,
@@ -1370,7 +1370,7 @@ static void *mergeable_xdp_get_buf(struct virtnet_info 
*vi,
 
 static struct sk_buff *receive_mergeable_xdp(struct net_device *dev,
                                             struct virtnet_info *vi,
-                                            struct receive_queue *rq,
+                                            struct virtnet_rq *rq,
                                             struct bpf_prog *xdp_prog,
                                             void *buf,
                                             void *ctx,
@@ -1430,7 +1430,7 @@ static struct sk_buff *receive_mergeable_xdp(struct 
net_device *dev,
 
 static struct sk_buff *receive_mergeable(struct net_device *dev,
                                         struct virtnet_info *vi,
-                                        struct receive_queue *rq,
+                                        struct virtnet_rq *rq,
                                         void *buf,
                                         void *ctx,
                                         unsigned int len,
@@ -1575,7 +1575,7 @@ static void virtio_skb_set_hash(const struct 
virtio_net_hdr_v1_hash *hdr_hash,
        skb_set_hash(skb, __le32_to_cpu(hdr_hash->hash_value), rss_hash_type);
 }
 
-static void receive_buf(struct virtnet_info *vi, struct receive_queue *rq,
+static void receive_buf(struct virtnet_info *vi, struct virtnet_rq *rq,
                        void *buf, unsigned int len, void **ctx,
                        unsigned int *xdp_xmit,
                        struct virtnet_rq_stats *stats)
@@ -1635,7 +1635,7 @@ static void receive_buf(struct virtnet_info *vi, struct 
receive_queue *rq,
  * not need to use  mergeable_len_to_ctx here - it is enough
  * to store the headroom as the context ignoring the truesize.
  */
-static int add_recvbuf_small(struct virtnet_info *vi, struct receive_queue *rq,
+static int add_recvbuf_small(struct virtnet_info *vi, struct virtnet_rq *rq,
                             gfp_t gfp)
 {
        char *buf;
@@ -1664,7 +1664,7 @@ static int add_recvbuf_small(struct virtnet_info *vi, 
struct receive_queue *rq,
        return err;
 }
 
-static int add_recvbuf_big(struct virtnet_info *vi, struct receive_queue *rq,
+static int add_recvbuf_big(struct virtnet_info *vi, struct virtnet_rq *rq,
                           gfp_t gfp)
 {
        struct page *first, *list = NULL;
@@ -1713,7 +1713,7 @@ static int add_recvbuf_big(struct virtnet_info *vi, 
struct receive_queue *rq,
        return err;
 }
 
-static unsigned int get_mergeable_buf_len(struct receive_queue *rq,
+static unsigned int get_mergeable_buf_len(struct virtnet_rq *rq,
                                          struct ewma_pkt_len *avg_pkt_len,
                                          unsigned int room)
 {
@@ -1731,7 +1731,7 @@ static unsigned int get_mergeable_buf_len(struct 
receive_queue *rq,
 }
 
 static int add_recvbuf_mergeable(struct virtnet_info *vi,
-                                struct receive_queue *rq, gfp_t gfp)
+                                struct virtnet_rq *rq, gfp_t gfp)
 {
        struct page_frag *alloc_frag = &rq->alloc_frag;
        unsigned int headroom = virtnet_get_headroom(vi);
@@ -1786,7 +1786,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,
+static bool try_fill_recv(struct virtnet_info *vi, struct virtnet_rq *rq,
                          gfp_t gfp)
 {
        int err;
@@ -1818,7 +1818,7 @@ static bool try_fill_recv(struct virtnet_info *vi, struct 
receive_queue *rq,
 static void skb_recv_done(struct virtqueue *rvq)
 {
        struct virtnet_info *vi = rvq->vdev->priv;
-       struct receive_queue *rq = &vi->rq[vq2rxq(rvq)];
+       struct virtnet_rq *rq = &vi->rq[vq2rxq(rvq)];
 
        rq->calls++;
        virtqueue_napi_schedule(&rq->napi, rvq);
@@ -1869,7 +1869,7 @@ static void refill_work(struct work_struct *work)
        int i;
 
        for (i = 0; i < vi->curr_queue_pairs; i++) {
-               struct receive_queue *rq = &vi->rq[i];
+               struct virtnet_rq *rq = &vi->rq[i];
 
                napi_disable(&rq->napi);
                still_empty = !try_fill_recv(vi, rq, GFP_KERNEL);
@@ -1883,7 +1883,7 @@ static void refill_work(struct work_struct *work)
        }
 }
 
-static int virtnet_receive(struct receive_queue *rq, int budget,
+static int virtnet_receive(struct virtnet_rq *rq, int budget,
                           unsigned int *xdp_xmit)
 {
        struct virtnet_info *vi = rq->vq->vdev->priv;
@@ -1933,11 +1933,11 @@ static int virtnet_receive(struct receive_queue *rq, 
int budget,
        return packets;
 }
 
-static void virtnet_poll_cleantx(struct receive_queue *rq)
+static void virtnet_poll_cleantx(struct virtnet_rq *rq)
 {
        struct virtnet_info *vi = rq->vq->vdev->priv;
        unsigned int index = vq2rxq(rq->vq);
-       struct send_queue *sq = &vi->sq[index];
+       struct virtnet_sq *sq = &vi->sq[index];
        struct netdev_queue *txq = netdev_get_tx_queue(vi->dev, index);
 
        if (!sq->napi.weight || is_xdp_raw_buffer_queue(vi, index))
@@ -1961,7 +1961,7 @@ static void virtnet_poll_cleantx(struct receive_queue *rq)
        }
 }
 
-static void virtnet_rx_dim_update(struct virtnet_info *vi, struct 
receive_queue *rq)
+static void virtnet_rx_dim_update(struct virtnet_info *vi, struct virtnet_rq 
*rq)
 {
        struct dim_sample cur_sample = {};
 
@@ -1981,10 +1981,10 @@ static void virtnet_rx_dim_update(struct virtnet_info 
*vi, struct receive_queue
 
 static int virtnet_poll(struct napi_struct *napi, int budget)
 {
-       struct receive_queue *rq =
-               container_of(napi, struct receive_queue, napi);
+       struct virtnet_rq *rq =
+               container_of(napi, struct virtnet_rq, napi);
        struct virtnet_info *vi = rq->vq->vdev->priv;
-       struct send_queue *sq;
+       struct virtnet_sq *sq;
        unsigned int received;
        unsigned int xdp_xmit = 0;
        bool napi_complete;
@@ -2083,7 +2083,7 @@ static int virtnet_open(struct net_device *dev)
 
 static int virtnet_poll_tx(struct napi_struct *napi, int budget)
 {
-       struct send_queue *sq = container_of(napi, struct send_queue, napi);
+       struct virtnet_sq *sq = container_of(napi, struct virtnet_sq, napi);
        struct virtnet_info *vi = sq->vq->vdev->priv;
        unsigned int index = vq2txq(sq->vq);
        struct netdev_queue *txq;
@@ -2127,7 +2127,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int 
budget)
        return 0;
 }
 
-static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
+static int xmit_skb(struct virtnet_sq *sq, struct sk_buff *skb)
 {
        struct virtio_net_hdr_mrg_rxbuf *hdr;
        const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;
@@ -2178,7 +2178,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct 
net_device *dev)
 {
        struct virtnet_info *vi = netdev_priv(dev);
        int qnum = skb_get_queue_mapping(skb);
-       struct send_queue *sq = &vi->sq[qnum];
+       struct virtnet_sq *sq = &vi->sq[qnum];
        int err;
        struct netdev_queue *txq = netdev_get_tx_queue(dev, qnum);
        bool kick = !netdev_xmit_more();
@@ -2232,7 +2232,7 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct 
net_device *dev)
 }
 
 static int virtnet_rx_resize(struct virtnet_info *vi,
-                            struct receive_queue *rq, u32 ring_num)
+                            struct virtnet_rq *rq, u32 ring_num)
 {
        bool running = netif_running(vi->dev);
        int err, qindex;
@@ -2257,7 +2257,7 @@ static int virtnet_rx_resize(struct virtnet_info *vi,
 }
 
 static int virtnet_tx_resize(struct virtnet_info *vi,
-                            struct send_queue *sq, u32 ring_num)
+                            struct virtnet_sq *sq, u32 ring_num)
 {
        bool running = netif_running(vi->dev);
        struct netdev_queue *txq;
@@ -2403,8 +2403,8 @@ static void virtnet_stats(struct net_device *dev,
 
        for (i = 0; i < vi->max_queue_pairs; i++) {
                u64 tpackets, tbytes, terrors, rpackets, rbytes, rdrops;
-               struct receive_queue *rq = &vi->rq[i];
-               struct send_queue *sq = &vi->sq[i];
+               struct virtnet_rq *rq = &vi->rq[i];
+               struct virtnet_sq *sq = &vi->sq[i];
 
                do {
                        start = u64_stats_fetch_begin(&sq->stats.syncp);
@@ -2771,8 +2771,8 @@ static int virtnet_set_ringparam(struct net_device *dev,
 {
        struct virtnet_info *vi = netdev_priv(dev);
        u32 rx_pending, tx_pending;
-       struct receive_queue *rq;
-       struct send_queue *sq;
+       struct virtnet_rq *rq;
+       struct virtnet_sq *sq;
        int i, err;
 
        if (ring->rx_mini_pending || ring->rx_jumbo_pending)
@@ -3095,7 +3095,7 @@ static void virtnet_get_ethtool_stats(struct net_device 
*dev,
        size_t offset;
 
        for (i = 0; i < vi->curr_queue_pairs; i++) {
-               struct receive_queue *rq = &vi->rq[i];
+               struct virtnet_rq *rq = &vi->rq[i];
 
                stats_base = (const u8 *)&rq->stats;
                do {
@@ -3110,7 +3110,7 @@ static void virtnet_get_ethtool_stats(struct net_device 
*dev,
        }
 
        for (i = 0; i < vi->curr_queue_pairs; i++) {
-               struct send_queue *sq = &vi->sq[i];
+               struct virtnet_sq *sq = &vi->sq[i];
 
                stats_base = (const u8 *)&sq->stats;
                do {
@@ -3308,8 +3308,8 @@ static int virtnet_send_notf_coal_vq_cmds(struct 
virtnet_info *vi,
 static void virtnet_rx_dim_work(struct work_struct *work)
 {
        struct dim *dim = container_of(work, struct dim, work);
-       struct receive_queue *rq = container_of(dim,
-                       struct receive_queue, dim);
+       struct virtnet_rq *rq = container_of(dim,
+                       struct virtnet_rq, dim);
        struct virtnet_info *vi = rq->vq->vdev->priv;
        struct net_device *dev = vi->dev;
        struct dim_cq_moder update_moder;
@@ -3903,7 +3903,7 @@ static int virtnet_set_features(struct net_device *dev,
 static void virtnet_tx_timeout(struct net_device *dev, unsigned int txqueue)
 {
        struct virtnet_info *priv = netdev_priv(dev);
-       struct send_queue *sq = &priv->sq[txqueue];
+       struct virtnet_sq *sq = &priv->sq[txqueue];
        struct netdev_queue *txq = netdev_get_tx_queue(dev, txqueue);
 
        u64_stats_update_begin(&sq->stats.syncp);
diff --git a/drivers/net/virtio/virtio_net.h b/drivers/net/virtio/virtio_net.h
index 902ccde10133..b28a4d0a3150 100644
--- a/drivers/net/virtio/virtio_net.h
+++ b/drivers/net/virtio/virtio_net.h
@@ -49,8 +49,8 @@ struct virtnet_rq_dma {
 };
 
 /* Internal representation of a send virtqueue */
-struct send_queue {
-       /* Virtqueue associated with this send _queue */
+struct virtnet_sq {
+       /* Virtqueue associated with this virtnet_sq */
        struct virtqueue *vq;
 
        /* TX: fragments + linear part + virtio header */
@@ -70,8 +70,8 @@ struct send_queue {
 };
 
 /* Internal representation of a receive virtqueue */
-struct receive_queue {
-       /* Virtqueue associated with this receive_queue */
+struct virtnet_rq {
+       /* Virtqueue associated with this virtnet_rq */
        struct virtqueue *vq;
 
        struct napi_struct napi;
@@ -124,8 +124,8 @@ struct virtnet_info {
        struct virtio_device *vdev;
        struct virtqueue *cvq;
        struct net_device *dev;
-       struct send_queue *sq;
-       struct receive_queue *rq;
+       struct virtnet_sq *sq;
+       struct virtnet_rq *rq;
        unsigned int status;
 
        /* Max # of queue pairs supported by the device */
-- 
2.32.0.3.g01195cf9f


Reply via email to