Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e781418 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Linus Torvalds
Browse files

signal: consolidate {TS,TLF}_RESTORE_SIGMASK code 

In general, there's no need for the "restore sigmask" flag to live in
ti->flags.  alpha, ia64, microblaze, powerpc, sh, sparc (64-bit only),
tile, and x86 use essentially identical alternative implementations,
placing the flag in ti->status.

Replace those optimized implementations with an equally good common
implementation that stores it in a bitfield in struct task_struct and
drop the custom implementations.

Additional architectures can opt in by removing their
TIF_RESTORE_SIGMASK defines.

Link: http://lkml.kernel.org/r/8a14321d64a28e40adfddc90e18a96c086a6d6f9.1468522723.git.luto@kernel.org


Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Tested-by: Michael Ellerman <mpe@ellerman.id.au>	[powerpc]
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dmitry Safonov <dsafonov@virtuozzo.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0a11b9aa

arch/alpha/include/asm/thread_info.h

+0 −27
Original line number Diff line number Diff line
@@ -86,33 +86,6 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define TS_UAC_NOPRINT		0x0001	/* ! Preserve the following three */

#define TS_UAC_NOFIX		0x0002	/* ! flags as they match          */

#define TS_UAC_SIGBUS		0x0004	/* ! userspace part of 'osf_sysinfo' */

#define TS_RESTORE_SIGMASK	0x0008	/* restore signal mask in do_signal() */



#ifndef __ASSEMBLY__

#define HAVE_SET_RESTORE_SIGMASK	1

static inline void set_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	ti->status |= TS_RESTORE_SIGMASK;

	WARN_ON(!test_bit(TIF_SIGPENDING, (unsigned long *)&ti->flags));

}

static inline void clear_restore_sigmask(void)

{

	current_thread_info()->status &= ~TS_RESTORE_SIGMASK;

}

static inline bool test_restore_sigmask(void)

{

	return current_thread_info()->status & TS_RESTORE_SIGMASK;

}

static inline bool test_and_clear_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	if (!(ti->status & TS_RESTORE_SIGMASK))

		return false;

	ti->status &= ~TS_RESTORE_SIGMASK;

	return true;

}

#endif



#define SET_UNALIGN_CTL(task,value)	({				\

	__u32 status = task_thread_info(task)->status & ~UAC_BITMASK;	\

arch/ia64/include/asm/thread_info.h

+0 −28
Original line number Diff line number Diff line
@@ -121,32 +121,4 @@ struct thread_info { 
/* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */

#define TIF_WORK_MASK		(TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT))



#define TS_RESTORE_SIGMASK	2	/* restore signal mask in do_signal() */



#ifndef __ASSEMBLY__

#define HAVE_SET_RESTORE_SIGMASK	1

static inline void set_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	ti->status |= TS_RESTORE_SIGMASK;

	WARN_ON(!test_bit(TIF_SIGPENDING, &ti->flags));

}

static inline void clear_restore_sigmask(void)

{

	current_thread_info()->status &= ~TS_RESTORE_SIGMASK;

}

static inline bool test_restore_sigmask(void)

{

	return current_thread_info()->status & TS_RESTORE_SIGMASK;

}

static inline bool test_and_clear_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	if (!(ti->status & TS_RESTORE_SIGMASK))

		return false;

	ti->status &= ~TS_RESTORE_SIGMASK;

	return true;

}

#endif	/* !__ASSEMBLY__ */



#endif /* _ASM_IA64_THREAD_INFO_H */

arch/microblaze/include/asm/thread_info.h

+0 −27
Original line number Diff line number Diff line
@@ -148,33 +148,6 @@ static inline struct thread_info *current_thread_info(void) 
 */

/* FPU was used by this task this quantum (SMP) */

#define TS_USEDFPU		0x0001

#define TS_RESTORE_SIGMASK	0x0002



#ifndef __ASSEMBLY__

#define HAVE_SET_RESTORE_SIGMASK 1

static inline void set_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	ti->status |= TS_RESTORE_SIGMASK;

	WARN_ON(!test_bit(TIF_SIGPENDING, (unsigned long *)&ti->flags));

}

