futex: Make futex_mm_init() void

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.

Thomas Gleixner committed 5 months ago

Commit d7b3f521 parent c1ffc9c3 files · +14 −25Browse files

Unified · Split

3 files

include/linux/futex.h +11 −17
kernel/fork.c +2 −6
kernel/futex/core.c +1 −2

include/linux/futex.h+11−17

@@ -81,22 +81,20 @@ int futex_hash_prctl(unsigned long arg2, unsigned long arg3, unsigned long arg4) · 80 unmodified lines
81	#ifdef CONFIG_FUTEX_PRIVATE_HASH	81	#ifdef CONFIG_FUTEX_PRIVATE_HASH
82	int futex_hash_allocate_default(void);	82	int futex_hash_allocate_default(void);
83	void futex_hash_free(struct mm_struct *mm);	83	void futex_hash_free(struct mm_struct *mm);
84	int futex_mm_init(struct mm_struct *mm);	84	void futex_mm_init(struct mm_struct *mm);
85		85	#else /* CONFIG_FUTEX_PRIVATE_HASH */
86	#else /* !CONFIG_FUTEX_PRIVATE_HASH */
87	static inline int futex_hash_allocate_default(void) { return 0; }	86	static inline int futex_hash_allocate_default(void) { return 0; }
88	static inline int futex_hash_free(struct mm_struct *mm) { return 0; }	87	static inline int futex_hash_free(struct mm_struct *mm) { return 0; }
89	static inline int futex_mm_init(struct mm_struct *mm) { return 0; }	88	static inline void futex_mm_init(struct mm_struct *mm) { }
90	#endif /* CONFIG_FUTEX_PRIVATE_HASH */	89	#endif /* !CONFIG_FUTEX_PRIVATE_HASH */
91		90
92	#else /* !CONFIG_FUTEX */	91	#else /* CONFIG_FUTEX */
93	static inline void futex_init_task(struct task_struct *tsk) { }	92	static inline void futex_init_task(struct task_struct *tsk) { }
94	static inline void futex_exit_recursive(struct task_struct *tsk) { }	93	static inline void futex_exit_recursive(struct task_struct *tsk) { }
95	static inline void futex_exit_release(struct task_struct *tsk) { }	94	static inline void futex_exit_release(struct task_struct *tsk) { }
96	static inline void futex_exec_release(struct task_struct *tsk) { }	95	static inline void futex_exec_release(struct task_struct *tsk) { }
97	static inline long do_futex(u32 __user *uaddr, int op, u32 val,	96	static inline long do_futex(u32 __user uaddr, int op, u32 val, ktime_t timeout,
98	ktime_t timeout, u32 __user uaddr2,	97	u32 __user *uaddr2, u32 val2, u32 val3)
99	u32 val2, u32 val3)
100	{	98	{
101	return -EINVAL;	99	return -EINVAL;
102	}	100	}
@@ -104,13 +102,9 @@ static inline int futex_hash_prctl(unsigned long arg2, unsigned long arg3, unsig · 1 unmodified line
104	{	102	{
105	return -EINVAL;	103	return -EINVAL;
106	}	104	}
107	static inline int futex_hash_allocate_default(void)	105	static inline int futex_hash_allocate_default(void) { return 0; }
108	{
109	return 0;
110	}
111	static inline int futex_hash_free(struct mm_struct *mm) { return 0; }	106	static inline int futex_hash_free(struct mm_struct *mm) { return 0; }
112	static inline int futex_mm_init(struct mm_struct *mm) { return 0; }	107	static inline void futex_mm_init(struct mm_struct *mm) { }
113		108	#endif /* !CONFIG_FUTEX */
114	#endif
115		109
116	#endif	110	#endif /* _LINUX_FUTEX_H */

kernel/fork.c+2−6

 #endif
 	mm_init_uprobes_state(mm);
 	hugetlb_count_init(mm);
+	futex_mm_init(mm);
 	mm_flags_clear_all(mm);
 	if (current->mm) {
 		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;
 	mm_free_id(mm);
 fail_noid:
 	mm_free_pgd(mm);
-fail_nopgd:
-	futex_hash_free(mm);
 fail_mm_init:
 	free_mm(mm);
 	return NULL;

kernel/futex/core.c+1−2

 	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);
 	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)