Commit 58635d66 authored by Nico Boehr's avatar Nico Boehr Committed by Janosch Frank
Browse files

s390/mm: fix virtual-physical address confusion for swiotlb 



swiotlb passes virtual addresses to set_memory_encrypted() and
set_memory_decrypted(), but uv_remove_shared() and uv_set_shared()
expect physical addresses. This currently works, because virtual
and physical addresses are the same.

Add virt_to_phys() to resolve the virtual-physical confusion.

Reported-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: default avatarNico Boehr <nrb@linux.ibm.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
Link: https://lore.kernel.org/r/20221107121221.156274-2-nrb@linux.ibm.com


Message-Id: <20221107121221.156274-2-nrb@linux.ibm.com>
Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
parent 77b53341

arch/s390/include/asm/mem_encrypt.h

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


#ifndef __ASSEMBLY__



int set_memory_encrypted(unsigned long addr, int numpages);

int set_memory_decrypted(unsigned long addr, int numpages);

int set_memory_encrypted(unsigned long vaddr, int numpages);

int set_memory_decrypted(unsigned long vaddr, int numpages);



#endif	/* __ASSEMBLY__ */

arch/s390/mm/init.c

+6 −6
Original line number Diff line number Diff line
@@ -140,25 +140,25 @@ void mark_rodata_ro(void) 
	debug_checkwx();

}



int set_memory_encrypted(unsigned long addr, int numpages)

int set_memory_encrypted(unsigned long vaddr, int numpages)

{

	int i;



	/* make specified pages unshared, (swiotlb, dma_free) */

	for (i = 0; i < numpages; ++i) {

		uv_remove_shared(addr);

		addr += PAGE_SIZE;

		uv_remove_shared(virt_to_phys((void *)vaddr));

		vaddr += PAGE_SIZE;

	}

	return 0;

}



int set_memory_decrypted(unsigned long addr, int numpages)

int set_memory_decrypted(unsigned long vaddr, int numpages)

{

	int i;

	/* make specified pages shared (swiotlb, dma_alloca) */

	for (i = 0; i < numpages; ++i) {

		uv_set_shared(addr);

		addr += PAGE_SIZE;

		uv_set_shared(virt_to_phys((void *)vaddr));

		vaddr += PAGE_SIZE;

	}

	return 0;

}