Re: [PATCH v2 8/9] crypto: ccp - Use __free() handlers for __sev_do_snp_platform_status() allocations

[Tom Lendacky <thomas.lendacky@amd.com>]

On 10/15/26 23:09, Michael Roth wrote:
> Make use of __free() handlers so that the related goto statements can be
> dropped. This is in preparation for switching over to using mutex
> guard()'s.
> 
> Signed-off-by: Michael Roth <michael.roth@amd.com>

Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>

> ---
>  drivers/crypto/ccp/sev-dev.c | 27 ++++++++++-----------------
>  1 file changed, 10 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
> index aae0b15a10d9..1e017783dd03 100644
> --- a/drivers/crypto/ccp/sev-dev.c
> +++ b/drivers/crypto/ccp/sev-dev.c
> @@ -2536,17 +2536,14 @@ static int __sev_do_snp_platform_status(struct sev_user_data_snp_status *status,
>  					int *error)
>  {
>  	struct sev_device *sev = psp_master->sev_data;
> +	void *data __free(free_page) = NULL;
>  	struct sev_data_snp_addr buf;
> -	struct page *status_page;
> -	void *data;
>  	int ret;
>  
> -	status_page = alloc_page(GFP_KERNEL_ACCOUNT);
> -	if (!status_page)
> +	data = (void *)get_zeroed_page(GFP_KERNEL_ACCOUNT);
> +	if (!data)
>  		return -ENOMEM;
>  
> -	data = page_address(status_page);
> -
>  	/*
>  	 * SNP_PLATFORM_STATUS can be executed in any SNP state. But if executed
>  	 * when SNP has been initialized, the status page must be firmware-owned.
> @@ -2556,10 +2553,8 @@ static int __sev_do_snp_platform_status(struct sev_user_data_snp_status *status,
>  		 * Firmware expects the status page to be in Firmware state,
>  		 * otherwise it will report an error INVALID_PAGE_STATE.
>  		 */
> -		if (rmp_mark_pages_firmware(__pa(data), 1, true)) {
> -			ret = -EFAULT;
> -			goto cleanup;
> -		}
> +		if (rmp_mark_pages_firmware(__pa(data), 1, true))
> +			return -EFAULT;
>  	}
>  
>  	buf.address = __psp_pa(data);
> @@ -2571,17 +2566,15 @@ static int __sev_do_snp_platform_status(struct sev_user_data_snp_status *status,
>  		 * in Firmware state on failure. Use snp_reclaim_pages() to
>  		 * transition either case back to Hypervisor-owned state.
>  		 */
> -		if (snp_reclaim_pages(__pa(data), 1, true))
> +		if (snp_reclaim_pages(__pa(data), 1, true)) {
> +			data = NULL;
>  			return -EFAULT;
> +		}
>  	}
>  
> -	if (ret)
> -		goto cleanup;
> -
> -	memcpy(status, data, sizeof(*status));
> +	if (!ret)
> +		memcpy(status, data, sizeof(*status));
>  
> -cleanup:
> -	__free_pages(status_page, 0);
>  	return ret;
>  }
>