From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shradha Shah Subject: [PATCH net-next 4/4] sfc: set and clear interrupt affinity hints Date: Wed, 28 Oct 2015 15:02:03 +0000 Message-ID: <5630E36B.2030501@solarflare.com> References: <5630E2FD.3070609@solarflare.com> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Cc: , To: David Miller Return-path: Received: from nbfkord-smmo01.seg.att.com ([209.65.160.76]:38978 "EHLO nbfkord-smmo01.seg.att.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751008AbbJ1PFH (ORCPT ); Wed, 28 Oct 2015 11:05:07 -0400 In-Reply-To: <5630E2FD.3070609@solarflare.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Bert Kenward Use cpumask_local_spread to provide interrupt affinity hints for each queue. This will spread interrupts across NUMA local CPUs first, extending to remote nodes if needed. Signed-off-by: Shradha Shah --- drivers/net/ethernet/sfc/efx.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 84f9e90..93c4c0e 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -1489,6 +1489,30 @@ static int efx_probe_interrupts(struct efx_nic *efx) return 0; } +#if defined(CONFIG_SMP) +static void efx_set_interrupt_affinity(struct efx_nic *efx) +{ + struct efx_channel *channel; + unsigned int cpu; + + efx_for_each_channel(channel, efx) { + cpu = cpumask_local_spread(channel->channel, + pcibus_to_node(efx->pci_dev->bus)); + + irq_set_affinity_hint(channel->irq, cpumask_of(cpu)); + channel->irq_mem_node = cpu_to_mem(cpu); + } +} + +static void efx_clear_interrupt_affinity(struct efx_nic *efx) +{ + struct efx_channel *channel; + + efx_for_each_channel(channel, efx) + irq_set_affinity_hint(channel->irq, NULL); +} +#endif /* CONFIG_SMP */ + static int efx_soft_enable_interrupts(struct efx_nic *efx) { struct efx_channel *channel, *end_channel; @@ -2932,6 +2956,9 @@ static void efx_pci_remove_main(struct efx_nic *efx) cancel_work_sync(&efx->reset_work); efx_disable_interrupts(efx); +#if defined(CONFIG_SMP) + efx_clear_interrupt_affinity(efx); +#endif efx_nic_fini_interrupt(efx); efx_fini_port(efx); efx->type->fini(efx); @@ -3081,6 +3108,11 @@ static int efx_pci_probe_main(struct efx_nic *efx) rc = efx_nic_init_interrupt(efx); if (rc) goto fail5; + +#if defined(CONFIG_SMP) + efx_set_interrupt_affinity(efx); +#endif + rc = efx_enable_interrupts(efx); if (rc) goto fail6; @@ -3088,6 +3120,9 @@ static int efx_pci_probe_main(struct efx_nic *efx) return 0; fail6: +#if defined(CONFIG_SMP) + efx_clear_interrupt_affinity(efx); +#endif efx_nic_fini_interrupt(efx); fail5: efx_fini_port(efx);