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 E2874C83F17 for ; Mon, 14 Jul 2025 00:34:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 876538D0007; Sun, 13 Jul 2025 20:34:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 82C038D0001; Sun, 13 Jul 2025 20:34:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EE768D0007; Sun, 13 Jul 2025 20:34:58 -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 55B8A8D0001 for ; Sun, 13 Jul 2025 20:34:58 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1AC3F10E653 for ; Mon, 14 Jul 2025 00:34:58 +0000 (UTC) X-FDA: 83661000276.07.423E0FE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 5DDD414000E for ; Mon, 14 Jul 2025 00:34:56 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eRdxeIAU; spf=pass (imf09.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752453296; a=rsa-sha256; cv=none; b=pZdOjqfjP/pP0lx+9/3O0NqopWNLpSQ0TxEyCWpZGOlZbJl8cF8qnZ9ty66g7LrO5AlIlz ALY8rJk9nk9TivtPCXpFLoi+ZvUqxSoJw8SFvte4YsfK+qWN0bYmIcIHzl3nutDAhI3lK0 UnN/Cij+Bi9kbZEMeCnUr3by4nh9smE= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eRdxeIAU; spf=pass (imf09.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752453296; 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=BfZNAwhk1NqT5tIuPPyjI7C606wcPsYsghkwk2GurVA=; b=oHodQnVGPWCtcPGNlvf5XlDWeBsMoVESeQjzXOhsNOShIHWYa24hiJEDeWoEAPfUNz716e qdKmUMhvEEyXDxa1tCuX9uZOILl7AAR7fcf5Juy8ZZ909DPHlMtoaUIKUH7lADe+OTlP46 ZhlDpH8Z6Ut32o9g2iXvV546GZxUPqk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752453295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BfZNAwhk1NqT5tIuPPyjI7C606wcPsYsghkwk2GurVA=; b=eRdxeIAURhL1wL7QW6hPw4KjH+mZEUkGEhkRXM/gH61ev85/g/YEakkuB1NXL0bPBU9f6j NxpLeJVnfaQVNbTMNqT69BdTs65j+bJkdHnU912o2xuWbXi88C0YhbX2XTRLQE4tk/4tu1 m9Xca9Yn5DrNSc2wOMngKbd0azGen2k= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-653-FlwQt_DJNyqxL5eDISseBg-1; Sun, 13 Jul 2025 20:34:52 -0400 X-MC-Unique: FlwQt_DJNyqxL5eDISseBg-1 X-Mimecast-MFC-AGG-ID: FlwQt_DJNyqxL5eDISseBg_1752453288 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EF258195605A; Mon, 14 Jul 2025 00:34:47 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.9]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C570930001A1; Mon, 14 Jul 2025 00:34:34 +0000 (UTC) From: Nico Pache To: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: david@redhat.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, ryan.roberts@arm.com, dev.jain@arm.com, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, akpm@linux-foundation.org, baohua@kernel.org, willy@infradead.org, peterx@redhat.com, wangkefeng.wang@huawei.com, usamaarif642@gmail.com, sunnanyong@huawei.com, vishal.moola@gmail.com, thomas.hellstrom@linux.intel.com, yang@os.amperecomputing.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, raquini@redhat.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, tiwai@suse.de, will@kernel.org, dave.hansen@linux.intel.com, jack@suse.cz, cl@gentwo.org, jglisse@google.com, surenb@google.com, zokeefe@google.com, hannes@cmpxchg.org, rientjes@google.com, mhocko@suse.com, rdunlap@infradead.org, hughd@google.com Subject: [PATCH v9 09/14] khugepaged: avoid unnecessary mTHP collapse attempts Date: Sun, 13 Jul 2025 18:32:02 -0600 Message-ID: <20250714003207.113275-10-npache@redhat.com> In-Reply-To: <20250714003207.113275-1-npache@redhat.com> References: <20250714003207.113275-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 5DDD414000E X-Stat-Signature: 4q1jnmrfi1wsg45sz9di6im9wt7fnakz X-HE-Tag: 1752453296-827930 X-HE-Meta: U2FsdGVkX18kDyCo+7nBvqN/QLMrQE5oAvMPFdvzcCtz1JwesQpi38a4y3lJzCd+jwceU4t19Gd9wFqxMf8dISZhU1yTz6iPhCP/BOJ/NWoH8bda4jvhiUZyzsppMT+En2ETZ8vFmGewSr9UeCMX87fhHj2uxeh3RoN7x4H5Gel1cP2s3uuOe4pyZhSmI7IO72FyeQsSHliE3rxINsi6zVk4kGOC+ooMAUOABusIUTV2BbKnACs7paOktuXPCrdyP2Xk5EKGiBszII4ZvnDpio7qv8HgoBjEfbUDjizG5XnLdCwRSKeP6DuzbBBGYZaR5+bM8DeESJAgd2ArUQIzrZdnKAodyvJ6p7munl+RF/MO8QzrwDg/Xl+ltel2HkJXVWcnDFT6FECINFgpNKn3t7oOlgoIUS+IKBYGxLyy3F7FfEAz6GGG5Ck8BFhl+DGMn/MWrHrGPJTsNxBP8Txog46nbu8EvNx51TOqQS9kqZ8GJBbVZZDs/jAdvUy6mCoHzv4/8VPQamCfaVhXvghdzRY+a0oSgnRqdVnkIROidXOocqchGTdYuasuVD09rvjKh9sBJX/+hjpMH/JxQmPBYOn1/tChxjU2+H7HPmK1MDYoTkfgqRlBcQlvDQOTON6q/VxWAJ9E71S3GP+IaHujCUr0CBTLyj0zV4xWFMiXMGjFx54oNB9N561jAPYu2qI+QoYRx9M52p2GlEKkYu509ZVnk9s32R7KJ5TqYWjenDOYew9S+5mSfdj/80dGqzZQFwGPVGl5r31yhvOnMt1peZIdsC8qzMc7cJ9YLsv21WbZ6oSzv7hW9phCJEDEkokeh7MJg9xNRvKrCLEMzrjc9lTscv61ouSD9A27DvyUDYZ/7oSlEnyHmrznEIMNBZvw+wm26dOmr8+AmXuOevrkkl+sn1CURY2BVzaVBTK6DuZSnk8AYqpjmkvYYHetJLLTGoUtSsHMa9jDRrDzshE jNcNbW8V zOkda6PfhC/tXgzgnKAM/VqAzazC5neSGLdWgB+poO8AeqYWz9CvG8xREuTUwggewFlUK2FnGziASeb98+/TzIGBJPodF8caSaFuiBpDU2OxqtE6PvIvTBplopndyWozfrp4EULd0783Lw6yKFzljNEa2kgKsIjj6FWsV2IPBa4PekJ8KKiCaojZEYMzV4wRgFxZS2atf1P4ULDUiyrSVNgs5bn2W/oDo/yFyHeMc6eTbNjJUMRSN1fs5QuOruzkZgIVK95FklAdCY4bQwHtnSsjv1lCIxXXk4y1JwmWE0uW8KJJIFgpZnmYdIDvW82Lz2x/fQhNsLJcy6uAaBDTn+x2NRbn+P289c8XQKg4NdFfpGq+mpgFvDZvsvVlGXs+wGoEgSryX+yZdGHhtN/rYQaj9yQ== 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: There are cases where, if an attempted collapse fails, all subsequent orders are guaranteed to also fail. Avoid these collapse attempts by bailing out early. Signed-off-by: Nico Pache --- mm/khugepaged.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index a701d9f0f158..7a9c4edf0e23 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1367,6 +1367,23 @@ static int collapse_scan_bitmap(struct mm_struct *mm, unsigned long address, collapsed += (1 << order); continue; } + /* + * Some ret values indicate all lower order will also + * fail, dont trying to collapse smaller orders + */ + if (ret == SCAN_EXCEED_NONE_PTE || + ret == SCAN_EXCEED_SWAP_PTE || + ret == SCAN_EXCEED_SHARED_PTE || + ret == SCAN_PTE_NON_PRESENT || + ret == SCAN_PTE_UFFD_WP || + ret == SCAN_ALLOC_HUGE_PAGE_FAIL || + ret == SCAN_CGROUP_CHARGE_FAIL || + ret == SCAN_COPY_MC || + ret == SCAN_PAGE_LOCK || + ret == SCAN_PAGE_COUNT) + goto next; + else + break; } next: -- 2.50.0