From patchwork Tue Mar 11 09:04:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 14011330 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 B2F81C28B30 for ; Tue, 11 Mar 2025 09:04:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907438.1314692 (Exim 4.92) (envelope-from ) id 1trvXM-0001H5-HD; Tue, 11 Mar 2025 09:04:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907438.1314692; Tue, 11 Mar 2025 09:04:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trvXM-0001Gu-DA; Tue, 11 Mar 2025 09:04:32 +0000 Received: by outflank-mailman (input) for mailman id 907438; Tue, 11 Mar 2025 09:04:30 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trvXK-0000nU-HI for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 09:04:30 +0000 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on20604.outbound.protection.outlook.com [2a01:111:f403:240a::604]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d59ffdf0-fe57-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 10:04:28 +0100 (CET) Received: from BY3PR03CA0018.namprd03.prod.outlook.com (2603:10b6:a03:39a::23) by BL1PR12MB5851.namprd12.prod.outlook.com (2603:10b6:208:396::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Tue, 11 Mar 2025 09:04:24 +0000 Received: from SJ1PEPF0000231E.namprd03.prod.outlook.com (2603:10b6:a03:39a:cafe::9a) by BY3PR03CA0018.outlook.office365.com (2603:10b6:a03:39a::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.27 via Frontend Transport; Tue, 11 Mar 2025 09:04:24 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ1PEPF0000231E.mail.protection.outlook.com (10.167.242.230) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Tue, 11 Mar 2025 09:04:23 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) 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; Tue, 11 Mar 2025 04:04:18 -0500 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Tue, 11 Mar 2025 04:04:17 -0500 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: d59ffdf0-fe57-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ApwisKWEWA/kDPsohgQvyPNJvq3+aF8oML3GPR7pj5Tsh3mp/kquWGwdP+qteNqqJUIdpS0M1KO+CAK8AK0czhJdiPzPh5s47ar44zIa1hCRVYjPL2rDWyo4pY5n2HRlHYuEhBOqTKzAWusM8LQyz3hGWD8ImaLMkKkPbeAEMDfEogVXG09iXAUby2O5wPY3Lopr6Cx+CInzgcHERtCTeLrjYAR9T9Yya98Asrx45wQqLWBH40hYQ6sdl7uTE1lA2z4Vurbma9i+7u8BN+t4XZ5G/18LXnjYT219dIFGUVbwpTMzCKd4QRxTeByjGoKFNXpa2iSitgp6hEw7a+gIuA== 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=09ybYecYRoOEzAvj3BYdvry8lchrGyNnjUK7uSVH+5I=; b=MgCYOhDP2Hsa5IZKEzRMMLdnIqLKZgU0z1ULRE3ynoKOA82KglymesijSBwE/YpzxejBWA3sJGdWOP6ha0cAf1wD6D6StuIWSaeRT8HMw4AvzTKhg5t1U3i2k9KkL+Cp4n2fH9Wv75thIezNv1BGbGALvZq6AqQK2lGNaevz4CoM28JSwz06D7M8qu1tA1YFqYEv51Xcwkr2Qwi0p6H3DY5vnNZ0oy3WRETu2jzoF9TLFXIYU4LK6n0NvaS9CJCWhc6WjzLnQGRlmHmM3UtStm3a4b4rDldgmBO5AkUQ+GUagghV3VsONxsfWpuMymRzkQfOhVVC/SKsTm1c91zhyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.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=09ybYecYRoOEzAvj3BYdvry8lchrGyNnjUK7uSVH+5I=; b=dfqjPDKbGsyiu4DQGFXtcNbqwLcCju1XEWkCK2wSURgPwgAAwDqAwdOufv1rbmqpVGIKwBjHWm1yTVmcZQO4MigPpVBllrRV+iqeo621C/p1mh+Nb4jH3VTLOKarsUtqQypHsdk6kk/s7+yav/KQxUiA5IH+bdpMHmieoSPMJiU= 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 From: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk Subject: [PATCH 1/2] xen/arm: Improve handling of nr_spis Date: Tue, 11 Mar 2025 10:04:08 +0100 Message-ID: <20250311090409.122577-2-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250311090409.122577-1-michal.orzel@amd.com> References: <20250311090409.122577-1-michal.orzel@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB04.amd.com: michal.orzel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF0000231E:EE_|BL1PR12MB5851:EE_ X-MS-Office365-Filtering-Correlation-Id: 54dcec8f-d655-465e-8c0c-08dd607bb7cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: GDXvmGubcQy3cxVIm1WFwouJwJ3lFV74KGPtYVhF1Wsol7vvD5XOoCt5qdmg8e88jN3NDj9vSpIOdfRvLVGgbnMz0Hg4aQOFYQoflPe+t73ux0n7qWUDiKknydr8q0Kks0DG2/+nvkjXgx7NZC/2GlmXUkLvZ8mD8wRmvZr7nOE9UNmBINkpfgJrtYrzfeK8h8YJfI+zPxt8XXEK9SNGXy9UfcdB/yIdENgGBKq92JjHHkleiiCMEAf8wLkVP8NzVA+pTdFDKnmKU8RAadqgCRy0aZyZesyFZjZrInJ2wiFxB4qOuYL8YSjgRx/Avvh5Vp0toRxiFSQsDfGCwApRAOjALBPZLwbttf7unRurvPc96vmAuCpTzRqaCBmghYz4tdStruvXfKByZ76dm/vqVQ9bJ3o8JHOsRucHocJyUNcVa+NAuoScOrPaNPR0BqiUvdxc31W+i6NM4h6Zbwo8ZO+6/SDLuRnR9Fuwro2VvLEp7rBnFhlD0KhpP6H86WOHQDqgnSL4o7r+td6xoXcbwJleD0A6zZxi4aBC9eQbRHMarNzYo3qFDOiy2+9S6teHEMfMlxAsjpTVQgYSxmST6KgfVphaBfCcuYTkgvANMofM1AgWtUboWzUR6r+xIWGVugZmjEm9PoobtEGB+JSEUTrJHrfaCdR4th8a8O51JnclVlRsvgdOIBDg95PY43uCUq0DUM9fpJ+8JMgNzmcHJUVtEQ09f4Uv7yo0pxtA9PbKjpUuwL1gP41fcpRAIDswRrLDlmiWNMj12J2++4Ufic4KdRHhXMGBBcAVcU8Yl7L66OKvQrhQFQhKzbyatoHO2AmTr7AiD/QG3pFjCUhQwn0Aljn3dliMHRyucBiRuqUm1KJ6vI+RXn/+hB8aI9sWIpul3Cdt7MN//3vEzbZzAxtAwj3lSli5mUCo3rhGUkOJxCfFVmk1se0k2FWbo2n04ADaTRB4rqQrqNqiqSJxFEr82LHzHmIVd2ahJ07TGIbiE0NI3cZx94R40pHIHPxpLoP70yvQcEdFy4eYn2G3eD1FptJ5r2uINvHlAxFwxYFIGG54OQyLxEPggW7t1c+n23ZEPEfC1nOCwmjwad9bVEV/27vc1BWX0IawZ9EKhtPhG5xiMWWzuRQIM3E1uhaLUQtMHdoQJSdRjKWm6g4PJwX/yRnjmBSfciWoByHa2N92IwMSxlJjR1NJwj0qxrXM0AW9YjUcrDsK1cJKagp7KjwhpRKJu4vLHStUj9g1oVQ+f/V0JyRTOjITLwj9CbEYnRiGmhhi+GL3bIoY3291pE5mpCjFbHw4SZx4CMyMO6gBerJR5pygyxm5mjg7heNpCDR66n5MaPcvEbXXYkn/WS5l1ECNwX2NZIl/KNHIA2T7JLNLn5+hHPM77sTB1N1ZWpXTM2y8eCdWdQr9rwa62DlaDScZdR76jNjOnr2Jik/BJBizoVDNmIjhiJGQzhUkRkG4xLVbtgYVvSD7YsehrjgCGZRUKInpIQaFslTCXrY= 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)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2025 09:04:23.5730 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 54dcec8f-d655-465e-8c0c-08dd607bb7cb 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: SJ1PEPF0000231E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5851 At the moment, we print a warning about max number of IRQs supported by GIC bigger than vGIC only for hardware domain. This check is not hwdom special, and should be made common. Also, in case of user not specifying nr_spis for dom0less domUs, we should take into account max number of IRQs supported by vGIC if it's smaller than for GIC. Introduce VGIC_MAX_IRQS macro and use it instead of hardcoded 992 value. Fix calculation of nr_spis for dom0less domUs and make the GIC/vGIC max IRQs comparison common. Signed-off-by: Michal Orzel --- xen/arch/arm/dom0less-build.c | 2 +- xen/arch/arm/domain_build.c | 9 ++------- xen/arch/arm/gic.c | 3 +++ xen/arch/arm/include/asm/vgic.h | 3 +++ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 31f31c38da3f..9a84fee94119 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1018,7 +1018,7 @@ void __init create_domUs(void) { int vpl011_virq = GUEST_VPL011_SPI; - d_cfg.arch.nr_spis = gic_number_lines() - 32; + d_cfg.arch.nr_spis = min(gic_number_lines(), VGIC_MAX_IRQS) - 32; /* * The VPL011 virq is GUEST_VPL011_SPI, unless direct-map is diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7cc141ef75e9..b99c4e3a69bf 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2371,13 +2371,8 @@ void __init create_dom0(void) /* The vGIC for DOM0 is exactly emulating the hardware GIC */ dom0_cfg.arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE; - /* - * Xen vGIC supports a maximum of 992 interrupt lines. - * 32 are substracted to cover local IRQs. - */ - dom0_cfg.arch.nr_spis = min(gic_number_lines(), (unsigned int) 992) - 32; - if ( gic_number_lines() > 992 ) - printk(XENLOG_WARNING "Maximum number of vGIC IRQs exceeded.\n"); + /* 32 are substracted to cover local IRQs */ + dom0_cfg.arch.nr_spis = min(gic_number_lines(), VGIC_MAX_IRQS) - 32; dom0_cfg.arch.tee_type = tee_get_type(); dom0_cfg.max_vcpus = dom0_max_vcpus(); diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index acf61a4de373..e80fe0ca2421 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -251,6 +251,9 @@ void __init gic_init(void) panic("Failed to initialize the GIC drivers\n"); /* Clear LR mask for cpu0 */ clear_cpu_lr_mask(); + + if ( gic_number_lines() > VGIC_MAX_IRQS ) + printk(XENLOG_WARNING "Maximum number of vGIC IRQs exceeded\n"); } void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) diff --git a/xen/arch/arm/include/asm/vgic.h b/xen/arch/arm/include/asm/vgic.h index e309dca1ad01..c549e5840bfa 100644 --- a/xen/arch/arm/include/asm/vgic.h +++ b/xen/arch/arm/include/asm/vgic.h @@ -329,6 +329,9 @@ extern void vgic_check_inflight_irqs_pending(struct vcpu *v, */ #define vgic_num_irqs(d) ((d)->arch.vgic.nr_spis + 32) +/* Maximum number of IRQs supported by vGIC */ +#define VGIC_MAX_IRQS 992U + /* * Allocate a guest VIRQ * - spi == 0 => allocate a PPI. It will be the same on every vCPU From patchwork Tue Mar 11 09:04:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 14011331 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 40411C28B2E for ; Tue, 11 Mar 2025 09:04:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907437.1314681 (Exim 4.92) (envelope-from ) id 1trvXL-000126-9L; Tue, 11 Mar 2025 09:04:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907437.1314681; Tue, 11 Mar 2025 09:04: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 1trvXL-00011y-5u; Tue, 11 Mar 2025 09:04:31 +0000 Received: by outflank-mailman (input) for mailman id 907437; Tue, 11 Mar 2025 09:04:29 +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 1trvXJ-0000na-Pp for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 09:04:29 +0000 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on20605.outbound.protection.outlook.com [2a01:111:f403:2406::605]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d5b43dfa-fe57-11ef-9ab9-95dc52dad729; Tue, 11 Mar 2025 10:04:28 +0100 (CET) Received: from SN6PR08CA0035.namprd08.prod.outlook.com (2603:10b6:805:66::48) by CH3PR12MB8073.namprd12.prod.outlook.com (2603:10b6:610:126::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.26; Tue, 11 Mar 2025 09:04:21 +0000 Received: from SA2PEPF000015CB.namprd03.prod.outlook.com (2603:10b6:805:66:cafe::fa) by SN6PR08CA0035.outlook.office365.com (2603:10b6:805:66::48) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Tue, 11 Mar 2025 09:04:21 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by SA2PEPF000015CB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Tue, 11 Mar 2025 09:04:20 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 11 Mar 2025 04:04:20 -0500 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Tue, 11 Mar 2025 04:04:18 -0500 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: d5b43dfa-fe57-11ef-9ab9-95dc52dad729 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y3lmWCBI1SfwzKnPhDhYbys+TwSBiZBEvoEWI7Nzl8s8AVSJzY1ZEl4D2Q2tpt1lEQ2lRuM5AHf17lFwXakfeQq8GbpWtXuCjIZRs8VC3JpANkombCoApGLLbGc7GlsdY6jtA+aqontJimmZG9i7mGHILvfP+vfIIUXdOdn4jx+0/NcKgXkf6b9sH9Zuxtr8/SpqgxG6W8h8UZO22jKGwF4Y5A9Lc1YRdaeLKEOt0wsrUiA8iDObRIaEYDucgNmZ/ajhAAaGPPjxKHYdSv+nhMZfPso5d8cv237ade78dxNbMN7uAtHudC9/9hcuAhxMcFqYGTyfsLgodNu2su3Fuw== 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=80brAO46bmDac1yCYoJVXqrH6nv3qcWOTeS80rNdmTU=; b=ajwZdNd4WmkXInHzTKoDYRN7hGVJdpyCCindVlAZJxtoVgEp0WZ0hyX3Fg1eDrxyVinKd/ortq95PdJbvh2fcdk3zYLRZuybIkA6U8MNC+YUwqQNjWqYKOMJFp984NCnlbCYaZORfk0tZbVA/XnLf5hW9MI3PSXSVh+jkyhXWtJ3pZkH8Z0GqD/TUhkK+kWmWQCaQScUZKO/vFxRqDbTaJVz1Z6lWJ88ezqFyFQJKge36hhmlGP3maNVKeLKNS4xeqQyDsoSzR2CpABlFVWFkcAm+F/ym1CWPtGfBizCBfeMzy91cMBjg5HIgAVvRjxrrXEF1K0CUVXqweVc2YYyNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.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=80brAO46bmDac1yCYoJVXqrH6nv3qcWOTeS80rNdmTU=; b=hbk75kEkMLj54z4Hx8m793xM0kWOih85m8BKgM1OLXlPLtvei+D1CPpYZ8GzzkWXuHUFGditEb1vUPQFyYExCYajZ9ua29K0rGGNufhYe3MYmP2sz9YqcYk8+OFvPbq4/A1BEYcvR5Clm57VXuWC85BXsCw4oKKO0pw5xFf64IM= 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=SATLEXMB03.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Anthony PERARD , Juergen Gross , "Stefano Stabellini" , Julien Grall , "Bertrand Marquis" Subject: [PATCH 2/2] tools/arm: Reject configuration with incorrect nr_spis value Date: Tue, 11 Mar 2025 10:04:09 +0100 Message-ID: <20250311090409.122577-3-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250311090409.122577-1-michal.orzel@amd.com> References: <20250311090409.122577-1-michal.orzel@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB03.amd.com: michal.orzel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015CB:EE_|CH3PR12MB8073:EE_ X-MS-Office365-Filtering-Correlation-Id: a40a0a1f-a7ff-42cd-292c-08dd607bb632 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: KQ/+PtggQAdTEuhWmxhbXx5iO6Dojx/XPEHrVsv8K4qfVuPWANMzG+c+BuI5W7TLHDqimEwQoSyAFHWK6tnopcmz3xBZXN+C3f9FE0yIr6BM8FdO2efIt08QMJPDDV2SKRmlpJViNVeUEKBMWGnwEC/7pC/29GCPgzhI85kgsiOZCBS/Id/4bukVAgdXiB+kG5ZhbuJLIMpGT8UxiQO7KAWrnStlB9suFv3I0bmKk1Glq0NtKpULsMPEK9Zqg80rYSX/9GngNyG3RMghFAxBNsQ/mE5XSWPegLlriQ9kyB86j1P2mggxSRkNEG8uRNkfhpNjVhql5e7SngxrYjD5PCIr4NrshEl1HIhQ7TsEHQzVlyvItcPcKvPu/pEFhvhgIdOyAOLG6JQ6iV6h+Cg34M2a0twPlAkapc/OZu6NwjP+q2qaNBqK4NOupy1303XMHfIYPrye7fit/tJ996SahnFbyJbSdpbRoIQFiEjBzY3ND9CQlUE12ELLK9rPlxDtSMIBbqjPnXw6tMkDj1RCdC2FBm2fs8hVfEGalFWtcApR5SJvaI7NfMFFLa1gXRhsDlEtEy0FKGalSsedi2uqfjQAH4+2xEpW8cHmFd7818qCrOUvLiZpnRpj05HFNqOMfC0u3agOaMRMDade1gfJa8zwCzFTk4TvPheQ8Dr8glSlQ8S8HH3RfukZxKXH8boL9j/uNKFtkPql9469OlgDRFXjjBGpiu+7mfqp3Q6suNidAxlrImAcWkslY1+UYfxgynhllCJVq8feM3bH/a/7IIDwHF9si5Rh1qitMH+NqY/DRPmYBL3tFe8wUiYCV2I6QGwpgew4fL/HISPDsjlv/y10M6j0nrD/Ae6SXkd0NxtBYKHA1hRs7OCfZdU3l33oQVpclVzvsGc27sRRb4Sz5BLN3XqFScA1+y34xoobJ2b9UtVn1VvUp2CTlGR24GuE/VYQPepN0RGiE2t3dwhucQuJLe2VZaPfFglJA+eBF8ee3NEBJkaHaIrkp3bBzJrezpMGtggfZI14ocDFptFISFwjJC0aEODzoKTdWQkq34EhNU340eDuM4V2RFF1wWa/Ogm3UC7icDYR1Gq44q+8/QN/e9jIClfu4bkoXtSqPG3rUtXnF7pz7NHguBzQqQafCCV6EAgSnBtCkZpBtXxblIBsv9bV5SnrmSmm/uYE9IH0WiQizJTuPFMSI8RkMW25cxgBefASneDXUxWD4n8Le8n2e00osrHcUlHjbAdVSfbTyZlT+awUaACAe944y8aZK6/1hiFRSuXgT1LG2Y9DbWsDDlnYZ/cUQmFOaOZfzzzPMqlUhL+HVJv5FwlTmyKPusJbVSlQuqUax6aI3cfuJFeqmAZ1wU2vXs54Awsu1ddIx6lipSt1tJzZZOlKqHMiim3G5Uz/HsxdOoic+XffQUpJvB//I1sTjwVfVReuq2Z6VfhkavwM3ZXjKfv2H6uHDCE9z6TOahwuQyWSnUkxNYX/lYiEIvMEmrWggWT2wik= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2025 09:04:20.9369 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a40a0a1f-a7ff-42cd-292c-08dd607bb632 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015CB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8073 If the calculated value for nr_spis by the toolstack is bigger than the value provided by the user, we silently ignore the latter. This is not consistent with the approach we have in Xen on Arm when we try to reject incorrect configuration. Also, the documentation for nr_spis is incorrect as it mentions 991 as the number of max SPIs, where it should be 960 i.e. (1020 - 32) rounded down to the nearest multiple of 32. Signed-off-by: Michal Orzel Reviewed-by: Bertrand Marquis --- docs/man/xl.cfg.5.pod.in | 13 +++++-------- tools/libs/light/libxl_arm.c | 6 ++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 8e1422104e50..7339c44efd54 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -3083,14 +3083,11 @@ interval of colors (such as "0-4"). =item B An optional integer parameter specifying the number of SPIs (Shared -Peripheral Interrupts) to allocate for the domain. Max is 991 SPIs. If -the value specified by the `nr_spis` parameter is smaller than the -number of SPIs calculated by the toolstack based on the devices -allocated for the domain, or the `nr_spis` parameter is not specified, -the value calculated by the toolstack will be used for the domain. -Otherwise, the value specified by the `nr_spis` parameter will be used. -The number of SPIs should match the highest interrupt ID that will be -assigned to the domain. +Peripheral Interrupts) to allocate for the domain. Max is 960 SPIs. If +the `nr_spis` parameter is not specified, the value calculated by the toolstack +will be used for the domain. Otherwise, the value specified by the `nr_spis` +parameter will be used. The number of SPIs should match the highest interrupt +ID that will be assigned to the domain. =back diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 5a9db5e85f6f..ee9154298f2a 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -181,6 +181,12 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, LOG(DEBUG, "Configure the domain"); + if (nr_spis > d_config->b_info.arch_arm.nr_spis) { + LOG(ERROR, "Provided nr_spis value is too small (required %u)\n", + nr_spis); + return ERROR_FAIL; + } + config->arch.nr_spis = max(nr_spis, d_config->b_info.arch_arm.nr_spis); LOG(DEBUG, " - Allocate %u SPIs", config->arch.nr_spis);