Commit dd40781e authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Run event/IRQ self-test asynchronously when interface is brought up 



Generate a test event on each event queue whenever the interface is
brought up, then after 1 second check that we have either handled a
test event or handled another IRQ for each event queue.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent eee6f6a9

drivers/net/ethernet/sfc/efx.c

+5 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "net_driver.h"

#include "efx.h"

#include "nic.h"

#include "selftest.h"



#include "mcdi.h"

#include "workarounds.h"
@@ -1564,8 +1565,9 @@ static void efx_start_all(struct efx_nic *efx) 
 * since we're holding the rtnl_lock at this point. */

static void efx_flush_all(struct efx_nic *efx)

{

	/* Make sure the hardware monitor is stopped */

	/* Make sure the hardware monitor and event self-test are stopped */

	cancel_delayed_work_sync(&efx->monitor_work);

	efx_selftest_async_cancel(efx);

	/* Stop scheduled port reconfigurations */

	cancel_work_sync(&efx->mac_work);

}
@@ -1825,6 +1827,7 @@ static int efx_net_open(struct net_device *net_dev) 
	efx_link_status_changed(efx);



	efx_start_all(efx);

	efx_selftest_async_start(efx);

	return 0;

}
@@ -2375,6 +2378,7 @@ static int efx_init_struct(struct efx_nic *efx, const struct efx_nic_type *type, 
#endif

	INIT_WORK(&efx->reset_work, efx_reset_work);

	INIT_DELAYED_WORK(&efx->monitor_work, efx_monitor);

	INIT_DELAYED_WORK(&efx->selftest_work, efx_selftest_async_work);

	efx->pci_dev = pci_dev;

	efx->msg_enable = debug;

	efx->state = STATE_INIT;

drivers/net/ethernet/sfc/efx.h

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static inline void efx_schedule_channel(struct efx_channel *channel) 


static inline void efx_schedule_channel_irq(struct efx_channel *channel)

{

	channel->last_irq_cpu = raw_smp_processor_id();

	channel->event_test_cpu = raw_smp_processor_id();

	efx_schedule_channel(channel);

}

drivers/net/ethernet/sfc/net_driver.h

+4 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ enum efx_rx_alloc_method { 
 * @eventq_mask: Event queue pointer mask

 * @eventq_read_ptr: Event queue read pointer

 * @last_eventq_read_ptr: Last event queue read pointer value.

 * @last_irq_cpu: Last CPU to handle interrupt for this channel

 * @event_test_cpu: Last CPU to handle interrupt or test event for this channel

 * @irq_count: Number of IRQs since last adaptive moderation decision

 * @irq_mod_score: IRQ moderation score

 * @rx_alloc_level: Watermark based heuristic counter for pushing descriptors
@@ -356,8 +356,8 @@ struct efx_channel { 
	unsigned int eventq_mask;

	unsigned int eventq_read_ptr;

	unsigned int last_eventq_read_ptr;

	int event_test_cpu;



	int last_irq_cpu;

	unsigned int irq_count;

	unsigned int irq_mod_score;

#ifdef CONFIG_RFS_ACCEL
@@ -678,6 +678,7 @@ struct vfdi_status; 
 * @irq_status: Interrupt status buffer

 * @irq_zero_count: Number of legacy IRQs seen with queue flags == 0

 * @irq_level: IRQ level/index for IRQs not triggered by an event queue

 * @selftest_work: Work item for asynchronous self-test

 * @mtd_list: List of MTDs attached to the NIC

 * @nic_data: Hardware dependent state

 * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode,
@@ -791,6 +792,7 @@ struct efx_nic { 
	struct efx_buffer irq_status;

	unsigned irq_zero_count;

	unsigned irq_level;

	struct delayed_work selftest_work;



#ifdef CONFIG_SFC_MTD

	struct list_head mtd_list;

drivers/net/ethernet/sfc/nic.c

+2 −2
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ efx_handle_generated_event(struct efx_channel *channel, efx_qword_t *event) 
	code = _EFX_CHANNEL_MAGIC_CODE(magic);



	if (magic == EFX_CHANNEL_MAGIC_TEST(channel)) {

		/* ignore */

		channel->event_test_cpu = raw_smp_processor_id();

	} else if (rx_queue && magic == EFX_CHANNEL_MAGIC_FILL(rx_queue)) {

		/* The queue must be empty, so we won't receive any rx

		 * events, so efx_process_channel() won't refill the
@@ -1334,7 +1334,7 @@ void efx_nic_remove_eventq(struct efx_channel *channel) 


void efx_nic_event_test_start(struct efx_channel *channel)

{

	channel->last_irq_cpu = -1;

	channel->event_test_cpu = -1;

	smp_wmb();

	efx_magic_event(channel, EFX_CHANNEL_MAGIC_TEST(channel));

}

drivers/net/ethernet/sfc/nic.h

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ extern void falcon_irq_ack_a1(struct efx_nic *efx); 


static inline int efx_nic_event_test_irq_cpu(struct efx_channel *channel)

{

	return ACCESS_ONCE(channel->last_irq_cpu);

	return ACCESS_ONCE(channel->event_test_cpu);

}

static inline int efx_nic_irq_test_irq_cpu(struct efx_nic *efx)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE