Commit bcbb6a5b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

sched/headers: Move 'struct user_struct' definition and APIs to the new <linux/sched/user.h> header 



'struct user_struct' was added to sched.h historically, but it's actually
entirely independent of task_struct and of scheduler details, so move
it to its own header.

Fix up .c files using those facilities.

Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c3edc401

include/linux/sched.h

+0 −53
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ extern void io_schedule(void); 
void __noreturn do_task_dead(void);



struct nsproxy;

struct user_namespace;



#ifdef CONFIG_MMU

extern void arch_pick_mmap_layout(struct mm_struct *mm);
@@ -481,49 +480,6 @@ struct thread_group_cputimer { 
#include <linux/rwsem.h>

struct autogroup;



/*

 * Some day this will be a full-fledged user tracking system..

 */

struct user_struct {

	atomic_t __count;	/* reference count */

	atomic_t processes;	/* How many processes does this user have? */

	atomic_t sigpending;	/* How many pending signals does this user have? */

#ifdef CONFIG_FANOTIFY

	atomic_t fanotify_listeners;

#endif

#ifdef CONFIG_EPOLL

	atomic_long_t epoll_watches; /* The number of file descriptors currently watched */

#endif

#ifdef CONFIG_POSIX_MQUEUE

	/* protected by mq_lock	*/

	unsigned long mq_bytes;	/* How many bytes can be allocated to mqueue? */

#endif

	unsigned long locked_shm; /* How many pages of mlocked shm ? */

	unsigned long unix_inflight;	/* How many files in flight in unix sockets */

	atomic_long_t pipe_bufs;  /* how many pages are allocated in pipe buffers */



#ifdef CONFIG_KEYS

	struct key *uid_keyring;	/* UID specific keyring */

	struct key *session_keyring;	/* UID's default session keyring */

#endif



	/* Hash table maintenance information */

	struct hlist_node uidhash_node;

	kuid_t uid;



#if defined(CONFIG_PERF_EVENTS) || defined(CONFIG_BPF_SYSCALL)

	atomic_long_t locked_vm;

#endif

};



extern int uids_sysfs_init(void);



extern struct user_struct *find_user(kuid_t);



extern struct user_struct root_user;

#define INIT_USER (&root_user)





struct backing_dev_info;

struct reclaim_state;
@@ -1908,15 +1864,6 @@ extern struct task_struct *find_task_by_vpid(pid_t nr); 
extern struct task_struct *find_task_by_pid_ns(pid_t nr,

		struct pid_namespace *ns);



/* per-UID process charging. */

extern struct user_struct * alloc_uid(kuid_t);

static inline struct user_struct *get_uid(struct user_struct *u)

{

	atomic_inc(&u->__count);

	return u;

}

extern void free_uid(struct user_struct *);



#include <asm/current.h>



extern void xtime_update(unsigned long ticks);

include/linux/sched/user.h

+54 −0
Original line number Diff line number Diff line
@@ -3,4 +3,58 @@ 


#include <linux/sched.h>



struct key;



/*

 * Some day this will be a full-fledged user tracking system..

 */

struct user_struct {

	atomic_t __count;	/* reference count */

	atomic_t processes;	/* How many processes does this user have? */

	atomic_t sigpending;	/* How many pending signals does this user have? */

#ifdef CONFIG_FANOTIFY

	atomic_t fanotify_listeners;

#endif

#ifdef CONFIG_EPOLL

	atomic_long_t epoll_watches; /* The number of file descriptors currently watched */

#endif

#ifdef CONFIG_POSIX_MQUEUE

	/* protected by mq_lock	*/

	unsigned long mq_bytes;	/* How many bytes can be allocated to mqueue? */

#endif

	unsigned long locked_shm; /* How many pages of mlocked shm ? */

	unsigned long unix_inflight;	/* How many files in flight in unix sockets */

	atomic_long_t pipe_bufs;  /* how many pages are allocated in pipe buffers */



#ifdef CONFIG_KEYS

	struct key *uid_keyring;	/* UID specific keyring */

	struct key *session_keyring;	/* UID's default session keyring */

#endif



	/* Hash table maintenance information */

	struct hlist_node uidhash_node;

	kuid_t uid;



#if defined(CONFIG_PERF_EVENTS) || defined(CONFIG_BPF_SYSCALL)

	atomic_long_t locked_vm;

#endif

};



extern int uids_sysfs_init(void);



extern struct user_struct *find_user(kuid_t);



extern struct user_struct root_user;

#define INIT_USER (&root_user)





/* per-UID process charging. */

extern struct user_struct * alloc_uid(kuid_t);

static inline struct user_struct *get_uid(struct user_struct *u)

{

	atomic_inc(&u->__count);

	return u;

}

extern void free_uid(struct user_struct *);



#endif /* _LINUX_SCHED_USER_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE