From patchwork Thu Apr 17 00:02:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14054646 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 1B4A0C369BD for ; Thu, 17 Apr 2025 00:07:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B46CA280151; Wed, 16 Apr 2025 20:07:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AF5DD280150; Wed, 16 Apr 2025 20:07:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9BCAF280151; Wed, 16 Apr 2025 20:07:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 7AA71280150 for ; Wed, 16 Apr 2025 20:07:30 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2413681006 for ; Thu, 17 Apr 2025 00:07:31 +0000 (UTC) X-FDA: 83341596702.22.92B4E38 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 7D5E040007 for ; Thu, 17 Apr 2025 00:07:29 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PTuYwvzi; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744848449; a=rsa-sha256; cv=none; b=XQK4dCbGKSMefCvNwDU0CPxCXJtVzfw4LQVe+WfvVeLmkfSt29PlACd46o2fiWTii68O3v gc6bDeDZU/Q/ZHOpOT5t6ruBYtlyviUp3LJ4ME/b2+Vj0LgHvEhDZvNJGGrBp7556vRIWK i2l1ci4DqJ7ZQibksyptVrenJw1QwW4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744848449; 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=lT7Le5l3OvCTeyxGbSyLQ+XqGfqD4qwGKJUaU5ZKhXs=; b=EIHiTlVQHF9PX2UCHKq6qKKKEcUauFWWPAgtmtrXQWvunJXfVV1bJE/1i4CLxC4SoZZIwN 6/XqvK5MhxHsnMuLzutFwzI/58PV+rd4Cq0HziDWNhUCfjUoqYhl9r+0vNmWVMVDvDWDeb m063eAq+nBtA9oHdTAD1cwcURhcLCbA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PTuYwvzi; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744848448; 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=lT7Le5l3OvCTeyxGbSyLQ+XqGfqD4qwGKJUaU5ZKhXs=; b=PTuYwvziJTD+enUDkfeid+xr+lEQT8N/6s4TNmcFRXp9TDSK1MI15quHQE5XAMqSywdT2q 8A+CBvMWctYQIZC34T+4WuQwcl38DGOkF26cG8fJPRU4sCyuePpFM7g46ANGXv/fZHlppw 8b8hPqmRxuZlgawLmdSSVGiMS8RTcrg= Received: from mx-prod-mc-08.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-445-eXBT7ml8MMi_oRCb4gBEvA-1; Wed, 16 Apr 2025 20:07:23 -0400 X-MC-Unique: eXBT7ml8MMi_oRCb4gBEvA-1 X-Mimecast-MFC-AGG-ID: eXBT7ml8MMi_oRCb4gBEvA_1744848439 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A0230180036E; Thu, 17 Apr 2025 00:07:19 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.34]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4933F180045B; Thu, 17 Apr 2025 00:07:11 +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: akpm@linux-foundation.org, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ziy@nvidia.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, dev.jain@arm.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 v4 09/12] khugepaged: avoid unnecessary mTHP collapse attempts Date: Wed, 16 Apr 2025 18:02:35 -0600 Message-ID: <20250417000238.74567-10-npache@redhat.com> In-Reply-To: <20250417000238.74567-1-npache@redhat.com> References: <20250417000238.74567-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7D5E040007 X-Stat-Signature: cgjkgbpnz7byb18jw9db9zf5rgcq5e6t X-Rspam-User: X-HE-Tag: 1744848449-697292 X-HE-Meta: U2FsdGVkX18gqfZs+VjTCWmIK3jUQjnmkmcBmTBM4tx4kW/+qSbaTle0JXZHKTunKPPOxLAnzDlNfamqUtBB7esccI/vuGcuHyFkWafwumvuXu4b8O35uetW4LA6Djg6BXtjCoL1eC/85DZ3Xyw6jg6okRvBFTNWpmNnK56LBzLOscSevX5vgbgt8TP1YMrFQeQ0ZMSjGeG6Q4/IxsvNION7KUYNQcGMIFlm7yIRjFi/4zN5d43nopoJQ9bDB9e5bV3/7laBoKPb1sNoejfqNdoxICYjKfAb8zuEn3t5Aqc17eCwDHds+v0MEvVoyFSBYgOss85hgH98H2SCDUgu2INQqKLJyxxhNB6GHcBX47oujDa9CmP8AYAQZ8iOi7rBz8JSmnfg11k3bHZne5AVsyL1jA3yJsze9YPUniX61K9A3ag8CmUwP/BphgqR8LuevVEa1wwSxEKxtnSYDdnlcIZQADQEqPfdlIRR2jxV9/z3v/U1gNRItnh/G7ky8EXJOQMCJ2USUkqV9UU8deGi8dbsgspQT3W+j/h1egc60ZcgyToCRspxA5WJWmsj4TcOwiVMag73W5JoVgQI6wBujZCU9t6Q/hGLPPrdxMCz1OqN7ekV0aPc7dlXoRJPkJjNVMGBptakWX8vyNvD7dxyveEDe6MqpHeS6rkSJkv+fUO0yvk4U5N/RyG/LjFF6SpSJDb6QM8r3qf5BC4WnQEzbwD1K2M102/f58WPxtIkS05Zhak/rKPzZe1Qg2LVqCHxnsaagO4N2txN/W7OIGa3s2CqzZdsmLxgp827YB+8Mb4JdPRtZkWPrGY0w3TPzSEm9I3Xvee+hrI9HhwhO/cbZleSdc5dAtRo6sNw0fNSBHtKswgmN65OQrFNijDetw8Wsjp2AAHCcV83rmF+8xPbw5N2SBfZaIxyCzdtKcMYfOEnmpnTarzJa7OFaXPWvIvlfDcN/uyvcDCx+A3EKi0 sZ/ZB9Yj tgJCtdvCg2zJyIP1PWKT2E//l7eC1kndqPn4nBHBpDS3nXnCi5aFcacQEpNPOuShwnTJ+xoYly4bRNLQ0kN6AmQKAXWH4bsGwdq0a1E3mZgU4tO35NCPqpKptbCjbzS7OOPiM 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 383aff12cd43..738dd9c5751d 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1366,6 +1366,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: