Commit b50634c5 authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Andrew Morton
Browse files

kho: cleanup error handling in kho_populate() 

* use dedicated labels for error handling instead of checking if a pointer
  is not null to decide if it should be unmapped
* drop assignment of values to err that are only used to print a numeric
  error code, there are pr_warn()s for each failure already so printing a
  numeric error code in the next line does not add anything useful

Link: https://lkml.kernel.org/r/20260122121757.575987-1-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: default avatarPasha Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: default avatarPratyush Yadav <pratyush@kernel.org>
Cc: Alexander Graf <graf@amazon.com>
Cc: Mike Rapoport <rppt@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0895a000

kernel/liveupdate/kexec_handover.c

+17 −22
Original line number Diff line number Diff line
@@ -1455,46 +1455,40 @@ void __init kho_memory_init(void) 
void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len,

			 phys_addr_t scratch_phys, u64 scratch_len)

{

	unsigned int scratch_cnt = scratch_len / sizeof(*kho_scratch);

	struct kho_scratch *scratch = NULL;

	phys_addr_t mem_map_phys;

	void *fdt = NULL;

	int err = 0;

	unsigned int scratch_cnt = scratch_len / sizeof(*kho_scratch);

	int err;



	/* Validate the input FDT */

	fdt = early_memremap(fdt_phys, fdt_len);

	if (!fdt) {

		pr_warn("setup: failed to memremap FDT (0x%llx)\n", fdt_phys);

		err = -EFAULT;

		goto out;

		goto err_report;

	}

	err = fdt_check_header(fdt);

	if (err) {

		pr_warn("setup: handover FDT (0x%llx) is invalid: %d\n",

			fdt_phys, err);

		err = -EINVAL;

		goto out;

		goto err_unmap_fdt;

	}

	err = fdt_node_check_compatible(fdt, 0, KHO_FDT_COMPATIBLE);

	if (err) {

		pr_warn("setup: handover FDT (0x%llx) is incompatible with '%s': %d\n",

			fdt_phys, KHO_FDT_COMPATIBLE, err);

		err = -EINVAL;

		goto out;

		goto err_unmap_fdt;

	}



	mem_map_phys = kho_get_mem_map_phys(fdt);

	if (!mem_map_phys) {

		err = -ENOENT;

		goto out;

	}

	if (!mem_map_phys)

		goto err_unmap_fdt;



	scratch = early_memremap(scratch_phys, scratch_len);

	if (!scratch) {

		pr_warn("setup: failed to memremap scratch (phys=0x%llx, len=%lld)\n",

			scratch_phys, scratch_len);

		err = -EFAULT;

		goto out;

		goto err_unmap_fdt;

	}



	/*
@@ -1511,7 +1505,7 @@ void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len, 
		if (WARN_ON(err)) {

			pr_warn("failed to mark the scratch region 0x%pa+0x%pa: %pe",

				&area->addr, &size, ERR_PTR(err));

			goto out;

			goto err_unmap_scratch;

		}

		pr_debug("Marked 0x%pa+0x%pa as scratch", &area->addr, &size);

	}
@@ -1533,13 +1527,14 @@ void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len, 
	kho_scratch_cnt = scratch_cnt;

	pr_info("found kexec handover data.\n");



out:

	if (fdt)

		early_memunmap(fdt, fdt_len);

	if (scratch)

	return;



err_unmap_scratch:

	early_memunmap(scratch, scratch_len);

	if (err)

		pr_warn("disabling KHO revival: %d\n", err);

err_unmap_fdt:

	early_memunmap(fdt, fdt_len);

err_report:

	pr_warn("disabling KHO revival\n");

}



/* Helper functions for kexec_file_load */