From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 486971758E for ; Tue, 2 Jul 2024 03:31:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719891087; cv=none; b=h+fVnwJ5xeDzKS+rjbtDOwEEgtx0Kkic2YeGwbpFTqj8Y/8dFaSlPNVELOW7o6n9CyroQ9f3HEp7eDVGKsumQ6T5Y3AkKkxMj3lPQSRk/tVyZX+qujfpIYfp3oM5Jy5poohmV6/8Ybi9E1Kpe4nEh+Oxk2eDKQDQbUPJS73Sy58= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719891087; c=relaxed/simple; bh=sNMo0XkczJs9LypSYIZE9vBSOzQ9rqvacwWyW/E/F7o=; h=Date:To:From:Subject:Message-Id; b=Q+fcBY5uELM00NAuRmz0cC7MaSU7sYo6V+nzkgpSxz6WwmJ+2b8SZP1HHOSB7QupL+OHxVZG3R3an0cvUAVm32iInYL39J4uBlu1bqq+aNfSsHRXRGtpg0Bd8L3zYAHTsq0RejJw1BaYpp5C3uxDvEHqZWTVkqgGt3JLcjrIv5A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=g9aK8v4+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="g9aK8v4+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD8CEC116B1; Tue, 2 Jul 2024 03:31:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1719891086; bh=sNMo0XkczJs9LypSYIZE9vBSOzQ9rqvacwWyW/E/F7o=; h=Date:To:From:Subject:From; b=g9aK8v4+GZVU2P6M383qO3rSc5Aq9dqcl4V3xOclh2OM5q4WunyEKM4YtAKFlLJBZ p91x6Hj+zd3pb/+GJ2o9XVswIj7KcaI2iKfhUJ/C9iH3hpCs7H+WiHBVz+9exy1VDY /TYs+dlZ3O9EggH+fq5g0z5J+lyMv6mWTChf9QJ0= Date: Mon, 01 Jul 2024 20:31:26 -0700 To: mm-commits@vger.kernel.org,ziy@nvidia.com,wangkefeng.wang@huawei.com,ryan.roberts@arm.com,hughd@google.com,david@redhat.com,baolin.wang@linux.alibaba.com,libang.li@antgroup.com,akpm@linux-foundation.org From: Andrew Morton Subject: [obsolete] support-thpeligible-semantics-for-mthp-with-anonymous-shmem.patch removed from -mm tree Message-Id: <20240702033126.CD8CEC116B1@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: smaps: support "THPeligible" semantics for mTHP with anonymous shmem has been removed from the -mm tree. Its filename was support-thpeligible-semantics-for-mthp-with-anonymous-shmem.patch This patch was dropped because it is obsolete ------------------------------------------------------ From: "Bang Li" Subject: smaps: support "THPeligible" semantics for mTHP with anonymous shmem Date: Fri, 28 Jun 2024 18:49:26 +0800 After the commit 7fb1b252afb5 ("mm: shmem: add mTHP support for anonymous shmem"), we can configure different policies through the multi-size THP sysfs interface for anonymous shmem. But currently "THPeligible" indicates only whether the mapping is eligible for allocating THP-pages as well as the THP is PMD mappable or not for anonymous shmem, we need to support semantics for mTHP with anonymous shmem similar to those for mTHP with anonymous memory. Link: https://lkml.kernel.org/r/20240628104926.34209-1-libang.li@antgroup.com Signed-off-by: Bang Li Cc: Baolin Wang Cc: David Hildenbrand Cc: Hugh Dickins Cc: Kefeng Wang Cc: Ryan Roberts Cc: Zi Yan Signed-off-by: Andrew Morton --- fs/proc/task_mmu.c | 10 +++++++--- include/linux/huge_mm.h | 11 +++++++++++ mm/shmem.c | 9 +-------- 3 files changed, 19 insertions(+), 11 deletions(-) --- a/fs/proc/task_mmu.c~support-thpeligible-semantics-for-mthp-with-anonymous-shmem +++ a/fs/proc/task_mmu.c @@ -1145,6 +1145,7 @@ static int show_smap(struct seq_file *m, { struct vm_area_struct *vma = v; struct mem_size_stats mss = {}; + bool thp_eligible; smap_gather_stats(vma, &mss, 0); @@ -1157,9 +1158,12 @@ static int show_smap(struct seq_file *m, __show_smap(m, &mss, false); - seq_printf(m, "THPeligible: %8u\n", - !!thp_vma_allowable_orders(vma, vma->vm_flags, - TVA_SMAPS | TVA_ENFORCE_SYSFS, THP_ORDERS_ALL)); + thp_eligible = !!thp_vma_allowable_orders(vma, vma->vm_flags, + TVA_SMAPS | TVA_ENFORCE_SYSFS, THP_ORDERS_ALL); + if (vma_is_anon_shmem(vma)) + thp_eligible = !!shmem_allowable_huge_orders(file_inode(vma->vm_file), + vma, vma->vm_pgoff, thp_eligible); + seq_printf(m, "THPeligible: %8u\n", thp_eligible); if (arch_pkeys_enabled()) seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma)); --- a/include/linux/huge_mm.h~support-thpeligible-semantics-for-mthp-with-anonymous-shmem +++ a/include/linux/huge_mm.h @@ -267,6 +267,10 @@ unsigned long thp_vma_allowable_orders(s return __thp_vma_allowable_orders(vma, vm_flags, tva_flags, orders); } +unsigned long shmem_allowable_huge_orders(struct inode *inode, + struct vm_area_struct *vma, pgoff_t index, + bool global_huge); + struct thpsize { struct kobject kobj; struct list_head node; @@ -462,6 +466,13 @@ static inline unsigned long thp_vma_allo { return 0; } + +static inline unsigned long shmem_allowable_huge_orders(struct inode *inode, + struct vm_area_struct *vma, pgoff_t index, + bool global_huge) +{ + return 0; +} #define transparent_hugepage_flags 0UL --- a/mm/shmem.c~support-thpeligible-semantics-for-mthp-with-anonymous-shmem +++ a/mm/shmem.c @@ -1622,7 +1622,7 @@ static gfp_t limit_gfp_mask(gfp_t huge_g } #ifdef CONFIG_TRANSPARENT_HUGEPAGE -static unsigned long shmem_allowable_huge_orders(struct inode *inode, +unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, bool global_huge) { @@ -1707,13 +1707,6 @@ static unsigned long shmem_suitable_orde return orders; } #else -static unsigned long shmem_allowable_huge_orders(struct inode *inode, - struct vm_area_struct *vma, pgoff_t index, - bool global_huge) -{ - return 0; -} - static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault *vmf, struct address_space *mapping, pgoff_t index, unsigned long orders) _ Patches currently in -mm which might be from libang.li@antgroup.com are mm-shmem-fix-input-and-output-inconsistencies.patch