Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751279AbdIMFG3 (ORCPT ); Wed, 13 Sep 2017 01:06:29 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:37403 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751013AbdIMFG2 (ORCPT ); Wed, 13 Sep 2017 01:06:28 -0400 From: "Aneesh Kumar K.V" To: "Kirill A. Shutemov" , Andrew Morton , Vlastimil Babka , Vineet Gupta , Russell King , Will Deacon , Catalin Marinas , Ralf Baechle , "David S. Miller" , Martin Schwidefsky , Heiko Carstens , Andrea Arcangeli Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Nitin Gupta , "Kirill A . Shutemov" Subject: Re: [PATCHv3 08/11] sparc64: update pmdp_invalidate to return old pmd value In-Reply-To: <20170912153941.47012-9-kirill.shutemov@linux.intel.com> References: <20170912153941.47012-1-kirill.shutemov@linux.intel.com> <20170912153941.47012-9-kirill.shutemov@linux.intel.com> Date: Wed, 13 Sep 2017 10:36:13 +0530 MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-MML: disable x-cbid: 17091305-0044-0000-0000-00000286EFCE X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17091305-0045-0000-0000-0000071C435D Message-Id: <87r2vbur0a.fsf@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-09-13_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709130078 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2541 Lines: 79 "Kirill A. Shutemov" writes: > From: "Aneesh Kumar K.V" You got the author wrong there. > > It's required to avoid loosing dirty and accessed bits. > > Signed-off-by: Nitin Gupta > Signed-off-by: Kirill A. Shutemov > --- > 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 4fefe3762083..83b06c98bb94 100644 > --- a/arch/sparc/include/asm/pgtable_64.h > +++ b/arch/sparc/include/asm/pgtable_64.h > @@ -979,7 +979,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 ee8066c3d96c..d36c65fc55cf 100644 > --- a/arch/sparc/mm/tlb.c > +++ b/arch/sparc/mm/tlb.c > @@ -218,17 +218,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); > > /* > @@ -239,6 +250,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.14.1