From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27C63315D49 for ; Thu, 2 Apr 2026 15:21:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775143275; cv=none; b=cM58mj7JpV25b9wkhVGVgC22AXc1o0wCIAd/ZptKNNeuOipnukaJNxD/L7qA7hJkMLr6TeLHJb7N7OKx8Wy+hztFhYHv8/K3ck4lO0cbeVRcv3FqkyJWE7059zg6dNbW5SDt7dLEhwslGxdubz4vBlnT4AaTu0eS64KH+7y/4lk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775143275; c=relaxed/simple; bh=JNx/WJXVVQ79OhTAWIHreYE7NGao/vKg6SajMKIlfhs=; h=Date:Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=RGqu65u0pSHgTbErtYD5D5mFt0HE+iCbVE7DtVsX8lSmOCVyZXHyL9rmuWh/2RQa5iQkJO2q4fLUZFYdTKpGuowJcAi/8wOZN0kkzaWl9YmaWHhXraqNPHo+OemacGHFIC5zZbirr4iVSnVQvdMgLBvvlrLX5nve26LtybE1T+s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ilui/5KO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ilui/5KO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 005B4C116C6; Thu, 2 Apr 2026 15:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775143274; bh=JNx/WJXVVQ79OhTAWIHreYE7NGao/vKg6SajMKIlfhs=; h=Date:From:To:Cc:Subject:References:From; b=Ilui/5KOfk4EIgQYkmpllTE36YUKxGIMn+t2VRaIyxcuax7HSfZZcxjl38IZszBdR D9/82t6mASM5lQdvvATNPRqLKstAaEhhkq0520DInKlyZt/NZ/ObeLT37xVUazXZ6e GbiIkQhqni+ck3hmGqo3bh6BmtLZOCpO9YWhUjuDBeO0pcanjOw+kUEtc3Y6cVv49G b7d9EAWT4tSWN6q8T8qP2qa0Pr0H557wAhKLS3b+YvcSwV8ACyiL7nqY1sU3wL+I/v 9QbDIi0LT25RK0tBv0qQRELf1ZB8PuxqtJmsKV/FW8mbBUHb6HijL0ivQW7tKH7QGi dTf9v2FFP/gEQ== Date: Thu, 02 Apr 2026 17:21:11 +0200 Message-ID: <20260402151939.731089413@kernel.org> User-Agent: quilt/0.68 From: Thomas Gleixner To: LKML Cc: Mathieu Desnoyers , =?UTF-8?q?Andr=C3=A8=20Almeida?= , Sebastian Andrzej Siewior , Carlos O'Donell , Peter Zijlstra , Florian Weimer , Rich Felker , Torvald Riegel , Darren Hart , Ingo Molnar , Davidlohr Bueso , Arnd Bergmann , "Liam R . Howlett" , Uros Bizjak , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Subject: [patch V4 02/14] futex: Make futex_mm_init() void References: <20260402151131.876492985@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Nothing fails there. Mop up the leftovers of the early version of this, which did an allocation. While at it clean up the stubs and the #ifdef comments to make the header file readable. Signed-off-by: Thomas Gleixner --- include/linux/futex.h | 28 +++++++++++----------------- kernel/fork.c | 8 ++------ kernel/futex/core.c | 3 +-- 3 files changed, 14 insertions(+), 25 deletions(-) --- a/include/linux/futex.h +++ b/include/linux/futex.h @@ -81,22 +81,20 @@ int futex_hash_prctl(unsigned long arg2, #ifdef CONFIG_FUTEX_PRIVATE_HASH int futex_hash_allocate_default(void); void futex_hash_free(struct mm_struct *mm); -int futex_mm_init(struct mm_struct *mm); - -#else /* !CONFIG_FUTEX_PRIVATE_HASH */ +void futex_mm_init(struct mm_struct *mm); +#else /* CONFIG_FUTEX_PRIVATE_HASH */ static inline int futex_hash_allocate_default(void) { return 0; } static inline int futex_hash_free(struct mm_struct *mm) { return 0; } -static inline int futex_mm_init(struct mm_struct *mm) { return 0; } -#endif /* CONFIG_FUTEX_PRIVATE_HASH */ +static inline void futex_mm_init(struct mm_struct *mm) { } +#endif /* !CONFIG_FUTEX_PRIVATE_HASH */ -#else /* !CONFIG_FUTEX */ +#else /* CONFIG_FUTEX */ static inline void futex_init_task(struct task_struct *tsk) { } static inline void futex_exit_recursive(struct task_struct *tsk) { } static inline void futex_exit_release(struct task_struct *tsk) { } static inline void futex_exec_release(struct task_struct *tsk) { } -static inline long do_futex(u32 __user *uaddr, int op, u32 val, - ktime_t *timeout, u32 __user *uaddr2, - u32 val2, u32 val3) +static inline long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, + u32 __user *uaddr2, u32 val2, u32 val3) { return -EINVAL; } @@ -104,13 +102,9 @@ static inline int futex_hash_prctl(unsig { return -EINVAL; } -static inline int futex_hash_allocate_default(void) -{ - return 0; -} +static inline int futex_hash_allocate_default(void) { return 0; } static inline int futex_hash_free(struct mm_struct *mm) { return 0; } -static inline int futex_mm_init(struct mm_struct *mm) { return 0; } - -#endif +static inline void futex_mm_init(struct mm_struct *mm) { } +#endif /* !CONFIG_FUTEX */ -#endif +#endif /* _LINUX_FUTEX_H */ --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1097,6 +1097,7 @@ static struct mm_struct *mm_init(struct #endif mm_init_uprobes_state(mm); hugetlb_count_init(mm); + futex_mm_init(mm); mm_flags_clear_all(mm); if (current->mm) { @@ -1109,11 +1110,8 @@ static struct mm_struct *mm_init(struct mm->def_flags = 0; } - if (futex_mm_init(mm)) - goto fail_mm_init; - if (mm_alloc_pgd(mm)) - goto fail_nopgd; + goto fail_mm_init; if (mm_alloc_id(mm)) goto fail_noid; @@ -1140,8 +1138,6 @@ static struct mm_struct *mm_init(struct mm_free_id(mm); fail_noid: mm_free_pgd(mm); -fail_nopgd: - futex_hash_free(mm); fail_mm_init: free_mm(mm); return NULL; --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -1717,7 +1717,7 @@ static bool futex_ref_is_dead(struct fut return atomic_long_read(&mm->futex_atomic) == 0; } -int futex_mm_init(struct mm_struct *mm) +void futex_mm_init(struct mm_struct *mm) { mutex_init(&mm->futex_hash_lock); RCU_INIT_POINTER(mm->futex_phash, NULL); @@ -1726,7 +1726,6 @@ int futex_mm_init(struct mm_struct *mm) mm->futex_ref = NULL; atomic_long_set(&mm->futex_atomic, 0); mm->futex_batches = get_state_synchronize_rcu(); - return 0; } void futex_hash_free(struct mm_struct *mm)