Commit 461ab980 authored by Claudio Imbrenda's avatar Claudio Imbrenda Committed by Zheng Zengkai
Browse files

KVM: s390/mm: Properly reset no-dat 

stable inclusion
from stable-v6.6.7
commit bb356cc6615c8d924f4ac8ef1bc9642d861a584b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8SSQ4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=bb356cc6615c8d924f4ac8ef1bc9642d861a584b



--------------------------------

commit 27072b8e18a73ffeffb1c140939023915a35134b upstream.

When the CMMA state needs to be reset, the no-dat bit also needs to be
reset. Failure to do so could cause issues in the guest, since the
guest expects the bit to be cleared after a reset.

Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarNico Boehr <nrb@linux.ibm.com>
Message-ID: <20231109123624.37314-1-imbrenda@linux.ibm.com>
Signed-off-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 3ea3f761

arch/s390/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ void ptep_zap_unused(struct mm_struct *mm, unsigned long addr, 
		pte_clear(mm, addr, ptep);

	}

	if (reset)

		pgste_val(pgste) &= ~_PGSTE_GPS_USAGE_MASK;

		pgste_val(pgste) &= ~(_PGSTE_GPS_USAGE_MASK | _PGSTE_GPS_NODAT);

	pgste_set_unlock(ptep, pgste);

	preempt_enable();

}