bitmap: separate bitmap parsing for user buffer and kernel buffer
Subsystems (3)
PATCH 1/1 bitmap: separate bitmap parsing for user buffer and kernel buffer
lib/bitmap.c:bitmap_parse() is a library function that received as input a user buffer. This seemed to have originated from the way the write_proc function of the /proc filesystem operates.
This has been reworked to not use kmalloc and eliminates a lot of get_user overhead by performing one access_ok before using __get_user.
This function will be useful for other uses as well; for example, taking input for /sysfs instead of /proc, so it was changed to accept kernel buffers. We have this use for the Linux UWB project, as part as the upcoming bandwidth allocator code.
Only a few routines used this function and they were changed too.
---
This is an updated version of patch bitmap-bitmap_parse-takes-a-kernel-buffer-instead-of-a-user-buffer.patch
With the usage of access_ok() before __get_user(), is it still necessary to check the return code of __get_user? We currently do this.
include/linux/bitmap.h | 13 +++++++++-- include/linux/cpumask.h | 14 ++++++------ include/linux/nodemask.h | 14 ++++++------ kernel/irq/proc.c | 2 - kernel/profile.c | 2 - lib/bitmap.c | 53 +++++++++++++++++++++++++++++++++++++---------- 6 files changed, 69 insertions(+), 29 deletions(-)
include/linux/bitmap.h +11 -2
@@ -46,7 +46,8 @@* bitmap_remap(dst, src, old, new, nbits) *dst = map(old, new)(src) * bitmap_bitremap(oldbit, old, new, nbits) newbit = map(old, new)(oldbit) * bitmap_scnprintf(buf, len, src, nbits) Print bitmap src to buf -* bitmap_parse(ubuf, ulen, dst, nbits) Parse bitmap dst from user buf +* bitmap_parse(buf, buflen, dst, nbits) Parse bitmap dst from kernel buf +* bitmap_parse_user(ubuf, ulen, dst, nbits) Parse bitmap dst from user buf * bitmap_scnlistprintf(buf, len, src, nbits) Print bitmap src as list to buf * bitmap_parselist(buf, dst, nbits) Parse bitmap dst from list * bitmap_find_free_region(bitmap, bits, order) Find and allocate bit region
@@ -106,7 +107,9 @@ extern int __bitmap_weight(const unsigneextern int bitmap_scnprintf (char *buf,unsigned int len,const unsigned long *src,int nbits); -extern int bitmap_parse (const char __user *ubuf,unsigned int ulen, +extern int __bitmap_parse (const char *buf,unsigned int buflen,int is_user, +unsigned long *dst,int nbits); +extern int bitmap_parse_user (const char __user *ubuf,unsigned int ulen,unsigned long *dst,int nbits);extern int bitmap_scnlistprintf (char *buf,unsigned int len,const unsigned long *src,int nbits);
@@ -270,6 +273,12 @@ static inline void bitmap_shift_left(uns__bitmap_shift_left (dst, src, n, nbits); } +static inline int bitmap_parse (const char *buf,unsigned int buflen, +unsigned long *maskp,int nmaskbits) +{ +return __bitmap_parse (buf, buflen,0 , maskp, nmaskbits); +} +#endif /* __ASSEMBLY__ */ #endif /* __LINUX_BITMAP_H */
lib/bitmap.c +42 -11
82 lines not on this page · raw message
include/linux/cpumask.h +7 -7
@@ -8,8 +8,8 @@* See detailed comments in the file linux/bitmap.h describing the * data type on which these cpumasks are based. * -* For details of cpumask_scnprintf() and cpumask_parse(), -* see bitmap_scnprintf() and bitmap_parse() in lib/bitmap.c. +* For details of cpumask_scnprintf() and cpumask_parse_user(), +* see bitmap_scnprintf() and bitmap_parse_user() in lib/bitmap.c. * For details of cpulist_scnprintf() and cpulist_parse(), see * bitmap_scnlistprintf() and bitmap_parselist(), also in bitmap.c. * For details of cpu_remap(), see bitmap_bitremap in lib/bitmap.c
@@ -49,7 +49,7 @@* unsigned long *cpus_addr(mask) Array of unsigned long's in mask * * int cpumask_scnprintf(buf, len, mask) Format cpumask for printing -* int cpumask_parse(ubuf, ulen, mask) Parse ascii string as cpumask +* int cpumask_parse_user(ubuf, ulen, mask) Parse ascii string as cpumask * int cpulist_scnprintf(buf, len, mask) Format cpumask as list for printing * int cpulist_parse(buf, map) Parse ascii string as cpulist * int cpu_remap(oldbit, old, new) newbit = map(old, new)(oldbit)
@@ -273,12 +273,12 @@ static inline int __cpumask_scnprintf(chreturn bitmap_scnprintf (buf, len, srcp->bits, nbits); } -#define cpumask_parse (ubuf, ulen, dst) \ - __cpumask_parse((ubuf), (ulen), &(dst), NR_CPUS) -static inline int __cpumask_parse (const char __user *buf,int len, +#define cpumask_parse_user (ubuf, ulen, dst) \ + __cpumask_parse_user((ubuf), (ulen), &(dst), NR_CPUS) +static inline int __cpumask_parse_user (const char __user *buf,int len,cpumask_t *dstp,int nbits) { -return bitmap_parse (buf, len, dstp->bits, nbits); +return bitmap_parse_user (buf, len, dstp->bits, nbits); }#define cpulist_scnprintf (buf, len, src) \
kernel/irq/proc.c +1 -1
@@ -57,7 +57,7 @@ static int irq_affinity_write_proc(strucif (!irq_desc[irq].chip->set_affinity || no_irq_affinity)return -EIO ; - err =cpumask_parse (buffer, count, new_value); + err =cpumask_parse_user (buffer, count, new_value);if (err)return err;
kernel/profile.c +1 -1
@@ -396,7 +396,7 @@ static int prof_cpu_mask_write_proc (strunsigned long full_count = count, err;cpumask_t new_value; - err =cpumask_parse (buffer, count, new_value); + err =cpumask_parse_user (buffer, count, new_value);if (err)return err;
include/linux/nodemask.h +7 -7
@@ -8,8 +8,8 @@* See detailed comments in the file linux/bitmap.h describing the * data type on which these nodemasks are based. * -* For details of nodemask_scnprintf() and nodemask_parse(), -* see bitmap_scnprintf() and bitmap_parse() in lib/bitmap.c. +* For details of nodemask_scnprintf() and nodemask_parse_user(), +* see bitmap_scnprintf() and bitmap_parse_user() in lib/bitmap.c. * For details of nodelist_scnprintf() and nodelist_parse(), see * bitmap_scnlistprintf() and bitmap_parselist(), also in bitmap.c. * For details of node_remap(), see bitmap_bitremap in lib/bitmap.c.
@@ -51,7 +51,7 @@* unsigned long *nodes_addr(mask) Array of unsigned long's in mask * * int nodemask_scnprintf(buf, len, mask) Format nodemask for printing -* int nodemask_parse(ubuf, ulen, mask) Parse ascii string as nodemask +* int nodemask_parse_user(ubuf, ulen, mask) Parse ascii string as nodemask * int nodelist_scnprintf(buf, len, mask) Format nodemask as list for printing * int nodelist_parse(buf, map) Parse ascii string as nodelist * int node_remap(oldbit, old, new) newbit = map(old, new)(oldbit)
@@ -288,12 +288,12 @@ static inline int __nodemask_scnprintf(creturn bitmap_scnprintf (buf, len, srcp->bits, nbits); } -#define nodemask_parse (ubuf, ulen, dst) \ - __nodemask_parse((ubuf), (ulen), &(dst), MAX_NUMNODES) -static inline int __nodemask_parse (const char __user *buf,int len, +#define nodemask_parse_user (ubuf, ulen, dst) \ + __nodemask_parse_user((ubuf), (ulen), &(dst), MAX_NUMNODES) +static inline int __nodemask_parse_user (const char __user *buf,int len,nodemask_t *dstp,int nbits) { -return bitmap_parse (buf, len, dstp->bits, nbits); +return bitmap_parse_user (buf, len, dstp->bits, nbits); }#define nodelist_scnprintf (buf, len, src) \
lib/bitmap.c int bitmap_parse(const char __user *ubuf · line 355
Quoted 6 lines · On Wed, 4 Oct 2006 17:56:30 -0700 Reinette Chatre…
lib/bitmap.c +6
-0+if (is_user) { +if (__get_user (c, buf++)) +return -EFAULT ; + } +else + c = *buf++;
Is this actually needed? __get_user(kernel_address) works OK and (believe it or not, given all the stuff it involves) boils down to a single instruction.
Quoted 12 lines · Andrew Morton
lib/bitmap.c int bitmap_parse(const char __user *ubuf · line 355
Quoted 6 lines · On Wed, 4 Oct 2006 17:56:30 -0700 Reinette Chatre…
lib/bitmap.c +6
-0+if (is_user) { +if (__get_user (c, buf++)) +return -EFAULT ; + } +else + c = *buf++;Is this actually needed?
__get_user(kernel_address)works OK and (believe it or not, given all the stuff it involves) boils down to a single instruction.
We weren't too sure if that'd be true in all kinds of arches and memory models. If it works for kernel space too, then we can fold out a lot of code...
Your call, you are the expert :)
--
Inaky
Quoted 14 lines · On Wed, 4 Oct 2006 18:33:37 -0700 Inaky Perez-Gonzalez <[email protected]>…
Quoted 12 lines · Andrew Morton
lib/bitmap.c int bitmap_parse(const char __user *ubuf · line 355
Quoted 6 lines · On Wed, 4 Oct 2006 17:56:30 -0700 Reinette Chatre…
lib/bitmap.c +6
-0+if (is_user) { +if (__get_user (c, buf++)) +return -EFAULT ; + } +else + c = *buf++;Is this actually needed?
__get_user(kernel_address)works OK and (believe it or not, given all the stuff it involves) boils down to a single instruction.
Quoted 3 lines
We weren't too sure if that'd be true in all kinds of arches and memory models. If it works for kernel space too, then we can fold out a lot of code...
We use __get_user() in this fashion in several places in core kernel already, although it's usually to find out "will this address give me a fault", rather than to actually read a value.
There's some precedent for the `is_user' approach as well - it has the advantage of being more sparse-friendly, and perhaps clearer to read.
PATCH 1/1 bitmap: parse kernel and user buffers
lib/bitmap.c:bitmap_parse() is a library function that received as input a user buffer. This seemed to have originated from the way the write_proc function of the /proc filesystem operates.
This has been reworked as follows:
- don't use kmalloc
- eliminates a lot of get_user overhead by performing one access_ok before using __get_user
- access kernel buffer using __get_user(kernel_address)
This function will be useful for other uses as well; for example, taking input for /sysfs instead of /proc, so it was changed to accept kernel buffers. We have this use for the Linux UWB project, as part as the upcoming bandwidth allocator code.
Only a few routines used this function and they were changed too.
---
This is an updated version of patch bitmap-bitmap_parse-takes-a-kernel-buffer-instead-of-a-user-buffer.patch
With the usage of access_ok() before __get_user(), is it still necessary to check the return code of __get_user? We currently do this.
include/linux/bitmap.h | 7 +++++-- include/linux/cpumask.h | 14 +++++++------- include/linux/nodemask.h | 14 +++++++------- kernel/irq/proc.c | 2 +- kernel/profile.c | 2 +- lib/bitmap.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 6 files changed, 60 insertions(+), 26 deletions(-)
include/linux/bitmap.h +5 -2
@@ -46,7 +46,8 @@* bitmap_remap(dst, src, old, new, nbits) *dst = map(old, new)(src) * bitmap_bitremap(oldbit, old, new, nbits) newbit = map(old, new)(oldbit) * bitmap_scnprintf(buf, len, src, nbits) Print bitmap src to buf -* bitmap_parse(ubuf, ulen, dst, nbits) Parse bitmap dst from user buf +* bitmap_parse(buf, buflen, dst, nbits) Parse bitmap dst from buf +* bitmap_parse_user(ubuf, ulen, dst, nbits) Parse bitmap dst from user buf * bitmap_scnlistprintf(buf, len, src, nbits) Print bitmap src as list to buf * bitmap_parselist(buf, dst, nbits) Parse bitmap dst from list * bitmap_find_free_region(bitmap, bits, order) Find and allocate bit region
@@ -106,7 +107,9 @@ extern int __bitmap_weight(const unsigneextern int bitmap_scnprintf (char *buf,unsigned int len,const unsigned long *src,int nbits); -extern int bitmap_parse (const char __user *ubuf,unsigned int ulen, +extern int bitmap_parse (const char *buf,unsigned int buflen, +unsigned long *dst,int nbits); +extern int bitmap_parse_user (const char __user *ubuf,unsigned int ulen,unsigned long *dst,int nbits);extern int bitmap_scnlistprintf (char *buf,unsigned int len,const unsigned long *src,int nbits);
lib/bitmap.c +39 -8
79 lines not on this page · raw message
include/linux/cpumask.h +7 -7
@@ -8,8 +8,8 @@* See detailed comments in the file linux/bitmap.h describing the * data type on which these cpumasks are based. * -* For details of cpumask_scnprintf() and cpumask_parse(), -* see bitmap_scnprintf() and bitmap_parse() in lib/bitmap.c. +* For details of cpumask_scnprintf() and cpumask_parse_user(), +* see bitmap_scnprintf() and bitmap_parse_user() in lib/bitmap.c. * For details of cpulist_scnprintf() and cpulist_parse(), see * bitmap_scnlistprintf() and bitmap_parselist(), also in bitmap.c. * For details of cpu_remap(), see bitmap_bitremap in lib/bitmap.c
@@ -49,7 +49,7 @@* unsigned long *cpus_addr(mask) Array of unsigned long's in mask * * int cpumask_scnprintf(buf, len, mask) Format cpumask for printing -* int cpumask_parse(ubuf, ulen, mask) Parse ascii string as cpumask +* int cpumask_parse_user(ubuf, ulen, mask) Parse ascii string as cpumask * int cpulist_scnprintf(buf, len, mask) Format cpumask as list for printing * int cpulist_parse(buf, map) Parse ascii string as cpulist * int cpu_remap(oldbit, old, new) newbit = map(old, new)(oldbit)
@@ -273,12 +273,12 @@ static inline int __cpumask_scnprintf(chreturn bitmap_scnprintf (buf, len, srcp->bits, nbits); } -#define cpumask_parse (ubuf, ulen, dst) \ - __cpumask_parse((ubuf), (ulen), &(dst), NR_CPUS) -static inline int __cpumask_parse (const char __user *buf,int len, +#define cpumask_parse_user (ubuf, ulen, dst) \ + __cpumask_parse_user((ubuf), (ulen), &(dst), NR_CPUS) +static inline int __cpumask_parse_user (const char __user *buf,int len,cpumask_t *dstp,int nbits) { -return bitmap_parse (buf, len, dstp->bits, nbits); +return bitmap_parse_user (buf, len, dstp->bits, nbits); }#define cpulist_scnprintf (buf, len, src) \
kernel/irq/proc.c +1 -1
@@ -57,7 +57,7 @@ static int irq_affinity_write_proc(strucif (!irq_desc[irq].chip->set_affinity || no_irq_affinity)return -EIO ; - err =cpumask_parse (buffer, count, new_value); + err =cpumask_parse_user (buffer, count, new_value);if (err)return err;
kernel/profile.c +1 -1
@@ -396,7 +396,7 @@ static int prof_cpu_mask_write_proc (strunsigned long full_count = count, err;cpumask_t new_value; - err =cpumask_parse (buffer, count, new_value); + err =cpumask_parse_user (buffer, count, new_value);if (err)return err;
include/linux/nodemask.h +7 -7
@@ -8,8 +8,8 @@* See detailed comments in the file linux/bitmap.h describing the * data type on which these nodemasks are based. * -* For details of nodemask_scnprintf() and nodemask_parse(), -* see bitmap_scnprintf() and bitmap_parse() in lib/bitmap.c. +* For details of nodemask_scnprintf() and nodemask_parse_user(), +* see bitmap_scnprintf() and bitmap_parse_user() in lib/bitmap.c. * For details of nodelist_scnprintf() and nodelist_parse(), see * bitmap_scnlistprintf() and bitmap_parselist(), also in bitmap.c. * For details of node_remap(), see bitmap_bitremap in lib/bitmap.c.
@@ -51,7 +51,7 @@* unsigned long *nodes_addr(mask) Array of unsigned long's in mask * * int nodemask_scnprintf(buf, len, mask) Format nodemask for printing -* int nodemask_parse(ubuf, ulen, mask) Parse ascii string as nodemask +* int nodemask_parse_user(ubuf, ulen, mask) Parse ascii string as nodemask * int nodelist_scnprintf(buf, len, mask) Format nodemask as list for printing * int nodelist_parse(buf, map) Parse ascii string as nodelist * int node_remap(oldbit, old, new) newbit = map(old, new)(oldbit)
@@ -288,12 +288,12 @@ static inline int __nodemask_scnprintf(creturn bitmap_scnprintf (buf, len, srcp->bits, nbits); } -#define nodemask_parse (ubuf, ulen, dst) \ - __nodemask_parse((ubuf), (ulen), &(dst), MAX_NUMNODES) -static inline int __nodemask_parse (const char __user *buf,int len, +#define nodemask_parse_user (ubuf, ulen, dst) \ + __nodemask_parse_user((ubuf), (ulen), &(dst), MAX_NUMNODES) +static inline int __nodemask_parse_user (const char __user *buf,int len,nodemask_t *dstp,int nbits) { -return bitmap_parse (buf, len, dstp->bits, nbits); +return bitmap_parse_user (buf, len, dstp->bits, nbits); }#define nodelist_scnprintf (buf, len, src) \
PATCH 1/1 bitmap: parse input from kernel and user buffers
lib/bitmap.c:bitmap_parse() is a library function that received as input a user buffer. This seemed to have originated from the way the write_proc function of the /proc filesystem operates.
This has been reworked to not use kmalloc and eliminates a lot of get_user() overhead by performing one access_ok before using __get_user().
We need to test if we are in kernel or user space (is_user) and access the buffer differently. We cannot use __get_user() to access kernel addresses in all cases, for example in architectures with separate address space for kernel and user.
This function will be useful for other uses as well; for example, taking input for /sysfs instead of /proc, so it was changed to accept kernel buffers. We have this use for the Linux UWB project, as part as the upcoming bandwidth allocator code.
Only a few routines used this function and they were changed too.
---
This is an updated version of patch bitmap-bitmap_parse-takes-a-kernel-buffer-instead-of-a-user-buffer.patch
Andi Kleen and Cristoph Hellwig have confirmed that in architectures with separate address space __get_user() won't work
With the usage of access_ok() before __get_user(), is it still necessary to check the return code of __get_user()? We currently do this.
include/linux/bitmap.h | 13 +++++++++-- include/linux/cpumask.h | 14 ++++++------ include/linux/nodemask.h | 14 ++++++------ kernel/irq/proc.c | 2 - kernel/profile.c | 2 - lib/bitmap.c | 54 +++++++++++++++++++++++++++++++++++++---------- 6 files changed, 70 insertions(+), 29 deletions(-)
include/linux/bitmap.h +11 -2
@@ -46,7 +46,8 @@* bitmap_remap(dst, src, old, new, nbits) *dst = map(old, new)(src) * bitmap_bitremap(oldbit, old, new, nbits) newbit = map(old, new)(oldbit) * bitmap_scnprintf(buf, len, src, nbits) Print bitmap src to buf -* bitmap_parse(ubuf, ulen, dst, nbits) Parse bitmap dst from user buf +* bitmap_parse(buf, buflen, dst, nbits) Parse bitmap dst from kernel buf +* bitmap_parse_user(ubuf, ulen, dst, nbits) Parse bitmap dst from user buf * bitmap_scnlistprintf(buf, len, src, nbits) Print bitmap src as list to buf * bitmap_parselist(buf, dst, nbits) Parse bitmap dst from list * bitmap_find_free_region(bitmap, bits, order) Find and allocate bit region
@@ -106,7 +107,9 @@ extern int __bitmap_weight(const unsigneextern int bitmap_scnprintf (char *buf,unsigned int len,const unsigned long *src,int nbits); -extern int bitmap_parse (const char __user *ubuf,unsigned int ulen, +extern int __bitmap_parse (const char *buf,unsigned int buflen,int is_user, +unsigned long *dst,int nbits); +extern int bitmap_parse_user (const char __user *ubuf,unsigned int ulen,unsigned long *dst,int nbits);extern int bitmap_scnlistprintf (char *buf,unsigned int len,const unsigned long *src,int nbits);
@@ -270,6 +273,12 @@ static inline void bitmap_shift_left(uns__bitmap_shift_left (dst, src, n, nbits); } +static inline int bitmap_parse (const char *buf,unsigned int buflen, +unsigned long *maskp,int nmaskbits) +{ +return __bitmap_parse (buf, buflen,0 , maskp, nmaskbits); +} +#endif /* __ASSEMBLY__ */ #endif /* __LINUX_BITMAP_H */
lib/bitmap.c +43 -11
86 lines not on this page · raw message
include/linux/cpumask.h +7 -7
@@ -8,8 +8,8 @@* See detailed comments in the file linux/bitmap.h describing the * data type on which these cpumasks are based. * -* For details of cpumask_scnprintf() and cpumask_parse(), -* see bitmap_scnprintf() and bitmap_parse() in lib/bitmap.c. +* For details of cpumask_scnprintf() and cpumask_parse_user(), +* see bitmap_scnprintf() and bitmap_parse_user() in lib/bitmap.c. * For details of cpulist_scnprintf() and cpulist_parse(), see * bitmap_scnlistprintf() and bitmap_parselist(), also in bitmap.c. * For details of cpu_remap(), see bitmap_bitremap in lib/bitmap.c
@@ -49,7 +49,7 @@* unsigned long *cpus_addr(mask) Array of unsigned long's in mask * * int cpumask_scnprintf(buf, len, mask) Format cpumask for printing -* int cpumask_parse(ubuf, ulen, mask) Parse ascii string as cpumask +* int cpumask_parse_user(ubuf, ulen, mask) Parse ascii string as cpumask * int cpulist_scnprintf(buf, len, mask) Format cpumask as list for printing * int cpulist_parse(buf, map) Parse ascii string as cpulist * int cpu_remap(oldbit, old, new) newbit = map(old, new)(oldbit)
@@ -273,12 +273,12 @@ static inline int __cpumask_scnprintf(chreturn bitmap_scnprintf (buf, len, srcp->bits, nbits); } -#define cpumask_parse (ubuf, ulen, dst) \ - __cpumask_parse((ubuf), (ulen), &(dst), NR_CPUS) -static inline int __cpumask_parse (const char __user *buf,int len, +#define cpumask_parse_user (ubuf, ulen, dst) \ + __cpumask_parse_user((ubuf), (ulen), &(dst), NR_CPUS) +static inline int __cpumask_parse_user (const char __user *buf,int len,cpumask_t *dstp,int nbits) { -return bitmap_parse (buf, len, dstp->bits, nbits); +return bitmap_parse_user (buf, len, dstp->bits, nbits); }#define cpulist_scnprintf (buf, len, src) \
kernel/irq/proc.c +1 -1
@@ -57,7 +57,7 @@ static int irq_affinity_write_proc(strucif (!irq_desc[irq].chip->set_affinity || no_irq_affinity)return -EIO ; - err =cpumask_parse (buffer, count, new_value); + err =cpumask_parse_user (buffer, count, new_value);if (err)return err;
kernel/profile.c +1 -1
@@ -396,7 +396,7 @@ static int prof_cpu_mask_write_proc (strunsigned long full_count = count, err;cpumask_t new_value; - err =cpumask_parse (buffer, count, new_value); + err =cpumask_parse_user (buffer, count, new_value);if (err)return err;
include/linux/nodemask.h +7 -7
@@ -8,8 +8,8 @@* See detailed comments in the file linux/bitmap.h describing the * data type on which these nodemasks are based. * -* For details of nodemask_scnprintf() and nodemask_parse(), -* see bitmap_scnprintf() and bitmap_parse() in lib/bitmap.c. +* For details of nodemask_scnprintf() and nodemask_parse_user(), +* see bitmap_scnprintf() and bitmap_parse_user() in lib/bitmap.c. * For details of nodelist_scnprintf() and nodelist_parse(), see * bitmap_scnlistprintf() and bitmap_parselist(), also in bitmap.c. * For details of node_remap(), see bitmap_bitremap in lib/bitmap.c.
@@ -51,7 +51,7 @@* unsigned long *nodes_addr(mask) Array of unsigned long's in mask * * int nodemask_scnprintf(buf, len, mask) Format nodemask for printing -* int nodemask_parse(ubuf, ulen, mask) Parse ascii string as nodemask +* int nodemask_parse_user(ubuf, ulen, mask) Parse ascii string as nodemask * int nodelist_scnprintf(buf, len, mask) Format nodemask as list for printing * int nodelist_parse(buf, map) Parse ascii string as nodelist * int node_remap(oldbit, old, new) newbit = map(old, new)(oldbit)
@@ -288,12 +288,12 @@ static inline int __nodemask_scnprintf(creturn bitmap_scnprintf (buf, len, srcp->bits, nbits); } -#define nodemask_parse (ubuf, ulen, dst) \ - __nodemask_parse((ubuf), (ulen), &(dst), MAX_NUMNODES) -static inline int __nodemask_parse (const char __user *buf,int len, +#define nodemask_parse_user (ubuf, ulen, dst) \ + __nodemask_parse_user((ubuf), (ulen), &(dst), MAX_NUMNODES) +static inline int __nodemask_parse_user (const char __user *buf,int len,nodemask_t *dstp,int nbits) { -return bitmap_parse (buf, len, dstp->bits, nbits); +return bitmap_parse_user (buf, len, dstp->bits, nbits); }#define nodelist_scnprintf (buf, len, src) \
Re: [PATCH] bitmap: parse input from kernel and user buffers
Quoted 12 lines · Reinette Chatre
lib/bitmap.c:bitmap_parse() is a library function that received as input a user buffer. This seemed to have originated from the way the
write_procfunction of the /proc filesystem operates.This has been reworked to not use kmalloc and eliminates a lot of
get_user()overhead by performing oneaccess_okbefore using__get_user().
We need to test if we are in kernel or user space (is_user) and access the buffer differently. We cannot use__get_user()to access kernel addresses in all cases, for example in architectures with separate address space for kernel and user.
Quoted 8 lines
This function will be useful for other uses as well; for example, taking input for /sysfs instead of /proc, so it was changed to accept kernel buffers. We have this use for the Linux UWB project, as part as the upcoming bandwidth allocator code.
Only a few routines used this function and they were changed too.
Signed-off-by Reinette Chatre <[email protected]>
Quoted 12 lines · Andrew Morton
lib/bitmap.c int bitmap_parse(const char __user *ubuf · line 355
Quoted 6 lines · On Wed, 4 Oct 2006 17:56:30 -0700 Reinette Chatre…
lib/bitmap.c +6
-0+if (is_user) { +if (__get_user (c, buf++)) +return -EFAULT ; + } +else + c = *buf++;Is this actually needed?
__get_user(kernel_address)works OK and (believe it or not, given all the stuff it involves) boils down to a single instruction.
On some architectures, kernel and user space are separate, overlapping address spaces.
If __bitmap_parse was an inline (and not exported), this would be okay; as it is, you end up doing the test dynamically under all circumstances, even though in most (if not all) cases the address space is know a priori.
-hpa
Quoted 12 lines · Andrew Morton
lib/bitmap.c int bitmap_parse(const char __user *ubuf · line 355
Quoted 6 lines · On Wed, 4 Oct 2006 17:56:30 -0700 Reinette Chatre…
lib/bitmap.c +6
-0+if (is_user) { +if (__get_user (c, buf++)) +return -EFAULT ; + } +else + c = *buf++;Is this actually needed?
__get_user(kernel_address)works OK and (believe it or not, given all the stuff it involves) boils down to a single instruction.
It is needed on lots of architectures that use separate address spaces like sparc64, m68k, s390 (and on x86 with 4:4 patches)
-Andi
Quoted 15 lines · On 05 Oct 2006 21:57:04 +0200 Andi Kleen <[email protected]> wrote:
Quoted 12 lines · Andrew Morton
lib/bitmap.c int bitmap_parse(const char __user *ubuf · line 355
Quoted 6 lines · On Wed, 4 Oct 2006 17:56:30 -0700 Reinette Chatre…
lib/bitmap.c +6
-0+if (is_user) { +if (__get_user (c, buf++)) +return -EFAULT ; + } +else + c = *buf++;Is this actually needed?
__get_user(kernel_address)works OK and (believe it or not, given all the stuff it involves) boils down to a single instruction.
Quoted 3 lines
It is needed on lots of architectures that use separate address spaces like sparc64, m68k, s390 (and on x86 with 4:4 patches)
It needs set_fs(KERNEL_DS) if we're going to use __get_user() on both callpaths.
I think we'll stick with the `is_user' version - less tricky, clearer.