Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b1d47f9 authored by Juergen Gross's avatar Juergen Gross Committed by Greg Kroah-Hartman
Browse files

xen/netback: do some code cleanup 



[ Upstream commit 5834e72eda0b7e5767eb107259d98eef19ebd11f ]

Remove some unused macros and functions, make local functions static.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Acked-by: default avatarWei Liu <wei.liu@kernel.org>
Link: https://lore.kernel.org/r/20220608043726.9380-1-jgross@suse.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Stable-dep-of: 74e7e1efdad4 ("xen/netback: don't call kfree_skb() with interrupts disabled")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8fe1bf6f

drivers/net/xen-netback/common.h

+0 −12
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#include <linux/debugfs.h>



typedef unsigned int pending_ring_idx_t;

#define INVALID_PENDING_RING_IDX (~0U)



struct pending_tx_info {

	struct xen_netif_tx_request req; /* tx request */
@@ -82,8 +81,6 @@ struct xenvif_rx_meta { 
/* Discriminate from any valid pending_idx value. */

#define INVALID_PENDING_IDX 0xFFFF



#define MAX_BUFFER_OFFSET XEN_PAGE_SIZE



#define MAX_PENDING_REQS XEN_NETIF_TX_RING_SIZE



/* The maximum number of frags is derived from the size of a grant (same
@@ -364,11 +361,6 @@ void xenvif_free(struct xenvif *vif); 
int xenvif_xenbus_init(void);

void xenvif_xenbus_fini(void);



int xenvif_schedulable(struct xenvif *vif);



int xenvif_queue_stopped(struct xenvif_queue *queue);

void xenvif_wake_queue(struct xenvif_queue *queue);



/* (Un)Map communication rings. */

void xenvif_unmap_frontend_data_rings(struct xenvif_queue *queue);

int xenvif_map_frontend_data_rings(struct xenvif_queue *queue,
@@ -391,7 +383,6 @@ int xenvif_dealloc_kthread(void *data); 
irqreturn_t xenvif_ctrl_irq_fn(int irq, void *data);



bool xenvif_have_rx_work(struct xenvif_queue *queue, bool test_kthread);

void xenvif_rx_action(struct xenvif_queue *queue);

void xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb);



void xenvif_carrier_on(struct xenvif *vif);
@@ -399,9 +390,6 @@ void xenvif_carrier_on(struct xenvif *vif); 
/* Callback from stack when TX packet can be released */

void xenvif_zerocopy_callback(struct ubuf_info *ubuf, bool zerocopy_success);



/* Unmap a pending page and release it back to the guest */

void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx);



static inline pending_ring_idx_t nr_pending_reqs(struct xenvif_queue *queue)

{

	return MAX_PENDING_REQS -

drivers/net/xen-netback/interface.c

+1 −15
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ void xenvif_skb_zerocopy_complete(struct xenvif_queue *queue) 
	wake_up(&queue->dealloc_wq);

}



int xenvif_schedulable(struct xenvif *vif)

static int xenvif_schedulable(struct xenvif *vif)

{

	return netif_running(vif->dev) &&

		test_bit(VIF_STATUS_CONNECTED, &vif->status) &&
@@ -178,20 +178,6 @@ irqreturn_t xenvif_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



int xenvif_queue_stopped(struct xenvif_queue *queue)

{

	struct net_device *dev = queue->vif->dev;

	unsigned int id = queue->id;

	return netif_tx_queue_stopped(netdev_get_tx_queue(dev, id));

}



void xenvif_wake_queue(struct xenvif_queue *queue)

{

	struct net_device *dev = queue->vif->dev;

	unsigned int id = queue->id;

	netif_tx_wake_queue(netdev_get_tx_queue(dev, id));

}



static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb,

			       struct net_device *sb_dev)

{

drivers/net/xen-netback/netback.c

+3 −1
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ static void make_tx_response(struct xenvif_queue *queue, 
			     s8       st);

static void push_tx_responses(struct xenvif_queue *queue);



static void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx);



static inline int tx_work_todo(struct xenvif_queue *queue);



static inline unsigned long idx_to_pfn(struct xenvif_queue *queue,
@@ -1433,7 +1435,7 @@ static void push_tx_responses(struct xenvif_queue *queue) 
		notify_remote_via_irq(queue->tx_irq);

}



void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx)

static void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx)

{

	int ret;

	struct gnttab_unmap_grant_ref tx_unmap_op;

drivers/net/xen-netback/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static void xenvif_rx_skb(struct xenvif_queue *queue) 


#define RX_BATCH_SIZE 64



void xenvif_rx_action(struct xenvif_queue *queue)

static void xenvif_rx_action(struct xenvif_queue *queue)

{

	struct sk_buff_head completed_skbs;

	unsigned int work_done = 0;