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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT 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 5A0CFC4361B for ; Tue, 15 Dec 2020 14:13:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E8CE4224BE for ; Tue, 15 Dec 2020 14:13:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8CE4224BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=Oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 427426B006C; Tue, 15 Dec 2020 09:13:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D35E6B006E; Tue, 15 Dec 2020 09:13:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C4A36B0070; Tue, 15 Dec 2020 09:13:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0072.hostedemail.com [216.40.44.72]) by kanga.kvack.org (Postfix) with ESMTP id 119D56B006C for ; Tue, 15 Dec 2020 09:13:11 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id C816E8249980 for ; Tue, 15 Dec 2020 14:13:10 +0000 (UTC) X-FDA: 77595708540.10.sofa65_3c0bd6e27424 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 9862716A0C3 for ; Tue, 15 Dec 2020 14:13:10 +0000 (UTC) X-HE-Tag: sofa65_3c0bd6e27424 X-Filterd-Recvd-Size: 4334 Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Dec 2020 14:13:09 +0000 (UTC) Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0BFE4ZYZ174028; Tue, 15 Dec 2020 14:13:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=corp-2020-01-29; bh=hQZopvQ/2R5bSnNeMOXl1coVQ2s6ZfV7/1lCPOpAMAw=; b=izzUehyiEZhxfmQwPvuFtsamc/STFyB4jIuANkVlBeLEXtHaaIfcvHMfeiAj9MVU/7cq oyWGl9pFOswDg6zz/1GVJm3EvwdUlj8+qaB7DP20e5mKmME4TXqkre/Mfu2zCTMXx8g/ hTLkUzbsbNck7HzslNWcJQygJ3YhiDYlx4f3pJVTTa7/NEdxnqGc4ojVRz96Gt0clDP4 WmRgpYnMQ0aqseAgYFi+khxDVP1U3Nuh/Hb/y16WamSqHyIDhNdFXXDziD0CguZP7Pkl 34tE/+O5KseMiEzfi02VhiyQgadnCQVuH19cIkCcTHWW5V8HgpckBYO/iPmEhCnaNxD4 JA== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2130.oracle.com with ESMTP id 35cn9raqpk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 15 Dec 2020 14:13:07 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0BFE5CNV045124; Tue, 15 Dec 2020 14:13:06 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3030.oracle.com with ESMTP id 35d7en2fwa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Dec 2020 14:13:06 +0000 Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 0BFED6FQ022201; Tue, 15 Dec 2020 14:13:06 GMT Received: from revolver.jebus.ca (/23.233.25.87) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 15 Dec 2020 06:13:04 -0800 From: "Liam R. Howlett" To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton Subject: [PATCH] mm/mmap: Don't unlock VMAs in remap_file_pages() Date: Tue, 15 Dec 2020 09:13:00 -0500 Message-Id: <20201215141300.1436976-1-Liam.Howlett@Oracle.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9835 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0 mlxscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012150101 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9835 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxlogscore=999 impostorscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 malwarescore=0 priorityscore=1501 phishscore=0 mlxscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012150101 Content-Transfer-Encoding: quoted-printable 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: do_mmap() will unlock the necessary VMAs. There is also a bug in the loop which will evaluate as false and not unlock any VMAs anyways. Signed-off-by: Liam R. Howlett --- mm/mmap.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 5c8b4485860de..008adf20611e5 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3025,25 +3025,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, s= tart, unsigned long, size, =20 flags &=3D MAP_NONBLOCK; flags |=3D MAP_SHARED | MAP_FIXED | MAP_POPULATE; - if (vma->vm_flags & VM_LOCKED) { - struct vm_area_struct *tmp; - flags |=3D MAP_LOCKED; - - /* drop PG_Mlocked flag for over-mapped range */ - for (tmp =3D vma; tmp->vm_start >=3D start + size; - tmp =3D 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 =3D get_file(vma->vm_file); ret =3D do_mmap(vma->vm_file, start, size, prot, flags, pgoff, &populate, NULL); --=20 2.28.0