Commit d6da6737 authored by Alexander Gordeev's avatar Alexander Gordeev
Browse files

s390/crash: move copy_to_user_real() to crash_dump.c 



Function copy_to_user_real() does not really belong to maccess.c.
It is only used for copying oldmem to user space, so let's move
it to the friends.

Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Tested-by: default avatarAlexander Egorenkov <egorenar@linux.ibm.com>
Link: https://lore.kernel.org/r/e8de968d40202d87caa09aef12e9c67ec23a1c1a.1658206891.git.agordeev@linux.ibm.com


Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 9ffed254

arch/s390/include/asm/uaccess.h

+0 −1
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ static inline unsigned long __must_check clear_user(void __user *to, unsigned lo 
	return __clear_user(to, n);

}



int copy_to_user_real(void __user *dest, unsigned long src, unsigned long count);

void *s390_kernel_write(void *dst, const void *src, size_t size);



int __noreturn __put_kernel_bad(void);

arch/s390/kernel/crash_dump.c

+26 −0
Original line number Diff line number Diff line
@@ -173,6 +173,32 @@ int copy_oldmem_kernel(void *dst, unsigned long src, size_t count) 
	return 0;

}



/*

 * Copy memory from kernel (real) to user (virtual)

 */

static int copy_to_user_real(void __user *dest, unsigned long src, unsigned long count)

{

	int offs = 0, size, rc;

	char *buf;



	buf = (char *)__get_free_page(GFP_KERNEL);

	if (!buf)

		return -ENOMEM;

	rc = -EFAULT;

	while (offs < count) {

		size = min(PAGE_SIZE, count - offs);

		if (memcpy_real(buf, src + offs, size))

			goto out;

		if (copy_to_user(dest + offs, buf, size))

			goto out;

		offs += size;

	}

	rc = 0;

out:

	free_page((unsigned long)buf);

	return rc;

}



/*

 * Copy memory of the old, dumped system to a user space virtual address

 */

arch/s390/mm/maccess.c

+0 −26
Original line number Diff line number Diff line
@@ -171,32 +171,6 @@ void memcpy_absolute(void *dest, void *src, size_t count) 
	arch_local_irq_restore(flags);

}



/*

 * Copy memory from kernel (real) to user (virtual)

 */

int copy_to_user_real(void __user *dest, unsigned long src, unsigned long count)

{

	int offs = 0, size, rc;

	char *buf;



	buf = (char *) __get_free_page(GFP_KERNEL);

	if (!buf)

		return -ENOMEM;

	rc = -EFAULT;

	while (offs < count) {

		size = min(PAGE_SIZE, count - offs);

		if (memcpy_real(buf, src + offs, size))

			goto out;

		if (copy_to_user(dest + offs, buf, size))

			goto out;

		offs += size;

	}

	rc = 0;

out:

	free_page((unsigned long) buf);

	return rc;

}



/*

 * Check if physical address is within prefix or zero page

 */