| Message ID | 1470249441-22787-1-git-send-email-ira.weiny@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Aug 03, 2016 at 02:37:21PM -0400, ira.weiny@intel.com wrote: > From: Tadeusz Struk <tadeusz.struk@intel.com> > > 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> > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> > --- > drivers/infiniband/hw/hfi1/affinity.c | 20 +++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) > > diff --git a/drivers/infiniband/hw/hfi1/affinity.c b/drivers/infiniband/hw/hfi1/affinity.c > index 79575ee873f2..62be2eda1b96 100644 > --- a/drivers/infiniband/hw/hfi1/affinity.c > +++ b/drivers/infiniband/hw/hfi1/affinity.c > @@ -682,7 +682,7 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf, > size_t count) > { > struct hfi1_affinity_node *entry; > - struct cpumask mask; > + cpumask_var_t mask; > int ret, i; > > spin_lock(&node_affinity.lock); > @@ -692,19 +692,24 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf, > if (!entry) > return -EINVAL; > > - ret = cpulist_parse(buf, &mask); > - if (ret) > + ret = zalloc_cpumask_var(&mask, GFP_KERNEL); > + if (!ret) > return ret; Ira, Are you aware that before this change you returned value different from zero in case of error and now you will return zero? Thanks
> > On Wed, Aug 03, 2016 at 02:37:21PM -0400, ira.weiny@intel.com wrote: > > From: Tadeusz Struk <tadeusz.struk@intel.com> > > > > 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> > > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > > Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> > > --- > > drivers/infiniband/hw/hfi1/affinity.c | 20 +++++++++++++------- > > 1 file changed, 13 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/infiniband/hw/hfi1/affinity.c > > b/drivers/infiniband/hw/hfi1/affinity.c > > index 79575ee873f2..62be2eda1b96 100644 > > --- a/drivers/infiniband/hw/hfi1/affinity.c > > +++ b/drivers/infiniband/hw/hfi1/affinity.c > > @@ -682,7 +682,7 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata > *dd, const char *buf, > > size_t count) > > { > > struct hfi1_affinity_node *entry; > > - struct cpumask mask; > > + cpumask_var_t mask; > > int ret, i; > > > > spin_lock(&node_affinity.lock); > > @@ -692,19 +692,24 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata > *dd, const char *buf, > > if (!entry) > > return -EINVAL; > > > > - ret = cpulist_parse(buf, &mask); > > - if (ret) > > + ret = zalloc_cpumask_var(&mask, GFP_KERNEL); > > + if (!ret) > > return ret; > > Ira, > Are you aware that before this change you returned value different from > zero in case of error and now you will return zero? > No I did not realize that zalloc_cpumask_var returns bool... Thanks, v2 on it's way. Ira -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/hw/hfi1/affinity.c b/drivers/infiniband/hw/hfi1/affinity.c index 79575ee873f2..62be2eda1b96 100644 --- a/drivers/infiniband/hw/hfi1/affinity.c +++ b/drivers/infiniband/hw/hfi1/affinity.c @@ -682,7 +682,7 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf, size_t count) { struct hfi1_affinity_node *entry; - struct cpumask mask; + cpumask_var_t mask; int ret, i; spin_lock(&node_affinity.lock); @@ -692,19 +692,24 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf, if (!entry) return -EINVAL; - ret = cpulist_parse(buf, &mask); - if (ret) + ret = zalloc_cpumask_var(&mask, GFP_KERNEL); + if (!ret) return ret; - 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"); - return -EINVAL; + ret = -EINVAL; + goto out; } mutex_lock(&sdma_affinity_mutex); /* reset the SDMA interrupt affinity details */ 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. */ @@ -720,8 +725,9 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf, if (ret) break; } - mutex_unlock(&sdma_affinity_mutex); +out: + free_cpumask_var(mask); return ret ? ret : strnlen(buf, PAGE_SIZE); }