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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0324FC433F5 for ; Wed, 6 Apr 2022 11:41:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C7A66B0072; Wed, 6 Apr 2022 07:40:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 650FD6B0073; Wed, 6 Apr 2022 07:40:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F0686B0074; Wed, 6 Apr 2022 07:40:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.27]) by kanga.kvack.org (Postfix) with ESMTP id 3904C6B0072 for ; Wed, 6 Apr 2022 07:40:59 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 02AC86140C for ; Wed, 6 Apr 2022 11:40:48 +0000 (UTC) X-FDA: 79326262218.07.9977A34 Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) by imf12.hostedemail.com (Postfix) with ESMTP id 63B5A40034 for ; Wed, 6 Apr 2022 11:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=m5EXEEg497xOr83ogozbwhitHuCNYeueS3bvALvkjQk=; b=Tr97WzcGVt2etVEEJVJuKk5yaT OdeFb0fcagRowg2eBK2IuvE9WkH7UBJAbv5FyRYjdPRzhG4tkDCLLBcCvmO2oFb+Uh525bv8lHVXM g3lWd46DxQD95PGjn3Q8/ipzOE3s44cutFMHSGYmnGUr8fm7IGT25Koxj44fxKQyOdJdwbZjGALFc lMz6Tq46MFSx0vvUG5UXruXGrY9xy+jx1LJbZkg3wP6JVsTmOX6OnXAN/DPmH5bF9DtIAU0pONI8y yw+bZvsKTpW5qdZn5mXG6jFgMGG4ZpF85rOGOWkHrPIBbNdAGNrb0KeTH7bPB0uJQSajGasEAEEG5 2nZAji4g==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=worktop.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nc41c-0029dL-1v; Wed, 06 Apr 2022 11:40:39 +0000 Received: by worktop.programming.kicks-ass.net (Postfix, from userid 1000) id 882E6986199; Wed, 6 Apr 2022 13:40:33 +0200 (CEST) Date: Wed, 6 Apr 2022 13:40:33 +0200 From: Peter Zijlstra To: Steve Capper Cc: linux-mm@kvack.org, David Hildenbrand , Anshuman Khandual , Catalin Marinas , Will Deacon Subject: Re: [PATCH v2] tlb: hugetlb: Add more sizes to tlb_remove_huge_tlb_entry Message-ID: <20220406114033.GF2731@worktop.programming.kicks-ass.net> References: <8d5f53c2-2e67-66e4-6453-946a62d5ee98@arm.com> <20220330112543.863-1-steve.capper@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220330112543.863-1-steve.capper@arm.com> Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=desiato.20200630 header.b=Tr97WzcG; spf=none (imf12.hostedemail.com: domain of peterz@infradead.org has no SPF policy when checking 90.155.92.199) smtp.mailfrom=peterz@infradead.org; dmarc=none X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 63B5A40034 X-Stat-Signature: 657hjorohc1j99gij57d6qj8fooizzr8 X-HE-Tag: 1649245248-471277 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Mar 30, 2022 at 12:25:43PM +0100, Steve Capper wrote: > tlb_remove_huge_tlb_entry only considers PMD_SIZE and PUD_SIZE when > updating the mmu_gather structure. > > Unfortunately on arm64 there are two additional huge page sizes that > need to be covered: CONT_PTE_SIZE and CONT_PMD_SIZE. Where an end-user > attempts to employ contiguous huge pages, a VM_BUG_ON can be experienced > due to the fact that the tlb structure hasn't been correctly updated by > the relevant tlb_flush_p.._range() call from tlb_remove_huge_tlb_entry. > > This patch adds inequality logic to the generic implementation of > tlb_remove_huge_tlb_entry s.t. CONT_PTE_SIZE and CONT_PMD_SIZE are > effectively covered on arm64. Also, as well as ptes, pmds and puds; > p4ds are now considered too. > > Reported-by: David Hildenbrand > Suggested-by: Peter Zijlstra (Intel) > Cc: Anshuman Khandual > Cc: Catalin Marinas > Cc: Will Deacon > Link: https://lore.kernel.org/linux-mm/811c5c8e-b3a2-85d2-049c-717f17c3a03a@redhat.com/ > Signed-off-by: Steve Capper Acked-by: Peter Zijlstra (Intel) > --- > include/asm-generic/tlb.h | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h > index 2c68a545ffa7..71942a1c642d 100644 > --- a/include/asm-generic/tlb.h > +++ b/include/asm-generic/tlb.h > @@ -565,10 +565,14 @@ static inline void tlb_flush_p4d_range(struct mmu_gather *tlb, > #define tlb_remove_huge_tlb_entry(h, tlb, ptep, address) \ > do { \ > unsigned long _sz = huge_page_size(h); \ > - if (_sz == PMD_SIZE) \ > - tlb_flush_pmd_range(tlb, address, _sz); \ > - else if (_sz == PUD_SIZE) \ > + if (_sz >= P4D_SIZE) \ > + tlb_flush_p4d_range(tlb, address, _sz); \ > + else if (_sz >= PUD_SIZE) \ > tlb_flush_pud_range(tlb, address, _sz); \ > + else if (_sz >= PMD_SIZE) \ > + tlb_flush_pmd_range(tlb, address, _sz); \ > + else \ > + tlb_flush_pte_range(tlb, address, _sz); \ > __tlb_remove_tlb_entry(tlb, ptep, address); \ > } while (0) > > -- > 2.35.1 >