From patchwork Wed Apr 15 00:43:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 11489445 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 D158F1392 for ; Wed, 15 Apr 2020 00:44:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 94B1720737 for ; Wed, 15 Apr 2020 00:44:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="VWarSvlp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94B1720737 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 1BACE8E0001; Tue, 14 Apr 2020 20:44:10 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 16B9A8E000B; Tue, 14 Apr 2020 20:44:10 -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 033428E0001; Tue, 14 Apr 2020 20:44:10 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0199.hostedemail.com [216.40.44.199]) by kanga.kvack.org (Postfix) with ESMTP id D94098E000B for ; Tue, 14 Apr 2020 20:44:09 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A155B5DD7 for ; Wed, 15 Apr 2020 00:44:09 +0000 (UTC) X-FDA: 76708242618.01.stew68_416534801f65e X-Spam-Summary: 2,0,0,3c88756c520849d2,d41d8cd98f00b204,32fiwxgykcn0v9kjdmfnnfkd.bnlkhmtw-llju9bj.nqf@flex--walken.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:966:973:988:989:1260:1277:1313:1314:1345:1359:1437:1516:1518:1535:1544:1593:1594:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2559:2562:2693:3138:3139:3140:3141:3142:3152:3355:3865:3866:3867:3868:3870:3872:4118:4250:4321:4385:4605:5007:6119:6261:6299:6653:6742:7901:7903:8660:9036:9969:10004:11026:11473:11657:11658:11914:12043:12296:12297:12438:12555:12895:13148:13230:13255:14096:14097:14181:14394:14659:14721:21080:21212:21324:21433:21444:21451:21611:21627:21795:21990:30003:30051:30054:30064:30070,0,RBL:209.85.210.201:@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:24,LUA_SUMMARY:none X-HE-Tag: stew68_416534801f65e X-Filterd-Recvd-Size: 7982 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Wed, 15 Apr 2020 00:44:09 +0000 (UTC) Received: by mail-pf1-f201.google.com with SMTP id x25so1398029pfq.18 for ; Tue, 14 Apr 2020 17:44:09 -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=Ad1osA7PXp9TaJziz5RfxCmgCGDDxR2XQUquw95G3RM=; b=VWarSvlp+scq0rhdkrZI9ThmO16dKdGS3hD3dQ0o99du+Bt6HRuwpoZk6OJvNIsiTq 6TAOthei3FwJ8wgdk/Gr0tLlHe0+kthwZP9pNPCgQme5sv0rw01DdqBEiDzdI8I3F6rm dPrRQUCsLxmnbTSahs0+bAYEdkowfA8dJXP492H7egotom+NbXcYh7KnKicjsn9zwuR9 Qz2gC1ISYDJ776NxEECfK2iog5SO+KtOgSpOGbT/ApkP24/Pbt4t/V8epVgTuTt5BCEA XOKclDXDRd8yR4kzUXpWc/UENkcoxMz9pqF5yvp9bKhFxJk3wx1N3gclcN9pOABX5qZ2 +jFg== 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=Ad1osA7PXp9TaJziz5RfxCmgCGDDxR2XQUquw95G3RM=; b=pfbr7Wdb4/GP7lQ4bqFN81Wb8tkIVyTZKKO3LOgBupxGmajmQzbdwAx8Uox7ooYqpv SJo95uJ99TaRU3DfJxZ1ejqfx+oN+cKYkRAwxGC9JZspzWs9gM5NIpw/9azYjJ9baPW4 Bd7y6xSc431mdzey2u2LmGK03vKrAp6FWBDvrKWbn7kCyaSFW7BbsUC1ktwmY/OdWfdJ P+XtNi5V1H5p1jmS1x1VCMe8ukQnetlYs8VxPaxYJyU3y7gp/GPbj2qVq9huOsD8sjiG 7IymNONdvi3uI6cAEnNFHUQzSz4CvWMuAF9v2Kx7cfAPor1MP/WiKmrFbIOEtJniDP0C QBOQ== X-Gm-Message-State: AGi0PuYhMjgM8gI04Gx74M/RuTgGdR2f5uOhuWzrXYnKcU9wzppDMHqJ atQNJ7RBvkUsiL35sWR5X0g9ZoE8As4= X-Google-Smtp-Source: APiQypJqGWzbv/IHIQQD+XaFi8o4HCrVN04+rqrNa9XLspAWlJs+rQikkwClVR7yHo+ZXfHFtSStaZPnY4g= X-Received: by 2002:a17:90a:3268:: with SMTP id k95mr2933353pjb.185.1586911448288; Tue, 14 Apr 2020 17:44:08 -0700 (PDT) Date: Tue, 14 Apr 2020 17:43:48 -0700 In-Reply-To: <20200415004353.130248-1-walken@google.com> Message-Id: <20200415004353.130248-6-walken@google.com> Mime-Version: 1.0 References: <20200415004353.130248-1-walken@google.com> X-Mailer: git-send-email 2.26.0.110.g2183baf09c-goog Subject: [PATCH v4 05/10] mmap locking API: convert mmap_sem call sites missed by coccinelle 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: Convert the last few remaining mmap_sem rwsem calls to use the new mmap locking API. These were missed by coccinelle for some reason (I think coccinelle does not support some of the preprocessor constructs in these files ?) Signed-off-by: Michel Lespinasse Reviewed-by: Daniel Jordan --- arch/mips/mm/fault.c | 10 +++++----- arch/x86/kvm/mmu/paging_tmpl.h | 8 ++++---- drivers/android/binder_alloc.c | 4 ++-- fs/proc/base.c | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index f8d62cd83b36..9ef2dd39111e 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c @@ -97,7 +97,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, if (user_mode(regs)) flags |= FAULT_FLAG_USER; retry: - down_read(&mm->mmap_sem); + mmap_read_lock(mm); vma = find_vma(mm, address); if (!vma) goto bad_area; @@ -190,7 +190,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, } } - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); return; /* @@ -198,7 +198,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, * Fix it, but check if it's kernel or user first.. */ bad_area: - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); bad_area_nosemaphore: /* User mode accesses just cause a SIGSEGV */ @@ -250,14 +250,14 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, * We ran out of memory, call the OOM killer, and return the userspace * (which will retry the fault, or kill us if we got oom-killed). */ - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); if (!user_mode(regs)) goto no_context; pagefault_out_of_memory(); return; do_sigbus: - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); /* Kernel mode? Handle exceptions or die */ if (!user_mode(regs)) diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h index 9bdf9b7d9a96..40e5bb67cc09 100644 --- a/arch/x86/kvm/mmu/paging_tmpl.h +++ b/arch/x86/kvm/mmu/paging_tmpl.h @@ -165,22 +165,22 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long pfn; unsigned long paddr; - down_read(¤t->mm->mmap_sem); + mmap_read_lock(current->mm); vma = find_vma_intersection(current->mm, vaddr, vaddr + PAGE_SIZE); if (!vma || !(vma->vm_flags & VM_PFNMAP)) { - up_read(¤t->mm->mmap_sem); + mmap_read_unlock(current->mm); return -EFAULT; } pfn = ((vaddr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; paddr = pfn << PAGE_SHIFT; table = memremap(paddr, PAGE_SIZE, MEMREMAP_WB); if (!table) { - up_read(¤t->mm->mmap_sem); + mmap_read_unlock(current->mm); return -EFAULT; } ret = CMPXCHG(&table[index], orig_pte, new_pte); memunmap(table); - up_read(¤t->mm->mmap_sem); + mmap_read_unlock(current->mm); } return (ret != orig_pte); diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 5e063739a3a8..cbdc43ed0f9f 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -932,7 +932,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item, mm = alloc->vma_vm_mm; if (!mmget_not_zero(mm)) goto err_mmget; - if (!down_read_trylock(&mm->mmap_sem)) + if (!mmap_read_trylock(mm)) goto err_down_read_mmap_sem_failed; vma = binder_alloc_get_vma(alloc); @@ -946,7 +946,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item, trace_binder_unmap_user_end(alloc, index); } - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); mmput(mm); trace_binder_unmap_kernel_start(alloc, index); diff --git a/fs/proc/base.c b/fs/proc/base.c index f0a566ccf193..6e321d1f2c03 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2302,7 +2302,7 @@ proc_map_files_readdir(struct file *file, struct dir_context *ctx) if (!mm) goto out_put_task; - ret = down_read_killable(&mm->mmap_sem); + ret = mmap_read_lock_killable(mm); if (ret) { mmput(mm); goto out_put_task; @@ -2329,7 +2329,7 @@ proc_map_files_readdir(struct file *file, struct dir_context *ctx) p = genradix_ptr_alloc(&fa, nr_files++, GFP_KERNEL); if (!p) { ret = -ENOMEM; - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); mmput(mm); goto out_put_task; } @@ -2338,7 +2338,7 @@ proc_map_files_readdir(struct file *file, struct dir_context *ctx) p->end = vma->vm_end; p->mode = vma->vm_file->f_mode; } - up_read(&mm->mmap_sem); + mmap_read_unlock(mm); mmput(mm); for (i = 0; i < nr_files; i++) {