192846463a
- Introduce lock classes and lock objects. Each lock class specifies a
name and set of flags (or properties) shared by all locks of a given
type. Currently there are three lock classes: spin mutexes, sleep
mutexes, and sx locks. A lock object specifies properties of an
additional lock along with a lock name and all of the extra stuff needed
to make witness work with a given lock. This abstract lock stuff is
defined in sys/lock.h. The lockmgr constants, types, and prototypes have
been moved to sys/lockmgr.h. For temporary backwards compatability,
sys/lock.h includes sys/lockmgr.h.
- Replace proc->p_spinlocks with a per-CPU list, PCPU(spinlocks), of spin
locks held. By making this per-cpu, we do not have to jump through
magic hoops to deal with sched_lock changing ownership during context
switches.
- Replace proc->p_heldmtx, formerly a list of held sleep mutexes, with
proc->p_sleeplocks, which is a list of held sleep locks including sleep
mutexes and sx locks.
- Add helper macros for logging lock events via the KTR_LOCK KTR logging
level so that the log messages are consistent.
- Add some new flags that can be passed to mtx_init():
- MTX_NOWITNESS - specifies that this lock should be ignored by witness.
This is used for the mutex that blocks a sx lock for example.
- MTX_QUIET - this is not new, but you can pass this to mtx_init() now
and no events will be logged for this lock, so that one doesn't have
to change all the individual mtx_lock/unlock() operations.
- All lock objects maintain an initialized flag. Use this flag to export
a mtx_initialized() macro that can be safely called from drivers. Also,
we on longer walk the all_mtx list if MUTEX_DEBUG is defined as witness
performs the corresponding checks using the initialized flag.
- The lock order reversal messages have been improved to output slightly
more accurate file and line numbers.
102 lines
3.3 KiB
C
102 lines
3.3 KiB
C
/*-
|
|
* Copyright (c) Peter Wemm <peter@netplex.com.au>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _MACHINE_GLOBALDATA_H_
|
|
#define _MACHINE_GLOBALDATA_H_
|
|
|
|
#include <machine/segments.h>
|
|
#include <machine/tss.h>
|
|
|
|
/* XXX */
|
|
#ifdef KTR_PERCPU
|
|
#include <sys/ktr.h>
|
|
#endif
|
|
|
|
/*
|
|
* This structure maps out the global data that needs to be kept on a
|
|
* per-cpu basis. genassym uses this to generate offsets for the assembler
|
|
* code, which also provides external symbols so that C can get at them as
|
|
* though they were really globals.
|
|
*
|
|
* The SMP parts are setup in pmap.c and locore.s for the BSP, and
|
|
* mp_machdep.c sets up the data for the AP's to "see" when they awake.
|
|
* The reason for doing it via a struct is so that an array of pointers
|
|
* to each CPU's data can be set up for things like "check curproc on all
|
|
* other processors"
|
|
*/
|
|
struct globaldata {
|
|
struct globaldata *gd_prvspace; /* self-reference */
|
|
struct proc *gd_curproc;
|
|
struct proc *gd_npxproc;
|
|
struct pcb *gd_curpcb;
|
|
struct proc *gd_idleproc;
|
|
struct timeval gd_switchtime;
|
|
struct i386tss gd_common_tss;
|
|
int gd_switchticks;
|
|
struct segment_descriptor gd_common_tssd;
|
|
struct segment_descriptor *gd_tss_gdt;
|
|
int gd_currentldt;
|
|
u_int gd_cpuid;
|
|
u_int gd_other_cpus;
|
|
SLIST_ENTRY(globaldata) gd_allcpu;
|
|
int gd_witness_spin_check;
|
|
struct lock_list_entry *gd_spinlocks;
|
|
#ifdef KTR_PERCPU
|
|
#ifdef KTR
|
|
volatile int gd_ktr_idx;
|
|
char *gd_ktr_buf;
|
|
char gd_ktr_buf_data[KTR_SIZE];
|
|
#endif
|
|
#endif
|
|
};
|
|
|
|
SLIST_HEAD(cpuhead, globaldata);
|
|
extern struct cpuhead cpuhead;
|
|
|
|
#ifdef SMP
|
|
/*
|
|
* This is the upper (0xff800000) address space layout that is per-cpu.
|
|
* It is setup in locore.s and pmap.c for the BSP and in mp_machdep.c for
|
|
* each AP. genassym helps export this to the assembler code.
|
|
*/
|
|
struct privatespace {
|
|
/* page 0 - data page */
|
|
struct globaldata globaldata;
|
|
char __filler0[PAGE_SIZE - sizeof(struct globaldata)];
|
|
|
|
/* page 1 - idle stack (UPAGES pages) */
|
|
char idlestack[UPAGES * PAGE_SIZE];
|
|
/* page 1+UPAGES... */
|
|
};
|
|
|
|
extern struct privatespace SMP_prvspace[];
|
|
|
|
#endif
|
|
|
|
#endif /* ! _MACHINE_GLOBALDATA_H_ */
|