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 X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 544DAC47094 for ; Thu, 10 Jun 2021 14:17:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E7CD1613C6 for ; Thu, 10 Jun 2021 14:17:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7CD1613C6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7E9F06B006C; Thu, 10 Jun 2021 10:17:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7997C6B006E; Thu, 10 Jun 2021 10:17:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5EC4D6B0070; Thu, 10 Jun 2021 10:17:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0073.hostedemail.com [216.40.44.73]) by kanga.kvack.org (Postfix) with ESMTP id 274416B006C for ; Thu, 10 Jun 2021 10:17:41 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id A6D0F181AEF21 for ; Thu, 10 Jun 2021 14:17:40 +0000 (UTC) X-FDA: 78238017480.04.3B301FC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf04.hostedemail.com (Postfix) with ESMTP id CD676493 for ; Thu, 10 Jun 2021 14:17:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623334659; 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: in-reply-to:in-reply-to:references:references; bh=2ettsBbd343DElYNQaOh/2OpHE71CrjjsdmVGaKy6xw=; b=UOE1Jj3Hh9z2MsSSyVHJWTuTEvfi35bRA437/ZcEHZTqo3P1G64yPcDZ+vBlm42qgOQEV+ mMNh/rgT9LbGNIl0V6Guwyq+WeYQNc1Q8Lld9l6BzYYp82RTuKz6w+IpmUWYSiEboNWzwW n6ywapyHqbomghBjmMKIR7Fdx1nTFvY= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-591-kbhv6nWhP0WCZIBiC2cTag-1; Thu, 10 Jun 2021 10:17:36 -0400 X-MC-Unique: kbhv6nWhP0WCZIBiC2cTag-1 Received: by mail-qk1-f197.google.com with SMTP id a193-20020a3766ca0000b02903a9be00d619so19378411qkc.12 for ; Thu, 10 Jun 2021 07:17:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=2ettsBbd343DElYNQaOh/2OpHE71CrjjsdmVGaKy6xw=; b=KxBT/mn28WBms3ibal1ndd7uhLpkBo0S7NrJYwA0fUMm3atNitbChX0Ztbhle+1Jlo 0/u3C7ILcRypbpzRKUmp+uL9BnLc93W1VlwBNHZO2XQbKwlTsMEB6u2YfI/cxmmb54ga tapSHx5vdyJnck6xu4b/GT4Sl/evIXs7qrL0CrZuvnppv5cXDTy2g9WMS5j8CRLetkCd FPH8PtVWHeu8ucRsWLDxyLXXtFetQp3qL9MFlhQgsSg7M3DJUTN6srUfCG1IVJD+EKIr 8d/QSbmvzBZUWb56m1flYPBOzWYUD6qRq8inOqf3evWHHXaMSLOUjiApfZo2ZP4mlxL+ GCIw== X-Gm-Message-State: AOAM530Vaz2pojCuAbsIXjDaO5knSVjL/ezlkxFFRdDg8OSKpn0aU9fp cWIlWEcy0ridD3xwnN9g8nJBk6Ndja4saHbu6xZ6x6lhKXbYDIr2B/a4h1gaiYR3ZmPPaWPVEFP PXCqPYeTdT9Y= X-Received: by 2002:a37:2fc3:: with SMTP id v186mr4893538qkh.28.1623334656091; Thu, 10 Jun 2021 07:17:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5juRO0nS6UGUfzZy9UuXFLrxmwuTJ0ipKNPqy4Doeu+Jg0pREfqsFhkhccahOFDRbBsOHcA== X-Received: by 2002:a37:2fc3:: with SMTP id v186mr4893513qkh.28.1623334655890; Thu, 10 Jun 2021 07:17:35 -0700 (PDT) Received: from t490s (bras-base-toroon474qw-grc-88-174-93-75-200.dsl.bell.ca. [174.93.75.200]) by smtp.gmail.com with ESMTPSA id q18sm2271315qkc.27.2021.06.10.07.17.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 07:17:35 -0700 (PDT) Date: Thu, 10 Jun 2021 10:17:34 -0400 From: Peter Xu To: Hugh Dickins Cc: Andrew Morton , "Kirill A. Shutemov" , Yang Shi , Wang Yugui , Matthew Wilcox , Alistair Popple , Ralph Campbell , Zi Yan , Will Deacon , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 02/11] mm: page_vma_mapped_walk(): settle PageHuge on entry Message-ID: References: <589b358c-febc-c88e-d4c2-7834b37fa7bf@google.com> MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UOE1Jj3H; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf04.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=peterx@redhat.com X-Rspamd-Server: rspam02 X-Stat-Signature: 9mgts4u59j3imi8src9q5xzohbhoi7xk X-Rspamd-Queue-Id: CD676493 X-HE-Tag: 1623334656-99419 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, Jun 09, 2021 at 11:36:36PM -0700, Hugh Dickins wrote: > page_vma_mapped_walk() cleanup: get the hugetlbfs PageHuge case > out of the way at the start, so no need to worry about it later. > > Signed-off-by: Hugh Dickins > Cc: > --- > mm/page_vma_mapped.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c > index a6dbf714ca15..7c0504641fb8 100644 > --- a/mm/page_vma_mapped.c > +++ b/mm/page_vma_mapped.c > @@ -153,10 +153,11 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) > if (pvmw->pmd && !pvmw->pte) > return not_found(pvmw); > > - if (pvmw->pte) > - goto next_pte; > - > if (unlikely(PageHuge(page))) { > + /* The only possible mapping was handled on last iteration */ > + if (pvmw->pte) > + return not_found(pvmw); > + > /* when pud is not present, pte will be NULL */ > pvmw->pte = huge_pte_offset(mm, pvmw->address, page_size(page)); > if (!pvmw->pte) Would it be even nicer to move the initial check to be after PageHuge() too? if (pvmw->pmd && !pvmw->pte) return not_found(pvmw); It looks already better, so no strong opinion. Reviewed-by: Peter Xu Thanks, -- Peter Xu