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 432DBC369AB for ; Thu, 24 Apr 2025 07:51:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB5F56B00AA; Thu, 24 Apr 2025 03:51:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C67506B00AB; Thu, 24 Apr 2025 03:51:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8E5A6B00AD; Thu, 24 Apr 2025 03:51:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8B9D96B00AA for ; Thu, 24 Apr 2025 03:51:55 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id EF0A7140C83 for ; Thu, 24 Apr 2025 07:51:56 +0000 (UTC) X-FDA: 83368168632.26.F65C362 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by imf16.hostedemail.com (Postfix) with ESMTP id A3A7918000C for ; Thu, 24 Apr 2025 07:51:54 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=PTXLqxZ2; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf16.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745481115; a=rsa-sha256; cv=none; b=WZCAKtdJX5MIKtQbEL0jDrM85RZh/rFUlpRISmsKDFg78qJPyWn04d4AJI6qM94KIS3yVu UCuB/12odvLWOUIWbT0yww22EalnPI4E8yr5E2wiwhd2JlxygKsNJFMtMXpqbPH2VKkuYl lnPaJalk7qC2Nii9gnUMIrEbatpBGss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745481115; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=66EBE6//T4b858PvX3WkhRuMXFKHkqm2EIhR70lCzm0=; b=hfgZvilgElv2/SEzSCfZfF5cIXp39PmYXQVzDKUxRnyQzIw6JDezK0KNoqabe9+YuQaRMf FB/iKLursMmf7lObWaACVRCy7FWiKdMoquQA1rMvLTuskMlmqa0nEk1xXBFL5QEf2hJLID s4UmRuqO+9gspX0vVT+sDb5VHkZO6LM= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=PTXLqxZ2; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf16.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1745481111; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=66EBE6//T4b858PvX3WkhRuMXFKHkqm2EIhR70lCzm0=; b=PTXLqxZ2wqKzOgET/j/LK2ZkUvISvOtbDg0bc1GtOqKITCc6Rm8st68pgCKQn93tJuOZLCI09uKra3ifyfRaQepSy9U82GEIPZjbS8RwfjMRYHTN7zMZFVb2D/oh3jw8NBq6LXEDO5IXPSPfMDiZTj4UodgBtPxxPxw46kjNAaI= Received: from 30.74.146.225(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WXyHI1o_1745481108 cluster:ay36) by smtp.aliyun-inc.com; Thu, 24 Apr 2025 15:51:49 +0800 Message-ID: <5187c3fb-bf2a-41a0-902d-2661f1b3a2c9@linux.alibaba.com> Date: Thu, 24 Apr 2025 15:51:48 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 10/12] khugepaged: improve tracepoints for mTHP orders To: Nico Pache , 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, 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 References: <20250417000238.74567-1-npache@redhat.com> <20250417000238.74567-11-npache@redhat.com> From: Baolin Wang In-Reply-To: <20250417000238.74567-11-npache@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A3A7918000C X-Stat-Signature: totfk6iu3bdtkmmnunopydry3tbyt45j X-Rspam-User: X-HE-Tag: 1745481114-292435 X-HE-Meta: U2FsdGVkX1+MjMwzKTD08qT4NIrBLkawgxEDv5b9fDs9QeUlsL4KWRJBQ0DQEnxAQ6JyoaM24u5nPS+NpRGhKpIoBy78IZ1GPl28dHR+Y5mCCmWIHF6+djlUuBAx0Uuwy0P6xAs9jtdYgaE+Y7Gk6EdO5jYX3wjvr9xxTWd1TP0rwD/AU+tcYL7XsEd9TwiUEv53EvLaRQDt27wfamBK9+tR8UOrJZQ4E2thaHCGbyQcxaINEZy0ZEkudoeOHWhCqZx8mxetQNe0x2Yb+kayUuBCTumBgqnEsXeJe4JITytfR59JARYWznqpLTchLKgS/3PUi4J1k5RDMRdwUzoW3aVFcJV+HA4TR1Cf77Q+Hoadh7NKhmqQDxz4fQ8f4Bdb9C+nG9sJjHxD03R1fIa/IvR9nzP5NXAo2AFR0WFE4rOxD11+1w8sfRe+T/PJn3d48R0yiAU3G/C+pFVexpAn3UURBMHHMpumFZD2AckzRQ/5q/XIo9HyWAwRQCWIaNCQTPrMGCZR5MyT0jhpSGFsKdK5DwUJlhX1xwoF2j41H2LIlZXO7WRHqZw0dWkGS9foD8KxLCcZBlSWTCHLC70qWBaxsQ5leMJc9j8OiCHn7GdI++RYMmHnS7nvH4x1q50HMjvMWTyO8RCkxmnoJ9sQrllrFsHE+P5v3jD9W8mAtRA00lN/60hLaCf1rqE4yGZyA5Zj73IEBqGYQQr8FMPiNm4k+QsXqSYqVi/1DuQZcKs046HBgQenG5Hr/VO40C5EZ2Fs/x7ZpcGndM+T40VDBg3pgpVSLgpGyA/zgp5ZV6Z9GBsBXmRFG6PT7FCn4lmdkc69PazV2vHIbimJ17BictDtsYA4AUi0nckO2OnnsGF2n8YdV9StuN1VhdGFH8+IX3Zc96FSaPL697lx6ws1QIzx7aDtCg/TBJTQABQLd6izYPZDQ4y4Yz53aFb/BX6aoa2Acbyqsca8nfHFa4E Od+2x7PZ Bwpp92zSiT3Q5tcyZ7sNk5x9ltxXoYAQXW9vcFpowfn3bb46vDJhQR8MEQhIU68bJyIc2taEtkrRASMmY9o1Irb2fHR2X1CTgwrIG2gswDFs/PlWzSxlNaep58V4ypGhfoxn7kE76YgC4gxRiDUaQ0Socxrq8v2e+RNzYq0/4T8Ri2zoam7S8xQZUW7NsPAgT4r1TiGw6M58JoKCQIhWWxwsktXIusXjSfwVvyyXfKfd/0r6yvVrpx7NZ754YC/Y0bA4FhKplkBmYy6/45KzeEY+/k/klPMilw6BK/NOc1PFcAaT7+e2q/17oygCb3BIAnTZhDjeLSA8lbIueYGgXRGixwNmdd7LpNdDawXthw98BU4YxkNOJCtmsZw== 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: On 2025/4/17 08:02, Nico Pache wrote: > Add the order to the tracepoints to give better insight into what order > is being operated at for khugepaged. > > Signed-off-by: Nico Pache LGTM. Reviewed-by: Baolin Wang > --- > 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; > } >