summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2020-06-24 17:39:14 +0200
committerHeiko Carstens <heiko.carstens@de.ibm.com>2020-06-29 16:26:36 +0200
commitd6df52e9996dcc2062c3d9c9123288468bb95b52 (patch)
tree251daeb1efbedf4808f2e8a4bc52354b8ea7ed3c /arch
parent3047766bc6ec9c6bc9ece85b45a41ff401e8d988 (diff)
downloadlinux-stable-d6df52e9996dcc2062c3d9c9123288468bb95b52.tar.gz
linux-stable-d6df52e9996dcc2062c3d9c9123288468bb95b52.tar.bz2
linux-stable-d6df52e9996dcc2062c3d9c9123288468bb95b52.zip
s390/maccess: add no DAT mode to kernel_write
To be able to patch kernel code before paging is initialized do plain memcpy if DAT is off. This is required to enable early jump label initialization. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/mm/maccess.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
index 22a0be655f27..1d17413b319a 100644
--- a/arch/s390/mm/maccess.c
+++ b/arch/s390/mm/maccess.c
@@ -62,11 +62,15 @@ notrace void *s390_kernel_write(void *dst, const void *src, size_t size)
long copied;
spin_lock_irqsave(&s390_kernel_write_lock, flags);
- while (size) {
- copied = s390_kernel_write_odd(tmp, src, size);
- tmp += copied;
- src += copied;
- size -= copied;
+ if (!(flags & PSW_MASK_DAT)) {
+ memcpy(dst, src, size);
+ } else {
+ while (size) {
+ copied = s390_kernel_write_odd(tmp, src, size);
+ tmp += copied;
+ src += copied;
+ size -= copied;
+ }
}
spin_unlock_irqrestore(&s390_kernel_write_lock, flags);