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=-23.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_RED,USER_IN_DEF_DKIM_WL 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 DB879C433E0 for ; Mon, 28 Dec 2020 17:59:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6D1B922AEC for ; Mon, 28 Dec 2020 17:59:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D1B922AEC 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 A359E8D0014; Mon, 28 Dec 2020 12:59:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BEAC8D0010; Mon, 28 Dec 2020 12:59:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 839728D0014; Mon, 28 Dec 2020 12:59:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0107.hostedemail.com [216.40.44.107]) by kanga.kvack.org (Postfix) with ESMTP id 674FB8D0010 for ; Mon, 28 Dec 2020 12:59:47 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 265583629 for ; Mon, 28 Dec 2020 17:59:47 +0000 (UTC) X-FDA: 77643454014.09.owl96_2115d5027495 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id 0E3B0180AD802 for ; Mon, 28 Dec 2020 17:59:47 +0000 (UTC) X-HE-Tag: owl96_2115d5027495 X-Filterd-Recvd-Size: 8570 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Mon, 28 Dec 2020 17:59:46 +0000 (UTC) Received: by mail-ed1-f52.google.com with SMTP id b2so10491855edm.3 for ; Mon, 28 Dec 2020 09:59:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ck6rcfso3sn2GdrLOlKXguxLVMHHDgxPWhphhFOCm6M=; b=LlQ6/Uhxg/sBeUvln4jLwvh9GGzK0PBu85L4PgB6rL6SvofSuvhC5obYBW9ZOqip/D secro/vSGhKM51bsB7KRf78CnsmnUFEsR2HXl5wF55ilTWKbSP91GhyibeqqpXmQz3MA 837LkLhUNe+hVwcS0CiXRDoE6GAMYo1khG1ekTfKdvWRmUkGPPNUyM1O/+XGay7gWeH7 g1K8bNpPH2jQXevENEq1KtH5QUt/04IJxku/2vj265mNRezwngXh9h+ZC87U43XZ3XCu BPDEDoNy6KL5y8nGc7tI5/Tzgn4vCqOI95PZ+WXtLbDWItr2O6ItxnOVIAd5+q///aaW 3NTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ck6rcfso3sn2GdrLOlKXguxLVMHHDgxPWhphhFOCm6M=; b=AEbdDsy/bUDkQB5x/QNCW3SAm1lgV0A0d3mzY/dJ7onejbQhApRnzST7y4HHXpYsnh D7FYuut67/5fnfzoQpnQMU7Ug//CpOcoQKVvmdkAO3he1W5e/M0e1696OPc3dPRZxgFe DrwlJDvAZEJDOLV9RIGrpHpwEuEq4qH40quzX/W7YBoVjSuBf1dpeNtHddn8Yb1SU5hW dirC+KXSuvznSqVD3HAHbuXawt3Tcp7BBiTvrpGbcbzS13fkmdyKl1zE0mYHkpFCzs2A VxqVCs4SDQ+lytgIfUjBxai3N3im6F5c4OHYSYhL+A7bLrD9zED8HYikcS2tPUQ3jdSy R8Tg== X-Gm-Message-State: AOAM530eKfW7YgDFIu8PAr93zTVvIFbjiIglDpLGLPbvoPkmOXtv0uiH dINW6+PGQYkWzefGI9cX5ULUBhsPpwETInc/4ub5Kg== X-Google-Smtp-Source: ABdhPJw11OpPXV/C7ii4wCX4PmEFrYLmouM2YXQ7jgD6vk7HnfnC5Vj0UW9lc5SdTqzWPzyaHodxKBUp4CVKhvx4WBk= X-Received: by 2002:a50:b5c5:: with SMTP id a63mr42925069ede.227.1609178385092; Mon, 28 Dec 2020 09:59:45 -0800 (PST) MIME-Version: 1.0 References: <20201214190237.a17b70ae14f129e2dca3d204@linux-foundation.org> <20201215030813.I8VAWZGRf%akpm@linux-foundation.org> In-Reply-To: <20201215030813.I8VAWZGRf%akpm@linux-foundation.org> From: Brian Geffon Date: Mon, 28 Dec 2020 09:59:09 -0800 Message-ID: Subject: Re: [patch 086/200] mremap: don't allow MREMAP_DONTUNMAP on special_mappings and aio To: Andrew Morton Cc: catalin.marinas@arm.com, dan.carpenter@oracle.com, dan.j.williams@intel.com, dave.jiang@intel.com, dima@arista.com, Hugh Dickins , Jason Gunthorpe , jhubbard@nvidia.com, "Kirill A. Shutemov" , linux-mm , linux@armlinux.org.uk, luto@kernel.org, Mike Kravetz , Minchan Kim , mingo@redhat.com, mm-commits@vger.kernel.org, rcampbell@nvidia.com, tglx@linutronix.de, Linus Torvalds , tsbogend@alpha.franken.de, Vlastimil Babka , viro@zeniv.linux.org.uk, vishal.l.verma@intel.com, Will Deacon Content-Type: text/plain; charset="UTF-8" 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: I don't think this situation can ever happen MREMAP_DONTUNMAP is already restricted to anonymous mappings (defined as not having vm_ops) and vma_to_resize checks that the mapping is anonymous before move_vma is called. On Mon, Dec 14, 2020 at 7:08 PM Andrew Morton wrote: > > From: Dmitry Safonov > Subject: mremap: don't allow MREMAP_DONTUNMAP on special_mappings and aio > > As kernel expect to see only one of such mappings, any further operations > on the VMA-copy may be unexpected by the kernel. Maybe it's being on the > safe side, but there doesn't seem to be any expected use-case for this, so > restrict it now. > > Link: https://lkml.kernel.org/r/20201013013416.390574-4-dima@arista.com > Fixes: commit e346b3813067 ("mm/mremap: add MREMAP_DONTUNMAP to mremap()") > Signed-off-by: Dmitry Safonov > Cc: Alexander Viro > Cc: Andy Lutomirski > Cc: Brian Geffon > Cc: Catalin Marinas > Cc: Dan Carpenter > Cc: Dan Williams > Cc: Dave Jiang > Cc: Hugh Dickins > Cc: Ingo Molnar > Cc: Jason Gunthorpe > Cc: John Hubbard > Cc: "Kirill A. Shutemov" > Cc: Mike Kravetz > Cc: Minchan Kim > Cc: Ralph Campbell > Cc: Russell King > Cc: Thomas Bogendoerfer > Cc: Thomas Gleixner > Cc: Vishal Verma > Cc: Vlastimil Babka > Cc: Will Deacon > Signed-off-by: Andrew Morton > --- > > arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- > fs/aio.c | 5 ++++- > include/linux/mm.h | 2 +- > mm/mmap.c | 6 +++++- > mm/mremap.c | 2 +- > 5 files changed, 12 insertions(+), 5 deletions(-) > > --- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c~mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio > +++ a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c > @@ -1458,7 +1458,7 @@ static int pseudo_lock_dev_release(struc > return 0; > } > > -static int pseudo_lock_dev_mremap(struct vm_area_struct *area) > +static int pseudo_lock_dev_mremap(struct vm_area_struct *area, unsigned long flags) > { > /* Not supported */ > return -EINVAL; > --- a/fs/aio.c~mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio > +++ a/fs/aio.c > @@ -324,13 +324,16 @@ static void aio_free_ring(struct kioctx > } > } > > -static int aio_ring_mremap(struct vm_area_struct *vma) > +static int aio_ring_mremap(struct vm_area_struct *vma, unsigned long flags) > { > struct file *file = vma->vm_file; > struct mm_struct *mm = vma->vm_mm; > struct kioctx_table *table; > int i, res = -EINVAL; > > + if (flags & MREMAP_DONTUNMAP) > + return -EINVAL; > + > spin_lock(&mm->ioctx_lock); > rcu_read_lock(); > table = rcu_dereference(mm->ioctx_table); > --- a/include/linux/mm.h~mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio > +++ a/include/linux/mm.h > @@ -558,7 +558,7 @@ struct vm_operations_struct { > void (*open)(struct vm_area_struct * area); > void (*close)(struct vm_area_struct * area); > int (*split)(struct vm_area_struct * area, unsigned long addr); > - int (*mremap)(struct vm_area_struct * area); > + int (*mremap)(struct vm_area_struct *area, unsigned long flags); > vm_fault_t (*fault)(struct vm_fault *vmf); > vm_fault_t (*huge_fault)(struct vm_fault *vmf, > enum page_entry_size pe_size); > --- a/mm/mmap.c~mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio > +++ a/mm/mmap.c > @@ -3405,10 +3405,14 @@ static const char *special_mapping_name( > return ((struct vm_special_mapping *)vma->vm_private_data)->name; > } > > -static int special_mapping_mremap(struct vm_area_struct *new_vma) > +static int special_mapping_mremap(struct vm_area_struct *new_vma, > + unsigned long flags) > { > struct vm_special_mapping *sm = new_vma->vm_private_data; > > + if (flags & MREMAP_DONTUNMAP) > + return -EINVAL; > + > if (WARN_ON_ONCE(current->mm != new_vma->vm_mm)) > return -EFAULT; > > --- a/mm/mremap.c~mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio > +++ a/mm/mremap.c > @@ -534,7 +534,7 @@ static unsigned long move_vma(struct vm_ > if (moved_len < old_len) { > err = -ENOMEM; > } else if (vma->vm_ops && vma->vm_ops->mremap) { > - err = vma->vm_ops->mremap(new_vma); > + err = vma->vm_ops->mremap(new_vma, flags); > } > > if (unlikely(err)) { > _