From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
To: linux-mm@kvack.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Dave Hansen <dave.hansen@intel.com>,
Hugh Dickins <hughd@google.com>,
"Kirill A. Shutemov" <kirill@shutemov.name>,
Jerome Marchand <jmarchan@redhat.com>,
linux-kernel@vger.kernel.org,
Naoya Horiguchi <nao.horiguchi@gmail.com>
Subject: [PATCH v4 04/13] smaps: remove mem_size_stats->vma and use walk_page_vma()
Date: Tue, 1 Jul 2014 13:07:22 -0400 [thread overview]
Message-ID: <1404234451-21695-5-git-send-email-n-horiguchi@ah.jp.nec.com> (raw)
In-Reply-To: <1404234451-21695-1-git-send-email-n-horiguchi@ah.jp.nec.com>
pagewalk.c can handle vma in itself, so we don't have to pass vma via
walk->private. And show_smap() walks pages on vma basis, so using
walk_page_vma() is preferable.
ChangeLog v4:
- remove redundant vma
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
fs/proc/task_mmu.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git v3.16-rc3.orig/fs/proc/task_mmu.c v3.16-rc3/fs/proc/task_mmu.c
index cfa63ee92c96..3067bf08393b 100644
--- v3.16-rc3.orig/fs/proc/task_mmu.c
+++ v3.16-rc3/fs/proc/task_mmu.c
@@ -430,7 +430,6 @@ const struct file_operations proc_tid_maps_operations = {
#ifdef CONFIG_PROC_PAGE_MONITOR
struct mem_size_stats {
- struct vm_area_struct *vma;
unsigned long resident;
unsigned long shared_clean;
unsigned long shared_dirty;
@@ -449,7 +448,7 @@ static void smaps_pte_entry(pte_t ptent, unsigned long addr,
unsigned long ptent_size, struct mm_walk *walk)
{
struct mem_size_stats *mss = walk->private;
- struct vm_area_struct *vma = mss->vma;
+ struct vm_area_struct *vma = walk->vma;
pgoff_t pgoff = linear_page_index(vma, addr);
struct page *page = NULL;
int mapcount;
@@ -501,7 +500,7 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
struct mm_walk *walk)
{
struct mem_size_stats *mss = walk->private;
- struct vm_area_struct *vma = mss->vma;
+ struct vm_area_struct *vma = walk->vma;
pte_t *pte;
spinlock_t *ptl;
@@ -594,10 +593,8 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
};
memset(&mss, 0, sizeof mss);
- mss.vma = vma;
/* mmap_sem is held in m_start */
- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
+ walk_page_vma(vma, &smaps_walk);
show_map_vma(m, vma, is_pid);
--
1.9.3
--
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:[~2014-07-01 17:07 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-01 17:07 [PATCH v4 00/13] pagewalk: improve vma handling, apply to new users Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 01/13] mm/pagewalk: remove pgd_entry() and pud_entry() Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 02/13] pagewalk: improve vma handling Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 03/13] pagewalk: add walk_page_vma() Naoya Horiguchi
2014-07-01 17:07 ` Naoya Horiguchi [this message]
2014-07-01 17:07 ` [PATCH v4 05/13] clear_refs: remove clear_refs_private->vma and introduce clear_refs_test_walk() Naoya Horiguchi
2014-07-10 11:32 ` Kirill A. Shutemov
2014-07-10 13:27 ` Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 06/13] pagemap: use walk->vma instead of calling find_vma() Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 07/13] numa_maps: fix typo in gather_hugetbl_stats Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 08/13] numa_maps: remove numa_maps->vma Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 09/13] memcg: cleanup preparation for page table walk Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 10/13] arch/powerpc/mm/subpage-prot.c: use walk->vma and walk_page_vma() Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 11/13] mempolicy: apply page table walker on queue_pages_range() Naoya Horiguchi
2014-07-01 21:00 ` Dave Hansen
2014-07-01 21:51 ` Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 12/13] mm: /proc/pid/clear_refs: avoid split_huge_page() Naoya Horiguchi
2014-07-01 17:07 ` [PATCH v4 13/13] mincore: apply page table walker on do_mincore() Naoya Horiguchi
2014-07-09 13:34 ` Kirill A. Shutemov
2014-07-09 21:36 ` Naoya Horiguchi
2014-07-10 10:06 ` Kirill A. Shutemov
2014-07-10 16:35 ` Naoya Horiguchi
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=1404234451-21695-5-git-send-email-n-horiguchi@ah.jp.nec.com \
--to=n-horiguchi@ah.jp.nec.com \
--cc=akpm@linux-foundation.org \
--cc=dave.hansen@intel.com \
--cc=hughd@google.com \
--cc=jmarchan@redhat.com \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nao.horiguchi@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox