[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v4 2/3] xen/arm: gic: acpi: Use the correct length for the GICC structure


  • To: Julien Grall <julien@xxxxxxx>
  • From: Bertrand Marquis <Bertrand.Marquis@xxxxxxx>
  • Date: Thu, 19 Nov 2020 18:16:29 +0000
  • Accept-language: en-GB, en-US
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none
  • 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-SenderADCheck; bh=GdeZEekMGzCdA7djWe9NFePYVX0bCegyfXcvVcmjAFQ=; b=hhYZBkSeiS7fSoiGOeQtOqbC8Fh7dkRGTALBVIB8T4LcKlp9L9QUgLvHD2uJn7nDcoxAdszZEHNWTeNRUrKQPQPRyxa3NiZJB+ibjdeNCPwWes02D+LGwyfWFoZSRZD/90SOefpRp2fSc2+JYJhgGyFvdL9sqTV6Qwq+RPW9IJzgOjlQK6+DSDHTM+oBHWNdUyii0S0HIHn4pos9xNNrFcXEKbvCE3iLxiadlZej5PWYaTp61wYz5OArtMIsqZdfiqqGW03YueFa4E8es6xSyZdogzSv/28LihmSOHCRpCtQUdEAj9+2XyFo9RkFgTHvPyhBlMPA9K5LBD1Ei1vZ7A==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jcaM866MQ/7TisjluUVGNkXxCaxIQayS3mk3qk0HbMssFHqc6nZxctfO+0hBRoBhZx2A88PZFSLMKnTlyLFNTmDI6V0lJ1oQEBYU3LNqV+Om01Bc2eE14425ZNNgN0Iieo8HrOq6o2vTLwMkvZzUnPICNh3HIVmCBpkuiBROBlSpeS9t2CRy5oeIlHOISDV71bjpUXA5aLx9YZe/S6QPPwDMWghy1I2jgU8ggEuE3tGM49RGWgQgF7zR1X133lWxS+EPKsdZ7Gd6Yz19jQa6p6o9F2YOH+t7TL2AcWuGgVGfKWUq5+Y0vj4KC/bWvMMUtfKbalL3j8TQ/pgMf2TOFQ==
  • Authentication-results-original: xen.org; dkim=none (message not signed) header.d=none;xen.org; dmarc=none action=none header.from=arm.com;
  • Cc: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>, "alex.bennee@xxxxxxxxxx" <alex.bennee@xxxxxxxxxx>, Andre Przywara <Andre.Przywara@xxxxxxx>, Rahul Singh <Rahul.Singh@xxxxxxx>, Julien Grall <Julien.Grall@xxxxxxx>, Julien Grall <jgrall@xxxxxxxxxx>
  • Delivery-date: Thu, 19 Nov 2020 18:16:50 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
  • Nodisclaimer: true
  • Original-authentication-results: xen.org; dkim=none (message not signed) header.d=none;xen.org; dmarc=none action=none header.from=arm.com;
  • Thread-index: AQHWvpa0bDYxNRQRmUCSGRjy8i0s/KnPwwaA
  • Thread-topic: [PATCH v4 2/3] xen/arm: gic: acpi: Use the correct length for the GICC structure

Hi,

> On 19 Nov 2020, at 17:08, Julien Grall <julien@xxxxxxx> wrote:
> 
> From: Julien Grall <julien.grall@xxxxxxx>
> 
> 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 <julien.grall@xxxxxxx>
> Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
> Signed-off-by: Julien Grall <jgrall@xxxxxxxxxx>
Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>

Cheers
Bertrand

> 
> ---
>    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_header 
> *header,
>     struct acpi_madt_generic_interrupt *processor =
>                container_of(header, struct acpi_madt_generic_interrupt, 
> header);
> 
> -    if ( BAD_MADT_ENTRY(processor, end) )
> +    if ( BAD_MADT_GICC_ENTRY(processor, end) )
>         return -EINVAL;
> 
>     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)
> 
>     host_gicc = container_of(header, struct acpi_madt_generic_interrupt,
>                              header);
> -    size = sizeof(struct acpi_madt_generic_interrupt);
> +
> +    size = ACPI_MADT_GICC_LENGTH;
>     /* Add Generic Interrupt */
>     for ( i = 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 =
>                container_of(header, struct acpi_madt_generic_interrupt, 
> header);
> 
> -    if ( BAD_MADT_ENTRY(processor, end) )
> +    if ( BAD_MADT_GICC_ENTRY(processor, end) )
>         return -EINVAL;
> 
>     /* 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)
> 
>     host_gicc = container_of(header, struct acpi_madt_generic_interrupt,
>                              header);
> -    size = sizeof(struct acpi_madt_generic_interrupt);
> +    size = ACPI_MADT_GICC_LENGTH;
>     for ( i = 0; i < d->max_vcpus; i++ )
>     {
>         gicc = (struct acpi_madt_generic_interrupt *)(base_ptr + table_len);
> @@ -1558,7 +1558,7 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header 
> *header,
>     struct acpi_madt_generic_interrupt *processor =
>                container_of(header, struct acpi_madt_generic_interrupt, 
> header);
> 
> -    if ( BAD_MADT_ENTRY(processor, end) )
> +    if ( BAD_MADT_GICC_ENTRY(processor, end) )
>         return -EINVAL;
> 
>     /* 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;
> 
>     cpuif = (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;
> 
>     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 domain 
> *d)
>     unsigned long madt_size;
> 
>     madt_size = 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);
> 
> -- 
> 2.17.1
> 




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.