maccess-remove-probe_read_common-and-probe_write_common.patch removed from -mm tree
The patch titled
Subject: maccess: remove probe_read_common and probe_write_common
has been removed from the -mm tree. Its filename was
maccess-remove-probe_read_common-and-probe_write_common.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: maccess: remove probe_read_common and probe_write_common
Each of the helpers has just two callers, which also different in dealing with kernel or userspace pointers. Just open code the logic in the callers.
---
mm/maccess.c | 63 ++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 34 deletions(-)
mm/maccess.c renamed from mm/maccess.c~maccess-remove-probe_read_common-and-probe_write_common +29 -34
@@ -6,30 +6,6 @@#include <linux/mm.h> #include <linux/uaccess.h> -static __always_inline long -probe_read_common (void *dst,const void __user *src,size_t size) -{ -long ret; - -pagefault_disable (); - ret =__copy_from_user_inatomic (dst, src, size); -pagefault_enable (); - -return ret ? -EFAULT :0 ; -} - -static __always_inline long -probe_write_common (void __user *dst,const void *src,size_t size) -{ -long ret; - -pagefault_disable (); - ret =__copy_to_user_inatomic (dst, src, size); -pagefault_enable (); - -return ret ? -EFAULT :0 ; -} -/** * probe_kernel_read(): safely attempt to read from any location * @dst: pointer to the buffer that shall take the data
@@ -70,10 +46,15 @@ long __probe_kernel_read(void *dst, consmm_segment_t old_fs =get_fs ();set_fs (KERNEL_DS ); - ret =probe_read_common (dst, (__force const void __user *)src, size); +pagefault_disable (); + ret =__copy_from_user_inatomic (dst, (__force const void __user *)src, + size); +pagefault_enable ();set_fs (old_fs); -return ret; +if (ret) +return -EFAULT ; +return 0 ; }EXPORT_SYMBOL_GPL (probe_kernel_read);
@@ -92,11 +73,16 @@ long probe_user_read(void *dst, const vomm_segment_t old_fs =get_fs ();set_fs (USER_DS ); -if (access_ok (src, size)) - ret =probe_read_common (dst, src, size); +if (access_ok (src, size)) { +pagefault_disable (); + ret =__copy_from_user_inatomic (dst, src, size); +pagefault_enable (); + }set_fs (old_fs); -return ret; +if (ret) +return -EFAULT ; +return 0 ; }EXPORT_SYMBOL_GPL (probe_user_read);
@@ -115,10 +101,14 @@ long probe_kernel_write(void *dst, constmm_segment_t old_fs =get_fs ();set_fs (KERNEL_DS ); - ret =probe_write_common ((__force void __user *)dst, src, size); +pagefault_disable (); + ret =__copy_to_user_inatomic ((__force void __user *)dst, src, size); +pagefault_enable ();set_fs (old_fs); -return ret; +if (ret) +return -EFAULT ; +return 0 ; }/**
@@ -136,11 +126,16 @@ long probe_user_write(void __user *dst,mm_segment_t old_fs =get_fs ();set_fs (USER_DS ); -if (access_ok (dst, size)) - ret =probe_write_common (dst, src, size); +if (access_ok (dst, size)) { +pagefault_disable (); + ret =__copy_to_user_inatomic (dst, src, size); +pagefault_enable (); + }set_fs (old_fs); -return ret; +if (ret) +return -EFAULT ; +return 0 ; }EXPORT_SYMBOL_GPL (probe_user_write);
_
Patches currently in -mm which might be from [email protected] are
amdgpu-a-null-mm-does-not-mean-a-thread-is-a-kthread.patch kernel-move-use_mm-unuse_mm-to-kthreadc.patch kernel-move-use_mm-unuse_mm-to-kthreadc-v2.patch kernel-better-document-the-use_mm-unuse_mm-api-contract.patch kernel-better-document-the-use_mm-unuse_mm-api-contract-v2.patch kernel-set-user_ds-in-kthread_use_mm.patch