hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IB/hfi1: Allocate cpu mask on the heap to silence warning 

If CONFIG_FRAME_WARN is small (1K) and CONFIG_NR_CPUS big
then a frame size warning is triggered during build.
Allocate the cpu mask dynamically to silence the warning.

Reviewed-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Tadeusz Struk 2016-08-03 20:19:32 -04:00 committed by Doug Ledford
parent 5412352fcd
commit 8303f683b1
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/infiniband/hw/hfi1/affinity.c
View File

@ -682,7 +682,7 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf,
size_t count) size_t count)
{ {
struct hfi1_affinity_node *entry; struct hfi1_affinity_node *entry;
struct cpumask mask; cpumask_var_t mask;
int ret, i; int ret, i;
spin_lock(&node_affinity.lock); spin_lock(&node_affinity.lock);
@ -692,19 +692,24 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf,
if (!entry) if (!entry)
return -EINVAL; return -EINVAL;
ret = cpulist_parse(buf, &mask); ret = zalloc_cpumask_var(&mask, GFP_KERNEL);
if (ret) if (!ret)
return ret; return -ENOMEM;
if (!cpumask_subset(&mask, cpu_online_mask) || cpumask_empty(&mask)) { ret = cpulist_parse(buf, mask);
if (ret)
goto out;
if (!cpumask_subset(mask, cpu_online_mask) || cpumask_empty(mask)) {
dd_dev_warn(dd, "Invalid CPU mask\n"); dd_dev_warn(dd, "Invalid CPU mask\n");
return -EINVAL; ret = -EINVAL;
goto out;
} }
mutex_lock(&sdma_affinity_mutex); mutex_lock(&sdma_affinity_mutex);
/* reset the SDMA interrupt affinity details */ /* reset the SDMA interrupt affinity details */
init_cpu_mask_set(&entry->def_intr); init_cpu_mask_set(&entry->def_intr);
cpumask_copy(&entry->def_intr.mask, &mask); cpumask_copy(&entry->def_intr.mask, mask);
/* /*
* Reassign the affinity for each SDMA interrupt. * Reassign the affinity for each SDMA interrupt.
*/ */
@ -720,8 +725,9 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf,
if (ret) if (ret)
break; break;
} }
mutex_unlock(&sdma_affinity_mutex); mutex_unlock(&sdma_affinity_mutex);
out:
free_cpumask_var(mask);
return ret ? ret : strnlen(buf, PAGE_SIZE); return ret ? ret : strnlen(buf, PAGE_SIZE);
} }