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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0FACC3DA6D for ; Fri, 23 May 2025 09:15:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F6FB6B00BA; Fri, 23 May 2025 05:15:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1CEE56B00BD; Fri, 23 May 2025 05:15:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BDFD6B00BF; Fri, 23 May 2025 05:15:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E1C416B00BA for ; Fri, 23 May 2025 05:15:39 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 872CDE000B for ; Fri, 23 May 2025 09:15:39 +0000 (UTC) X-FDA: 83473614798.22.ED487B3 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2077.outbound.protection.outlook.com [40.107.243.77]) by imf09.hostedemail.com (Postfix) with ESMTP id 91EDE140005 for ; Fri, 23 May 2025 09:15:36 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b="Nn/cMEiS"; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf09.hostedemail.com: domain of shivankg@amd.com designates 40.107.243.77 as permitted sender) smtp.mailfrom=shivankg@amd.com; dmarc=pass (policy=quarantine) header.from=amd.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747991736; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=P5GX/xuXunh5Q4HPToTUaeRSaL7/PVdP2ElwNAMU9/w=; b=gRwZUwKhJjc6Dd1on4KYzypJj4EIoGTRaAU/wlFQ6dXlj8Br+Z3qrIpa9ZU3svnrLcjkzH GQ2twUELrOI5fnXLUlPwKcs2eG9FFPCWFq1WkbJPGBJPORu7gtnVr/+CmR2RTc4VwrZgt1 j2HWzjjVb9UMn7whAR08/y6oNsFi7ro= ARC-Authentication-Results: i=2; imf09.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b="Nn/cMEiS"; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf09.hostedemail.com: domain of shivankg@amd.com designates 40.107.243.77 as permitted sender) smtp.mailfrom=shivankg@amd.com; dmarc=pass (policy=quarantine) header.from=amd.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1747991736; a=rsa-sha256; cv=pass; b=gv9ECBYS8uwhsDWA/yHp0nm6eTMLoS3gjhj06kOnJBsmVjEvUJQC33RvVL+5ponwcgp3Wp hlKX9+SQfDIU8+FfF39ThRkpvEfPrIQbv/Ua0myCnxSwGYT+qoYZpMA2UUYt3qS/gjYD7G be7MTUcW7XZT3YeaBc2jcvvn6wS08BI= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PXAfOquPdMAKJ8wCeJ6Oz0xRTbg2oSwhfMv6M3XyVcPjNlBu1k8OxOa9JlY27H3/QONCK1vwtJtox7Vo5Xvpb+xfoJS3sRk5ZY4sUAKtVfVftf+TBFv20dfOywR6DrAJu2hnDadNZPb6bY7OpcIqv10Ir3UchZiwAwC/cRHlBK+TVma+iQLZyfR3T6x9g9FkTVYTRByqkWPQk2BxMaNnMD/9uhOVOkFjlTy0PdqcMJU719CrVIenHGKDM2FAfq2ylCfBr5Z3zj2aZwL1vrWocKuHzihIHqjp8OS2o4GSgGO2ieiIGIaHkelOg+SmNt8707oggDV6IXP9immo7dFjcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=P5GX/xuXunh5Q4HPToTUaeRSaL7/PVdP2ElwNAMU9/w=; b=s+5L2AadXKT9DQ635e/k4HwG1+WUlx2tvEXsxNdn74GCnnTnUpCz9EiS396kUm6Xm3aPyitIcNrrQ6xrTIn9FIu8RGInlOW66AX4yoO5h+ecHVkZyVcBBTf+smMVG1st4oleDWHtT7OuFtyjRCYdHlPVMdTD0NBqut3JzBfcXn8ZZRc3IYTcRqaJ9rGvXlKx6wzMdK5evTImWwcMdo+0Spr9QUMaZofKfvClMnV/VGVjvDauyOoRrrgIoQJGBo1q+dsPEPPs486jKEle3f9EN2wkHJowRJjiDJpNQDi0xtD7BmUugMqqvWk3B6S3Fd3HtwOIdQMychSEHsVXpm2leA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P5GX/xuXunh5Q4HPToTUaeRSaL7/PVdP2ElwNAMU9/w=; b=Nn/cMEiSWz8V3G4yBCsllr6jEu/9QJFLTQWmgG4ivSe84QMVphKaJNgFR00Nntn647PCpKixiC+VyQ/inkPxT/65NOTFfoYvNLbuzEYwYTN8aLpAhTSydgo4avdSbFjOCKAtnhsOxkbOCAWNeUIEL0dv0aAeV9E/8WLBTNVdETE= Received: from BN7PR06CA0046.namprd06.prod.outlook.com (2603:10b6:408:34::23) by IA1PR12MB8495.namprd12.prod.outlook.com (2603:10b6:208:44d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.21; Fri, 23 May 2025 09:15:33 +0000 Received: from BN1PEPF0000468B.namprd05.prod.outlook.com (2603:10b6:408:34:cafe::f0) by BN7PR06CA0046.outlook.office365.com (2603:10b6:408:34::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.30 via Frontend Transport; Fri, 23 May 2025 09:15:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF0000468B.mail.protection.outlook.com (10.167.243.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Fri, 23 May 2025 09:15:32 +0000 Received: from kaveri.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 23 May 2025 04:15:28 -0500 From: Shivank Garg To: , , , CC: , , , , , , , , , Subject: [PATCH V2 1/2] mm/khugepaged: clean up refcount check using folio_expected_ref_count() Date: Fri, 23 May 2025 09:14:33 +0000 Message-ID: <20250523091432.17588-1-shivankg@amd.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF0000468B:EE_|IA1PR12MB8495:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c3411fb-5dce-42d3-ce08-08dd99da5ed3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vVhVzXzIc1PhsjKKx/BmTyGUptVyT2sWD+KXNqm6PXiqZiDKYbzIQE/Mw2rA?= =?us-ascii?Q?7UJ+oZ7ZE2TTcX9vz27Qwbro8lDaHX6Fj0PemKLq6xSgXmYmNA5EbfF6Kxy+?= =?us-ascii?Q?Sahid1WUGU4WCo5eEENDX79kC7u2HirCJtrLAI0ucUAt9IjI+aepBJmBx93z?= =?us-ascii?Q?0Io4vjvKz9e5ENQt+MqOEKKCcXonFnbjOs9NO3oOYUYOrlJebsXKqWRNXGIm?= =?us-ascii?Q?4JwJAKZAeFxwMzUOxSHXRISRWCWBi3DTSQiWIqxoYnpyJ/tD9gJvOWFEd26s?= =?us-ascii?Q?k9vK3yQlZDXK+tyI5TWE3fvqT4aqwgNMeJD2c7540wnI87z5/iZklYkk5Co9?= =?us-ascii?Q?UyzxscxiqlLkbMC0ZUV2La0zxwtAFnmqvsQbUyssDNjARjDrH2z1RoF9STyq?= =?us-ascii?Q?z/Y8AGyiBDbnSqgJ01/YqXPe/zCglNUKOnV/Deh6rYe3Tb0CVFsbuVg5vhr/?= =?us-ascii?Q?Qy859txeYkJU/M6SJP1ojN6gOZubeJwgjfg+6IPPwG/PeanS20az83icCZ6Z?= =?us-ascii?Q?68DFqlR0W5NVSytT4R/qL5V1BsOHH+BmCipGaV5/jJ/nBlTzDhlqd7S6aAfc?= =?us-ascii?Q?Q2rlUmBgRPaZ1qrWNFA+QlqKm3r32/y6Qpj8ImmmlN51lEu/iS+P8r82BWV4?= =?us-ascii?Q?avMWr88rnFjBeL9siDw0e9BeaKJCj04y3qF35SVaatbDAa2P4G/dENdGEDsx?= =?us-ascii?Q?Oe4coU++jmPDddgiEo/hLcj5MGtDnStdnuwYvs4z0V07hEnDwjxsEHOB+JIc?= =?us-ascii?Q?Hc5HlHOr4ZMfIYzq408/dOC3a/mO9VD2SCz1eE+KDLS7QPeymCmBAJRTg+i+?= =?us-ascii?Q?Jz9h3Dm8JIGbz7hTXiC/N5ANZynei0xU5GiUy3seMO+/JQq7RguGRip2zHSN?= =?us-ascii?Q?hPEm3E35fUp4AtDCCT8w2jn6v21Bf7itmXSGfOWI2TTTEapMe6Ao/+vrCu/k?= =?us-ascii?Q?EjatAPkNN74OlbsEbIamGlR7gu2kPrLOKucrAqkxv8K0bQ8p4GA4ExVqGvmI?= =?us-ascii?Q?YJ1a9nSKzA43tFDvIxZhOuNuEshKJY63ygSRu9gDsrB0BNGC0Cut9ep+PnTQ?= =?us-ascii?Q?k+PIbfFJeR1KWXaTqSUVLNuna/BXOnSiVCnVLBbNwRb0VwFgGPq9d04t7WH/?= =?us-ascii?Q?O0ii745cOsWlE/RyBEmMDzFGohK48U/Spv1S1VMurXazgzHhMsUuewXYvXwJ?= =?us-ascii?Q?3MObOMdKGMVDlV4wDZ4TJHUkOnzd9MxkvLUv17b16wK0jhZ95OBqv93uCTXj?= =?us-ascii?Q?Lesi1IhFgGXa4RhiNwEnvyBoPxMUJKITHRug8oxp91jq7gJMZq2mCAKvGLTR?= =?us-ascii?Q?2YsoH1Gz1cIElosQZioFZnUzZO5xvFgr9iMHteCDfCtMlUQ7qPaJUZAt346v?= =?us-ascii?Q?zKzeMWEOFmMXjcaSv2pNmpfBiAwnbo22sYqDGLnw2t0RYJxm+oG5XwiYcbsi?= =?us-ascii?Q?gcwgFqJ0ymZntyqUu/bJpEx+9pEb+vuK4/2UWXrFPqhdV8BDnXaA462AQXMO?= =?us-ascii?Q?8DjhvIRh76JTmFA1R3ajLHe8Sesadvyo6tSj?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2025 09:15:32.8900 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c3411fb-5dce-42d3-ce08-08dd99da5ed3 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF0000468B.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8495 X-Rspam-User: X-Stat-Signature: mkmcp3cwf3ggoz9f7rs696abopmsuz49 X-Rspamd-Queue-Id: 91EDE140005 X-Rspamd-Server: rspam11 X-HE-Tag: 1747991736-923105 X-HE-Meta: U2FsdGVkX18Erg+dl5bqeKTt6sVL4ychPI3rEw0Urq5rWXAcLjh9dL+4l9ZoU0+qNcb6OUvkRhODavIZ0hmVJzKLhTu7IB88lZP4FDXqEsTKWZznl76aPjjOKYFzo7JOJuIrxSt8m6tigzj8pokFBFiGbgGVlAUK6S4CGioJsA8HU1YF4Cl6gztVUEuGQLHcsgdkilwL05Kwg07ZK5kzRtPVPDfYeVC0wce96TRJjhVpOHl1bV3+GhojUA8V+8TTAdN3EkfZGy4s6u0JodsApuBFH8zgM6MscJgpFP/mK9+0cSBaOr9UAfQO0tOZxEJnl+MzDa5J2E5MUXdCnwvpN07+xbIX19fTTAKRlUyym1JrGSy8NKtfQbGlaNva4JgoZTJcofOUNEu1s8DtEEIqjSIOiJjIYBhUkl/ju+1q5cOcMS+YaKFfCX8V/DeWGgh/ZkbpOFZcvESrLLclEFMI+lCnXOwug38elnGuh/E/9BDHUjGuEi5PNviSKLKdiUJMVTg/oV16yfgxKfbpo0q34PQXNzF1SKCbQjEfxiolcAS1PX06d7HKOAwgoN1QN0gNoSTiMeOSY9LwZMoSnsOF3zu0srM9oPN9qDg8K6oowPRm1uQN3senliJvwRx/nqzRi1zi8hB3qMHKaGVzXwUJ59+LktvB21aozt2bQyiGKp29fnlhkLybOpuinkZbZXkxj2ONW/TthMiv/PepzWDg8/lLUPMQeHEOimH5mfabGoQY6nUmzxy07bTqz2PbxjfcB5OWDUdepo8c7b/j3VCj0ab9xOTPZZBs9kXdR5LSEfO5GT4U0SewGG05ridSKEOmv71y/hu0Ai5W4q8WIfmk+L/2+RxfL4oE84gyVPZLPEt54AYcwkqYa/9BJ1nw/n/PLKFEESjkmnXMdvtjigyGGIEyhPuFbWMEGmWzqZDClPOF2OwTL1SbGho4A+75Y4nHUvxJ3CC1SRefyt33HLR O/iY/5ym 9Pya0YQmZx4eS8HV7wrfItbZ49/4r2ObEw7NKFh61d3R8FE6iP7xptLPa4VPLaZrCRx6crhqiEYduLf7j2dnra0gLzfNINKsFtgfRvFdeG1hpHhnGGlPorAE9PaIJaXUYawiLTlsgSPl9/d2LuF10ZcGePKOYaEe6aOdVeDe7UvS8QAp4JYiWKVuhSPIK2o56uWeQWjk5sXndWZ4HZYSsxRmQj7cDrlf2NYhc0LTITMlY19OYTtHdRXhfwO4HB8Nop5+2Bv2mnOnf1P65AnYEKKnkXKxyc2OIkc77NsrN/Hm1tx1L5hnXyX/p/Jxi9Lt6Uz1tiI0aci6LJSLjIGLIBNfvm32jCZUvptwpfu6D8720/UHaeGZIwBVUqk9zCX4jk8pF9DCP5A2KJlWSWG76NODoq3CasZaw9kffKhSuzV7Bg1kpSjXt1GsxRtW2PT1TbskCnMx7RlyTEy7SchZCaGIShAfHa5mdMRNJjYlgw+quk4f7rA0J0/piszGrQK2amfowF7Acn6xONxPmwaZfasmGJL4G31nziCPz+1JrjV6phGsHtG35imSsjz24RwmOU//U5nipkCE6KYQjvN1bTswZ17zcQRfu7+SQAuabuWfaxFA= 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: List-Subscribe: List-Unsubscribe: Use folio_expected_ref_count() instead of open-coded logic in is_refcount_suitable(). This avoids code duplication and improves clarity. Drop is_refcount_suitable() as it is no longer needed. Suggested-by: David Hildenbrand Signed-off-by: Shivank Garg --- mm/khugepaged.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index cc945c6ab3bd..19aa4142bb99 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -548,19 +548,6 @@ static void release_pte_pages(pte_t *pte, pte_t *_pte, } } -static bool is_refcount_suitable(struct folio *folio) -{ - int expected_refcount = folio_mapcount(folio); - - if (!folio_test_anon(folio) || folio_test_swapcache(folio)) - expected_refcount += folio_nr_pages(folio); - - if (folio_test_private(folio)) - expected_refcount++; - - return folio_ref_count(folio) == expected_refcount; -} - static int __collapse_huge_page_isolate(struct vm_area_struct *vma, unsigned long address, pte_t *pte, @@ -652,7 +639,7 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, * but not from this process. The other process cannot write to * the page, only trigger CoW. */ - if (!is_refcount_suitable(folio)) { + if (folio_expected_ref_count(folio) != folio_ref_count(folio)) { folio_unlock(folio); result = SCAN_PAGE_COUNT; goto out; @@ -1402,7 +1389,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, * has excessive GUP pins (i.e. 512). Anyway the same check * will be done again later the risk seems low. */ - if (!is_refcount_suitable(folio)) { + if (folio_expected_ref_count(folio) != folio_ref_count(folio)) { result = SCAN_PAGE_COUNT; goto out_unmap; } @@ -2320,7 +2307,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, break; } - if (!is_refcount_suitable(folio)) { + if (folio_expected_ref_count(folio) != folio_ref_count(folio)) { result = SCAN_PAGE_COUNT; break; } -- 2.34.1