From: Ross Zwisler <ross.zwisler@linux.intel.com>
To: Jan Kara <jack@suse.cz>
Cc: linux-nvdimm@lists.01.org, linux-mm@kvack.org,
linux-fsdevel@vger.kernel.org,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: Re: [PATCH 03/20] mm: Use pgoff in struct vm_fault instead of passing it separately
Date: Fri, 14 Oct 2016 12:42:51 -0600 [thread overview]
Message-ID: <20161014184251.GB27575@linux.intel.com> (raw)
In-Reply-To: <1474992504-20133-4-git-send-email-jack@suse.cz>
On Tue, Sep 27, 2016 at 06:08:07PM +0200, Jan Kara wrote:
> struct vm_fault has already pgoff entry. Use it instead of passing pgoff
> as a separate argument and then assigning it later.
>
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---
> mm/memory.c | 35 ++++++++++++++++++-----------------
> 1 file changed, 18 insertions(+), 17 deletions(-)
>
> diff --git a/mm/memory.c b/mm/memory.c
> index 447a1ef4a9e3..4c2ec9a9d8af 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -2275,7 +2275,7 @@ static int wp_pfn_shared(struct vm_fault *vmf, pte_t orig_pte)
> if (vma->vm_ops && vma->vm_ops->pfn_mkwrite) {
> struct vm_fault vmf2 = {
> .page = NULL,
> - .pgoff = linear_page_index(vma, vmf->address),
> + .pgoff = vmf->pgoff,
I think there is one path where vmf->pgoff isn't set here. Here's the path:
__collapse_huge_page_swapin()
do_swap_page()
do_wp_page()
wp_pfn_shared()
We then use an uninitialized vmf->pgoff to set up vmf2->pgoff, which we pass
to vm_ops->pfn_mkwrite().
I think all we need to do to fix this is initialize .pgoff in
__collapse_huge_page_swapin(). With this one change:
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Ross Zwisler <ross.zwisler@linux.intel.com>
To: Jan Kara <jack@suse.cz>
Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org,
linux-nvdimm@lists.01.org,
Dan Williams <dan.j.williams@intel.com>,
Ross Zwisler <ross.zwisler@linux.intel.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: Re: [PATCH 03/20] mm: Use pgoff in struct vm_fault instead of passing it separately
Date: Fri, 14 Oct 2016 12:42:51 -0600 [thread overview]
Message-ID: <20161014184251.GB27575@linux.intel.com> (raw)
In-Reply-To: <1474992504-20133-4-git-send-email-jack@suse.cz>
On Tue, Sep 27, 2016 at 06:08:07PM +0200, Jan Kara wrote:
> struct vm_fault has already pgoff entry. Use it instead of passing pgoff
> as a separate argument and then assigning it later.
>
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---
> mm/memory.c | 35 ++++++++++++++++++-----------------
> 1 file changed, 18 insertions(+), 17 deletions(-)
>
> diff --git a/mm/memory.c b/mm/memory.c
> index 447a1ef4a9e3..4c2ec9a9d8af 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -2275,7 +2275,7 @@ static int wp_pfn_shared(struct vm_fault *vmf, pte_t orig_pte)
> if (vma->vm_ops && vma->vm_ops->pfn_mkwrite) {
> struct vm_fault vmf2 = {
> .page = NULL,
> - .pgoff = linear_page_index(vma, vmf->address),
> + .pgoff = vmf->pgoff,
I think there is one path where vmf->pgoff isn't set here. Here's the path:
__collapse_huge_page_swapin()
do_swap_page()
do_wp_page()
wp_pfn_shared()
We then use an uninitialized vmf->pgoff to set up vmf2->pgoff, which we pass
to vm_ops->pfn_mkwrite().
I think all we need to do to fix this is initialize .pgoff in
__collapse_huge_page_swapin(). With this one change:
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
--
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>
next prev parent reply other threads:[~2016-10-14 18:42 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 16:08 [PATCH 0/20 v3] dax: Clear dirty bits after flushing caches Jan Kara
2016-09-27 16:08 ` [PATCH 01/20] mm: Change type of vmf->virtual_address Jan Kara
[not found] ` <1474992504-20133-2-git-send-email-jack-AlSwsSmVLrQ@public.gmane.org>
2016-09-30 9:07 ` Christoph Hellwig
2016-09-30 9:07 ` Christoph Hellwig
2016-10-14 18:02 ` Ross Zwisler
2016-10-14 18:02 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 02/20] mm: Join struct fault_env and vm_fault Jan Kara
[not found] ` <1474992504-20133-3-git-send-email-jack-AlSwsSmVLrQ@public.gmane.org>
2016-09-30 9:10 ` Christoph Hellwig
2016-09-30 9:10 ` Christoph Hellwig
2016-10-03 7:43 ` Jan Kara
2016-10-03 7:43 ` Jan Kara
2016-09-27 16:08 ` [PATCH 03/20] mm: Use pgoff in struct vm_fault instead of passing it separately Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-10-14 18:42 ` Ross Zwisler [this message]
2016-10-14 18:42 ` Ross Zwisler
2016-10-17 9:01 ` Jan Kara
2016-09-27 16:08 ` [PATCH 04/20] mm: Use passed vm_fault structure in __do_fault() Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-10-14 19:05 ` Ross Zwisler
2016-10-14 19:05 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 05/20] mm: Trim __do_fault() arguments Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-10-14 20:31 ` Ross Zwisler
2016-10-17 9:04 ` Jan Kara
2016-10-17 9:04 ` Jan Kara
2016-09-27 16:08 ` [PATCH 06/20] mm: Use pass vm_fault structure for in wp_pfn_shared() Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-10-14 21:04 ` Ross Zwisler
2016-10-14 21:04 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 07/20] mm: Add orig_pte field into vm_fault Jan Kara
2016-10-17 16:45 ` Ross Zwisler
2016-10-17 16:45 ` Ross Zwisler
2016-10-18 10:13 ` Jan Kara
2016-10-18 10:13 ` Jan Kara
2016-09-27 16:08 ` [PATCH 08/20] mm: Allow full handling of COW faults in ->fault handlers Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-10-17 16:50 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 09/20] mm: Factor out functionality to finish page faults Jan Kara
2016-10-17 17:38 ` Ross Zwisler
2016-10-17 17:38 ` Ross Zwisler
2016-10-17 17:40 ` Ross Zwisler
2016-10-17 17:40 ` Ross Zwisler
2016-10-18 9:44 ` Jan Kara
2016-09-27 16:08 ` [PATCH 10/20] mm: Move handling of COW faults into DAX code Jan Kara
2016-10-17 19:29 ` Ross Zwisler
2016-10-17 19:29 ` Ross Zwisler
2016-10-18 10:32 ` Jan Kara
2016-10-18 10:32 ` Jan Kara
2016-09-27 16:08 ` [PATCH 11/20] mm: Remove unnecessary vma->vm_ops check Jan Kara
2016-10-17 19:40 ` Ross Zwisler
2016-10-17 19:40 ` Ross Zwisler
2016-10-18 10:37 ` Jan Kara
2016-10-18 10:37 ` Jan Kara
2016-09-27 16:08 ` [PATCH 12/20] mm: Factor out common parts of write fault handling Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-10-17 22:08 ` Ross Zwisler
2016-10-17 22:08 ` Ross Zwisler
2016-10-18 10:50 ` Jan Kara
2016-10-18 17:32 ` Ross Zwisler
2016-10-18 17:32 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 13/20] mm: Pass vm_fault structure into do_page_mkwrite() Jan Kara
2016-10-17 22:29 ` Ross Zwisler
2016-10-17 22:29 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 14/20] mm: Use vmf->page during WP faults Jan Kara
2016-10-18 17:56 ` Ross Zwisler
2016-10-18 17:56 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 15/20] mm: Move part of wp_page_reuse() into the single call site Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-10-18 17:59 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 16/20] mm: Provide helper for finishing mkwrite faults Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-10-18 18:35 ` Ross Zwisler
2016-10-18 18:35 ` Ross Zwisler
2016-10-19 7:16 ` Jan Kara
2016-10-19 7:16 ` Jan Kara
2016-10-19 17:21 ` Ross Zwisler
2016-10-19 17:21 ` Ross Zwisler
2016-10-20 8:48 ` Jan Kara
2016-10-20 8:48 ` Jan Kara
2016-09-27 16:08 ` [PATCH 17/20] mm: Export follow_pte() Jan Kara
2016-10-18 18:37 ` Ross Zwisler
2016-10-18 18:37 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 18/20] dax: Make cache flushing protected by entry lock Jan Kara
2016-10-18 19:20 ` Ross Zwisler
2016-10-19 7:19 ` Jan Kara
2016-10-19 7:19 ` Jan Kara
2016-10-19 18:25 ` Ross Zwisler
2016-10-19 18:25 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 19/20] dax: Protect PTE modification on WP fault by radix tree " Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-10-18 19:53 ` Ross Zwisler
2016-10-18 19:53 ` Ross Zwisler
2016-10-19 7:25 ` Jan Kara
2016-10-19 7:25 ` Jan Kara
2016-10-19 17:25 ` Ross Zwisler
2016-10-19 17:25 ` Ross Zwisler
2016-09-27 16:08 ` [PATCH 20/20] dax: Clear dirty entry tags on cache flush Jan Kara
2016-09-27 16:08 ` Jan Kara
2016-10-18 22:12 ` Ross Zwisler
2016-10-18 22:12 ` Ross Zwisler
2016-10-19 7:30 ` Jan Kara
2016-10-19 7:30 ` Jan Kara
2016-10-19 16:38 ` Ross Zwisler
2016-10-19 16:38 ` Ross Zwisler
2016-09-30 9:14 ` [PATCH 0/20 v3] dax: Clear dirty bits after flushing caches Christoph Hellwig
2016-10-03 7:59 ` Jan Kara
2016-10-03 8:03 ` Christoph Hellwig
2016-10-03 8:15 ` Jan Kara
2016-10-03 8:15 ` Jan Kara
2016-10-03 9:32 ` Christoph Hellwig
2016-10-03 9:32 ` Christoph Hellwig
2016-10-03 11:13 ` Jan Kara
[not found] ` <20161003111358.GQ6457-4I4JzKEfoa/jFM9bn6wA6Q@public.gmane.org>
2016-10-13 20:34 ` Ross Zwisler
2016-10-13 20:34 ` Ross Zwisler
2016-10-17 8:47 ` Jan Kara
2016-10-17 8:47 ` Jan Kara
[not found] ` <20161017084732.GD3359-4I4JzKEfoa/jFM9bn6wA6Q@public.gmane.org>
2016-10-17 18:59 ` Ross Zwisler
2016-10-17 18:59 ` Ross Zwisler
2016-10-18 9:49 ` Jan Kara
2016-10-18 9:49 ` Jan Kara
2016-11-18 9:17 [PATCH 0/20 v5] " Jan Kara
2016-11-18 9:17 ` [PATCH 03/20] mm: Use pgoff in struct vm_fault instead of passing it separately Jan Kara
2016-11-18 9:17 ` Jan Kara
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=20161014184251.GB27575@linux.intel.com \
--to=ross.zwisler@linux.intel.com \
--cc=jack@suse.cz \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
/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.