| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAJZ5v0iHJjP3BRWz0PZTT_fq24VC75YZLkyu7ovDkRPmKVVGuA@mail.gmail.com>
Date: Wed, 7 May 2025 13:31:44 +0200
From: "Rafael J. Wysocki" <rafael@...nel.org>
To: Zaid Alali <zaidal@...amperecomputing.com>
Cc: rafael@...nel.org, lenb@...nel.org, james.morse@....com,
tony.luck@...el.com, bp@...en8.de, robert.moore@...el.com,
Jonathan.Cameron@...wei.com, ira.weiny@...el.com, Benjamin.Cheatham@....com,
dan.j.williams@...el.com, arnd@...db.de, Avadhut.Naik@....com,
u.kleine-koenig@...gutronix.de, john.allen@....com,
linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org,
acpica-devel@...ts.linux.dev
Subject: Re: [PATCH v7 3/9] ACPI: APEI: EINJ: Fix kernel test sparse warnings
On Tue, May 6, 2025 at 11:38 PM Zaid Alali
<zaidal@...amperecomputing.com> wrote:
>
> This patch fixes the kernel test robot warning reported here:
> Link: https://lore.kernel.org/all/202410241620.oApALow5-lkp@intel.com/
The Link: tag should be adjacent to the other tags.
Also, it is not sufficient to point to a problem report from a patch
changelog. Please describe both the problem and the fix.
> Reviewed-by: Ira Weiny <ira.weiny@...el.com>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@...wei.com>
> Signed-off-by: Zaid Alali <zaidal@...amperecomputing.com>
> ---
> drivers/acpi/apei/einj-core.c | 106 +++++++++++++++++++---------------
> 1 file changed, 60 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/acpi/apei/einj-core.c b/drivers/acpi/apei/einj-core.c
> index 04731a5b01fa..47abd9317fef 100644
> --- a/drivers/acpi/apei/einj-core.c
> +++ b/drivers/acpi/apei/einj-core.c
> @@ -149,7 +149,7 @@ static DEFINE_MUTEX(einj_mutex);
> */
> bool einj_initialized __ro_after_init;
>
> -static void *einj_param;
> +static void __iomem *einj_param;
>
> static void einj_exec_ctx_init(struct apei_exec_context *ctx)
> {
> @@ -214,24 +214,26 @@ static void check_vendor_extension(u64 paddr,
> struct set_error_type_with_address *v5param)
> {
> int offset = v5param->vendor_extension;
> - struct vendor_error_type_extension *v;
> + struct vendor_error_type_extension v;
> + struct vendor_error_type_extension __iomem *p;
> u32 sbdf;
>
> if (!offset)
> return;
> - v = acpi_os_map_iomem(paddr + offset, sizeof(*v));
> - if (!v)
> + p = acpi_os_map_iomem(paddr + offset, sizeof(*p));
> + if (!p)
> return;
> - get_oem_vendor_struct(paddr, offset, v);
> - sbdf = v->pcie_sbdf;
> + memcpy_fromio(&v, p, sizeof(v));
> + get_oem_vendor_struct(paddr, offset, &v);
> + sbdf = v.pcie_sbdf;
> sprintf(vendor_dev, "%x:%x:%x.%x vendor_id=%x device_id=%x rev_id=%x\n",
> sbdf >> 24, (sbdf >> 16) & 0xff,
> (sbdf >> 11) & 0x1f, (sbdf >> 8) & 0x7,
> - v->vendor_id, v->device_id, v->rev_id);
> - acpi_os_unmap_iomem(v, sizeof(*v));
> + v.vendor_id, v.device_id, v.rev_id);
> + acpi_os_unmap_iomem(p, sizeof(v));
> }
>
> -static void *einj_get_parameter_address(void)
> +static void __iomem *einj_get_parameter_address(void)
> {
> int i;
> u64 pa_v4 = 0, pa_v5 = 0;
> @@ -252,26 +254,30 @@ static void *einj_get_parameter_address(void)
> entry++;
> }
> if (pa_v5) {
> - struct set_error_type_with_address *v5param;
> + struct set_error_type_with_address v5param;
> + struct set_error_type_with_address __iomem *p;
>
> - v5param = acpi_os_map_iomem(pa_v5, sizeof(*v5param));
> - if (v5param) {
> + p = acpi_os_map_iomem(pa_v5, sizeof(*p));
> + if (p) {
> + memcpy_fromio(&v5param, p, sizeof(v5param));
> acpi5 = 1;
> - check_vendor_extension(pa_v5, v5param);
> - return v5param;
> + check_vendor_extension(pa_v5, &v5param);
> + return p;
> }
> }
> if (param_extension && pa_v4) {
> - struct einj_parameter *v4param;
> + struct einj_parameter v4param;
> + struct einj_parameter __iomem *p;
>
> - v4param = acpi_os_map_iomem(pa_v4, sizeof(*v4param));
> - if (!v4param)
> + p = acpi_os_map_iomem(pa_v4, sizeof(*p));
> + if (!p)
> return NULL;
> - if (v4param->reserved1 || v4param->reserved2) {
> - acpi_os_unmap_iomem(v4param, sizeof(*v4param));
> + memcpy_fromio(&v4param, p, sizeof(v4param));
> + if (v4param.reserved1 || v4param.reserved2) {
> + acpi_os_unmap_iomem(p, sizeof(v4param));
> return NULL;
> }
> - return v4param;
> + return p;
> }
>
> return NULL;
> @@ -317,7 +323,7 @@ static struct acpi_generic_address *einj_get_trigger_parameter_region(
> static int __einj_error_trigger(u64 trigger_paddr, u32 type,
> u64 param1, u64 param2)
> {
> - struct acpi_einj_trigger *trigger_tab = NULL;
> + struct acpi_einj_trigger trigger_tab;
> struct apei_exec_context trigger_ctx;
> struct apei_resources trigger_resources;
> struct acpi_whea_header *trigger_entry;
> @@ -325,54 +331,57 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
> u32 table_size;
> int rc = -EIO;
> struct acpi_generic_address *trigger_param_region = NULL;
> + struct acpi_einj_trigger __iomem *p;
>
> - r = request_mem_region(trigger_paddr, sizeof(*trigger_tab),
> + r = request_mem_region(trigger_paddr, sizeof(trigger_tab),
> "APEI EINJ Trigger Table");
> if (!r) {
> pr_err("Can not request [mem %#010llx-%#010llx] for Trigger table\n",
> (unsigned long long)trigger_paddr,
> (unsigned long long)trigger_paddr +
> - sizeof(*trigger_tab) - 1);
> + sizeof(trigger_tab) - 1);
> goto out;
> }
> - trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab));
> - if (!trigger_tab) {
> + p = ioremap_cache(trigger_paddr, sizeof(*p));
> + if (!p) {
> pr_err("Failed to map trigger table!\n");
> goto out_rel_header;
> }
> - rc = einj_check_trigger_header(trigger_tab);
> + memcpy_fromio(&trigger_tab, p, sizeof(trigger_tab));
> + rc = einj_check_trigger_header(&trigger_tab);
> if (rc) {
> pr_warn(FW_BUG "Invalid trigger error action table.\n");
> goto out_rel_header;
> }
>
> /* No action structures in the TRIGGER_ERROR table, nothing to do */
> - if (!trigger_tab->entry_count)
> + if (!trigger_tab.entry_count)
> goto out_rel_header;
>
> rc = -EIO;
> - table_size = trigger_tab->table_size;
> - r = request_mem_region(trigger_paddr + sizeof(*trigger_tab),
> - table_size - sizeof(*trigger_tab),
> + table_size = trigger_tab.table_size;
> + r = request_mem_region(trigger_paddr + sizeof(trigger_tab),
> + table_size - sizeof(trigger_tab),
> "APEI EINJ Trigger Table");
> if (!r) {
> pr_err("Can not request [mem %#010llx-%#010llx] for Trigger Table Entry\n",
> - (unsigned long long)trigger_paddr + sizeof(*trigger_tab),
> + (unsigned long long)trigger_paddr + sizeof(trigger_tab),
> (unsigned long long)trigger_paddr + table_size - 1);
> goto out_rel_header;
> }
> - iounmap(trigger_tab);
> - trigger_tab = ioremap_cache(trigger_paddr, table_size);
> - if (!trigger_tab) {
> + iounmap(p);
> + p = ioremap_cache(trigger_paddr, table_size);
> + if (!p) {
> pr_err("Failed to map trigger table!\n");
> goto out_rel_entry;
> }
> + memcpy_fromio(&trigger_tab, p, sizeof(trigger_tab));
> trigger_entry = (struct acpi_whea_header *)
> - ((char *)trigger_tab + sizeof(struct acpi_einj_trigger));
> + ((char *)&trigger_tab + sizeof(struct acpi_einj_trigger));
> apei_resources_init(&trigger_resources);
> apei_exec_ctx_init(&trigger_ctx, einj_ins_type,
> ARRAY_SIZE(einj_ins_type),
> - trigger_entry, trigger_tab->entry_count);
> + trigger_entry, trigger_tab.entry_count);
> rc = apei_exec_collect_resources(&trigger_ctx, &trigger_resources);
> if (rc)
> goto out_fini;
> @@ -390,7 +399,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
>
> apei_resources_init(&addr_resources);
> trigger_param_region = einj_get_trigger_parameter_region(
> - trigger_tab, param1, param2);
> + &trigger_tab, param1, param2);
> if (trigger_param_region) {
> rc = apei_resources_add(&addr_resources,
> trigger_param_region->address,
> @@ -419,13 +428,13 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
> out_fini:
> apei_resources_fini(&trigger_resources);
> out_rel_entry:
> - release_mem_region(trigger_paddr + sizeof(*trigger_tab),
> - table_size - sizeof(*trigger_tab));
> + release_mem_region(trigger_paddr + sizeof(trigger_tab),
> + table_size - sizeof(trigger_tab));
> out_rel_header:
> - release_mem_region(trigger_paddr, sizeof(*trigger_tab));
> + release_mem_region(trigger_paddr, sizeof(trigger_tab));
> out:
> - if (trigger_tab)
> - iounmap(trigger_tab);
> + if (p)
> + iounmap(p);
>
> return rc;
> }
> @@ -444,8 +453,10 @@ static int __einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,
> return rc;
> apei_exec_ctx_set_input(&ctx, type);
> if (acpi5) {
> - struct set_error_type_with_address *v5param = einj_param;
> + struct set_error_type_with_address *v5param, v5_struct;
>
> + v5param = &v5_struct;
> + memcpy_fromio(v5param, einj_param, sizeof(*v5param));
> v5param->type = type;
> if (type & ACPI5_VENDOR_BIT) {
> switch (vendor_flags) {
> @@ -490,15 +501,18 @@ static int __einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,
> break;
> }
> }
> + memcpy_toio(einj_param, v5param, sizeof(*v5param));
> } else {
> rc = apei_exec_run(&ctx, ACPI_EINJ_SET_ERROR_TYPE);
> if (rc)
> return rc;
> if (einj_param) {
> - struct einj_parameter *v4param = einj_param;
> + struct einj_parameter v4param;
>
> - v4param->param1 = param1;
> - v4param->param2 = param2;
> + memcpy_fromio(&v4param, einj_param, sizeof(v4param));
> + v4param.param1 = param1;
> + v4param.param2 = param2;
> + memcpy_toio(einj_param, &v4param, sizeof(v4param));
> }
> }
> rc = apei_exec_run(&ctx, ACPI_EINJ_EXECUTE_OPERATION);
> --
> 2.43.0
>
Powered by blists - more mailing lists