mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-09 23:00:21 +00:00
sfc: Avoid NULL pointer dereference on systems without numa awareness
On such systems cpumask_of_node() returns NULL, which bitmap operations are not happy with. Fixes: c265b569a45f ("sfc: default config to 1 channel/core in local NUMA node only") Fixes: 09a99ab16c60 ("sfc: set affinity hints in local NUMA node only") Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com> Reviewed-by: Íñigo Huguet <ihuguet@redhat.com> Link: https://lore.kernel.org/r/164857006953.8140.3265568858101821256.stgit@palantir17.mph.net Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
8f0588e80e
commit
c9ad266bbe
@ -91,11 +91,9 @@ static unsigned int count_online_cores(struct efx_nic *efx, bool local_node)
|
||||
}
|
||||
|
||||
cpumask_copy(filter_mask, cpu_online_mask);
|
||||
if (local_node) {
|
||||
int numa_node = pcibus_to_node(efx->pci_dev->bus);
|
||||
|
||||
cpumask_and(filter_mask, filter_mask, cpumask_of_node(numa_node));
|
||||
}
|
||||
if (local_node)
|
||||
cpumask_and(filter_mask, filter_mask,
|
||||
cpumask_of_pcibus(efx->pci_dev->bus));
|
||||
|
||||
count = 0;
|
||||
for_each_cpu(cpu, filter_mask) {
|
||||
@ -386,8 +384,7 @@ int efx_probe_interrupts(struct efx_nic *efx)
|
||||
#if defined(CONFIG_SMP)
|
||||
void efx_set_interrupt_affinity(struct efx_nic *efx)
|
||||
{
|
||||
int numa_node = pcibus_to_node(efx->pci_dev->bus);
|
||||
const struct cpumask *numa_mask = cpumask_of_node(numa_node);
|
||||
const struct cpumask *numa_mask = cpumask_of_pcibus(efx->pci_dev->bus);
|
||||
struct efx_channel *channel;
|
||||
unsigned int cpu;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user