Received-SPF: pass (google.com: domain of linux-kernel+bounces-26331-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Mon, 15 Jan 2024 13:55:51 -0400
From: Jason Gunthorpe <jgg@nvidia.com>
To: peterx@redhat.com
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	James Houghton <jthoughton@google.com>,
	David Hildenbrand <david@redhat.com>,
	"Kirill A . Shutemov" <kirill@shutemov.name>,
	Yang Shi <shy828301@gmail.com>, linux-riscv@lists.infradead.org,
	Andrew Morton <akpm@linux-foundation.org>,
	"Aneesh Kumar K . V" <aneesh.kumar@kernel.org>,
	Rik van Riel <riel@surriel.com>,
	Andrea Arcangeli <aarcange@redhat.com>,
	Axel Rasmussen <axelrasmussen@google.com>,
	Mike Rapoport <rppt@kernel.org>, John Hubbard <jhubbard@nvidia.com>,
	Vlastimil Babka <vbabka@suse.cz>,
	Michael Ellerman <mpe@ellerman.id.au>,
	Christophe Leroy <christophe.leroy@csgroup.eu>,
	Andrew Jones <andrew.jones@linux.dev>,
	linuxppc-dev@lists.ozlabs.org,
	Mike Kravetz <mike.kravetz@oracle.com>,
	Muchun Song <muchun.song@linux.dev>,
	linux-arm-kernel@lists.infradead.org,
	Christoph Hellwig <hch@infradead.org>,
	Lorenzo Stoakes <lstoakes@gmail.com>,
	Matthew Wilcox <willy@infradead.org>
Subject: Re: [PATCH v2 03/13] mm: Provide generic pmd_thp_or_huge()
Message-ID: <20240115175551.GP734935@nvidia.com>
References: <20240103091423.400294-1-peterx@redhat.com>
 <20240103091423.400294-4-peterx@redhat.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240103091423.400294-4-peterx@redhat.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?Y0Mnz+FeeoVW5CGXwQ/NvcLQVPo5bEBhWaviH9wkGZXMZ7N3lD5fBZdbxVqA?=
 =?us-ascii?Q?ApU9YnpP/RgZbsQxrWPI4JDZ/ipQLzQ59ll2C2yAYB9ii7hUUNMMZazQjAP9?=
 =?us-ascii?Q?fzr1c21hr9hASew3UtfqwCVVS3t81HPNbLn2+EFRZAPh3bnS/Jomun8RAOeR?=
 =?us-ascii?Q?48lEND0KaSIZxw3j/0AfVolKx9NHGybZ6WXI1N/Tui8MBG5Rr28Ick/5pCYq?=
 =?us-ascii?Q?Cx95ukqsQPPvlQNpZtDxU3Iaz8E5VRj2fpy8eAsRLE6Ylpb/Pd/Z2u5HhYCX?=
 =?us-ascii?Q?+ffuddCgXPj/eR4iMckQVcZxvyLPjFPxTMCQIfCJdKml/PEAkAPFzvhGGKRv?=
 =?us-ascii?Q?xDx4Ke4wu1fZqXAolbj2Bh+1v+4JhgIsW0QXj7KRT19W8OiVZc5H1A7yBGHb?=
 =?us-ascii?Q?J7SUt89BU2xa6/PSm1R8nk+kuDermiwPvU/d2arz/uvdJEiZkwnHXwAEtaXv?=
 =?us-ascii?Q?Ax4tVgcgN0u/1bUzljIJfRiCy94Kep+yiUy/tGmHnfCSRp25DIUqLXsTW9iq?=
 =?us-ascii?Q?RgSU9qKQtdub6Qt6PKQgGN+t21fz6ON8W0N4APxrJuI8gllS5FMcdE3EzxJC?=
 =?us-ascii?Q?OMcIRlsK1xY6Rynquq2/rTbGt/z16O/rdHu71p0emKVHGOpHzH0DKmJuICKw?=
 =?us-ascii?Q?vuaYPm/1SB9bAL6vRR6cBKQTiSWuFbmdpnpYO44OFoPxEsoclSzPtAYrmun1?=
 =?us-ascii?Q?d6qHgg3yUw/+H0qcomBoyucTFgABul51xulQa+NJ0+t85O11beoDc9Z5OISV?=
 =?us-ascii?Q?7y8Bb3eQJRKSH4SHJ3VjANQf4kblMDC9vHEkLUWt+gv7rUOUD1QhEtc0lzIV?=
 =?us-ascii?Q?7K+H2xSEZBSYkwl+ENG8B6UtL72muwsoiUH2CavWT9bX9r8mI9mflP8Lbq8D?=
 =?us-ascii?Q?LS9xVawTDpLbznNGNMd0FoJiQjvC7/jwm/ZfI4FRkLPgAiIzTpyA6GjPYioN?=
 =?us-ascii?Q?yZicqh4Q26WNAu391jR1ZqUXZ0eiKuuv9sxVhwIdqP8DCbSXuaOPIKVZBvWs?=
 =?us-ascii?Q?GAbH1onR4BY0U2fyRBOl5z3KN6d3h4xCI+ehz7izyVc2SWTK1KYJN2tKFr7N?=
 =?us-ascii?Q?4iOxW8CsxwYms4+5ftjVNbymlnZyRgZCZVIqq9Oe2PaWxaT4ABsAkXcd/iOW?=
 =?us-ascii?Q?5Wg/MOhYVvqGpJy2P8r1QxtYJZ8/UeYUIDJhAkwMTobMa2OHGFmHsG2cAH64?=
 =?us-ascii?Q?FaTiAwOvwSjHTZkzfbnnJIPfPeCfyxt4z45Gs9+JsdZZOluo8qRE13gQYyK2?=
 =?us-ascii?Q?WHQJSv12nSCMQMGdW74qKYS8SkaE+bbRE+svZP+9gyo8D3yNhLGrg8Ye1q/U?=
 =?us-ascii?Q?9I89z6DgFJfqL6AINDPQKLzsLLSzSzUPFnsS8zbL+NsC9V2hpRUF/GDzTzAH?=
 =?us-ascii?Q?zU5hMEkqmraZzXEGH0iraSZEyI6o0+VNj7bdS1tMUvIF7esEQ37lpFwFe/G1?=
 =?us-ascii?Q?9vder69Oa/OkbOGmJlxEFOR7NDR71+rbG4Om5rfXnKkYCJIT7VVXN6dBKF4v?=
 =?us-ascii?Q?FvhukTLNEoOPQSgTMNgwBGw8zycrhgQDPx7Cxk8AMbyRBKAuFEDJ8Mm4AF+q?=
 =?us-ascii?Q?Vy6XczWgs6FWDLjdVwwz9Az7hzWwx/8qZIKp+/13?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5fc418c7-27bc-45f4-d373-08dc15f336f2
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2024 17:55:52.4657
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: R/Usag42TfUXXXKvAA8ETsQfL0dzgmbBHZjxdZyFonQ7KwBgccdBmaU19g4uJrj2
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR12MB5460

On Wed, Jan 03, 2024 at 05:14:13PM +0800, peterx@redhat.com wrote:
> From: Peter Xu <peterx@redhat.com>
> 
> ARM defines pmd_thp_or_huge(), detecting either a THP or a huge PMD.  It
> can be a helpful helper if we want to merge more THP and hugetlb code
> paths.  Make it a generic default implementation, only exist when
> CONFIG_MMU.  Arch can overwrite it by defining its own version.
> 
> For example, ARM's pgtable-2level.h defines it to always return false.
> 
> Keep the macro declared with all config, it should be optimized to a false
> anyway if !THP && !HUGETLB.
> 
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>  include/linux/pgtable.h | 4 ++++
>  mm/gup.c                | 3 +--
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
> index 466cf477551a..2b42e95a4e3a 100644
> --- a/include/linux/pgtable.h
> +++ b/include/linux/pgtable.h
> @@ -1362,6 +1362,10 @@ static inline int pmd_write(pmd_t pmd)
>  #endif /* pmd_write */
>  #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>  
> +#ifndef pmd_thp_or_huge
> +#define pmd_thp_or_huge(pmd)	(pmd_huge(pmd) || pmd_trans_huge(pmd))
> +#endif

Why not just use pmd_leaf() ?

This GUP case seems to me exactly like what pmd_leaf() should really
do and be used for..

eg x86 does:

#define pmd_leaf	pmd_large
static inline int pmd_large(pmd_t pte)
	return pmd_flags(pte) & _PAGE_PSE;

static inline int pmd_trans_huge(pmd_t pmd)
	return (pmd_val(pmd) & (_PAGE_PSE|_PAGE_DEVMAP)) == _PAGE_PSE;

int pmd_huge(pmd_t pmd)
        return !pmd_none(pmd) &&
                (pmd_val(pmd) & (_PAGE_PRESENT|_PAGE_PSE)) != _PAGE_PRESENT;

I spot checked a couple arches and it looks like it holds up.

Further, it looks to me like this site in GUP is the only core code
caller..

So, I'd suggest a small series to go arch by arch and convert the arch
to use pmd_huge() == pmd_leaf(). Then retire pmd_huge() as a public
API.

> diff --git a/mm/gup.c b/mm/gup.c
> index df83182ec72d..eebae70d2465 100644
> --- a/mm/gup.c
> +++ b/mm/gup.c
> @@ -3004,8 +3004,7 @@ static int gup_pmd_range(pud_t *pudp, pud_t pud, unsigned long addr, unsigned lo
>  		if (!pmd_present(pmd))
>  			return 0;
>  
> -		if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd) ||
> -			     pmd_devmap(pmd))) {
> +		if (unlikely(pmd_thp_or_huge(pmd) || pmd_devmap(pmd))) {
>  			/* See gup_pte_range() */
>  			if (pmd_protnone(pmd))
>  				return 0;

And the devmap thing here doesn't make any sense either. The arch
should ensure that pmd_devmap() implies pmd_leaf(). Since devmap is a
purely SW construct it almost certainly does already anyhow.

Jason