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 D80B5CFD34D for ; Fri, 11 Oct 2024 11:21:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 663C06B00B7; Fri, 11 Oct 2024 07:21:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6142E6B00B8; Fri, 11 Oct 2024 07:21:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4DC2F6B00B9; Fri, 11 Oct 2024 07:21:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 29B116B00B7 for ; Fri, 11 Oct 2024 07:21:40 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 14D28AC7D7 for ; Fri, 11 Oct 2024 11:21:31 +0000 (UTC) X-FDA: 82661081076.16.BE3B209 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf18.hostedemail.com (Postfix) with ESMTP id D2A091C000A for ; Fri, 11 Oct 2024 11:21:36 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728645653; a=rsa-sha256; cv=none; b=I+t8r5rOjxPjPcbYlrhCShebg5+3EzOMRil2sDEI7JDCcUlLPNun8ziyakANw2dA59V+8U nSTcgeibYnTov1dLtFA8/OlEx92z6+E/YlK7Dp0+ln8wXlm+61bDvEA6jG6IN0QQn9hnPf F+7+RLaRV/1V+3GLHMGiauaMneitoN0= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728645653; 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; bh=bgq2g/aATkYKfhRFs1QqAQq8eVUnfnoiyqRevjLZSGg=; b=lXhsB2UThgLkdn7IUhr8e5AY4ZgYtOVDxFzyXkKcGa8i9r8mcUtDedPwPu4nMX8EPpZPL3 xUam/my9d4aGvgQLEEHORL44/LCx7xy4VkduwmW8MU7oZsOVAinkhBmCHff1Y8E7ZKqol+ QryKcYfOSYl4pLdZrhBW1bpy5BoxSwE= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1E1AF497; Fri, 11 Oct 2024 04:22:06 -0700 (PDT) Received: from [10.57.85.162] (unknown [10.57.85.162]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A2EE63F73F; Fri, 11 Oct 2024 04:21:34 -0700 (PDT) Message-ID: <262aa3c4-fdcc-4971-bbbb-024b9086d6c3@arm.com> Date: Fri, 11 Oct 2024 12:21:32 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 1/2] mm: huge_memory: add vma_thp_disabled() and thp_disabled_by_hw() To: David Hildenbrand , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, kvm@vger.kernel.org, Andrew Morton , Hugh Dickins , Thomas Huth , "Matthew Wilcox (Oracle)" , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Kefeng Wang References: <20241011102445.934409-1-david@redhat.com> <20241011102445.934409-2-david@redhat.com> Content-Language: en-GB From: Ryan Roberts In-Reply-To: <20241011102445.934409-2-david@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: D2A091C000A X-Rspamd-Server: rspam01 X-Stat-Signature: 6barpiaxkbceq8eij4y8y6smo65qczrc X-HE-Tag: 1728645696-605575 X-HE-Meta: U2FsdGVkX1+wwbdmpScH/PPJryvTczy8U5giOoc5kyBJYZY4WwwtRAuoYDNTOY75eXwZkbOqs76LX94/0xwIE3HNWAsNy2K2uUrsG01EPJi1rlplEepLV9JKsnuWdyTHT5ld95BMs+Fk2S6R/TlHOA/q2BebQkmN2YqwON6Xd6Jggzqb8VFPT3xkstdWbQ2uAYRIT+A+L14PqqtTJnXAyPxHSEMtxZmeChU0xNhbGLn2IMPygqnZCkGioCsNoPFqpE01f4QOH3h7sisWh/Ny04rJ8RU1Z9FWXqUHvTpICOZGTeO7VoZ6rVmGUd/FsS3Qr+RYxec21CzZF4Am8wbd38orDfQVZQhCtavU/pKL97UU1tDdWbpFvrxxTtlmLMLR5JpoFOxZwTe/y91LKBcHFPAv6HVdtC7bGIxtiTiuTLJueVc7ubv7RqHVLTjG0EapFpNU/k6+8GFunRYfi9n37iyui595V8E2Ich2RJ6f5ij0N9G3YdHWIDN5x9GOVCDBJ4Bvz7a9oqhmppjTX0g6AXTxjT6TurYu9jO1H0/XAWDwYnCWJUnGkKl+O4I1Xj8/A3Yuf09PWkn4koVgsLusFP9GIH+QlYNMAv22feKvnN8i/VS9h5tJCP91djB7E/r9a22kwqbVw4+r5NLJSCPKWeG2EdFLsI03lyqaoDcZFPmE5/86PSDFoa205nDhVue0lmiV+zyovdPiZ90H8ycZiH1UrHFs/RVU0Ig2tEUgjEGwRIqDVX4lLsy+2B5hUXXfevRwQHyanBaUYt2VOz5jQtmNmoeeVdr88BVx4NzflQNVoC1qG/QTkTyDxhX1QsDKk4fV1eu5TpLMpn+Lp/FdJe8Nk5eyaNtwGlYs/L71uWfBl/X4MsrLTKBDqkNu7fn8nYbNQ8th6SbP6DXL3EJZBGMaLHZ9IgBF2Fc9LuzVW2RoebcWj11Jo9Ox/QNQfwTwfLJvDloEsvEhS4uCV51 c+mNwBHy HpS2Rcalb9oRbZwl56/hPFv5YPVMh4ZgFYjabqte5IzDBiZhSDZ930oTjO6G2bjLBzStB+ZbCoJgIlUZfTnpE8TixUy886ipbNWiW5kyey3tQRquV4R3jkJGEFSkT3LJWMyNvhDKSCvzQDrB8d8BSuTRhWcGWGbMWSXg07eRtHE3DWY2/yHF0ubCyBCIRDRW467zeFC6WhAnVp9Eop9X158ibG+DlFsSxu4pJDSl/GsrX55Oc1lI1rXkF2qfEbAOWpo5xavtrjC9QR4abrYabhmv2A3AXOjokx0gAIoveb9PrCFk= 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 11/10/2024 11:24, David Hildenbrand wrote: > From: Kefeng Wang > > Add vma_thp_disabled() and thp_disabled_by_hw() helpers to be shared by > shmem_allowable_huge_orders() and __thp_vma_allowable_orders(). > > Signed-off-by: Kefeng Wang > [ rename to vma_thp_disabled(), split out thp_disabled_by_hw() ] > Signed-off-by: David Hildenbrand Looks like a nice tidy up on its own: Reviewed-by: Ryan Roberts > --- > include/linux/huge_mm.h | 18 ++++++++++++++++++ > mm/huge_memory.c | 13 +------------ > mm/shmem.c | 7 +------ > 3 files changed, 20 insertions(+), 18 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index 67d0ab3c3bba..ef5b80e48599 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -322,6 +322,24 @@ struct thpsize { > (transparent_hugepage_flags & \ > (1< > +static inline bool vma_thp_disabled(struct vm_area_struct *vma, > + unsigned long vm_flags) > +{ > + /* > + * Explicitly disabled through madvise or prctl, or some > + * architectures may disable THP for some mappings, for > + * example, s390 kvm. > + */ > + return (vm_flags & VM_NOHUGEPAGE) || > + test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags); > +} > + > +static inline bool thp_disabled_by_hw(void) > +{ > + /* If the hardware/firmware marked hugepage support disabled. */ > + return transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED); > +} > + > unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr, > unsigned long len, unsigned long pgoff, unsigned long flags); > unsigned long thp_get_unmapped_area_vmflags(struct file *filp, unsigned long addr, > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 87b49ecc7b1e..2fb328880b50 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -109,18 +109,7 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, > if (!vma->vm_mm) /* vdso */ > return 0; > > - /* > - * Explicitly disabled through madvise or prctl, or some > - * architectures may disable THP for some mappings, for > - * example, s390 kvm. > - * */ > - if ((vm_flags & VM_NOHUGEPAGE) || > - test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) > - return 0; > - /* > - * If the hardware/firmware marked hugepage support disabled. > - */ > - if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED)) > + if (thp_disabled_by_hw() || vma_thp_disabled(vma, vm_flags)) > return 0; > > /* khugepaged doesn't collapse DAX vma, but page fault is fine. */ > diff --git a/mm/shmem.c b/mm/shmem.c > index 4f11b5506363..c5adb987b23c 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1664,12 +1664,7 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, > loff_t i_size; > int order; > > - if (vma && ((vm_flags & VM_NOHUGEPAGE) || > - test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags))) > - return 0; > - > - /* If the hardware/firmware marked hugepage support disabled. */ > - if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED)) > + if (thp_disabled_by_hw() || (vma && vma_thp_disabled(vma, vm_flags))) > return 0; > > global_huge = shmem_huge_global_enabled(inode, index, write_end,