From patchwork Tue Feb 23 23:50:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12101119 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,PDS_BAD_THREAD_QP_64,SPF_HELO_NONE,SPF_PASS, 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 0C39BC433E0 for ; Tue, 23 Feb 2021 23:50:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7AEA464E7C for ; Tue, 23 Feb 2021 23:50:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7AEA464E7C 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 B146B6B0006; Tue, 23 Feb 2021 18:50:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AECD16B006C; Tue, 23 Feb 2021 18:50:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 98F4E6B006E; Tue, 23 Feb 2021 18:50:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0209.hostedemail.com [216.40.44.209]) by kanga.kvack.org (Postfix) with ESMTP id 824826B0006 for ; Tue, 23 Feb 2021 18:50:35 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 4BCBB18036187 for ; Tue, 23 Feb 2021 23:50:35 +0000 (UTC) X-FDA: 77851179630.24.B500F03 Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by imf15.hostedemail.com (Postfix) with ESMTP id 809ADA0009EA for ; Tue, 23 Feb 2021 23:50:33 +0000 (UTC) Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 11NNnw8p050140; Tue, 23 Feb 2021 23:50:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-type : content-transfer-encoding : mime-version; s=corp-2020-01-29; bh=csBC4fO3lUSN1RA/yjwDRZ5qW6HtCGSseHTHi01DNuQ=; b=JQ2QY1SNGfJ/nMHQW9pIgpuOJCNNTWuPTC2flK+cpLSJRdZQnTBv1+3C6BDJ90lYS6X8 cRMxw9FMVtKYFHddUPIE6x2Z9uMbfQSIfgQLTf9cXY4hV7Q/yocPHwTFasapolC9gprn X1Eto6ZaAS/ETCJpNa2wXEj2kJS1HRxXb8TKSPMiiJxtvx8r3ErE8oNGE97xfIVlCWmn wIkRP7mVtbtn7mdXDIS1ViLdENX+zqeLcMEJ+tB3vIptLSA2oACNqaHZanKxyum+BBDD gPw5Ra5YyULULS04KOjVEuzEhW43GgoHKiZUwItA/RXrrJYHMhzsfH16D5r2GaOsBYrK Ew== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2120.oracle.com with ESMTP id 36ttcm96pr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Feb 2021 23:50:32 +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 11NNoSSf053252; Tue, 23 Feb 2021 23:50:31 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2177.outbound.protection.outlook.com [104.47.55.177]) by aserp3030.oracle.com with ESMTP id 36v9m58hyf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Feb 2021 23:50:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JONR27LI6ecrFTRNfleoKgvOhkYMevKUZtKIpP3hiZMv0GX/ez2dTZ5Ufl8mMFcYPRDhwAgrXV6bVPmut0R1kU79PsbRYhgqeGEyyPx3sZ+5J9ox1lopZG98wzi32lyVQsH0CuQXKSZkN0RZJ/O1WHeiP4UK9A5CW3qjR7dWLlwAVgoyuvFnZWHFp6nOGg0wbgLaM8JNGHDD3pmkBjaxQyNzI1Pg+Nkg0Pu6hNF4yUrOv3lMWQDIXDZ9huqDfvULEJSf0bZbrd8v9RmFBCOGcnHqVEMRo/EDFK9dY2SfS1OmsqXM4Y4JJVNvXRZVcKu1kpMKxvn2mIDG9JpzzGD83A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=csBC4fO3lUSN1RA/yjwDRZ5qW6HtCGSseHTHi01DNuQ=; b=ZFhOJPOyWAV/YmeP/zs1+nDqSPG8P+eXHnQUsKD6GNrus3n0JSg/xlE6UgiXcuJsYsljxQWiokjgp3+7Xa8kOweDiHp8IC+XDDa6B8OMZmumfntVNF0jqc5I3TAsw1rSquNiXHuZFiJfXVPql6SvTIrLz4huE6WU9v0QR2tN75NzFDdoj3rLN+jtGMjjr18TYA7QLiKXwzTTpg3mnSkTg2f7WEqdzVs9OP4hI1wpg6J4Dz7tWPttRBdnQhZ9mySgOnFTrlH9xgeexro3Vi2cW1QAZLf7MFUPF6QR3ttgCDRoaqXTNsnVa5KejsrDMDixSTq497QaOrckbGVsMfb39g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=csBC4fO3lUSN1RA/yjwDRZ5qW6HtCGSseHTHi01DNuQ=; b=UCHlTpNf+lHZdkTSg4FYTJilR+NNNxor8WHEiSUedg+LnEp8Fb9WkGzRHAb6TL1utv5PTyMdudCz89RcMFpMNkxzSK0gzuKQUe6BZfe96Ko1+RFzvZFVEvdDG+d8OSoXsQf6qDiGo9x1WDxcEZF41lROdqTczfIzqLxXW7ADw0U= Received: from MWHPR10MB1582.namprd10.prod.outlook.com (2603:10b6:300:22::8) by MWHPR10MB1871.namprd10.prod.outlook.com (2603:10b6:300:10c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.32; Tue, 23 Feb 2021 23:50:23 +0000 Received: from MWHPR10MB1582.namprd10.prod.outlook.com ([fe80::ac3f:8441:8f0c:2c89]) by MWHPR10MB1582.namprd10.prod.outlook.com ([fe80::ac3f:8441:8f0c:2c89%11]) with mapi id 15.20.3890.019; Tue, 23 Feb 2021 23:50:23 +0000 From: Liam Howlett To: Andrew Morton CC: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Hugh Dickins , Liam Howlett Subject: [PATCH v3] mm/mmap: Don't unlock VMAs in remap_file_pages() Thread-Topic: [PATCH v3] mm/mmap: Don't unlock VMAs in remap_file_pages() Thread-Index: AQHXCj6mqNsC+jTn0USOZcQjo8OwWQ== Date: Tue, 23 Feb 2021 23:50:23 +0000 Message-ID: <20210223235010.2296915-1-Liam.Howlett@Oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.30.0 authentication-results: linux-foundation.org; dkim=none (message not signed) header.d=none;linux-foundation.org; dmarc=none action=none header.from=oracle.com; x-originating-ip: [23.233.25.87] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8f7a1ee2-5d40-48ce-4efc-08d8d855c952 x-ms-traffictypediagnostic: MWHPR10MB1871: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3968; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rFIpfEml78G4le7hN3nfe80bODJ94jyrLCDckbBY6Y+NWRKhoMLl9xM4A3i9/Ixj2LgnWZdAJTKkW/fHjf9MS+zpBJgR8awAxgA3jtEfALuPLCTptOgfMppM2DV5ljwNg5o1qkI71Ao6YNy/lDN4M9yR9RzNMs/cWbtJ/NyoXeR9YQXOrWtMkKk2nONnCWMKVWKRiSQfYS5qfhG+G7tuoCLqzLKrGnaIWUJhXo8FOcvYnAubTI5XXMflA7g7ZosnZQGBY5mH7gN8E8IwpL4LyQnAoJY/4BJCLEnMKn9Gy0TePiV6g6gfgRv4WCI3jRP0VGXFVP39RewQtTuZoiFM+r5KHEyton7jIW55W2GzXPGKSsg6mswhztnXzKdFwYsx2txRl+sK/t5lXc7IKTKAvbpU+NeDBeQcNNr4wncCM+VH60h86rxFwQYIwM+QomzPNeFBjppP74u/7LnjZQx0Kb5nxGmwWTaXwPM/R9dfESDmfrRuvCQOmf20S0VWdZ7epx3eB7jOxP5vpuhwLYZkrw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR10MB1582.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(346002)(39860400002)(376002)(136003)(366004)(8936002)(186003)(6506007)(1076003)(66446008)(26005)(8676002)(2616005)(478600001)(5660300002)(66556008)(44832011)(4326008)(64756008)(54906003)(66946007)(83380400001)(66476007)(86362001)(76116006)(91956017)(2906002)(6916009)(6512007)(36756003)(71200400001)(316002)(107886003)(6486002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: =?iso-8859-1?q?j3qRQ3F64gGKY+GBEeUSX8xwp?= =?iso-8859-1?q?7P9MWP67YPrk4PaDDz3ThzhhrSbV3T2cH2t7cKlOAb7eV3j55PSkmBOZ31lu?= =?iso-8859-1?q?4USfo0HA9ZgxQq50AUo4IMS7o0H9S1yOVp46of74PIzXoPeOUc1QhhkafM3J?= =?iso-8859-1?q?bnP0CHfrfU8EcoqFPWc/s0+upBtStAvPoTG3XlzE+3IpqNHZ9u5kXNdMnXre?= =?iso-8859-1?q?jYPx3R9U60dP33zhdlN9GMgSjbgB0s9r1ZHbYIgxt8+xo9BoRlbwaVSmUJAG?= =?iso-8859-1?q?8aR07FS9sga0hCBZC9imW2PFYPVVfmORWm7qjYfCc7g0qNt631lTwOSj8qNb?= =?iso-8859-1?q?GkCeGhN1CdJoEh30Nh+dOR5gUk7yKnTlh09uX0PwKF6aIZ5a477VEJ64YsON?= =?iso-8859-1?q?HUVSprV6mRjTaVkDKpqPM/rUzLgxRqJ9U9crD+zpURowUlkoGif4wyUjLqQZ?= =?iso-8859-1?q?y3DdwjpBefFb32H3+S93o43jWuP394wovnSxbTMhpyCGw5TDbTIm3N7khDuy?= =?iso-8859-1?q?3U8fZFpk0e4xS1Sm4EUK0Y7Z+6jmg8H6ZWtJRN1mvn9WMUTJm8b4ZRXVkFu7?= =?iso-8859-1?q?LkD7N3MZ3Lk6/vo83uOhgzRdXEdiaST7fE+ickXW57SC3+StdmBnj5ULXw0Z?= =?iso-8859-1?q?eu9AtgW//0CRUxmvyVTh86ZHdmDP1SQDY3a+UtjjD2eoYhOIZmQtgK4vqTUw?= =?iso-8859-1?q?cqSO1EUrI8ZwJqd5bBWZDM4cIDoN3ZHBpe7tsg5yXUjoezh6uIR9Ta8Xn4OF?= =?iso-8859-1?q?X2MKNKc5LhDf4g1PcfFMr6naAuGE2usUZbuMG/6WAh/LJE25slVgMqIWgaiO?= =?iso-8859-1?q?MYEjFtYF43zJw+By3Rup7kktRqX35kbnNNGUm0rZtcXDToO8YrVG7rWX2KXl?= =?iso-8859-1?q?jSex0hhlqrhjS+DAKk5p6Nu5xO7JJ3Ysu2kD6xjTOL/9keC9EE4xRpmYrzql?= =?iso-8859-1?q?zNwG5e3BHfSD0KczL/YD9eK4b9ORJtlwFTMoZotFuyad5F5WuM8RRi3yMYI0?= =?iso-8859-1?q?tystkOC0gIKF3euVdRkdw3aRgZ4TC7gpvsWkR1uNYvIyMwvku2mE9JXKpySL?= =?iso-8859-1?q?DxHyZmmLIolL6UTFMK5BTGacelFprzOYIW6Aik+cLTYYbyajpeK8cpfl0ASE?= =?iso-8859-1?q?r0lqHM8iNK8qxzf7l0Zje/9YAv/rVAPG8QmQU75ek3Uxwo7itR7sp4TaXpGG?= =?iso-8859-1?q?qHwbqci/gRE2gr+PLB31SVjvZRIi5yAXvRKAyGvd+SHzpkgAcU+HiQhm4/Wt?= =?iso-8859-1?q?8O7Cy9w2zOX9Wz7uLuASgOo7cP1bkCYxQbaStIsNUdJf/wnZIO4dERwL3o0J?= =?iso-8859-1?q?sFhXdHJ5BlNw86GmYx0dk70jWErkq+tgNHCZLkKYtyYZ6uB47SO9C3hU1nY?= MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR10MB1582.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f7a1ee2-5d40-48ce-4efc-08d8d855c952 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Feb 2021 23:50:23.3060 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 6u0lxrmlDZdbXzBbWW9c+7ar7PmURF/4nZ3Wk6U2Mqt1trqDV0yvGYoL3i22h1BeyEh0klKIutDE47sWd2Zlug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1871 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9904 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102230201 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9904 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 lowpriorityscore=0 spamscore=0 mlxscore=0 bulkscore=0 clxscore=1011 priorityscore=1501 malwarescore=0 impostorscore=0 suspectscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102230201 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 809ADA0009EA X-Stat-Signature: ay4q6hrfngjb6mhcpxuy1dra83cfrox1 Received-SPF: none (oracle.com>: No applicable sender policy available) receiver=imf15; identity=mailfrom; envelope-from=""; helo=aserp2120.oracle.com; client-ip=141.146.126.78 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614124233-819068 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: 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 Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: David Hildenbrand --- 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);