From: Michel Lespinasse <walken@google.com>
To: Andrew Morton <akpm@linux-foundation.org>, linux-mm <linux-mm@kvack.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Laurent Dufour <ldufour@linux.ibm.com>,
Vlastimil Babka <vbabka@suse.cz>,
Matthew Wilcox <willy@infradead.org>,
Liam Howlett <Liam.Howlett@oracle.com>,
Jerome Glisse <jglisse@redhat.com>,
Davidlohr Bueso <dave@stgolabs.net>,
David Rientjes <rientjes@google.com>,
Hugh Dickins <hughd@google.com>, Ying Han <yinghan@google.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
Daniel Jordan <daniel.m.jordan@oracle.com>,
Michel Lespinasse <walken@google.com>
Subject: [PATCH v4 08/10] mmap locking API: add MMAP_LOCK_INITIALIZER
Date: Tue, 14 Apr 2020 17:43:51 -0700 [thread overview]
Message-ID: <20200415004353.130248-9-walken@google.com> (raw)
In-Reply-To: <20200415004353.130248-1-walken@google.com>
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: Michel Lespinasse <walken@google.com>
---
arch/x86/kernel/tboot.c | 2 +-
drivers/firmware/efi/efi.c | 2 +-
include/linux/mmap_lock.h | 2 ++
mm/init-mm.c | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index b89f6ac6a0c0..4b79335624b1 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -90,7 +90,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_sem = MMAP_LOCK_INITIALIZER(init_mm.mmap_sem),
.page_table_lock = __SPIN_LOCK_UNLOCKED(init_mm.page_table_lock),
.mmlist = LIST_HEAD_INIT(init_mm.mmlist),
};
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 911a2bd0f6b7..4bac9d7a48a6 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -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_sem = MMAP_LOCK_INITIALIZER(efi_mm.mmap_sem),
.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},
diff --git a/include/linux/mmap_lock.h b/include/linux/mmap_lock.h
index 1050257361aa..07efa379664a 100644
--- a/include/linux/mmap_lock.h
+++ b/include/linux/mmap_lock.h
@@ -1,6 +1,8 @@
#ifndef _LINUX_MMAP_LOCK_H
#define _LINUX_MMAP_LOCK_H
+#define MMAP_LOCK_INITIALIZER(name) __RWSEM_INITIALIZER(name)
+
static inline void mmap_init_lock(struct mm_struct *mm)
{
init_rwsem(&mm->mmap_sem);
diff --git a/mm/init-mm.c b/mm/init-mm.c
index 19603302a77f..3c128bd6a30c 100644
--- a/mm/init-mm.c
+++ b/mm/init-mm.c
@@ -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_sem = MMAP_LOCK_INITIALIZER(init_mm.mmap_sem),
.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),
--
2.26.0.110.g2183baf09c-goog
next prev parent reply other threads:[~2020-04-15 0:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 0:43 [PATCH v4 00/10] Add a new mmap locking API wrapping mmap_sem calls Michel Lespinasse
2020-04-15 0:43 ` [PATCH v4 01/10] mmap locking API: initial implementation as rwsem wrappers Michel Lespinasse
2020-04-20 19:48 ` Davidlohr Bueso
2020-04-21 0:48 ` Michel Lespinasse
2020-04-15 0:43 ` [PATCH v4 02/10] MMU notifier: use the new mmap locking API Michel Lespinasse
2020-04-20 19:51 ` Davidlohr Bueso
2020-04-15 0:43 ` [PATCH v4 03/10] DMA reservations: " Michel Lespinasse
2020-04-15 0:43 ` [PATCH v4 04/10] mmap locking API: use coccinelle to convert mmap_sem rwsem call sites Michel Lespinasse
2020-04-15 0:43 ` [PATCH v4 05/10] mmap locking API: convert mmap_sem call sites missed by coccinelle Michel Lespinasse
2020-04-15 0:43 ` [PATCH v4 06/10] mmap locking API: convert nested write lock sites Michel Lespinasse
2020-04-20 18:19 ` Daniel Jordan
2020-04-20 19:33 ` Matthew Wilcox
2020-04-21 0:51 ` Michel Lespinasse
2020-04-15 0:43 ` [PATCH v4 07/10] mmap locking API: add mmap_read_trylock_non_owner() Michel Lespinasse
2020-04-20 18:22 ` Daniel Jordan
2020-04-20 19:23 ` Matthew Wilcox
2020-04-21 0:55 ` Michel Lespinasse
2020-04-15 0:43 ` Michel Lespinasse [this message]
2020-04-20 18:23 ` [PATCH v4 08/10] mmap locking API: add MMAP_LOCK_INITIALIZER Daniel Jordan
2020-04-20 19:28 ` Matthew Wilcox
2020-04-21 0:57 ` Michel Lespinasse
2020-04-15 0:43 ` [PATCH v4 09/10] mmap locking API: use lockdep_assert_held Michel Lespinasse
2020-04-21 2:35 ` Matthew Wilcox
2020-04-15 0:43 ` [PATCH v4 10/10] mmap locking API: rename mmap_sem to mmap_lock Michel Lespinasse
2020-04-20 18:28 ` Daniel Jordan
2020-04-21 5:33 ` kbuild test robot
2020-04-21 22:19 ` Michel Lespinasse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200415004353.130248-9-walken@google.com \
--to=walken@google.com \
--cc=Liam.Howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=daniel.m.jordan@oracle.com \
--cc=dave@stgolabs.net \
--cc=hughd@google.com \
--cc=jgg@ziepe.ca \
--cc=jglisse@redhat.com \
--cc=ldufour@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
--cc=yinghan@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).