more /dev/[k]mem cleanups
PATCH 3/3 devmem: remove redundant parameter from do_write_kmem()
In reply to Wu Fengguang--- drivers/char/mem.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/char/mem.c +6 -8
@@ -465,7 +465,7 @@ static ssize_t read_kmem(struct file *fistatic inline ssize_t -do_write_kmem (void *p,unsigned long realp,const char __user * buf, +do_write_kmem (unsigned long p,const char __user * buf,size_t count,loff_t *ppos) {ssize_t written, sz;
@@ -474,12 +474,11 @@ do_write_kmem(void *p, unsigned long rea written =0 ;#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED/* we don't have page 0 mapped on sparc and m68k.. */ -if (realp <PAGE_SIZE ) { - sz =size_inside_page (realp, count); +if (p <PAGE_SIZE ) { + sz =size_inside_page (p, count);/* Hmm. Do something? */ buf += sz; p += sz; - realp += sz; count -= sz; written += sz; }
@@ -488,14 +487,14 @@ do_write_kmem(void *p, unsigned long reawhile (count >0 ) {char *ptr; - sz =size_inside_page (realp, count); + sz =size_inside_page (p, count);/* * On ia64 if a page has been mapped somewhere as * uncached, then it must also be accessed uncached * by the kernel or data corruption may occur */ - ptr =xlate_dev_kmem_ptr (p); + ptr =xlate_dev_kmem_ptr ((char *)p); copied =copy_from_user (ptr, buf, sz);if (copied) {
@@ -506,7 +505,6 @@ do_write_kmem(void *p, unsigned long rea } buf += sz; p += sz; - realp += sz; count -= sz; written += sz; }
@@ -530,7 +528,7 @@ static ssize_t write_kmem(struct file *if (p < (unsigned long ) high_memory) { unsigned long to_write = min_t(unsigned long, count, (unsigned long )high_memory - p); - wrote =do_write_kmem ((void *)p, p, buf, to_write, ppos); + wrote =do_write_kmem (p, buf, to_write, ppos);if (wrote != to_write)return wrote; p += wrote;
cover more /dev/[k]mem cleanups
Andrew,
Here are three more devmem cleanup patches following your comments.
Thanks,
Fengguang
PATCH 2/3 devmem: remove the "written" variable in write_kmem()
Also rename "len" to "sz". No behavior change.
--- drivers/char/mem.c | 48 ++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 27 deletions(-)
drivers/char/mem.c +21 -27
@@ -444,19 +444,18 @@ static ssize_t read_kmem(struct file *fiif (!kbuf)return -ENOMEM ;while (count >0 ) { -int len =size_inside_page (p, count); - - len =vread (kbuf, (char *)p, len); -if (!len) + sz =size_inside_page (p, count); + sz =vread (kbuf, (char *)p, sz); +if (!sz)break ; -if (copy_to_user (buf, kbuf, len)) { +if (copy_to_user (buf, kbuf, sz)) {free_page ((unsigned long )kbuf);return -EFAULT ; } - count -= len; - buf += len; - read += len; - p += len; + count -= sz; + buf += sz; + read += sz; + p += sz; }free_page ((unsigned long )kbuf); }
@@ -526,19 +525,14 @@ static ssize_t write_kmem(struct file *unsigned long p = *ppos;ssize_t wrote =0 ;ssize_t virtr =0 ; -ssize_t written;char * kbuf;/* k-addr because vwrite() takes vmlist_lock rwlock */ if (p < (unsigned long ) high_memory) { - - wrote = count; -if (count > (unsigned long ) high_memory - p) - wrote = (unsigned long ) high_memory - p; - - written =do_write_kmem ((void *)p, p, buf, wrote, ppos); -if (written != wrote) -return written; - wrote = written; + unsigned long to_write = min_t(unsigned long, count, + (unsigned long )high_memory - p); + wrote =do_write_kmem ((void *)p, p, buf, to_write, ppos); +if (wrote != to_write) +return wrote; p += wrote; buf += wrote; count -= wrote;
@@ -549,20 +543,20 @@ static ssize_t write_kmem(struct file *if (!kbuf)return wrote ? wrote : -ENOMEM ;while (count >0 ) { -int len =size_inside_page (p, count); +unsigned long sz =size_inside_page (p, count); - written =copy_from_user (kbuf, buf, len); -if (written) { + sz =copy_from_user (kbuf, buf, sz); +if (sz) {if (wrote + virtr)break ;free_page ((unsigned long )kbuf);return -EFAULT ; } - len =vwrite (kbuf, (char *)p, len); - count -= len; - buf += len; - virtr += len; - p += len; + sz =vwrite (kbuf, (char *)p, sz); + count -= sz; + buf += sz; + virtr += sz; + p += sz; }free_page ((unsigned long )kbuf); }
PATCH 1/3 devmem: make size_inside_page() logic straight
In reply to Wu FengguangAlso convert more size_inside_page() users.
--- drivers/char/mem.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-)
drivers/char/mem.c +12 -22
@@ -40,12 +40,9 @@ static inline unsigned long size_inside_ {unsigned long sz; -if (-start & (PAGE_SIZE -1 )) - sz = -start & (PAGE_SIZE -1 ); -else - sz =PAGE_SIZE ; + sz =PAGE_SIZE - (start & (PAGE_SIZE -1 )); - return min_t(unsigned long, sz, size); +return min (sz, size); }/*
@@ -137,9 +134,7 @@ static ssize_t read_mem(struct file * fi#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED/* we don't have page 0 mapped on sparc and m68k.. */ if (p <PAGE_SIZE ) { - sz =PAGE_SIZE - p; -if (sz > count) - sz = count; + sz =size_inside_page (p, count);if (sz >0 ) {if (clear_user (buf, sz))return -EFAULT ;
@@ -202,9 +197,7 @@ static ssize_t write_mem(struct file * f#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED/* we don't have page 0 mapped on sparc and m68k.. */ if (p <PAGE_SIZE ) { -unsigned long sz =PAGE_SIZE - p; -if (sz > count) - sz = count; + sz =size_inside_page (p, count);/* Hmm. Do something? */ buf += sz; p += sz;
@@ -416,15 +409,14 @@ static ssize_t read_kmem(struct file *fi#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED/* we don't have page 0 mapped on sparc and m68k.. */ if (p <PAGE_SIZE && low_count >0 ) { -size_t tmp =PAGE_SIZE - p; -if (tmp > low_count) tmp = low_count; -if (clear_user (buf, tmp)) + sz =size_inside_page (p, low_count); +if (clear_user (buf, sz))return -EFAULT ; - buf += tmp; - p += tmp; - read += tmp; - low_count -= tmp; - count -= tmp; + buf += sz; + p += sz; + read += sz; + low_count -= sz; + count -= sz; }#endif while (low_count >0 ) {
@@ -484,9 +476,7 @@ do_write_kmem(void *p, unsigned long rea#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED/* we don't have page 0 mapped on sparc and m68k.. */ if (realp <PAGE_SIZE ) { -unsigned long sz =PAGE_SIZE - realp; -if (sz > count) - sz = count; + sz =size_inside_page (realp, count);/* Hmm. Do something? */ buf += sz; p += sz;
Re: [PATCH 3/3] devmem: remove redundant parameter from do_write_kmem()
In reply to Wu Fengguangdrivers/char/mem.c static ssize_t read_kmem(struct file *fi · line 470
Quoted 5 lines · Wu Fengguang
static inline
ssize_tdrivers/char/mem.c +1
-1-do_write_kmem(void *p, unsigned long realp, const char __user * buf, +do_write_kmem(unsigned long p, const char __user * buf, size_t count, loff_t *ppos) {
There's one style issue in the block above. Could you run your patches through checkpatch and fix whatever errors it reports?
Daniel
Re: [PATCH 3/3] devmem: remove redundant parameter from do_write_kmem()
Quoted 9 lines · Daniel Walker
Review
Quoted 5 lines · Wu Fengguang
static inline
ssize_t(quoted diff) +1
-1-do_write_kmem(void *p, unsigned long realp, const char __user * buf, +do_write_kmem(unsigned long p, const char __user * buf, size_t count, loff_t *ppos) {There's one style issue in the block above. Could you run your patches through checkpatch and fix whatever errors it reports?
Thanks for catching it! Here is the updated patch.
(I ran checkpatch against the first two bugs but forgot this last one..)
--
devmem: remove redundant parameter from do_write_kmem()
--- drivers/char/mem.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/char/mem.c +6 -8
@@ -465,7 +465,7 @@ static ssize_t read_kmem(struct file *fistatic inline ssize_t -do_write_kmem (void *p,unsigned long realp,const char __user * buf, +do_write_kmem (unsigned long p,const char __user *buf,size_t count,loff_t *ppos) {ssize_t written, sz;
@@ -474,12 +474,11 @@ do_write_kmem(void *p, unsigned long rea written =0 ;#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED/* we don't have page 0 mapped on sparc and m68k.. */ -if (realp <PAGE_SIZE ) { - sz =size_inside_page (realp, count); +if (p <PAGE_SIZE ) { + sz =size_inside_page (p, count);/* Hmm. Do something? */ buf += sz; p += sz; - realp += sz; count -= sz; written += sz; }
@@ -488,14 +487,14 @@ do_write_kmem(void *p, unsigned long reawhile (count >0 ) {char *ptr; - sz =size_inside_page (realp, count); + sz =size_inside_page (p, count);/* * On ia64 if a page has been mapped somewhere as * uncached, then it must also be accessed uncached * by the kernel or data corruption may occur */ - ptr =xlate_dev_kmem_ptr (p); + ptr =xlate_dev_kmem_ptr ((char *)p); copied =copy_from_user (ptr, buf, sz);if (copied) {
@@ -506,7 +505,6 @@ do_write_kmem(void *p, unsigned long rea } buf += sz; p += sz; - realp += sz; count -= sz; written += sz; }
@@ -530,7 +528,7 @@ static ssize_t write_kmem(struct file *if (p < (unsigned long ) high_memory) { unsigned long to_write = min_t(unsigned long, count, (unsigned long )high_memory - p); - wrote =do_write_kmem ((void *)p, p, buf, to_write, ppos); + wrote =do_write_kmem (p, buf, to_write, ppos);if (wrote != to_write)return wrote; p += wrote;