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 C9CF7C10F16 for ; Mon, 6 May 2024 08:47:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42E4D6B0092; Mon, 6 May 2024 04:46:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B7656B0093; Mon, 6 May 2024 04:46:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 259A56B0095; Mon, 6 May 2024 04:46:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F3B286B0092 for ; Mon, 6 May 2024 04:46:58 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BE570A166E for ; Mon, 6 May 2024 08:46:58 +0000 (UTC) X-FDA: 82087340916.13.C11AEB6 Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) by imf02.hostedemail.com (Postfix) with ESMTP id B3CD78000E for ; Mon, 6 May 2024 08:46:56 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=hTI8TkZN; spf=pass (imf02.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=1714985217; 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=JwVqRNDg6ovq+W40+OWE62ViZ4KVyR46bNtfHFl1yVM=; b=Jn13WqqP0Q9ilaZ3xDNy2G6hn4gBxSMfA6S/CWAk/51I/c89WInhnTeF8ZkKYqS3ycpivc 5t3jKKbUNkFDObcbA2rJNsC6hHl9hGmIWCc5LRJQ7po1FUZbCW8A6aZvhPmG2B7dbJjPdg nDJi862nlR6Yh07t73EADR4aqKlOhV0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714985217; a=rsa-sha256; cv=none; b=R1uzZKwXnK7l8MztNIRQd0405ZX/BupLs+mOuoBxzqEfEx2m55aBS7HUyw5xbviwbokwn2 xteqhYqk+0e0fBL1Y7Ev01aJ8b2h4Q82+46Qaf0wbG+OXVfmkLUNYzFzutUn90qjT3YF6W Q6nj3XxLz3+AvuTnq6jMQTXVUJzZfyY= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=hTI8TkZN; spf=pass (imf02.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=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: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: 5incii6zdyna5771gj48mstbgnobk4wj X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: B3CD78000E X-HE-Tag: 1714985216-23824 X-HE-Meta: U2FsdGVkX1/i6idDJoax1nM/OBpZtxC5G7TSdmnwY2i8dskmJ4Z5te6b/izmhlGo+ntLixq5KkJYgca08oUOwM7soXDBM+Sl0SShLPKvjPtOBNM405a6umWNi96zpPiD6kNy4Xa3qz1uhxIVHHRjBv3v/43LArKJU3QVSiOIRgErYdYUT5DN3Dx4qWHutEd285RsTVLOzb9LMn5djIv/N0J/Hc2BPpyQsjAaCwYTds+UUF36rXZUHlGlUPTc5Y9GnPVXDC4WJVhyRLVIjQB9mYT9/TagkmxwAokMpv4REv49yl1rfYAEAAIRC80tYRU8+TyQC6G/kKWv7J0CDyxPLNI932DUri0jNgjMjfeT+W6DUGb0DxZ/VSIXPFh3WEl0J7UAp/3xxa8toUsX8AJuFTRLJDpUqj27FPu2PDx50XHYTe3BCLfmwc16Ogygk+ie9aJv8irwzYauc+IAChZXfYX7L3FhjPnSVxoLWzXKcLRbR107Ta999732TBA/j0gLScq8zEb97W3UrEcQqQWj5qy04Bl1sH+dpJ79/TYhwCwFvAQxSfaKkdRSAa+1QepgKzM/ObLQXsJw6IVJLg8YYaYz6vTTAKtdkhP2iBtzM1x31DpTHPkrKmFFl+SWI6biqXXRhxO5FDSGzMwRO7dDRIR37vn1GOl2I6pozdn/m/aDCv+LUzbtI9b9mvBzXcwQaMy6sWjR2bLPxBNY3ras0OhW1f8MNwKd3NKT4VDO4Sji0oelwMIQcqFkERygKjOnc65GsDvxOz3BiCe2jeEHHrPCU0VHNnRNBMXH99SUvWfi9pGwRsUJ8kPVP1BbfP761nY9/aOoeosmvaLEqmNN5faOH/j/DeClxHkxbilD2ERram5mw50rJ1Wk0qerIXIt+EoG6WzJ++LJBJyDs2STcV0hwCtdCqG2296QQldyaSEGA99XY6QpV36BiSzd6F5HObn4+i8ssy8KE4P6sPR +hjJuO4l DhFRFrajfLCf36CU8FjFg/EYtY9PZEhOwu0/iWZfLJqt5stUlALKAHknyzdGb3Iy13t5eoaVXZ/vIdAXLs01Hj+OEUNlAQ3KcrvlMZ+keOOwAJ/wPNcuEiU2kYEStDR4RyfeAIgSmZCKm45zJksSut94kYgBFhbw0Ypd/P9CEH9TB+mnWn3COUBBviUGBYwAdg2wFSClPNOCEYFtL2RlJpzPH+b7P50ScObN6TD3wcOSi/IjZI5QMpxKhwqoZ7mNc1VY6czg5Ve/Q3ZMWGrOVHGT5sa2CF+V9QaeB 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 --- 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 *file, unsigned long inflated_len; unsigned long inflated_addr; unsigned long inflated_offset; + unsigned long hpage_size = HPAGE_PMD_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; /* @@ -2437,6 +2436,8 @@ unsigned long shmem_get_unmapped_area(struct file *file, 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 +2450,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 +2490,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