On Sun, Jun 05, 2011 at 12:16:08PM -0700, Hugh Dickins wrote:
> Good find, news to me. Interesting uses of -PTR_ERR()!
*snerk*
I've run into a bug where ->open() returned -PTR_ERR(...) on one of the failure
exits and went grepping. Caught so far:
* l2tp_debugfs - originally found bug
* xfs mknod() returning the error with wrong sign if xfs_get_acl()
fails
* jfs lmLogOpen() - positive error value returned (and propagated
all way be to userland if we'd been doing remount) if block device can't be
opened
* sunrpc - two bugs of the same kind
* this one, where the *sign* is right, but mixing E.. with VM_FAULT_..
is not.
Bugs are like mushrooms - found one, look around for more...
> Looks like we'd better not have more than 12 VM_FAULT_ flags.
> > Am I right assuming that we want VM_FAULT_OOM in both cases?
>
> No, where hugetlb_get_quota() fails it should be VM_FAULT_SIGBUS:
> there's no excuse to go on an OOM-killing spree just because hugetlb
> quota is exhausted.
Good point...
> VM_FAULT_OOM is appropriate where vma_needs_reservation() fails,
> because region_chg() couldn't kmalloc a structure, as you point out.
>
> (Though that doesn't matter much, since the only way the kmalloc can
> fail is when this task is already selected for OOM-kill - I think.)
You mean, something like the diff below?
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index f33bb31..3de23f0 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -125,7 +125,7 @@ static long region_chg(struct list_head *head, long f, long t)
if (&rg->link == head || t < rg->from) {
nrg = kmalloc(sizeof(*nrg), GFP_KERNEL);
if (!nrg)
- return -ENOMEM;
+ return -VM_FAULT_OOM;
nrg->from = f;
nrg->to = f;
INIT_LIST_HEAD(&nrg->link);
@@ -1036,7 +1036,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
return ERR_PTR(chg);
if (chg)
if (hugetlb_get_quota(inode->i_mapping, chg))
- return ERR_PTR(-ENOSPC);
+ return ERR_PTR(-VM_FAULT_SIGBUS);
spin_lock(&hugetlb_lock);
page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve);
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxxx For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>