From patchwork Tue Jun 4 10:17:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13685020 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 9F15BC25B78 for ; Tue, 4 Jun 2024 10:18:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 803856B00BA; Tue, 4 Jun 2024 06:18:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 78ACB6B00BB; Tue, 4 Jun 2024 06:18:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5DEA06B00BC; Tue, 4 Jun 2024 06:18:18 -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 3AB906B00BA for ; Tue, 4 Jun 2024 06:18:18 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BCFB4406A3 for ; Tue, 4 Jun 2024 10:18:17 +0000 (UTC) X-FDA: 82192806234.07.D4BEEFD Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by imf18.hostedemail.com (Postfix) with ESMTP id C20E71C0014 for ; Tue, 4 Jun 2024 10:18:14 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=FK08sUdG; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 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=1717496295; 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=mF0SOFHOYjsa4DTAJ1q9V/3Dk01gX+rLS8KbnSGFj9Q=; b=MwFT2mQx3BO/OgPHvij9MVfx2p/5ohzLQT6aROdgL6O5VoLTxUPo6gfgUALiMOv2J2h8ul vC4l4rD1MW4yT9811XAh/V5zrsp7yCLGP50GSYM2dXV5y3PDcaZ4Q3wbu0XzOvYiT54phO vc55BNHXNhnabbN3U1XaredUXl/uTCE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717496295; a=rsa-sha256; cv=none; b=7hTdbOjjjHwEv5QK+iO6h2djd78A8O1gwkctRVEJbVkaYaQRj1dxmZhCvLSl4qbdps5Uo2 C/4vymyBu7elvgsWvzlKjx6pujuLlHOTrvQNCwVR5xVe+kvJp2OXfjAMuqPkeH5YjfPs/C xgpUFL2Xj8pWZ+lrNw65ICvJ9Tpnji4= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=FK08sUdG; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 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=1717496292; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=mF0SOFHOYjsa4DTAJ1q9V/3Dk01gX+rLS8KbnSGFj9Q=; b=FK08sUdGePBdy/o5PZmibrK5llvpDr0X6bC/6NQUXfd6sUczNTDPv6KdBWU0t009yygTZDoqDd6j5C73pyD8VmKJHYmCvBCSQcQHSXs7s7HLIHYbT7eiCbxzKqNYZjLZb88Vx3iXDVuQvnBDX/qCv0aQ21QcbL/K0skRujt7sgw= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;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_---0W7qooJc_1717496289; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W7qooJc_1717496289) by smtp.aliyun-inc.com; Tue, 04 Jun 2024 18:18:09 +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 v4 5/6] mm: shmem: add mTHP size alignment in shmem_get_unmapped_area Date: Tue, 4 Jun 2024 18:17:49 +0800 Message-Id: <1d2f719d558d5c789c4cceebdaac42a814e8f107.1717495894.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: C20E71C0014 X-Rspam-User: X-Stat-Signature: gi57tngz4sep1f9g99mkp8uzo8h6qoah X-HE-Tag: 1717496294-836763 X-HE-Meta: U2FsdGVkX1/nVZ+If595mn5WebT9eCPDOUVNW/PvRavCzGcI9X3H0g8+SuJ1t0GfncVnXxaC6/31eG9b4H7U8iaRRR4igqxa8WcUmH1bXzQVjrAhEqhIwEqaomGqWjitkEl+NBBfRS7M8gRLvybvEYSinYuBVqnAStCiwa8wKzfSXHKmp4NjQAc85tiuaLlCAWaqQ8E+l+5dFcc645v7nDenjO7olAfNvb8lFRSilmHwNiobvrZGLzpDa8FUHIaf39WHSF8MVGUgJle986/lBh8uKSnHVSzNo/V6qMoovgvhsa1mtOpBau94XaXlpG46/hKqnhlYrAs86oBVGW9GV1nqjUn2lHChdlVjWxAb7gOeRlByIV2HCymW1bypBIk8iG/RPG6dMhcrGgzfuvtctqqloERI/vtfm2VF3zqrviPjEOj110Bg+uRr12tRZPlhQ1P7rOzt1h5mcK0MT3DDETJ25MEalIrwuEXrR30sPiNmTuaDfrhGBQw5DOJ4D7MjgLRLR5rzSLtyKsHklyh4zhNtRND3WNQGcFCkuuOM8C6XoiUxozE194w1LUYKji7AWduCVpzIkPmVG52nNlaGQdwPzqwKDcV+oqaRSvYxsr70eReI4ER39wtb5rtYPK8vQE90WexaQl1R2g0EYJrzx414x5RrKYu5cwBqtnou0k9FssGLdlJ75xPDn/pauvzKgAjsH1JHGz9DlXZKhOTt3nVasM9Cw5DJjtesriUXG69jzMQjfvXhpiR1H9kX4fHg4Hvl1KUwvYjg/ShrhWKZfQKzzeMiWu+ryQ55Uul+YN6azhdnnLiAVw9U2YoIP746GwYIgz0Sfu2zB59f2gvMB/DLHI/HkPhIAP6sxPgQOk1pVtkI3Y4BTYxyDHr01SzACKJDBtBuEk7mcGX/q42MWL8j0+DecjvEmv8rruTwZrSndvNS4gIy24xY1F/DPoC7aTybghy3qd+bUfSnYkp j86xbrI/ G1MWJ1gMiAPhUxKvN+9KqDNYyhE4p04FjyQmp2uNYl4ErSfz3ihAIEVNyMu2CzNBFQzHufqUh/Z3fgfvFpeOUWxy5sXj7hVd38ubpYIAoYLbyM0gDlkxLlnd82djIYy/NDFAxVdI4VHIUUDecaGtVxIeeqBJGyccZxpM55QHbFlmb56hGacv23chYMxTDWgqI1hqJz7jYLLvBqsGoHRGVx4tJPjDfhDdkEon4NcNckulyjAa5KE3hOuP0YbxbOroHi96jblBSrltzvQssdsQPgFMnkOoXsLO7dCCcnnd8H5RlqdA5erqGtOKCEg== 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 | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 9a8533482208..2ecc41521dbb 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,38 @@ 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); + if (SHMEM_SB(sb)->huge != SHMEM_HUGE_NEVER) + hpage_orders |= READ_ONCE(huge_anon_shmem_orders_inherit); + + if (hpage_orders > 0) { + 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 +2485,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;