Re: [PATCH v7 09/11] cxl: Restore CXL HDM state after PCI reset

[sashiko-bot@kernel.org]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] The function `cxl_reset_function` mixes `goto`-based error handling with scope-based cleanup (`scoped_guard`).
--

commit 632a408ad919cb36ef2b58d6bfde50d19355ae4d
Author: Srirangan Madhavan <smadhavan@nvidia.com>

cxl: Restore CXL HDM state after PCI reset

After CXL reset, restore PCI config state enough to reach HDM MMIO,
restore cached global and per-decoder HDM state, and then run the normal
PCI restore callbacks.

> diff --git a/drivers/cxl/core/reset.c b/drivers/cxl/core/reset.c
> index 69bcfab898589..d801c91a5cbf8 100644
> --- a/drivers/cxl/core/reset.c
> +++ b/drivers/cxl/core/reset.c
[ ... ]
> @@ -1053,12 +1219,19 @@ int cxl_reset_function(struct pci_dev *pdev, bool probe)
>  	if (rc)
>  		goto out_functions_done;
>  
> +	rc = cxl_pci_target_reset_prepare(&ctx);
> +	if (rc)
> +		goto out_functions_done;
> +
>  	scoped_guard(rwsem_write, &cxl_rwsem.region) {
>  		rc = cxl_hdm_ranges_prepare(&range_ctx, &ctx);
>  		if (!rc)
>  			rc = cxl_reset_execute(pdev, dvsec);
> +		if (!rc)
> +			rc = cxl_restore_hdm_decoders(&ctx);
>  	}
>  
> +	cxl_pci_target_reset_done(&ctx);
>  out_functions_done:
>  	cxl_pci_functions_reset_done(&ctx);
>  out_unlock:

[Severity: Low]
Does this code violate the guideline against mixing goto-based error handling
with scope-based cleanups in the same function?

The cleanup documentation specifies that for a given routine, either all
resources that need a goto cleanup should be converted to scope-based cleanup,
or none of them. Could cxl_reset_function() in drivers/cxl/core/reset.c be
refactored to use a consistent error handling approach rather than mixing goto
labels with scoped_guard blocks?

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260623032453.3404772-1-smadhavan@nvidia.com?part=9