From patchwork Tue Aug 17 13:52:49 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: 12441559 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=-18.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,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 EBF2CC4338F for ; Tue, 17 Aug 2021 13:52:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4EAE160EFE for ; Tue, 17 Aug 2021 13:52:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4EAE160EFE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id CFEB28D0001; Tue, 17 Aug 2021 09:52:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CADE96B0074; Tue, 17 Aug 2021 09:52:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B27898D0001; Tue, 17 Aug 2021 09:52:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0161.hostedemail.com [216.40.44.161]) by kanga.kvack.org (Postfix) with ESMTP id 955A16B0073 for ; Tue, 17 Aug 2021 09:52:54 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2DC2218458295 for ; Tue, 17 Aug 2021 13:52:54 +0000 (UTC) X-FDA: 78484713468.15.CBA8991 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf25.hostedemail.com (Postfix) with ESMTP id ADAC5B000185 for ; Tue, 17 Aug 2021 13:52:53 +0000 (UTC) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17HDqNun020021; Tue, 17 Aug 2021 13:52:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=M5MTXadbxzVruRDb6NjuMvqpROeKPGbg+k7VH+b8Bwc=; b=w4pUwMeggXSKw8wBebezYycuN8yM8/zeMep36ezCaQxXtDodjlaImE63spwQv5EAC6qx b4pmbNTB3XooZIv0Oe57uEzo/0yPIhDifAGCSACD32GoetWOIfmuT0bdlaplgBxEc+1k +3IAKmSiVZag5xLPCBFPrw3mBG+6vFeZUvzOak8N4AgvozrF5PmjzIULy45MhyzCo1o8 xtF2SfU2gSTCaPjuMNVr38XWgz8NEqfhP3t121jaVugE+DK0tPqhL3umNkwBFa/pLXX8 PM7TqCMFm9I8ozC99XzVrC4XlGkj3BcBNwW+B/FY5wxNCq6Vsy24Gf/cQQ/D0P3krVLR yg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : content-type : content-transfer-encoding : mime-version; s=corp-2020-01-29; bh=M5MTXadbxzVruRDb6NjuMvqpROeKPGbg+k7VH+b8Bwc=; b=DKoq/BFu/OYjFXjCBvJDuhC3eVdQMyqlCOtMTz91opjTMBA9z0og0CoLK7yFa8ihO5p9 mhyAKl/9kHDX6Wc87YhfrRJxY6dn0t27iOp0W8VSm2lVU/q3OiTW5rlv18XS1zl0BCwM STRByHwAD8uS+W+GdTv93LpMrBbVh4fV7mhP6vBjreZAE/7LyOrTTc/nS/4rw0JI9YeG QHA5jQ0gRiEgub01efb60Kw+QIrbYpH21kyjMyXDiyMp3PZbr53LJ1o4LcjpdWVGC30l 7HS08CeMTvW9PciIYNY+8gSMaxRLvhK5FeCraubrrVPh/NQloM5gO2MDyivJkTfA/bgm xA== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 3age7mr0y6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Aug 2021 13:52:52 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 17HDj2nO166583; Tue, 17 Aug 2021 13:52:51 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2172.outbound.protection.outlook.com [104.47.57.172]) by userp3030.oracle.com with ESMTP id 3ae2y061my-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Aug 2021 13:52:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eZgsJie3ItL1ehh8bbJj5ON9G8wpXQbFB0UBnBTCHzVn3iV+ohQlWzHmeMY/qpRDuliMXz98rHN0tmb5i1KjaKwaCQJ0XaqHEP1SoDSKx6RfpjUPTKxtsiepqX09frGctpb1HBU3oYCBuTBUsd9HRg8qjNFrUDYguTR31EP4POdGiFmxaXY9azYU+dpt/dPpacZ4rmBIZM8WG3rm5G6Wy5WrUmrreCyq+HaKiHs4ON0RBQeX2NclNGwhXdt/1K7nTl9RPKgq3q1bV1ywNA6K+k4q25wFjOiJFydfp7V9FYAclLgg2x4tkNxqz6f0ON6TYeGVb6Y9qNnsquYlhCZMCQ== 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=M5MTXadbxzVruRDb6NjuMvqpROeKPGbg+k7VH+b8Bwc=; b=gPTnrf3ZpzhxCnIlBO9IbIibvclYyeTwi8ytaOTylinJSLqHDbjO40/FNg5WLI9znDNImRVj29vKM0p+/LIpqnaUeOv2NSW3gI6cQk447a9Op0aAxcZgXPSJcHQyudyQ4SGkTRquZO+4R3U+wJRKMVIVd8INEJFqyCkiC5ypz9zAZo2f1uNX4bK/+mxmuBB39cQJwTWZWqAOGmEZb4H+xqOtJCeolzt6lAfY4qFZojZbTlgBVtFwosTB/OCiyd0pcHLLSGMc84dhgryWJnfOdd8CgqA7Om3LaFt0BigT/998wOpD0q4aKFmyoczyVZBU442QNowbmCRXeukPHjPfGA== 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=M5MTXadbxzVruRDb6NjuMvqpROeKPGbg+k7VH+b8Bwc=; b=NUE/6tEpWGxRHfeYk819ulMskYH3XtvyAmqWszd+DZnMxx5rpoKX9jezupHxULBMiAjWGPt+9wXtiwbRJHSeMmhY3RXqcfbleWgH4KWv/yYouYc3bvNyl3KL2n52mzy/OJjxDT6mQ71IThliJl4TgLBwuXwlxCfPK+DSRDu3JwQ= Received: from DM6PR10MB4380.namprd10.prod.outlook.com (2603:10b6:5:223::19) by DM6PR10MB3500.namprd10.prod.outlook.com (2603:10b6:5:153::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Tue, 17 Aug 2021 13:52:50 +0000 Received: from DM6PR10MB4380.namprd10.prod.outlook.com ([fe80::585:1aa0:6582:92f3]) by DM6PR10MB4380.namprd10.prod.outlook.com ([fe80::585:1aa0:6582:92f3%6]) with mapi id 15.20.4415.024; Tue, 17 Aug 2021 13:52:50 +0000 From: Liam Howlett To: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Subject: [PATCH] remap_file_pages: Use vma_lookup() instead of find_vma() Thread-Topic: [PATCH] remap_file_pages: Use vma_lookup() instead of find_vma() Thread-Index: AQHXk28qYXojRB8Cb0aFH4j7RVywRA== Date: Tue, 17 Aug 2021 13:52:49 +0000 Message-ID: <20210817135234.1550204-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.2 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ad9e0067-f36c-4c49-1c4e-08d961864d4d x-ms-traffictypediagnostic: DM6PR10MB3500: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4941; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: lOreYjtyd7pbZFxL8DQ0oPO9HdvitPlLkkxZHByWhf59a6JXpbP9UGaloXnbgs68LPlAgd5mtyTnQTO2wQZngb746OKLs4vZQsmYr3oYLVQYecjfqOzQ3HCuhouboSVj3x3BmqL/whjJ3Yt8iQhY/HHSy6IbwjQJvQfhxUb6ReZC2tW5vYBJJHnm+W2NCoAM3GV1pp4HsMPOdJuukkazrSX6v+d8Ge/PAcCBf5vG9GMkPhvdeAdXOS7D2YUncJ5luc/qEy0FJKG7ZXdEv09lBJQFEGS+rGToIUwrsRW8IrM7Ka13bG6DYWS9Ip91Ck5FzsS6Lohdyq+livEVmvtFK2bFCJjZB8OdkgAaBV6tWzfUT1/qeBMVvdk4VEbncKAmnoUS0vMAJzXtutBFScUZEihvGkkxTrcbpX8Kcgftnv4bDEj0JVLbXqVrja/J2i18vXmtFfm5lBg4FtZi/yBnRXZfXO6Wph+LcvXBIu+ayduXDc5x+vSRKxdOZLlB+WaIV5kqOUqg64YTFcg2/rBBdtchAvAoftB2bN27b9DUpXspqkQh/PpwTAFFgspVGyPsez9bUyfp1CExxI0n/VLFS7QoCT+Mf+kp63kzO1tAKQvNAQ6W9vDakuV27qQfEmIqRvXBTXOqoiLifIKygh8++CLV2r/fQnAwc0+fqLBIVf9/4RAWZPplTgJWggaWvTENlXTJvF3KN50p4WoKBkMYGA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4380.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(136003)(366004)(346002)(396003)(39860400002)(44832011)(83380400001)(110136005)(316002)(2616005)(26005)(186003)(71200400001)(6512007)(6486002)(38070700005)(122000001)(6506007)(76116006)(91956017)(86362001)(36756003)(5660300002)(478600001)(2906002)(38100700002)(66446008)(64756008)(66476007)(66946007)(8936002)(8676002)(4744005)(1076003)(66556008);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?nLgxG1qEikcDrlgderaRRFR?= =?iso-8859-1?q?AIqwUBd/RlZfnOxRvPAqfh4nJWKVSS3W+zaB7HQPDPcaKadnt//htDBMxVtK?= =?iso-8859-1?q?1Yh1A42Uzk6TuSEEBrWdV1oIAtCO9l0BnTfLNIYKJqzJm60Rt7clz8Xczsxo?= =?iso-8859-1?q?kn+XHADh9Tzqy0TrRO2y2nc9zzwkHAIcFQhtEE8BcGEuZ1YjIEP/pWpis3Xb?= =?iso-8859-1?q?cQazRoZQ9vTnbwsaDZiYAlaSFpRo9gTRU57p/B76IpyTdVTNin1KlBCMq/EX?= =?iso-8859-1?q?lftUgwlGXgf/mQrvJG+Gt8iYhJB/K6n4qMlLT37Pj7ddDqxjefE3xZcCaY5O?= =?iso-8859-1?q?klLGNBbD8qyZW87oXY++MUvW9K7gySKL7CZTcfv4xEy7O7tKbeEgxtldDVP4?= =?iso-8859-1?q?vFGSdV7tyLrb470nx8P89JZn/R1dcWm0jvFYbwFEW0FRIWzdGLsT3nZWURoS?= =?iso-8859-1?q?MZqK34KEUT3EbnGHnkHL28YbKJPTImYH9uCVGPS3aH2IQgjN5ashvAqHTAPC?= =?iso-8859-1?q?XyHesx3gEnY1GS57nR5hEJM2Zbh6ZWMfrPNj03/hl0nlAla202CQ3pu1K6EE?= =?iso-8859-1?q?r7+kno+VGmT7xNTa2U8NHnOTqM/2kcf++fjvXAYtsmkFPl+PLcLl/PbN4boz?= =?iso-8859-1?q?1c9NhE1Vpw4IGtFCKGkQXl4W1RVfejjse68i9WeY0XUuwBDDhMvw3ytj3qkD?= =?iso-8859-1?q?xOERwQR9W5GkEvyT/9Ivzz9LuCuE1FesYilT3sXJk41zAjNP7TcmrSnSodN5?= =?iso-8859-1?q?7xBFD+41gQXZpaDtQIoQVuao9UKpi8Vuz5om07TaHvteSbgpMUn4TJQlw0tW?= =?iso-8859-1?q?1gF1iFggXb+iqKycf6sLYTOUPdzAJ32ysTSGZ0l/X8X1zLREfFPMvfb6GQe6?= =?iso-8859-1?q?jAnTRwOQct5RrpPprZpC4emnV4CLNrodnj7380mEsyRFlWzP+fjcujsxKt9L?= =?iso-8859-1?q?b7kMqZAVimuooPu1KZCqW3yhG1FMvY+gVVcd28S5bPLEhQJV0DAuKm5UQTsg?= =?iso-8859-1?q?5QBWNs0LRcYvuLrr0Hs0fKX/Tnd7OxFkJVLTv2zcc73Jk6w4ZbozM/gVupch?= =?iso-8859-1?q?jRmO1ajFyEcskOJAcjg1ds6Q0sIC2yl56LhdXgcE/1f3cYbxB4rZR5m9Ahlz?= =?iso-8859-1?q?urlEHjZg56EeOyTHBpdtx4PQ93YgwvZoeA7V3/GHLZCFHfnmsGxUmN1bHIW2?= =?iso-8859-1?q?yeWb+QivxQ6Ok0qCt6MXZmpZQlQjR4yYetV0lZc15xl6ildbC5oz2dB/ffVp?= =?iso-8859-1?q?afc2LmdL/dQonz9NjlZhx4PvmGvzEtv+lSAkxVYxVRPWODX9zYhNmRopD9ju?= =?iso-8859-1?q?qy1O31oXlXyboB5pTPuJh73yUM+t0yaXW18AHTGio5cqZ8nvRL0wUKmifiTl?= =?iso-8859-1?q?L?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4380.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad9e0067-f36c-4c49-1c4e-08d961864d4d X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Aug 2021 13:52:49.9071 (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: yTxtIcMZ9BIIJHwVjB6Fl+DO2pb/WackfnvdAeCGWfKaJM/jl+mpd5DLyedroAA2Fq6YNUg0dGcqofNtlCCwiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3500 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10079 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 suspectscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2108170084 X-Proofpoint-ORIG-GUID: ti9DyQXLuerugOJAZNvCJJKfOjxMk5RK X-Proofpoint-GUID: ti9DyQXLuerugOJAZNvCJJKfOjxMk5RK X-Rspamd-Queue-Id: ADAC5B000185 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=w4pUwMeg; dkim=pass header.d=oracle.com header.s=corp-2020-01-29 header.b="DKoq/BFu"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="NUE/6tEp"; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf25.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com X-Rspamd-Server: rspam04 X-Stat-Signature: cswuf1dqdkpk4o67q8yspsrjp5a4qoj7 X-HE-Tag: 1629208373-827246 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: From: "Liam R. Howlett" Using vma_lookup() verifies the start address is contained in the found vma. This results in easier to read code. Signed-off-by: Liam R. Howlett Reviewed-by: David Hildenbrand --- mm/mmap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index d9aa54be6244..1a23d4575cc4 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2994,14 +2994,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, if (mmap_write_lock_killable(mm)) return -EINTR; - vma = find_vma(mm, start); + vma = vma_lookup(mm, start); if (!vma || !(vma->vm_flags & VM_SHARED)) goto out; - if (start < vma->vm_start) - goto out; - if (start + size > vma->vm_end) { struct vm_area_struct *next;