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

Commit 1a5c1349 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

sem: Move struct sem and struct sem_array into ipc/sem.c 



All of the users are now in ipc/sem.c so make the definitions
local to that file to make code maintenance easier.  AKA
to prevent rebuilding the entire kernel when one of these
files is changed.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent d8c6e854

include/linux/sem.h

+1 −39
Original line number Diff line number Diff line
@@ -2,48 +2,10 @@ 
#ifndef _LINUX_SEM_H

#define _LINUX_SEM_H



#include <linux/atomic.h>

#include <linux/rcupdate.h>

#include <linux/cache.h>

#include <linux/time64.h>

#include <uapi/linux/sem.h>



struct task_struct;



/* One semaphore structure for each semaphore in the system. */

struct sem {

	int	semval;		/* current value */

	/*

	 * PID of the process that last modified the semaphore. For

	 * Linux, specifically these are:

	 *  - semop

	 *  - semctl, via SETVAL and SETALL.

	 *  - at task exit when performing undo adjustments (see exit_sem).

	 */

	int	sempid;

	spinlock_t	lock;	/* spinlock for fine-grained semtimedop */

	struct list_head pending_alter; /* pending single-sop operations */

					/* that alter the semaphore */

	struct list_head pending_const; /* pending single-sop operations */

					/* that do not alter the semaphore*/

	time_t	sem_otime;	/* candidate for sem_otime */

} ____cacheline_aligned_in_smp;



/* One sem_array data structure for each set of semaphores in the system. */

struct sem_array {

	struct kern_ipc_perm	sem_perm;	/* permissions .. see ipc.h */

	time64_t		sem_ctime;	/* create/last semctl() time */

	struct list_head	pending_alter;	/* pending operations */

						/* that alter the array */

	struct list_head	pending_const;	/* pending complex operations */

						/* that do not alter semvals */

	struct list_head	list_id;	/* undo requests on this array */

	int			sem_nsems;	/* no. of semaphores in array */

	int			complex_count;	/* pending complex operations */

	unsigned int		use_global_lock;/* >0: global lock required */



	struct sem		sems[];

} __randomize_layout;

struct sem_undo_list;



#ifdef CONFIG_SYSVIPC

ipc/sem.c

+34 −0
Original line number Diff line number Diff line
@@ -88,6 +88,40 @@ 
#include <linux/uaccess.h>

#include "util.h"



/* One semaphore structure for each semaphore in the system. */

struct sem {

	int	semval;		/* current value */

	/*

	 * PID of the process that last modified the semaphore. For

	 * Linux, specifically these are:

	 *  - semop

	 *  - semctl, via SETVAL and SETALL.

	 *  - at task exit when performing undo adjustments (see exit_sem).

	 */

	int	sempid;

	spinlock_t	lock;	/* spinlock for fine-grained semtimedop */

	struct list_head pending_alter; /* pending single-sop operations */

					/* that alter the semaphore */

	struct list_head pending_const; /* pending single-sop operations */

					/* that do not alter the semaphore*/

	time_t	sem_otime;	/* candidate for sem_otime */

} ____cacheline_aligned_in_smp;



/* One sem_array data structure for each set of semaphores in the system. */

struct sem_array {

	struct kern_ipc_perm	sem_perm;	/* permissions .. see ipc.h */

	time64_t		sem_ctime;	/* create/last semctl() time */

	struct list_head	pending_alter;	/* pending operations */

						/* that alter the array */

	struct list_head	pending_const;	/* pending complex operations */

						/* that do not alter semvals */

	struct list_head	list_id;	/* undo requests on this array */

	int			sem_nsems;	/* no. of semaphores in array */

	int			complex_count;	/* pending complex operations */

	unsigned int		use_global_lock;/* >0: global lock required */



	struct sem		sems[];

} __randomize_layout;



/* One queue for each sleeping process in the system. */

struct sem_queue {