From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261291AbVFDW4S (ORCPT ); Sat, 4 Jun 2005 18:56:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261425AbVFDW4S (ORCPT ); Sat, 4 Jun 2005 18:56:18 -0400 Received: from mta09-winn.ispmail.ntl.com ([81.103.221.49]:7803 "EHLO mta09-winn.ispmail.ntl.com") by vger.kernel.org with ESMTP id S261291AbVFDW4L (ORCPT ); Sat, 4 Jun 2005 18:56:11 -0400 Message-ID: <42A23188.8080100@ntlworld.com> Date: Sat, 04 Jun 2005 23:56:08 +0100 From: Matt User-Agent: Debian Thunderbird 1.0.2 (X11/20050602) X-Accept-Language: en-us, en MIME-Version: 1.0 CC: linux-kernel@vger.kernel.org Subject: Re: [PATCH] BUG #3054 madvise doesn't fail for exceding RSS limit. References: <42A23047.5000600@ntlworld.com> In-Reply-To: <42A23047.5000600@ntlworld.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org sorry that error return should be -EIO not -ENOMEM, sorry! new patch attached. --- linux-2.6.11.10/mm/madvise.c 2005-04-12 15:58:30.000000000 +0100 +++ linux/mm/madvise.c 2005-06-04 23:25:03.000000000 +0100 @@ -70,6 +70,17 @@ end = vma->vm_end; end = ((end - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; + /* + * This doesn't account for pages that may already be mapped + * due to readahead, but since this is merely a hint to the + * kernel no real harm should be done, it will just make things + * run a little slower. Sometimes less is more! More than enough + * code for this minor corner case. + */ + if (((max_sane_readahead(end-start) << PAGE_SHIFT)+current->mm->rss)> + current->signal->rlim[RLIMIT_RSS].rlim_cur) + return -EIO; + force_page_cache_readahead(file->f_mapping, file, start, max_sane_readahead(end - start)); return 0; Matt wrote: > Patch that fixes bug #3054. Compiles, tests ok. > > --- linux-2.6.11.10/mm/madvise.c 2005-05-12 15:58:30.000000000 +0100 > +++ linux/mm/madvise.c 2005-06-04 23:25:03.000000000 +0100 > @@ -70,6 +70,17 @@ > end = vma->vm_end; > end = ((end - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; > > + /* > + * This doesn't account for pages that may already be mapped > + * due to readahead, but since this is merely a hint to the > + * kernel no real harm should be done, it will just make things > + * run a little slower. Sometimes less is more! More than enough > + * code for this minor corner case. > + */ > + if (((max_sane_readahead(end-start) << > PAGE_SHIFT)+current->mm->rss)> > + current->signal->rlim[RLIMIT_RSS].rlim_cur) > + return -ENOMEM; > + > force_page_cache_readahead(file->f_mapping, > file, start, max_sane_readahead(end - start)); > return 0; > >