From patchwork Wed Apr 22 00:14:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 11502553 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3202F13B2 for ; Wed, 22 Apr 2020 00:14:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F3CC920575 for ; Wed, 22 Apr 2020 00:14:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ZBxfSTH4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3CC920575 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 05CFD8E000B; Tue, 21 Apr 2020 20:14:41 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F28918E0003; Tue, 21 Apr 2020 20:14:40 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3F358E000B; Tue, 21 Apr 2020 20:14:40 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0163.hostedemail.com [216.40.44.163]) by kanga.kvack.org (Postfix) with ESMTP id CC6738E0003 for ; Tue, 21 Apr 2020 20:14:40 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 8ED554DD8 for ; Wed, 22 Apr 2020 00:14:40 +0000 (UTC) X-FDA: 76733569920.05.look07_45e437fb1ec62 X-Spam-Summary: 2,0,0,c1c6af4ecb670899,d41d8cd98f00b204,3b4yfxgykcaiycnmgpiqqing.eqonkpwz-oomxcem.qti@flex--walken.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1542:1593:1594:1711:1730:1747:1777:1792:1801:2198:2199:2393:2559:2562:3138:3139:3140:3141:3142:3152:3352:3865:3868:3870:3871:3874:4250:4321:4605:5007:6261:6653:6742:8660:9969:10004:10400:11026:11473:11657:11658:11914:12043:12296:12297:12438:12555:12895:12986:13141:13148:13153:13228:13230:14096:14097:14181:14394:14659:14721:21080:21220:21433:21444:21451:21627:21990:30054:30064,0,RBL:209.85.210.202:@flex--walken.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: look07_45e437fb1ec62 X-Filterd-Recvd-Size: 5234 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Wed, 22 Apr 2020 00:14:40 +0000 (UTC) Received: by mail-pf1-f202.google.com with SMTP id a6so526898pfg.18 for ; Tue, 21 Apr 2020 17:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=BiEEiVkzSVoyEqKh7AVUXyeKMpCUvM4D35tqNT5BDzI=; b=ZBxfSTH4Jf/kixOoAnairq3UwrJnJI9xCIxf/bGiCkHeAm9ChAhBbaaQdZ/RqNx/6v py3PlzefCpfQkI5EZo2elGDyIMyP4qb0jDB2WzxJt8RrKrqsDDVD290X5CA51GNf3SaY knC0BULD9D+uDIaSdTzAnm5JBMYj+9C77WmxTcRL03wMyePjbrDM/pL9PkSx9dzVzNpv 41MmKfgXzWaJ5JmHaLQ0EJ5q0aPZ1FyLo4tEPxBTVjsjJGxr7du0pbW+Er7qeK+eEump Gs7IoopoPEQxl8aHYPPTNvnRsLS4NuqttG0iX6mbR+ZDTybj23mV+0nNOFT9XqYFjigK 7PrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=BiEEiVkzSVoyEqKh7AVUXyeKMpCUvM4D35tqNT5BDzI=; b=sU8+pCfHZ+4C+7jciDrve2VlKOLxlfuwfypND6SnT9hreBTbpBcieM9oxZfHVUsjQ9 r9KX6xgzc4LtOxGXEfZmNKU94jFQ6Ogo1tgW5CLn9xPBUUtxtiJTdFekiVVwuEhxgra0 X9V+CM7cIa3vMK6wXrKe3lqwVusuw+BOtxez1AjKH2n+0kUsTfnI9fSfSSkm+PygkFDI UlbmMlCOGiZXGGiFY8MIMd38NfvxxW599oOu32payTUIt40DBQ71UWWGZeO3q8lpN6oJ fWaKW5SS2L4jGLIDMiNeOWC9tqeERzE0JaL6wzSnatghM2XmW/SatAjLCyw3iVDH9oMM 2TJQ== X-Gm-Message-State: AGi0PubK77Ov+RRSdI7lXrFAVg0dlHc8E/7P9jKi1gVrhe6TUYxpeqVg uHVUaP9Fu/KGkpLoaT1oRBbHUPkWDDs= X-Google-Smtp-Source: APiQypLiKMr0o5RL5Ux7FELtq4rZpz0gRc5jfxGfMu8ywH2+NFGs5Ampy6i+wXiJMpGmReBMmSUWBmgzcio= X-Received: by 2002:a63:c007:: with SMTP id h7mr23391466pgg.428.1587514479245; Tue, 21 Apr 2020 17:14:39 -0700 (PDT) Date: Tue, 21 Apr 2020 17:14:18 -0700 In-Reply-To: <20200422001422.232330-1-walken@google.com> Message-Id: <20200422001422.232330-7-walken@google.com> Mime-Version: 1.0 References: <20200422001422.232330-1-walken@google.com> X-Mailer: git-send-email 2.26.1.301.g55bc3eb7cb9-goog Subject: [PATCH v5 06/10] mmap locking API: convert nested write lock sites From: Michel Lespinasse To: Andrew Morton , linux-mm Cc: LKML , Peter Zijlstra , Laurent Dufour , Vlastimil Babka , Matthew Wilcox , Liam Howlett , Jerome Glisse , Davidlohr Bueso , David Rientjes , Hugh Dickins , Ying Han , Jason Gunthorpe , Daniel Jordan , Michel Lespinasse X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add API for nested write locks and convert the few call sites doing that. Signed-off-by: Michel Lespinasse Reviewed-by: Daniel Jordan Reviewed-by: Vlastimil Babka Reviewed-by: Laurent Dufour --- arch/um/include/asm/mmu_context.h | 3 ++- include/linux/mmap_lock.h | 5 +++++ kernel/fork.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h index 62262c5c7785..17ddd4edf875 100644 --- a/arch/um/include/asm/mmu_context.h +++ b/arch/um/include/asm/mmu_context.h @@ -8,6 +8,7 @@ #include #include +#include #include @@ -47,7 +48,7 @@ static inline void activate_mm(struct mm_struct *old, struct mm_struct *new) * when the new ->mm is used for the first time. */ __switch_mm(&new->context.id); - down_write_nested(&new->mmap_sem, 1); + mmap_write_lock_nested(new, SINGLE_DEPTH_NESTING); uml_setup_stubs(new); mmap_write_unlock(new); } diff --git a/include/linux/mmap_lock.h b/include/linux/mmap_lock.h index 97ac53b66052..a757cb30ae77 100644 --- a/include/linux/mmap_lock.h +++ b/include/linux/mmap_lock.h @@ -11,6 +11,11 @@ static inline void mmap_write_lock(struct mm_struct *mm) down_write(&mm->mmap_sem); } +static inline void mmap_write_lock_nested(struct mm_struct *mm, int subclass) +{ + down_write_nested(&mm->mmap_sem, subclass); +} + static inline int mmap_write_lock_killable(struct mm_struct *mm) { return down_write_killable(&mm->mmap_sem); diff --git a/kernel/fork.c b/kernel/fork.c index 41d3f45c058e..a5d1d20ccba7 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -499,7 +499,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, /* * Not linked in yet - no deadlock potential: */ - down_write_nested(&mm->mmap_sem, SINGLE_DEPTH_NESTING); + mmap_write_lock_nested(mm, SINGLE_DEPTH_NESTING); /* No ordering required: file already has been exposed. */ RCU_INIT_POINTER(mm->exe_file, get_mm_exe_file(oldmm));