Messages in this thread Patch in this message | | | Date | Wed, 31 Mar 2004 02:48:37 +0100 | From | Andy Whitcroft <> | Subject | RE: [PATCH] [0/6] HUGETLB memory commitment |
| |
--On 30 March 2004 22:48 +0100 Andy Whitcroft <apw@shadowen.org> wrote:
>> I can do: >> fd = open("/mnt/htlb/myhtlbfile", O_CREAT|O_RDWR, 0755); >> mmap(..., fd, offset); >> >> Accounting didn't happen in this case, (grep Huge /proc/meminfo):
O.k. Try this one. Should fix that case. There is some uglyness in there which needs review, but my testing says this works.
Thanks for testing.
-apw--- file | 1 + fs/hugetlbfs/inode.c | 41 ++++++++++++++++++++++++++++++++++++++--- fs/proc/proc_misc.c | 1 + include/linux/hugetlb.h | 3 +++ 4 files changed, 43 insertions(+), 3 deletions(-)
diff -X /home/apw/lib/vdiff.excl -rupN reference/file current/file --- reference/file 1970-01-01 01:00:00.000000000 +0100 +++ current/file 2004-03-30 14:39:12.000000000 +0100 @@ -0,0 +1 @@ +this is more text diff -X /home/apw/lib/vdiff.excl -rupN reference/fs/hugetlbfs/inode.c current/fs/hugetlbfs/inode.c --- reference/fs/hugetlbfs/inode.c 2004-03-25 02:43:00.000000000 +0000 +++ current/fs/hugetlbfs/inode.c 2004-03-31 02:18:03.000000000 +0100 @@ -32,6 +32,27 @@ /* some random number */ #define HUGETLBFS_MAGIC 0x958458f6 +atomic_t hugetlb_committed_space = ATOMIC_INIT(0); + +int hugetlb_acct_memory(long delta) +{ + atomic_add(delta, &hugetlb_committed_space); + if (delta > 0 && atomic_read(&hugetlb_committed_space) > + hugetlb_total_pages()) { + atomic_add(-delta, &hugetlb_committed_space); + return -ENOMEM; + } + return 0; +} + +int hugetlbfs_report_meminfo(char *buf) +{ +#define K(x) ((x) << (PAGE_SHIFT - 10)) + long htlb = atomic_read(&hugetlb_committed_space); + return sprintf(buf, "HugeCommitted_AS: %5lu kB\n", K(htlb)); +#undef K +} + static struct super_operations hugetlbfs_ops; static struct address_space_operations hugetlbfs_aops; struct file_operations hugetlbfs_file_operations; @@ -62,13 +83,20 @@ static int hugetlbfs_file_mmap(struct fi vma_len = (loff_t)(vma->vm_end - vma->vm_start); down(&inode->i_sem); + len = vma_len + ((loff_t)vma->vm_pgoff << PAGE_SHIFT); + /* This represents an extend to the file. */ + if (inode->i_size < len) { + ret = hugetlb_acct_memory((len - inode->i_size) / PAGE_SIZE); + if (ret) + goto out_isem; + } file_accessed(file); vma->vm_flags |= VM_HUGETLB | VM_RESERVED; vma->vm_ops = &hugetlb_vm_ops; ret = hugetlb_prefault(mapping, vma); - len = vma_len + ((loff_t)vma->vm_pgoff << PAGE_SHIFT); if (ret == 0 && inode->i_size < len) inode->i_size = len; +out_isem: up(&inode->i_sem); return ret; @@ -200,6 +228,7 @@ static void hugetlbfs_delete_inode(struc if (inode->i_data.nrpages) truncate_hugepages(&inode->i_data, 0); + hugetlb_acct_memory(-(inode->i_size / PAGE_SIZE)); security_inode_delete(inode); @@ -241,6 +270,7 @@ out_truncate: spin_unlock(&inode_lock); if (inode->i_data.nrpages) truncate_hugepages(&inode->i_data, 0); + hugetlb_acct_memory(-(inode->i_size / PAGE_SIZE)); if (sbinfo->free_inodes >= 0) { spin_lock(&sbinfo->stat_lock); @@ -350,6 +380,10 @@ static int hugetlbfs_setattr(struct dent error = hugetlb_vmtruncate(inode, attr->ia_size); if (error) goto out; + /* We rely on the fact that the sizes are hugepage aligned, + * and that hugetlb_vmtruncate prevents extend. */ + hugetlb_acct_memory((attr->ia_size - i_size_read(inode)) / + PAGE_SIZE); attr->ia_valid &= ~ATTR_SIZE; } error = inode_setattr(inode, attr); @@ -710,8 +744,9 @@ struct file *hugetlb_zero_setup(size_t s if (!capable(CAP_IPC_LOCK)) return ERR_PTR(-EPERM); - if (!is_hugepage_mem_enough(size)) - return ERR_PTR(-ENOMEM); + error = hugetlb_acct_memory(size / PAGE_SIZE); + if (error) + return ERR_PTR(error); root = hugetlbfs_vfsmount->mnt_root; snprintf(buf, 16, "%lu", hugetlbfs_counter()); diff -X /home/apw/lib/vdiff.excl -rupN reference/fs/proc/proc_misc.c current/fs/proc/proc_misc.c --- reference/fs/proc/proc_misc.c 2004-03-29 12:10:18.000000000 +0100 +++ current/fs/proc/proc_misc.c 2004-03-30 14:39:12.000000000 +0100 @@ -232,6 +232,7 @@ static int meminfo_read_proc(char *page, ); len += hugetlb_report_meminfo(page + len); + len += hugetlbfs_report_meminfo(page + len); return proc_calc_metrics(page, start, off, count, eof, len); #undef K diff -X /home/apw/lib/vdiff.excl -rupN reference/include/linux/hugetlb.h current/include/linux/hugetlb.h --- reference/include/linux/hugetlb.h 2004-03-29 12:10:22.000000000 +0100 +++ current/include/linux/hugetlb.h 2004-03-30 14:39:12.000000000 +0100 @@ -115,11 +115,14 @@ static inline void set_file_hugepages(st { file->f_op = &hugetlbfs_file_operations; } +int hugetlbfs_report_meminfo(char *); + #else /* !CONFIG_HUGETLBFS */ #define is_file_hugepages(file) 0 #define set_file_hugepages(file) BUG() #define hugetlb_zero_setup(size) ERR_PTR(-ENOSYS) +#define hugetlbfs_report_meminfo(buf) 0 #endif /* !CONFIG_HUGETLBFS */ | |