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 89D31C83F17 for ; Mon, 14 Jul 2025 00:35:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14B4B6B009E; Sun, 13 Jul 2025 20:35:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D49A6B009F; Sun, 13 Jul 2025 20:35:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EDED56B00A0; Sun, 13 Jul 2025 20:35:38 -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 D7E706B009E for ; Sun, 13 Jul 2025 20:35:38 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AC7A8B99B5 for ; Mon, 14 Jul 2025 00:35:38 +0000 (UTC) X-FDA: 83661001956.25.D88128F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 0201320008 for ; Mon, 14 Jul 2025 00:35:36 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LidoejeR; spf=pass (imf03.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=1752453337; 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=TDHsdfiITWi1pnUsMSjaLnG0WwHLXZ+KHZ38MYerHJU=; b=OImhOVdqOsnd4hdXFzIgRnh6bSmc4dyuAwvKKVMIWH/pHck5ioymCmdHY64mfRWrt7pati Nqw/vd2EiZxQNOiXt8FtWkKACukrHoWwwJF2hg8BBz1BM3GrMQc69LsxD3MTgUdLHeMZWV ViFCpZ3hc5B4mAZms3xH1hbLaa7GOTM= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LidoejeR; spf=pass (imf03.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=1752453337; a=rsa-sha256; cv=none; b=JLAO0yjiZFlOLyYg0WBz1usRu2eDbRJziBGV3fqRhBim8CdKyrfU+OF1L/iV3t5sdFbZNw pjtViuTEzNaXn+cfO7AJflL76SILTX7B3CnLVhSRg/wnKXVxJ/8h8mJeOINESspZUKiV/o KJr1kXIBWdoYaUvVR3hzZuoAmdoXmdc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752453336; 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=TDHsdfiITWi1pnUsMSjaLnG0WwHLXZ+KHZ38MYerHJU=; b=LidoejeR74ESJJuyE++tPfwo98YZJxCAQqBRvKlV+uCATNFkyuLZF/9bhT91ASneImqSIP UqHfu6l3ASmn0f6QaxYaUUc054wazJA9G5sVh2obrr7RZ+cQIaZ/ctpTXG6o5jDO8P0N8E CYoe65YHv1cdpCIlLGMsExcvx/yE/kk= 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-297-52g8xMnVOduRZQaxW_M1UQ-1; Sun, 13 Jul 2025 20:35:33 -0400 X-MC-Unique: 52g8xMnVOduRZQaxW_M1UQ-1 X-Mimecast-MFC-AGG-ID: 52g8xMnVOduRZQaxW_M1UQ_1752453328 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 651701956086; Mon, 14 Jul 2025 00:35:28 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.9]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 526D730001A1; Mon, 14 Jul 2025 00:35:15 +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, hughd@google.com Subject: [PATCH v9 12/14] khugepaged: improve tracepoints for mTHP orders Date: Sun, 13 Jul 2025 18:32:05 -0600 Message-ID: <20250714003207.113275-13-npache@redhat.com> In-Reply-To: <20250714003207.113275-1-npache@redhat.com> References: <20250714003207.113275-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspam-User: X-Rspamd-Queue-Id: 0201320008 X-Rspamd-Server: rspam06 X-Stat-Signature: y4xtj9sdtnokahh3dqdxyqf56i6tjmq7 X-HE-Tag: 1752453336-403590 X-HE-Meta: U2FsdGVkX19cqGdgibHfIb76ZBjwsgcWYmeJ/ypqzstJ0pKFriGMDryFr/RSM4i7Ea/MwlK9uI0sa0+Lqhu+o9+ucOiOJRmYRstQQ3i9+zG5Vnb7zkrem8xE0K5UFU5HIcw+DZinWTHQeUHGHki8NKw2LNgcqdIwovW1VX0osSz+Pk37gcnG9WR0Xpc7ll1OHWpvcjsR2Le+yfRn4cpoRyvZPIJRI1Cn+7i+gAdDHlWKhSq2ppAV14HaHeL6s5UqYdMPqFiGLTv9B+AJbjam2svMVuSDHl+AoQhOqRz/rb56wtxClGP7uRqBHYn9+mMKsTYVaXo+sGcJqpuG9BhdbCWmzOUaf/HFsoFkMUWkPxi6H5O3TLDhNUZh58f/KEY1Vd1SY65SQp1aAQW0R9Y0K1JIA80A2Z/hYNd0pQNFjdtnt5NeSxdISxJJHZmVtcSxK+s+d/GbIalWQWGZC/X4VIgi5+liLNKrkGJ52Hn90vUMnWcesCiCJgpGjEqBLHuRCeKz8v0aigZSOLF2L88UyX8AryrN9xDerY45jBqOKNO7BXv9oYv9fNQbAPEDTjzSkucID1yRtyfnT/C25nlvQ+7m3IDUd7vJZt/xjl/ePCgjB057UY9S4HySjkbVzVKPQ5EWbo1oLTpesqmbPGXeP6qTHIPw9K6lCaiNHpM2wIzMGp4TBxHkYROX70iJpW9AXglH2/cZPlwoB5vtkEVFm/HbQrDuwFeJpnE2f0R3o8IB71bo6HtS8y8DgaScwiaraEXytKU3aqFbxtLrouRxiaT28kn75IIIO+e779ssoGAADR9aY1+UaaGrBBq8zFdW3NlevT3jfHSK1AatigTv/gTiOi/McJ3AD3m6ihc9eml2OJcMwwJQ3mFF2xB8+U6XcaBBzOA6eHA0ZUWvls5ShJgKR2h2ZpUfJxVK5ImZ9V96azdyyzgYaIgv+yTi7JabsiMlcIahxpi+1Lq6gx/ LWYoOgQV E8IkiHHXtwlHgu1pjUWNmMhpWC75UUFg82UqQW1d6Qylo+y7J7MOsdgPMFTZl6qOwp/uLAj5QstqoE0ZB3uySX5nc2lkPHsnSQK/xt7QeDZCUuQrzfazyRb/MqEoE8iWIrH+lsYjzrjwA6xPkEsZK0f/qcyuAgnJoZyhPeoGfBALCNW4AbhM85uG6s0xL4UoarNW9oWSpCfpHSe/7ctjRL9w8ys4KgmB5T5U1TxbAdAhFNuTeEc4IwJq81sKE0yY7IB6P/F4g4rz3rJCzb43KpvLO7b76ETL3dxyukWYJRtlw2NKICM15xDMw2Od2eylY3tYaJPnD6l1xwz1Mg+D3JF4906zTF7LiYkaeIC+lxxF0M1WCeNnCTiuI85sM4aEfPibIuAsFhFkd+bFNGnetmNQiM6hubnVfZauHiOA8Iy9FOnU= 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 65cb8c58bbf8..d0c99b86b304 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; } @@ -1097,7 +1098,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; } @@ -1322,7 +1324,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.50.0