From patchwork Fri May 21 17:48:06 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: 12273519 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, URIBL_BLOCKED,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 360FCC4707A for ; Fri, 21 May 2021 17:48:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D02A7613B6 for ; Fri, 21 May 2021 17:48:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D02A7613B6 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 F1645940035; Fri, 21 May 2021 13:48:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EC7C0940036; Fri, 21 May 2021 13:48:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C55B9940035; Fri, 21 May 2021 13:48:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0060.hostedemail.com [216.40.44.60]) by kanga.kvack.org (Postfix) with ESMTP id 6A715940033 for ; Fri, 21 May 2021 13:48:12 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 0E284180364EA for ; Fri, 21 May 2021 17:48:12 +0000 (UTC) X-FDA: 78165972024.03.4AD007F Received: from aserp2130.oracle.com (aserp2130.oracle.com [141.146.126.79]) by imf25.hostedemail.com (Postfix) with ESMTP id 7FB236000250 for ; Fri, 21 May 2021 17:48:08 +0000 (UTC) Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14LHUO7u083252; Fri, 21 May 2021 17:48:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2020-01-29; bh=DxSfNFKSHJm3x+zWGsAvzGZjb1Kk2gcQT6b+y/dq8VA=; b=mL6cbXwM7vMauxTkhEereEJbrmnSfap47j2AIOR0gXKTEG6of1Qwxgi/PhavAy63NTM8 NzG/32R7zDApgxjkIM/GL6LejICtgtOU88/koM2Dz2VR9Car/32xj/XaiLgXqlyph9JZ 4iCNrgzvQ6auurqE2R/kIVFQ/65CB56+SE6RncepAk+WnGQtWyYDRP7yLIobQWHK1Vf/ f2p6MijbPkfANBQVQQI6j5H4KG/o0gXByBpJZWPvy3fiCiJK84SyFslra2IytvzZR8M9 nYqB6x3AI4qBABdy3ILjN0W5Mby9OAAW/07Uhsl6tTIuh4NjsrRoqPhX9HHL95l86LJk vg== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2130.oracle.com with ESMTP id 38j3tbrf2t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 May 2021 17:48:10 +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 14LHkYWM095609; Fri, 21 May 2021 17:48:09 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1anam02lp2045.outbound.protection.outlook.com [104.47.57.45]) by userp3030.oracle.com with ESMTP id 38megnskas-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 May 2021 17:48:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cIb8yM0zI/jjMSUQVG1N/v14bBtoPPuffUsakVSh4O2seYndIjWvAO5hYa8aVFAX5qMDjY1VZ00wzE/YUbZuU19pSE8ewmpTwfNPWm5N2ezodhcVLOE8lGX0dXLDo+EHSuU6U2RSJzh0IBWiHHmFBQLKYWeWVYgWxf49GtPnRUyyLuJ61+UN5lj9J5wAZQYBKfsAOiTJx9ED4q60LJ9Uqu2/qav+funNAuxCHJaz6+5wsQieigmLy0GnLan6RXT/LQz8CDS3I5jg+qGpT8Hn/GvR70DcH/4jepNdSYQZqfjEAs8xbTgi83/irmz/kOqXiLpYTy6crlj5NBK6dleIVA== 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=DxSfNFKSHJm3x+zWGsAvzGZjb1Kk2gcQT6b+y/dq8VA=; b=KnvKslMwTAONTWitV64hGn9dc+3R4biQYjJMVvGJ5J1SOmbg86M85zwOZ0gC51I1q/Vy3QCYSN2S9qGk9TY9WelaPF5CnJevi+9ALBg7Mwpj8XSd2625l/ECPZPMry9TqAdF6WQ63logqofud2dmoHMKTEjBa97JUO9BPNh7U5GZyGwn4cyQw8Us88HXxJs4nI10Q+y/AOvWuIHPm87INBqleR1kQuyXwqAI/DzMvabC10s0usypLVHUdKd9e+EGaAdzkVDdzlhUraGTbQqRM21mVmEs2oYo/cR3EjUtwjf02IpcBsgLDdEpKdgQixCLZhS+9KsBcLpzr+15vt3RpA== 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=DxSfNFKSHJm3x+zWGsAvzGZjb1Kk2gcQT6b+y/dq8VA=; b=VpZpkeopfvyQl7quDz6cCnFZdyKPj1zX4Jm2SY6HH2+SdOS53eMAIOwZbhC+yXFZhHboBU/niyrNWs9miTcK67EqquoaKRhGIRZ4go/ByI8qbKUlm7jakZww4SZKrb6zHbtWkv8TG/B5rHmz9Hmi1Z04QJoA2oIT9EzyIxsSswY= Received: from MWHPR10MB1582.namprd10.prod.outlook.com (2603:10b6:300:22::8) by CO1PR10MB4467.namprd10.prod.outlook.com (2603:10b6:303:90::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23; Fri, 21 May 2021 17:48:06 +0000 Received: from MWHPR10MB1582.namprd10.prod.outlook.com ([fe80::353a:1802:6e91:1811]) by MWHPR10MB1582.namprd10.prod.outlook.com ([fe80::353a:1802:6e91:1811%8]) with mapi id 15.20.4150.023; Fri, 21 May 2021 17:48:06 +0000 From: Liam Howlett To: Andrew Morton , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" CC: Geert Uytterhoeven , Laurent Dufour , Davidlohr Bueso , Liam Howlett Subject: [PATCH v2 18/22] mm/ksm: Use vma_lookup() in find_mergeable_vma() Thread-Topic: [PATCH v2 18/22] mm/ksm: Use vma_lookup() in find_mergeable_vma() Thread-Index: AQHXTml0xemHo+Odr0in21Eh0dgSGA== Date: Fri, 21 May 2021 17:48:06 +0000 Message-ID: <20210521174745.2219620-19-Liam.Howlett@Oracle.com> References: <20210521174745.2219620-1-Liam.Howlett@Oracle.com> In-Reply-To: <20210521174745.2219620-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-originating-ip: [23.233.25.87] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 83727a0e-d83b-40ae-6b2c-08d91c8096ea x-ms-traffictypediagnostic: CO1PR10MB4467: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4714; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: S3VPCbSTl+mkO8Dg7ZfTw2CNu4pVOv3NOAVskN0KUF+Jn2U4aipV4/0ZN9uejxUYxAz6nrkFs9XCNmlfo/Oa09/LP6e1KDPDk9ZSEpuGOUk7Nc9jw6ZFskLdFsciAa8TfzMz5VoidalO5HQBWVBePt/MDbBVkANnrU8HXE9Ax0832rcSghSzavn4WKeGiksE+Y4oA+n3f3g61P9psXkJ+VthyU/mrPSpG/NRNxCtkUwj0MxK/ZuiWjkNRTqQM0N7tl0P2Q960VNWOS9gLwKwhNGhw+dz5xJ+jgP4mhHmSbsJDHPcpXQkQ/3oDegpL4/RK0LmQDo4rhhvXYsr6hF8wceBSGKVVm+4FvqZWLQlPChPyMxH94M7FvpeY2ko9QOWSCyFv14BjMC5SEsCrA85qP/BV8C2cxglR9jjj3sOxGCGt5U5KR3mzhRzaMcq9X2eVOaGNriaDp9Sn/aKo7W4DYd2kn7PbEDa6pMjTeKyQ6f7d3Cs3UodqW9HiAviqhXPCRWuPBXffXnZ8GUC3ZhCNZw8XpADK21XYzoxtcmtt/GfmQegZ4B4PRXWQta/KXkuIo4bu0FuMAnD+nehi3M+QpKOfmWkNL/4mDA1nTFJXMU= 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:(346002)(376002)(396003)(366004)(39860400002)(136003)(6512007)(26005)(44832011)(71200400001)(107886003)(76116006)(91956017)(122000001)(86362001)(8936002)(66446008)(66556008)(6486002)(64756008)(2616005)(5660300002)(8676002)(36756003)(186003)(4326008)(66476007)(66946007)(478600001)(1076003)(54906003)(2906002)(110136005)(38100700002)(4744005)(316002)(83380400001)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: =?iso-8859-1?q?p4SnpEhfQwr2OzEtfJqs3+yaq?= =?iso-8859-1?q?WA7hTmdAToOjqxl17wYkFoYCKxT8itCb6McJUf39xHSHwmhdHAITQFIzoDNV?= =?iso-8859-1?q?F7lsYB0inphnXjy4fwM/orqGwRyrgOjP4eO4obth8NqRB9q/K8dLvcBFSBqD?= =?iso-8859-1?q?Jz8WwPn4AOTbl8IGeQ4z57+UVOWZ+UPhv0gxrUG//Yj0sB5n7BXAOh+IBHuP?= =?iso-8859-1?q?19+liwDCdtz1tfNntTfUr7F32qcrns3N5yWYLBdl2ftRZM3dZyZDanyFsTXx?= =?iso-8859-1?q?BoG2gg4jdFGQDB2oew19Wtjbt9JSzA6WnCD9i6gcH6tg+nTXz6aQSdirYM6G?= =?iso-8859-1?q?E+hm8vmZjRojscCEJCMDUwG8RGk2CWEh38dEZAHIASytUhwiqWxIhX8Dxj0s?= =?iso-8859-1?q?gMeiW0jZoN/opYvwnbYX6rtGOBj02LxWS+C231Zvw5/igeaSqmuJypKPdw8Z?= =?iso-8859-1?q?CoA72RtvXxpo/IDF0JXFsMsKINiCxSbH+KJeLCnOKhDr2AElTDTxAQ7+4Iqy?= =?iso-8859-1?q?ufGfUN7TUfJQZCzSTn657r8NG/iDWQ03AJVAX65iVLhpNXfU3oskZCxkWg/d?= =?iso-8859-1?q?lXFnYvLARpA0eeCAB7Tzt3isnSN/2wz6Gc6QBlNMPlplblDx8dyoAKyEbGTN?= =?iso-8859-1?q?UuSRhAwFV2ng/So2ef+KLWqRykMriDMU9yV2OyN2Nde3huWwML/KdRawOFx/?= =?iso-8859-1?q?PLIOmd2cIleu30C2s536KyFE5ZYSBj6K6CBml5T6Xa9qBSfrLGrKvgxPw0Vq?= =?iso-8859-1?q?ilp/nMPQ3fkjGrAhQr8nqgYTULPO9SHdbUxhLa9eJTCIYbaf2VTxh+oWg2k+?= =?iso-8859-1?q?cfH6mZMd3r/Z4qmsSo0NZ6UqtUi5Pg5C3KoIhYARCQg3mItf6Y3NwTqypQ9k?= =?iso-8859-1?q?HfmCLPB3N7VRJqSIT+yfTLpkppZKkZ0ER/wnVGUtD/lqENPb5aW8buWKpA4p?= =?iso-8859-1?q?EttYplLVqJF64jtEtjQKJ1q0CIaOh/+d8RHBdSwHp2DYx7kJMPkRoMufBhpI?= =?iso-8859-1?q?tRbUCJr0WVocch2pfeZqoj7iQdq11r27JRjzvgy8WZtKI8VHCQNzdLYKOHAJ?= =?iso-8859-1?q?X/ixC38PWSF4iTQRWaxe9b77o5rpw8KaF13vDMrWldZl3Gizlw4kxir5xGYh?= =?iso-8859-1?q?wBWop7YOXxrDG/Vk9brOaFBcECNFNjTBZAwHNAZZVbSveVfOULnjBmG/+eLY?= =?iso-8859-1?q?NlSiVJL5rktsjzYXDIcKqMj2w9MDkXbHDGFszwFVM+hZby1+a5FJSPMNfruK?= =?iso-8859-1?q?9woteyImW71r3gZtj/6XAjMlB9Pzx9qYwkfS5WNCXfQzx6JVykNqk8Vtvmdx?= =?iso-8859-1?q?cUs4mDEuhmjBE1mZBpETx5uCZkgVddhXFGGPCf3s7AYmaaHMWadi5DcOEOP?= 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: 83727a0e-d83b-40ae-6b2c-08d91c8096ea X-MS-Exchange-CrossTenant-originalarrivaltime: 21 May 2021 17:48:06.1583 (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: J8dwVPvMUpwNRCcfOEEv9nB9fV6ZfTWnThGFDxyXeJNs//qprK7Hhy7z4UZ9l/THk6mGN3c+TVr3Xvp787OPRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4467 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9991 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105210093 X-Proofpoint-ORIG-GUID: YFGVfB4WcQN25SVRK9IitucmEzrbCSQP X-Proofpoint-GUID: YFGVfB4WcQN25SVRK9IitucmEzrbCSQP X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9991 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 malwarescore=0 spamscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 mlxscore=0 impostorscore=0 adultscore=0 clxscore=1015 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105210092 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2020-01-29 header.b=mL6cbXwM; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=VpZpkeop; 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 141.146.126.79) smtp.mailfrom=liam.howlett@oracle.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 7FB236000250 X-Stat-Signature: zac49iee17nrfctud74j3eytcdz35uiw X-HE-Tag: 1621619288-74484 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: Use vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated. Signed-off-by: Liam R. Howlett Reviewed-by: Laurent Dufour Acked-by: David Hildenbrand Acked-by: Davidlohr Bueso --- mm/ksm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 6bbe314c5260..ced6830d0ff4 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -521,10 +521,8 @@ static struct vm_area_struct *find_mergeable_vma(struct mm_struct *mm, struct vm_area_struct *vma; if (ksm_test_exit(mm)) return NULL; - vma = find_vma(mm, addr); - if (!vma || vma->vm_start > addr) - return NULL; - if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma) + vma = vma_lookup(mm, addr); + if (!vma || !(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma) return NULL; return vma; }