From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EC52C433EF for ; Fri, 27 May 2022 09:02:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234069AbiE0JCG (ORCPT ); Fri, 27 May 2022 05:02:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350481AbiE0JAA (ORCPT ); Fri, 27 May 2022 05:00:00 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1D82E5E143 for ; Fri, 27 May 2022 01:56:02 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6D209143D; Fri, 27 May 2022 01:56:02 -0700 (PDT) Received: from [10.163.36.66] (unknown [10.163.36.66]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AF9463F73D; Fri, 27 May 2022 01:55:57 -0700 (PDT) Message-ID: Date: Fri, 27 May 2022 14:25:54 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH] arm64/hugetlb: Fix building errors in huge_ptep_clear_flush() Content-Language: en-US To: Baolin Wang , Gavin Shan , torvalds@linux-foundation.org Cc: catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, naresh.kamboju@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <814e20c19b110209ee12ecae7cb05f8a78d021c8.1653625820.git.baolin.wang@linux.alibaba.com> <4707e621-c167-8fff-b210-9babb6a3f2df@redhat.com> From: Anshuman Khandual In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/27/22 14:12, Baolin Wang wrote: > > > On 5/27/2022 3:12 PM, Gavin Shan wrote: >> Hi Baolin, >> >> On 5/27/22 12:51 PM, Baolin Wang wrote: >>> Fix below building errors which was caused by commit ae07562909f3 >>> ("mm: change huge_ptep_clear_flush() to return the original pte") >>> interacting with commit fb396bb459c1 ("arm64/hugetlb: Drop TLB flush >>> from get_clear_flush()"). >>> >>> Due to the new get_clear_contig() has dropped TLB flush, we should >>> add an explicit TLB flush in huge_ptep_clear_flush() to keep original >>> semantics when changing to use new get_clear_contig(). >>> >>> " >>> arch/arm64/mm/hugetlbpage.c: In function ‘huge_ptep_clear_flush’: >>> arch/arm64/mm/hugetlbpage.c:515:9: error: implicit declaration of >>> function ‘get_clear_flush’; did you mean ‘ptep_clear_flush’? >>> [-Werror=implicit-function-declaration] >>>    515 |  return get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncontig); >>>        |         ^~~~~~~~~~~~~~~ >>>        |         ptep_clear_flush >>> " >>> >>> Reported-by: Linux Kernel Functional Testing >>> Suggested-by: Catalin Marinas >>> Signed-off-by: Baolin Wang >>> Cc: Catalin Marinas >>> Cc: Anshuman Khandual >>> Cc: Andrew Morton >>> --- >>>   arch/arm64/mm/hugetlbpage.c | 5 ++++- >>>   1 file changed, 4 insertions(+), 1 deletion(-) >>> >> >> I ran to the compiling failure either and it would be caused by >> commit fb396bb459c1 ("arm64/hugetlb: Drop TLB flush from get_clear_flush()"). >> It's worthy to have a "Fixes" tag. With those fixed: > > Thanks for reminding. IMHO, better to add 2 related commits' fix tag. Linus, could you help to add them when applying this patch, or need a resend? Thanks. > > Fixes: ae07562909f3 ("mm: change huge_ptep_clear_flush() to return the original pte") > Fixes: fb396bb459c1 ("arm64/hugetlb: Drop TLB flush from get_clear_flush()"). Although this merge conflict happened in flight, the earlier commit ae07562909f3 came afterwards by which time get_clear_contig() has been added without required TLB flush. Hence seems like 'Fixes:' tag applies to the earlier commit itself. Nonetheless LGTM. Reviewed-by: Anshuman Khandual > >> >> Reviewed-by: Gavin Shan >> >> >>> diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c >>> index 0f0c17dfeb9c..e2a5ec9fdc0d 100644 >>> --- a/arch/arm64/mm/hugetlbpage.c >>> +++ b/arch/arm64/mm/hugetlbpage.c >>> @@ -507,12 +507,15 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, >>>   { >>>       size_t pgsize; >>>       int ncontig; >>> +    pte_t orig_pte; >>>       if (!pte_cont(READ_ONCE(*ptep))) >>>           return ptep_clear_flush(vma, addr, ptep); >>>       ncontig = find_num_contig(vma->vm_mm, addr, ptep, &pgsize); >>> -    return get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncontig); >>> +    orig_pte = get_clear_contig(vma->vm_mm, addr, ptep, pgsize, ncontig); >>> +    flush_tlb_range(vma, addr, addr + pgsize * ncontig); >>> +    return orig_pte; >>>   } >>>   static int __init hugetlbpage_init(void) >>> >> >> Thanks, >> Gavin