From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38255C433DF for ; Wed, 29 Jul 2020 09:05:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D1674206D4 for ; Wed, 29 Jul 2020 09:05:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TUOKteIH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1674206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 616456B000C; Wed, 29 Jul 2020 05:05:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A0848D0001; Wed, 29 Jul 2020 05:05:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 43FFC6B000E; Wed, 29 Jul 2020 05:05:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0045.hostedemail.com [216.40.44.45]) by kanga.kvack.org (Postfix) with ESMTP id 292266B000C for ; Wed, 29 Jul 2020 05:05:46 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id DE31C184B3541 for ; Wed, 29 Jul 2020 09:05:45 +0000 (UTC) X-FDA: 77090530650.27.pump11_4e07d6d26f71 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id AF71B8ED564 for ; Wed, 29 Jul 2020 09:05:45 +0000 (UTC) X-HE-Tag: pump11_4e07d6d26f71 X-Filterd-Recvd-Size: 16025 Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by imf44.hostedemail.com (Postfix) with ESMTP for ; Wed, 29 Jul 2020 09:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596013544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=nb4omP5V4ww6pNm+jwC+mSNjVyx/1lyN4nQDwPTAYC8=; b=TUOKteIHR8T01uF01AU1b9LyX7CMeFnDsUvebMoSANc70N9JfLY04VCuBJAw0+WkZxUzBc eiZO+DjmMzR3E/hrG3pkra1Mzt1KonkS9aKUu0+/XfLI38gO2hxJ34fUbWmQ69itWo4csZ rmGbqTrgXMs/Zeg+iv5ivaq209jAvug= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-234-n_R65YgSPceqW-4sRy-0QQ-1; Wed, 29 Jul 2020 05:05:40 -0400 X-MC-Unique: n_R65YgSPceqW-4sRy-0QQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 431D3106B242; Wed, 29 Jul 2020 09:05:39 +0000 (UTC) Received: from [10.36.114.111] (ovpn-114-111.ams2.redhat.com [10.36.114.111]) by smtp.corp.redhat.com (Postfix) with ESMTP id E98BD19741; Wed, 29 Jul 2020 09:05:33 +0000 (UTC) Subject: Re: [PATCH] mm: remove unnecessary wrapper function do_mmap_pgoff() To: Peter Collingbourne , Andrew Morton Cc: Oleg Nesterov , linux-mm@kvack.org References: <20200727194109.1371462-1-pcc@google.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 WNyWQQ== Organization: Red Hat GmbH Message-ID: Date: Wed, 29 Jul 2020 11:05:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200727194109.1371462-1-pcc@google.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: AF71B8ED564 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: On 27.07.20 21:41, Peter Collingbourne wrote: > The current split between do_mmap() and do_mmap_pgoff() was introduced > in commit 1fcfd8db7f82 ("mm, mpx: add "vm_flags_t vm_flags" > arg to do_mmap_pgoff()") to support MPX. The wrapper function > do_mmap_pgoff() always passed 0 as the value of the vm_flags argument > to do_mmap(). However, MPX support has subsequently been removed from > the kernel and there were no more direct callers of do_mmap(); all > calls were going via do_mmap_pgoff(). Simplify the code by removing > do_mmap_pgoff() and changing all callers to directly call do_mmap(), > which now no longer takes a vm_flags argument. > > Signed-off-by: Peter Collingbourne > --- > fs/aio.c | 6 +++--- > fs/hugetlbfs/inode.c | 2 +- > include/linux/fs.h | 2 +- > include/linux/mm.h | 12 +----------- > ipc/shm.c | 2 +- > mm/mmap.c | 16 ++++++++-------- > mm/nommu.c | 6 +++--- > mm/shmem.c | 2 +- > mm/util.c | 4 ++-- > 9 files changed, 21 insertions(+), 31 deletions(-) > > diff --git a/fs/aio.c b/fs/aio.c > index 91e7cc4a9f17..5736bff48e9e 100644 > --- a/fs/aio.c > +++ b/fs/aio.c > @@ -525,9 +525,9 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events) > return -EINTR; > } > > - ctx->mmap_base = do_mmap_pgoff(ctx->aio_ring_file, 0, ctx->mmap_size, > - PROT_READ | PROT_WRITE, > - MAP_SHARED, 0, &unused, NULL); > + ctx->mmap_base = do_mmap(ctx->aio_ring_file, 0, ctx->mmap_size, > + PROT_READ | PROT_WRITE, > + MAP_SHARED, 0, &unused, NULL); > mmap_write_unlock(mm); > if (IS_ERR((void *)ctx->mmap_base)) { > ctx->mmap_size = 0; > diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c > index ef5313f9c78f..523954d00dff 100644 > --- a/fs/hugetlbfs/inode.c > +++ b/fs/hugetlbfs/inode.c > @@ -140,7 +140,7 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) > * already been checked by prepare_hugepage_range. If you add > * any error returns here, do so after setting VM_HUGETLB, so > * is_vm_hugetlb_page tests below unmap_region go the right > - * way when do_mmap_pgoff unwinds (may be important on powerpc > + * way when do_mmap unwinds (may be important on powerpc > * and ia64). > */ > vma->vm_flags |= VM_HUGETLB | VM_DONTEXPAND; > diff --git a/include/linux/fs.h b/include/linux/fs.h > index f5abba86107d..47bdfb907158 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -559,7 +559,7 @@ static inline int mapping_mapped(struct address_space *mapping) > > /* > * Might pages of this file have been modified in userspace? > - * Note that i_mmap_writable counts all VM_SHARED vmas: do_mmap_pgoff > + * Note that i_mmap_writable counts all VM_SHARED vmas: do_mmap > * marks vma as VM_SHARED if it is shared, and the file was opened for > * writing i.e. vma may be mprotected writable even if now readonly. > * > diff --git a/include/linux/mm.h b/include/linux/mm.h > index dc7b87310c10..256e1bc83460 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2579,23 +2579,13 @@ extern unsigned long mmap_region(struct file *file, unsigned long addr, > struct list_head *uf); > extern unsigned long do_mmap(struct file *file, unsigned long addr, > unsigned long len, unsigned long prot, unsigned long flags, > - vm_flags_t vm_flags, unsigned long pgoff, unsigned long *populate, > - struct list_head *uf); > + unsigned long pgoff, unsigned long *populate, struct list_head *uf); > extern int __do_munmap(struct mm_struct *, unsigned long, size_t, > struct list_head *uf, bool downgrade); > extern int do_munmap(struct mm_struct *, unsigned long, size_t, > struct list_head *uf); > extern int do_madvise(unsigned long start, size_t len_in, int behavior); > > -static inline unsigned long > -do_mmap_pgoff(struct file *file, unsigned long addr, > - unsigned long len, unsigned long prot, unsigned long flags, > - unsigned long pgoff, unsigned long *populate, > - struct list_head *uf) > -{ > - return do_mmap(file, addr, len, prot, flags, 0, pgoff, populate, uf); > -} > - > #ifdef CONFIG_MMU > extern int __mm_populate(unsigned long addr, unsigned long len, > int ignore_errors); > diff --git a/ipc/shm.c b/ipc/shm.c > index 0a6dd94afa21..bf38d7e2fbe9 100644 > --- a/ipc/shm.c > +++ b/ipc/shm.c > @@ -1558,7 +1558,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, > goto invalid; > } > > - addr = do_mmap_pgoff(file, addr, size, prot, flags, 0, &populate, NULL); > + addr = do_mmap(file, addr, size, prot, flags, 0, &populate, NULL); > *raddr = addr; > err = 0; > if (IS_ERR_VALUE(addr)) > diff --git a/mm/mmap.c b/mm/mmap.c > index 59a4682ebf3f..d43cc3b0187c 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -1030,7 +1030,7 @@ static inline int is_mergeable_anon_vma(struct anon_vma *anon_vma1, > * anon_vmas, nor if same anon_vma is assigned but offsets incompatible. > * > * We don't check here for the merged mmap wrapping around the end of pagecache > - * indices (16TB on ia32) because do_mmap_pgoff() does not permit mmap's which > + * indices (16TB on ia32) because do_mmap() does not permit mmap's which > * wrap, nor mmaps which cover the final page at index -1UL. > */ > static int > @@ -1365,11 +1365,11 @@ static inline bool file_mmap_ok(struct file *file, struct inode *inode, > */ > unsigned long do_mmap(struct file *file, unsigned long addr, > unsigned long len, unsigned long prot, > - unsigned long flags, vm_flags_t vm_flags, > - unsigned long pgoff, unsigned long *populate, > - struct list_head *uf) > + unsigned long flags, unsigned long pgoff, > + unsigned long *populate, struct list_head *uf) > { > struct mm_struct *mm = current->mm; > + vm_flags_t vm_flags; > int pkey = 0; > > *populate = 0; > @@ -1431,7 +1431,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr, > * to. we assume access permissions have been handled by the open > * of the memory object, so we don't do any here. > */ > - vm_flags |= calc_vm_prot_bits(prot, pkey) | calc_vm_flag_bits(flags) | > + vm_flags = calc_vm_prot_bits(prot, pkey) | calc_vm_flag_bits(flags) | > mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC; > > if (flags & MAP_LOCKED) > @@ -2209,7 +2209,7 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, > /* > * mmap_region() will call shmem_zero_setup() to create a file, > * so use shmem's get_unmapped_area in case it can be huge. > - * do_mmap_pgoff() will clear pgoff, so match alignment. > + * do_mmap() will clear pgoff, so match alignment. > */ > pgoff = 0; > get_area = shmem_get_unmapped_area; > @@ -2970,7 +2970,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, > } > > file = get_file(vma->vm_file); > - ret = do_mmap_pgoff(vma->vm_file, start, size, > + ret = do_mmap(vma->vm_file, start, size, > prot, flags, pgoff, &populate, NULL); > fput(file); > out: > @@ -3189,7 +3189,7 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) > * By setting it to reflect the virtual start address of the > * vma, merges and splits can happen in a seamless way, just > * using the existing file pgoff checks and manipulations. > - * Similarly in do_mmap_pgoff and in do_brk. > + * Similarly in do_mmap and in do_brk. > */ > if (vma_is_anonymous(vma)) { > BUG_ON(vma->anon_vma); > diff --git a/mm/nommu.c b/mm/nommu.c > index f32a69095d50..11a27e5770ba 100644 > --- a/mm/nommu.c > +++ b/mm/nommu.c > @@ -1078,7 +1078,6 @@ unsigned long do_mmap(struct file *file, > unsigned long len, > unsigned long prot, > unsigned long flags, > - vm_flags_t vm_flags, > unsigned long pgoff, > unsigned long *populate, > struct list_head *uf) > @@ -1086,6 +1085,7 @@ unsigned long do_mmap(struct file *file, > struct vm_area_struct *vma; > struct vm_region *region; > struct rb_node *rb; > + vm_flags_t vm_flags; > unsigned long capabilities, result; > int ret; > > @@ -1104,7 +1104,7 @@ unsigned long do_mmap(struct file *file, > > /* we've determined that we can make the mapping, now translate what we > * now know into VMA flags */ > - vm_flags |= determine_vm_flags(file, prot, flags, capabilities); > + vm_flags = determine_vm_flags(file, prot, flags, capabilities); > > /* we're going to need to record the mapping */ > region = kmem_cache_zalloc(vm_region_jar, GFP_KERNEL); > @@ -1763,7 +1763,7 @@ EXPORT_SYMBOL_GPL(access_process_vm); > * > * Check the shared mappings on an inode on behalf of a shrinking truncate to > * make sure that that any outstanding VMAs aren't broken and then shrink the > - * vm_regions that extend that beyond so that do_mmap_pgoff() doesn't > + * vm_regions that extend that beyond so that do_mmap() doesn't > * automatically grant mappings that are too large. > */ > int nommu_shrink_inode_mappings(struct inode *inode, size_t size, > diff --git a/mm/shmem.c b/mm/shmem.c > index a0dbe62f8042..0ef2eb83c2df 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -4128,7 +4128,7 @@ EXPORT_SYMBOL_GPL(shmem_file_setup_with_mnt); > > /** > * shmem_zero_setup - setup a shared anonymous mapping > - * @vma: the vma to be mmapped is prepared by do_mmap_pgoff > + * @vma: the vma to be mmapped is prepared by do_mmap > */ > int shmem_zero_setup(struct vm_area_struct *vma) > { > diff --git a/mm/util.c b/mm/util.c > index c63c8e47be57..329150d35dfe 100644 > --- a/mm/util.c > +++ b/mm/util.c > @@ -503,8 +503,8 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr, > if (!ret) { > if (mmap_write_lock_killable(mm)) > return -EINTR; > - ret = do_mmap_pgoff(file, addr, len, prot, flag, pgoff, > - &populate, &uf); > + ret = do_mmap(file, addr, len, prot, flag, pgoff, &populate, > + &uf); > mmap_write_unlock(mm); > userfaultfd_unmap_complete(mm, &uf); > if (populate) > LGTM and the history makes sense Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb