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 91D3AC54FB3 for ; Thu, 29 May 2025 08:24:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB7886B0116; Thu, 29 May 2025 04:24:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D68A96B0117; Thu, 29 May 2025 04:24:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA5386B0119; Thu, 29 May 2025 04:24:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id ACAA66B0117 for ; Thu, 29 May 2025 04:24:10 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 03B5D1D409B for ; Thu, 29 May 2025 08:24:09 +0000 (UTC) X-FDA: 83495257860.16.5F51C84 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by imf12.hostedemail.com (Postfix) with ESMTP id 78E3D40004 for ; Thu, 29 May 2025 08:24:07 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="rRhM/7Wb"; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf12.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1748507048; 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=0SELs1h7jaP7V5rEcYlTVB8+PGf5ZsGKYSIxuyINI8U=; b=Qg2kiYW6N55LXrOYzPaLzxX14Rdf2j0v1m59T6VBx/3yv91x8F/VB67Kb8NHGDRh78sPxa niWvfQD5vFH8SpVNNlP2MSsFme7378gseV4/VqkG+w6svfrb2+kqFIA96Yc9V0RpCC/Us5 GRtjaBGqo+YZ0w1xJhnBK8HhtNAxYPk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748507048; a=rsa-sha256; cv=none; b=LtOan07q/swN2+KD1SH/keaxYPE6ZIGEYf1Ovjtq5wq0u+xjqhE76p+uwRrK+fOk6UOS0k LWP5wWiVkbozHD6hF0Dw1FKaePYXsIhb4bNEn5F0AHKdSX38utVOBBBlw0kpie73Qk5RLF BuGuP5gGogx0ijslTOm46qMGViEu2Ko= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="rRhM/7Wb"; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf12.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1748507045; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=0SELs1h7jaP7V5rEcYlTVB8+PGf5ZsGKYSIxuyINI8U=; b=rRhM/7Wbhn7NdgEFuZ1EKwzvAZI9XuLBsugJJxlkwXlNLpjadpdQt4621gTAkmlhOG5g/JeySTZkz/0tUrpCSJ5Lbzc6Ij6WeRgOgdJPUqOMkt6YH3dcm1gdMMplwmD2WKSSBXhkprshUC81VLEAXcA3Pde86E5VgEpQXrP9NrM= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WcGls7-_1748507043 cluster:ay36) by smtp.aliyun-inc.com; Thu, 29 May 2025 16:24:03 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com, david@redhat.com Cc: lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, npache@redhat.com, ryan.roberts@arm.com, dev.jain@arm.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] mm: huge_memory: disallow hugepages if the system-wide THP sysfs settings are disabled Date: Thu, 29 May 2025 16:23:54 +0800 Message-ID: X-Mailer: git-send-email 2.43.5 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 78E3D40004 X-Stat-Signature: 6mr9rkwrjchnj1jz1axomc35zy57f3c4 X-Rspam-User: X-HE-Tag: 1748507047-321622 X-HE-Meta: U2FsdGVkX1+xdDjYuwT1X7kSnVj8S8JfI7j5TAjI+FQ4xghfoBPQZ8Eto11ze/IYT/bm8Gj+64gYsSXDrDrZ7owTxYxZO8pWXXPdxPjSw6F8mxUGxZ21+PWkBsWFZ2vbRz3lUZQwnQ9cCpi7/Qritq+BIqRuOnQ9k63/YSH1u7lmYRjT0q9SdgnFb2nsB0rBmvi5OzUY2cocQDzVvSG0C2dTid7AOTbXlSNslmhLWUl7iS7z90k8UZxBre5v0eMzIYxWE25KUx+qhBW7KlGxMzat/ihAkhNo9bZZ2BiQh+mvDqx17gSEy3IR/jAs4Ot9V0IClkGsl2vjllzdxKOpzWr5NujTdrD6DgVsNO3Yp6LZH8pM/HlBy86lX+j2EUjmQJkZhWj9F2AKYLQCIk14CU8CUzJn174i8o8lEPIr5lZSNksETfxdvKvkoy1P51Qtgs5vBMCgZSvdAsmRhLrWH3MzQy+XyMvui6FWloib3XZ7EQg+tghLI8wISig3yjcbBCtedFtj32MV79XKS62kQMFnGCEIaGDS2x4gFo7yUUwTllqSEzoaQV1Vmxiv+s1pcTPGXRGdNYb/o1h78NHLm84NgJNs66fPZRCtx0QgGZr1i1NrTCQwWnVgl6jNMd3lnMsohmx2NKc4thstcdmQZ80yUeTHEoR54fSFVCoqxho1IPraZT+iA3UZYG6k4cJLr0FGhOSF3UPnINbDE5WjoR8cCXHX2mid//9lnuNCJW58/N8YUIbwi4qM3L90ajIPAq4KU0NnZ8wbyom0X6pgiVv/x++pedqIm1IUUn7ej6xSYijbPA6KXWAZynnosIgMdbog0tDqjkYxJk8qNC8vFokV5yYU6wJLo/YUrAy94rdzqvaPnHJHuAcEuMSsuvprj93Wm7/bWBfUznjUK9Mg4WGfNSqJqzbCfOsl5+pqKhClVORgcuHqJsWLtRQSDlTpLLrTZe6jfxBomp2BI+0 AvCz9cx2 4+H7QM+OpO7vt5KpTPJOf2FCOGzXjlAbIj3tYyhsfPLYnfpn0vv+/KdZdHA6k2vuSbjA6dHt+Q7ft6ZGmpaAxDu+P07MMaiJs0siwwkCKwOfVyUhD6E2B6+Q3/OHSiIp9d3CoXCsopyDiwDOgsSmjwNGCYUur9p0eBwoaE8bBfkUAMbBz2UD49CybEWxIAUdteyHD9Jq3B6AcGbrNFNVWqRCozpQAqsbHifCakFu/XVKlv6CPVPR0fiI49p7dmoWRs7LeYL2GoYBI0C3FXrM9UPb2xILkfVczv4L3YGqTuPH6z5edNVSfc+F/tQ== 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: The MADV_COLLAPSE will ignore the system-wide Anon THP sysfs settings, which means that even though we have disabled the Anon THP configuration, MADV_COLLAPSE will still attempt to collapse into a Anon THP. This violates the rule we have agreed upon: never means never. To address this issue, should check whether the Anon THP configuration is disabled in thp_vma_allowable_orders(), even when the TVA_ENFORCE_SYSFS flag is set. Signed-off-by: Baolin Wang --- include/linux/huge_mm.h | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 2f190c90192d..199ddc9f04a1 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -287,20 +287,35 @@ unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma, unsigned long orders) { /* Optimization to check if required orders are enabled early. */ - if ((tva_flags & TVA_ENFORCE_SYSFS) && vma_is_anonymous(vma)) { - unsigned long mask = READ_ONCE(huge_anon_orders_always); + if (vma_is_anonymous(vma)) { + unsigned long always = READ_ONCE(huge_anon_orders_always); + unsigned long madvise = READ_ONCE(huge_anon_orders_madvise); + unsigned long inherit = READ_ONCE(huge_anon_orders_inherit); + unsigned long mask = always | madvise; + + /* + * If the system-wide THP/mTHP sysfs settings are disabled, + * then we should never allow hugepages. + */ + if (!(mask & orders) && !(hugepage_global_enabled() && (inherit & orders))) + return 0; + + if (!(tva_flags & TVA_ENFORCE_SYSFS)) + goto skip; + mask = always; if (vm_flags & VM_HUGEPAGE) - mask |= READ_ONCE(huge_anon_orders_madvise); + mask |= madvise; if (hugepage_global_always() || ((vm_flags & VM_HUGEPAGE) && hugepage_global_enabled())) - mask |= READ_ONCE(huge_anon_orders_inherit); + mask |= inherit; orders &= mask; if (!orders) return 0; } +skip: return __thp_vma_allowable_orders(vma, vm_flags, tva_flags, orders); } -- 2.43.5