From: Dawei Li <dawei.li@shingroup.cn> To: will@kernel.org, mark.rutland@arm.com Cc: xueshuai@linux.alibaba.com, renyu.zj@linux.alibaba.com, yangyicong@hisilicon.com, jonathan.cameron@huawei.com, andersson@kernel.org, konrad.dybcio@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Dawei Li <dawei.li@shingroup.cn> Subject: [PATCH 9/9] perf/thunder_x2: Avoid explicit cpumask var allocation from stack Date: Tue, 2 Apr 2024 18:56:10 +0800 [thread overview] Message-ID: <20240402105610.1695644-10-dawei.li@shingroup.cn> (raw) In-Reply-To: <20240402105610.1695644-1-dawei.li@shingroup.cn> For CONFIG_CPUMASK_OFFSTACK=y kernel, explicit allocation of cpumask variable on stack is not recommended since it can cause potential stack overflow. Instead, kernel code should always use *cpumask_var API(s) to allocate cpumask var in config- neutral way, leaving allocation strategy to CONFIG_CPUMASK_OFFSTACK. Use *cpumask_var API(s) to address it. Signed-off-by: Dawei Li <dawei.li@shingroup.cn> --- drivers/perf/thunderx2_pmu.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/perf/thunderx2_pmu.c b/drivers/perf/thunderx2_pmu.c index e16d10c763de..8a02a4533b32 100644 --- a/drivers/perf/thunderx2_pmu.c +++ b/drivers/perf/thunderx2_pmu.c @@ -932,9 +932,9 @@ static int tx2_uncore_pmu_online_cpu(unsigned int cpu, static int tx2_uncore_pmu_offline_cpu(unsigned int cpu, struct hlist_node *hpnode) { - int new_cpu; + cpumask_var_t cpu_online_mask_temp; struct tx2_uncore_pmu *tx2_pmu; - struct cpumask cpu_online_mask_temp; + int new_cpu; tx2_pmu = hlist_entry_safe(hpnode, struct tx2_uncore_pmu, hpnode); @@ -945,17 +945,21 @@ static int tx2_uncore_pmu_offline_cpu(unsigned int cpu, if (tx2_pmu->hrtimer_callback) hrtimer_cancel(&tx2_pmu->hrtimer); - cpumask_copy(&cpu_online_mask_temp, cpu_online_mask); - cpumask_clear_cpu(cpu, &cpu_online_mask_temp); - new_cpu = cpumask_any_and( - cpumask_of_node(tx2_pmu->node), - &cpu_online_mask_temp); + if (!alloc_cpumask_var(&cpu_online_mask_temp, GFP_KERNEL)) + return 0; + + cpumask_copy(cpu_online_mask_temp, cpu_online_mask); + cpumask_clear_cpu(cpu, cpu_online_mask_temp); + new_cpu = cpumask_any_and(cpumask_of_node(tx2_pmu->node), + cpu_online_mask_temp); tx2_pmu->cpu = new_cpu; if (new_cpu >= nr_cpu_ids) - return 0; + goto __free_cpumask; perf_pmu_migrate_context(&tx2_pmu->pmu, cpu, new_cpu); +__free_cpumask: + free_cpumask_var(cpu_online_mask_temp); return 0; } -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Dawei Li <dawei.li@shingroup.cn> To: will@kernel.org, mark.rutland@arm.com Cc: xueshuai@linux.alibaba.com, renyu.zj@linux.alibaba.com, yangyicong@hisilicon.com, jonathan.cameron@huawei.com, andersson@kernel.org, konrad.dybcio@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Dawei Li <dawei.li@shingroup.cn> Subject: [PATCH 9/9] perf/thunder_x2: Avoid explicit cpumask var allocation from stack Date: Tue, 2 Apr 2024 18:56:10 +0800 [thread overview] Message-ID: <20240402105610.1695644-10-dawei.li@shingroup.cn> (raw) In-Reply-To: <20240402105610.1695644-1-dawei.li@shingroup.cn> For CONFIG_CPUMASK_OFFSTACK=y kernel, explicit allocation of cpumask variable on stack is not recommended since it can cause potential stack overflow. Instead, kernel code should always use *cpumask_var API(s) to allocate cpumask var in config- neutral way, leaving allocation strategy to CONFIG_CPUMASK_OFFSTACK. Use *cpumask_var API(s) to address it. Signed-off-by: Dawei Li <dawei.li@shingroup.cn> --- drivers/perf/thunderx2_pmu.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/perf/thunderx2_pmu.c b/drivers/perf/thunderx2_pmu.c index e16d10c763de..8a02a4533b32 100644 --- a/drivers/perf/thunderx2_pmu.c +++ b/drivers/perf/thunderx2_pmu.c @@ -932,9 +932,9 @@ static int tx2_uncore_pmu_online_cpu(unsigned int cpu, static int tx2_uncore_pmu_offline_cpu(unsigned int cpu, struct hlist_node *hpnode) { - int new_cpu; + cpumask_var_t cpu_online_mask_temp; struct tx2_uncore_pmu *tx2_pmu; - struct cpumask cpu_online_mask_temp; + int new_cpu; tx2_pmu = hlist_entry_safe(hpnode, struct tx2_uncore_pmu, hpnode); @@ -945,17 +945,21 @@ static int tx2_uncore_pmu_offline_cpu(unsigned int cpu, if (tx2_pmu->hrtimer_callback) hrtimer_cancel(&tx2_pmu->hrtimer); - cpumask_copy(&cpu_online_mask_temp, cpu_online_mask); - cpumask_clear_cpu(cpu, &cpu_online_mask_temp); - new_cpu = cpumask_any_and( - cpumask_of_node(tx2_pmu->node), - &cpu_online_mask_temp); + if (!alloc_cpumask_var(&cpu_online_mask_temp, GFP_KERNEL)) + return 0; + + cpumask_copy(cpu_online_mask_temp, cpu_online_mask); + cpumask_clear_cpu(cpu, cpu_online_mask_temp); + new_cpu = cpumask_any_and(cpumask_of_node(tx2_pmu->node), + cpu_online_mask_temp); tx2_pmu->cpu = new_cpu; if (new_cpu >= nr_cpu_ids) - return 0; + goto __free_cpumask; perf_pmu_migrate_context(&tx2_pmu->pmu, cpu, new_cpu); +__free_cpumask: + free_cpumask_var(cpu_online_mask_temp); return 0; } -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-04-02 10:58 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-04-02 10:56 [PATCH 0/9] perf: Avoid explicit cpumask var allocation from stack Dawei Li 2024-04-02 10:56 ` Dawei Li 2024-04-02 10:56 ` [PATCH 1/9] perf/alibaba_uncore_drw: " Dawei Li 2024-04-02 10:56 ` Dawei Li 2024-04-02 11:06 ` Mark Rutland 2024-04-02 11:06 ` Mark Rutland 2024-04-02 10:56 ` [PATCH 2/9] perf/arm-cmn: " Dawei Li 2024-04-02 10:56 ` Dawei Li 2024-04-05 14:30 ` Robin Murphy 2024-04-05 14:30 ` Robin Murphy 2024-04-02 10:56 ` [PATCH 3/9] perf/arm_cspmu: " Dawei Li 2024-04-02 10:56 ` Dawei Li 2024-04-02 10:56 ` [PATCH 4/9] perf/arm_dsu: " Dawei Li 2024-04-02 10:56 ` Dawei Li 2024-04-02 23:58 ` kernel test robot 2024-04-02 23:58 ` kernel test robot 2024-04-03 1:43 ` kernel test robot 2024-04-03 1:43 ` kernel test robot 2024-04-02 10:56 ` [PATCH 5/9] perf/dwc_pcie: " Dawei Li 2024-04-02 10:56 ` Dawei Li 2024-04-02 10:56 ` [PATCH 6/9] perf/hisi_pcie: " Dawei Li 2024-04-02 10:56 ` Dawei Li 2024-04-02 10:56 ` [PATCH 7/9] perf/hisi_uncore: " Dawei Li 2024-04-02 10:56 ` Dawei Li 2024-04-02 10:56 ` [PATCH 8/9] perf/qcom_l2: " Dawei Li 2024-04-02 10:56 ` Dawei Li 2024-04-02 10:56 ` Dawei Li [this message] 2024-04-02 10:56 ` [PATCH 9/9] perf/thunder_x2: " Dawei Li 2024-04-02 11:12 ` [PATCH 0/9] perf: " Mark Rutland 2024-04-02 11:12 ` Mark Rutland 2024-04-02 13:40 ` Dawei Li 2024-04-02 13:40 ` Dawei Li 2024-04-02 14:41 ` Mark Rutland 2024-04-02 14:41 ` Mark Rutland 2024-04-03 10:41 ` Dawei Li 2024-04-03 10:41 ` Dawei Li 2024-04-03 11:10 ` Mark Rutland 2024-04-03 11:10 ` Mark Rutland
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240402105610.1695644-10-dawei.li@shingroup.cn \ --to=dawei.li@shingroup.cn \ --cc=andersson@kernel.org \ --cc=jonathan.cameron@huawei.com \ --cc=konrad.dybcio@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=renyu.zj@linux.alibaba.com \ --cc=will@kernel.org \ --cc=xueshuai@linux.alibaba.com \ --cc=yangyicong@hisilicon.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.