Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e63d2ba authored by Claudio Imbrenda's avatar Claudio Imbrenda Committed by Greg Kroah-Hartman
Browse files

s390/mm: Fix storage key clearing for guest huge pages 



[ Upstream commit 843c3280686fc1a83d89ee1e0b5599c9f6b09d0c ]

The function __storage_key_init_range() expects the end address to be
the first byte outside the range to be initialized. I.e. end - start
should be the size of the area to be initialized.

The current code works because __storage_key_init_range() will still loop
over every page in the range, but it is slower than using sske_frame().

Fixes: 964c2c05 ("s390/mm: Clear huge page storage keys on enable_skey")
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Link: https://lore.kernel.org/r/20240416114220.28489-2-imbrenda@linux.ibm.com


Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 47d253c4

arch/s390/mm/gmap.c

+1 −1
Original line number Diff line number Diff line
@@ -2610,7 +2610,7 @@ static int __s390_enable_skey_hugetlb(pte_t *pte, unsigned long addr, 
		return 0;



	start = pmd_val(*pmd) & HPAGE_MASK;

	end = start + HPAGE_SIZE - 1;

	end = start + HPAGE_SIZE;

	__storage_key_init_range(start, end);

	set_bit(PG_arch_1, &page->flags);

	cond_resched();