From patchwork Wed Jun 15 17:40:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12882821 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22CB9C43334 for ; Wed, 15 Jun 2022 17:41:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C28D6B0071; Wed, 15 Jun 2022 13:41:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 972B16B0072; Wed, 15 Jun 2022 13:41:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C4846B0074; Wed, 15 Jun 2022 13:41:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 69E0E6B0071 for ; Wed, 15 Jun 2022 13:41:09 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 398761203B0 for ; Wed, 15 Jun 2022 17:41:09 +0000 (UTC) X-FDA: 79581186258.07.FAF59C3 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf18.hostedemail.com (Postfix) with ESMTP id C13111C0084 for ; Wed, 15 Jun 2022 17:41:08 +0000 (UTC) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25FHXi60005235; Wed, 15 Jun 2022 17:41:01 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=2gQv0Hd9LOGosE9l2qWzX9RvO5y0C348nL1ga7X3DL8=; b=zFDclcorPINC5lMATt08zjVA6ovXs4oE4FuOmyxvcjB8HSUpnTv/eY0MMlPxVa+iqwzv VLUnJZvL/rMQ0QALBB95Lr5wzJ72JEcoJpA6B/r7Cj/SSqYSqZ8a2lerAp33o4MZg5D9 Z0jf/Vk3witaYuvqlMSIf6bCbSsz34+sroEPUeG7D/JmlT9HdL94Px2jpddOsx/K9836 UNq/kWrS0aG45EQINMGibmXEp5fU3kPTVlYIMoFbsVsH36/ytn8yG2krTLSzMv1CPsKu mLSy7k4G66CNpkgpnz8nRDIpsXjvAEGtCePmRE6d7zP9mXQiGz7puDP/9+XIxub5FViH yA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmjns97s0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 17:41:00 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25FHFaYQ028074; Wed, 15 Jun 2022 17:41:00 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2171.outbound.protection.outlook.com [104.47.59.171]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3gpqwb7v4p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 17:41:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SCvMe6TtfaRsfUm93eKe3CS7GmGHgPmtCTs7o+rH2XTaieVSmVuZour1ZlnMEn25qIweDma+OzjHQC22sFBULQl/8rw9LqGqwpuaDZ5moNyyqbujRyy2w9ECE4hBhv6yUQSnv3EcuHmCY9nfetVcFfvNLM5BMUvjiCIzx1f07HDQCiy5sTHvMXLOlrZ4cUAqxjLIuoG9XoFOGXOT6tj2fqM6OwgWEw6JbLS15nYaSsNc5DJsxE0eFq8aYreAdoGuX+DOosLiiwqT/SdwP4PFPsBlMxL48t70NzvyZlcrp6bVRD43ACccs32emjR1A3HJPSLNPCwQyLVNZhAnnvlrXQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2gQv0Hd9LOGosE9l2qWzX9RvO5y0C348nL1ga7X3DL8=; b=cvyBs7M/g1AltGifZaiB7jIrH42XwGL3q9rfHsCqXmNqyEO/2u05oP+lrv6aNdWcxsN50sTLDrLKOlr79Hrgw/EAItmmxoh+Q3kXE++I0pN9p+bm30KarbOl2GkLhj1x+YXMsQ2OB7DFn1rXvU+ETxZHr33buT4v6sWW6rS/tfH70zA/O7OCkg5fSQlSnFKwg7WATNlvsGPSukpa9tiTfVftAsBpAoIUVzyoPgpRRuyd7snF9V0uEL25WXW+IVz3LrFvgXjYLVlo8JQep3VHb5q08v8buXGn3tSIg6OzsAA6Jzetk9HSMvwSM+LeJwRQAzsfeCPzhhz6IyspO0oZcg== 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=2gQv0Hd9LOGosE9l2qWzX9RvO5y0C348nL1ga7X3DL8=; b=CnKg+YprpnNcLmwEQbLxyTSdrM66rDuxOtvOkj9gC8keiZuWxMSYN1KBnbtH1w5/2qPLaXcTw6mYachbpFfAAIEpZ9FvGeuR7vXMUL73ZQFWkb6KpVjSmpnEnqQMQPsQD9w5K66chksbvSC4BAzj5WD4ktWJgsf/bzofGGleZ+w= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by BN6PR10MB1587.namprd10.prod.outlook.com (2603:10b6:404:47::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14; Wed, 15 Jun 2022 17:40:58 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::e1df:2e42:6674:313e]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::e1df:2e42:6674:313e%7]) with mapi id 15.20.5332.013; Wed, 15 Jun 2022 17:40:58 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , Lukas Bulwahn , Matthew Wilcox Subject: [PATCH] mm/mlock: Drop dead code in count_mm_mlocked_page_nr() Thread-Topic: [PATCH] mm/mlock: Drop dead code in count_mm_mlocked_page_nr() Thread-Index: AQHYgN8SlZu4nzjVxkan7UNcI+AmoA== Date: Wed, 15 Jun 2022 17:40:58 +0000 Message-ID: <20220615174050.738523-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.35.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 842733ed-3225-4e3f-85fb-08da4ef634e9 x-ms-traffictypediagnostic: BN6PR10MB1587:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: lmq2z6rqtgHY1H5Uw5BoekuRmSP20LluDQT99rUxoVsIcjQzwEv7SsxU4OMTeLdGTTUlgRmg5JdBxAdU3prDHx3uEOK8YnZb6J2zKaq+1Oxdjb/RWgPSNsEMzUz/oiW2OMDZGqNoaL9P6zlnBcg4kfslkp/4gIZNWO3K6P71FDCTbAnKr6fJz/ZDMV0+Sq3IBgtIihNK76ZWYIphw9ZWvowpU6ZSseo0oY7EbxkeaTHWo4w69CWJwvg8JYv3FaWEljPthwDXgnjEe0xQXU7e0VP41hHs1zg7jYjHToyR/e2+Z5uImeZZq6AvespEyNXLejoXsGjYyQh6k7hoF3LKaGcsH3NotuXU6uBhZKZZSHW+8T22l4/JxbUcX1MBWwjQfti7uOf/qaq9Tt9IUW9uOq9drXM5MlF3+8uev8ytGUD7dOsmyzZDMhDcGJZsfMwp6RdBxT+emhuy7ammgNWVfmejV6rc78uMHm56qJClR3UNwKORzi8VttWmqltjBiu6ZHxMZaEySHEJTD6sra6Rhi9C+ycBEhgQmwK0mK3Vp/VJKVry/aPX80hxNhuAOFtwQ+ASU+JStJMKrFJIezwvySsCC8bwlw1wgP1o2S3BaxWNYSXidEiyTg3houjRCoMMwhOUdHuKX2itzaqshc5+CWrBTr1t+u/1/v8/HUn0Zs39aUyZeoES4Y8j9PnRKlRIgB3IKGWNPpH5HIgs6s1zFA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(71200400001)(91956017)(76116006)(508600001)(6486002)(86362001)(38100700002)(8936002)(66946007)(64756008)(66446008)(66476007)(66556008)(44832011)(186003)(122000001)(6506007)(8676002)(38070700005)(6512007)(26005)(4744005)(2906002)(83380400001)(1076003)(2616005)(36756003)(110136005)(5660300002)(316002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?5g8XcKUUxkZdXi9/5p/hAbJ?= =?iso-8859-1?q?F1+SRm8x7oi5sF9N/9YQiuqh9mkdL53STIvEbwZx2QBprHmHImBbI+9DCLud?= =?iso-8859-1?q?kdIHXAzax0KYQJkphEIANaqoe2j+de8I+D38NB5H2E+tLpOYWsS4ZR9c0nQY?= =?iso-8859-1?q?La+X5pRvb4asDkekGRLoNLJ2VntpB55InV3u7EIwYikqkVdKx8CKIktxpDYo?= =?iso-8859-1?q?oYdUss4HeIgmhIYZSX2PhV50EPXYF0TbsOuViPD6dI++E4j4HiL4EsthZS0k?= =?iso-8859-1?q?7VCf9YD4d4rT0PItzFpVXUQ3WqlnX7E4EGG8ZhCaq/PJL6UavgSidyb7j0no?= =?iso-8859-1?q?8SMHaMn10pXs9LOJG+TVbXUkDAMSWBMgVf2lGkYYyED+A2vw6UUSzKgYC+fc?= =?iso-8859-1?q?H+rcQabseB0lfwHrmxJ1qsKTAikbMqTaaPJPJr09kfBaBzoi1oPu60o7cOzX?= =?iso-8859-1?q?QB43ZbyQF2uNQcWLSoZat01H2XGf4PJ1qkpXWMW+8NY0KrxJgAlWOA2cTTTX?= =?iso-8859-1?q?NHRXp2OBmknjOB7ilgyRi9cGd50gswDX2UzCmP7eL5Fr8GnMACMtezn/MBg/?= =?iso-8859-1?q?0ynzTCyD2EHGdFWoy4R3TIC9Nr0XNiThF3GWQjJALJf2+1XszX+NY4blmJUn?= =?iso-8859-1?q?VY6I+d1KVjrZOrKzU+gWZVjoXxPhHxiK59kQkttT8PEYkfzUobXcwDEP3ku0?= =?iso-8859-1?q?yqVk0XEYBecbLRCm/+N/sUDJtQJ+11/zNwITTp6vFYBKIx8Udic8o6P2I2OS?= =?iso-8859-1?q?rndm2AumBYTEdYt16M6AVm3IHlUEjeZmBmQ5yN8kPtGK/Dk4clF1YGoWUgac?= =?iso-8859-1?q?jP7FPuLVr2fq0K9eL2P4oXLNcYvuIH4aB/R7qzLE5XcFiyA3AA9H/oP+Plzh?= =?iso-8859-1?q?UJ31lwcAN7qhqvY8EMs3XIX6pl5kzdLaHhZOnZcUa+77zkgypxRC+/RTD4YJ?= =?iso-8859-1?q?MqtJ6kYwyFaBIFagDbdOFbCagufkzYMZ38AQ7nZXd09CSwhFgZJR693YizdK?= =?iso-8859-1?q?7QufYcZX3PAE+znTth/n/vNWRpkQ6qd28o2otxHPWMgkcDgodR4HmWicpC4/?= =?iso-8859-1?q?x4kAqAOflK+JxNz7edkaq+NRy5iiIPrTovYbSO0JKRWEGDq2A/baB8svcGKd?= =?iso-8859-1?q?W2yaWlEbBMlFrX816hJn8Z27IcVJbQ/zpGlcPYVnW7KA0MVwcTSSzBKFDbf3?= =?iso-8859-1?q?tkcEe/VG/x0OHo8IJCTFpI/eQxpUKkewJjk0G2waIvALrdPrScjh+Niq7PZI?= =?iso-8859-1?q?1Iz0YpuyenRGUQPi9fElfjh5ZCk/5ygqxt6Yx/AzV59mh4N5hncP1F9HrMwv?= =?iso-8859-1?q?m2lOSaWsNkOISf9w9K0YxGMgH51WYWk13RzJlXyR01A8BFkik3boR0tF3XNw?= =?iso-8859-1?q?qNsszT31lCvbnST1pBTYdnbRgg6e6eHt+uJvxlZVOt1vtpeWOvzp+ghqCowE?= =?iso-8859-1?q?HGvOovndIFAxbvqVcQH0ecvSJoHwnlPU0gI56akdadKJ+UseOfWHUIiCFBVW?= =?iso-8859-1?q?wm7Mjvy7CU1pvLdKVE/raRdzG+egCMF3VdgmAfcw+lWYeDQq2R932fKdbe3y?= =?iso-8859-1?q?pR3SYun9uYZyzNHgVm4run/SkQc0KXDvI35wpi96TsuxXn9jdFiUZ/AtJ0O5?= =?iso-8859-1?q?W4FDoAO4jMMs7bdhaPCNNaEtlsfyXe1ImuWC/L37kl9wmexmSnDzQDJW9Meq?= =?iso-8859-1?q?HXIrvPW+u7viD1r5El/TPouGolWZSsyAotlfNIifVWv+IAIJOlnIuv5NnNLB?= =?iso-8859-1?q?leYiQKYBFIvYmt5ADBZqRXdxoErZeII/fRU+yDVvWdsND01SG/8Jyz6aFLox?= =?iso-8859-1?q?byM+2lYU=3D?= MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 842733ed-3225-4e3f-85fb-08da4ef634e9 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jun 2022 17:40:58.2518 (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: HpC7OYiDUGJzpNcyPGZI5Q6qS/2lSg40fW0HCl+2FN8VQqZLCO7ECTUzH1pvnHrXrpaJz9oEXuqmkKkyCqKJMw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR10MB1587 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-15_05:2022-06-15,2022-06-15 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206150064 X-Proofpoint-GUID: k-lJlUFeBDCzo3tDn8goyDxPgzZ20zbE X-Proofpoint-ORIG-GUID: k-lJlUFeBDCzo3tDn8goyDxPgzZ20zbE ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1655314868; a=rsa-sha256; cv=pass; b=P09j+180JbnwV+RLUZmRhbeL2bbJvi8P6UE9myfBQwX1rl4EfIdK3whrqcUY8TvkuMAv8j lC8YG9R/Yk0BjB4QsfJhThgc5ECd8ag+BxDl8HitYj9C5TJ1xUtfOhTDM1oydF2xqmidDK Wh8b3dF+EoQ+cOxumDlqwM03uULR7HU= ARC-Authentication-Results: i=2; imf18.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=zFDclcor; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=CnKg+Ypr; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf18.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655314868; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=2gQv0Hd9LOGosE9l2qWzX9RvO5y0C348nL1ga7X3DL8=; b=clKg0CdDcYMLcfHXUMbkKV+gaFhD3mxYNG88ZuUx2PvjU/K+EKDZ7243pJ4IUWe/AwPone LD+Sz7boxZ0UDHCtbRfQQ4+Gvia5YyXeXAqDHE2M1uLWQZY4mDs7BnaYvqAgaXE94DZMzq kC515mTdvQDH8bSEZks8c+13t7L7vk8= X-Rspamd-Queue-Id: C13111C0084 X-Rspam-User: Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=zFDclcor; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=CnKg+Ypr; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf18.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: rspam06 X-Stat-Signature: ntj4mqi8b6cuyrp1wnb79bureu5xgmo6 X-HE-Tag: 1655314868-685629 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: The check for mm being null has never been needed since the only caller has always passed in current->mm. Remove the check from count_mm_mlocked_page_nr(). Signed-off-by: Liam R. Howlett Suggested-by: Lukas Bulwahn --- mm/mlock.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/mlock.c b/mm/mlock.c index 43d19a1f28eb..7032f6dd0ce1 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -531,14 +531,12 @@ static unsigned long count_mm_mlocked_page_nr(struct mm_struct *mm, unsigned long end; VMA_ITERATOR(vmi, mm, start); - if (mm == NULL) - mm = current->mm; - /* Don't overflow past ULONG_MAX */ if (unlikely(ULONG_MAX - len < start)) end = ULONG_MAX; else end = start + len; + for_each_vma_range(vmi, vma, end) { if (vma->vm_flags & VM_LOCKED) { if (start > vma->vm_start)