diff options
author | KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | 2009-09-22 19:45:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:42 -0400 |
commit | 678ad5d8aaf8925cb8465f84e1e47d9b1284666a (patch) | |
tree | 638189ae49da8da3dff9ba2f422f16a734b9388c /fs/proc | |
parent | 90396f96b7da0e2305ffe0266d22b6f8221f28ba (diff) |
/proc/kcore: fix stat.st_size
Presently the size of /proc/kcore which can be read by 'ls -l' is 0. But
it's not the correct value.
On x86-64, ls -l shows
... root root 140737486266368 2009-09-17 10:29 /proc/kcore
Then, 7FFFFFFE02000. This comes from vmalloc area's size.
(*) This shows "core" size, not memory size.
This patch shows the size by updating "size" field in struct
proc_dir_entry. Later, lookup routine will create inode and fill
inode->i_size based on this value. Then, this has a problem.
- Once inode is cached, inode->i_size will never be updated.
Then, this patch is not memory-hotplug-aware.
To update inode->i_size, we have to know dentry or inode.
But there is no way to lookup them by inside kernel. Hmmm....
Next patch will try it.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/kcore.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index 70733780fdd9..3d0485c361c7 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c | |||
@@ -107,6 +107,8 @@ static void free_kclist_ents(struct list_head *head) | |||
107 | */ | 107 | */ |
108 | static void __kcore_update_ram(struct list_head *list) | 108 | static void __kcore_update_ram(struct list_head *list) |
109 | { | 109 | { |
110 | int nphdr; | ||
111 | size_t size; | ||
110 | struct kcore_list *tmp, *pos; | 112 | struct kcore_list *tmp, *pos; |
111 | LIST_HEAD(garbage); | 113 | LIST_HEAD(garbage); |
112 | 114 | ||
@@ -121,6 +123,7 @@ static void __kcore_update_ram(struct list_head *list) | |||
121 | } else | 123 | } else |
122 | list_splice(list, &garbage); | 124 | list_splice(list, &garbage); |
123 | kcore_need_update = 0; | 125 | kcore_need_update = 0; |
126 | proc_root_kcore->size = get_kcore_size(&nphdr, &size); | ||
124 | write_unlock(&kclist_lock); | 127 | write_unlock(&kclist_lock); |
125 | 128 | ||
126 | free_kclist_ents(&garbage); | 129 | free_kclist_ents(&garbage); |
@@ -429,7 +432,8 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) | |||
429 | unsigned long start; | 432 | unsigned long start; |
430 | 433 | ||
431 | read_lock(&kclist_lock); | 434 | read_lock(&kclist_lock); |
432 | proc_root_kcore->size = size = get_kcore_size(&nphdr, &elf_buflen); | 435 | size = get_kcore_size(&nphdr, &elf_buflen); |
436 | |||
433 | if (buflen == 0 || *fpos >= size) { | 437 | if (buflen == 0 || *fpos >= size) { |
434 | read_unlock(&kclist_lock); | 438 | read_unlock(&kclist_lock); |
435 | return 0; | 439 | return 0; |