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 402EAC433F5 for ; Wed, 30 Mar 2022 12:05:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 976C68D0002; Wed, 30 Mar 2022 08:05:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 925898D0001; Wed, 30 Mar 2022 08:05:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C63C8D0002; Wed, 30 Mar 2022 08:05:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0089.hostedemail.com [216.40.44.89]) by kanga.kvack.org (Postfix) with ESMTP id 689FE8D0001 for ; Wed, 30 Mar 2022 08:05:56 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id EAA1F18289582 for ; Wed, 30 Mar 2022 12:05:55 +0000 (UTC) X-FDA: 79300923870.28.57249C8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 6434514001D for ; Wed, 30 Mar 2022 12:05:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648641954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z7kyeXIq3qpC1TqkQxZiQ80R5roligpsZx60nCj9EyM=; b=hCA88vq9Tb6NleNsgogKzyf1ZxxI9Wo8stQ1fxlRYaxWWf17mjYqCiU5MgxVS6/OSbpbjL +bTm4FcuMrvTi6XphkAl1G7JFvAlTeEYnZAHDm8qOpn6mioCyjkVVnDgVZEGuf5VN6mCmz 3JV8jUsJGrubTZe7+zBvW2WCSt9eZ6M= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-270-plv40VnsMAeUsY-hgnSlhg-1; Wed, 30 Mar 2022 08:05:51 -0400 X-MC-Unique: plv40VnsMAeUsY-hgnSlhg-1 Received: by mail-wm1-f71.google.com with SMTP id r64-20020a1c2b43000000b0038b59eb1940so653997wmr.0 for ; Wed, 30 Mar 2022 05:05:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:organization:in-reply-to :content-transfer-encoding; bh=z7kyeXIq3qpC1TqkQxZiQ80R5roligpsZx60nCj9EyM=; b=BCXUzSfqBMZISrYH9uJvJ056m9i/PJrMX/9uldUEWjiFYx25MV6c5dS/ZRrLD8z/IQ vwcM/n/vyWjsaTgkltQHMLE2lG01tqrYsyNCgfVCMpVog82vlP26Ev8JGBCM15hDf3on RBFG4ppi1C0T6Gj+jCbdsEMKuViVPAkC+j2/Cns/RLnI1gIAaMrIbC7SbrojduXT7I0S OMScCXdDt9t34EDIzlrtKm872+RxAAZWL5PElXkFptOEMt8LGyzYJ7r8DU8D1tSuqclG I+oljy5nmKsw5HZF9RfBW8tAA8j/vAXxosR9K7dYoLcJi9vIz0ACKi1V+FB+vv20E82h T+uQ== X-Gm-Message-State: AOAM532SLMPq2XBGHvgl+vHTkL9byAobCcL85fqjCJKA5YEC6/RbXVnA xEri+OjQqZsvXMSKjOcoMITY0po+oiKGhSayvCzYZoddpTdbVRaqKnU1I2dJ11iPG6zpLDjpkBO DkaEJbn2esbw= X-Received: by 2002:a05:6000:1a85:b0:205:a234:d0a5 with SMTP id f5-20020a0560001a8500b00205a234d0a5mr31311424wry.126.1648641950677; Wed, 30 Mar 2022 05:05:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUlj9F4n2TwBQrj3cNNHC28+mvqUZwUJTmnsrMpVYh0Jx4TsD5Au8FsnpvdDbECH7xR332zA== X-Received: by 2002:a05:6000:1a85:b0:205:a234:d0a5 with SMTP id f5-20020a0560001a8500b00205a234d0a5mr31311398wry.126.1648641950399; Wed, 30 Mar 2022 05:05:50 -0700 (PDT) Received: from ?IPV6:2003:cb:c705:2200:178b:7244:2a1f:b5d8? (p200300cbc7052200178b72442a1fb5d8.dip0.t-ipconnect.de. [2003:cb:c705:2200:178b:7244:2a1f:b5d8]) by smtp.gmail.com with ESMTPSA id u11-20020a5d6acb000000b002058148822bsm24244099wrw.63.2022.03.30.05.05.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 30 Mar 2022 05:05:49 -0700 (PDT) Message-ID: <02897471-908a-06bb-63fe-0fee35c6fd3c@redhat.com> Date: Wed, 30 Mar 2022 14:05:48 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.2 Subject: Re: [PATCH v2] tlb: hugetlb: Add more sizes to tlb_remove_huge_tlb_entry To: Steve Capper , linux-mm@kvack.org Cc: Peter Zijlstra , Anshuman Khandual , Catalin Marinas , Will Deacon References: <8d5f53c2-2e67-66e4-6453-946a62d5ee98@arm.com> <20220330112543.863-1-steve.capper@arm.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20220330112543.863-1-steve.capper@arm.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hCA88vq9; spf=none (imf26.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 6434514001D X-Stat-Signature: 8zohcfr153sopwm4gjk483szbpykgxts X-HE-Tag: 1648641955-863496 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 30.03.22 13:25, 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 > > --- > > Changed in V2: instead of doing the per-arch implementation of > tlb_remove_huge_tlb_entry we add to the generic implmentation, as > suggested by PeterZ. > > This works well on arm64 with contiguous PTEs/PMDs. Does this look > reasonable to the ppc folk? > > Cheers, > -- > Steve > --- > 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) > LGTM Acked-by: David Hildenbrand -- Thanks, David / dhildenb