From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
willy@linux.intel.com
Subject: Re: [PATCH] mm: Use linear_page_index() in do_fault()
Date: Mon, 1 Feb 2016 15:06:38 +0200 [thread overview]
Message-ID: <20160201130638.GB29337@node.shutemov.name> (raw)
In-Reply-To: <1454242401-17005-1-git-send-email-matthew.r.wilcox@intel.com>
On Sun, Jan 31, 2016 at 11:13:21PM +1100, Matthew Wilcox wrote:
> do_fault assumes that PAGE_SIZE is the same as PAGE_CACHE_SIZE.
> Use linear_page_index() to calculate pgoff in the correct units.
>
> Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
'linear' part of helper name is not relevant any more since we've dropped
non-linear mappings. Probably, we should rename helpers.
> ---
> mm/memory.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/mm/memory.c b/mm/memory.c
> index 554816b..5224c06 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -3161,8 +3161,7 @@ static int do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
> unsigned long address, pte_t *page_table, pmd_t *pmd,
> unsigned int flags, pte_t orig_pte)
> {
> - pgoff_t pgoff = (((address & PAGE_MASK)
> - - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
> + pgoff_t pgoff = linear_page_index(vma, address);
>
> pte_unmap(page_table);
> /* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */
> --
> 2.7.0.rc3
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@kvack.org. For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
--
Kirill A. Shutemov
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
willy@linux.intel.com
Subject: Re: [PATCH] mm: Use linear_page_index() in do_fault()
Date: Mon, 1 Feb 2016 15:06:38 +0200 [thread overview]
Message-ID: <20160201130638.GB29337@node.shutemov.name> (raw)
In-Reply-To: <1454242401-17005-1-git-send-email-matthew.r.wilcox@intel.com>
On Sun, Jan 31, 2016 at 11:13:21PM +1100, Matthew Wilcox wrote:
> do_fault assumes that PAGE_SIZE is the same as PAGE_CACHE_SIZE.
> Use linear_page_index() to calculate pgoff in the correct units.
>
> Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
'linear' part of helper name is not relevant any more since we've dropped
non-linear mappings. Probably, we should rename helpers.
> ---
> mm/memory.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/mm/memory.c b/mm/memory.c
> index 554816b..5224c06 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -3161,8 +3161,7 @@ static int do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
> unsigned long address, pte_t *page_table, pmd_t *pmd,
> unsigned int flags, pte_t orig_pte)
> {
> - pgoff_t pgoff = (((address & PAGE_MASK)
> - - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
> + pgoff_t pgoff = linear_page_index(vma, address);
>
> pte_unmap(page_table);
> /* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */
> --
> 2.7.0.rc3
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@kvack.org. For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
--
Kirill A. Shutemov
next prev parent reply other threads:[~2016-02-01 13:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-31 12:13 [PATCH] mm: Use linear_page_index() in do_fault() Matthew Wilcox
2016-01-31 12:13 ` Matthew Wilcox
2016-02-01 13:06 ` Kirill A. Shutemov [this message]
2016-02-01 13:06 ` Kirill A. Shutemov
2016-02-01 20:44 ` Matthew Wilcox
2016-02-01 20:44 ` Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160201130638.GB29337@node.shutemov.name \
--to=kirill@shutemov.name \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=matthew.r.wilcox@intel.com \
--cc=willy@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.