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 22305C54E41 for ; Wed, 6 Mar 2024 06:36:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B101E6B0082; Wed, 6 Mar 2024 01:36:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ABFC06B008A; Wed, 6 Mar 2024 01:36:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 960C46B008C; Wed, 6 Mar 2024 01:36:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 097016B0082 for ; Wed, 6 Mar 2024 01:36:52 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CA680140238 for ; Wed, 6 Mar 2024 06:36:51 +0000 (UTC) X-FDA: 81865656222.30.EDF3B62 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf26.hostedemail.com (Postfix) with ESMTP id AF4DA140003 for ; Wed, 6 Mar 2024 06:36:49 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=NtmgAmPS; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709707010; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OMF01+qVeFxfN7P3ksHsvokmHxjN6KqPHsAdK+wH7Ws=; b=0w0YkW1rVMmZ8RWhLD4gc3VUoqmOFHBC0JUELYTrQv/vcGBJCDNR954dMA4/JNlu75pgLy twoE0KICf+XPKtCJoed9epGb1OQBFQq2JbVrHsxh9fsuXoLmXWJkdLrpxmanEJnVJyQktt Gv+5KRV3CC9zOJpZQzeax2TYfiE087U= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=NtmgAmPS; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709707010; a=rsa-sha256; cv=none; b=mmyEjlAIDvKMnPtM2Ozl8CT41FBTigWMSsZDFMSdkK9gXgdXow1VnTEpgwfiqE4Z30Mc/8 8+r+YDNx6r6wFi+keqzkLTSvQFZ/kqsl+fzpgUUN8CtUb1Vk+N/S45ZoXBzPaUavbuCZyx sHh9W3sALkW5Av5tAhSEEbr11QJm2Yc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 92BB0CE20F6; Wed, 6 Mar 2024 06:36:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14E48C433F1; Wed, 6 Mar 2024 06:36:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709707005; bh=qejD/AKf5341J4gQp//ueMJAwnNH5bDWfrIRnrKMeZY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=NtmgAmPSnnTGquSSBtgnnitKLjtBNKFm004CppR+tHqdKlhGJnP9/ad42nnQPeKDc NoVzize21yUxJGdFmGVqXTh65b5ZkKHVUrJDRiRL6WLo7FtdPvZXo4XkWcPaaw/3Bb Wj7H9Re4o72oKQbPbXEou01QYNdI272fCGsTS19gKvCvgy1qEdEqmImdgnLWkCd9fI ggFsoKkPiGGvwUEkmNgZh59xOuqEE4cjzvGh5fSd9lTsx64nGQnG2T8a11gKyMv8lG Y5QWo6Xw6Pv2zntlvr5/8DlAC4s9AeyV9SV8uENWWXhV2HDMGmdkjosElKIXt63OYB v3+6//XOHBFNw== Date: Wed, 6 Mar 2024 08:35:52 +0200 From: Mike Rapoport To: peterx@redhat.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Christophe Leroy , x86@kernel.org, "Kirill A . Shutemov" , Jason Gunthorpe , Yang Shi , Andrew Morton , linuxppc-dev@lists.ozlabs.org, Muchun Song Subject: Re: [PATCH v3 10/10] mm/treewide: Align up pXd_leaf() retval across archs Message-ID: References: <20240305043750.93762-1-peterx@redhat.com> <20240305043750.93762-11-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240305043750.93762-11-peterx@redhat.com> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: AF4DA140003 X-Stat-Signature: 5wt5t8186j9dhdoyjaqocku44jsxecu8 X-Rspam-User: X-HE-Tag: 1709707009-571539 X-HE-Meta: U2FsdGVkX18/NlGYPPDYvf3idVeRZcrVYHkxjtPC1skD1z/V7he2thgy4RlHmLVtlhliDhLq3Uj2DCHAzTWVujZEjmFCC8CBQDfPAzm27YPouHN4HKb5nFfk83pAnqKa4jPuJSEO+3ArCYaEALekwpxGzJSEmzP8F4DDYg1b5Tdq0R8fybmA+BqXd1FCGkPAGJN7Uf9yOrad/QHFEJsi26FJbh2dkksBAGJJCIj6ybgsoiwKJwa/1Y3lx62D/+CWYx+9JTjtAQR1jbar1NRSImXxqDEyl8v8JPKttYegsPclt9//Zbi4XO1IneVbKOUkiRPZrzhxqUereUiwC8F1wun8SKAEVawNOWa7pOU48AcWEbeJGT1kzOWcElHJNQ9pUFql52p8QG43mOumeUIMZGw9ifgnpo/z8W0LccX22ZG855LbuaxmI34emY0wolFMRa1EBkdJ5lG89yQzwwkLi6WlskXIKRdlitmkAjhQOs+U9/j9xjYVhzym2OSnxWVeWZ1ZMan+UPWPsL4IdavvDdJITrm1t6YvnYctQ2EQQteqEBDBIGF7cEwr7tuG3t5a58cj7nJ2ak7C7FeB1q6p/bodMK5qoS+fhR42+btngvfSKPvtMbbNGURE2PbdWOU2PFX3Ec4EhiA834vQBAmp7z71JZvlTiokKJj7Mtis7wIuN9wDFSlqCuGIvD/JrOvfkJMM/qFj/jx9N/w+TPu2dLCs/8FqpmLo9kkHxGimiYXOqzuJwiIUhgJCewIxmTdvdLbptwkcoqSRyB8Y6KKfvh6FLBR1l55vDcXjtomkU5HfbfJ3m5HGlwRQD5npAqgqr0/7x3pNX8C5Ern7iEPafSFRf3rPIAdJnNkxujJbDlUP46RuNtLJOAN3TgEWxrrkdBm9SIJMV9JFlsw6hzZMQxG/QeIZ36YzZ+9ujDjfrGei8aLv69Mckg== 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 Tue, Mar 05, 2024 at 12:37:50PM +0800, peterx@redhat.com wrote: > From: Peter Xu > > Even if pXd_leaf() API is defined globally, it's not clear on the retval, > and there are three types used (bool, int, unsigned log). > > Always return a boolean for pXd_leaf() APIs. > > Suggested-by: Jason Gunthorpe > Signed-off-by: Peter Xu Reviewed-by: Mike Rapoport (IBM) > --- > arch/riscv/include/asm/pgtable-64.h | 2 +- > arch/riscv/include/asm/pgtable.h | 2 +- > arch/s390/include/asm/pgtable.h | 4 ++-- > arch/sparc/include/asm/pgtable_64.h | 4 ++-- > arch/x86/include/asm/pgtable.h | 8 ++++---- > include/linux/pgtable.h | 8 ++++---- > 6 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/arch/riscv/include/asm/pgtable-64.h b/arch/riscv/include/asm/pgtable-64.h > index b42017d76924..2c7e1661db01 100644 > --- a/arch/riscv/include/asm/pgtable-64.h > +++ b/arch/riscv/include/asm/pgtable-64.h > @@ -190,7 +190,7 @@ static inline int pud_bad(pud_t pud) > } > > #define pud_leaf pud_leaf > -static inline int pud_leaf(pud_t pud) > +static inline bool pud_leaf(pud_t pud) > { > return pud_present(pud) && (pud_val(pud) & _PAGE_LEAF); > } > diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h > index add5cd30ab34..6839520dbcb1 100644 > --- a/arch/riscv/include/asm/pgtable.h > +++ b/arch/riscv/include/asm/pgtable.h > @@ -241,7 +241,7 @@ static inline int pmd_bad(pmd_t pmd) > } > > #define pmd_leaf pmd_leaf > -static inline int pmd_leaf(pmd_t pmd) > +static inline bool pmd_leaf(pmd_t pmd) > { > return pmd_present(pmd) && (pmd_val(pmd) & _PAGE_LEAF); > } > diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h > index 9e08af5b9247..60950e7a25f5 100644 > --- a/arch/s390/include/asm/pgtable.h > +++ b/arch/s390/include/asm/pgtable.h > @@ -706,7 +706,7 @@ static inline int pud_none(pud_t pud) > } > > #define pud_leaf pud_leaf > -static inline int pud_leaf(pud_t pud) > +static inline bool pud_leaf(pud_t pud) > { > if ((pud_val(pud) & _REGION_ENTRY_TYPE_MASK) != _REGION_ENTRY_TYPE_R3) > return 0; > @@ -714,7 +714,7 @@ static inline int pud_leaf(pud_t pud) > } > > #define pmd_leaf pmd_leaf > -static inline int pmd_leaf(pmd_t pmd) > +static inline bool pmd_leaf(pmd_t pmd) > { > return (pmd_val(pmd) & _SEGMENT_ENTRY_LARGE) != 0; > } > diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h > index 6ff0a28d5fd1..4d1bafaba942 100644 > --- a/arch/sparc/include/asm/pgtable_64.h > +++ b/arch/sparc/include/asm/pgtable_64.h > @@ -681,7 +681,7 @@ static inline unsigned long pte_special(pte_t pte) > } > > #define pmd_leaf pmd_leaf > -static inline unsigned long pmd_leaf(pmd_t pmd) > +static inline bool pmd_leaf(pmd_t pmd) > { > pte_t pte = __pte(pmd_val(pmd)); > > @@ -868,7 +868,7 @@ static inline pmd_t *pud_pgtable(pud_t pud) > #define p4d_page(p4d) NULL > > #define pud_leaf pud_leaf > -static inline unsigned long pud_leaf(pud_t pud) > +static inline bool pud_leaf(pud_t pud) > { > pte_t pte = __pte(pud_val(pud)); > > diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h > index cfc84c55d0e6..7621a5acb13e 100644 > --- a/arch/x86/include/asm/pgtable.h > +++ b/arch/x86/include/asm/pgtable.h > @@ -252,7 +252,7 @@ static inline unsigned long pgd_pfn(pgd_t pgd) > } > > #define p4d_leaf p4d_leaf > -static inline int p4d_leaf(p4d_t p4d) > +static inline bool p4d_leaf(p4d_t p4d) > { > /* No 512 GiB pages yet */ > return 0; > @@ -261,7 +261,7 @@ static inline int p4d_leaf(p4d_t p4d) > #define pte_page(pte) pfn_to_page(pte_pfn(pte)) > > #define pmd_leaf pmd_leaf > -static inline int pmd_leaf(pmd_t pte) > +static inline bool pmd_leaf(pmd_t pte) > { > return pmd_flags(pte) & _PAGE_PSE; > } > @@ -1086,7 +1086,7 @@ static inline pmd_t *pud_pgtable(pud_t pud) > #define pud_page(pud) pfn_to_page(pud_pfn(pud)) > > #define pud_leaf pud_leaf > -static inline int pud_leaf(pud_t pud) > +static inline bool pud_leaf(pud_t pud) > { > return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) == > (_PAGE_PSE | _PAGE_PRESENT); > @@ -1413,7 +1413,7 @@ static inline bool pgdp_maps_userspace(void *__ptr) > } > > #define pgd_leaf pgd_leaf > -static inline int pgd_leaf(pgd_t pgd) { return 0; } > +static inline bool pgd_leaf(pgd_t pgd) { return false; } > > #ifdef CONFIG_PAGE_TABLE_ISOLATION > /* > diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h > index a36cf4e124b0..85fc7554cd52 100644 > --- a/include/linux/pgtable.h > +++ b/include/linux/pgtable.h > @@ -1777,16 +1777,16 @@ typedef unsigned int pgtbl_mod_mask; > * Only meaningful when called on a valid entry. > */ > #ifndef pgd_leaf > -#define pgd_leaf(x) 0 > +#define pgd_leaf(x) false > #endif > #ifndef p4d_leaf > -#define p4d_leaf(x) 0 > +#define p4d_leaf(x) false > #endif > #ifndef pud_leaf > -#define pud_leaf(x) 0 > +#define pud_leaf(x) false > #endif > #ifndef pmd_leaf > -#define pmd_leaf(x) 0 > +#define pmd_leaf(x) false > #endif > > #ifndef pgd_leaf_size > -- > 2.44.0 > > -- Sincerely yours, Mike.