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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, 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 47A6CC433DB for ; Wed, 24 Feb 2021 10:13:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C3D7064D74 for ; Wed, 24 Feb 2021 10:13:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3D7064D74 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 3C5916B006C; Wed, 24 Feb 2021 05:13:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 376D36B006E; Wed, 24 Feb 2021 05:13:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 23DCD6B0070; Wed, 24 Feb 2021 05:13:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0239.hostedemail.com [216.40.44.239]) by kanga.kvack.org (Postfix) with ESMTP id 03C796B006C for ; Wed, 24 Feb 2021 05:13:49 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id A8725181B04B9 for ; Wed, 24 Feb 2021 10:13:49 +0000 (UTC) X-FDA: 77852750178.17.FFFF6B0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf26.hostedemail.com (Postfix) with ESMTP id D2D71407F8F8 for ; Wed, 24 Feb 2021 10:13:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614161628; 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; bh=4FcXEpP0vdnzaUAUO/Bvo8vNurL9pwZLa9AyjXBoRb0=; b=Y9trqSe99F8Yc7lAkzi63k1cRez6Pj0wfUR7DWS6+M/ciJVCUxKYcIsxGKxhkdHxI1KROu wvhvsVwbVTtrdkjde19mT4Fsv8UxGyVBycg1OTp9zMiDPq0tuUvtdwgEN7cnGF1Jv8c4sB CyUMMj9oaMJFBL3KFyQ2azLEvqcsWUw= 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-188-ntzSqvNBNKmBgedvhNEKjQ-1; Wed, 24 Feb 2021 05:13:44 -0500 X-MC-Unique: ntzSqvNBNKmBgedvhNEKjQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A5D9801977; Wed, 24 Feb 2021 10:13:42 +0000 (UTC) Received: from [10.36.114.83] (ovpn-114-83.ams2.redhat.com [10.36.114.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7ECF3828; Wed, 24 Feb 2021 10:13:40 +0000 (UTC) Subject: Re: [PATCH v3] mm/mmap: Don't unlock VMAs in remap_file_pages() To: Liam Howlett , Andrew Morton Cc: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Hugh Dickins References: <20210223235010.2296915-1-Liam.Howlett@Oracle.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: <8eb2255e-b526-1d5f-c224-6af3bec1270d@redhat.com> Date: Wed, 24 Feb 2021 11:13:39 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <20210223235010.2296915-1-Liam.Howlett@Oracle.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: D2D71407F8F8 X-Stat-Signature: k5ootzfdag1xe7po9s7coy4r65piwanm Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf26; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=63.128.21.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614161624-346890 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 24.02.21 00:50, Liam Howlett wrote: > Since this call uses MAP_FIXED, do_mmap() will munlock the necessary > range. There is also an error in the loop test expression which will > evaluate as false and the loop body has never execute. > > Signed-off-by: Liam R. Howlett > Acked-by: Hugh Dickins > --- > mm/mmap.c | 18 +----------------- > 1 file changed, 1 insertion(+), 17 deletions(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index dc7206032387c..e22b048733269 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -3025,25 +3025,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, > > flags &= MAP_NONBLOCK; > flags |= MAP_SHARED | MAP_FIXED | MAP_POPULATE; > - if (vma->vm_flags & VM_LOCKED) { > - struct vm_area_struct *tmp; > + if (vma->vm_flags & VM_LOCKED) > flags |= MAP_LOCKED; > > - /* drop PG_Mlocked flag for over-mapped range */ > - for (tmp = vma; tmp->vm_start >= start + size; > - tmp = tmp->vm_next) { > - /* > - * Split pmd and munlock page on the border > - * of the range. > - */ > - vma_adjust_trans_huge(tmp, start, start + size, 0); > - > - munlock_vma_pages_range(tmp, > - max(tmp->vm_start, start), > - min(tmp->vm_end, start + size)); > - } > - } > - > file = get_file(vma->vm_file); > ret = do_mmap(vma->vm_file, start, size, > prot, flags, pgoff, &populate, NULL); > Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb