From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Vlastimil Babka <vbabka@suse.cz>,
Andrea Arcangeli <aarcange@redhat.com>,
Michal Hocko <mhocko@kernel.org>,
linux-arch@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
Nitin Gupta <nitin.m.gupta@oracle.com>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCHv4 08/12] sparc64: Update pmdp_invalidate() to return old pmd value
Date: Wed, 13 Dec 2017 13:57:52 +0300 [thread overview]
Message-ID: <20171213105756.69879-9-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <20171213105756.69879-1-kirill.shutemov@linux.intel.com>
From: Nitin Gupta <nitin.m.gupta@oracle.com>
It's required to avoid losing dirty and accessed bits.
Signed-off-by: Nitin Gupta <nitin.m.gupta@oracle.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
arch/sparc/include/asm/pgtable_64.h | 2 +-
arch/sparc/mm/tlb.c | 23 ++++++++++++++++++-----
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
index 9937c5ff94a9..339920fdf9ed 100644
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@ -1010,7 +1010,7 @@ void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr,
pmd_t *pmd);
#define __HAVE_ARCH_PMDP_INVALIDATE
-extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
+extern pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
pmd_t *pmdp);
#define __HAVE_ARCH_PGTABLE_DEPOSIT
diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c
index 4ae86bc0d35c..5a3ba863b48a 100644
--- a/arch/sparc/mm/tlb.c
+++ b/arch/sparc/mm/tlb.c
@@ -219,17 +219,28 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr,
}
}
+static inline pmd_t pmdp_establish(struct vm_area_struct *vma,
+ unsigned long address, pmd_t *pmdp, pmd_t pmd)
+{
+ pmd_t old;
+
+ {
+ old = *pmdp;
+ } while (cmpxchg64(&pmdp->pmd, old.pmd, pmd.pmd) != old.pmd);
+
+ return old;
+}
+
/*
* This routine is only called when splitting a THP
*/
-void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
+pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
pmd_t *pmdp)
{
- pmd_t entry = *pmdp;
-
- pmd_val(entry) &= ~_PAGE_VALID;
+ pmd_t old, entry;
- set_pmd_at(vma->vm_mm, address, pmdp, entry);
+ entry = __pmd(pmd_val(*pmdp) & ~_PAGE_VALID);
+ old = pmdp_establish(vma, address, pmdp, entry);
flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
/*
@@ -240,6 +251,8 @@ void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
if ((pmd_val(entry) & _PAGE_PMD_HUGE) &&
!is_huge_zero_page(pmd_page(entry)))
(vma->vm_mm)->context.thp_pte_count--;
+
+ return old;
}
void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,
--
2.15.0
--
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:[~2017-12-13 10:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-13 10:57 [PATCHv4 00/12] Do not lose dirty bit on THP pages Kirill A. Shutemov
2017-12-13 10:57 ` [PATCHv4 01/12] asm-generic: Provide generic_pmdp_establish() Kirill A. Shutemov
2017-12-13 10:57 ` [PATCHv4 02/12] arc: Use generic_pmdp_establish as pmdp_establish Kirill A. Shutemov
2017-12-13 10:57 ` [PATCHv4 03/12] arm/mm: Provide pmdp_establish() helper Kirill A. Shutemov
2017-12-13 10:57 ` [PATCHv4 04/12] arm64: " Kirill A. Shutemov
2017-12-13 10:57 ` [PATCHv4 05/12] mips: Use generic_pmdp_establish as pmdp_establish Kirill A. Shutemov
2017-12-13 10:57 ` [PATCHv4 06/12] powerpc/mm: update pmdp_invalidate to return old pmd value Kirill A. Shutemov
2017-12-13 10:57 ` [PATCHv4 07/12] s390/mm: Modify pmdp_invalidate to return old value Kirill A. Shutemov
2017-12-13 10:57 ` Kirill A. Shutemov [this message]
2017-12-14 0:06 ` [PATCHv4 08/12] sparc64: Update pmdp_invalidate() to return old pmd value Andrew Morton
2017-12-13 10:57 ` [PATCHv4 09/12] x86/mm: Provide pmdp_establish() helper Kirill A. Shutemov
2017-12-14 0:09 ` Andrew Morton
2017-12-14 0:33 ` Kirill A. Shutemov
2017-12-14 0:36 ` Andrew Morton
2017-12-14 0:42 ` Kirill A. Shutemov
2017-12-15 13:49 ` Kirill A. Shutemov
2017-12-13 10:57 ` [PATCHv4 10/12] mm: Do not lose dirty and access bits in pmdp_invalidate() Kirill A. Shutemov
2017-12-13 10:57 ` [PATCHv4 11/12] mm: Use updated pmdp_invalidate() interface to track dirty/accessed bits Kirill A. Shutemov
2017-12-13 10:57 ` [PATCHv4 12/12] mm/thp: Remove pmd_huge_split_prepare 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=20171213105756.69879-9-kirill.shutemov@linux.intel.com \
--to=kirill.shutemov@linux.intel.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=nitin.m.gupta@oracle.com \
--cc=vbabka@suse.cz \
/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;
as well as URLs for NNTP newsgroup(s).