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 BC640C25B7E for ; Thu, 30 May 2024 02:04:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A23E96B009F; Wed, 29 May 2024 22:04:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D33D6B00A1; Wed, 29 May 2024 22:04:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8003B6B00A3; Wed, 29 May 2024 22:04:45 -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 5D5F16B009F for ; Wed, 29 May 2024 22:04:45 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 0E9ECA0E70 for ; Thu, 30 May 2024 02:04:45 +0000 (UTC) X-FDA: 82173418530.16.0F94771 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) by imf25.hostedemail.com (Postfix) with ESMTP id DA9BFA000E for ; Thu, 30 May 2024 02:04:42 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=YuHhpIIJ; spf=pass (imf25.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.98 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717034683; 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=OpKbZmXRrURMX+/QsaD7+TkYK79RF0tdTg/q8PuO7h4=; b=mLBztUrVQc3yCbzcIINrHuN+q7AtL2HD9tCK8nqacWQCtfARrzVSYQWwj0a1dJgpTAV0Wp 8nybS9afNWTntFFB72whg+Uj5wuZIU9TIV1MbfJJ9HjVMQCC209sDcfdV+4HRAVxTz6FAg yp6W0EYmOd+7Fktyne2PTBfS78fvyFc= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=YuHhpIIJ; spf=pass (imf25.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.98 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717034683; a=rsa-sha256; cv=none; b=k7L9oNTTHLZelxn9qDjHuVhZoQRearEEN2RBIWCyR0JM1ANvvKOrVVdUyXDG6yeKOarb2H o64XNG4pUAJjAhoh9GX9l18cs9zRhIec1KcHPmSL5CGzGFEOQFlL9k7MsviLa68Pojghjq UJN7a0kLYD6zKTuQ08zkZR4JmFGRYxE= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1717034680; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=OpKbZmXRrURMX+/QsaD7+TkYK79RF0tdTg/q8PuO7h4=; b=YuHhpIIJoMVLAOPeznpleGZHsDvkg+6jnktDZDigNmAHgWj69xaV5VN/g5vzr9729yeI1qKsN5UW9pIvvhefIh7T3RSEfnegrIzVWFk5JyYb3CXOEaniyx0ZyhAWV1i+jjLOD8i/B0wWewxgqPrPZ5o/xhbRkKrAVLdlU5LRdqY= 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-contentspam033037067113;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---0W7V1J68_1717034679; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W7V1J68_1717034679) by smtp.aliyun-inc.com; Thu, 30 May 2024 10:04:39 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, ioworker0@gmail.com, da.gomez@samsung.com, p.raghav@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/6] mm: shmem: add mTHP size alignment in shmem_get_unmapped_area Date: Thu, 30 May 2024 10:04:16 +0800 Message-Id: <4d0b226f2a14f93d156a01855db32ff562547bcc.1717033868.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 95im3ssmczmruaihgbfsdcfcqnnwo9ye X-Rspamd-Queue-Id: DA9BFA000E X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1717034682-97835 X-HE-Meta: U2FsdGVkX18v1liCvAXtHGdBaBxVLU9Xa1msWWx5C0fWPHfiel+9JcdpLwkcgRdQIST88XIW0kWVwjC/w0fxL/j17RVe0WW4L5UUKSoLLDLU1qdTznB6x6kxA70/s9upjwvaErqdCGljTrYHsVnfaRMTCxqt5Haz322ye5tPG3vTIXnISc8s8tGmPPHor8vkKeKGavjvXwAKuiW1JEFDyC/OEdoXKyMRKAIkcELs4WiWz7g+MAkKsKmoYbso8SxzdFIAomREdC2qKH3n2uIIY0phT4WsqOofKf9IRvgMGYLm4a850Pjk0FzSfj5W2i1gODOMj52W5fZRwRmXdFcYNwXZt+EzOLW++tFUy+ZtiCLaDxzARVcM4uX15JA3FhonagFcuNVVw/qrkWqsScObxKvRjP3qHwKZoJ0shlmQ5j/gLkDmvAVDtUd2kL9khvA/Uduj50iUt5HmbE0M3xd25opwJvJGjv1tTddqqmEhx/DjF0FMI2QDik2caDemXKejooUzXnGdSv9HkJXdAI0ZgLxqB6uBIkoybSW4AkjWfiQRWnp95w6gVhPZCZV6AIqUSEMRxDLS7MAQVZuDbyo3AiknM/9aycIruajHSHCtFc3tUdq3OWZnI+Qb4h/jSKpRGl3PLSjUk2rcoBRjI06QEXH/0DukXwzkQTCVRGGrXs0wPAeQATWUpBi7csc4sgaP8Bz+KL1hgLVyBf2Fv56UQiG3UpxdwO7stfcyP5C7+GQu2NyH6htyoajp5b4F3DmZ5dmjLl0ZTyceZiamHRA409H2qUgYOx2wBYd3TbkStAvXmCpK75HRdB5Cdg/5TxclgUMlBTVkXLrmhIslbK6EWHetiwmCkXiZ2mH8GcWinIX8LtpX5F/XkNsMxsRFF8yyp3blGTe781qGf/Oh4kXSVjXyZuWmB7bf/dWJ+/4piy/5ywIegekhVGmsIQ0KGeuI9tm65etNKGc+KtwuJy4 hNEeJN/C 1pXWEQGeuSAlvCcyeg1wMHNR79BquuHA0j7pJCznZeErFdJLHTl7pYoA9c30aFvwON3QOg37VnSRxdHA8dsCexsEdbTkipR8pNWq4nyyHJV6gyrFz+QCOuSyypdKdmTklKsoXpAwTYF6ft6mm5RyTTZqknpvcHEk14stN6t3BZ4O1IW5JLW1MRKtfnErpicru/dv+KgTTFCi/1Q4zBb/DSALNgD9agkWO3a5lkWlI9HumC0MmPYxINaZhzkadWiK1G+Be5xAzZx8RTGRH6ol/IYRqGQSgLRzFdduXCx9VlBzgC3wbrhWQkqxekw== 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: Although the top-level hugepage allocation can be turned off, anonymous shmem can still use mTHP by configuring the sysfs interface located at '/sys/kernel/mm/transparent_hugepage/hugepage-XXkb/shmem_enabled'. Therefore, add alignment for mTHP size to provide a suitable alignment address in shmem_get_unmapped_area(). Signed-off-by: Baolin Wang Tested-by: Lance Yang --- mm/shmem.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 493873d7246c..efc093ee7d4d 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2394,6 +2394,7 @@ unsigned long shmem_get_unmapped_area(struct file *file, unsigned long inflated_len; unsigned long inflated_addr; unsigned long inflated_offset; + unsigned long hpage_size; if (len > TASK_SIZE) return -ENOMEM; @@ -2412,8 +2413,6 @@ unsigned long shmem_get_unmapped_area(struct file *file, if (shmem_huge == SHMEM_HUGE_DENY) return addr; - if (len < HPAGE_PMD_SIZE) - return addr; if (flags & MAP_FIXED) return addr; /* @@ -2425,8 +2424,11 @@ unsigned long shmem_get_unmapped_area(struct file *file, if (uaddr == addr) return addr; + hpage_size = HPAGE_PMD_SIZE; if (shmem_huge != SHMEM_HUGE_FORCE) { struct super_block *sb; + unsigned long __maybe_unused hpage_orders; + int order = 0; if (file) { VM_BUG_ON(file->f_op != &shmem_file_operations); @@ -2439,18 +2441,34 @@ unsigned long shmem_get_unmapped_area(struct file *file, if (IS_ERR(shm_mnt)) return addr; sb = 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 = READ_ONCE(huge_anon_shmem_orders_always); + hpage_orders |= READ_ONCE(huge_anon_shmem_orders_within_size); + hpage_orders |= READ_ONCE(huge_anon_shmem_orders_madvise); + hpage_orders |= READ_ONCE(huge_anon_shmem_orders_inherit); + order = highest_order(hpage_orders); + hpage_size = PAGE_SIZE << order; +#endif } - if (SHMEM_SB(sb)->huge == SHMEM_HUGE_NEVER) + if (SHMEM_SB(sb)->huge == SHMEM_HUGE_NEVER && !order) return addr; } - offset = (pgoff << PAGE_SHIFT) & (HPAGE_PMD_SIZE-1); - if (offset && offset + len < 2 * HPAGE_PMD_SIZE) + if (len < hpage_size) + return addr; + + offset = (pgoff << PAGE_SHIFT) & (hpage_size - 1); + if (offset && offset + len < 2 * hpage_size) return addr; - if ((addr & (HPAGE_PMD_SIZE-1)) == offset) + if ((addr & (hpage_size - 1)) == offset) return addr; - inflated_len = len + HPAGE_PMD_SIZE - PAGE_SIZE; + inflated_len = len + hpage_size - PAGE_SIZE; if (inflated_len > TASK_SIZE) return addr; if (inflated_len < len) @@ -2463,10 +2481,10 @@ unsigned long shmem_get_unmapped_area(struct file *file, if (inflated_addr & ~PAGE_MASK) return addr; - inflated_offset = inflated_addr & (HPAGE_PMD_SIZE-1); + inflated_offset = inflated_addr & (hpage_size - 1); inflated_addr += offset - inflated_offset; if (inflated_offset > offset) - inflated_addr += HPAGE_PMD_SIZE; + inflated_addr += hpage_size; if (inflated_addr > TASK_SIZE - len) return addr; -- 2.39.3