Skip to content

Commit a449ffa

Browse files
willdeaconkonradwilk
authored andcommitted
powerpc/svm: Don't issue ultracalls if !mem_encrypt_active()
Commit ad6c002 ("swiotlb: Free tbl memory in swiotlb_exit()") introduced a set_memory_encrypted() call to swiotlb_exit() so that the buffer pages are returned to an encrypted state prior to being freed. Sachin reports that this leads to the following crash on a Power server: [ 0.010799] software IO TLB: tearing down default memory pool [ 0.010805] ------------[ cut here ]------------ [ 0.010808] kernel BUG at arch/powerpc/kernel/interrupt.c:98! Nick spotted that this is because set_memory_encrypted() is issuing an ultracall which doesn't exist for the processor, and should therefore be gated by mem_encrypt_active() to mirror the x86 implementation. Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Claire Chang <tientzu@chromium.org> Cc: Christoph Hellwig <hch@lst.de> Cc: Robin Murphy <robin.murphy@arm.com> Fixes: ad6c002 ("swiotlb: Free tbl memory in swiotlb_exit()") Suggested-by: Nicholas Piggin <npiggin@gmail.com> Reported-by: Sachin Sant <sachinp@linux.vnet.ibm.com> Tested-by: Sachin Sant <sachinp@linux.vnet.ibm.com> Tested-by: Nathan Chancellor <nathan@kernel.org> Link: https://lore.kernel.org/r/1905CD70-7656-42AE-99E2-A31FC3812EAC@linux.vnet.ibm.com/ Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
1 parent 93ebb68 commit a449ffa

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

  • arch/powerpc/platforms/pseries

arch/powerpc/platforms/pseries/svm.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ void __init svm_swiotlb_init(void)
6363

6464
int set_memory_encrypted(unsigned long addr, int numpages)
6565
{
66+
if (!mem_encrypt_active())
67+
return 0;
68+
6669
if (!PAGE_ALIGNED(addr))
6770
return -EINVAL;
6871

@@ -73,6 +76,9 @@ int set_memory_encrypted(unsigned long addr, int numpages)
7376

7477
int set_memory_decrypted(unsigned long addr, int numpages)
7578
{
79+
if (!mem_encrypt_active())
80+
return 0;
81+
7682
if (!PAGE_ALIGNED(addr))
7783
return -EINVAL;
7884

0 commit comments

Comments
 (0)