From patchwork Thu Apr 17 00:02:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14054647 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 20C21C369C2 for ; Thu, 17 Apr 2025 00:07:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD090280152; Wed, 16 Apr 2025 20:07:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B7EF8280150; Wed, 16 Apr 2025 20:07:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A4749280152; Wed, 16 Apr 2025 20:07:38 -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 8626B280150 for ; Wed, 16 Apr 2025 20:07:38 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3227080FFC for ; Thu, 17 Apr 2025 00:07:39 +0000 (UTC) X-FDA: 83341597038.29.04798B5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 7C432C0009 for ; Thu, 17 Apr 2025 00:07:37 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LNZBLkep; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744848457; a=rsa-sha256; cv=none; b=3CX+qvfS7od2f+FGPLJzR9NEOYxTKuYypGmOkWsR1MILiK6FKdBWQBYK4664k+V9J/isgg R6eBnst++i3pzgHNPqWPDPivKVv38vRwUEOUEnDggCZljjzX/2PGrw9Qc92uTbgCJ7Bg/j boGWTZTcGHpaBF8FD4csAAGS3u2Pzq0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LNZBLkep; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of npache@redhat.com designates 170.10.133.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=1744848457; 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=I5MjwLdOROb4OzoYHmS/XbFwlXwBFtjpdsTiTGPdAHg=; b=wPByaZo/xvNYnVTIb/mnvTqG7BubHpWnpPb/84paZm+CItkQEbk/yU9qMD8M77Jvg3xRvZ t6LjFHdF/loPGjNT3f55DyOHR6o7hiSGoWUkV/o6IRX5j2zQzYtC2g7aywovZA0nu9xBDE YQz+LFq14wUvTztQvtBQEaD3hL/zeUs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744848456; 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=I5MjwLdOROb4OzoYHmS/XbFwlXwBFtjpdsTiTGPdAHg=; b=LNZBLkepVPEBNj2iLDyyX9/5HE9X7bTNZa14ermAbNpm1yybiGNFfvUxfSvULq4u8BPYRI ZlBH25xmO4YDIrqPcP4hFHX0xYfqRrK8QO6ApIke3mw1TAZaEEy+Q7tslrYEuM5tuyBkzy Vzcfpssfzy/4qC/5pvM/Bl1r1j4brp8= Received: from mx-prod-mc-01.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-52-rmiki82LOK6rDQ1-cKmcXw-1; Wed, 16 Apr 2025 20:07:33 -0400 X-MC-Unique: rmiki82LOK6rDQ1-cKmcXw-1 X-Mimecast-MFC-AGG-ID: rmiki82LOK6rDQ1-cKmcXw_1744848449 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 33BB919560A0; Thu, 17 Apr 2025 00:07:29 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.34]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 01E15180045B; Thu, 17 Apr 2025 00:07:19 +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, rdunlap@infradead.org Subject: [PATCH v4 10/12] khugepaged: improve tracepoints for mTHP orders Date: Wed, 16 Apr 2025 18:02:36 -0600 Message-ID: <20250417000238.74567-11-npache@redhat.com> In-Reply-To: <20250417000238.74567-1-npache@redhat.com> References: <20250417000238.74567-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 7C432C0009 X-Stat-Signature: nr5un3djfqns3u47coqhhkmx7ua1dg1w X-Rspam-User: X-HE-Tag: 1744848457-183190 X-HE-Meta: U2FsdGVkX1+0T47kwK7bCZiIo4VcuGk7/dLuxqgBY7j0yRzgd40yjcIFqwrznn3aeXBqOq2XixW2XQnGVNtjWFwvrL4cqn+/eTdNnn8mbkXh1WDq78bCI3+nlKttmXoWKFae45ryJhXRUoe15n8LdpQ8Hsc+doJXyTSMmnIGVnqkWLKa6ElsdVaQV/Sw25MyCWUWPgySsgIrumHwHEhaMp61YE8rsXWi85/GU12b26LI0CdkSMG9Bn+49vAPCk+q4DPJpxy6DO705Logekytykm5hvJ5es31lQJZMQWjWTd1594yq0R3bRGLbScN0asK0BRmjQuaLVXGW6soejlaWzlKviopUOQ/RKNwpSGtdjgsJKX0px/z9Vsk48xTRyQl0hfzEzuEV28N2CXcNpa8gUKtce8nlsZZYEcqUg59nnmuymUwNEcN5koI15F1DPZfuUhs5UqmJhIkPKnmK4bc4UlvFHXIT3pfbDIKkatdMKx2k43j8JUIkSvI1J35NM2ltoOMoO10czmK8DrcVIvY0RhG1bvyEP5W2ddcDz/73Z5bFkmJPHqWlAkgT2QwtKc/eUAXpfeMuXiXBrUvzcYR7g7amwm2HjJAwMkODT7+GkHTiiGGJ/QOqDYUSY1G5ejsmXdt+gbPwGu7QKGpbAfryeBPwzZM+0OFIePoSqifM/v2jj6P4R2NH9haP8H1OEcMzIjLI7cj5rlrTME+84zWPu7WGBnSVt58bxBJL9+0SUxTeKgYuYHmSerdd5BBCBkPtSaKzi6kMl4x6lV1iba+neb//RTkuf8df5fYh3FCwcZwaif5ByX+SvZ/8RZo+Fi5ZHmETJsIEcfkLEXeV90ckLYF1rHsd56v1IwyziiBghQqpqwyLwYmlqAZggpEtxPcAklBCUYCncH3jBpsvcryvl8bYnycO7GTg6Mpebu5JiNpJn+bA4uDwW4c2d3QoRuG3bHrV/AA5pSIRW1VNni E7S0o7rA B0snYezt4ASIIQByk6BjDlX5QswPoBKvr9CstEqjWLkUwTPyaTtmLKr43FdE3165FcYtTLqQdJQwrYmrlxhCy00d/eX3OY1hPgug+2eZuk3eQGPhIKEFIVsCqeT250FQYCorR4gcQj2tJkmz9/e1qc77XNkSFJib/2J0/F8GumKucUybcNdE8+7Y6vOv5REa5p0SovyfPYGzrB8u8uOvp0siivd5o5h5l/xy75qS+0thjRP/ajdf+9UbqzV4dpb5m3c8qgZwa5cq+TubkCo43pEBecuDlWAX1eZdStW7lcacf4h+9xlpzhKBkKIM9KbbFm9BLgVIuW+wGX4PUrBlmbOoEWPYKNZTcE5RulvwhFkjPEXcebxbA74nfG8umn5IXSPNy2QDUO8hvHLD18diUpglGAQ== 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 738dd9c5751d..67da0950b833 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; }