From nobody Tue Feb 10 01:30:21 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; 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-Seal: i=1; a=rsa-sha256; t=1605805745; cv=none; d=zohomail.com; s=zohoarc; b=kWiJZhC8HohTVWmyL5R0QkqtyHidwbUX5UhS2gtzXwg9W/DQxx5AqFMflYxy63SEqOxt6xdT083wiIb/wF8zeyQhTvWIZqZYd5H1vNo7KNQrVtoA2wUlo03L6DrJSqVWqbime09XihIKX0u3jRgMCXyjNEgt9tW/KWmEZ4kzAlY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605805745; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=QAujMV9Xzy7Ut9dM8y6NKak187oQRubSEIiR6ad+wBs=; b=HBci6GsLoAWcc853IzlUQFyAaaifpwu+/FtdbJ4f9mPVuCi3YdFTBNwvSeU6oyVMX5vdKoeqkhioKX6d81rjluAksw1z/io/458/helnQFakQOX8P4TUSnfbXrG6JR4Fhf6wmeoRyu+svGVCWmQg7RfGY8dDREZCDWblr90l2N4= ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1605805745670190.87382453756481; Thu, 19 Nov 2020 09:09:05 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.31211.61531 (Exim 4.92) (envelope-from ) id 1kfnQD-0007k7-3U; Thu, 19 Nov 2020 17:08:37 +0000 Received: by outflank-mailman (output) from mailman id 31211.61531; Thu, 19 Nov 2020 17:08:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfnQC-0007jx-Vb; Thu, 19 Nov 2020 17:08:36 +0000 Received: by outflank-mailman (input) for mailman id 31211; Thu, 19 Nov 2020 17:08:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfnQB-0007iR-Cg for xen-devel@lists.xenproject.org; Thu, 19 Nov 2020 17:08:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfnQB-0000va-04; Thu, 19 Nov 2020 17:08:35 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kfnQB-0000U1-ML; Thu, 19 Nov 2020 17:08:35 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfnQB-0007iR-Cg for xen-devel@lists.xenproject.org; Thu, 19 Nov 2020 17:08:35 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfnQB-0000va-04; Thu, 19 Nov 2020 17:08:35 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kfnQB-0000U1-ML; Thu, 19 Nov 2020 17:08:35 +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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=QAujMV9Xzy7Ut9dM8y6NKak187oQRubSEIiR6ad+wBs=; b=aCJJJb6sjI77v6nqN0uVYCtU1 50k3k2Qm1ZfPgDgkoeXxmsu/PQ4GmrTTGwy9W2yoOoeAgpU28w2huwx1+bLqexzs5wl2UV6WsY+Kp VYmRA7KKUSuy61RcjC0Q6+MXJIi/nTrtOW6RydU8NuBuGVeLIGQZPnx91HG3TIOdKB4x8=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: alex.bennee@linaro.org, bertrand.marquis@arm.com, andre.przywara@arm.com, Rahul.Singh@arm.com, Julien Grall , Julien Grall Subject: [PATCH v4 2/3] xen/arm: gic: acpi: Use the correct length for the GICC structure Date: Thu, 19 Nov 2020 17:08:28 +0000 Message-Id: <20201119170829.9923-3-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201119170829.9923-1-julien@xen.org> References: <20201119170829.9923-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall The length of the GICC structure in the MADT ACPI table differs between version 5.1 and 6.0, although there are no other relevant differences. Use the BAD_MADT_GICC_ENTRY macro, which was specifically designed to overcome this issue. Signed-off-by: Julien Grall Signed-off-by: Andre Przywara Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis --- Changes in v3: - Update the commit title as we also modify GICv3 code - Use the correct length in more places Changes in v2: - Patch added --- xen/arch/arm/acpi/boot.c | 2 +- xen/arch/arm/gic-v2.c | 5 +++-- xen/arch/arm/gic-v3.c | 6 +++--- xen/arch/arm/gic.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/acpi/boot.c b/xen/arch/arm/acpi/boot.c index 30e4bd1bc5a7..55c3e5cbc834 100644 --- a/xen/arch/arm/acpi/boot.c +++ b/xen/arch/arm/acpi/boot.c @@ -131,7 +131,7 @@ acpi_parse_gic_cpu_interface(struct acpi_subtable_heade= r *header, struct acpi_madt_generic_interrupt *processor =3D container_of(header, struct acpi_madt_generic_interrupt, he= ader); =20 - if ( BAD_MADT_ENTRY(processor, end) ) + if ( BAD_MADT_GICC_ENTRY(processor, end) ) return -EINVAL; =20 acpi_table_print_madt_entry(header); diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 581ea5ba6b2c..b2adc8ec9a64 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -1136,7 +1136,8 @@ static int gicv2_make_hwdom_madt(const struct domain = *d, u32 offset) =20 host_gicc =3D container_of(header, struct acpi_madt_generic_interrupt, header); - size =3D sizeof(struct acpi_madt_generic_interrupt); + + size =3D ACPI_MADT_GICC_LENGTH; /* Add Generic Interrupt */ for ( i =3D 0; i < d->max_vcpus; i++ ) { @@ -1165,7 +1166,7 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *= header, struct acpi_madt_generic_interrupt *processor =3D container_of(header, struct acpi_madt_generic_interrupt, he= ader); =20 - if ( BAD_MADT_ENTRY(processor, end) ) + if ( BAD_MADT_GICC_ENTRY(processor, end) ) return -EINVAL; =20 /* Read from APIC table and fill up the GIC variables */ diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 2a344393a0e4..ac28013c1967 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -1499,7 +1499,7 @@ static int gicv3_make_hwdom_madt(const struct domain = *d, u32 offset) =20 host_gicc =3D container_of(header, struct acpi_madt_generic_interrupt, header); - size =3D sizeof(struct acpi_madt_generic_interrupt); + size =3D ACPI_MADT_GICC_LENGTH; for ( i =3D 0; i < d->max_vcpus; i++ ) { gicc =3D (struct acpi_madt_generic_interrupt *)(base_ptr + table_l= en); @@ -1558,7 +1558,7 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *= header, struct acpi_madt_generic_interrupt *processor =3D container_of(header, struct acpi_madt_generic_interrupt, he= ader); =20 - if ( BAD_MADT_ENTRY(processor, end) ) + if ( BAD_MADT_GICC_ENTRY(processor, end) ) return -EINVAL; =20 /* Read from APIC table and fill up the GIC variables */ @@ -1628,7 +1628,7 @@ gic_acpi_get_madt_cpu_num(struct acpi_subtable_header= *header, struct acpi_madt_generic_interrupt *cpuif; =20 cpuif =3D (struct acpi_madt_generic_interrupt *)header; - if ( BAD_MADT_ENTRY(cpuif, end) || !cpuif->gicr_base_address ) + if ( BAD_MADT_GICC_ENTRY(cpuif, end) || !cpuif->gicr_base_address ) return -EINVAL; =20 return 0; diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index fe60619e99cf..3b0331b53830 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -454,7 +454,7 @@ unsigned long gic_get_hwdom_madt_size(const struct doma= in *d) unsigned long madt_size; =20 madt_size =3D sizeof(struct acpi_table_madt) - + sizeof(struct acpi_madt_generic_interrupt) * d->max_vcpus + + ACPI_MADT_GICC_LENGTH * d->max_vcpus + sizeof(struct acpi_madt_generic_distributor) + gic_hw_ops->get_hwdom_extra_madt_size(d); =20 --=20 2.17.1