Commit 8168a7b7 authored by Ashish Kalra's avatar Ashish Kalra Committed by Herbert Xu
Browse files

crypto: ccp - allow callers to use HV-Fixed page API when SEV is disabled 



When SEV is disabled, the HV-Fixed page allocation call fails, which in
turn causes SFS initialization to fail.

Fix the HV-Fixed API so callers (for example, SFS) can use it even when
SEV is disabled by performing normal page allocation and freeing.

Fixes: e09701dc ("crypto: ccp - Add new HV-Fixed page allocation/free API")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAshish Kalra <ashish.kalra@amd.com>
Reviewed-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6de23f81

drivers/crypto/ccp/sev-dev.c

+4 −6
Original line number Diff line number Diff line
@@ -1105,15 +1105,12 @@ struct page *snp_alloc_hv_fixed_pages(unsigned int num_2mb_pages) 
{

	struct psp_device *psp_master = psp_get_master_device();

	struct snp_hv_fixed_pages_entry *entry;

	struct sev_device *sev;

	unsigned int order;

	struct page *page;



	if (!psp_master || !psp_master->sev_data)

	if (!psp_master)

		return NULL;



	sev = psp_master->sev_data;



	order = get_order(PMD_SIZE * num_2mb_pages);



	/*
@@ -1126,7 +1123,8 @@ struct page *snp_alloc_hv_fixed_pages(unsigned int num_2mb_pages) 
	 * This API uses SNP_INIT_EX to transition allocated pages to HV_Fixed

	 * page state, fail if SNP is already initialized.

	 */

	if (sev->snp_initialized)

	if (psp_master->sev_data &&

	    ((struct sev_device *)psp_master->sev_data)->snp_initialized)

		return NULL;



	/* Re-use freed pages that match the request */
@@ -1162,7 +1160,7 @@ void snp_free_hv_fixed_pages(struct page *page) 
	struct psp_device *psp_master = psp_get_master_device();

	struct snp_hv_fixed_pages_entry *entry, *nentry;



	if (!psp_master || !psp_master->sev_data)

	if (!psp_master)

		return;



	/*