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 2E3C4C83013 for ; Wed, 2 Jul 2025 06:02:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C2A206B00D1; Wed, 2 Jul 2025 02:02:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C00816B00D2; Wed, 2 Jul 2025 02:02:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF0296B00D3; Wed, 2 Jul 2025 02:02:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 9D9C56B00D1 for ; Wed, 2 Jul 2025 02:02:01 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 65CED5B2EA for ; Wed, 2 Jul 2025 06:02:01 +0000 (UTC) X-FDA: 83618278842.25.C786B0F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 9DF4A80004 for ; Wed, 2 Jul 2025 06:01:59 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bSnz2B3j; spf=pass (imf02.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=1751436119; 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=Te3ncyc0BcAKNiPn3UGiXNtvO3eBlJiyC77AptKisoc=; b=S0Iycl5+Rzl+oCeKmTwytqKdslUaJo1TRtCwbJf865c2kpEMcnHixsf53fK6ENeS3I+7O7 iZT1n6yG9Jr+MPvKFX3WGTQTydtlsM5ZNj5A2tNESMmUrq/rMRlhHd7wjxrHUdT8W1Fc6L kkeHmxzRPquwVv+pW69FjnTf1shgp0g= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bSnz2B3j; spf=pass (imf02.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=1751436119; a=rsa-sha256; cv=none; b=BxSv5s2ZkfuJrXvVjQ5m1kUaEdfIjRJjtQvz/JuVdRKEIoyvD59BGuTa6Ee3Wm/h4HYVQT KmXdp2IMKHB3n3YVGBugNFdwsC2YlHCXgpf8LX0Lc7fLr3Rnd71dAjYpB/QGZIIYNFEV4u bSAd6tPlmtpRnv7+5cflu/EkSuIlBdM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751436119; 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=Te3ncyc0BcAKNiPn3UGiXNtvO3eBlJiyC77AptKisoc=; b=bSnz2B3jDoYY/cJRHbNi5eQ2VYZ2nJpkTD6tBHMY/HbJuxGw6lQlU/Fh9lpLRDdYACB+MC JOVCgBPZ8XS7cLIPaOwc8K2UdZH/yGx2GOIwfrsrgyc2Htpqucn19uBQbHbeeolw60er+5 2bWLR7oaAWm1RUoIEeBvNEJo4jsfsHA= 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-607-pIqVZFUKM5i-5tAW-osWpQ-1; Wed, 02 Jul 2025 02:01:54 -0400 X-MC-Unique: pIqVZFUKM5i-5tAW-osWpQ-1 X-Mimecast-MFC-AGG-ID: pIqVZFUKM5i-5tAW-osWpQ_1751436110 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 F1424180028C; Wed, 2 Jul 2025 06:01:49 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.112]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C81B918003FC; Wed, 2 Jul 2025 06:01: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 Subject: [PATCH v8 13/15] khugepaged: improve tracepoints for mTHP orders Date: Tue, 1 Jul 2025 23:57:40 -0600 Message-ID: <20250702055742.102808-14-npache@redhat.com> In-Reply-To: <20250702055742.102808-1-npache@redhat.com> References: <20250702055742.102808-1-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: rspam05 X-Rspamd-Queue-Id: 9DF4A80004 X-Stat-Signature: dq4ypbrf9pcs5476fqjzde5w3wn67okr X-HE-Tag: 1751436119-913600 X-HE-Meta: U2FsdGVkX1/tZGlGMdJBpTa64J9aisFF1Ng0cT0bo1hRrtZI83fflG6llOnH4lzLtnToZ3ZcR2H8vTbAar371kR8T21dLqWizmQYFgqlcUT45NBilaVhwNP/WIxAJMhff7A0Tp8YvWVE0cq1uRAnMEtQLUV4H71wEUwAqbFIvn+f5Zccjt+Swu+VlBgy5bqC/tMksyJYa+Ds3pS95eXUXmzIWQWZMErLYxu7ecZT9WGKCh0cxKCXFoymkYY8mAxMPdUUh83Oyx36FjHS7yN+F7PMmn7itTaRhN9c7TWPlNoT3hdurZf8rHVi3TtKHOc7kTHex/S3E0jU9cT6kK/Y5nBlssewxyHPwmn56FNVC2iRQJiy8YUWiJXXYfCVeX5ZHa296+lpYlrKlgYmZz5SL2hcT279EN0E8bXGW5ldlPN7zNGUBC/9lz+eO7fFKVcEopR1jcsw2pu/UVk4yA1+/Mff8bcxGAJSCHpUzsJHqFMDCX99iV87rZFPAosEhYtqDxYgsrrFmx49+y1ZqKYByK1Pvzpo+yuFDIn/qRXTu+bxQ0vhcXrsq/ukNX48XpF3wTLLC/K0XnfYNPKDFaiQXWHvTLeI18k+zR0XfPUYdSjDg+S+OYMUuRLD6UVlnNJbajPHf4yw7JW3IfJF6IvAh/GZ6oZSzqfPfQ5tS0j2nYetAqZUx9hSUQ8VwQqau4zs2hOxaSuRd5YeofxdQFRSVr5VJTSjpyIPbokZXAzXLfJQStk0EdGy1sr7KRMcykwZiDBFyXhGsMlXL5rFRg88JkDiLkEb1Xpgs6m1SJPuFpqSPsefMby9z0xsScFrRynz1DrbKiygpRhTCNsSrcJCSvjvE62kO4iSTU/rKdQo1qU+X+6AggXy1/HRc5sGn5Bjr04ERL/q2uPAyPUBmHQEbO9kvAdbtW4q0USCssRugHCoBz+3if0IrvgJxeds7K5BYukQqg4CMk5Wl6U63sw 3rigcU8I MhpVeGtj1vG3cdcXZc1RT0cFp2XxI7/TFPYBe+KmyzhK68yNO4LyRP8DP2aC/uwH72veM/dI0QfdIRZeUSUuYSXASZb6XEVLFbLfL3sVQEegnHLnEwdw0IjgSTm+ImhgQT9Wc99pzO00sHnQUvqBkWoFuauj5co/KpeOEFqlPssbxOQ5hYT4KIJSveww7UhDVZ0/SlUziqXWMr4cP+dBlhcZMJ60ryM8cZ4J7oFk3mDKsR1qRgUbkpP9x2KEJEEx+qIDDCvz463twZjFM1gfkd2SvtxcDSxs8Fk6Ghh5d72qmcpO/DELGRtX/uRetXI8XpzubhATsb4CSxNxHSHwrwWxtgSIVxki8obD76dt5adBCtADaZXB20RVgMAKOItaVlC+nBQBAwcbs2uOucFYnAWtNq/zZ0at5mM8DfKWXvpzDVVc= 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 d20a217387ed..2c0962637c34 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -711,13 +711,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; } @@ -1088,7 +1089,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; } @@ -1313,7 +1315,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