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 6EE0EC3ABD8 for ; Thu, 15 May 2025 03:06:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 517A96B00EF; Wed, 14 May 2025 23:06:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A0806B00F1; Wed, 14 May 2025 23:06:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2CC5B6B010A; Wed, 14 May 2025 23:06:26 -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 0B94F6B00EF for ; Wed, 14 May 2025 23:06:26 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6CF801CA70B for ; Thu, 15 May 2025 03:06:26 +0000 (UTC) X-FDA: 83443653972.09.E4F0803 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 1285CC0005 for ; Thu, 15 May 2025 03:06:22 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Nd56qddh; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.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=1747278384; a=rsa-sha256; cv=none; b=vUfzOehNYfGqCxQbjJcJ+t11nwILKj7I6e0Wapy/ai0ILx7ffv70CBQDo/zkvbZrw1rOkY dOTnIWiReHhDt/4rOTYBO9Uo+3NEBLtGvbToJm4kmO2zITu4cUI9ZuJdzg0ENOmN9qU15K U3TCDUtmTdbM6b04MpT+F/WCw4xNpxQ= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Nd56qddh; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of npache@redhat.com designates 170.10.129.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=1747278384; 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=a1560guXkqYUZ+/e7QSvzrzCUMRzmT/mDtQJhfKhhU8=; b=wcwkOh+Lvhf8JSReur7GbK85pgho+69n9F4XojCpMyn8FrQxkkTxu9uMNn9eEBmmS1zZBy 7Z89UMH4QZgdUa+gRkgw2A9cR16tyscFfSkZyPQTqiFcACXwemae5hSNskw+I1g7L8+9OP LrUKGMKM4SXc0u+ZKCvIKLqgV0EB5jo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747278382; 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=a1560guXkqYUZ+/e7QSvzrzCUMRzmT/mDtQJhfKhhU8=; b=Nd56qddhqZrWFkkPoMXlstCMUQJvvm7BxCVIS9MpWL7HytyS7RpuwrhHV7jmpHCuQ3/5+u E0/mTmBGGh4R1ONwxhfCj3TvK9R9zeNA0LGrC4fmukrE5xjEfB5zdISnMKhWD2lyn6J1KY 3n+zXvnb/K8Z2CTLH+aogZLvO0/ZHls= 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-615-N4b1AtLXN0aC6A-vJlebzQ-1; Wed, 14 May 2025 23:06:19 -0400 X-MC-Unique: N4b1AtLXN0aC6A-vJlebzQ-1 X-Mimecast-MFC-AGG-ID: N4b1AtLXN0aC6A-vJlebzQ_1747278375 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7A70A1956095; Thu, 15 May 2025 03:06:15 +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 543181800268; Thu, 15 May 2025 03:06:00 +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 10/12] khugepaged: improve tracepoints for mTHP orders Date: Wed, 14 May 2025 21:03:10 -0600 Message-ID: <20250515030312.125567-11-npache@redhat.com> In-Reply-To: <20250515030312.125567-10-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> <20250515030312.125567-10-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 1285CC0005 X-Rspam-User: X-Stat-Signature: obampom9jpsn89ctk13irdatduxcgzwh X-HE-Tag: 1747278382-238840 X-HE-Meta: U2FsdGVkX18JBPU2uQCdHaA3WvxUNmuK6WtB2JEUSM1vlrz3B1IssgxfHiBrgVPIs4pW5xf9BGWS2xac2TT6dKHjIJ9CmfKgbODAslX1+FoChfRNJ8vUhZXX6ZzkHf7ZvYCRsqfKM2ShC5UoOZ/eKeNoXcjw/p1E0Em5bAfwqMe85XaRfsvtDiw0Alrx7xqJrgadNkDG2Oul/CzG228dgRjARq799WP4xJxTXYYcn1cqcaQguHo7b15jBvKs7Ex1g+l75MhZ6nm+drdkX7ImzFQQvyKHZ25b3/n/FWFbmwZ8z9iAtFD80jVHv86xCqVFF6Tx4QcxI224RftRbnQ6vfW3nnLCCM6N+PAnentmOx0+5ZKxsaeltjymORLKgyoA06r/yNpPypjVbWtlpTDRvrXmQuwlk2G381smhtRTWKMMB7JB21BNY/Qoi/fQYTG4+EZj9a1vBaYBvQGIlfnwUb4pviYQee7CPh+ab07WAsMmacR3QAKXjS/y7p0whHHSClgAQ8eG5ML8EMhxZ+ALwmTn5YDukZDbLjQYLGO0jmAPPg/clS1F/w+11WNqAbQooHl+mk2eq23Rf5gLypsHawtDhriIl5Ql0MBILuzL/fEetVYzkdSLobWvyIW0FdsPha55eWuYgYCMc8jeHGyySzEAlVXnWQAvgf69Uf69Dp0IT9Zb+oVLuKZQGVcPfpZQBdVLcAh+rRZt6ik2S8oFs+4BEfy/8CFPaT6E+axDUdSn+DR/YyDZhNIuzYxpV8u1vE90I7IGslLIe31iYJ6tH9qWN8TMh3E2DBEwdxi9yWjfAmJUiWAQ0Bj9bcspW2p0PvcWNo0UoySunLRPNZiHeoie7HPkgZXsYDMkxJ7q/WY0/LtuNoblq5nSZVSmNjMxIjm29MgZlnJk4x7WoXjSAOlGXknKKTVX/a50Y0dW1WpergOaVQ3BJhpGkV1KZ8y9/4aKer4LdDAsfmmSUML CP9LqB7H Gxnm+jlPnRh6BXHs+3TGzKneZw/3oNo/nfjTtcrtvUdNruy6KU2WUALNY8TWHbZS83FR3l7CKiilXtNgwrDKtUWPKjsDb7O/K1p1HSWDxIYTH3ID0g3NzaIBAYBx/vawIKXEB4HDdw3hTBNSGxlPbG+6Auv+/vdSXl3tYv81Kv6QCsshyu4F1BUksnJoB0CfSU4I5180OoOUIMxP7N8tS2osPiVuYpqoGN5SFfa2TuqzhDKpuYINOuXmqkLu7yuJsHFChM98WDWEkd+iw/QUYd7S0Ypa9EiSWPzod/trUPyi+4kbQUoCNY3mFDV59zKZKgLKrURuB/NiaJvO7azGS4ZKr0KIUcJjx/Ul9HXaet5s1FLUivj+VFDquPmrlLVA4QMj5JDSp74OcUoFFJpSLeRiy+Ttizv323nGRDt9tRMQugPA= 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: Add the order to the tracepoints to give better insight into what order is being operated at for khugepaged. Reviewed-by: Baolin Wang Signed-off-by: Nico Pache --- include/trace/events/huge_memory.h | 34 +++++++++++++++++++----------- mm/khugepaged.c | 10 +++++---- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index 2305df6cb485..70661bbf676f 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -92,34 +92,37 @@ TRACE_EVENT(mm_khugepaged_scan_pmd, TRACE_EVENT(mm_collapse_huge_page, - TP_PROTO(struct mm_struct *mm, int isolated, int status), + TP_PROTO(struct mm_struct *mm, int isolated, int status, int order), - TP_ARGS(mm, isolated, status), + TP_ARGS(mm, isolated, status, order), TP_STRUCT__entry( __field(struct mm_struct *, mm) __field(int, isolated) __field(int, status) + __field(int, order) ), TP_fast_assign( __entry->mm = mm; __entry->isolated = isolated; __entry->status = status; + __entry->order = order; ), - TP_printk("mm=%p, isolated=%d, status=%s", + TP_printk("mm=%p, isolated=%d, status=%s order=%d", __entry->mm, __entry->isolated, - __print_symbolic(__entry->status, SCAN_STATUS)) + __print_symbolic(__entry->status, SCAN_STATUS), + __entry->order) ); TRACE_EVENT(mm_collapse_huge_page_isolate, TP_PROTO(struct folio *folio, int none_or_zero, - int referenced, bool writable, int status), + int referenced, bool writable, int status, int order), - TP_ARGS(folio, none_or_zero, referenced, writable, status), + TP_ARGS(folio, none_or_zero, referenced, writable, status, order), TP_STRUCT__entry( __field(unsigned long, pfn) @@ -127,6 +130,7 @@ TRACE_EVENT(mm_collapse_huge_page_isolate, __field(int, referenced) __field(bool, writable) __field(int, status) + __field(int, order) ), TP_fast_assign( @@ -135,27 +139,31 @@ TRACE_EVENT(mm_collapse_huge_page_isolate, __entry->referenced = referenced; __entry->writable = writable; __entry->status = status; + __entry->order = order; ), - TP_printk("scan_pfn=0x%lx, none_or_zero=%d, referenced=%d, writable=%d, status=%s", + TP_printk("scan_pfn=0x%lx, none_or_zero=%d, referenced=%d, writable=%d, status=%s order=%d", __entry->pfn, __entry->none_or_zero, __entry->referenced, __entry->writable, - __print_symbolic(__entry->status, SCAN_STATUS)) + __print_symbolic(__entry->status, SCAN_STATUS), + __entry->order) ); TRACE_EVENT(mm_collapse_huge_page_swapin, - TP_PROTO(struct mm_struct *mm, int swapped_in, int referenced, int ret), + TP_PROTO(struct mm_struct *mm, int swapped_in, int referenced, int ret, + int order), - TP_ARGS(mm, swapped_in, referenced, ret), + TP_ARGS(mm, swapped_in, referenced, ret, order), TP_STRUCT__entry( __field(struct mm_struct *, mm) __field(int, swapped_in) __field(int, referenced) __field(int, ret) + __field(int, order) ), TP_fast_assign( @@ -163,13 +171,15 @@ TRACE_EVENT(mm_collapse_huge_page_swapin, __entry->swapped_in = swapped_in; __entry->referenced = referenced; __entry->ret = ret; + __entry->order = order; ), - TP_printk("mm=%p, swapped_in=%d, referenced=%d, ret=%d", + TP_printk("mm=%p, swapped_in=%d, referenced=%d, ret=%d, order=%d", __entry->mm, __entry->swapped_in, __entry->referenced, - __entry->ret) + __entry->ret, + __entry->order) ); TRACE_EVENT(mm_khugepaged_scan_file, diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 517cf2b271d7..951c44778f56 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -721,13 +721,14 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, } else { result = SCAN_SUCCEED; trace_mm_collapse_huge_page_isolate(folio, none_or_zero, - referenced, writable, result); + referenced, writable, result, + order); return result; } out: release_pte_pages(pte, _pte, compound_pagelist); trace_mm_collapse_huge_page_isolate(folio, none_or_zero, - referenced, writable, result); + referenced, writable, result, order); return result; } @@ -1099,7 +1100,8 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm, result = SCAN_SUCCEED; out: - trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, result); + trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, result, + order); return result; } @@ -1323,7 +1325,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, *mmap_locked = false; if (folio) folio_put(folio); - trace_mm_collapse_huge_page(mm, result == SCAN_SUCCEED, result); + trace_mm_collapse_huge_page(mm, result == SCAN_SUCCEED, result, order); return result; } -- 2.49.0