From: Jan Kara <jack@suse.cz>
To: linux-mm@kvack.org
Cc: linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org,
Andrew Morton <akpm@linux-foundation.org>,
Ross Zwisler <ross.zwisler@linux.intel.com>,
Jan Kara <jack@suse.cz>
Subject: [PATCH 15/21] mm: Move part of wp_page_reuse() into the single call site
Date: Tue, 1 Nov 2016 23:36:24 +0100 [thread overview]
Message-ID: <1478039794-20253-19-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1478039794-20253-1-git-send-email-jack@suse.cz>
wp_page_reuse() handles write shared faults which is needed only in
wp_page_shared(). Move the handling only into that location to make
wp_page_reuse() simpler and avoid a strange situation when we sometimes
pass in locked page, sometimes unlocked etc.
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---
mm/memory.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index e278a8a6ccc7..06aba4203104 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2103,8 +2103,7 @@ static void fault_dirty_shared_page(struct vm_area_struct *vma,
* case, all we need to do here is to mark the page as writable and update
* any related book-keeping.
*/
-static inline int wp_page_reuse(struct vm_fault *vmf,
- int page_mkwrite, int dirty_shared)
+static inline void wp_page_reuse(struct vm_fault *vmf)
__releases(vmf->ptl)
{
struct vm_area_struct *vma = vmf->vma;
@@ -2124,16 +2123,6 @@ static inline int wp_page_reuse(struct vm_fault *vmf,
if (ptep_set_access_flags(vma, vmf->address, vmf->pte, entry, 1))
update_mmu_cache(vma, vmf->address, vmf->pte);
pte_unmap_unlock(vmf->pte, vmf->ptl);
-
- if (dirty_shared) {
- if (!page_mkwrite)
- lock_page(page);
-
- fault_dirty_shared_page(vma, page);
- put_page(page);
- }
-
- return VM_FAULT_WRITE;
}
/*
@@ -2308,7 +2297,8 @@ static int wp_pfn_shared(struct vm_fault *vmf)
return 0;
}
}
- return wp_page_reuse(vmf, 0, 0);
+ wp_page_reuse(vmf);
+ return VM_FAULT_WRITE;
}
static int wp_page_shared(struct vm_fault *vmf)
@@ -2346,7 +2336,13 @@ static int wp_page_shared(struct vm_fault *vmf)
page_mkwrite = 1;
}
- return wp_page_reuse(vmf, page_mkwrite, 1);
+ wp_page_reuse(vmf);
+ if (!page_mkwrite)
+ lock_page(vmf->page);
+ fault_dirty_shared_page(vma, vmf->page);
+ put_page(vmf->page);
+
+ return VM_FAULT_WRITE;
}
/*
@@ -2421,7 +2417,8 @@ static int do_wp_page(struct vm_fault *vmf)
page_move_anon_rmap(vmf->page, vma);
}
unlock_page(vmf->page);
- return wp_page_reuse(vmf, 0, 0);
+ wp_page_reuse(vmf);
+ return VM_FAULT_WRITE;
}
unlock_page(vmf->page);
} else if (unlikely((vma->vm_flags & (VM_WRITE|VM_SHARED)) ==
--
2.6.6
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz>
To: <linux-mm@kvack.org>
Cc: <linux-fsdevel@vger.kernel.org>,
linux-nvdimm@lists.01.org,
Andrew Morton <akpm@linux-foundation.org>,
Ross Zwisler <ross.zwisler@linux.intel.com>,
Jan Kara <jack@suse.cz>
Subject: [PATCH 15/21] mm: Move part of wp_page_reuse() into the single call site
Date: Tue, 1 Nov 2016 23:36:24 +0100 [thread overview]
Message-ID: <1478039794-20253-19-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1478039794-20253-1-git-send-email-jack@suse.cz>
wp_page_reuse() handles write shared faults which is needed only in
wp_page_shared(). Move the handling only into that location to make
wp_page_reuse() simpler and avoid a strange situation when we sometimes
pass in locked page, sometimes unlocked etc.
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---
mm/memory.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index e278a8a6ccc7..06aba4203104 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2103,8 +2103,7 @@ static void fault_dirty_shared_page(struct vm_area_struct *vma,
* case, all we need to do here is to mark the page as writable and update
* any related book-keeping.
*/
-static inline int wp_page_reuse(struct vm_fault *vmf,
- int page_mkwrite, int dirty_shared)
+static inline void wp_page_reuse(struct vm_fault *vmf)
__releases(vmf->ptl)
{
struct vm_area_struct *vma = vmf->vma;
@@ -2124,16 +2123,6 @@ static inline int wp_page_reuse(struct vm_fault *vmf,
if (ptep_set_access_flags(vma, vmf->address, vmf->pte, entry, 1))
update_mmu_cache(vma, vmf->address, vmf->pte);
pte_unmap_unlock(vmf->pte, vmf->ptl);
-
- if (dirty_shared) {
- if (!page_mkwrite)
- lock_page(page);
-
- fault_dirty_shared_page(vma, page);
- put_page(page);
- }
-
- return VM_FAULT_WRITE;
}
/*
@@ -2308,7 +2297,8 @@ static int wp_pfn_shared(struct vm_fault *vmf)
return 0;
}
}
- return wp_page_reuse(vmf, 0, 0);
+ wp_page_reuse(vmf);
+ return VM_FAULT_WRITE;
}
static int wp_page_shared(struct vm_fault *vmf)
@@ -2346,7 +2336,13 @@ static int wp_page_shared(struct vm_fault *vmf)
page_mkwrite = 1;
}
- return wp_page_reuse(vmf, page_mkwrite, 1);
+ wp_page_reuse(vmf);
+ if (!page_mkwrite)
+ lock_page(vmf->page);
+ fault_dirty_shared_page(vma, vmf->page);
+ put_page(vmf->page);
+
+ return VM_FAULT_WRITE;
}
/*
@@ -2421,7 +2417,8 @@ static int do_wp_page(struct vm_fault *vmf)
page_move_anon_rmap(vmf->page, vma);
}
unlock_page(vmf->page);
- return wp_page_reuse(vmf, 0, 0);
+ wp_page_reuse(vmf);
+ return VM_FAULT_WRITE;
}
unlock_page(vmf->page);
} else if (unlikely((vma->vm_flags & (VM_WRITE|VM_SHARED)) ==
--
2.6.6
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz>
To: linux-mm@kvack.org
Cc: linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org,
Andrew Morton <akpm@linux-foundation.org>,
Ross Zwisler <ross.zwisler@linux.intel.com>,
Jan Kara <jack@suse.cz>
Subject: [PATCH 15/21] mm: Move part of wp_page_reuse() into the single call site
Date: Tue, 1 Nov 2016 23:36:24 +0100 [thread overview]
Message-ID: <1478039794-20253-19-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1478039794-20253-1-git-send-email-jack@suse.cz>
wp_page_reuse() handles write shared faults which is needed only in
wp_page_shared(). Move the handling only into that location to make
wp_page_reuse() simpler and avoid a strange situation when we sometimes
pass in locked page, sometimes unlocked etc.
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---
mm/memory.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index e278a8a6ccc7..06aba4203104 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2103,8 +2103,7 @@ static void fault_dirty_shared_page(struct vm_area_struct *vma,
* case, all we need to do here is to mark the page as writable and update
* any related book-keeping.
*/
-static inline int wp_page_reuse(struct vm_fault *vmf,
- int page_mkwrite, int dirty_shared)
+static inline void wp_page_reuse(struct vm_fault *vmf)
__releases(vmf->ptl)
{
struct vm_area_struct *vma = vmf->vma;
@@ -2124,16 +2123,6 @@ static inline int wp_page_reuse(struct vm_fault *vmf,
if (ptep_set_access_flags(vma, vmf->address, vmf->pte, entry, 1))
update_mmu_cache(vma, vmf->address, vmf->pte);
pte_unmap_unlock(vmf->pte, vmf->ptl);
-
- if (dirty_shared) {
- if (!page_mkwrite)
- lock_page(page);
-
- fault_dirty_shared_page(vma, page);
- put_page(page);
- }
-
- return VM_FAULT_WRITE;
}
/*
@@ -2308,7 +2297,8 @@ static int wp_pfn_shared(struct vm_fault *vmf)
return 0;
}
}
- return wp_page_reuse(vmf, 0, 0);
+ wp_page_reuse(vmf);
+ return VM_FAULT_WRITE;
}
static int wp_page_shared(struct vm_fault *vmf)
@@ -2346,7 +2336,13 @@ static int wp_page_shared(struct vm_fault *vmf)
page_mkwrite = 1;
}
- return wp_page_reuse(vmf, page_mkwrite, 1);
+ wp_page_reuse(vmf);
+ if (!page_mkwrite)
+ lock_page(vmf->page);
+ fault_dirty_shared_page(vma, vmf->page);
+ put_page(vmf->page);
+
+ return VM_FAULT_WRITE;
}
/*
@@ -2421,7 +2417,8 @@ static int do_wp_page(struct vm_fault *vmf)
page_move_anon_rmap(vmf->page, vma);
}
unlock_page(vmf->page);
- return wp_page_reuse(vmf, 0, 0);
+ wp_page_reuse(vmf);
+ return VM_FAULT_WRITE;
}
unlock_page(vmf->page);
} else if (unlikely((vma->vm_flags & (VM_WRITE|VM_SHARED)) ==
--
2.6.6
--
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-11-01 22:36 UTC|newest]
Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-01 22:36 [PATCH 0/21 v4] dax: Clear dirty bits after flushing caches Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 01/20] mm: Change type of vmf->virtual_address Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-02 9:55 ` Kirill A. Shutemov
2016-11-02 9:55 ` Kirill A. Shutemov
2016-11-01 22:36 ` [PATCH 01/21] mm: Join struct fault_env and vm_fault Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-02 9:58 ` Kirill A. Shutemov
2016-11-02 9:58 ` Kirill A. Shutemov
2016-11-04 4:32 ` Jan Kara
2016-11-04 4:32 ` Jan Kara
2016-11-01 22:36 ` [PATCH 02/20] " Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 02/21] mm: Use vmf->address instead of of vmf->virtual_address Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-02 4:18 ` Hillf Danton
2016-11-02 4:18 ` Hillf Danton
2016-11-02 4:18 ` Hillf Danton
2016-11-04 3:46 ` Jan Kara
2016-11-04 3:46 ` Jan Kara
2016-11-01 22:36 ` [PATCH 03/21] mm: Use pgoff in struct vm_fault instead of passing it separately Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 04/21] mm: Use passed vm_fault structure in __do_fault() Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 05/21] mm: Trim __do_fault() arguments Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 06/21] mm: Use passed vm_fault structure for in wp_pfn_shared() Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 06/20] mm: Use pass " Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 07/21] mm: Add orig_pte field into vm_fault Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 08/21] mm: Allow full handling of COW faults in ->fault handlers Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 09/21] mm: Factor out functionality to finish page faults Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 10/21] mm: Move handling of COW faults into DAX code Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 11/21] mm: Remove unnecessary vma->vm_ops check Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 12/21] mm: Factor out common parts of write fault handling Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 13/21] mm: Pass vm_fault structure into do_page_mkwrite() Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 14/21] mm: Use vmf->page during WP faults Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara [this message]
2016-11-01 22:36 ` [PATCH 15/21] mm: Move part of wp_page_reuse() into the single call site Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 16/21] mm: Provide helper for finishing mkwrite faults Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 17/21] mm: Change return values of finish_mkwrite_fault() Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 17/20] mm: Export follow_pte() Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 18/20] dax: Make cache flushing protected by entry lock Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 18/21] mm: Export follow_pte() Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 19/21] dax: Make cache flushing protected by entry lock Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 19/20] dax: Protect PTE modification on WP fault by radix tree " Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 20/20] dax: Clear dirty entry tags on cache flush Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 20/21] dax: Protect PTE modification on WP fault by radix tree entry lock Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 22:36 ` [PATCH 21/21] dax: Clear dirty entry tags on cache flush Jan Kara
2016-11-01 22:36 ` Jan Kara
2016-11-01 23:13 ` [PATCH 0/21 v4] dax: Clear dirty bits after flushing caches Jan Kara
2016-11-01 23:13 ` Jan Kara
2016-11-02 10:02 ` Kirill A. Shutemov
2016-11-02 10:02 ` Kirill A. Shutemov
2016-11-03 20:46 ` Jan Kara
2016-11-03 20:46 ` Jan Kara
2016-11-02 5:17 ` Ross Zwisler
2016-11-02 5:17 ` Ross Zwisler
2016-11-04 4:46 ` Jan Kara
2016-11-04 4:46 ` Jan Kara
2016-11-04 18:14 ` Jan Kara
2016-11-04 18:14 ` Jan Kara
2016-11-04 4:24 [PATCH 0/21 v4 RESEND] " Jan Kara
2016-11-04 4:25 ` [PATCH 15/21] mm: Move part of wp_page_reuse() into the single call site Jan Kara
2016-11-04 4:25 ` Jan Kara
2016-11-04 4:25 ` Jan Kara
2016-11-15 22:44 ` Kirill A. Shutemov
2016-11-15 22:44 ` Kirill A. Shutemov
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=1478039794-20253-19-git-send-email-jack@suse.cz \
--to=jack@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
--cc=ross.zwisler@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.