From patchwork Tue Feb 11 00:30:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 13968642 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 1148CC0219D for ; Tue, 11 Feb 2025 00:32:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9A0F4280011; Mon, 10 Feb 2025 19:32:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 92B3D280008; Mon, 10 Feb 2025 19:32:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72E83280011; Mon, 10 Feb 2025 19:32:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 4FAA3280008 for ; Mon, 10 Feb 2025 19:32:42 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 08BDBB10BE for ; Tue, 11 Feb 2025 00:32:42 +0000 (UTC) X-FDA: 83105788164.19.0FCA780 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 3B25F14000E for ; Tue, 11 Feb 2025 00:32:40 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cSjMJcf4; spf=pass (imf09.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739233960; 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=mWdmFB3VEeA1XnEF1XTP4N/+VjRlOdLjAcJyCJVOZpY=; b=HsdK8BcAz1rxNm4pMUW1hbsXfcwX9W50KNcHOdN4vo4fxWSUc7C+kEj8ZMcgUCXs3/kfXp XKqmJbjyVUvVEJeBhvgQcrtqvZIaXN105IBoP7URvkS5jAof/810rOqNT8szPA6IWTOzEE CT4XIuvMEX9LsBVdV1sFKbRl/qAm1Vw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cSjMJcf4; spf=pass (imf09.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739233960; a=rsa-sha256; cv=none; b=qCojBg0H0QiZ7OruIHNnDpxvZmPbHiOQ0067IC4fbANDfPUeQH90Wh5MtngE0IIXZdUjLq Yze6SPNptsr8tfEJAwXnBNsBktSCdqzO6vjyBC05pdDkMKO8aPkz1kHdNhbc824PKBvlK4 ppkNptExuSNGJ6G9TEoV30WOLNm8o4Y= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739233959; 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=mWdmFB3VEeA1XnEF1XTP4N/+VjRlOdLjAcJyCJVOZpY=; b=cSjMJcf4bklPEVPujHQLJhuJEjKyEeSlyNrblwO1qSfYbd318db4V8TaGscl8m7nF0v/Y5 88+WlPqaARuM/SuTVrJ5dY8ckL4AN/M+uHqQncx62Dkppzl4ntWcrra4/eRkdcNxsvNp/f KufNkbTlJLdBxcz23JwuzPjOnCCocpw= 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-20-dTR64f4SM6qnszwScxMw2w-1; Mon, 10 Feb 2025 19:32:35 -0500 X-MC-Unique: dTR64f4SM6qnszwScxMw2w-1 X-Mimecast-MFC-AGG-ID: dTR64f4SM6qnszwScxMw2w Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 84DE3195608C; Tue, 11 Feb 2025 00:32:24 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.129]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A30601800876; Tue, 11 Feb 2025 00:32:14 +0000 (UTC) From: Nico Pache To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org Cc: ryan.roberts@arm.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, cl@gentwo.org, vbabka@suse.cz, mhocko@suse.com, apopple@nvidia.com, dave.hansen@linux.intel.com, will@kernel.org, baohua@kernel.org, jack@suse.cz, srivatsa@csail.mit.edu, haowenchao22@gmail.com, hughd@google.com, aneesh.kumar@kernel.org, yang@os.amperecomputing.com, peterx@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ziy@nvidia.com, jglisse@google.com, surenb@google.com, vishal.moola@gmail.com, zokeefe@google.com, zhengqi.arch@bytedance.com, jhubbard@nvidia.com, 21cnbao@gmail.com, willy@infradead.org, kirill.shutemov@linux.intel.com, david@redhat.com, aarcange@redhat.com, raquini@redhat.com, dev.jain@arm.com, sunnanyong@huawei.com, usamaarif642@gmail.com, audra@redhat.com, akpm@linux-foundation.org, rostedt@goodmis.org, mathieu.desnoyers@efficios.com, tiwai@suse.de Subject: [RFC v2 8/9] khugepaged: improve tracepoints for mTHP orders Date: Mon, 10 Feb 2025 17:30:27 -0700 Message-ID: <20250211003028.213461-9-npache@redhat.com> In-Reply-To: <20250211003028.213461-1-npache@redhat.com> References: <20250211003028.213461-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3B25F14000E X-Stat-Signature: sn45nxxmk649fxb31gnq4qxisi4i57u4 X-Rspam-User: X-HE-Tag: 1739233960-934168 X-HE-Meta: U2FsdGVkX18aFqO3R6R5YdVcmcUuGF1KmLUyM/JypVGEHlYWvPZrD9zVTaFpU/WVQIITTsQjXL+ILwjNBOtYFdtbSYBCgVTlG6qFPnWWPXAcwysjQTFQJIrcln42Ia0LbwEuUjtjm19DjXEWtONMntTG9DwFVQAa0jLGIhBM9aMK+rRTbjRS4cR4No0f81HBxD69v5AGLExI/+n5UmfIxd2s3a7tMOG05JUb4kEVdHYeAIJVKIrOcjNiMketzRvmMtOYM4VD1f9i1bl0bi7yfeJLJJDhrsGaFEBOhER9PmyMiTVYRjSx9TccsaibDQ41XNvqA5ZPos95MV3HNB/Zc12mZnoyVGwlTozQglKZZhTKKkonmBsdl7X1sFpxFDoBqlwNuU6llsBqN2JlemYrO8tAeiUtQXdEzNJb6VxTmx0KLt+/E8L1s6ELgmE+ZT2a/1l+E6dI0INeiZpZ6scyAb7zoLPvrQOLHrfVfio3EesQIEAQ8KciB1eIOMIcfzKoBaLLc877SqVzkD+k+yGoFhDwUA6WYlV/yiEK8dtvNu49d6NwkU/idwblahZGg122FUvGHoWRqnqAsjSEsSzI8Gbk5RmjIPwjA+3OjWioR8bbsb5+YpGX/2RWi+CBPmpYTrbPSYNiOAtszz3P5VEhPDH/mgYDQBJP8Ee0JMH7ZYittcP8TOiiPmnz6gE6VzgEM4geYnsmDm3lyiFOPgIYCYSuiA/+BMiV8thorbskRqStDcixvOQXZ4f2YLKeF2PVlbQnusxpAojK/3kTLJ2hm+531KzPieSuYOrDR3GliOzITPfqk6yRQImXS7URdtn+FV24TzDPcvHALVXdJIvYYFcLn6+edbbUTqI2kLlN8EguRcG1oSG8C8zuSyoEncLa5JCqQ1qf4P8XlqOlHtD/DgNF4g8eMPi8rwqg4MgailCV782r8eG2Ic+hxXNuUb1HdEInQEef3mB+MlKA0QX 92o1hnJC pXohEFrg97qjakwUZTbn+YRIAtx3pxmlgU1cB3/wveWSzi5nwxif1TUCMEKazSUnsKrACah1xaVsp8iWt8hNc0s0RiN8T+rLSi75UfeEQuWI8e3Bjm49vnBia0QtatuBCwM5QhnPWhICETsUvSWfw9eLOwiUrVp0y+SUAO3ATQt4fBXOQ0YQkNqJqxbexJ2CA2euIvtzsydiTqAD0HoBeGuhfBjfn2V3hmoSiD8pIQTGXa7DzXueb8odZ1HuFAMcwSXoe4ybmnA2Z0Y+scwT3h/rXLd3HpoXIGxW4vOHXyxvpcuIWnf+AHAYStUL3ITje9V+wg9WPtk77ldFsRcBvvKodxyTX/GYP7PoI0ckxui+b68v1nhiDrnsPTbsmzR/U7ndnKsyt2QVIZO8= 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. 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 9d5c00b0285c..ea2fe20a39f5 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 page *page, int none_or_zero, - int referenced, bool writable, int status), + int referenced, bool writable, int status, int order), - TP_ARGS(page, none_or_zero, referenced, writable, status), + TP_ARGS(page, 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 cd310989725b..e2ba18e57064 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -713,13 +713,14 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, } else { result = SCAN_SUCCEED; trace_mm_collapse_huge_page_isolate(&folio->page, 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->page, 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; } @@ -1305,7 +1307,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; }