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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 44F59C47DD9 for ; Fri, 22 Mar 2024 17:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PrnkoGVHC2lcw1DP2H8Hh0vcB4nlnfhMlC/fqULTtEM=; b=o3q1hrUC55ZCqh KugUUDPTLjXrUxGGlJQJeZvQaEqM/SS4Y2H0c5nAyMUhsp9Anqk1atWRdtAxdLpSlJIevCJ787IH2 lkOLO3OJAfXDYDQV5/JwZ32J1uAh/ET+yXApulhVFbADQmWuK1E7XnpoURNDQi5v7kTZ1sGRBJl0t wpyIK3qnHvQctwwh8TOqOxQzNLX+vfn3u06Sya6dGi3PCQlobCqjLJFlpk4TTZcvkU341sJ6TffoX j7Ts+aZi+9ujE9rqpOt8IH5IBSNyvtJyWpwYjYkWSdRuQomf8/4ydW+wqjxSakU/kXLZHVEeyT5L/ Z/jF4PzK6pT4Dvd3Av9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rniTz-0000000887R-3Vqw; Fri, 22 Mar 2024 17:15:07 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rniTu-0000000884q-46Zy; Fri, 22 Mar 2024 17:15:04 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id B25E0CE0C47; Fri, 22 Mar 2024 17:15:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BE9BC433F1; Fri, 22 Mar 2024 17:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711127699; bh=C8GD9fG22TLIZK0yuUnEPTKbqHoBiCuXP/x09X9W/Os=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cp+0MqbN/avd7Y97uUQSY5e3e9KLVDxkhGPn+yWRI0D04F60iun6Ic766AOtiq+Md hbLUwftVGSSMtsA0ZZKPudwZqFCd+lo0SsIZJB1oXC/WFV4GXZB8YLu5zC2yPiOhjr 5BMLpXMMG1ZsWtHf0qcbGDiiKeFIJqzhIDyOUzJVdE/6IImQGRiyzKh9HaM766Mex1 s+nFrDQl3Y7IMmiSt07qyqGMJr3O/WR4llweHd32XwKcWLG0J7BQM/mZ/iBnSlmSeA p28TSop2p+oI1SaFWDwF3ryu/RLJndxMfx3mRvQNCX5A2N3t/GOQPwJibZJp9E2p5n mg6iv/YIR0f1w== From: SeongJae Park To: peterx@redhat.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Christophe Leroy , Matthew Wilcox , Rik van Riel , Lorenzo Stoakes , Axel Rasmussen , Yang Shi , John Hubbard , linux-arm-kernel@lists.infradead.org, "Kirill A . Shutemov" , Andrew Jones , Vlastimil Babka , Mike Rapoport , Andrew Morton , Muchun Song , Christoph Hellwig , linux-riscv@lists.infradead.org, James Houghton , David Hildenbrand , Jason Gunthorpe , Andrea Arcangeli , "Aneesh Kumar K . V" , Mike Kravetz Subject: Re: [PATCH v3 03/12] mm: Make HPAGE_PXD_* macros even if !THP Date: Fri, 22 Mar 2024 10:14:56 -0700 Message-Id: <20240322171456.118997-1-sj@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240321220802.679544-4-peterx@redhat.com> References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240322_101503_413946_A73C802C X-CRM114-Status: GOOD ( 19.54 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Hi Peter, On Thu, 21 Mar 2024 18:07:53 -0400 peterx@redhat.com wrote: > From: Peter Xu > > These macros can be helpful when we plan to merge hugetlb code into generic > code. Move them out and define them even if !THP. > > We actually already defined HPAGE_PMD_NR for other reasons even if !THP. > Reorganize these macros. > > Reviewed-by: Christoph Hellwig > Reviewed-by: Jason Gunthorpe > Signed-off-by: Peter Xu > --- > include/linux/huge_mm.h | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index de0c89105076..3bcdfc7e5d57 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -64,9 +64,6 @@ ssize_t single_hugepage_flag_show(struct kobject *kobj, > enum transparent_hugepage_flag flag); > extern struct kobj_attribute shmem_enabled_attr; > > -#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > -#define HPAGE_PMD_NR (1< - > /* > * Mask of all large folio orders supported for anonymous THP; all orders up to > * and including PMD_ORDER, except order-0 (which is not "huge") and order-1 > @@ -87,14 +84,19 @@ extern struct kobj_attribute shmem_enabled_attr; > #define thp_vma_allowable_order(vma, vm_flags, smaps, in_pf, enforce_sysfs, order) \ > (!!thp_vma_allowable_orders(vma, vm_flags, smaps, in_pf, enforce_sysfs, BIT(order))) > > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > #define HPAGE_PMD_SHIFT PMD_SHIFT > #define HPAGE_PMD_SIZE ((1UL) << HPAGE_PMD_SHIFT) > #define HPAGE_PMD_MASK (~(HPAGE_PMD_SIZE - 1)) > +#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > +#define HPAGE_PMD_NR (1< > #define HPAGE_PUD_SHIFT PUD_SHIFT > #define HPAGE_PUD_SIZE ((1UL) << HPAGE_PUD_SHIFT) > #define HPAGE_PUD_MASK (~(HPAGE_PUD_SIZE - 1)) > +#define HPAGE_PUD_ORDER (HPAGE_PUD_SHIFT-PAGE_SHIFT) > +#define HPAGE_PUD_NR (1< X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5B197C54E71 for ; Fri, 22 Mar 2024 17:15:53 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=Cp+0MqbN; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4V1TVv706Jz3vfP for ; Sat, 23 Mar 2024 04:15:51 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=Cp+0MqbN; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=145.40.73.55; helo=sin.source.kernel.org; envelope-from=sj@kernel.org; receiver=lists.ozlabs.org) Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4V1TTz6KbQz3dWk for ; Sat, 23 Mar 2024 04:15:03 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id B25E0CE0C47; Fri, 22 Mar 2024 17:15:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BE9BC433F1; Fri, 22 Mar 2024 17:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711127699; bh=C8GD9fG22TLIZK0yuUnEPTKbqHoBiCuXP/x09X9W/Os=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cp+0MqbN/avd7Y97uUQSY5e3e9KLVDxkhGPn+yWRI0D04F60iun6Ic766AOtiq+Md hbLUwftVGSSMtsA0ZZKPudwZqFCd+lo0SsIZJB1oXC/WFV4GXZB8YLu5zC2yPiOhjr 5BMLpXMMG1ZsWtHf0qcbGDiiKeFIJqzhIDyOUzJVdE/6IImQGRiyzKh9HaM766Mex1 s+nFrDQl3Y7IMmiSt07qyqGMJr3O/WR4llweHd32XwKcWLG0J7BQM/mZ/iBnSlmSeA p28TSop2p+oI1SaFWDwF3ryu/RLJndxMfx3mRvQNCX5A2N3t/GOQPwJibZJp9E2p5n mg6iv/YIR0f1w== From: SeongJae Park To: peterx@redhat.com Subject: Re: [PATCH v3 03/12] mm: Make HPAGE_PXD_* macros even if !THP Date: Fri, 22 Mar 2024 10:14:56 -0700 Message-Id: <20240322171456.118997-1-sj@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240321220802.679544-4-peterx@redhat.com> References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Houghton , David Hildenbrand , Yang Shi , Andrew Jones , linux-mm@kvack.org, linux-riscv@lists.infradead.org, Andrea Arcangeli , "Aneesh Kumar K . V" , Matthew Wilcox , Christoph Hellwig , linux-arm-kernel@lists.infradead.org, Jason Gunthorpe , Axel Rasmussen , Rik van Riel , John Hubbard , "Kirill A . Shutemov" , Vlastimil Babka , Lorenzo Stoakes , Muchun Song , linux-kernel@vger.kernel.org, Andrew Morton , linuxppc-dev@lists.ozlabs.org, Mike Rapoport , Mike Kravetz Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi Peter, On Thu, 21 Mar 2024 18:07:53 -0400 peterx@redhat.com wrote: > From: Peter Xu > > These macros can be helpful when we plan to merge hugetlb code into generic > code. Move them out and define them even if !THP. > > We actually already defined HPAGE_PMD_NR for other reasons even if !THP. > Reorganize these macros. > > Reviewed-by: Christoph Hellwig > Reviewed-by: Jason Gunthorpe > Signed-off-by: Peter Xu > --- > include/linux/huge_mm.h | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index de0c89105076..3bcdfc7e5d57 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -64,9 +64,6 @@ ssize_t single_hugepage_flag_show(struct kobject *kobj, > enum transparent_hugepage_flag flag); > extern struct kobj_attribute shmem_enabled_attr; > > -#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > -#define HPAGE_PMD_NR (1< - > /* > * Mask of all large folio orders supported for anonymous THP; all orders up to > * and including PMD_ORDER, except order-0 (which is not "huge") and order-1 > @@ -87,14 +84,19 @@ extern struct kobj_attribute shmem_enabled_attr; > #define thp_vma_allowable_order(vma, vm_flags, smaps, in_pf, enforce_sysfs, order) \ > (!!thp_vma_allowable_orders(vma, vm_flags, smaps, in_pf, enforce_sysfs, BIT(order))) > > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > #define HPAGE_PMD_SHIFT PMD_SHIFT > #define HPAGE_PMD_SIZE ((1UL) << HPAGE_PMD_SHIFT) > #define HPAGE_PMD_MASK (~(HPAGE_PMD_SIZE - 1)) > +#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > +#define HPAGE_PMD_NR (1< > #define HPAGE_PUD_SHIFT PUD_SHIFT > #define HPAGE_PUD_SIZE ((1UL) << HPAGE_PUD_SHIFT) > #define HPAGE_PUD_MASK (~(HPAGE_PUD_SIZE - 1)) > +#define HPAGE_PUD_ORDER (HPAGE_PUD_SHIFT-PAGE_SHIFT) > +#define HPAGE_PUD_NR (1< X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E8978C54E71 for ; Fri, 22 Mar 2024 17:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=K0sNVuTPr7pRawba1YWO+XtjiNEqKQWa3145Wc4qKqo=; b=dGxhFYuoWNB5qr tuvu+WfvdNZODuofj/vjJYNZvv15MKrQOY72B1YefFh2xwCVCfQMqTcnZdfJhQWzHcTJLgO0q9wQg wH5MxPqgCqt21Y2zSK2t4ngZrAZ+YdDqyijJEMJDSwE9WLonnEZQjceYjDVSQiFNm+j8UwUK+gxZ6 cd7MPb2ZBrGwiX/pO4xhuhTNvZZ45EyA3DFK+HGfkRtQNlYjpI1amVZ5Q3pDeh4qusuN1ULGSANU/ QqK441xCxP1eGZqG/61yn1+QBhx2Ekm5hTKCDU33xQoXzCmzFrs+++jegjhXqVcymYK8inknfAthv m8LrGaLaAsKy1xh9zdwg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rniTz-00000008873-0Pxg; Fri, 22 Mar 2024 17:15:07 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rniTu-0000000884q-46Zy; Fri, 22 Mar 2024 17:15:04 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id B25E0CE0C47; Fri, 22 Mar 2024 17:15:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BE9BC433F1; Fri, 22 Mar 2024 17:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711127699; bh=C8GD9fG22TLIZK0yuUnEPTKbqHoBiCuXP/x09X9W/Os=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cp+0MqbN/avd7Y97uUQSY5e3e9KLVDxkhGPn+yWRI0D04F60iun6Ic766AOtiq+Md hbLUwftVGSSMtsA0ZZKPudwZqFCd+lo0SsIZJB1oXC/WFV4GXZB8YLu5zC2yPiOhjr 5BMLpXMMG1ZsWtHf0qcbGDiiKeFIJqzhIDyOUzJVdE/6IImQGRiyzKh9HaM766Mex1 s+nFrDQl3Y7IMmiSt07qyqGMJr3O/WR4llweHd32XwKcWLG0J7BQM/mZ/iBnSlmSeA p28TSop2p+oI1SaFWDwF3ryu/RLJndxMfx3mRvQNCX5A2N3t/GOQPwJibZJp9E2p5n mg6iv/YIR0f1w== From: SeongJae Park To: peterx@redhat.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Christophe Leroy , Matthew Wilcox , Rik van Riel , Lorenzo Stoakes , Axel Rasmussen , Yang Shi , John Hubbard , linux-arm-kernel@lists.infradead.org, "Kirill A . Shutemov" , Andrew Jones , Vlastimil Babka , Mike Rapoport , Andrew Morton , Muchun Song , Christoph Hellwig , linux-riscv@lists.infradead.org, James Houghton , David Hildenbrand , Jason Gunthorpe , Andrea Arcangeli , "Aneesh Kumar K . V" , Mike Kravetz Subject: Re: [PATCH v3 03/12] mm: Make HPAGE_PXD_* macros even if !THP Date: Fri, 22 Mar 2024 10:14:56 -0700 Message-Id: <20240322171456.118997-1-sj@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240321220802.679544-4-peterx@redhat.com> References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240322_101503_413946_A73C802C X-CRM114-Status: GOOD ( 19.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Peter, On Thu, 21 Mar 2024 18:07:53 -0400 peterx@redhat.com wrote: > From: Peter Xu > > These macros can be helpful when we plan to merge hugetlb code into generic > code. Move them out and define them even if !THP. > > We actually already defined HPAGE_PMD_NR for other reasons even if !THP. > Reorganize these macros. > > Reviewed-by: Christoph Hellwig > Reviewed-by: Jason Gunthorpe > Signed-off-by: Peter Xu > --- > include/linux/huge_mm.h | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index de0c89105076..3bcdfc7e5d57 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -64,9 +64,6 @@ ssize_t single_hugepage_flag_show(struct kobject *kobj, > enum transparent_hugepage_flag flag); > extern struct kobj_attribute shmem_enabled_attr; > > -#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > -#define HPAGE_PMD_NR (1< - > /* > * Mask of all large folio orders supported for anonymous THP; all orders up to > * and including PMD_ORDER, except order-0 (which is not "huge") and order-1 > @@ -87,14 +84,19 @@ extern struct kobj_attribute shmem_enabled_attr; > #define thp_vma_allowable_order(vma, vm_flags, smaps, in_pf, enforce_sysfs, order) \ > (!!thp_vma_allowable_orders(vma, vm_flags, smaps, in_pf, enforce_sysfs, BIT(order))) > > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > #define HPAGE_PMD_SHIFT PMD_SHIFT > #define HPAGE_PMD_SIZE ((1UL) << HPAGE_PMD_SHIFT) > #define HPAGE_PMD_MASK (~(HPAGE_PMD_SIZE - 1)) > +#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > +#define HPAGE_PMD_NR (1< > #define HPAGE_PUD_SHIFT PUD_SHIFT > #define HPAGE_PUD_SIZE ((1UL) << HPAGE_PUD_SHIFT) > #define HPAGE_PUD_MASK (~(HPAGE_PUD_SIZE - 1)) > +#define HPAGE_PUD_ORDER (HPAGE_PUD_SHIFT-PAGE_SHIFT) > +#define HPAGE_PUD_NR (1< 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 C4E94C54E71 for ; Fri, 22 Mar 2024 17:15:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 57E076B009C; Fri, 22 Mar 2024 13:15:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 52DAF6B009D; Fri, 22 Mar 2024 13:15:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F5A96B009E; Fri, 22 Mar 2024 13:15:08 -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 2F6386B009C for ; Fri, 22 Mar 2024 13:15:08 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C4ACAC0224 for ; Fri, 22 Mar 2024 17:15:07 +0000 (UTC) X-FDA: 81925325454.20.A35A8F7 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf02.hostedemail.com (Postfix) with ESMTP id 656B68000E for ; Fri, 22 Mar 2024 17:15:04 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Cp+0MqbN; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.hostedemail.com: domain of sj@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711127705; a=rsa-sha256; cv=none; b=SKCsNtLKEoNmR3G+lwFoJOEzo29akkIdSI+dXCLXqfvsNW6SHAaV3VKtRwu6M6Uu7Gs+YO B3Y55nS0WudsSDAgo/ba6u29MRVwIhggX1s3YLac039L1ZQzjUApYxIRXFtgcSuUNGSX20 O34n7D9hv8Y8ChvUTW7xtIWMA/60gYw= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Cp+0MqbN; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.hostedemail.com: domain of sj@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711127705; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UQxTJDkXcHJPogUVvCZqnkUqMP/IBh0RfyWmXzc50i8=; b=1Sx+i7guD+zc3L/UUtMdTfIsOHxCxGrqHpjDcNdt2/sZVrqQlbV3UQfL0g1PtPQEYKGZVA ev1hdh0f6ediipT4xSgRdgf/a8kv76EF/mDPwNoemiDpO2EPfc1RgLhQlOE8lcpV3c0Uuk E75+AO5gBRCvvXP9Os+ei3MeQYLvNks= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id B25E0CE0C47; Fri, 22 Mar 2024 17:15:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BE9BC433F1; Fri, 22 Mar 2024 17:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711127699; bh=C8GD9fG22TLIZK0yuUnEPTKbqHoBiCuXP/x09X9W/Os=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cp+0MqbN/avd7Y97uUQSY5e3e9KLVDxkhGPn+yWRI0D04F60iun6Ic766AOtiq+Md hbLUwftVGSSMtsA0ZZKPudwZqFCd+lo0SsIZJB1oXC/WFV4GXZB8YLu5zC2yPiOhjr 5BMLpXMMG1ZsWtHf0qcbGDiiKeFIJqzhIDyOUzJVdE/6IImQGRiyzKh9HaM766Mex1 s+nFrDQl3Y7IMmiSt07qyqGMJr3O/WR4llweHd32XwKcWLG0J7BQM/mZ/iBnSlmSeA p28TSop2p+oI1SaFWDwF3ryu/RLJndxMfx3mRvQNCX5A2N3t/GOQPwJibZJp9E2p5n mg6iv/YIR0f1w== From: SeongJae Park To: peterx@redhat.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Christophe Leroy , Matthew Wilcox , Rik van Riel , Lorenzo Stoakes , Axel Rasmussen , Yang Shi , John Hubbard , linux-arm-kernel@lists.infradead.org, "Kirill A . Shutemov" , Andrew Jones , Vlastimil Babka , Mike Rapoport , Andrew Morton , Muchun Song , Christoph Hellwig , linux-riscv@lists.infradead.org, James Houghton , David Hildenbrand , Jason Gunthorpe , Andrea Arcangeli , "Aneesh Kumar K . V" , Mike Kravetz Subject: Re: [PATCH v3 03/12] mm: Make HPAGE_PXD_* macros even if !THP Date: Fri, 22 Mar 2024 10:14:56 -0700 Message-Id: <20240322171456.118997-1-sj@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240321220802.679544-4-peterx@redhat.com> References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 656B68000E X-Stat-Signature: gwqnkou6xk5ni4fmf6eju3ch1f7g79ja X-HE-Tag: 1711127704-680536 X-HE-Meta: U2FsdGVkX18y4v9gR4PHDvvWHIvcoYgR9ML3RoLORYKZeIRqIBskLt4rGyfrNE/o3eWOF+E9sKXrt4HvBVl4U7WQ7sP41BEYtlI1SYmH8Rr9vj12dx6fVgf81jyP2HiAcGLJ9jH/H35ZkhxE+RFTYDwRf/oieFRn7gDoYkG3YHu+MQf/S2HYPc8qc4f96dzv4LP5/0qzBehfN7oI2SXSLEjF9jnhO/PqAVsgjOu8Mp5eTJvUnGiscx1An/9H9gdhfw8GWPSGM0FlvXsyoy/SaNMyxmBFfzFo3I7R8/0DUmIEBqoB2+p0WBTHWf1fth7JZ1s6COezv/H4peOsxzgpHHHmD9YBgjappdLxciIG7EtZ9gXkuc5hDSukF47pin4QmTDg1Mhq1XYwOvxI1E0PN4lDqqOf62jXZN4T5RecwKlMArVO1N1o4mUtqqSkejfTnGhppDzQbXEacpvjVXzukrRTwNG6eNgv/AqPbDkAZlLfSWe56HEeZ/vcBI4Mucn/1EV+AJU4iK1opfE6eMWULCJr/xea5jCloTEfehkLyQA6//ogk3d9ifPpQ6Wa2noWTkk0/5Ym5JR+4qn9PB0JMnnqlzAABZUlrbFRbCNIeXRafrR5Y+ImPB5R8u+Zg/BCV7xYpdrAHnjGGrgP+1LFN5jQFjg30Bg5wX0iI4nJcEZGwKpvv/wcNDIaX4Uqy6kM6CFvJCB/Cg5w+bcykMh9Oq6k4ClrPkuFGNCgltqI8mRuG79mQ2HuZ/VKQHuRaWbwk8iktJxYwjffDBORom5kca5sH9DDjcNUhE3Ss78rr5pGlQuRRJ9E9Y6aM5V6ry/q9ld+2kRKmO5Ru24C/sb41yegNO3A+JoVFWGAyxJDbavF6UGt5qv83UI4GMnFDxGiZfbAWJ0ziKvP5pTWzO8dfdMoI8F3Pvr9lj9sDw/DaS4cWlTx9tyYKSxyKkSMEXoKEMLaToKNvudFLsqEIfa 8yB62/62 EYeSAvpqCOOBukV8CV78OyX8ZYgf+WqvT2jmIsYu1qoKGxt5Dg9FGOqo6r7CKpyD+K8+XKKuIozmPa42/664HHpncxn9DRpyb87b3PjSC4eeQQG7qF0b9Yhl973XjyyrOGMoWzt7MiLu1AsfMCMAkzxowpFK6UbGnZUK+V1FwaSOpE/F0nitRmQIGdHUsOAAndPYWPTr0fp6oMoN0UuClmRQM0Vd9cNUx5iRbpQ1FeNvX/bYXy9+X+jOTB5ycx5LnCNjbt/JyryjYF2q688eDJLVxnKWZatDydXEdnyS0g6Msd8hoCFT1GtCOZAQLkgrOro7ijYK/B8Yl3BIuagEq7oh2HqD3pivkFBzK4lWf6qnJ068x7cBHrIvc+crvEm+BEW7DXApgKplenlc= 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: Hi Peter, On Thu, 21 Mar 2024 18:07:53 -0400 peterx@redhat.com wrote: > From: Peter Xu > > These macros can be helpful when we plan to merge hugetlb code into generic > code. Move them out and define them even if !THP. > > We actually already defined HPAGE_PMD_NR for other reasons even if !THP. > Reorganize these macros. > > Reviewed-by: Christoph Hellwig > Reviewed-by: Jason Gunthorpe > Signed-off-by: Peter Xu > --- > include/linux/huge_mm.h | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index de0c89105076..3bcdfc7e5d57 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -64,9 +64,6 @@ ssize_t single_hugepage_flag_show(struct kobject *kobj, > enum transparent_hugepage_flag flag); > extern struct kobj_attribute shmem_enabled_attr; > > -#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > -#define HPAGE_PMD_NR (1< - > /* > * Mask of all large folio orders supported for anonymous THP; all orders up to > * and including PMD_ORDER, except order-0 (which is not "huge") and order-1 > @@ -87,14 +84,19 @@ extern struct kobj_attribute shmem_enabled_attr; > #define thp_vma_allowable_order(vma, vm_flags, smaps, in_pf, enforce_sysfs, order) \ > (!!thp_vma_allowable_orders(vma, vm_flags, smaps, in_pf, enforce_sysfs, BIT(order))) > > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > #define HPAGE_PMD_SHIFT PMD_SHIFT > #define HPAGE_PMD_SIZE ((1UL) << HPAGE_PMD_SHIFT) > #define HPAGE_PMD_MASK (~(HPAGE_PMD_SIZE - 1)) > +#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > +#define HPAGE_PMD_NR (1< > #define HPAGE_PUD_SHIFT PUD_SHIFT > #define HPAGE_PUD_SIZE ((1UL) << HPAGE_PUD_SHIFT) > #define HPAGE_PUD_MASK (~(HPAGE_PUD_SIZE - 1)) > +#define HPAGE_PUD_ORDER (HPAGE_PUD_SHIFT-PAGE_SHIFT) > +#define HPAGE_PUD_NR (1<