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 7245CC3ABC3 for ; Thu, 15 May 2025 03:25:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B30166B00F9; Wed, 14 May 2025 23:25:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ADBE86B00FA; Wed, 14 May 2025 23:25:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97CEB6B00FF; Wed, 14 May 2025 23:25:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7636F6B00F9 for ; Wed, 14 May 2025 23:25:32 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 71CD58018B for ; Thu, 15 May 2025 03:25:33 +0000 (UTC) X-FDA: 83443702146.09.EF9E505 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id C0624180008 for ; Thu, 15 May 2025 03:25:31 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GPYPyXPt; spf=pass (imf24.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=1747279531; a=rsa-sha256; cv=none; b=DTxq/k/OTVos93h1D/pbsvoju9Q2touQFAYx0b/+pSW8oZ4wqvl4TRoy/mio/y3L+06Ks2 Qy4ZapKm6qBMP4ZzQeVxCAl/NM3wpOojyLb5H8qy94U2F7ebrrEYhCocBUAUoUiX3Vid0G zF+R5Gq44pd8icnJ0opdD7Acdepvnwc= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GPYPyXPt; spf=pass (imf24.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=1747279531; 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=kQadoxmQ9n9W1fxy0ZzAe82DG7Xs+e4DDy2Ly81jeGXLEGo/GLxWeZlbfLrTz9Mgv9PBkh hy5mviqAznUznCY8AnKdTPeAhSt3Mt9x8DLFQHsRKYJRtU+FmPqEnrze5FLvJvKr1mjOjB 7iuXr+pT9RVMUbYOOGxedrzMLvwFoMg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747279531; 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=GPYPyXPtQOs74y4QxinwZyHBYWOQK9lLV3MqWLghxDkZpXoWuzofb0LDsQUoxcopjT8qcH BG1JOFNFxBxKcMbfiaSp5/cCEFvz2iUnMP0G9EGdV8eZ+3T34t8zBteA8OMXIq/yOgrY9O toj5C+TY7gDnAMCBUsDk3agANZswTTA= 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-479-G9r4VyQxPhaa69sbd1iONw-1; Wed, 14 May 2025 23:25:27 -0400 X-MC-Unique: G9r4VyQxPhaa69sbd1iONw-1 X-Mimecast-MFC-AGG-ID: G9r4VyQxPhaa69sbd1iONw_1747279524 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 05DA4180035E; Thu, 15 May 2025 03:25:24 +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 C7FAB180087A; Thu, 15 May 2025 03:25:08 +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 v7 10/12] khugepaged: improve tracepoints for mTHP orders Date: Wed, 14 May 2025 21:22:24 -0600 Message-ID: <20250515032226.128900-11-npache@redhat.com> In-Reply-To: <20250515032226.128900-1-npache@redhat.com> References: <20250515032226.128900-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: rspam01 X-Rspamd-Queue-Id: C0624180008 X-Stat-Signature: 1x36gtj1omn1exnxamxsdiifczepgnwb X-HE-Tag: 1747279531-829400 X-HE-Meta: U2FsdGVkX18eQ+FvCJbasQMZOIkVMfBxEWkbTIcGlwYjVdYD2qpDTuJHJ2uWW87nOubS3FeZ9djbfP0jdHzU5j7YJ/tfakU6canxRK7WxEdXg04yjLDeXbEDdXc9+Bvpk/C5iUWQrS1SJ16OZ3TwbBMFlpZq7n+btHYLvcKdJaj7X6zeMr/nm2Aa9bj/A26HNocgrJRdMPp6IztQAqDMzpeG5cuCJnxjZajYOlCMI+CezWSa3j6N2fBQyS/pe/KuGcGwANywwOPdUD4UEpgN/TSuxMlOD0HoUungkaCR43AUugmciNkMcUbfLQa0mY1/v0l3rGwS4a2RikpTpevXc6ECnjDsKNVvRkbrjGdL+8IdeN9oAd8v538kxdPv9CRcy86TDD9UrM270Ujz+0+0LKsYocojKo9Z8av8dRsvwLI4lTYEUJKGy5KCGYSsGbBFsmqo5z0goWLCNlldt9xTYBRE/HVhugiEQc7Z24TZqRhMeDMsub1zgraYHsrN+Ya/2RptccKTN8swLMEwXqaNhtXsv7w9MyuWeSrai74pYC1b0/8Xnj+jODDIY8zLOG9LV5OwVEkHj/LmzNa+TJsBLZ2ZZVCTbkI3oRDUU+CAVxGDJ6tKWNR1n68IOyKadrw9GUN8U8w9qBFowZ7EF8FejKSNgkJiw7ikMW8Ll0hNzCfZ9hpm7kXr3CoL8MoDY7N7Sxc4YcT5hNgFNPDSX72R3jr5VBuTsDSxkzT6Xjh9JmeOtTsIFsIITMrvyXnVDTBq+GiOf3YdVEgE+1m8O0hmPndpoKXAX7hy47tkek3weChIrW25WfgZ8V5xwXwCVcvuVNNSJOBVE6d+6gco/M92GWgTL/As6vYycBXUBG2gx2fberCT/fXu8zqdvwCsaiP4H4GvYTcCYsT2tiVBrV1ebkqW9g6pqoBMAMQeEGD3s+WgyRgYYw5B+hR294K3tDayQASVTkLRc08V37cEZkY 13jZDMZR DMu+OZFyOmK08Rs9RFa6Oc8l1MfX0uubAEr1WVLpKlsjj9pJ/hxOnA26zzObJU67cqTY9fdslRv3RkENLSSF+0nBjPi8M4b7Cn0N87LBJnflO3MrJRBN7FRhK1HDFagkYHWZ6gR2JSdKNuPYARm3QWMNGAtXDNL11NxbEk8OMRJdThfs5Q6GrVcU1NqA3QjXG6zAdKxj3gf5BzFJD+16qN9m8FtI1U16Kb8tArGs7k0dLoRkOxppLl+cy+NqHHEgvRJLdlVJjC8yVWNKsMZqcjtMC5CZtenLhFu98dzbVBZRzI3plYJLzsgFaRIJ/KDvkanpp2dpn5Lzl4Qis6wAupUzWE6OPBJ7hh9+seHwW42oe9EbrprF4k/0lBpo35dBrGlYs+wVtBhP8e8B7ZkncIRgivJmqxawT/lIeq8XuLrfdF/U= 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