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 51E48C3ABD8 for ; Thu, 15 May 2025 03:06:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 329416B00C2; Wed, 14 May 2025 23:06:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2DB386B0108; Wed, 14 May 2025 23:06:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 153566B0109; Wed, 14 May 2025 23:06:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E55096B00C2 for ; Wed, 14 May 2025 23:06:09 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 17F54160F98 for ; Thu, 15 May 2025 03:06:10 +0000 (UTC) X-FDA: 83443653300.11.B594D51 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 5FF1640007 for ; Thu, 15 May 2025 03:06:08 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JKI0nRV5; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747278368; a=rsa-sha256; cv=none; b=OxznXn7YU846Ag5c0qb6TrdK6P9U6DLxrJPqn7W8B33j2B1AV+RNWn8yYdxCNglih3r6H6 vvkN7ThAA70KIW5QmYpD/7JitBqyEhS+wS5F33+61dIJXimroHN6eNh6hb96W+aXAOlzaH N4+faKaMeavtgyVbaAJiqI5n2Qn1H9E= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JKI0nRV5; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747278368; 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=HsIdjyB9iz2XKbIQ5ACDKzPgfNIwiEtNslHlyIUHdNI=; b=ZFbpUy/Kb7BxmgcMN6BFPGsz50YP1wyJvWFgkan53X25VHiFhjD4FetiV/QF2YRaM5ggmj nDgwwk3m/OHe8dwiW/ldXVpqPgh2XWyzze+7wqn36R5EJJZmuVJlgI6zuziIDlb6QFoJ93 UpL3248P7z+fdaTywt7YMEJpgobjS60= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747278367; 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=HsIdjyB9iz2XKbIQ5ACDKzPgfNIwiEtNslHlyIUHdNI=; b=JKI0nRV5N6bqcGKBP0XLyy6AePR4EhGuQ8t9453oMVmp7iCCcC8Z9COiL/78YtvXxVQVTm 0E6/nn3dZuann+GhawlmUuaBw/BShcVgOPlhqnNNfKfcaZyMtM9jRqoC9D9JPzZqRt6rdX QC2cUzmZnYYL9K3Gwpcdrx+3+bAIOt0= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-l7fB6TRJN6GM3IamP5VNFg-1; Wed, 14 May 2025 23:06:04 -0400 X-MC-Unique: l7fB6TRJN6GM3IamP5VNFg-1 X-Mimecast-MFC-AGG-ID: l7fB6TRJN6GM3IamP5VNFg_1747278360 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B1E581800261; Thu, 15 May 2025 03:05:59 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C329A1800268; Thu, 15 May 2025 03:05:43 +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 Subject: [PATCH v6 09/12] khugepaged: avoid unnecessary mTHP collapse attempts Date: Wed, 14 May 2025 21:03:09 -0600 Message-ID: <20250515030312.125567-10-npache@redhat.com> In-Reply-To: <20250515030312.125567-9-npache@redhat.com> References: <20250515030312.125567-1-npache@redhat.com> <20250515030312.125567-2-npache@redhat.com> <20250515030312.125567-3-npache@redhat.com> <20250515030312.125567-4-npache@redhat.com> <20250515030312.125567-5-npache@redhat.com> <20250515030312.125567-6-npache@redhat.com> <20250515030312.125567-7-npache@redhat.com> <20250515030312.125567-8-npache@redhat.com> <20250515030312.125567-9-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5FF1640007 X-Stat-Signature: dt98mu3jzrxc9qisktaikwu9s9husyis X-HE-Tag: 1747278368-30242 X-HE-Meta: U2FsdGVkX18w5H+p9byR+XIe00C11aQ5l/Nt21RJtmSqF4lS9siJdFED5mWBwwG8G/Eki01TafllFaiMPL61GMHJQU/ORRt+mDG0tGSgjk5qQ0WSVeJ0BOKD8zB+4GXPpXUSpMs+SKHkYkDs6UiwTdwNsz3kJ3RzES8mJAckwaM021PFcBC1DF4gjwEcHmVmdOdIN7ROW9MbtvKqzv4KbtoHwoDAl5wUvc6CEUArbZAblU0g5FEiBz8xe4mD+omkKMaWrvIZKq14yv6kq8ffC583hfV37ywqatl59ggmqDMjMhwHTPuVyum2Hll65RUU3x6FcjPrI3CEE1XfhLinZZRdnQYVkgHLXM+H1XWHseXskAg7RRZ/Rwo85byx4toaLuHsrTHOOL6IU6ynodBVkuqZqlEGbFnW23Xyzznt6siMHUsZ09VSo1vc2yHSMyS5SPSVHpD/EOYT6M4Is3wklY5kceNR2VOC09VCqlwrktCZR+3itf00WB2wVnpdVAUu8dZkV9ow0kC+iKyll5jGJ1cHUDpyJYomjBQKfcI4UUPSYy7JsE2B4QY9BIgaalBcp+ayoLpcn+Iz1r0WPd2dabK+5y9zPHWpcDDcbeyGJQ1H0/NLavnqGGJkymArLnkDj6dND9goX+P9Lv742nY19stHDCq2zAJdDUaOKJxEFnwqdSyg65FRXA1LgLDs1tQdEJFpjBU49RR4g0AubrjgoCfiER3VvmuQT16v3Deo8icqrLJiOxW6ztnVap9voVBahZhdbF2uQt36RZRSO+rCixmOcagsDk/kYzgeTcMN+3J2mlGG3ml5CTm/j2ZzTNrQIvXYiN8Fm24TZP94E/3TpNnT3//DD/eF8pSGBohf7SoQKWsJpDgbXPPZ6unsjMbhl05DW0YBM+lYaQ9xpT3dyeBoEqsMYyEvuYFVuTudkk0/Cifq6/1J7n4LNUTTTPHH937pvf/3fhap519Lurj mM5dP6dx Xxj/+ZLHpRgVTBxHUxYXghamn+JZtJHgsx2ctlt/Ieqx9wItawM+BYVYiyzgIPrRhTDMtB+5FeQ2m/hvxqJSig2pCqUssuNDgEIzuphguhl7RGBCwd/xBkEqPJ9FSEy05WHkDZ1fYyWcBcLWUZPjEyb5uKWYutjTDfEfW2fU60kQ2M/gq18lqSR3lU4aX9OPxlTQTlmXY0wrvgAetXpk69mmqoEhrKt5Q6dUssPgOtLWN059uiJgyrV3pcptFzxbJHZ1F9CCULNcbBxdshA+yE4FhY2OUgc7Y7LQz/bfKYzdHeVeH4GAU334nW1sk03r6CHmgm8ycd02X0jKh84UszD9MGdCFVDMg1rRqsCruCD9uadmeDq2+8X1HAhCk8bHIo8t/ptybzb6Ma10XqIMYG2LOxw== 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 5920d4715a11..517cf2b271d7 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1371,6 +1371,23 @@ static int khugepaged_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.49.0