From patchwork Mon Apr 14 22:05:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14051086 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 523EFC369B5 for ; Mon, 14 Apr 2025 22:08:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A83AD2800A0; Mon, 14 Apr 2025 18:08:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A346928009C; Mon, 14 Apr 2025 18:08:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 923E22800A0; Mon, 14 Apr 2025 18:08:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7249228009C for ; Mon, 14 Apr 2025 18:08:05 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 36B08C0775 for ; Mon, 14 Apr 2025 22:08:06 +0000 (UTC) X-FDA: 83334038172.27.A420D6E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 6AEFC140003 for ; Mon, 14 Apr 2025 22:08:04 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ffa28jPK; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf26.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=1744668484; a=rsa-sha256; cv=none; b=xE+3Bz8Kjmp/HLWGY9t6otIOU+haSsmmg/aGmTHmeosmwXvby+7Z/waUdMCC0FR73hRY+6 4qE0NoWtADBRs4Wg5/A6noiO8mEWTO2wD9ixPtwo2RXrMs9DPVfwpHlWtiqNWtsTbyjOSS /uc6R1tF1SNeQefsE+VIo5Ttd4Q2/JY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ffa28jPK; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf26.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=1744668484; 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=PYXrSAEt5l2U2Xh9JJaMnzvAc4JHOtXOLyT0D9PfDoI=; b=HXmghxezQjm5dL2Qo8bWsKjajt6gTwhtYGB0MieFuTYCroojinwxkQpK+pLI6cztGTxpI+ yYTs/U6wuCDLGw+MNMCghp6v6D1mkcFyFctcbJtajPxEpc92rc3hgmSWXLoz5OyJVC6tnT O2AQkDCAmpJCdYN7Do8t3XXiYB8DD0k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744668483; 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=PYXrSAEt5l2U2Xh9JJaMnzvAc4JHOtXOLyT0D9PfDoI=; b=ffa28jPKHA/n+RIuidEHXCP5ZHeP4n147hwPN0mmBFKtFgQtmflHiwNz00KlRCAB4cHfpN AHIZqUKh9HLKSjMbhu/Zd7oOQpEpbS/lxOpLMe5TglzENcVrHpRvSxlG2OnPNOESunO9RN 4MwwalcEwrDjt3og9jHsZ+7nCwnEjzY= Received: from mx-prod-mc-05.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-347-iMkoo9zeMc6Ie018wIzbaA-1; Mon, 14 Apr 2025 18:08:00 -0400 X-MC-Unique: iMkoo9zeMc6Ie018wIzbaA-1 X-Mimecast-MFC-AGG-ID: iMkoo9zeMc6Ie018wIzbaA_1744668476 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0E8771956089; Mon, 14 Apr 2025 22:07:56 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.91]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 729901955BC2; Mon, 14 Apr 2025 22:07:48 +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: akpm@linux-foundation.org, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ziy@nvidia.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, dev.jain@arm.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 Subject: [PATCH v3 10/12] khugepaged: improve tracepoints for mTHP orders Date: Mon, 14 Apr 2025 16:05:55 -0600 Message-ID: <20250414220557.35388-11-npache@redhat.com> In-Reply-To: <20250414220557.35388-1-npache@redhat.com> References: <20250414220557.35388-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspam-User: X-Rspamd-Queue-Id: 6AEFC140003 X-Rspamd-Server: rspam04 X-Stat-Signature: 76f3ab58kjjjp6r81ebap6n5j14uqcdd X-HE-Tag: 1744668484-543427 X-HE-Meta: U2FsdGVkX1/SFbXEgYJ9y6/OzEaRIjuIeMuliBtLtzV6YJDzKBfe98y/3ouf1yqKRioeb4hhTDfisIjOBU6SwjjKcgzo9U3YgkP8j2010pDI47qSX4YLnLhUgLE1cIthK0Gj1XybCS9hDrfAve5Yg8R2kCVStMfHmUdirnp1IpvgLPfgRDZycxIbCXs7kDTVxGfabon0ZLuXVQMfR6IscpxTATYIrWhejJ9K5Gq3g2wAt2cHfC1CcstPv4khVnJCPD2WLqJMLbk33+zeBgB2ztJdL0+sKDWlXIpRzqiEmYNbhwn3RKkuBCVq4YDdY10vpmp9nhLfP14w32cWwJVkKYGXCDMBNThD8XwcXuPGZy4W9OS2wKPW/mishkM2uPXIIhLqjaPS7CzEqz6G2Mdf1SrRanXcLv+wQw2a917xVHZMSof5YoKz7TQAJ6ZEFOH1MMl1+3FjNpubb1oekRohLWclrPzUgye0LLvYYA4zV6vNNub5kKocwLr7D8g9d98MVWbfS6hI+zhHUx69BXewyqUihvuVbLlIqKvi0gKbN1b8xuUsuwXaJy7Q3p6t6i9xj+/AilrFbGMuEzcJymCzXBxtovm2jYvFMfCYYpvn2uk4fo/t+FRK+rKP7Xrv5Un5Y5z2dllW1gmeVNd07uW+NlE+2JzYZ4jXINouBxhmYpu1Pjj2Q5c9AAHVklDDKTKaeGjJp0aCkbhQKsRInQL/ufgJqbHYePvYsux6CZKQLXIWMloIqa7haVg2bxkKAsUZrHKkXMusN2FHcLiyrlJEQJaCKSdEtH6ILd2S0W+m4Yw4MOeu1ZY09YFNVU3XijsFYgY9LBYlHegeBbquodtvjOuQN1tJmDRbqr1lH415mhsv3LrCy7SFabcpMCspQniYfCNgQH+msr+5MZ+IaL+G1nR8jT77Cv3CEzvKZCt4HcLtq+HHYIGeyFwg+c+QU5SmPuWXnBgMfEFIdmqUgeA iLypw0Oq e9VFIR/iXSFdTIoAW/Lxf7HHkaIXwbsdsI8MAz5IvBig8yjh77qNAevPGDv484yUYHfmQCiNQ4obPfUuOgQJg+LxqrKHC7jxIvViVpkHPIsM1us2fbYDUFzg4WM5ldotx1vjC6ZwI/19uaXy0AWJPnoQyy5sygAeuZQYN9eXvHw0gPbpX/aMv7ap3sXxAgHyH+c0Qo79dpEtCVrtgFBt3Wqs4pzSSv4SDsTVjg0WE59u4P14Woh42mhoVMWaes00K+VYAqe1PcNETq4yTs06kIep5PplUL8GAJpBnVBLP8i6GH5ShXsZUZalhl4uuHPCBgDkrAaNFqgsyWp1GX4Tf2ROeFA8MBuICv/I1CqlnDNEBZoSmxl8njRh5ZV8jjbNL4fEkU1REmfTvcHAzRusxt8mq6A== 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 86e4c5100181..8cbde2ae0112 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->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; } @@ -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; } @@ -1318,7 +1320,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; }