From nobody Mon Jan 26 07:40:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1768475983; cv=pass; d=zohomail.com; s=zohoarc; b=nCsdBQCp9d0NFhfAg0kfujP8E7+gr4VJs9k+JkIw62RNtyq2JjntLxHynVNMtr0xmUtl6JN3HGbtdXfioKSohHt0YE2kojHk14/9OfY06U+0jqlj5Iii8FXuZaWBSjNrVfGMjISy/F6BxSBFWaSuUnN+qTjZhDkMiRYMnxfvjeM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768475983; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DGFKVF0i2wWigbiwR7BNTdhzq53D/kNouGUmcPEvNic=; b=Es1CZb60296z8Ir9fMCI+Zy/Tv6iLismODzsc7pOYNbyK1T5rbiB7fh/QkVxxm5Yq6eEeWIPfAqYTxHM0RViWIQ8xFJ3W97tti3wmKXF3zcH9cr8JBeHqjOPGjBH2c1D4xjd0I0eG1t4EJ23Q/+A10MwRuZXgJKan1Lv40ikNAw= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1768475983297910.4789152949899; Thu, 15 Jan 2026 03:19:43 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1204854.1519395 (Exim 4.92) (envelope-from ) id 1vgLNk-0003et-D4; Thu, 15 Jan 2026 11:19:16 +0000 Received: by outflank-mailman (output) from mailman id 1204854.1519395; Thu, 15 Jan 2026 11:19:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vgLNk-0003eO-7k; Thu, 15 Jan 2026 11:19:16 +0000 Received: by outflank-mailman (input) for mailman id 1204854; Thu, 15 Jan 2026 11:19:15 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vgLNj-0003bC-5V for xen-devel@lists.xenproject.org; Thu, 15 Jan 2026 11:19:15 +0000 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazlp170120007.outbound.protection.outlook.com [2a01:111:f403:c101::7]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 05e868fa-f204-11f0-b15e-2bf370ae4941; Thu, 15 Jan 2026 12:19:14 +0100 (CET) Received: from CH7PR03MB7860.namprd03.prod.outlook.com (2603:10b6:610:24e::14) by LV3PR03MB7431.namprd03.prod.outlook.com (2603:10b6:408:194::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.4; Thu, 15 Jan 2026 11:19:11 +0000 Received: from CH7PR03MB7860.namprd03.prod.outlook.com ([fe80::f5ba:35df:1c9f:b343]) by CH7PR03MB7860.namprd03.prod.outlook.com ([fe80::f5ba:35df:1c9f:b343%4]) with mapi id 15.20.9520.005; Thu, 15 Jan 2026 11:19:11 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 05e868fa-f204-11f0-b15e-2bf370ae4941 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HOUt15YJB2aXEzpXq0D3dExLXpxTS0dWGWptTiLjTOzULkpBRXQYJ3nD5hdv4mg9vZtUDAEIszkcEwV3Ck8c3wcchArhow1Kv8LYAoE7zyM+mntVJswv1JRs9F6hvW9Nz9icnM1hvTRCztVb32MaAR+HzIhBvV9z62nzj3QEPBRgnEb/r+aBZVEtruPulHNWX4aIFXHLF/IAt3oSw6WPLoXsXhfMscFvWVZve+Ey2PVkh4pVeC04oKHqlsMnmJ/UyCgIoWzjdZ83hUF8b5AzyYhU5eOhZMqsw65FOXFbzc6LBdEBTNYCH2OrA6TSXg/sb4H4+mAgjLZqKW3mYFi1kw== 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=DGFKVF0i2wWigbiwR7BNTdhzq53D/kNouGUmcPEvNic=; b=JdiHKVg/Q04yRKCBDGAg34F6fzWLdPryQoeNztm9IsEqstxHWHzxiKQAUJBzycHu59aOsxsB8Y55S+w3YoXZMKXz278f3RQDjRGp/DRg42kmGMn2tVng8cQ8YMn4DsF4J4cojPTKfvBVHlQilluLTSP7Elihwc9KZbWRlb7uFvdWDILmbfDFl35YoML/w+oRqduyTB7R3gJh3mmRKfUgOniDZHg6GHeoQrGG7Lbao1W1zdkLmw146kwfJ4kkxqvOYdfctMpQKY8I64wPcOn6IsL/PYg3y95ATCa9AR+8hoC+9CYCH9+wdWSgaT1sdNOjRF65oUnLG7r8fjfMmDuLPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DGFKVF0i2wWigbiwR7BNTdhzq53D/kNouGUmcPEvNic=; b=cMn0fGOpUhbnml+IyMxP++T1XQmhV8/pklD2FXIr7Wkzft78VDu2gHlFql0yckWmFEbkwJUHTgREl9zo92FXaB+NflWkauWwrdj/s54L+Pzs5IfNoWshrrGMwwH4U1cEWQyDMWnnJM3xubg5slrUwEU7/XbizFO5TX7o2BBYnOA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , Stefano Stabellini Subject: [PATCH v2 1/3] xen/mm: enforce SCRUB_DEBUG checks for MEMF_no_scrub allocations Date: Thu, 15 Jan 2026 12:18:02 +0100 Message-ID: <20260115111804.40199-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260115111804.40199-1-roger.pau@citrix.com> References: <20260115111804.40199-1-roger.pau@citrix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN2PR06CA0012.namprd06.prod.outlook.com (2603:10b6:208:23d::17) To CH7PR03MB7860.namprd03.prod.outlook.com (2603:10b6:610:24e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH7PR03MB7860:EE_|LV3PR03MB7431:EE_ X-MS-Office365-Filtering-Correlation-Id: 711dc458-f203-4445-de7b-08de5427e88c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Um5WeTI3MnNzbjMxRFJJR2RiWDlDVUNUeUt1aUN4YU0ycTRzTGswSnhmZUNv?= =?utf-8?B?UHc4blZVTUc4ZlI5U0hPRTVtOFlnUStXU3BmVXdqY2RlckN0WldybTVaSFBw?= =?utf-8?B?QnZJdkJGZW9OcVovaHJNemFDQlg0dUdXWWNlWXlvSTdqaDMxYU5UQXBLMGxQ?= =?utf-8?B?UWZtN3h6RkhjNkVrVllHaFF4cFdKa3A0WGtoWWV5VEMvdkdUVXF1TmpzWllB?= =?utf-8?B?V0RNL3JwUytXVmF1QktSVkRZRmRmSUlyMzJySWJRMzBrZWpRZzhPT1MxM3FO?= =?utf-8?B?THU5MUNjaEhYMVNSbW8xeGcxVmZ2YStiUWlUUVVpVjBhS29zVGFhdnJuMjhC?= =?utf-8?B?cVVqYXAvQVA2eGQ3R09jS29EUFlqTCs0TUtKS3dpMFZPb0NEcHVMSWFGZEty?= =?utf-8?B?Rlg3enpBNDhDT2QvQ0JlaE9yRnVzV2dlR25xU3JqbVVyMjBabGNMeGJ4YlQz?= =?utf-8?B?eWhidWF2ZlRmL3BoZnQyVVVtWXpVTjUraFRqWE5IVFJkSlJGeCt6K0xzazZ6?= =?utf-8?B?TFBmMlFxaVhxc214d24rcFRySVVsTXB5VFNISVV4SUpXM0tKdjNnZWthdk5G?= =?utf-8?B?NGFmMGNoVzZodFc5djJtL25reTZ4ZEYrRTlLdUNoMHR2elJnZDYxaDZBb1RO?= =?utf-8?B?RGJicEdyZTJGOGRtK0Q3bHllT1lyUXhmdGxJOFgrbU1xekRYaVFlK1F6LzI1?= =?utf-8?B?YzdvcGlsR3o3YnFnNFo2QnFuL0R0T2Z2WjN6Z09QbUltQTduUG1xeFRtZE14?= =?utf-8?B?RTFoOFN0TlpHNWt2RkFUZXV6SEdTSit4Q2ZwclZJSStZZUhvTHRQK01tcFhz?= =?utf-8?B?bHdKKzJnWTVyb0p3TVFJN09tSythYzZWYjRrcVVTL3MyK1oxUFc0U3hxbzJm?= =?utf-8?B?OVY2M1dSVDNSanpha3lMMllIenZSUlZrV2Z4OHhCTUhiaWIvWUtFRk9KbnNW?= =?utf-8?B?djJ6NXBuRzRsL2hWYkdxb1kyZk9TanFDMEpmUS90SVJza1BhUnZmSkl2L3JG?= =?utf-8?B?RjB5VnB1ekpxRWpEQi81S1h0c3FVbnVJejkyUDE5T202VFo3U2JIUGNzVlh4?= =?utf-8?B?ck54OGJicGZOcS85ckdLQjFOTERITVBnUHEySnVSRDZUVlliNW4yZ0RtYmI1?= =?utf-8?B?U3BrN0dCcThDaFhGTGdUZmFMWktiYkNHZG9wKzJPMng0ZzUvZUllSTlacjVG?= =?utf-8?B?WGpGZ1ZwRkdqTFpieFhOSEJVZEordnFnK1Vxb1FxTXdVYzVHTi9yVjB5eStL?= =?utf-8?B?NGQ0SkJveEJmRm9CclJidkxHUWRrRkRYUHRiQ1lOejRiazhCcjlSYVk1dFYx?= =?utf-8?B?N3I4SlhHd0hZZ284c1MyU2JxZ05yMTVJcEdaUTdyaytoOTlGNGJmWDllTWFr?= =?utf-8?B?L2ZHTDUvRzV1QjdOOVFVaDByb3p1VkM0Y1l3dGpIUG9kVnB2WnUzL01tU1Zu?= =?utf-8?B?SFQ1N0FwUFhQSUY3UjdrcUk1SmRtTU9TMHV3ckswOW4vN2o5SDMxd2pES1hT?= =?utf-8?B?RTlIcXN6LytTbUVNRWpjeXNtaGRBT2dIZHNDcUFFOU11QkJNMFc1VUQrOEdq?= =?utf-8?B?cXoxbit5aVRIVWRlNmxGSW1vL0c2aXpBL0tmMDE4QVlEeENGZjkwL0hDZTVV?= =?utf-8?B?Mk9RVUNOeGZwODNENjRnM01YdEZMd20wU3ZhRHQxN3gwcHNPYXJ6aTVVNUhu?= =?utf-8?B?WGdkR2xvdGhLYnRiTFAvSG5rczhQWDVUWnpSTXJ0dzBuaTIxTElzUHhvUVdo?= =?utf-8?B?ZWpqK2VWTlIxY1pFT01qd3RLcWRYSmwvUy95Q3dLRlowZG4xcFJMQUtOL1da?= =?utf-8?B?cTM4UXZoekRYZFBFNW5BdmlSOERLa240cXIrRUx3WDZSNjZ3cVFEMkZiQzNL?= =?utf-8?B?aGw4ZjhDQURQQ0xFN0tJVTB2VzdxOFQvOEdRZUhxcTdDdUVZYkp5T0cwZ2Nq?= =?utf-8?B?ZG9YZkQ3VlljR2tXUUcyT0g1TGt0VlFLZ2FEbkJ3c05lbFRmVXpUOGZWMTBF?= =?utf-8?B?T3RlUTJpUzU3alZoK0tmbCtKRkIrc0tDOFduYXNHNFJhKzY2eHBMTXlVamNU?= =?utf-8?B?NmYrZ28yNUdldHRlMXZRT1VZMjJOTUR4MDZtYlZsdXptelIzRjc1V3krU2NW?= =?utf-8?Q?5TlQ=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH7PR03MB7860.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U2laTHU2Ukd4RWhtTjZKUkNBMmVQbDkzZUEyQlM2RklHVExLOFdvK2d6NldI?= =?utf-8?B?VEt5ckZmelEwcjBoUUN4ckdwR21IbE9JQS9YaVhLNXcyZUNITHRzdGtFMkhD?= =?utf-8?B?ZHpUZUFoM2czK1c3VXo0WEFjNnNVYXBBUUljTGlERFpEZitxMUcvc2liVTJr?= =?utf-8?B?RkxOUVc0ZnU5TVBpQVRqUS9aa3k3akk2N0xmWXY5RTVLZHlDd2phRGNJSWdX?= =?utf-8?B?cHZXYzgrYlpvdHVqTmpHV3BvZzNGVUNLTU0yZXhNTFBTeFNIUytjemR0YWRI?= =?utf-8?B?Z2NTMG1LWmliZ2x4Vnpva2VqdmpjeG1ZcUhVYUU0Q3pXQ3JpLzdjb29uOW1z?= =?utf-8?B?d2YvRjRoOGhsaUo1SGdJMStVbnlXQkE3UjV6aUxnalBqTE92OVQwWUVGbDRj?= =?utf-8?B?UUxwVUtNNUhJMktyUi9OR2xieTBQOUtlaElvZEtUVytFK1J4dWtmS1Z1Mk1M?= =?utf-8?B?Y0FOamNUTUxEeDZhSFV5TDNFRC9lc0h2MkdLZmk1ZGdrTjE2blloclJRUU5h?= =?utf-8?B?QndHWHVZMk1ERS92UjNNbjFidkZSUTFDTGNESThlL2svYmwwd0hmUkZYV1d4?= =?utf-8?B?a1pNQkI0b2x2OFhqS3FON0tJSEcwc29LZUlWeVMxUzU5TldiUjlZL2VBTW1H?= =?utf-8?B?akg0NHBpcGxndHo4T0xEV0w2ODNHcllVSGM4ZFBQRzVqbmY2M1pXbEJXZlpB?= =?utf-8?B?bDM2TE5BQlJYV0hYOWlXcDRtWXkxdWpSQTJGVWdFOWtZUStnVEhVT2xVWnZs?= =?utf-8?B?M2lJUm9VTVVRZ2p6Q2NSZVhwSHhMVmxWM3BRL0lFUEYwTkVFcDZzcXEwME5t?= =?utf-8?B?aTcvbE84azFoWXVTOGhZZ1dTNVF4b3Yvb3U1NzBxbVNkK1pESW1zbGRFenRV?= =?utf-8?B?eVkyVEgxWExxZGRYVTVNRytReDZrODgyWUxDSzVXUjdGOVk3dTRNSk40d0dU?= =?utf-8?B?QjFQNzFKcERqWjcvUTBDN2ZkNms5MUpQbFdPV3AzQmN3SFIvM1Zvd2RFcDJ3?= =?utf-8?B?RmEzMUpTSmxub3dRV01OTnozZXMzMUMrYVVNdDFlN3Y4dncvTjZDUjR3SVQ2?= =?utf-8?B?b204bjc0ZitqbU9ESVFmb0JYWTdhOStXQ0RKTkZXK1UzVjQzNHJJOE81SDFi?= =?utf-8?B?d3RTb0pydFFOZmZpdWZVUlg1a3JHYXVuUGZYNkVMcmRnMTI1TmNTU1FBZ0s5?= =?utf-8?B?OStvMDJMTGhLSTdDUXdzckYxelVQQ3orY1Z6NEhlWENJZ1VVdHVUZExMZGxO?= =?utf-8?B?LytDaHVkblMyQjBlNWZ2elUveXFvd2E1TTgrOEdGQlkxTlAxWWpQT2hvUStB?= =?utf-8?B?V1YrOWEvdjd1THBVU3RFcVhjYVlTRGh6dnVSczdWTjNZMDlVOFRzeHg2ZExk?= =?utf-8?B?RnFYYjRlSVVvOFREYkdqTXF6V3EyaUd2eEtZK0NaUlZlbjlMUEcrZDNCN3l5?= =?utf-8?B?dGVSTGwrTFBhL2UyenlNbmV0MUgySy9PbDN3a0lscEhXYjhOQU1kblJRZ1Zt?= =?utf-8?B?L2tSOFdjRkY3RjAzM2VoQmtmRjRhL0plNWlHYm1lOTd1L1AxTHY5WlJkR1gy?= =?utf-8?B?d0hJeWxQR2trbWw0bTdlUGl6K2ExYWpPaDlRbFRLWUU2b2tqR2RDS0JURkdq?= =?utf-8?B?QkpUTkc1NU5LOFA1S053ZUp6d3pTeHEvQ3h3elpjdlBBYndCZWFWR3Nmb2Vv?= =?utf-8?B?dVd0eGZzZ1JwVVg0NmE1WWJ5MmxyNXA5VDQrbDZyVk8xdVkyMTFhcGFlODd1?= =?utf-8?B?cjNqSjZ5OEozeU9iQ2E2c2lYWDZ5cFB1c0Q1M3VVUlJKaTQxa0pKMXJMQjVT?= =?utf-8?B?b3V3VHIzYytxZllWT2pkLy8rbW1tTTVvU2NJNkJwb1EyeHBiWnBaQVpweUR4?= =?utf-8?B?REdYM3M4NTBmM0RPczdrWDRBQmlhdWJra1N0bVVNLytLc0xLU2JNQkZCeGE3?= =?utf-8?B?WE0vL0tsL2pTdXByRVA1S3F4VnI2ait1QjNTelJXdUVPYU10ZzNaYURTMEg5?= =?utf-8?B?UktvcnlMblNLVFNqbkVEa01Jd2lBa0cwQ2lLaGdZWFBqeDZuOVA2ODg4TUEz?= =?utf-8?B?M0R4NGZwdTZwZ2lVUXAyOFZ3ME44aWY1TWpHWStLZGhod1FONWszaTd6aGhp?= =?utf-8?B?MUZXSHl3dCtwa1hXR2x0R2srYTV4YkhGSHJjd3d2OHc2N2dkdEhaOVhsSEJh?= =?utf-8?B?VUdPV3c0U2M4WndETUV3MUlFZkhrS0pCQmNvTytOang5ajJCOXRwNlgzdDFo?= =?utf-8?B?d0N1OGpnVGdHa0JJRnVNZTNIMWZlQTk5OFV5cTBEL0h1L01FcURFRmxjbWhG?= =?utf-8?B?d1RLN1BJQW1hdXNmVnoxdDJJZDJBQ2tPK1l3Q2lNZEJPbFJqdURXZz09?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 711dc458-f203-4445-de7b-08de5427e88c X-MS-Exchange-CrossTenant-AuthSource: CH7PR03MB7860.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2026 11:19:11.6964 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QY2DH6neAatWyF0VweI5fMVs6nggu1MLMKibZOVtTP8SqYG7mlay09Doz0z14Ff+jwSoIVxj0FOP2I0Z7MwT2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR03MB7431 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1768475984095158500 The logic in alloc_heap_pages() only checks for scrubbing pattern correctness when the caller doesn't pass MEMF_no_scrub in memflags. However already scrubbed pages can be checked for correctness, regardless of the caller having requested MEMF_no_scrub. Relax the checking around the check_one_page() call, to allow for calls with MEMF_no_scrub to also check the correctness of pages marked as already scrubbed when allocated. This widens the checking of scrubbing correctness, so it would also check the scrubbing correctness of MEMF_no_scrub allocations. Signed-off-by: Roger Pau Monn=C3=A9 --- After discussing with Jan I've deliberately omitted the tag: Fixes: 0c5f2f9cefac ("mm: Make sure pages are scrubbed") The intended approach might have been to ensure the caller of alloc_heap_pages() gets properly scrubbed pages, rather than asserting the internal state of free pages is as expected. --- xen/common/page_alloc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 2efc11ce095f..de1480316f05 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1105,8 +1105,7 @@ static struct page_info *alloc_heap_pages( =20 spin_unlock(&heap_lock); =20 - if ( first_dirty !=3D INVALID_DIRTY_IDX || - (scrub_debug && !(memflags & MEMF_no_scrub)) ) + if ( first_dirty !=3D INVALID_DIRTY_IDX || scrub_debug ) { bool cold =3D d && d !=3D current->domain; =20 @@ -1119,7 +1118,7 @@ static struct page_info *alloc_heap_pages( =20 dirty_cnt++; } - else if ( !(memflags & MEMF_no_scrub) ) + else check_one_page(&pg[i]); } =20 --=20 2.51.0 From nobody Mon Jan 26 07:40:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1768475984; cv=pass; d=zohomail.com; s=zohoarc; b=j6OfxDnKdmGuenKIrXxIoIlRlOBmKkSF4H6IwCO7rdX7alaPbf/Ic1pWo+2rLyDjs+S1xTWxTEjt9fXaJrAZ1osPtHsroUWW7ySGE6JzLtwUq6mAo+wSp7VtfgEnj833vIzRMK/Oq3UYukt81mVR8cfIC7RXTA0uJjTUrNPpRaA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768475984; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=q8bzH/L1hTXEPNB93H2sFsVys9laAXqSrcgU3fr2F+Y=; b=LFoqhGZ/AyR+knJF4Vnojg/QgBpX0KF7VDCCit1qUSPvJfMAMT04got0JW7z3++svRWnjHANLTKGCX3NLwCNNs8nSaX5tPlUtewxkdYnkFYDo9dp6zWLshlg+FhdlVfWlsWrq96kYijIqe+jE5uSuxMx3Ijb/7wxCBqqMKDrRIg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1768475983976737.9620337659388; Thu, 15 Jan 2026 03:19:43 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1204858.1519409 (Exim 4.92) (envelope-from ) id 1vgLNz-0004DI-JD; Thu, 15 Jan 2026 11:19:31 +0000 Received: by outflank-mailman (output) from mailman id 1204858.1519409; Thu, 15 Jan 2026 11:19:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vgLNz-0004D9-FG; Thu, 15 Jan 2026 11:19:31 +0000 Received: by outflank-mailman (input) for mailman id 1204858; Thu, 15 Jan 2026 11:19:30 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vgLNy-0003bC-4l for xen-devel@lists.xenproject.org; Thu, 15 Jan 2026 11:19:30 +0000 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazlp170120007.outbound.protection.outlook.com [2a01:111:f403:c101::7]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0e6a5028-f204-11f0-b15e-2bf370ae4941; Thu, 15 Jan 2026 12:19:29 +0100 (CET) Received: from CH7PR03MB7860.namprd03.prod.outlook.com (2603:10b6:610:24e::14) by LV3PR03MB7431.namprd03.prod.outlook.com (2603:10b6:408:194::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.4; Thu, 15 Jan 2026 11:19:14 +0000 Received: from CH7PR03MB7860.namprd03.prod.outlook.com ([fe80::f5ba:35df:1c9f:b343]) by CH7PR03MB7860.namprd03.prod.outlook.com ([fe80::f5ba:35df:1c9f:b343%4]) with mapi id 15.20.9520.005; Thu, 15 Jan 2026 11:19:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 0e6a5028-f204-11f0-b15e-2bf370ae4941 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XsDoWne7cHuZsKJqc/j0QsxbXsuykPAwP9pI4tQer56FSk8/ldC6SRonV63PzHt4KEGZWLKy44GBsgmbq+be/A+Ge0djmbE6r17x8eQ/4GnY64tfO//cYbRHqkgv2u1DWCkVrnZeZrvemdCL3Wxsay2bdeEGKdy+ucA7jBefPvSzw/61xdifuMkh6TA/J0CvXdEsH7qpBjaKAQb2081Xn7LwZ6sEXCXbJxEKmHg17PyJxV3SFZlK4D0qibYbscv6VtSrIfMwu/ShohxEhncKBt9j4mqX5mwhYu4omGzIL2lq0qADRD4O8bkfGq5quFVRupKEjUAOY00k+jCf0bVytA== 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=q8bzH/L1hTXEPNB93H2sFsVys9laAXqSrcgU3fr2F+Y=; b=UkZY9fWiYYoTEk/2npoVwn+rex5Uak+0qJW25hi361rbTSuRcT3gI3oF5HahF4hoNO0/eCMWhjlxOF/H+frzaGNdpbmRPknFZfArgwq7yhxQFHWDATIKnF3i/w5JpKbdbfRF5Ny9NaCaCjKs+xmpxyLbnP/yJ2a5v3Yu8J26vgRIkQSu0YWzlzYS0tTKnLq7TFPjnlxyKmMVbnQH6eAoLbIKmqFYZW4guEGd2ZA3Q6pV7Mg+M4El439NqXwEcHuQGWjjt5X4F0pUkKg4m3BqrvMX+/3TgbioG3bsTcX/jUZagmR5+PJEttCFUQFysp+I4eCURd1G52PDsnN7oymKdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q8bzH/L1hTXEPNB93H2sFsVys9laAXqSrcgU3fr2F+Y=; b=WO0pLLVyNWx57TYuN0Xyi/sHxj50w87SbEN2zrs9PpspAP6+GdPuC97+6d3zFXDau9d/kXkmsf6PZUgvGRd0GidLNHwd9cAChOgRASnsF0Ub+w32OL70hVfYbifeVWkzwrKvvNkpNCO78Brcn7N9D6z6F22iaijMiiu1W7SjnFQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , Stefano Stabellini Subject: [PATCH v2 2/3] xen/mm: allow deferred scrub of physmap populate allocated pages Date: Thu, 15 Jan 2026 12:18:03 +0100 Message-ID: <20260115111804.40199-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260115111804.40199-1-roger.pau@citrix.com> References: <20260115111804.40199-1-roger.pau@citrix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN0P221CA0008.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:52a::30) To CH7PR03MB7860.namprd03.prod.outlook.com (2603:10b6:610:24e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH7PR03MB7860:EE_|LV3PR03MB7431:EE_ X-MS-Office365-Filtering-Correlation-Id: 7568f4fb-280b-4145-1564-08de5427ea52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?eFFXZWFwVmpqVkR1RXZRY0lVV0F6Y2M2SkIzUFp4UEdXelZ3RkxhOVpjVnVT?= =?utf-8?B?RHowNVhFbUZsODR1ODRMNzMrY1YwMm5sd3IvQTBLMlovbm9wcCtJWEYxSHU5?= =?utf-8?B?THAyWGphUjRsQ2RaQkVSaUhGbDlza0JKcDRibzdIVTdCdzF3SENXdDJJTFNS?= =?utf-8?B?NjF5UDRaQStuL1M5bWtqMThvNXZic1dZbDdUd2haZUN6eXZpM0NwTEF5OXNI?= =?utf-8?B?T2dnd2t0ZC9jMHVhNGkrMnhNU0VBYTVWYjRTYktqUktFVTFvRS9JcEE2djBn?= =?utf-8?B?MHlZeDNRbFJKY3NzcXdFbTcwL2U1K3ZZdnU3Y2xlVXltd0tRV3FETGlFdkRS?= =?utf-8?B?bysyRVovazh5TTVsenErUW80T0VaalovYklUL2hrM0NmQklkQlBucElmSElB?= =?utf-8?B?RUJucHFMTHpEblhlNzJJMjNLdXlDV2ZWbWJrNTFrQ3RtMXROK0RYNURYN3Rm?= =?utf-8?B?bVcrRUV2WkNkRXN0N1AxV0ZFeGliRUFWbUQ4U3dvSEZRN2pRb1RPTFFaUU1o?= =?utf-8?B?akhqWUFGcmlSZXV5QjRLZ1QwekZwanB4Tnc5RUlkUFlKR1JGNmMvTEF1MC8y?= =?utf-8?B?cGh4dzZKOGJmTGR4WjR6Ti9SV0xnRTUzUWs0TVIyODkzQ0oyRWhLZElyMG84?= =?utf-8?B?S3VyUG9Da1hTQ3JtYkFYbGJ5RXAxdDVOdEJoWGJmQnVjVXRLWmVtWXBmVWFk?= =?utf-8?B?TU5NdzhzTVAxY2hCS1JQcWJKNVFwZmVZVFczK3ZGNGxmb1dRdnBJNTJjZlNu?= =?utf-8?B?TGNGakV1T3ZvenRlV0x5TUdBSHBNZ0Q5a0VMN3BDY00zS3ZvejRXaHFrcmwz?= =?utf-8?B?NVNWRGN6SDI1MUFTWEFmUUZPc1pRa3h6a2hySTlPcm5kemR6QWtuZkJOQ1l4?= =?utf-8?B?cVg3eVRXb0tBNFVrUkpVc1Rma2I3QUtQNHlqY2UvMEVoYmJ4L1ZwTWMvOGRt?= =?utf-8?B?dnpxS1RIVDR0alRHejhzQUhReXBkUnBLR1lSRnM2VE5QMHd4U3FYbTE4VkxY?= =?utf-8?B?WTZvRm53T2U0OTZCeEx6QjBHZ2NBZXVsYm94VmMzb242UUFkczc0ZU5NcTNM?= =?utf-8?B?RDFRSS9FU2F4bXpnUlJ2bWV1aFpEUXk1QnR5SmpscHZieTR1c0twQVdQdUQw?= =?utf-8?B?c1FhSUJ5YjZobEdmSzk5eGZ0Y1dQT1JScTErLzAvVFo0UFdla0pNcUtEZDVN?= =?utf-8?B?Vmhsb25xWjRXRytVM2FRRHIxNWhjM3ozYUNUN25qMndwdWRReTQwdHJLaExq?= =?utf-8?B?OEZsNjlkY3RkYjFnZXhQYjdVNmVoQTRXazdraHdvNXlqZDVLOXNVMmRYdUY4?= =?utf-8?B?Ukd2NVBndXhCUy81Y0dVb1ZoM3MzamJ3M0VEWVZSVVhGd3RjRVNVMWNGODN1?= =?utf-8?B?T3kxMVpwWjZScmFha0hXYitzcVN4a0Q1eXM4cDlnZkd4V3JINmtjMmIrMFhG?= =?utf-8?B?cFNvQllERG5uSFhoRDBXbmlhSE9XS0crcTl2Y2RDNDB5UDhiMVBlWVlaL1lG?= =?utf-8?B?Ukg3ejVpWnBQSGN5WHcvTGNWQkpZVHdWd2tqeWkyd2pmTkFYZWhEdWdUWGpn?= =?utf-8?B?dmNuY3A0c3l5RE9DK3dCRXM2N0FobHV1RFlBNGpnUmF6ODYzRDVwWUJqb2Fp?= =?utf-8?B?MFVIaXJ1YWV5TVlwZ3ppakEzNzBlc0trTHRsKzlPTlRsekRYclk0RW10VnRM?= =?utf-8?B?M0I2aDlBSFBoN2hDajZCYVpVMVNQNXBCd3VOdnArWlNteFFIb2o1UTlIMys1?= =?utf-8?B?NU8ybmtaaXpzWUh1SGRuUzlBYm9oMGRQVHdYS2FhTTRUOXBBRWtkckcwU3Zs?= =?utf-8?B?ZnBPczlTelpLYktGRDVvUVpReEpkTCtwZkdwVGlJQVg5MS9ML0E0dkhhNG9u?= =?utf-8?B?bWF2TXZIeHFmR1ZlVTRQRHcvTTNOYmEwRmJEM3ZMWUhPVEtKUUFkQTg3VDMw?= =?utf-8?B?UmtRRjJXaVJnNDNMRlFUT0YxcWR2SzlWdnpzYU94aG80d3lEbnFiUVZ4Ymor?= =?utf-8?B?RFp3NGtGK2xNUWxvbC9XanBOdHZWVXBjRWQ4UC84Uk9zN3Vzbzl4YkdVc2VV?= =?utf-8?B?NndSemVCcUx4ZE90Y0tNcm1YcDQvUGhxMko3bjdGOWxhMmtMRU5Udi8yakZu?= =?utf-8?Q?aZxs=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH7PR03MB7860.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VVFaa055MnlqTmg1WWxnL29GOWJSYWNKZlVCbDQwdVBuK3hxbVNRTG5tQU9F?= =?utf-8?B?b0JyUzNBUm9mR01TaVdOMkFzWERvNHNXZjBzTEtVeUtFL3YyOHI3WEdGMXhD?= =?utf-8?B?NEg0QlhCT2d2Y2V1N1I1VDJxQTNOQ09Fd0FEN0toOTdFalJXNWFWcVdibEV3?= =?utf-8?B?Y2VGb0hPQVhLM2VmU01HZmwyVUh2dGZiZEIrMGQ0czRrcDRyc3dMMStWV1p6?= =?utf-8?B?TkpBOXp2RTVnOUR4R2M3aEJxK0JFUkllb09hVzVtZlBGTm1SbzNVKzFOcWpF?= =?utf-8?B?Z2Jrb2tyUTI0Q0poM2dlQmxRYkp6dng3enFvNzZvY1dkTnlhdTVNVThIVzBR?= =?utf-8?B?TjNKODQvRUJaSG4rSEg1dDNPSS84VVd6M2szbCt5T2V5TW1KNDZUNHZNU09v?= =?utf-8?B?YWs4Z3hvWktPN1hQK2xXcCsyUTYrRG5TOTlDZkVlU2xQQzQ5QUd2VjFnOFY0?= =?utf-8?B?TkRYb0hKYUVIbUVWSWl3eVFvaGNaZkFtREFwT0lDaTZIbk9VNk51NkpiVDE1?= =?utf-8?B?RXFuU2N5Nk91OXFjTEJnTklKS3lLUmVmVE1PQW9iMGhGVlU2TFhpOVN1cjI4?= =?utf-8?B?YWxDUS9JWVh6UU1nRUlZTGZvcWZ0VFJ2YmxybUV1UFpEcU9sQUswRitGeEtN?= =?utf-8?B?czkxOEJDMncwWDhQaDdGK3JYV3VERWdKeVQzMmdnckJJRjZ3eForQ1pGeEls?= =?utf-8?B?TXVUWDlvYXRxNVZzWmhiajBrQ29pNWVrQlVkbEhpb1Q5QlpTLzZMeDV3UkFy?= =?utf-8?B?dmZwaXFzdWo0UUVtdkk4dHRLQXljVEZQNno2SHpHV3FleXpuVG1qaVJLUnAx?= =?utf-8?B?ck4va0tGZFp6NTI2b09YaVozcnBlMWM4b3pJVzdIbUdGUFJjY2xOK2Y4OFAx?= =?utf-8?B?UVAyVVlWUGE0NUtyRmVrQjRsQm1OMkFyUDZLN0xmWnpjNVBIYmVkTmZrS0VY?= =?utf-8?B?ZGJHV2FETnlvYW82TVhEdGhlZVNmWHlSM01EWjh1ZFJLLzFROVo1dkNOblkv?= =?utf-8?B?dnNvWFNaaXlNeTRjRERxemdOTFRiVENvbVJBMm4rbGg5ZWdPWEJwQ0MzMjc0?= =?utf-8?B?YStBRFJsNzdyT1ZkL2tNMkJELzZjbno1bEN3RXBpdzVramdXY1RKd0hGcnNy?= =?utf-8?B?SnlLeW50akg3SVRZOHNyUXRPS1Y2ZjNtTHFnOUN3bXA1d0pZZnQrLzdMZVpo?= =?utf-8?B?b2FqVXNLYWs0ekQzYm83V1dmS3IxUW1XMnhxQUg2MkVJRlNFcjMxazA0cFow?= =?utf-8?B?MVVoK0JUTXdwSmIyaUdUUk81ZVc5UlVzU0xTdnNMMXpuNWo5Qk1ObXczT09Q?= =?utf-8?B?SXIvN3lzWnRSQUJBRmNMTnlOOGVBcmFXdU10TXJlSXN1VTlJN1FPaHI1TkpE?= =?utf-8?B?ak5kSDd1ZUYwajZOOThzNkpzRWxYaHdiK3lDNDlVVHk3clQvWkRYWjY2cjd3?= =?utf-8?B?YWtSRVhJbkllSWZ3T0xpUlhUN2xOVTBaN0h2VnB5a2djS0dseVgyNkgrQVoy?= =?utf-8?B?OHpXMk1zbVRRclh0ZHZsLzFFLytoMDJ6dzhmN2RxRXhORjFsN3BTK25ETExu?= =?utf-8?B?R2s3VFRVRUx6a3BUTUVicVI1STIvTWZTbzg1MjdPR1RnUlZXWkdreDhRZ3NM?= =?utf-8?B?eEhNdDdRRURKYlFVN1ZWbjRuM21PTlpTMGt5Zy82c0w4eGYzQ201UlpGYjBy?= =?utf-8?B?cGkyNWxURWhucmtHa0xZd0h6VU91UnM1a3U0NjVRa0JaemVVUnNmUlhNSjBj?= =?utf-8?B?aEF3WkhQUmp3VVlrcHFqSGQ3bk9Eekpzektrd0o5ZWRnYldmQS9uZTBqSzNa?= =?utf-8?B?Z3R0Nm1BQ0d4UjROWEt5TVFXMmdQaEIvUEw3UFVUNHVuRDJTTEhuYWhIVWRq?= =?utf-8?B?bGFaQWlWcXYyWDdVVWNqZklBN05YQUdJUERmekZGdjk0U1JlSjBidWVsN0Vy?= =?utf-8?B?a281WmppenNjUTBiNE93Y3RjbDRFaTNIbFI4R1h4blNScThkeHkwYXhXYTR2?= =?utf-8?B?Y0lxTkk4dC9SZEt4dG5rTFRWRE1zRi9ES1NNa0RuYitrNlZVWnBxakU2SDNy?= =?utf-8?B?NzUvU3JobTBLSEJ3YjdHeERuSzR1T0ZKWGNtVXdEaWxNUFZPa0lhWEd4TFVm?= =?utf-8?B?MlFxMzZjSU4xUUNZT0dNY1VtditJWU5XMEZXUUlJbE55enBBZzdEZkQyWVV0?= =?utf-8?B?T1dlZkFIcHhzSGxTRE1uTEx2R1lHR2I1N2tZUEtTeHBKejVSRlY0VU1yN0N0?= =?utf-8?B?L3hSN0dwanJncjlldDRHN3pvcmJEeURwT3pLTzJ5a0JZSkpid1BFUkswS0t2?= =?utf-8?B?bXZXM3FLMVBCVkEzS0oxMHpqWjVDbzdFMENkR0RnZE5lKzg5RGNyUT09?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7568f4fb-280b-4145-1564-08de5427ea52 X-MS-Exchange-CrossTenant-AuthSource: CH7PR03MB7860.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2026 11:19:14.6685 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uHf3YnkPw9gZt7tmrUoCIeyGkOiqLa3e6BfBdr+GEeNvW95r1Yh4Ks1TivRPOxf0KKuvP91Ghgd+LADiHD5iTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR03MB7431 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1768475985861158500 Physmap population has the need to use pages as big as possible to reduce p2m shattering. However that triggers issues when big enough pages are not yet scrubbed, and so scrubbing must be done at allocation time. On some scenarios with added contention the watchdog can trigger: Watchdog timer detects that CPU55 is stuck! ----[ Xen-4.17.5-21 x86_64 debug=3Dn Not tainted ]---- CPU: 55 RIP: e008:[] clear_page_sse2+0x1a/0x30 RFLAGS: 0000000000000202 CONTEXT: hypervisor (d0v12) [...] Xen call trace: [] R clear_page_sse2+0x1a/0x30 [] S clear_domain_page+0x11/0x20 [] S common/page_alloc.c#alloc_heap_pages+0x400/0x5a0 [] S alloc_domheap_pages+0x67/0x180 [] S common/memory.c#populate_physmap+0x22f/0x3b0 [] S do_memory_op+0x728/0x1970 Introduce a mechanism to preempt page scrubbing in populate_physmap(). It relies on stashing the dirty page in the domain struct temporarily to preempt to guest context, so the scrubbing can resume when the domain re-enters the hypercall. The added deferral mechanism will only be used for domain construction, and is designed to be used with a single threaded domain builder. If the toolstack makes concurrent calls to XENMEM_populate_physmap for the same target domain it will trash stashed pages, resulting in slow domain physmap population. Note a similar issue is present in increase reservation. However that hypercall is likely to only be used once the domain is already running and the known implementations use 4K pages. It will be deal with in a separate patch using a different approach, that will also take care of the allocation in populate_physmap() once the domain is running. Fixes: 74d2e11ccfd2 ("mm: Scrub pages in alloc_heap_pages() if needed") Signed-off-by: Roger Pau Monn=C3=A9 --- Changes since v1: - New in this version, different approach than v1. --- xen/common/domain.c | 17 +++++++ xen/common/memory.c | 105 +++++++++++++++++++++++++++++++++++++++- xen/common/page_alloc.c | 2 +- xen/include/xen/mm.h | 1 + xen/include/xen/sched.h | 5 ++ 5 files changed, 128 insertions(+), 2 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 376351b528c9..5bbbc7e1aada 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -722,6 +722,15 @@ static void _domain_destroy(struct domain *d) =20 XVFREE(d->console); =20 + if ( d->pending_scrub ) + { + BUG_ON(d->creation_finished); + free_domheap_pages(d->pending_scrub, d->pending_scrub_order); + d->pending_scrub =3D NULL; + d->pending_scrub_order =3D 0; + d->pending_scrub_index =3D 0; + } + argo_destroy(d); =20 rangeset_domain_destroy(d); @@ -1678,6 +1687,14 @@ int domain_unpause_by_systemcontroller(struct domain= *d) */ if ( new =3D=3D 0 && !d->creation_finished ) { + if ( d->pending_scrub ) + { + printk(XENLOG_ERR + "%pd: cannot be started with pending dirty pages, destr= oying\n", + d); + domain_crash(d); + return -EBUSY; + } d->creation_finished =3D true; arch_domain_creation_finished(d); } diff --git a/xen/common/memory.c b/xen/common/memory.c index 10becf7c1f4c..4ad2cc6428d5 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -159,6 +159,74 @@ static void increase_reservation(struct memop_args *a) a->nr_done =3D i; } =20 +/* + * Temporary storage for a domain assigned page that's not been fully scru= bbed. + * Stored pages must be domheap ones. + * + * The stashed page can be freed at any time by Xen, the caller must pass = the + * order and NUMA node requirement to the fetch function to ensure the + * currently stashed page matches it's requirements. + */ +static void stash_allocation(struct domain *d, struct page_info *page, + unsigned int order, unsigned int scrub_index) +{ + BUG_ON(d->creation_finished); + + rspin_lock(&d->page_alloc_lock); + + /* + * Drop any stashed allocation to accommodated the current one. This + * interface is designed to be used for single-threaded domain creatio= n. + */ + if ( d->pending_scrub ) + free_domheap_pages(d->pending_scrub, d->pending_scrub_order); + + d->pending_scrub_index =3D scrub_index; + d->pending_scrub_order =3D order; + d->pending_scrub =3D page; + + rspin_unlock(&d->page_alloc_lock); +} + +static struct page_info *get_stashed_allocation(struct domain *d, + unsigned int order, + nodeid_t node, + unsigned int *scrub_index) +{ + struct page_info *page =3D NULL; + + BUG_ON(d->creation_finished && d->pending_scrub); + + rspin_lock(&d->page_alloc_lock); + + /* + * If there's a pending page to scrub check it satisfies the current + * request. If it doesn't keep it stashed and return NULL. + */ + if ( !d->pending_scrub || d->pending_scrub_order !=3D order || + (node !=3D NUMA_NO_NODE && node !=3D page_to_nid(d->pending_scrub= )) ) + goto done; + else + { + page =3D d->pending_scrub; + *scrub_index =3D d->pending_scrub_index; + } + + /* + * The caller now owns the page, clear stashed information. Prevent + * concurrent usages of get_stashed_allocation() from returning the sa= me + * page to different contexts. + */ + d->pending_scrub_index =3D 0; + d->pending_scrub_order =3D 0; + d->pending_scrub =3D NULL; + + done: + rspin_unlock(&d->page_alloc_lock); + + return page; +} + static void populate_physmap(struct memop_args *a) { struct page_info *page; @@ -275,7 +343,18 @@ static void populate_physmap(struct memop_args *a) } else { - page =3D alloc_domheap_pages(d, a->extent_order, a->memfla= gs); + unsigned int scrub_start =3D 0; + nodeid_t node =3D + (a->memflags & MEMF_exact_node) ? MEMF_get_node(a->mem= flags) + : NUMA_NO_NODE; + + page =3D get_stashed_allocation(d, a->extent_order, node, + &scrub_start); + + if ( !page ) + page =3D alloc_domheap_pages(d, a->extent_order, + a->memflags | (d->creation_finished ? 0 + : MEMF_no_scru= b)); =20 if ( unlikely(!page) ) { @@ -286,6 +365,30 @@ static void populate_physmap(struct memop_args *a) goto out; } =20 + if ( !d->creation_finished ) + { + unsigned int dirty_cnt =3D 0, j; + + /* Check if there's anything to scrub. */ + for ( j =3D scrub_start; j < (1U << a->extent_order); = j++ ) + { + if ( !test_and_clear_bit(_PGC_need_scrub, + &page[j].count_info) ) + continue; + + scrub_one_page(&page[j], true); + + if ( (j + 1) !=3D (1U << a->extent_order) && + !(++dirty_cnt & 0xff) && + hypercall_preempt_check() ) + { + a->preempted =3D 1; + stash_allocation(d, page, a->extent_order, ++j= ); + goto out; + } + } + } + if ( unlikely(a->memflags & MEMF_no_tlbflush) ) { for ( j =3D 0; j < (1U << a->extent_order); j++ ) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index de1480316f05..c9e82fd7ab62 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -792,7 +792,7 @@ static void page_list_add_scrub(struct page_info *pg, u= nsigned int node, # define scrub_page_cold clear_page_cold #endif =20 -static void scrub_one_page(const struct page_info *pg, bool cold) +void scrub_one_page(const struct page_info *pg, bool cold) { void *ptr; =20 diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 426362adb2f4..f249c52cb7d8 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -144,6 +144,7 @@ unsigned long avail_domheap_pages_region( unsigned long avail_node_heap_pages(unsigned int nodeid); #define alloc_domheap_page(d,f) (alloc_domheap_pages(d,0,f)) #define free_domheap_page(p) (free_domheap_pages(p,0)) +void scrub_one_page(const struct page_info *pg, bool cold); =20 int online_page(mfn_t mfn, uint32_t *status); int offline_page(mfn_t mfn, int broken, uint32_t *status); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 91d6a49daf16..735d5b76b411 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -661,6 +661,11 @@ struct domain =20 /* Pointer to console settings; NULL for system domains. */ struct domain_console *console; + + /* Pointer to allocated domheap page that possibly needs scrubbing. */ + struct page_info *pending_scrub; + unsigned int pending_scrub_order; + unsigned int pending_scrub_index; } __aligned(PAGE_SIZE); =20 static inline struct page_list_head *page_to_list( --=20 2.51.0 From nobody Mon Jan 26 07:40:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1768475992; cv=pass; d=zohomail.com; s=zohoarc; b=f6snLXhJuMz8guwYRHPqkIgeNjjfD5OUI/yMAErA0UfG/oJqVy0MmOrqA/DeCsxM4eEryyeNDhEM6uOnAIYEDsG+e6zACaKew6mu4aVNCgeHOqDvXLO/DnKCtFJKo+zXC/JMWrQYqKyGWVZJPz35MijQj9UHAvKLrt+65wKsZ2s= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768475992; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qYRYoLFH/OVP5b6Hea05RAtPOi9OmM1ZzKogWwOxcy8=; b=LQUATekr9K3lKIOsT5PaEELTfMWxCwh45lKrrOx0GDTfg3kavI6tkO/AZTuHWjQXFmokjMZULf4jiUBkVoc65vc+vNOTKcNOeoyaoz1aB5I8rtzKFync4tgX1hdf5mxjukrV7F5Wj0Q0BRZ1/UFGo0mJjcQI55kgo09/N6upWH4= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1768475992908466.29636153974695; Thu, 15 Jan 2026 03:19:52 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1204859.1519413 (Exim 4.92) (envelope-from ) id 1vgLNz-0004FX-Rf; Thu, 15 Jan 2026 11:19:31 +0000 Received: by outflank-mailman (output) from mailman id 1204859.1519413; Thu, 15 Jan 2026 11:19:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vgLNz-0004ER-NU; Thu, 15 Jan 2026 11:19:31 +0000 Received: by outflank-mailman (input) for mailman id 1204859; Thu, 15 Jan 2026 11:19:31 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vgLNz-0003bC-54 for xen-devel@lists.xenproject.org; Thu, 15 Jan 2026 11:19:31 +0000 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazlp170120007.outbound.protection.outlook.com [2a01:111:f403:c101::7]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0f2361ce-f204-11f0-b15e-2bf370ae4941; Thu, 15 Jan 2026 12:19:29 +0100 (CET) Received: from CH7PR03MB7860.namprd03.prod.outlook.com (2603:10b6:610:24e::14) by LV3PR03MB7431.namprd03.prod.outlook.com (2603:10b6:408:194::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9520.4; Thu, 15 Jan 2026 11:19:17 +0000 Received: from CH7PR03MB7860.namprd03.prod.outlook.com ([fe80::f5ba:35df:1c9f:b343]) by CH7PR03MB7860.namprd03.prod.outlook.com ([fe80::f5ba:35df:1c9f:b343%4]) with mapi id 15.20.9520.005; Thu, 15 Jan 2026 11:19:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 0f2361ce-f204-11f0-b15e-2bf370ae4941 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RpLNlcoW4ZS/4PZdX86LFV4SElXBvYn6qZyvpbWap/HT0iG/p4VXsDO5JqcxRInLmZximCMpxDuB9JW8O6Hzks3boKV83inZMmJwI2xhcJCE2H81xOLZCxJf9iWs0RRPCPByy11seBucIPDz/2MIptMHp/WNNLWNCzQ04DbGrXt2X9yVodimHSKxOrA/M4OfxhjmnmObXISDzbFzr/dZKmKBcwJ/0JISn+FhX9hXhZgvHT/saZFiZrqyiMohebuCd2KrNXHa57ZZc9i89V2RHrigzPVByU0FK4N0wefTJdihMAxKy7II4+0491CmikWPdYW04vO8bKUVMY9OS6SxYw== 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=qYRYoLFH/OVP5b6Hea05RAtPOi9OmM1ZzKogWwOxcy8=; b=sraHMv1h8XjJ0TMXDeyzLdU0YFF2FGreysT32lKNpbJ7cO2wux/HrLt3pAXu3ii2CzqoXaaUymLCFIxrnd0Dvnd+r1bRqGOIGxQ6YVEFDTUaLl/7aNfv57sa12YXf1H7LW+ITqXPsaNTWPD0MKu3MZpRC7EfwaDN6e911/BzKreLh8QCM6ezTXyhaHhvIpgvI35zU1stm4UGr/VyhzzqHngKob0b4t3mZOeWTCrfBIWKPp+fgDygWVmJuQHwi0yNiLcyGMfd3UvGewPzUQ/6Ob7OeWzZRBhcTGzjLuNCGYmWx2YIV7hRs+UTxERwrAd6wpowRi4IuHOdtvD+N0Cw6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qYRYoLFH/OVP5b6Hea05RAtPOi9OmM1ZzKogWwOxcy8=; b=arjkhKQS4bbdHaQYk9pWVhf+tZcdB5E+v1doX47iWoT1jNeuAVAVlMCZWF0kEDEE1lKKireneNb7ROI50Ung1z+9UdEPlIVDeLw46aOLrrh6Fgqft/M2RJLjNyLqotbN3kdvHX2jtlb/v8zQnPfGyoqhLoXsblNDWO4w1AZBatI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , Stefano Stabellini Subject: [PATCH v2 3/3] xen/mm: limit non-scrubbed allocations to a specific order Date: Thu, 15 Jan 2026 12:18:04 +0100 Message-ID: <20260115111804.40199-4-roger.pau@citrix.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260115111804.40199-1-roger.pau@citrix.com> References: <20260115111804.40199-1-roger.pau@citrix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BLAPR03CA0160.namprd03.prod.outlook.com (2603:10b6:208:32f::25) To CH7PR03MB7860.namprd03.prod.outlook.com (2603:10b6:610:24e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH7PR03MB7860:EE_|LV3PR03MB7431:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c766822-244e-43d2-0faa-08de5427ebff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?B?WkxabVFJQXRJeG1WTmtaUHltcE9aa2ZnaklYU3cwK3crU1Z3TjJUd2I0Z3l1?= =?utf-8?B?WVNqQjJuVVp4WmNjWnZhVDBiakE1emJpdXNhTnUxb1F4dkNuSHhsY21KN3p3?= =?utf-8?B?eGpHK2p2TWxhbitqNzdNa2FGZUk4WDE4L1pQNTZNTXhHTGp3cGp4MGlmZGdj?= =?utf-8?B?Z29BZ1pIK2FobmlnOWN3dm92WlZ1TjNkdnZSSW13cGE0L2o0VlBwcUk3Yk05?= =?utf-8?B?Z093aTN4WHA3dkJUNnNwNFk3cnlpWDZqZ05BbTFwUlZOajBjdmlWOUU1NGV0?= =?utf-8?B?Y0ZCaXVnVC9nTTErUUx5em5JTEdnaE5YRWpYRGYxQXJuNnA2QlIyUG4vZVg2?= =?utf-8?B?TEpwbkE4a2g4R1RSbkMzRkUvVU1LNGRGdmxJWFdLNExVc2tSMUw5UytSY1hO?= =?utf-8?B?NUhNY2tHUWNucW9pY0VHN3NvRzRVc21LMzg0K29SYzB4WGNkaHo1alFGMjJN?= =?utf-8?B?d1ZJSEgraXNGUTdFM3VUdDFsNHE3akFZbGYySXd3UkQ1ZUlURGpHM0RLUE1s?= =?utf-8?B?R0k1M29sMzE0eHB4T3lCc1VhUG1uRHZIbzJWUDh6ZmE5WFQ3VEQ0ZmpGNHpi?= =?utf-8?B?M3RMcUNzQ083WFhoNXZRQ2V6TXFibFBwRDRZVlFZZldVTWp3aU9WdStQTkF1?= =?utf-8?B?RmlyQzhDWXhOZXZFaFNoaFM0R09Dekx3WnhJaVhBTWZIZStrMXNGdkMrbmpI?= =?utf-8?B?eE12dGM5cnhWQkJuQnZFOUVvcFAzdHlOeE9IcGtpTW9sRjd1dDBiUUowZmpv?= =?utf-8?B?eE5tQ0hoR1dROTNoanJ5RFQrTkd4L05ac2dDVDk0R1p0NEozSDgxcU51TUhq?= =?utf-8?B?STd2UmVyMlQzdkJySVBKNVdINS9wU3lVcDZLVk9nT1l5SWtXRjduc2dYVDE4?= =?utf-8?B?dzVVbDdlZ0RQRWowN2RiZHM3WTNUYUdudTlTcXdTV1lFYVdtd25BMnp4aDZu?= =?utf-8?B?RTZ2RnNtQlJVQ0xUVjZxMUl3bllITEZzcGR3cDNWaFFTeVRVRVZPZWhzUzc2?= =?utf-8?B?ak5Fa2FKWXJVZ1hIOEZkNmdvVTdMMkI2eEZkeGN2WFFGQWxQclVSZ1ZTcTg0?= =?utf-8?B?dWgzeWxkQ0hkSzZxOEx6Uzh2ZVhISUhmZGVNMHpOek1ZZzloR3ZUVzV6am1u?= =?utf-8?B?YklXalRGSTQvZEIyTExNSVlLRDM3ZmoyZDVDZ1JKc3FrSDIyNHNaTlhCbVQw?= =?utf-8?B?RUpQVkREaG9TTm1vaHNnUVM3STNHd0pmYjFvSGxyYlJpaDhmZjlrZkh0bTht?= =?utf-8?B?NElPTy9PQ3ZvLzlaMUdpYmlrTHVvUm83VVdQTGduS05oa052RXlWZFZMY3ZE?= =?utf-8?B?SzlPUXFUQUg1UXBsVnZNcDE0alRlMWRJTnRZN1F0bVZVM2w5TUZSMUdWdTVH?= =?utf-8?B?d0xYdGJCdGRzSlgzVmFIYmlkODBiL2cwQVpoVEtQY2c2MEVXUzJBQ25sWkV5?= =?utf-8?B?OFA0SG9iUHJoTFF5V2hOTmh0bWl6cmpzckJFM0pnQ0JEYU9SYTZtWVBnYkx6?= =?utf-8?B?dS8vOWVRZElGUWYwa2NKTDhoY1BWblVUZlBId0N3S0lSQ0puYnFhcDFISjJs?= =?utf-8?B?ZzNpRDR0dWo2TEs4cUM0VVdMWGtOUjdBNklQRmJ4RkhxT1BueW5XOGFCMVQ4?= =?utf-8?B?c0hEc3plOEszUk1Vamk3b2cwYmhFWWE5SGIrTHNmSzVHcExQbVIyUC8zUWxX?= =?utf-8?B?c1ExZXVlMXZJM0hxbkR5VWJCV1d0L3JPWTJUMjhlL1dOZGxOTlIrVFBUekx4?= =?utf-8?B?WnNKOTJZa0JSdWg4U1dVZ2JPamhRdzkyVjhXTTlNWVVWcVhEMDJqRzdKamNQ?= =?utf-8?B?bmZyeDhKSFhlL3hrU01vMzBwWHp6WWRyTmdYUm9qbTZoOWp2TllnT1lNKzBp?= =?utf-8?B?dFVvb2VIcGVnZGsyLzZzdXc0Wmcxb0dxNytTUVdlaE1EVCtKeUIzaEJ0TURO?= =?utf-8?B?L2xya1V2ZHRkcFN5VitWejBScjRhOHBjNGYzTForelJ4dnhnZk84QnJqTzhR?= =?utf-8?B?WnBVQXJ5MXBEZzh0U3g5N2hqZi9uYXU0UUo1ZzFZMlRYeGdsLzd1SzF6N1lm?= =?utf-8?B?bi9Wcll3QlZSL3VLYUN3SitocXlCNk9OdXVmcVJlaldmRG5YV3BxYW5heHNs?= =?utf-8?Q?tveM=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH7PR03MB7860.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cU80ZzRKdzIwRTlrdlF4VEdJQkdkM0s0Q0t6bFNsYVlwS3F3cngwRVhIbUh4?= =?utf-8?B?cXE3cjZKaXcvY1Y4dmxpVXdFcHlXT2xYM2dLeVVJUG94ckJFT0dUajFhcU5x?= =?utf-8?B?RU5HbUJid28rYy9DdnRtVjFiNy9KSk5xNjUzZGlQbk8xN2VwbENkWlQxNTdP?= =?utf-8?B?REhhVUE0c0FaOXhTdDZSbDVOUlVqSG83MWdpeER2ZmJWUVB6ZTNXZndBVkh2?= =?utf-8?B?RkJFS2JRRE5mR1dIMWhtSTVRUXVWMEo3cmhUaGNuSVZXLzJzYjlLblFzUjRU?= =?utf-8?B?S0dMcUhXQjBoVGI5bVZtUzlYQU05Zm9QN1J5VEVkcTcxNXZPaEpPTjlZVFBN?= =?utf-8?B?L25TZGoxekRyOC9XYlRQZUUzVEJ2OEd6cEVMQjdJWDU3OTQ1a3Q4bTR3aE5O?= =?utf-8?B?TVF5cnpPNTFmMG5Id0xLNGNLOCtvY00yQ1BvTVcyV0NPWkdGeW1sSUUraklH?= =?utf-8?B?ZGlURTM2b09yVElEekZpQ1Bna2VQRGt1SW84RXV6V29ucWdNYWwwYmRRaVRU?= =?utf-8?B?dGJhRWxXM3Z0djFTbzdXellCT1BXdGJPSEtBWDgxaDBydWpmdFM0QWxLNktl?= =?utf-8?B?QkNJTDdlZXpVZUZqdmdvUFdaMEdic1NiS1B6cFpJRVpaajdzQ1lOZHVFKzNn?= =?utf-8?B?T1VVYXZnaG5MWitwU3RVLzdCNVhQTHp5eFZwMTBqRlVWYVltVFlEOVh4dDI2?= =?utf-8?B?N0FrY0FSYXhLVlYrM21jaUkrcDliSVErNVBpQWRxSU1ZRTdlak9TMHh6a3dP?= =?utf-8?B?d2FJUG05RDNmeXJ4L1RJdFFPQytOVDB5SUlaOWgxWWpjd2tQVjA2d3drZ29j?= =?utf-8?B?ek5oUjVheU1sN2ZYSEZ3SWZ0SGwwMEtqWlpPOFpKNzNFUXArMFRMSHNxNjJi?= =?utf-8?B?Tlp2NDZsSGtlS0R4QS9adHJoNklxR0RRN0t6cWlSY3VVRzM2ZXFqRXBDbHk4?= =?utf-8?B?Y0FydHpaWklTbUtvWC9SYVZETVkrVDZvMXRhN0hKM2lydC8vQWJGdFJVNWxX?= =?utf-8?B?Tmx1VDB5WHZmS0RLYVE0OTJzRURWOWlVMHBNZHQ4UjBraGJNN2R3K0JtVFBq?= =?utf-8?B?SndwTWFwcy8vSWs2UmF4T2MwSlovUm9HelVIUnI3VjdlOXhQbzcyV0cySnJQ?= =?utf-8?B?NGhYYUVRNzRqSjM4OWQ4ZHF4R1FYTmJtajJrekpnQk5PZTA1clFFc2NIc0JV?= =?utf-8?B?NUZjR3czUXF1RSttbUFRcURRNmNRank1UkpFMm5sMStXZmJwa0VRQ1pad0Uy?= =?utf-8?B?Q2pUN2JyVDlhS0c5V29hQ3JsVEVtamxsNmlzcEZHcTZHSFFKQlFGQjhzSWhT?= =?utf-8?B?bENOVGNrT0VGcStuZk9kMC9zQ3F1UXVSbWdLdGRsYllNZmtqZHhPTzhIUzli?= =?utf-8?B?VWhTUCtnTnBnaXJkMEVNRXp4SVhObGh0RG1RL3ljejJhWVp3aHEvMzJreDcy?= =?utf-8?B?VnlpTDBXYzRkdk03bjNOR1padkM0UWRkaTBkWnBndExWNE1YMGkrVHdBZC9J?= =?utf-8?B?UTBEZm5pSmVxNWxpdDRGZ3BCS0lLNktiRkF6dTRlMjd2UUxzazhMdVRydlAy?= =?utf-8?B?VDl5TkpaNnppaC9VRndNekdVbUQySkdhdGV2YnFHTXU1ZXU3dXA1dS9lZFB6?= =?utf-8?B?QUxDSDVmL3FjdXplSFMyanpidUZhcVRWOWZQRDBYTU5LVFVKSUlIdDhIMVJ3?= =?utf-8?B?RHBBcGFoQ0RNVkJqMmpUdGpEby9xeTAybzhIRU5xcHJkenplemM2ZGVCMjk2?= =?utf-8?B?NGJkcFdwS2hDd0lRY0pBVEhqemUvZmVqaHZWU0hCempDb2gvOWUzc3JqV0JG?= =?utf-8?B?bDk1TFJlTzNEd1B2ZWdyMC9PNHcxUFZsaU9VMlR5Y081UVk2MkNHVWgwMjZP?= =?utf-8?B?TktUTHVtdnFiNG03V0kxck1EeGl2L2l2MDZKVUFYc0lCNFZ6NTlhdnh1NHps?= =?utf-8?B?VmxzOGRGY0VmWFZEWk9uN2dsQ0JUQWR5ckN1MDQ2QzN5bFFvRS9QVlZJTStU?= =?utf-8?B?TFZvOHZWc0t2cjczdXhtb3NZK0RyMGhmeU02TzJObEt1eStBeitLNHRkRy9j?= =?utf-8?B?ckY0LzFSL2FjVzIwc0JoMHY5RFZtZGVrSmkyUWFTMVdwSGl1ZjJ4aFdycmdW?= =?utf-8?B?ZGVaekN1Mk5JQmxFckVDVStHR3hGWUd3OXhGT3c2Qnd1dzVqaUI0Ym9NcktI?= =?utf-8?B?UXQvSDcyekE0NnZDdjVVdGtMNDVKUWRyVDRrMVRaS2cvVld1YXJEb3RPbG1B?= =?utf-8?B?YmhuSGpuc0NuVlA0d0VhZFhuNFJ1djhxZ2U1WWpueFE1MTcxWnc3TjZjNU9z?= =?utf-8?B?aWMvSWRqdnVIdCtFVlpuUUdJalc5NU9rYTFuSGdieGVnUUJxTkExUT09?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c766822-244e-43d2-0faa-08de5427ebff X-MS-Exchange-CrossTenant-AuthSource: CH7PR03MB7860.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2026 11:19:17.4639 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: J7bUeytQMKGfayYO+GtGefv2lU2m8PotS+zopPiep/Qq/CaqL3/icEpJplAark2nUvx5RmaClqxVzeefUMCu7A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR03MB7431 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1768475993986158500 The current logic allows for up to 1G pages to be scrubbed in place, which can cause the watchdog to trigger in practice. Reduce the limit for in-place scrubbed allocations to a newly introduced define: CONFIG_DIRTY_MAX_ORDER. This currently defaults to CONFIG_DOMU_MAX_ORDER on all architectures. Also introduce a command line option to set the value. Fixes: 74d2e11ccfd2 ("mm: Scrub pages in alloc_heap_pages() if needed") Signed-off-by: Roger Pau Monn=C3=A9 --- Changes since v1: - Split from previous patch. - Introduce a command line option to set the limit. --- docs/misc/xen-command-line.pandoc | 9 +++++++++ xen/common/page_alloc.c | 23 ++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line= .pandoc index 50d7edb2488e..65b4dfc826b5 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1822,6 +1822,15 @@ Specify the deepest C-state CPUs are permitted to be= placed in, and optionally the maximum sub C-state to be used used. The latter only appli= es to the highest permitted C-state. =20 +### max-order-dirty +> `=3D ` + +Specify the maximum allocation order allowed when scrubbing allocated pages +in-place. The allocation is non-preemptive, and hence the value must be k= eep +low enough to avoid hogging the CPU for too long. + +Defaults to `CONFIG_DIRTY_MAX_ORDER` or if unset to `CONFIG_DOMU_MAX_ORDER= `. + ### max_gsi_irqs (x86) > `=3D ` =20 diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index c9e82fd7ab62..728b4d6c9861 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -267,6 +267,13 @@ static PAGE_LIST_HEAD(page_offlined_list); /* Broken page list, protected by heap_lock. */ static PAGE_LIST_HEAD(page_broken_list); =20 +/* Maximum order allowed for allocations with MEMF_no_scrub. */ +#ifndef CONFIG_DIRTY_MAX_ORDER +# define CONFIG_DIRTY_MAX_ORDER CONFIG_DOMU_MAX_ORDER +#endif +static unsigned int __ro_after_init dirty_max_order =3D CONFIG_DIRTY_MAX_O= RDER; +integer_param("max-order-dirty", dirty_max_order); + /************************* * BOOT-TIME ALLOCATOR */ @@ -1008,7 +1015,13 @@ static struct page_info *alloc_heap_pages( =20 pg =3D get_free_buddy(zone_lo, zone_hi, order, memflags, d); /* Try getting a dirty buddy if we couldn't get a clean one. */ - if ( !pg && !(memflags & MEMF_no_scrub) ) + if ( !pg && !(memflags & MEMF_no_scrub) && + /* + * Allow any order unscrubbed allocations during boot time, we + * compensate by processing softirqs in the scrubbing loop below = once + * irqs are enabled. + */ + (order <=3D dirty_max_order || system_state < SYS_STATE_active) ) pg =3D get_free_buddy(zone_lo, zone_hi, order, memflags | MEMF_no_scrub, d); if ( !pg ) @@ -1117,6 +1130,14 @@ static struct page_info *alloc_heap_pages( scrub_one_page(&pg[i], cold); =20 dirty_cnt++; + + /* + * Use SYS_STATE_smp_boot explicitly; ahead of that state + * interrupts are disabled. + */ + if ( system_state =3D=3D SYS_STATE_smp_boot && + !(dirty_cnt & 0xff) ) + process_pending_softirqs(); } else check_one_page(&pg[i]); --=20 2.51.0