From nobody Tue Dec 2 00:02:44 2025 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012062.outbound.protection.outlook.com [52.101.53.62]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F114530EF62 for ; Wed, 26 Nov 2025 03:50:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764129025; cv=fail; b=tMFaSJcj4N8HWFbWvhUItaAkEViU6+20RtdtOsHe0Yw3/UlAOk5QdreUiIBOkTKizpDHut5MFYqUJeQNGCuIYXyMjOUeWORD7ukck9HONawV267rWhxOGpS+Gg8FP53iNey50KzSTHHJjfqvqfHXQDjUPxssD+tdpfK4oVZp9uA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764129025; c=relaxed/simple; bh=6uv+G5g1pnqMtlm1zBYlrY+wD23jnhgg05ppIeYKOKU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=lPnDVoJYVqU2nZOXVPbA2yZf2iqD9y6ym93okHuRJjDDv0sPEXci7gYrFerrk414agSMA/bXr57PgWxMtZU3DDXndHKXF8zRIwR0glB+pQr35y+nZDN66LAnK0eKXNiXvOxG9bed09nVD/6WbKLmb/ZNqK5DpYHX7uQksBogL74= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=GcdeXpOW; arc=fail smtp.client-ip=52.101.53.62 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="GcdeXpOW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vQfVN12VTeeZfBrC3o1DGQqyh7/m7kYJyJtO4O9/mSIG+orhIWgE9AL6wDDYmqqnkR6YHpUjZC5AYnSRePcLb7WD4XAKP5dTaokcdwcLeKvHT4SudEe9Rpn2QxNfOnHT/OR2a0zxi+HyRayiqrFyJ8mNt2UjC0dct816m4X6Pfbk+zAozcVa27CVXf5/Npx/eSNWcvtOnpycQv2DBBOFnRBlbWQ6+PvZ6G+D++cFrZTez1SiV2cknOc1TNg1ESUQU0bZpoGhebRWUVYJFC2a/r4FrLtCyUxqjCOHeKywlMDgUmto5wAv93szr60XNDQKYCZTS4rQlkt1oY2PtsAOoA== 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=Y+G66bJstCt+lztKl1UgXEHcLQ9ZTZEtKHy5ZQ8w9ek=; b=csCTQV4XtkTBdPzTgQc8UK5R2jLABHEPOFLd6YCKvOzNR3Tj/lTWu2zsQHQyFPJUBsR6Dsxhn9ftHRAb+/tBu0E4wrZaZJBb7dGMsDeaQ/h5yzgKkfQ+1FRVfK3rLPHZxzwMBoChQMEAcI7wDkUdQowyuVuHt2OUPaSoOf+bw9djTPHvrxwIprLI9QDkSUMXtONj8HIH6mNdaHAJ0V+swmTPJ8zmdFA96A1Ga6Q4dV/znIJomhYPkoVeNh0f721cQZa0mc6hzpyBfxUBp5ieVLzL5FoGUDImyByux8r0ZCJPMtGXAfo9vmeVWuKsKWgmRYxPnon/ccEiQfD1f0uxfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y+G66bJstCt+lztKl1UgXEHcLQ9ZTZEtKHy5ZQ8w9ek=; b=GcdeXpOW1M+VmVg9c0JQg4HlZg/uwJoXuOTLpVx+Oaud8jbxY4WBuubA+dr9+li0dVCuCH5ciLFVFrD5l8jbuZQDExoMZw6X2Fbbt5asDiynQD9ed5Kv65CpIxvWQK3kK+kTbtzfas5eco2JWd3IsYfbJQUF5iH2HmH1X8f99UPq8RYUnDkCL2ZR7gYCanRVnjNVJpBbWzL5FTAomyhZP+7Sn43ZMVgdHcCmMzINTso9hWth5o+PIMitjpFJ0tLLG2ga01psFnqWcV0T+11yHIEsfif7akcFL1WYLhhJrEMw6oBoDuUR8xQcMbyxFx10wmDYELKeAHlJRKjQvXp5PA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by LV9PR12MB9782.namprd12.prod.outlook.com (2603:10b6:408:2f2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.11; Wed, 26 Nov 2025 03:50:19 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%5]) with mapi id 15.20.9366.009; Wed, 26 Nov 2025 03:50:19 +0000 From: Zi Yan To: David Hildenbrand , Lorenzo Stoakes Cc: Andrew Morton , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Miaohe Lin , Naoya Horiguchi , Wei Yang , Balbir Singh , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/4] mm/huge_memory: fix folio split stats counting Date: Tue, 25 Nov 2025 22:50:08 -0500 Message-ID: <20251126035008.1919461-5-ziy@nvidia.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251126035008.1919461-1-ziy@nvidia.com> References: <20251126035008.1919461-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL0PR05CA0025.namprd05.prod.outlook.com (2603:10b6:208:91::35) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|LV9PR12MB9782:EE_ X-MS-Office365-Filtering-Correlation-Id: ee06f07c-8520-49a5-00b8-08de2c9eeb22 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IDeSUwJ0RANnwmhjgBYr5X2h+EcDIV0OX5otm3jr0sR/3SwdlpAVPlaXoTnY?= =?us-ascii?Q?J5mxt37gkLE31+ABOPQXrIoNdYHaKJalX/ga0V9VXyYriF3kpTUtwQIzqwSc?= =?us-ascii?Q?U5aOhMFKrzqvxZnqPGvWdxfMHDtTfzC/gEXegkDZ1UVnGLrE0EqK6jwOxY0R?= =?us-ascii?Q?3DZa1KiLrMnLM3CumsSOQeYOk9MlIV+idcT0QY6NGlLFaXgN0lBXpqW5/y9J?= =?us-ascii?Q?eH65txO9J9acJI3uZL1wXukNcmLmX3lPCqaule+PsukuBOHcw+tjhzRT9Uo5?= =?us-ascii?Q?itI8JBM2HivwzOqeV0IRC8GIV0S1S5361zfgUnPeOpDFzOz9fPNWDv2NNiET?= =?us-ascii?Q?l3jbB8Y6xtoUWtggk2+cuRsUoel0ZwMD/o1EdJQ353NG2wBU1BO8SLfNM/kf?= =?us-ascii?Q?tdGQOkX5AiY+VW1hd8rS97neqtaWVBgDBDwJj92WNyzG2KFddILZHhKHUHK4?= =?us-ascii?Q?RTTcyY+KivHQ1K9gN8B170uhMQj+7lsNqBsvK/j3HJQ7A/qhCqvwQ0yibUI2?= =?us-ascii?Q?A1rTaz3f/oNcF6Vjj239uwA8fdlDaSa9ejOzrL0rDt/6j0zihDTyZBCwmC3H?= =?us-ascii?Q?atDGp8li4W/nny+1h2Vstk7rXQgVfihzF2BhxjhD7AYQqHhPzyaAT00hNnXz?= =?us-ascii?Q?991jMcKRUv33ZKJ36GFFa5uFXlqlxEYzOVceSJ9Q29MveuPa68XSIzqgTSAN?= =?us-ascii?Q?2Z8T1wNTLd9ONKy4ZSSMaYnyty5vLNwpfUVKEKzn8TAsS870kdUEAI7FCryu?= =?us-ascii?Q?KLfhji4UR3e02CQn/KdLmpKh455z6mbhENO4LQQ7iZaRQ0MXECmU5j5s5/Db?= =?us-ascii?Q?G15IH4rk27MScdfnTrHrxODgmsC3zo/JzCbFuzLlfRP20mrlT4v0WygGUNU+?= =?us-ascii?Q?g4TNb/PpLDIrY4wA+eqyfVhGmFRC4rv3eCXPkZI7l/2NNaL7JBNyasU7jV7s?= =?us-ascii?Q?EY0uBMCy7Hryj3rA+TnEASjxS1l3GYzhFULScVvFZLF4W5oYnRWA8+Cz1CIV?= =?us-ascii?Q?D+6Fm8iisuNkRDT4GMLffijp5NF5qWUoLFYfViAnQB5bkBbJzWZ0TPPYgE6U?= =?us-ascii?Q?sKTStxcobI8+Lgi9sfBXPvmn/99Iwh7ITJMS0g6PPk07stunlFL23hvBzpE9?= =?us-ascii?Q?aT8q7xp39EP+VcJYB4BZPoqvG8oBwuAqmDxHXUwnZpm42yJX+JdnV1CUaY1u?= =?us-ascii?Q?O9vH4mNdpl+bjKqkB7X7bAZ2kmdU2CxFcOqdfdkd34/2SbEsfWOOmvGAf91c?= =?us-ascii?Q?jfnz2czy4QJ+IP4C1XaAHEw5KGuYdJ94qlvYOMNdiYluctmDf2PBNUJFR+6Y?= =?us-ascii?Q?1xWzPNFMp6fSBaZKahclMksF++aa2Kx9MVcE1aKmkohWzob2XdDN9bhFYJlV?= =?us-ascii?Q?7KKMCpDWdNL6VIqVjfS9T39Fhb7I9wsbTuZym0fswj/HRHZiJ+5F+JjMYSyu?= =?us-ascii?Q?EPJJs59lB77lC9zvv3wvjkKGI27glyES?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR12MB9473.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xb5yjV842NeC3MsKQTxlTovK1b5XDnndTQZx3EN6jH28JiJtDbdxpRODpTaH?= =?us-ascii?Q?Lfuj+G3wQGhHNtsP22WwoxH9VzcX1QiJeHa/1f7hruCMQ/YtCBY4o2SeLqV2?= =?us-ascii?Q?+cTpzstab79En/4mCPdSlCZazMr2T+MJiL0TxewESsPLriPgm3a8cNcGsYyg?= =?us-ascii?Q?mt/As5PyBcApP+u6W7rVZkzwCP9QJCJ+mFBAxzDEhvQQfTbfE0XfDg5CqPSy?= =?us-ascii?Q?Yoi+9ern1B0NqurdqPrwclXwczbkY+uA5ykM0qh5HcaPjXrw72ByjWSpOoIm?= =?us-ascii?Q?c2+WhzoQM81YVzbHUE3it49WA0XU1c8mFdk70NnrpsyS7GzW71zkWhSkFV0w?= =?us-ascii?Q?M/fqd0s8x2rY4N1m9HTUW4sMtQ6+0qAEkpPim1XTIZtKPfSeMvh//GLTqrZF?= =?us-ascii?Q?BUMy5prjFRI0ZGXP70CMYMMK5RwYCmQX4/YiC1ACLY+HefSF5p/JTOxDNgCr?= =?us-ascii?Q?FrlwzEmGf7P7yUhFikjUOq1fL6GZLknXEULvIseDlz3AfUaUxJZOUcRn0XnU?= =?us-ascii?Q?svIRLqEnys637zRQSW5YStabSfqt1Bmbh3aA5+PcFCgeOmSjHmQ5ixKIfx3q?= =?us-ascii?Q?DWhhRl1BP85boxJlC94ewk1Sbj5emZ1iMfstY7t0OK5wolDfuHUWor5Bne6b?= =?us-ascii?Q?8N+ZOdD1Lrz0IQzJmAubJ3xp5d2W7TchDwMioKk4Iox0wdtIixGORvDqMI5+?= =?us-ascii?Q?NTtNcpFlq9BeTz9NH0dWdfERO1eY6FAPZr0ZGOy14m0HAburSFiXSFzo9fbL?= =?us-ascii?Q?Fbj10fxllk/BgTAZPJGFUfzUKOKCgxZx2Aw9UfOzA7uexhAKkuETbnHjBEBj?= =?us-ascii?Q?1/K2rBLc2M0OlS8qvZt1vtGiMxP7bZvE/x1r//xK23rLqK4+XaxQpKdMC8oS?= =?us-ascii?Q?YBO7mNywE+b21Ncp4/pAcScH/vJnoJxBEQef31QdYCvJ14/s7yrMT09MSLIv?= =?us-ascii?Q?2uslUjkuy0JpHVYdw14jEcOJmNL6cbzlXzyXm/SESUTW3XbPzZFFShNh+KbD?= =?us-ascii?Q?wPeAd98hR7awVL755Ti/Mwpe1skY+FsNAyBGZxzgG8Om68xV9SAeP1OQztW4?= =?us-ascii?Q?7uphglFKOsPh3lUB5aBnMKL2wquGUtHVjmGw/cU75xpx7AYLSh+u0WPjup7H?= =?us-ascii?Q?JyK44GUyWdtHG8gRkQ+Sz8LQh06RyBKEB7TYRutiO6KgG3TL6jtH1ELrhuc3?= =?us-ascii?Q?xlg8hIaxapyuJbqfpWtjSYvi6xbXqQCIoA54yE/6FdrBCE6ZkbzSLeeMHR8w?= =?us-ascii?Q?vHp5afi18idAg/5RgP1H7uNDURew3lVCLvkIRTU9axeeB1Q3ksJYnxtVxkRM?= =?us-ascii?Q?TXKn1n21TEcQ+x19k0BttWRjaQLROFzOaW/Bm74xJllGOSHiGUuFWYZbmM+V?= =?us-ascii?Q?3YoSktQ8Yl2VN+Pn5av+wxS+I3zmEcylTYMzt66sqj/+jwihatlpOoG2MPW/?= =?us-ascii?Q?eorAS+Nj6Jb5aVYuOwrq5ro7pSp+UUnDMSQ9yGpYGhQFcy0d6ml6obpPUFiR?= =?us-ascii?Q?WHolIsDx2orF8zC0IGHLWypYZCGuBVBGXouEsMSeklF76AVtA0hYFMrxkPLu?= =?us-ascii?Q?oGmQUuA1I4TS4YKehXC8QgOlQHbjzDwN6tS4XHQo?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee06f07c-8520-49a5-00b8-08de2c9eeb22 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Nov 2025 03:50:19.5459 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fupJ9/3meQRK9ihrUJJXJAcFY37uxVt4Y95lV1qdrwXNDvvd4BzNqJyWHMFt7oxf X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV9PR12MB9782 Content-Type: text/plain; charset="utf-8" The "return " statements for error checks at the beginning of __folio_split() skip necessary count_vm_event() and count_mthp_stat() at the end of the function. Fix these by replacing them with "ret =3D ; goto out;". Signed-off-by: Zi Yan Reviewed-by: Wei Yang Reviewed-by: Lorenzo Stoakes Acked-by: David Hildenbrand (Red Hat) --- mm/huge_memory.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 3d2396bf5763..9e984608da81 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3944,16 +3944,20 @@ static int __folio_split(struct folio *folio, unsig= ned int new_order, VM_WARN_ON_ONCE_FOLIO(!folio_test_locked(folio), folio); VM_WARN_ON_ONCE_FOLIO(!folio_test_large(folio), folio); =20 - if (folio !=3D page_folio(split_at) || folio !=3D page_folio(lock_at)) - return -EINVAL; + if (folio !=3D page_folio(split_at) || folio !=3D page_folio(lock_at)) { + ret =3D -EINVAL; + goto out; + } =20 - if (new_order >=3D old_order) - return -EINVAL; + if (new_order >=3D old_order) { + ret =3D -EINVAL; + goto out; + } =20 ret =3D folio_check_splittable(folio, new_order, split_type); if (ret) { VM_WARN_ONCE(ret =3D=3D -EINVAL, "Tried to split an unsplittable folio"); - return ret; + goto out; } =20 if (is_anon) { --=20 2.51.0