From patchwork Sat Oct 12 01:17:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 13833389 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 BC6C5D0EE1C for ; Sat, 12 Oct 2024 01:17:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA7386B00A9; Fri, 11 Oct 2024 21:17:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C56E46B00AB; Fri, 11 Oct 2024 21:17:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD1DB6B00AC; Fri, 11 Oct 2024 21:17:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 90FBA6B00A9 for ; Fri, 11 Oct 2024 21:17:24 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 73C3A1205FA for ; Sat, 12 Oct 2024 01:17:19 +0000 (UTC) X-FDA: 82663187166.14.843F94B Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11022078.outbound.protection.outlook.com [52.101.43.78]) by imf29.hostedemail.com (Postfix) with ESMTP id 27DF712000A for ; Sat, 12 Oct 2024 01:17:16 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=os.amperecomputing.com header.s=selector2 header.b=SvliBjEM; spf=pass (imf29.hostedemail.com: domain of yang@os.amperecomputing.com designates 52.101.43.78 as permitted sender) smtp.mailfrom=yang@os.amperecomputing.com; dmarc=pass (policy=quarantine) header.from=amperecomputing.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1728695770; a=rsa-sha256; cv=pass; b=rRupYQJ3mI6i78T4HHPgnhyrF4+TT1LtSr4d7Igg8YtCnjjlwNCRgkdbVnFMBSQRS5YTPc 5H2oVkbslAat+xvszCj3DoTK0L4JM+WX2zQOMfaOOTzgMlIjPDA9S/3XVxOtb4BsXMu5BI wMDeXfvSqC8xABEuPPLh3nAOpfD/42I= ARC-Authentication-Results: i=2; imf29.hostedemail.com; dkim=pass header.d=os.amperecomputing.com header.s=selector2 header.b=SvliBjEM; spf=pass (imf29.hostedemail.com: domain of yang@os.amperecomputing.com designates 52.101.43.78 as permitted sender) smtp.mailfrom=yang@os.amperecomputing.com; dmarc=pass (policy=quarantine) header.from=amperecomputing.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728695770; 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=4X0o8iGl1l9Z7eG/Hruc66iObLqhFzBNEY4JGlQn7xA=; b=ZuEcQgnNol3pMNoduYtMEu1OWaT1s7o/Sv+060HYSagt+hvK4+/DEU8LzzQBBSYUgkah/i Bos/Wq3ImhdPlgUk9rGV+CT8NvxtBETSBgPGpEoVW+dsEpAdMm7TcToUrqXZ6+6+FgAqgv S8nC4f00Ftt07vtAFOFhRs5OfI9f7IE= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Z8fIkXNd+HmMDDM5pRhaBxhHr4f0osMWhaJuCUls1y9g3zg6C0AtfFKKFKhWkrbQhgSlkTpvsdm+i+udn4meCbAxluCHqUDeJcV67zGZK0OzT00Vk5XjJArE1twGBo80pQMOoPeFCSFTwKQQNHwv/Yxt//TiuUDfM9HukSiO+VbN2vEfe8lnF48T1pzPANORYoKjM5YdluSS9py17Od3lJSdnoiIGakUe5QCJpm2zKNbnXCzIGmXOjzsYRKfbKuHwCqQZpcILYeqgxPw4T8WeC6d0ev+heLXABkiBuRDdWPhiLh/KCICcO9Yxzj+siRpukBGxxFJ7lc7Vm2lDZ0uhw== 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=4X0o8iGl1l9Z7eG/Hruc66iObLqhFzBNEY4JGlQn7xA=; b=qvMqzrmCwGgqwdmc2wpe+GbZpDDGSjG7GBreODBU9Ix6XkvrKSR7EEwtxJMR3z29mABxp5VmGJKDcARUUPlzsOht1PGEPysMLlIGvjYhlpyinbpXYPKUZrUunek4NV4yialLnIgobM40HI2uVk4jn2L8Dzh77OhrMsZ89g+qoSNv+Xa3ZF2M0ycsCD70Yzr07smONtrHquf59cRxTTdw/46JAZVF1Q6Pwlz2AWKOi/fu0p/SLl/ovAzvoH7pWzB4exWxNomtmGwvjly3mHRfp6Wk8pWJSqZr00L+n6oqbE23FT4mAT1MUQ/IWYqSmw3/v2Tgr5ZZr5J2LHrdGj736g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4X0o8iGl1l9Z7eG/Hruc66iObLqhFzBNEY4JGlQn7xA=; b=SvliBjEM9pVfh3H51nGg7nRSSPvVsUeCn2nSB30tYWP1B8lh5TOCYhot325DYq8NL8iFHbL61Qe118E9efrEhxsd5jpe2Rq5ebgm23wLcDmswFMiXgPHnInuLatA3OahdaVl5U2WmchtgfM1FucQjSejhmkJG1beITbHLhAUFTM= Received: from CH0PR01MB6873.prod.exchangelabs.com (2603:10b6:610:112::22) by SA3PR01MB8040.prod.exchangelabs.com (2603:10b6:806:313::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.34; Sat, 12 Oct 2024 01:17:17 +0000 Received: from CH0PR01MB6873.prod.exchangelabs.com ([fe80::3850:9112:f3bf:6460]) by CH0PR01MB6873.prod.exchangelabs.com ([fe80::3850:9112:f3bf:6460%5]) with mapi id 15.20.7982.033; Sat, 12 Oct 2024 01:17:16 +0000 From: Yang Shi To: gautammenghani201@gmail.com, rostedt@goodmis.org, akpm@linux-foundation.org Cc: yang@os.amperecomputing.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: khugepaged: fix the arguments order in khugepaged_collapse_file trace point Date: Fri, 11 Oct 2024 18:17:02 -0700 Message-ID: <20241012011702.1084846-1-yang@os.amperecomputing.com> X-Mailer: git-send-email 2.41.0 X-ClientProxiedBy: CH0PR03CA0438.namprd03.prod.outlook.com (2603:10b6:610:10e::14) To CH0PR01MB6873.prod.exchangelabs.com (2603:10b6:610:112::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR01MB6873:EE_|SA3PR01MB8040:EE_ X-MS-Office365-Filtering-Correlation-Id: db866fc9-163a-4fd0-9877-08dcea5b9c1d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: DVHfsJxVW7vAoyncAFFeaRgUrTU0OBJYlgWtp6srwFV1cMUG63MtJw9FRW2YVrFD64dOVy1ZZosxjyD+pxxbMjH5+IBdeHtKp+4swYkZ+wjugFnHqpzUQi4Af+87q14wDxdCtC3e7m6m3WpcSrInh00gU10g6kSuKtUN8iZ/uMKrqxhwRKzRFodPXuxnMiQu/ScNgOi2XGGBywxtf8vbcTK6/mEehJfanNT4yHDx1446aY6sayKWbn4IlCmPCpv1zzjyndFtMdBcrWlFKpWQCwmHHNejU5KNGroMb5pwFeuU/Aygi2eNcyrnbnLncyMURMWtg/P/yOUtI+7MVQ9oN2cV7zKwTP/cgYb5lA/JHy1NlQ0FMP/juf4MFwcas8Uv7OeFGK3ZzTt3s/fCJNwc2HfWiWVFwEowEu8tk++bq1WIGl7ZBuNcZ0lRsw/PCalEfCp26YNFtpyXLlpVASV1iO4U9s0UHzVSexf28f3nIG1v0OUjDBUmoiAdcbt6Yl3c+I0fdSAywClZDocQ4t+h2mK92W7pBfZ5hdor4U3H5wiMGpV2gT5FmlJv+KqOCWnQsY0QeYsNaO5ZHLIcZRD2tN9QRmGk28y+6GCZ6oxNJxFRymhn3iyPc96eUFpZKZpkLgmaQe3tSWPuqLhHhOE0dwxtU/rxExufYbppMXKAjdGF894cVVdG0UfbSsDxgbDLvK9O+NOD5VTlqBKRtVT7uPOENZJbWTt7jMAd5m8jvjnx6Srnd5rJxVLlfPyeI+GxvKs7QAxrxRMyXw4gfhk4IgRdoSixF4WEk/WPtUAWiGWbvHd62QF4HTTJpH9q5AukPIFc5YH1CPNeK0l+InQiz92MXmKLjGyJcjbg7OHz/6zqR3qZSpeqg3UWvAX0hS8zK/vuRmoYwVxUqseSbzOT/5J0Zy6rXylL2VuRcr/N9BRGQ13THkgdC12XTVjcX/IbbRjhN2js5hcgHoSb8AUFtHgswN9l3kRfNAAlXVN6hQfXn9GashWdnywCTS8+GiH/TiH0XVX2uYgUXuJaLRXMXzl49jWzLgtBrWIkxr3VxpPbrYw2IKk/vuSX2Dgesh8gVQpltkz30xutVbGlufIBOT3VPneAgAujV+o5UQBL92qT5gvyfsqep7G6NMcgFQWjFLuHPTS7hFusG66yR+ixqPY+cl7Nbml7xb73tyY4G8jQcuoDnELlU7Jv3vmvGSy0ftCcYL8SMRuGpEOtfRaXz4HthEHFx7Kg7JNiUWfbS+/3JcaAE6XEwsZg9YzWnSlAUEuDNdnfVcuE7IlVHXWhVjTfcWAGpv2pX9YwOaQqr5Og1IBLHTojj6ZKmkerjjpHJFAPhB1m6N7qaRZVjaU1vQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR01MB6873.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7v5czzLiogTYFxVer4a1MnhCxc74nEtfl2beD9dd1H6PhvRt/qwwDWa1+Eh0uYvboehu7fwOCavAHMhFXF/8yQe4YC0C3/hqZlqCwDo/7nklw7OFYD6CGYcwvcwI2fp0EhNnrnMx045T3i3RJeFQH9QyTRXY1J75sS+gVichg5dfaXz24Zq2X4QyXSTYjftAvH22FYpAQ38G6L0kxpHgI9HIq0CcLkbUjy0G1R16yQsveiYWuUn2CLh0hil9BSi89Dre4gENn5p+nWx79gNekSveM6IftdMmZHa/3/qWabwB9lRfnFsfO67EpiQeN7pPnmpxDfMVpQXHMkCO6RcEBX5emd7VixFqfuYm6AGt7oL5T/Vm+bI+KoHsFOqTZu3BpnugBI/agcVl7x/i4jxBq0U/CcprbMIY8qhvk6YYmr670uGk5+s/vsqQXgbYdceJBMjr7vPIYJRcpOAZulPnJo66mFSm4HXEtDGjg/IUqeow6vTPtTnJ9oJPmPzAUGnEBrQVveXQ19VHk5EvoXIo0ABkALhC1qCc5jvHYmRVwQNuMu8s2QJl+BhatJI0mcBO5s5FlcU1As3TpTnRrCvkpB0LX35Nb/E+aHJrHR++eVGsF6o0NoGO36rUwKgqU0MXdgibT20QerX6YkBj9C47K1niRltvKNmnCpjtdgmAbsscPUoEkJtY0rzucUS9blkAsGdLbgiSOJRWb2MowaTELF8ZC+IZLPdupEndukP9SgXsKZdHIecp3BOAnnohaXL20tH0izfBYGdtssnTMdnBnJYZlx8FaA/dPov1ghk4R0XfSy00EV2dNCbIifDzKjXvMsB1pv4rDIx+uwt2NTNx77gIhMQ8qljQqmt+lLcLeBwtTIUbeHhhNp0E1/z4gLTrI2o7mHj7l3W/AHQe4AH7yNglUXrea1rSyaPm2R1+mEs7lTYMIK1R4GanY7lv8szoyi2O7W01B8SoiaqKpgZCY9iLOwKv0qojW2h+MgfYHljGUd3Wlt95V1mTkrhwvZSWrC2vOu64nP0KSzU0I0cKlfbpRx82OoiWj3QyWfl+NhCXD7RT0GIwmeAycgDOiRkx5u+KdYBoRJ8BxhDw5IK0RIgczXsPaf/w6j28Z1dSUANcAoLGXB8pd1vUx6U1KjfDf+rGVfv9b9e5EjGcXNBCRqH16Kc36XNZWlYSJe4NVvj2hMhWVHuvz7RFFQwRXc7aYRmz27HvRVYemk4bweNmgula3dpD2q8AQsq0svqk03SM0/jJuacup5n6M2QFSQtheO2kHJCan6ZBYeFZDVNCThgBl4go1zTxf4QSdYamvfc1TAyZBCYoEuWUJ1rsZB0c75dtiRgdHtHc6/jB+frEY2lso98T0hBQHueTXsprQn0LDPiEeOIrKheQV6Ycs/sQrraFtzfG6v8BKyaC6tWhSXkIqpRto8hRf+hVhaj9H7wYx4MikZOQPZ6vx894IKukRo6s7N7Dgpm6farJEEfPPY+PKmBftPnRWZX6Gellzcp1qimo4gg3NspzsJmF22ematzGfl2Awp/SI3MdXESV8vz7Ri6h0KJlirE5SONuSU1FOi431xZnezv1ZO/u6vIKsMYkyZwDhMUIGgSRGFNRFn8L8grkWz0FdmIJTEIQiHM= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: db866fc9-163a-4fd0-9877-08dcea5b9c1d X-MS-Exchange-CrossTenant-AuthSource: CH0PR01MB6873.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2024 01:17:16.4670 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 80qN0h2lxqnuN1yxiryJGQbGIRHsJJFGX/4eVYU+t8o/afDq6NoAIp1ajc2AQQZucmefd82aNkltFiEfafySdzes+9bbQUXGfvYzBWrOFq0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR01MB8040 X-Stat-Signature: arbx5zhd5raez5mc1qs3z41ub93jdyat X-Rspamd-Queue-Id: 27DF712000A X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1728695836-815643 X-HE-Meta: U2FsdGVkX19YChQpPaXzLcsUVc1xbgpwz/1Z1FkgDkJmt8vcPNBMhM448CbulKHg880740Agz/H+JFiVApzWMArCy4BnNV57TnIahgLe/XJpDMHYHRy+6iLdkbdvLPtBlVeNI85kx/6MvuIHHRTC5Ox6wphiNF7075t1Tg619zf6CQRHxtKvChIkCvTpcTLH0vUUzqzPXaVKai+BpynPhvFugB4ejshi1vVQEnG1aBCMxcgR3i6kEPzzdyv5pnxCzlCebzF7Zdye3PUdi4JJ680iFLaoJbeMsYz2HxcyTuoMKAMIzqFUFN/JyD2j07riIXlhzuUb2qtGXb7/Z1bOA5v6ArJrXepV6o0fpd+eRU7pIb/LcFGHgbJ3S3P6k2ZgTk5zLMmAEkZ4J73LI6L4CIR0vRGWXwFzejvC10y+XYRRWnIjbG6yUXMwxjACBiRxKfYpZhO/kj+EoZ5jte0g0KdKo/TLp4x1oLalMrLrDehCWiSugodrXXomBKj2Sl0NACZerVV7aGO3vSDnTBJzcbCagc0LRab/PI1Sapu+5DDzZXGcgfUHYrBCGH/oqBtoa57URPJaeE77yTqBMjAASlDAbecwvENdDz72LU79oEEpk3J4nx0SyI5PKoVQTz1rKeT8mV5Yi7Vd1m6AaQWJeqZEQiw8FdmkA3G45Tve1TTHf+oUKuoUc2M7ruWnVXZL7qORNQhVtCpa98bBJ7FSEP3qgrRLdXQeM2INV3C2Zwm3tdKoLjIhoyfDWLRGyFTroVADWYTxG5Y3WDjvMpQ5z4D5UbIIYS9SBKj2FU7IeAmNA29GbXVEN2ya3FVLUgmn9mgjwAS5tAQgVTrqyOwjvnVREy0LZJH4ghrpzHEdp636DESZk8djBMncDblHwzZ4c2kIDwY5Xb5kcIfAYa3FC6HQL1c2OGXckH2vEV/Bkc7DAI4wxDnv1X6Pk9PhaYWF7YXt+Yy+MMGRHptP9JU 0NSWBeRC r1dxuHHwrEV0WygFc0KXiyBREZcvXtiQQ6+IgiZp0BE7/yz5gMqoIQwTsZ5hHR2ZFqawYOrYzcodHEef4DxCpP5nLXmIQHu2amqYUlpKjHs7zKDZyAKoaWc5w9vTOtQODQ8lcbbfuYLlpOYomE/Ly/o5Ry3fMKwkp0dRa6yyf0bhSBekGBNCj2aQ9vvA1EUmYuZKVN1IW9eeelRhEhwlFgLIUvqgYxIKvh2AZNhPLK0xSlXiuxNZudEkZdx6DQdxYeuRfcypWzJ4qYIWsY6t0f52luW8ckBI5/mpdR9K9I7SAjX+DDnOuZhJYb2qa7Zu47gHN0j9TtWbuLyBfUZ1iGO/tbaqbm6oQIGIFqeClyywzrL9nooOsOh49zq3healXeOFwoRLmDO0/XXourhgSjVaDAQtsDHvl9EBLmXKWM7EUKMOwTkUBKVKnMxdS8KITi/PCmrDVEJJ4aGFoWHyB5jKp1SGeZMwsdECc 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: The "addr" and "is_shmem" arguments have different order in TP_PROTO and TP_ARGS. This resulted in the incorrect trace result: text-hugepage-644429 [276] 392092.878683: mm_khugepaged_collapse_file: mm=0xffff20025d52c440, hpage_pfn=0x200678c00, index=512, addr=1, is_shmem=0, filename=text-hugepage, nr=512, result=failed The value of "addr" is wrong because it was treated as bool value, the type of is_shmem. Fix the order in TP_PROTO to keep "addr" is before "is_shmem" since the original patch review suggested this order to achieve best packing. And use "lx" for "addr" instead of "ld" in TP_printk because address is typically shown in hex. After the fix, the trace result looks correct: text-hugepage-7291 [004] 128.627251: mm_khugepaged_collapse_file: mm=0xffff0001328f9500, hpage_pfn=0x20016ea00, index=512, addr=0x400000, is_shmem=0, filename=text-hugepage, nr=512, result=failed Fixes: 4c9473e87e75 ("mm/khugepaged: add tracepoint to collapse_file()") Cc: [6.2+] Signed-off-by: Yang Shi --- include/trace/events/huge_memory.h | 4 ++-- mm/khugepaged.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index b5f5369b6300..9d5c00b0285c 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -208,7 +208,7 @@ TRACE_EVENT(mm_khugepaged_scan_file, TRACE_EVENT(mm_khugepaged_collapse_file, TP_PROTO(struct mm_struct *mm, struct folio *new_folio, pgoff_t index, - bool is_shmem, unsigned long addr, struct file *file, + unsigned long addr, bool is_shmem, struct file *file, int nr, int result), TP_ARGS(mm, new_folio, index, addr, is_shmem, file, nr, result), TP_STRUCT__entry( @@ -233,7 +233,7 @@ TRACE_EVENT(mm_khugepaged_collapse_file, __entry->result = result; ), - TP_printk("mm=%p, hpage_pfn=0x%lx, index=%ld, addr=%ld, is_shmem=%d, filename=%s, nr=%d, result=%s", + TP_printk("mm=%p, hpage_pfn=0x%lx, index=%ld, addr=%lx, is_shmem=%d, filename=%s, nr=%d, result=%s", __entry->mm, __entry->hpfn, __entry->index, diff --git a/mm/khugepaged.c b/mm/khugepaged.c index f9c39898eaff..a420eff92011 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2227,7 +2227,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, folio_put(new_folio); out: VM_BUG_ON(!list_empty(&pagelist)); - trace_mm_khugepaged_collapse_file(mm, new_folio, index, is_shmem, addr, file, HPAGE_PMD_NR, result); + trace_mm_khugepaged_collapse_file(mm, new_folio, index, addr, is_shmem, file, HPAGE_PMD_NR, result); return result; }