static inline void clear_restore_sigmask(void)

{

	current_thread_info()->status &= ~TS_RESTORE_SIGMASK;

}

static inline bool test_restore_sigmask(void)

{

	return current_thread_info()->status & TS_RESTORE_SIGMASK;

}

static inline bool test_and_clear_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	if (!(ti->status & TS_RESTORE_SIGMASK))

		return false;

	ti->status &= ~TS_RESTORE_SIGMASK;

	return true;

}

#endif



#endif /* __KERNEL__ */

#endif /* _ASM_MICROBLAZE_THREAD_INFO_H */

arch/powerpc/include/asm/thread_info.h

+0 −25
Original line number Diff line number Diff line
@@ -138,40 +138,15 @@ static inline struct thread_info *current_thread_info(void) 
/* Don't move TLF_NAPPING without adjusting the code in entry_32.S */

#define TLF_NAPPING		0	/* idle thread enabled NAP mode */

#define TLF_SLEEPING		1	/* suspend code enabled SLEEP mode */

#define TLF_RESTORE_SIGMASK	2	/* Restore signal mask in do_signal */

#define TLF_LAZY_MMU		3	/* tlb_batch is active */

#define TLF_RUNLATCH		4	/* Is the runlatch enabled? */



#define _TLF_NAPPING		(1 << TLF_NAPPING)

#define _TLF_SLEEPING		(1 << TLF_SLEEPING)

#define _TLF_RESTORE_SIGMASK	(1 << TLF_RESTORE_SIGMASK)

#define _TLF_LAZY_MMU		(1 << TLF_LAZY_MMU)

#define _TLF_RUNLATCH		(1 << TLF_RUNLATCH)



#ifndef __ASSEMBLY__

#define HAVE_SET_RESTORE_SIGMASK	1

static inline void set_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	ti->local_flags |= _TLF_RESTORE_SIGMASK;

	WARN_ON(!test_bit(TIF_SIGPENDING, &ti->flags));

}

static inline void clear_restore_sigmask(void)

{

	current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK;

}

static inline bool test_restore_sigmask(void)

{

	return current_thread_info()->local_flags & _TLF_RESTORE_SIGMASK;

}

static inline bool test_and_clear_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	if (!(ti->local_flags & _TLF_RESTORE_SIGMASK))

		return false;

	ti->local_flags &= ~_TLF_RESTORE_SIGMASK;

	return true;

}



static inline bool test_thread_local_flags(unsigned int flags)

{

arch/sh/include/asm/thread_info.h

+0 −26
Original line number Diff line number Diff line
@@ -151,19 +151,10 @@ extern void init_thread_xstate(void); 
 * ever touches our thread-synchronous status, so we don't

 * have to worry about atomic accesses.

 */

#define TS_RESTORE_SIGMASK	0x0001	/* restore signal mask in do_signal() */

#define TS_USEDFPU		0x0002	/* FPU used by this task this quantum */



#ifndef __ASSEMBLY__



#define HAVE_SET_RESTORE_SIGMASK	1

static inline void set_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	ti->status |= TS_RESTORE_SIGMASK;

	WARN_ON(!test_bit(TIF_SIGPENDING, (unsigned long *)&ti->flags));

}



#define TI_FLAG_FAULT_CODE_SHIFT	24



/*
@@ -182,23 +173,6 @@ static inline unsigned int get_thread_fault_code(void) 
	return ti->flags >> TI_FLAG_FAULT_CODE_SHIFT;

}



static inline void clear_restore_sigmask(void)

{

	current_thread_info()->status &= ~TS_RESTORE_SIGMASK;

}

static inline bool test_restore_sigmask(void)

{

	return current_thread_info()->status & TS_RESTORE_SIGMASK;

}

static inline bool test_and_clear_restore_sigmask(void)

{

	struct thread_info *ti = current_thread_info();

	if (!(ti->status & TS_RESTORE_SIGMASK))

		return false;

	ti->status &= ~TS_RESTORE_SIGMASK;

	return true;

}



#endif	/* !__ASSEMBLY__ */



#endif /* __KERNEL__ */