From nobody Wed Dec 17 19:04:02 2025 Received: from out30-118.freemail.mail.aliyun.com (out30-118.freemail.mail.aliyun.com [115.124.30.118]) (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 7EE481420B3 for ; Mon, 6 May 2024 08:46:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.118 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714985218; cv=none; b=Un3dO/7QDakM0duKamt2b+MxKHbdUgsFfY4MRa1po96s0nlfQfpJU8mvbGY96MmPORbd9pFpqmGxBpJa6eh6s8zsA2T5GX9N3giW7OQjHCEOshJzR5F/TqhODNB9pW85AF/vtgXgI1hymWlKaRNsss1zC6gW1wOcwLBniCiUMRE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714985218; c=relaxed/simple; bh=mEf7qdKiwDYet1xOpUaPAS7unGOxruNdMBxPsPtjsEk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qzK5Iwz4qgNVXFZYpCkUo4dDJDXEKsVO+io/ipQtNlU+p41tka4YGa/QKHMMeU42THK/EJe+jmpTWH50y+kUIGDbk0AI8Fzg54eR7KDoTUJfELKCw+izO4C7kepVGKjuu7rPJRyXlOYiKZJEyDsns9SvHLqZOcGpWAvNiP6xAGI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=hTI8TkZN; arc=none smtp.client-ip=115.124.30.118 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="hTI8TkZN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1714985214; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=JwVqRNDg6ovq+W40+OWE62ViZ4KVyR46bNtfHFl1yVM=; b=hTI8TkZNM6lKGKawrV3DkYoFzOJc8c7v2EIZKKcMaJgQQg4Y1cgdQ68VHEVw0FFjLZ16/ZJ7v1iS63EOLnpgFzcBb3WVjEkoiGniXL4Pbm+M40L2xpKtj7DcJXZB025Z7rlvmTy63nmifCH/jgoKJldV/fyyc87p/SZzTKil4/E= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045046011;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0W5wQICo_1714985212; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W5wQICo_1714985212) by smtp.aliyun-inc.com; Mon, 06 May 2024 16:46:53 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] mm: shmem: add mTHP size alignment in shmem_get_unmapped_area Date: Mon, 6 May 2024 16:46:31 +0800 Message-Id: <6e7528bd80309e887427a6bade4b1233a92214d0.1714978902.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Although the top-level hugepage allocation can be turned off, anonymous shm= em can still use mTHP by configuring the sysfs interface located at '/sys/kernel/mm/transparent_hugepage/hugepage-XXkb/shmem_enabled'. Therefor= e, add alignment for mTHP size to provide a suitable alignment address in shmem_get_unmapped_area(). Signed-off-by: Baolin Wang --- mm/shmem.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 08ccea5170a1..27107afdff9e 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2404,6 +2404,7 @@ unsigned long shmem_get_unmapped_area(struct file *fi= le, unsigned long inflated_len; unsigned long inflated_addr; unsigned long inflated_offset; + unsigned long hpage_size =3D HPAGE_PMD_SIZE; =20 if (len > TASK_SIZE) return -ENOMEM; @@ -2422,8 +2423,6 @@ unsigned long shmem_get_unmapped_area(struct file *fi= le, =20 if (shmem_huge =3D=3D SHMEM_HUGE_DENY) return addr; - if (len < HPAGE_PMD_SIZE) - return addr; if (flags & MAP_FIXED) return addr; /* @@ -2437,6 +2436,8 @@ unsigned long shmem_get_unmapped_area(struct file *fi= le, =20 if (shmem_huge !=3D SHMEM_HUGE_FORCE) { struct super_block *sb; + unsigned long __maybe_unused hpage_orders; + int order =3D 0; =20 if (file) { VM_BUG_ON(file->f_op !=3D &shmem_file_operations); @@ -2449,18 +2450,34 @@ unsigned long shmem_get_unmapped_area(struct file *= file, if (IS_ERR(shm_mnt)) return addr; sb =3D shm_mnt->mnt_sb; + + /* + * Find the highest mTHP order used for anonymous shmem to + * provide a suitable alignment address. + */ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + hpage_orders =3D READ_ONCE(huge_anon_shmem_orders_always); + hpage_orders |=3D READ_ONCE(huge_anon_shmem_orders_within_size); + hpage_orders |=3D READ_ONCE(huge_anon_shmem_orders_madvise); + hpage_orders |=3D READ_ONCE(huge_anon_shmem_orders_inherit); + order =3D highest_order(hpage_orders); + hpage_size =3D PAGE_SIZE << order; +#endif } - if (SHMEM_SB(sb)->huge =3D=3D SHMEM_HUGE_NEVER) + if (SHMEM_SB(sb)->huge =3D=3D SHMEM_HUGE_NEVER && !order) return addr; } =20 - offset =3D (pgoff << PAGE_SHIFT) & (HPAGE_PMD_SIZE-1); - if (offset && offset + len < 2 * HPAGE_PMD_SIZE) + if (len < hpage_size) + return addr; + + offset =3D (pgoff << PAGE_SHIFT) & (hpage_size - 1); + if (offset && offset + len < 2 * hpage_size) return addr; - if ((addr & (HPAGE_PMD_SIZE-1)) =3D=3D offset) + if ((addr & (hpage_size - 1)) =3D=3D offset) return addr; =20 - inflated_len =3D len + HPAGE_PMD_SIZE - PAGE_SIZE; + inflated_len =3D len + hpage_size - PAGE_SIZE; if (inflated_len > TASK_SIZE) return addr; if (inflated_len < len) @@ -2473,10 +2490,10 @@ unsigned long shmem_get_unmapped_area(struct file *= file, if (inflated_addr & ~PAGE_MASK) return addr; =20 - inflated_offset =3D inflated_addr & (HPAGE_PMD_SIZE-1); + inflated_offset =3D inflated_addr & (hpage_size - 1); inflated_addr +=3D offset - inflated_offset; if (inflated_offset > offset) - inflated_addr +=3D HPAGE_PMD_SIZE; + inflated_addr +=3D hpage_size; =20 if (inflated_addr > TASK_SIZE - len) return addr; --=20 2.39.3