Commit 14c3656b authored by Michel Lespinasse's avatar Michel Lespinasse Committed by Linus Torvalds
Browse files

mmap locking API: add MMAP_LOCK_INITIALIZER 



Define a new initializer for the mmap locking api.  Initially this just
evaluates to __RWSEM_INITIALIZER as the API is defined as wrappers around
rwsem.

Signed-off-by: default avatarMichel Lespinasse <walken@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarLaurent Dufour <ldufour@linux.ibm.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Cc: Davidlohr Bueso <dbueso@suse.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Liam Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Han <yinghan@google.com>
Link: http://lkml.kernel.org/r/20200520052908.204642-9-walken@google.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0cc55a02

arch/x86/kernel/tboot.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static struct mm_struct tboot_mm = { 
	.pgd            = swapper_pg_dir,

	.mm_users       = ATOMIC_INIT(2),

	.mm_count       = ATOMIC_INIT(1),

	.mmap_sem       = __RWSEM_INITIALIZER(init_mm.mmap_sem),

	MMAP_LOCK_INITIALIZER(init_mm)

	.page_table_lock =  __SPIN_LOCK_UNLOCKED(init_mm.page_table_lock),

	.mmlist         = LIST_HEAD_INIT(init_mm.mmlist),

};

drivers/firmware/efi/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct mm_struct efi_mm = { 
	.mm_rb			= RB_ROOT,

	.mm_users		= ATOMIC_INIT(2),

	.mm_count		= ATOMIC_INIT(1),

	.mmap_sem		= __RWSEM_INITIALIZER(efi_mm.mmap_sem),

	MMAP_LOCK_INITIALIZER(efi_mm)

	.page_table_lock	= __SPIN_LOCK_UNLOCKED(efi_mm.page_table_lock),

	.mmlist			= LIST_HEAD_INIT(efi_mm.mmlist),

	.cpu_bitmap		= { [BITS_TO_LONGS(NR_CPUS)] = 0},

include/linux/mmap_lock.h

+3 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_MMAP_LOCK_H

#define _LINUX_MMAP_LOCK_H



#define MMAP_LOCK_INITIALIZER(name) \

	.mmap_sem = __RWSEM_INITIALIZER((name).mmap_sem),



static inline void mmap_init_lock(struct mm_struct *mm)

{

	init_rwsem(&mm->mmap_sem);

mm/init-mm.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct mm_struct init_mm = { 
	.pgd		= swapper_pg_dir,

	.mm_users	= ATOMIC_INIT(2),

	.mm_count	= ATOMIC_INIT(1),

	.mmap_sem	= __RWSEM_INITIALIZER(init_mm.mmap_sem),

	MMAP_LOCK_INITIALIZER(init_mm)

	.page_table_lock =  __SPIN_LOCK_UNLOCKED(init_mm.page_table_lock),

	.arg_lock	=  __SPIN_LOCK_UNLOCKED(init_mm.arg_lock),

	.mmlist		= LIST_HEAD_INIT(init_mm.mmlist),

CRA Git | Maintained and supported by SUSTech CRA and CCSE