nfit: fix region registration vs block-data-window ranges (8d0d8ed3) · Commits · 戴 / test

Commit "nfit: scrub and register regions in a workqueue" mistakenly attempts to register a region per BLK aperture. There is nothing to register for individual apertures as they belong as a set to a BLK aperture group that are registered with a corresponding DIMM-control-region. Filter them for registration to prevent some needless devm_kzalloc() allocations. Cc: <stable@vger.kernel.org> Fixes: ("nfit: scrub and register regions in a workqueue") Reviewed-by:

Dave Jiang <dave.jiang@intel.com> Signed-off-by:

Dan Williams <dan.j.williams@intel.com>

drivers/acpi/nfit/core.c

+14 −8

Original line number	Diff line number	Diff line
		@@ -3018,11 +3018,17 @@ static void acpi_nfit_scrub(struct work_struct *work)
		static int acpi_nfit_register_regions(struct acpi_nfit_desc *acpi_desc)
		{
		struct nfit_spa *nfit_spa;
		int rc;

		list_for_each_entry(nfit_spa, &acpi_desc->spas, list)
		if (nfit_spa_type(nfit_spa->spa) == NFIT_SPA_DCR) {
		/* BLK regions don't need to wait for ars results */
		list_for_each_entry(nfit_spa, &acpi_desc->spas, list) {
		int rc, type = nfit_spa_type(nfit_spa->spa);

		/* PMEM and VMEM will be registered by the ARS workqueue */
		if (type == NFIT_SPA_PM \|\| type == NFIT_SPA_VOLATILE)
		continue;
		/* BLK apertures belong to BLK region registration below */
		if (type == NFIT_SPA_BDW)
		continue;
		/* BLK regions don't need to wait for ARS results */
		rc = acpi_nfit_register_region(acpi_desc, nfit_spa);
		if (rc)
		return rc;

Admin message