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 9D4EFC54E67 for ; Thu, 14 Mar 2024 12:59:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 133C1800A2; Thu, 14 Mar 2024 08:59:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E42C80073; Thu, 14 Mar 2024 08:59:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA004800A2; Thu, 14 Mar 2024 08:59:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D445980073 for ; Thu, 14 Mar 2024 08:59:32 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4AB7280575 for ; Thu, 14 Mar 2024 12:59:32 +0000 (UTC) X-FDA: 81895650984.26.710B7DF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 1BFB72000E for ; Thu, 14 Mar 2024 12:59:29 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dSaR2vE1; spf=pass (imf03.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710421170; a=rsa-sha256; cv=none; b=2UwMi7s32TaoyacNTwfM0e2uAVPzxqH+JHisRQdov+XF+2CKmjBLafj8LbcK/o2c0fm7rc PCrCJHDQ3Eli+Zfplo15UnkaTIufyBA1S2Fm8vHWWw/DCZU+5WCWDkVqKBGHRjvFH2lV36 iDVSN5NV9qDPJrtZnxYRo8G3XWOh57A= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dSaR2vE1; spf=pass (imf03.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710421170; h=from:from:sender: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:dkim-signature; bh=jKCzOVXDDLeWui+9xMnOflGFcsiyeRgIZTuCOA+l7OQ=; b=IkxRmQsJa2n8ntvmJtY6vVgSVgkOFXptfzSxxUwfSzoUssfNonqj6revTE0/u2oKKUePhI zg+RDNP22WQcTTLQKcfvVGevTU84+kOB1QzcBCZyJvBvRF+NAXKaiNSlbFIk+NQxj8MNh5 MaPbJ/5+/jYR6qaYJ2ttzXyiPsI4zl0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710421169; 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=jKCzOVXDDLeWui+9xMnOflGFcsiyeRgIZTuCOA+l7OQ=; b=dSaR2vE1rU3Gnl/T8xSffNMNi88szzSueQV13TvvBalN/AdPVq9Ov+nn0E+ZfCm+fTYunp bxNc5qaajufWsHRWiO+rh22T9fOeqLcvGfBpEW8R5/b94nQ7+5aO/74SxU0top+MzSVwNT 7tF0nuLDRatjXqBQaWAjIuNkwVeHNO0= Received: from mail-vk1-f200.google.com (mail-vk1-f200.google.com [209.85.221.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-678-gHWDVuUgOOesCq6HpXAILA-1; Thu, 14 Mar 2024 08:59:28 -0400 X-MC-Unique: gHWDVuUgOOesCq6HpXAILA-1 Received: by mail-vk1-f200.google.com with SMTP id 71dfb90a1353d-4d424421d4aso121579e0c.0 for ; Thu, 14 Mar 2024 05:59:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710421167; x=1711025967; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jKCzOVXDDLeWui+9xMnOflGFcsiyeRgIZTuCOA+l7OQ=; b=kEU3tsyRMGlXd0pgkMazTYILCYzYJWQBja3NL8ZZDaguVaZir5d+uf9mgn1pC2yIvS eHGC8Q0Mxa6CTNTNRnD7QddCA76b5bAOb+zEs91wiSqOTF+ilFDV2miq1aLLk5dvydw4 QnnyjeHXsJXWsgf5tmoJ6aMV+0VQMZKpW/Dgv6ZATlIbLL9HdB8jofKDASU+T8rLU/jp dbaR8j/PxBz0G+NU/GJ0rd/oGgxWmFnl2or2NMv5adMEr5EZGzEWJMgE453M9hEF4dRA h83fpMNip+u87q8Bhn7A75QW/wNm7Jr2qo639UjPbdMgBoZg/j3AiKCFicjg20uGhnYh vFcw== X-Forwarded-Encrypted: i=1; AJvYcCWHMCAIYWJJz7PSdFmCZX92wVK1jLcGHidJdJcL9Pwiomcxy6gkIVXz8K5t07Dk0HQwlB6ozYMADYCZvf9GShvc/gw= X-Gm-Message-State: AOJu0YwxuC6ZQYeMUN9COCwzfw4K5ZSyk0uoxMKkS7YhSkFVTys3OlkY H04y3mGhFjv65YtsoZP5VMTAsSHsSz3VHBIlXqkItOvHtEK8KlngsieBwhvBQ3YXxRwdUZy+yua AVGGA9vlXASbLO9oR/zhHVW4/rXqgH7K6BL0Det1tgEPxs5VoLLz++v+4 X-Received: by 2002:a67:f405:0:b0:476:7cf:5495 with SMTP id p5-20020a67f405000000b0047607cf5495mr1410172vsn.3.1710421167229; Thu, 14 Mar 2024 05:59:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpB2lM/GBtztEZpRh5zxenkJs3cKW/cbCqzpceWYQibEUdWkJxv7eCQPooUilH8iyb4M7ppQ== X-Received: by 2002:a67:f405:0:b0:476:7cf:5495 with SMTP id p5-20020a67f405000000b0047607cf5495mr1410155vsn.3.1710421166816; Thu, 14 Mar 2024 05:59:26 -0700 (PDT) Received: from x1n ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id q14-20020a05621419ee00b00690edd77658sm413155qvc.75.2024.03.14.05.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 05:59:26 -0700 (PDT) Date: Thu, 14 Mar 2024 08:59:22 -0400 From: Peter Xu To: Christophe Leroy Cc: "linux-kernel@vger.kernel.org" , "linux-mm@kvack.org" , "linux-arm-kernel@lists.infradead.org" , Matthew Wilcox , "linuxppc-dev@lists.ozlabs.org" , Andrew Morton , "x86@kernel.org" , Mike Rapoport , Muchun Song , "sparclinux@vger.kernel.org" , Jason Gunthorpe Subject: Re: [PATCH 11/13] mm/treewide: Replace pXd_huge() with pXd_leaf() Message-ID: References: <20240313214719.253873-1-peterx@redhat.com> <20240313214719.253873-12-peterx@redhat.com> <0f929f80-92fd-4824-a7d6-839f1aef4c8a@csgroup.eu> MIME-Version: 1.0 In-Reply-To: <0f929f80-92fd-4824-a7d6-839f1aef4c8a@csgroup.eu> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 1BFB72000E X-Stat-Signature: goerpignssy18epsdk3hu7en8nb5h9d3 X-Rspam-User: X-HE-Tag: 1710421169-385118 X-HE-Meta: U2FsdGVkX1/GC8sIQBRN0x516T1WOpbhCQ97UEECWKBS5GjA+veaEA3SIsqkZsfYlsTNce91EfzEKR6nE/YW5zvyFGbazAuRudrGWZ1ek1RcAJahKHuY4QAva7qSAMvCoK++tWBQVc133RnItU8LfOruVbgHv2scn57ObLUXnHWd78TWv6sehAIG+Jj5se1GuCcMXKfrV7Q4EsQYMY+HDNDtwMtRwKfgXlqoABCqmkTJbkxiidCzde+eZz2dmwFb8bohIohgpe1pUbSS/GeUh6953bQWkibjnsJFq9E6jyDoKa/EdE0KLzn3+P4IlaXQP6K2nRBVxkPAaH9IaI3t3WRzaxa2BKNBnZVM0e9y9ICjmx932luQbDAyu0lsXdJYWKAMK8rRJO/g3ID158Icx5Nmm2R0h1QIV8T2dQ50Pmz1E80vE/9HDei4f3UOlG9X4ToTc8XaUAPdp1FgIUPx/NON25xbNJLJHmvDVGmbrjtyGG2SBnMCNSAOiY6c0q32//xXHi8EK/o75Jl2jSFjPSVUF7dqQLR5vaZZoW2iV8J8TOY7crJZUKLULeAN+iZAyIxFN9FQ26JVMXtsFbtadnJY/sLOZ74BH+DA7U7awcY8HcQscuHcK033RU4G9NyBdYC05J5Eh7WogTLxYgzfHgvmB16vPUCKojXDlC5nYDHsuTsplGdeiDCpQsHy9wTl+lJi3T5MDt5+fYq82MkIuv2EN5WSpnSYUgCUcbuSCDx/BpzFpqi3c68If7yX/KPeBkC+8xT9lOmCo+K+7TutpJeNx8DHl4dg3kR1xq+dfvHdJTRfggYiQnyc2V7csjhwD7MB2s3G296JBGJsEm9Xap8VBWd+4AR3+24v6H7FAXb9iZK5XjCPkxiZa+rJ88lsUdzISYWHK7TmfHsyJ//Ar3Dk1eBUpzsMmD7xL53W7z/1/sAY3lPBMAHKyZC2M993OXZak/5Izr/jTJ/okD8 vZSmJpLW GX+MoV2hKBxSNF8vqo/68bd8UeEBDEKcEXSk8NL3Hg22aKr3KB0pQ8RvWLNcQ+Im5f9V7nGJ4tUnKcHBUfK5A8ilYvK9hDA6xdr6xiCmOieNhE6c5XBmZUUdTJiCTcr60cDuuyA3hr/WFgawFx1YteM/Vj2dHt37U7NDc+l6n7jgM0LmVmp/SuTmprA== 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: List-Subscribe: List-Unsubscribe: On Thu, Mar 14, 2024 at 08:50:20AM +0000, Christophe Leroy wrote: > > > Le 13/03/2024 à 22:47, peterx@redhat.com a écrit : > > From: Peter Xu > > > > Now after we're sure all pXd_huge() definitions are the same as pXd_leaf(), > > reuse it. Luckily, pXd_huge() isn't widely used. > > > > Signed-off-by: Peter Xu > > --- > > arch/arm/include/asm/pgtable-3level.h | 2 +- > > arch/arm64/include/asm/pgtable.h | 2 +- > > arch/arm64/mm/hugetlbpage.c | 4 ++-- > > arch/loongarch/mm/hugetlbpage.c | 2 +- > > arch/mips/mm/tlb-r4k.c | 2 +- > > arch/powerpc/mm/pgtable_64.c | 6 +++--- > > arch/x86/mm/pgtable.c | 4 ++-- > > mm/gup.c | 4 ++-- > > mm/hmm.c | 2 +- > > mm/memory.c | 2 +- > > 10 files changed, 15 insertions(+), 15 deletions(-) > > > > diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h > > index e7aecbef75c9..9e3c44f0aea2 100644 > > --- a/arch/arm/include/asm/pgtable-3level.h > > +++ b/arch/arm/include/asm/pgtable-3level.h > > @@ -190,7 +190,7 @@ static inline pte_t pte_mkspecial(pte_t pte) > > #define pmd_dirty(pmd) (pmd_isset((pmd), L_PMD_SECT_DIRTY)) > > > > #define pmd_hugewillfault(pmd) (!pmd_young(pmd) || !pmd_write(pmd)) > > -#define pmd_thp_or_huge(pmd) (pmd_huge(pmd) || pmd_trans_huge(pmd)) > > +#define pmd_thp_or_huge(pmd) (pmd_leaf(pmd) || pmd_trans_huge(pmd)) > > Previous patch said pmd_trans_huge() implies pmd_leaf(). Ah here I remember I kept this arm definition there because I think we should add a patch to drop pmd_thp_or_huge() completely. If you won't mind I can add one more patch instead of doing it here. Then I keep this patch purely as a replacement patch without further changes on arch-cleanups. > > Or is that only for GUP ? I think it should apply to all. > > > > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > > #define pmd_trans_huge(pmd) (pmd_val(pmd) && !pmd_table(pmd)) > > > > diff --git a/mm/hmm.c b/mm/hmm.c > > index c95b9ec5d95f..93aebd9cc130 100644 > > --- a/mm/hmm.c > > +++ b/mm/hmm.c > > @@ -429,7 +429,7 @@ static int hmm_vma_walk_pud(pud_t *pudp, unsigned long start, unsigned long end, > > return hmm_vma_walk_hole(start, end, -1, walk); > > } > > > > - if (pud_huge(pud) && pud_devmap(pud)) { > > + if (pud_leaf(pud) && pud_devmap(pud)) { > > Didn't previous patch say devmap implies leaf ? Or is it only for GUP ? This is an extra safety check that I didn't remove. Devmap used separate bits even though I'm not clear on why. It should still imply a leaf though. Thanks, > > > unsigned long i, npages, pfn; > > unsigned int required_fault; > > unsigned long *hmm_pfns; > > -- Peter Xu