[PATCH] arm64/sve: Move sve_free() into SVE code section

Geert Uytterhoeven posted 1 patch 4 years ago
arch/arm64/kernel/fpsimd.c | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
[PATCH] arm64/sve: Move sve_free() into SVE code section
Posted by Geert Uytterhoeven 4 years ago
If CONFIG_ARM64_SVE is not set:

    arch/arm64/kernel/fpsimd.c:294:13: warning: ‘sve_free’ defined but not used [-Wunused-function]

Fix this by moving sve_free() and __sve_free() into the existing section
protected by "#ifdef CONFIG_ARM64_SVE", now the last user outside that
section has been removed.

Fixes: a1259dd807192917 ("arm64/sve: Delay freeing memory in fpsimd_flush_thread()")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/kernel/fpsimd.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index d994bf0a6ca93984..819979398127e6f3 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -281,23 +281,6 @@ static bool have_cpu_fpsimd_context(void)
 	return !preemptible() && __this_cpu_read(fpsimd_context_busy);
 }
 
-/*
- * Call __sve_free() directly only if you know task can't be scheduled
- * or preempted.
- */
-static void __sve_free(struct task_struct *task)
-{
-	kfree(task->thread.sve_state);
-	task->thread.sve_state = NULL;
-}
-
-static void sve_free(struct task_struct *task)
-{
-	WARN_ON(test_tsk_thread_flag(task, TIF_SVE));
-
-	__sve_free(task);
-}
-
 unsigned int task_get_vl(const struct task_struct *task, enum vec_type type)
 {
 	return task->thread.vl[type];
@@ -690,6 +673,22 @@ static void sve_to_fpsimd(struct task_struct *task)
 }
 
 #ifdef CONFIG_ARM64_SVE
+/*
+ * Call __sve_free() directly only if you know task can't be scheduled
+ * or preempted.
+ */
+static void __sve_free(struct task_struct *task)
+{
+	kfree(task->thread.sve_state);
+	task->thread.sve_state = NULL;
+}
+
+static void sve_free(struct task_struct *task)
+{
+	WARN_ON(test_tsk_thread_flag(task, TIF_SVE));
+
+	__sve_free(task);
+}
 
 /*
  * Return how many bytes of memory are required to store the full SVE
-- 
2.25.1

Re: [PATCH] arm64/sve: Move sve_free() into SVE code section
Posted by Catalin Marinas 4 years ago
On Tue, 17 May 2022 16:52:03 +0200, Geert Uytterhoeven wrote:
> If CONFIG_ARM64_SVE is not set:
> 
>     arch/arm64/kernel/fpsimd.c:294:13: warning: ‘sve_free’ defined but not used [-Wunused-function]
> 
> Fix this by moving sve_free() and __sve_free() into the existing section
> protected by "#ifdef CONFIG_ARM64_SVE", now the last user outside that
> section has been removed.
> 
> [...]

Applied to arm64 (for-next/sme), thanks!

[1/1] arm64/sve: Move sve_free() into SVE code section
      https://git.kernel.org/arm64/c/8e1f78a92101

-- 
Catalin

Re: [PATCH] arm64/sve: Move sve_free() into SVE code section
Posted by Mark Brown 4 years ago
On Tue, May 17, 2022 at 04:52:03PM +0200, Geert Uytterhoeven wrote:
> If CONFIG_ARM64_SVE is not set:
> 
>     arch/arm64/kernel/fpsimd.c:294:13: warning: ‘sve_free’ defined but not used [-Wunused-function]
> 
> Fix this by moving sve_free() and __sve_free() into the existing section
> protected by "#ifdef CONFIG_ARM64_SVE", now the last user outside that
> section has been removed.

Reviewed-by: Mark Brown <broonie@kernel.org>