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 5ABD4C25B10 for ; Mon, 13 May 2024 05:08:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E27046B025F; Mon, 13 May 2024 01:08:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DABEC6B0260; Mon, 13 May 2024 01:08:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C26E06B0261; Mon, 13 May 2024 01:08:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 9B6346B025F for ; Mon, 13 May 2024 01:08:48 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 55FB3A0FB4 for ; Mon, 13 May 2024 05:08:48 +0000 (UTC) X-FDA: 82112192736.06.E0F19F2 Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) by imf16.hostedemail.com (Postfix) with ESMTP id 625C6180007 for ; Mon, 13 May 2024 05:08:46 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=PzG+9wE0; spf=pass (imf16.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.101 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=1715576926; 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=vWL4N5Yma0Cz0eiOf0sAW+iyKgVOoYbMTHPZ99SVNnk=; b=6+/hlmo1yF9eZp4k0OdK0D1UFba9KkIJK12TKWbRI8RK+aGUMK3nUhYurgZi1pdCUaNUQY 53n13NehZHv+YMiWpFVP5aGBTEwnhAQrWFv/I55exdTDRbwffmgZM0HJipFD9c6UDwGGHh aT6KinBQNQU6kvZWFMgcMfnSwzfsKJ8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715576926; a=rsa-sha256; cv=none; b=GDHZqwxf299g8+dQk2aFdCSiMQ3B1cTIzbI+hDl7Yhi0TZ5ZRBTlxApCw/LRswomVHQWhO xDV8vp0dTPmZ7+FxpXSWhYyjIkV2tXu/jDufAd7RyvOFmaRErwooevhaiRItX49ZI4+0j8 aXF1/uZxClOL68TXtbWrv0xTvSHo7ZI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=PzG+9wE0; spf=pass (imf16.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.101 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1715576924; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=vWL4N5Yma0Cz0eiOf0sAW+iyKgVOoYbMTHPZ99SVNnk=; b=PzG+9wE0a/KnrQOlY906rEaJdjtjLAwYCVa+767wmfRbnmLIaz1BTZSTFibPujcQRrhI/IISeLMcc3tXrepw9enuU9FvRk+6GqvZV6eN8dHebJWWLgDulEkJ6aPfZUeDBQjSjccoTtCzYdiado5BofehFgY2TW/13KV3ihH5Xk0= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033022160150;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0W6HFTD5_1715576921; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W6HFTD5_1715576921) by smtp.aliyun-inc.com; Mon, 13 May 2024 13:08:42 +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 v2 6/7] mm: shmem: add mTHP size alignment in shmem_get_unmapped_area Date: Mon, 13 May 2024 13:08:16 +0800 Message-Id: <664d35cfa7192adb28c133efffa81b0947f60d67.1715571279.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-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 625C6180007 X-Rspam-User: X-Stat-Signature: oermk9mxa3ouothfbhpkkiew1rgh9yoe X-HE-Tag: 1715576926-32397 X-HE-Meta: U2FsdGVkX1/JzG7p4szi1+km8D4E1Eds5akjTCJoO1+rEvs+tgDbd07Y7Bqm9wsQ8Gl5ucoCjvBrfIX/Ewj0P+6m3a0lKBHh0vPO55a4fgL9dCQCTf5G1QOYuE+fTYXm9L4D+ylsgP2kHNmWcw7nOx38qW4+8VJNTk+PHYdN2IKYzRL6UY+P2EtHec8h6qvqv/vzG0ypiGI9atFciaIIX+72jT3vx4QzteflnmgHsW5vhfLChEyBX2nORmOfJXZXXikUgDp+WC0wjybVyrpB0hXKc/loDrJnvlbVjyyyppyDcPsJks1TD6Iv+oeewmAi1Pv/3P+w+nENLed4Qt+rBr0N8LmRJrt4muDkvQOkZ8C2bGpkMqhSPmursQPZJYGp/QAXxxZ3EJovWj3f4GqnWMnUkWpXQdas6wBbpGrs8UB56dyIoRZ+zxJ/rCb1/Ioj2obMxZJqa52s6soxizsPH0ke+1goVDcK6vX+4dqx9aLURz129A4N3Ql9W/M7uWI9WdaaEuilQ1t9uHCo1QtzOZR+sf/azWrKnVIKnow7PzeYdRptCHEYYWaiSpCxVcSl9xVNrehSwVevyMeugMk3Ln2vQX7YVXoxwjkRfWVUaoqomMQ8GHMlz2/RtDhn0ZxkOLxrMb2MXycaK6mD+q0V/CkqPntGIKcQOdJEMQ6rGj19VWhXGRWB0yBbYKlE/MaSmqmcbZNY9KDyeHjOXu0ackNrvHLcxqsG6jT0vjhcRrnUd+gISpCNt5sj123crrMFbSMqTXhzJse7frRDD5tkb/i8rsD9uPUM6wEPYEJQgVBpRgu7IsPDFvXgzLxvMYLMmq7UpMroCmTe0yNly+6HLn7YLPH1r3i8+meJSvEsCOgBo7cbM5IexR9MDPHSRpyuRMPUzOubt59N2GhvcBLLxo5s8aingDFmk+EgiW/qQy9sqX+h/YnZWwp+3SwbCADb0p/CBIeDHbspup9A6fX IE1xqdSV +mJ1OJypbfyPOfQ2Sbkn3w/F6MSiqqhc5jeXyjBkWo6CbVv0XkorP+0wtvh/exM+sW+Z/tfUjlsA0P4IZknnDvGIjiXDda0rA67ScjcgmnDrdA29vKeHUJuKP/3c+4lgdA+YwJU7EaTt8ORE/zTpStr+Er3S0gLxJwQ43PWxZVrOSd4GfGBKeGWomQKOX747Wj5WKL35nKfKEimR2hiUtOiD2f2Ii+x0AnV7N1vovzkAYNLR1IKlyDNm8IlSP+dtxUg645YY2PPLS1kH+8sElXKubPxnC5SaSLHeVOqQOWEsq4PMZXColKmZsVQ== 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 b50ddf013e37..8b020ff09c72 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2404,6 +2404,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; @@ -2422,8 +2423,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; /* @@ -2435,8 +2434,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); @@ -2449,18 +2451,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) @@ -2473,10 +2491,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