From patchwork Sat Aug 12 21:00:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zach O'Keefe X-Patchwork-Id: 13351955 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 54D83C41513 for ; Sat, 12 Aug 2023 21:01:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 29D0D6B0075; Sat, 12 Aug 2023 17:01:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 24DAF6B0078; Sat, 12 Aug 2023 17:01:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0EEB26B007B; Sat, 12 Aug 2023 17:01:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id ED5066B0075 for ; Sat, 12 Aug 2023 17:01:54 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A5719140837 for ; Sat, 12 Aug 2023 21:01:54 +0000 (UTC) X-FDA: 81116674548.30.AC0984C Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) by imf10.hostedemail.com (Postfix) with ESMTP id F01D5C0010 for ; Sat, 12 Aug 2023 21:01:52 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=ikAJpg6x; spf=pass (imf10.hostedemail.com: domain of 3P_PXZAcKCLIrgcWWXWYggYdW.Ugedafmp-eecnSUc.gjY@flex--zokeefe.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=3P_PXZAcKCLIrgcWWXWYggYdW.Ugedafmp-eecnSUc.gjY@flex--zokeefe.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691874113; 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-type:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=ERK5q0s3pNoBkM1cIqzvaJZXjMBumkRX6A7c8Or84Aw=; b=E1wyGNkBztE7m2f04fCsYKE6o3xAt51UlUF5XtGVB+7f5rv9y/8Ca1dci5aQD7Ocwa3HSI L3v1GUpCXkTO6tQkg7vTYsDbIproZZdmQEMVlmIt30F3RJBnDA33ueJeasiepcCu/IGeqj tarPGC95nLR4z6l9AxYiNrDn2LVml+s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691874113; a=rsa-sha256; cv=none; b=2hqHu6Uv62LAQIx+b2h9zAQbU9aXY7bzapxey40P+cLMHaxdqLZ6CTwrLcWf955eXMe8oO BO5U/JMgRdcJDhIyovIzmqdQqN/G3RUx9mtwMMaZkkTxOswE1hbuoraQ6VFKOX4Xhbo4XB zZXrFgRg3sWGg1bmfxPrPFa/FS1YwwE= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=ikAJpg6x; spf=pass (imf10.hostedemail.com: domain of 3P_PXZAcKCLIrgcWWXWYggYdW.Ugedafmp-eecnSUc.gjY@flex--zokeefe.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=3P_PXZAcKCLIrgcWWXWYggYdW.Ugedafmp-eecnSUc.gjY@flex--zokeefe.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-68790b952bbso3560361b3a.0 for ; Sat, 12 Aug 2023 14:01:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691874112; x=1692478912; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=ERK5q0s3pNoBkM1cIqzvaJZXjMBumkRX6A7c8Or84Aw=; b=ikAJpg6xCGOoRKwhhzIL6L5UU+aZyUGYkereg0Di7mfhrQE+GXcuhUbzS2URIUzGZ1 ZhRJQSlAFLOxPDTtB+fUoDAcgq7F/C4JOuZpc5nQCioVUzQNKdrmkrq1XRJThJsrDpuR 9qUh0vVDRk+U08lBBOKnM4iOwM07qdhT7kz736DVWI/3FDID9grPL7m85nhhAX4lhfGh 2ZgQIeXp8uZIr1QFBOsRkQOHDeYY5nYatMLDZKjrTAOnJibnZjFgq+QN0LbCMc30U+g7 uOKy82n8dGMn5KKpAtNm4YGd6/iQhoOSbLqhLRCl2rsH0UxOVRLStXwCXZ5T5ZEC+/9Q Q2Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691874112; x=1692478912; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ERK5q0s3pNoBkM1cIqzvaJZXjMBumkRX6A7c8Or84Aw=; b=dk0qQbnzlMkaEFk02QWBH0Fz7/tK4nXrfTc7U9fk7iLdPlEPBUIcJsWVrZINBD77Ps /QwG+qEIGcPF84zjic2WbcDconfgycODbXicyPIVyHqUxRjQbM+m8YIPbLadYNZS7rIr c//XJSVPwc07XoVQ4rISIK5AYeVYa1Jn88sfLT9OOT+SgQfY7RSk5RseF2rWbN4LgN5m uedhdpWqFypDhXuuPnOqS7mkV5jHrpEID9UJk1WA6JQ9bHO0yWN5wQiFS0RuNtxqhuva ZqmUWZKyU1KVcx8BoWE/GNZ4e5weGTFsNsUCjjLPORCIUZbJtokK6712L0HcOiSZcqc9 KOjQ== X-Gm-Message-State: AOJu0YwF9bYXagvbTOWiB6lxHSc3Izmbe5vxnJhZcMOzGajMJqTsn1XY 0FD+Os8NJpCNv9PYNTStV7Ba9phP6dDLTtVLOQrynKjnn8BIZcvRhVIAO5kPe6zrXzmaYPQTBRK fXfrMlKILJlU9nHxgjVeD7QxttpkldAbuLuyN4ebxvlrhG+ZwNADFL2lQuPU= X-Google-Smtp-Source: AGHT+IH6JHGx7HCRZG9WmyU+e1nCfqazXgpKZwW0HwtSs54orfATz6XJre+St3dUlChPPn5yrfNmWiK6vNQf X-Received: from zokeefe3.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1b6]) (user=zokeefe job=sendgmr) by 2002:a05:6a00:2488:b0:67d:41a8:3e19 with SMTP id c8-20020a056a00248800b0067d41a83e19mr2442047pfv.3.1691874111529; Sat, 12 Aug 2023 14:01:51 -0700 (PDT) Date: Sat, 12 Aug 2023 14:00:53 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.694.ge786442a9b-goog Message-ID: <20230812210053.2325091-1-zokeefe@google.com> Subject: [PATCH] mm/thp: fix "mm: thp: kill __transhuge_page_enabled()" From: "Zach O'Keefe" To: linux-mm@kvack.org, Yang Shi Cc: linux-kernel@vger.kernel.org, "Zach O'Keefe" , Saurabh Singh Sengar X-Rspamd-Queue-Id: F01D5C0010 X-Rspam-User: X-Stat-Signature: f6mrobbwiodidhsk9e3enautnt6rk55w X-Rspamd-Server: rspam03 X-HE-Tag: 1691874112-993966 X-HE-Meta: U2FsdGVkX19yr8oGDNP+wIItOz+rCK/DNt9GV/DhBU/DJX2TyN0Gzu0w/A8+ZSYefROv8wIJvRf/iYowWYrBVStDP7XqWTRdBbpKm2DEMH1Gsq4x/AQFYeHlsRhcRJyx1ANIE9aPeb2SZJGZHhae+W99FtKewKgWOCa6stXQ+g4iv84Q692fS2DCN8MUNRX57IoTFbZ58FNmbpOWjnXyrvwiA7+cHYka1AY4MQdDvgIRiaXp2y+vKwqbCndmR6O+FxeYFacI3yWsTQfs/Sa/HdRhz46r3dlMI986Wrkyymh4TtAbal8nz6WXiaBOka0WBtkQ7wmQurmAHxLdlQXLxqGsl/jORUuhhPJ2ry3APlHhB8qGBaa0JwQWMwFsxCsMh2uNn7k6g7yWXCglknWUuDAJheWcpdvz36nA4A1KtH+b97We2n8I5Tnu/YtTcmYga2QY8sThd718EyCSVx+mCK/S/V6Nk2PYV93O5LDSUF6C/OWuYz+QXjel37xQSd6+qf3D69wWecw7+OJU13mIbIy4Q90Am8f1sl2mKg+EhhRZUSxSz/CKyjtEESSDLNrE3FtrPFTK55UDKPWpZ9nTg199EmB/HO4TknVCDcpcDCR1B+aY1Rk/BlE3+s8W9VJE8f759I7/w3gO9XH79ceQOOnVXiWTg6iatHuHOsNCKcNJzQUEuEHs95eH/R3m5F5gv1lQJPX4Au1dPCeYyKSWwdW9bEuCbOfRq9CXHKx/I8IQZ1AQAVnHA3L6UfQxDPvkOQV/T9Q7x2IYtvTMtDakvNW09gqXOvi08hh5SUYUrUeX+sQMTobroRCAEKyfYG33bhhq42b0LlcBUaPhFpHCO3x8eU/Zr2xxYtPktM/bJLdT/P92dcYHpX1bB/sHzljnBBv4C/7vgB2ao9uNOZK27XgQD4c/vlBIrnEZngcwveL3Ou3Lrex3550sf20j8zeQXNn3SW/RoVST/tblxBo A6049PQ7 k2QutlXP/oSBGDPJmz1pVpnwzG3TIdNgCb+DnEAViYlEWJmSPT0ldxVfTcWPx5MfPXzt5mYmCD8AE8RQcLJCTroKZE8NozcsZIww9JqYLCYBS9Ie2lFIMyBlVKRI4ATLW/kpM9g43t0q8esRH4RDXIvCpbeyJyTw2LC2p0MiH+dP43mb6RkhcXfpLkAMqD5oR5Wp3GiaAj1bIKq4UO4CxZNK6qWxrdCfW8J7IYirNoKmHNqPykxKpBrpyqa8CMhuEN4MfVyHoF54cy16c4NWIgnPNpfZAk1Bwe+EDEEzpqLM6LsvVGlk27FE1wxBQvE/xHbENyaiHxwOVwfMOxbUUvJNEFycUYiyQ+8toTeQXuAxzAj/jNxpHtLFxIQuzNcPddnm+ib/nUcVKmaXcZ5xC+0ciUBhsdNHbBxXl2xo1JOnBJdpPlt8oHTfvYcPnuyETuThCOQdZ2acH42oBV5SERSPB+/HWN0dGZjN6f2ZiOohHERLenECcjmBmAktei2OcWonIa9mmWQzYiKcRgrFM9VhC5DPdJw1Ojalfce5GCgzoZra6qSsEp8NP8RVHjgYiF7sx6cagdHMxUTL0fsJByERICe2mxiUOjOzjS69A71XRNRMeUAoAUkpLu4lUKNXEW83Ai+WsOwNO7aRCtLRtb13Iw3RwsfyaZ+tToK4ofSWGvHq7dukuWnIGd/Da4sKDIJtcT57KkdqyIGc= 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: The 6.0 commits: commit 9fec51689ff6 ("mm: thp: kill transparent_hugepage_active()") commit 7da4e2cb8b1f ("mm: thp: kill __transhuge_page_enabled()") merged "can we have THPs in this VMA?" logic that was previously done separately by fault-path, khugepaged, and smaps "THPeligible". During the process, the check on VM_NO_KHUGEPAGED from the khugepaged path was accidentally added to fault and smaps paths. Certainly the previous behavior for fault should be restored, and since smaps should report the union of THP eligibility for fault and khugepaged, also opt smaps out of this constraint. Fixes: 7da4e2cb8b1f ("mm: thp: kill __transhuge_page_enabled()") Reported-by: Saurabh Singh Sengar Signed-off-by: Zach O'Keefe Cc: Yang Shi --- mm/huge_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index eb3678360b97..e098c26d5e2e 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -96,11 +96,11 @@ bool hugepage_vma_check(struct vm_area_struct *vma, unsigned long vm_flags, return in_pf; /* - * Special VMA and hugetlb VMA. + * khugepaged check for special VMA and hugetlb VMA. * Must be checked after dax since some dax mappings may have * VM_MIXEDMAP set. */ - if (vm_flags & VM_NO_KHUGEPAGED) + if (!in_pf && !smaps && (vm_flags & VM_NO_KHUGEPAGED)) return false; /*