Message ID | 20250414220557.35388-10-npache@redhat.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 1678CC369B2 for <linux-mm@archiver.kernel.org>; Mon, 14 Apr 2025 22:08:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5323B2800A1; Mon, 14 Apr 2025 18:08:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BB1728009C; Mon, 14 Apr 2025 18:08:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E5492800A1; Mon, 14 Apr 2025 18:08:07 -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 10F5328009C for <linux-mm@kvack.org>; Mon, 14 Apr 2025 18:08:07 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D105E1605B7 for <linux-mm@kvack.org>; Mon, 14 Apr 2025 22:08:07 +0000 (UTC) X-FDA: 83334038214.16.21D9E98 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 4AE88A0005 for <linux-mm@kvack.org>; Mon, 14 Apr 2025 22:08:04 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="V8dx/VXg"; spf=pass (imf25.hostedemail.com: domain of npache@redhat.com designates 170.10.133.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=1744668485; 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=ZcJZphRyHLZo+N8WDQs50obgYAPQYa0/jjuYLyo1WUI=; b=QxxjsfK0669UVjffc+xUi3ag+njOIsVhlXfLs4oOH7fNWsbnzou3pqJ3mXyd6hDJXXw4x0 bzldUaufh7HOfQUKc7wsjvuwrERwTRu7usQDhLIQQ6JSoTd1RJDqE9d2JwrKPBfx42qMyw ki0kDeumOpEZwvAsNY7L31J/32htQoI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744668485; a=rsa-sha256; cv=none; b=SeETr+zCWGxCeio/EXoOEl6c0D4knVUrcs/gIgJpWbvPc9M7aG65PGUGrI+E/5xy1DVdC+ pNMwdJ36nzeGVgA3vxkOwYcNysuZPeGZwfImQD+wg03lR4zsmf3dGRSAr7lT7Kyfnik/Qa jc763B/pGKfqQeOqNxckyFwpKgRJzuY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="V8dx/VXg"; spf=pass (imf25.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744668483; 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=ZcJZphRyHLZo+N8WDQs50obgYAPQYa0/jjuYLyo1WUI=; b=V8dx/VXgf+NWoZdrXo7VnXj/kGuRxvPhaJUwzM9Luigm7ecBSA4QhjkmA62ljTuaXurKby FRYI7wxH9NFEuagI5AME43xdLkiA4+MpWnoRlXyDas+arzTnNyojIUyybqYAN+YkM1HI91 EAhdSgy5hgTSU63MRS9CLQ+nBCdi6Ro= 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-270-UG3tPO-1Oq2w4uzgC6Xx-w-1; Mon, 14 Apr 2025 18:07:59 -0400 X-MC-Unique: UG3tPO-1Oq2w4uzgC6Xx-w-1 X-Mimecast-MFC-AGG-ID: UG3tPO-1Oq2w4uzgC6Xx-w_1744668468 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 23D5F1801A07; Mon, 14 Apr 2025 22:07:48 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.91]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C1A701956094; Mon, 14 Apr 2025 22:07:40 +0000 (UTC) From: Nico Pache <npache@redhat.com> 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 Subject: [PATCH v3 09/12] khugepaged: avoid unnecessary mTHP collapse attempts Date: Mon, 14 Apr 2025 16:05:54 -0600 Message-ID: <20250414220557.35388-10-npache@redhat.com> In-Reply-To: <20250414220557.35388-1-npache@redhat.com> References: <20250414220557.35388-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 4AE88A0005 X-Stat-Signature: 7jop3t4m16r5q3tu6ot4chcqxhxok861 X-HE-Tag: 1744668484-119094 X-HE-Meta: U2FsdGVkX18xNdyxB+VKKoR2JH+61cHzOFcOQ2i/5ScvmF36tXV/dwriHFRluK5UWQyb3Kd/Y4xhNu4K+RERtrhUob+ZnJonZQvEDzUj1o2YE3bbQBf20sAXGGif2Jw5ryXDB4mp+v7xUHqZ8IFcwZfTKiAmo1faqAhu0CQLM8l7Pnt1P6qSpAAqREjnstPc8FdS4Q13xkbKc4L/6UNVlCHMfpA7EJeS1H/Zgx/1T3arE3XjfvH2aPTbBLQqROGOHYMAxSQ3sOuDc2n2zrg4pQeGqJnkPQY/CsuDgE3KwgVbr66qwXzAw6TDPcH6TsNsOYYO7AhJO0byYDFMx7SljFJmhhcVe3xZGUqEWvMhuap8lNnxHdOOOJn7FxRk3DaZ2hKK6TAcrUw8l3qj79XWm3lQoCqIjXhCKdFiDGEp+dTGrce34Nh/JPSNt9nNOncQ1VqWctDjWY1ybURTGycIp4ezcEm/niS/Mo/BtMkk+mDCePTCaqxWuUAzKqUncPVqFfDkW8ESFP8B20nrryhkfWXYxGcno/t4hvAPSA5GGdtHH5rKBS4hmr8TcvSTScQSYFs5BYvvW9jOb+6VA5cejd3M1Q0/oRZ7N6YtWYPfJlk9kGz1M171XMGMG5FwHslnbXGlb6aAjsNwsZohh1TXpp0DyTmKtXk/R9N/AvOlAuWqXLIH5L0VQ3PGyiou2jkijSs8SCmg9+QTB/LH0bMx4UKRYdolyAW8jeOWmQWHIfwsMAKdkFYFpH9xM7aSaPjP+AjYr59yIgXnuS0ZscI0w+3PcB0m5zrdualnDGfqg9sJ8d/SPMhhtMcHzf7PW+Hl7XkYr71CZL1l6AIDZLCj+4+AUTlSsMmtMtgVIOi8vfenUdSnUjLOvndE21yRQSAMs/Ta3VfQQJHbW3i3v2xUxcyY9lrbEnpBPtyGkpaKo1DVzar86QhhB5eDW27I2svyGfjo5aovxMKrKlwpyKC gGuN6j50 ob5xgllvjNy1rVlw/P4Bf5vcdj4/cuPyvUmpbUl7T67N5r/wMCMLEHpAzg3I97dtawXFNeTgS6z9PgWcn/U52Rqca6Q7CFxCv+T9WQBBHBmguUU786vbCXBpUzdKY+dx2MtKfZq6NuXvWV2/VQDqojL2tMSKtidhVktwducHBUv709qjZCMYBRJIN5vA4ufcRZYOMk2qRhl2dwM7yx+StTGbkzF0YgXhAHzvGghbNduoz8Qg5irh/giVFUR3UWfEumhUF4tO307LzE8Rf6miPu1/heA09ZDeOHcF10KEJ8THaE6e+YPKaY8h0pYYjENhntdgFZFIM6DD3LfNtpyOzTDvh8UVg0UDvaM5z5WZG7WWAb4bSkZxVQkMv9S6GG+ExxCYFSrDqCY/vIeq83dBu/pE+sg== 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: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
khugepaged: mTHP support
|
expand
|
diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 114056276003..86e4c5100181 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:
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 <npache@redhat.com> --- mm/khugepaged.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)