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 81B9FC5475B for ; Wed, 6 Mar 2024 06:16:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D94746B0075; Wed, 6 Mar 2024 01:16:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D44546B007D; Wed, 6 Mar 2024 01:16:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C32AD6B007E; Wed, 6 Mar 2024 01:16:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B24896B0075 for ; Wed, 6 Mar 2024 01:16:54 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 57F1440ABA for ; Wed, 6 Mar 2024 06:16:54 +0000 (UTC) X-FDA: 81865605948.02.5E5B2A7 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf30.hostedemail.com (Postfix) with ESMTP id 3F3B780010 for ; Wed, 6 Mar 2024 06:16:50 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=MvZkxAzs; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf30.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=1709705812; 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=BLmBmSr18A8Q2gZWKHjIhrqgKSxSvQ8/zQ/NA8q+Fu8=; b=oZseoCM5KictcuTKvPNFRrEhCq2imx00B/jfetLYgWBS+wAVufYQF/AobFnqbFDRXRSSC7 Xj9TuNjs/abDjV77g9289YIQaoUvINDLbrGnx+S3ifrperRl1e4SImnqX27iE6vjEO27yj s0KV15lbGsgqtc3hZKi0xIvtzJVIxa8= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=MvZkxAzs; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf30.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=1709705812; a=rsa-sha256; cv=none; b=S7+62L/TfRZ6NJ/KV/FVJrk24K6+sX7wyyIXtfwnFuwErCTQDhuDnwamA2q1WQ3XNbh6qo ycHDjZpL+fBpNcGaGEKR9OuPqiMH0qz66drjet97K7BLkNi1g+G8Hst/+0vbSylVqCfRCV 7hdRTcYh4Nb9+wOV2OlVCEG8wZGHXJ4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 73C82CE20B2; Wed, 6 Mar 2024 06:16:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F608C433C7; Wed, 6 Mar 2024 06:16:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709705806; bh=IB3GfOzNUfXIFpeJe83ampj3Bt5+cvL3ZIZkQ8chnV8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=MvZkxAzsCLc/0ZLBdD7AJr1R8IXx+NjawjJcePutExZPCOi0qLI0u6XEPirHngsWw 6jkkHtLd9ocCleDtOhmO+Usd8PQWEmDAsy7EpBC2MDFlT8iFzlvxnwCqFWtGW8sE11 PoGZMscM6T2m04L+rU3wgOg4vayMgd5e7LD9vkZhlhiO7IsQMzk854f9WmF6Ww0pgr o6h9EbhB5nmpC6VW4bxaVLxbeCt8MMiwlEremthZOjx+gAbAgyIrFr/9rQyDX9ctor POTbTZi/F+PwOinsAGphF0K50OMAjX+J00tS6AaCwPs+mPY/Uho2xKDcvIHthehBL2 Ywr6Rprr3pl2w== Date: Wed, 6 Mar 2024 08:15:53 +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 , Michael Ellerman , Nicholas Piggin , "Aneesh Kumar K.V" , "Naveen N. Rao" Subject: Re: [PATCH v3 01/10] mm/ppc: Define pXd_large() with pXd_leaf() Message-ID: References: <20240305043750.93762-1-peterx@redhat.com> <20240305043750.93762-2-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240305043750.93762-2-peterx@redhat.com> X-Rspamd-Queue-Id: 3F3B780010 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 147aq43oyx5ws578hpbo5eh868rawbzk X-HE-Tag: 1709705810-692089 X-HE-Meta: U2FsdGVkX19SHu8MV7EZXquc4vTyU/J2W1GkRbjz684ceooVV4RD5FXXK0EXKIeab2s4ZBLSoZQMTgI5g5EeqRlsP1tCDfFsWhtKGrKyq6T0DIO7nOjjb+L5tuQ04WW7+gT/yYnqT3vrqaKdti+umtFr36UiEH+03BAdK/FaBIXoWbj7ZVz2vD/pjobu2rj9zlN4Ey9xhcHWjgKy9ssXGDZ+M6jJ18YC8byfEo5rxgTbCR5iufhItZWil30Op5AAbljXctYKslD7/XO2ds+jVkf4yQY7ca7JlAKV4QSSE9fn4FLtfzUT6k0POiOBBlCXXclg8bqN7Y9IolzXXdfCjdQI7CTaTobzMPkrQolW3XVB6RntHsxfH0E4RZ1XbMleP01c4E0sK1PaEGRgLteQLEC64sXoQ8nqfOjTsSZtDj3KdvDwbL85U4fsxAfBCZ2dIhrynvDrKcotMy6Uoq8MF+Flj8chX1tXokOwPJvhJaB4Ri1/t/D9bpuXMD5GJV6RJYmScv+yMrrCjAb5fUtVW9r+TqeC1sEXYjpdwoNIl9mp87JmDetbBYLTfBMKCXMiED4JW8fTG98FSbVcnsBQicF+QXFTyGg1dsHTBv3CNq5/j8bfXLp5MHthCT9gQ1ncis+mRs1zUL7/8kmlspwjxs6jC5e3xRM5k58zBOM9sqOckjkOxOUWBEV9KYPecjc40NLl4dpRQ+3XHUhzUw8nq3quMf5T342Yajv0ieK+aPuGL4Q1FjL28s6jEYql+HA1vfxdZkoq8dTsSdeDJw+mi590aSKuhrAPuN/hPyuv+6yw3rwJs97W3WFsbXj3BR+srVtgs54v170NOEjx7qkm0T4bC+b/tz7hLY6SrA61ZPe2i5QC5R7seqjkwU6+/AE6SbMwahGI/Ik0HzbzdCZ6l8Q0acQNZ5olSmr6BN1RMVSifnjgwWP81Q== 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:41PM +0800, peterx@redhat.com wrote: > From: Peter Xu > > The two definitions are the same. The only difference is that pXd_large() > is only defined with THP selected, and only on book3s 64bits. > > Instead of implementing it twice, make pXd_large() a macro to pXd_leaf(). > Define it unconditionally just like pXd_leaf(). This helps to prepare > merging the two APIs. > > Cc: Michael Ellerman > Cc: Nicholas Piggin > Cc: Christophe Leroy > Cc: "Aneesh Kumar K.V" > Cc: "Naveen N. Rao" > Cc: linuxppc-dev@lists.ozlabs.org > Reviewed-by: Jason Gunthorpe > Signed-off-by: Peter Xu Reviewed-by: Mike Rapoport (IBM) > --- > arch/powerpc/include/asm/book3s/64/pgtable.h | 16 ++-------------- > arch/powerpc/include/asm/pgtable.h | 2 +- > 2 files changed, 3 insertions(+), 15 deletions(-) > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h > index 927d585652bc..d1318e8582ac 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h > @@ -1157,20 +1157,6 @@ pud_hugepage_update(struct mm_struct *mm, unsigned long addr, pud_t *pudp, > return pud_val(*pudp); > } > > -/* > - * returns true for pmd migration entries, THP, devmap, hugetlb > - * But compile time dependent on THP config > - */ > -static inline int pmd_large(pmd_t pmd) > -{ > - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > -} > - > -static inline int pud_large(pud_t pud) > -{ > - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > -} > - > /* > * For radix we should always find H_PAGE_HASHPTE zero. Hence > * the below will work for radix too > @@ -1455,6 +1441,7 @@ static inline bool is_pte_rw_upgrade(unsigned long old_val, unsigned long new_va > */ > #define pmd_is_leaf pmd_is_leaf > #define pmd_leaf pmd_is_leaf > +#define pmd_large pmd_leaf > static inline bool pmd_is_leaf(pmd_t pmd) > { > return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > @@ -1462,6 +1449,7 @@ static inline bool pmd_is_leaf(pmd_t pmd) > > #define pud_is_leaf pud_is_leaf > #define pud_leaf pud_is_leaf > +#define pud_large pud_leaf > static inline bool pud_is_leaf(pud_t pud) > { > return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h > index 7a1ba8889aea..5928b3c1458d 100644 > --- a/arch/powerpc/include/asm/pgtable.h > +++ b/arch/powerpc/include/asm/pgtable.h > @@ -101,7 +101,7 @@ void poking_init(void); > extern unsigned long ioremap_bot; > extern const pgprot_t protection_map[16]; > > -#ifndef CONFIG_TRANSPARENT_HUGEPAGE > +#ifndef pmd_large > #define pmd_large(pmd) 0 > #endif > > -- > 2.44.0 > > -- Sincerely yours, Mike.