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

Commit 688ff32d authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbevf: add netpoll support 



This patch adds ixgbevf_netpoll() a callback for .ndo_poll_controller to
allow for the VF interface to be used with netconsole.

CC: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 6622402a

drivers/net/ethernet/intel/ixgbevf/ixgbevf.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -379,7 +379,7 @@ struct ixgbevf_adapter { 
	 */

	 */

	u32 flags;

	u32 flags;

#define IXGBE_FLAG_IN_WATCHDOG_TASK             (u32)(1)

#define IXGBE_FLAG_IN_WATCHDOG_TASK             (u32)(1)

#define IXGBE_FLAG_IN_NETPOLL                   (u32)(1 << 1)



#define IXGBEVF_FLAG_QUEUE_RESET_REQUESTED	(u32)(1 << 2)

#define IXGBEVF_FLAG_QUEUE_RESET_REQUESTED	(u32)(1 << 2)





	struct msix_entry *msix_entries;

	struct msix_entry *msix_entries;

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+23 −6
Original line number Original line Diff line number Diff line
@@ -344,10 +344,8 @@ static void ixgbevf_rx_skb(struct ixgbevf_q_vector *q_vector, 
		return;

		return;

	}

	}

#endif /* CONFIG_NET_RX_BUSY_POLL */

#endif /* CONFIG_NET_RX_BUSY_POLL */

	if (!(q_vector->adapter->flags & IXGBE_FLAG_IN_NETPOLL))



	napi_gro_receive(&q_vector->napi, skb);

	napi_gro_receive(&q_vector->napi, skb);

	else

		netif_rx(skb);

}

}





/* ixgbevf_rx_checksum - indicate in skb if hw indicated a good cksum

/* ixgbevf_rx_checksum - indicate in skb if hw indicated a good cksum
@@ -919,12 +917,10 @@ static int ixgbevf_poll(struct napi_struct *napi, int budget) 
	else

	else

		per_ring_budget = budget;

		per_ring_budget = budget;





	adapter->flags |= IXGBE_FLAG_IN_NETPOLL;

	ixgbevf_for_each_ring(ring, q_vector->rx)

	ixgbevf_for_each_ring(ring, q_vector->rx)

		clean_complete &= (ixgbevf_clean_rx_irq(q_vector, ring,

		clean_complete &= (ixgbevf_clean_rx_irq(q_vector, ring,

							per_ring_budget)

							per_ring_budget)

				   < per_ring_budget);

				   < per_ring_budget);

	adapter->flags &= ~IXGBE_FLAG_IN_NETPOLL;





#ifdef CONFIG_NET_RX_BUSY_POLL

#ifdef CONFIG_NET_RX_BUSY_POLL

	ixgbevf_qv_unlock_napi(q_vector);

	ixgbevf_qv_unlock_napi(q_vector);
@@ -3553,6 +3549,24 @@ static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu) 
	return 0;

	return 0;

}

}





#ifdef CONFIG_NET_POLL_CONTROLLER

/* Polling 'interrupt' - used by things like netconsole to send skbs

 * without having to re-enable interrupts. It's not called while

 * the interrupt routine is executing.

 */

static void ixgbevf_netpoll(struct net_device *netdev)

{

	struct ixgbevf_adapter *adapter = netdev_priv(netdev);

	int i;



	/* if interface is down do nothing */

	if (test_bit(__IXGBEVF_DOWN, &adapter->state))

		return;

	for (i = 0; i < adapter->num_rx_queues; i++)

		ixgbevf_msix_clean_rings(0, adapter->q_vector[i]);

}

#endif /* CONFIG_NET_POLL_CONTROLLER */



static int ixgbevf_suspend(struct pci_dev *pdev, pm_message_t state)

static int ixgbevf_suspend(struct pci_dev *pdev, pm_message_t state)

{

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct net_device *netdev = pci_get_drvdata(pdev);
@@ -3689,6 +3703,9 @@ static const struct net_device_ops ixgbevf_netdev_ops = { 
#ifdef CONFIG_NET_RX_BUSY_POLL

#ifdef CONFIG_NET_RX_BUSY_POLL

	.ndo_busy_poll		= ixgbevf_busy_poll_recv,

	.ndo_busy_poll		= ixgbevf_busy_poll_recv,

#endif

#endif

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= ixgbevf_netpoll,

#endif

};

};





static void ixgbevf_assign_netdev_ops(struct net_device *dev)

static void ixgbevf_assign_netdev_ops(struct net_device *dev)