From patchwork Mon Jul 25 13:10:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12928041 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A43FDC43334 for ; Mon, 25 Jul 2022 13:11:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.374593.606660 (Exim 4.92) (envelope-from ) id 1oFxrF-0007iR-E8; Mon, 25 Jul 2022 13:10:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 374593.606660; Mon, 25 Jul 2022 13:10:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oFxrF-0007iK-B4; Mon, 25 Jul 2022 13:10:49 +0000 Received: by outflank-mailman (input) for mailman id 374593; Mon, 25 Jul 2022 13:10:47 +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 1oFxrD-0007iD-QS for xen-devel@lists.xenproject.org; Mon, 25 Jul 2022 13:10:47 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2047.outbound.protection.outlook.com [40.107.22.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 31f30ef8-0c1b-11ed-bd2d-47488cf2e6aa; Mon, 25 Jul 2022 15:10:46 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by HE1PR04MB3115.eurprd04.prod.outlook.com (2603:10a6:7:1a::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.24; Mon, 25 Jul 2022 13:10:44 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::d4c4:d01d:5d39:920c]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::d4c4:d01d:5d39:920c%7]) with mapi id 15.20.5458.019; Mon, 25 Jul 2022 13:10:44 +0000 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: 31f30ef8-0c1b-11ed-bd2d-47488cf2e6aa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g7hV+7GWpfMnXoUgxk1J3AG6bf0RGtNWCsOe4mDbP1AFiXPPAIfUsatCM3Ju9PCJ6kCxwI1j0ZPjD9qmItBbtfoHh3DNWmISNW2bn+CVh/3ikUaNP96QpJS1LK/hhz4zcgkWpZPkXVaXxC5S6i9ZeMTinA8DHJFadvZCYmirhrWhcaPkXu//xtF/f0z7pX2rN7cb/2HTN9Xyyr4lS0hXz/66q0Yu6Rsr53OXrfT7R2bDka6c4M8BaYEMp4hFHy4tl7JEslemlbXkmK2cLjONLmYV2Kp0cu5tc9w1Lg60Y6j6EQCDSw/pTrd33vs7WG0vIYqeYnSNiPAOYPK/HiCbfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2Y9bbWTZkIjkIehIg0UtM+rMqcF9EceSJLRI57FqFxE=; b=TATjkFkkXOJB2TgbHallS+C6lTCuqdTRum9jU0QhQklZIHZ3v2w5nfO3V+vV/HjDRpEbg7gb5tYHssqupeIkX29R5Ju8lUZntIslw5yNfWVenudXFMP/5iLpDphoeZFxV7xKmmT9oesfGWOll/bht+Oi2bHRoJbzuCORjv6mMdFYZznbUTISn5EYWJ1ZoIFiRbKmChwFWSVRlkJ5hNS6qgScGQc+FWCFEmLfDYMGDjIqsqJG0LL4+ffDTL3wHMaYTKUu86TvYCJnZQNF5jbOC8l1bdFjrBgND0EkVtaiYLeNBoa93lYvg2ikIlnclij47WODzvA3t221kIUh8hJOVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2Y9bbWTZkIjkIehIg0UtM+rMqcF9EceSJLRI57FqFxE=; b=rKGazL1OEET0smcw4rmwi/bogfT6QQiS2R784G0UXD99/U7/02Ym/kGsM9xjmGxIMdpEHU1U+c5tiOFIf973MUA4lpJDIYsSkubhIZ267vzwn8QBxiTz/hV9Dn4UWQL4VZQcnSub4MIE927p+gIgqLhA8PRwgFj9uJ9YHGoNJIRv1ET/fnulwVeZMQjZ3B7kapx/Q5tCH6QNMaw1VAy0dU09hC6KwdOXKHaTZn3PgS/CKsDyg+2INtvALwnkOn0QMYoas8zdaKldxa8E9zeyMIkrxNc7jTyHsFNCWUllJ5AOOtBktU6lPrN59SQkZmE023jf2U+f6ElSxj2IqH9Ccw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <473c82d9-0f81-b4f4-70a3-8dfc3beb2be2@suse.com> Date: Mon, 25 Jul 2022 15:10:42 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , "Xia, Hongyan" From: Jan Beulich Subject: [PATCH] page-alloc: fix initialization of cross-node regions X-ClientProxiedBy: AM6PR01CA0069.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e0::46) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dbcaea2a-65cb-4853-ee23-08da6e3f1541 X-MS-TrafficTypeDiagnostic: HE1PR04MB3115:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M2gCZ2IR9ZSLWvPVOs9PHXl+Si4IwfVPaIU+2AaPLMotonQrW37VVyr2+zQF8lxtYsOtezlwDAxOAikmtryPUNyvpV29Kd0iCbAPU/nVHDqm/mu1tNXX8RPNQlVjihSHjR4mmV/1QToiOYrVvFGQiAUcxAidouMFvETGgGWfjPfTzXjSjV3OXvzfuARgh98FKw9ii0lxvfVnBKy2F0jjwrTnBAxxEyA2E/cAlTlVMouy8A6FW3lzU5/+Q5+tt8wnLsdcB/sCTB+dGoGMH3qwMW5ylfXz7PesVV7sBvwOM+JBiIajgw+dGUnzql6GmOmaPusEjOPOz6s9NWt4yvHsGppyLXwTlEJbDeTwwtXjYm16V+nHjR3TG+kdBjKNwBoJoWQ0z/Z7IFz6Srdhspy5VA4AAGY+iBTKZpJ7AUFSzcWzRlXRZ4ArnB5UGd596FcXr/qYgmGMBxA1dJipNCcPWqtluYvkBR+fqxiifqx8ZWpAXUIhjfoDCjWzqLBV9o+6NQwoMjcfQosqbKPk8yiX4nmKtj1KuPrwcW+m1QXn5wlBbzUZBRaQnNCGQulknl+TJ2TwA6s8vUNNgnMCPfSD+TWZ9r6PIBoSc+zR0bW+IKuMlWNEjF6yAL09/CselCcscu+z91UKzAJRqzBwOh6w8l/H9+Pe4wpbRM8lUH1QfofyWm7PW1T/6oXAaY3qvYVAmlaDUwzMMQujxxSS1ZdHLp+9FeYINtwlOER5ZpfjsEoSLTVewg1Yz31mB2NjAVOJG5AHfs33ShR1WIMMyMmOI+2gD9zJTeB3EY7cqt+dXoJiLZNwj9s8MKZzHtPfvQ+5wzLdQnrt6Pi6TyeywclGYQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(346002)(366004)(396003)(376002)(39860400002)(136003)(31696002)(86362001)(41300700001)(2906002)(26005)(6512007)(6506007)(6486002)(4744005)(5660300002)(478600001)(8936002)(83380400001)(2616005)(186003)(38100700002)(6916009)(8676002)(4326008)(66476007)(54906003)(316002)(31686004)(36756003)(66556008)(66946007)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?QSvDwFilYU6ul0HV5+1IhZ54VNQq?= =?utf-8?q?LlPMkQ35XvfwjlxHbd7zNWRNI33A7eq5AHtBhuWNvKv6da6kJxwB6NzpBU/nDeYkC?= =?utf-8?q?uu7Nig1u2HwnGEYkYAnxY3yrciDEgHdWSRCblgjMfJx9wyncyK4xBRi2Ovyf2+otd?= =?utf-8?q?Cy53shl9s82f8k5cigYIWbLy5X88XusvnTNP2Gi8zEpijEZKc/nfWqvc7HeJa4XwI?= =?utf-8?q?2PYoksOfd3IfgE+Jdq5dfKj+aioEUBC/SQuqH3piRp36nA7JoCspPUSBNrnOK2cNn?= =?utf-8?q?/ECufHTlo/rmrCfeOugqfI+b/nlj6DfON6Whtc6FKAOWJ0DpU7jC4Xw+VTDf3Qy3v?= =?utf-8?q?2lfw3SL3Ws0Wxzp1btCcaOmyH298qQ391u4oTe/CrR/LVOeFtK4MZShXPAlDXk08H?= =?utf-8?q?Dks9gyj6UCxi0dQCiWDUtFo+YdWYJJbf8ct0ENEw9t3YEq+afZjH1EL9pElU1CWSb?= =?utf-8?q?n+VE3x2AnUX6AH1ZpfOdLaO1dylsUfE2q7b2X5JNAB8y2QH/L3CTiWiKFoWnEvFgy?= =?utf-8?q?NLukZ8Q/Mdh3rZdICSAyE2COzbqCK9CfNuP8eeg/bLgN67L76eKUnrqOSmtvtXLsT?= =?utf-8?q?War0H/fjvcx/AjAYVXNB8emWT00MjA2lHPd35adzh6XVZwFN9ut7d3EAcWpfwTCM2?= =?utf-8?q?jWQ4FhQR8QDLqSt5D/EzcBEgWaKsyUmgy9KSyiYMys0pRi0Xooe6h0jpXZMi7h3KN?= =?utf-8?q?KfGFOOcHMB85ltJy3Gvmo4iEv4g+ZpUygPByXanmznzLAq4+a13yQstcohAc/oTRq?= =?utf-8?q?KW+xv/lWmzVyvYIOT/PRdFZ0xtO2yJ5hajzsr5LC168HcoStA+jovw/vBl5KFdOxJ?= =?utf-8?q?YkVN2oFh/X3krhnM61f+zKCjIxjgULEA6S3n5c3rmdhGzQBJA8x/E1rI0k1JFC4ML?= =?utf-8?q?JeOEYA+pd3chS+lZakScjaPIzxHqYoh6qsBwCBkh76MkldijnoChSv/fW1IOnehFc?= =?utf-8?q?9CJY8nbYDi65p6XkwMGcnnTmHNdK4NsDquQrGtbtHOnTmtQORQDCCIeXKWp0IchZc?= =?utf-8?q?13ewXo0daWaz2ag4HoSs3DLUKgQZ8amkqGia5BBQA6tqJbBD430WYwWtrp+vNVvjr?= =?utf-8?q?YUsy4t7rdWagMBl1oBouIDiE1ZWHkbO7Z5umlAtMeFEemvpapyjTd6O8qlwBbQfqI?= =?utf-8?q?kt3Aez1mRv5fmCTKnjj6qbwXxhNpzwoe8bEWSWFYAif8pXED4SVBEYinv0oX2tF+2?= =?utf-8?q?gc9ZtZkX0OHJADWakQz9i1pLzHBo39WStuQw8i4MMiaiAIPq7/RZd+gVNta4wMrwR?= =?utf-8?q?VXUUWRMDRGe6ydY3YwI2rF7VrmOl/CfO91kp3T0vaei+p8CHEXrM94tB1KkSRudg+?= =?utf-8?q?o6kdk+UKAF+KqCDkUIp5K7XSXthEMSCGjzvEY28IQfpgmwFDIKoAhs9efP8ZQzRKG?= =?utf-8?q?dyGa49Domw4DZdRJ72TAhpjNfuWk97plhIbcBxVTtORYXvyjXnudwwVOSlxS6w6/8?= =?utf-8?q?X4un/8iG60OdZyVabcK7DwXkm1hA+Q6MnALBcvBzKq/iNfYc4w6oBSfV/NJURx3E0?= =?utf-8?q?XSEwrW89Bqmi?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbcaea2a-65cb-4853-ee23-08da6e3f1541 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2022 13:10:44.6233 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nA+yFO/2Y0m8IJppJlSYR9brnyzTq+vzIKLTTCp+JE8XDnpREY1PplwwSnk6bKIvB1p5aLDTFxG0+Z0D8OvNlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB3115 Quite obviously to determine the split condition successive pages' attributes need to be evaluated, not always those of the initial page. Fixes: 72b02bc75b47 ("xen/heap: pass order to free_heap_pages() in heap init") Signed-off-by: Jan Beulich Reviewed-by: Julien Grall --- Part of the problem was already introduced in 24a53060bd37 ("xen/heap: Split init_heap_pages() in two"), but there it was still benign. --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1885,11 +1885,11 @@ static void init_heap_pages( * range to cross zones. */ #ifdef CONFIG_SEPARATE_XENHEAP - if ( zone != page_to_zone(pg) ) + if ( zone != page_to_zone(pg + contig_pages) ) break; #endif - if ( nid != (phys_to_nid(page_to_maddr(pg))) ) + if ( nid != (phys_to_nid(page_to_maddr(pg + contig_pages))) ) break; }