diff options
author | Claudio Imbrenda <imbrenda@linux.ibm.com> | 2023-11-09 13:36:24 +0100 |
---|---|---|
committer | sanglipeng <sanglipeng1@jd.com> | 2024-04-24 10:09:12 +0800 |
commit | 43087df476ad84dcf17a27904f5455d48a1722fa (patch) | |
tree | 02e41de2ccf9e605efe006292d9af3d44c1c3885 | |
parent | 0ffc1d162fb41a3a256cd4c2c0c506e5920f76fa (diff) | |
download | openEuler-kernel-43087df476ad84dcf17a27904f5455d48a1722fa.tar.gz |
KVM: s390/mm: Properly reset no-dat
stable inclusion
from stable-v5.10.204
commit e0e897ddf392804fc2f27ebc9cce8917a1178d3e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9J4PL
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e0e897ddf392804fc2f27ebc9cce8917a1178d3e
--------------------------------
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: Nico Boehr <nrb@linux.ibm.com>
Message-ID: <20231109123624.37314-1-imbrenda@linux.ibm.com>
Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>
-rw-r--r-- | arch/s390/mm/pgtable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 1c05caf68e7d86..5b62e385af386d 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -717,7 +717,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(); } |