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 BBB9AC001B0 for ; Mon, 24 Jul 2023 19:10:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B5D16B007B; Mon, 24 Jul 2023 15:10:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 564638E0001; Mon, 24 Jul 2023 15:10:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 405346B007E; Mon, 24 Jul 2023 15:10:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 345616B007B for ; Mon, 24 Jul 2023 15:10:30 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0F3B51C9AB8 for ; Mon, 24 Jul 2023 19:10:30 +0000 (UTC) X-FDA: 81047446620.27.24F9381 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf22.hostedemail.com (Postfix) with ESMTP id 9F6A0C0013 for ; Mon, 24 Jul 2023 19:10:27 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Eg07Wzo+; spf=pass (imf22.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690225827; 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=VNEBeAWzU/CT4iyd6EAoxgzBL6LW64vgyDe8qKmFgh0=; b=L6Z9DEwPsPDUKw1uZmIoJRpVhbH4nuVJRFtVYU4ApMcdL/ctSz2XnSwFrrJzOAggOKPs5v 4slchCb90uYPturzoKD1mJ5k/Yt/6izC5wl1TjUIcFUfPOGjRBUn90Bfjke8f/CPKRCqHQ p5mK3twzVKkOxisjsekMXAlwv5+ZiQE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690225827; a=rsa-sha256; cv=none; b=ClUGRJTo/PHV5tAFkOzpQBix2VMzrW0yZlXevv9VAbDFvgHtOBzJbhod/Eg+MF72B00qmD BrUbAy0gyjGDrN8/+SwBZcHSNeNc5s/VtfgALKMgFwCvm/0h2rrlW55laj1DndmEPV8QRe lIcO6B9IeW9H3utKiYoj0MGdmqHQ0Rg= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Eg07Wzo+; spf=pass (imf22.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com Received: from pps.filterd (m0353723.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36OJ9Vks012368; Mon, 24 Jul 2023 19:10:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=VNEBeAWzU/CT4iyd6EAoxgzBL6LW64vgyDe8qKmFgh0=; b=Eg07Wzo++/WPSXNsInbAxeEDrUuN6D8+uwTP+2ehrAX8cwbotjGI1cy30M4tDh+N8G1B EkyUKwgPju2eJ42gclRm0m0FVEuk3iLbB1x4I/yk7M0IUyecoNn3yWihHK2pCDQ4uCs1 GLDQBaU0OBX5DI7sbHa/6fdZMJhLLcS02tnaMkuLhmCHmhcOhfNmPE+9B8qgZKgYbN+R YNb7+g0wxMnR0mstL88qyz8s4HZOBCQCHUxCMcIcSU47NxlvcyXkbpyquWeegBtQowrQ 4c11jLgGSHYExNEjZkPuVEQJFGurohUe3zLqeUdGsQt4vxi1OZiXyK7+YayiU2arKuOB EQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3s1vrvkssw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 19:10:15 +0000 Received: from m0353723.ppops.net (m0353723.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 36OJ9vue014568; Mon, 24 Jul 2023 19:10:15 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3s1vrvkssm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 19:10:15 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36OI0bji002375; Mon, 24 Jul 2023 19:10:14 GMT Received: from smtprelay01.wdc07v.mail.ibm.com ([172.16.1.68]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3s0txjnkna-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 19:10:14 +0000 Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay01.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36OJAEnG31064600 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 24 Jul 2023 19:10:14 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1E60158068; Mon, 24 Jul 2023 19:10:14 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4C0F558055; Mon, 24 Jul 2023 19:10:09 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.177.66.22]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 24 Jul 2023 19:10:08 +0000 (GMT) From: "Aneesh Kumar K.V" To: linux-mm@kvack.org, akpm@linux-foundation.org, mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, npiggin@gmail.com, christophe.leroy@csgroup.eu Cc: Oscar Salvador , Mike Kravetz , Dan Williams , Joao Martins , Catalin Marinas , Muchun Song , Will Deacon , "Aneesh Kumar K.V" Subject: [PATCH v6 08/13] powerpc/mm/trace: Convert trace event to trace event class Date: Tue, 25 Jul 2023 00:37:54 +0530 Message-ID: <20230724190759.483013-9-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230724190759.483013-1-aneesh.kumar@linux.ibm.com> References: <20230724190759.483013-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: tsAODs3yZXCKz5iwX_3juu_3x31vgKdm X-Proofpoint-GUID: MykmrjbFbcLZDV9QhlQqoR2j0HYK66AN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-24_14,2023-07-24_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 phishscore=0 mlxlogscore=999 clxscore=1015 spamscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307240168 X-Rspamd-Queue-Id: 9F6A0C0013 X-Rspam-User: X-Stat-Signature: m19r5bnbhxgrxesqnfrimrfzsgp6odik X-Rspamd-Server: rspam03 X-HE-Tag: 1690225827-954582 X-HE-Meta: U2FsdGVkX1/Qmm4kzxsegbvU21vfm1SwhG7j/bYVo36VwCCyTjrRX3xk+9Wxi3nkURtZl+xry7IXjmGH8VvY3FKLv+POP0PSBvFMfb/p6JDT3MKq6Mg6dDQcO2vVBicw+AzjDPn0UL4/kfGaXvus59iDcWqXnddI+KChz0ioTwXL4BPemCs06hm7+BKe9NG6w3Bzg7brkiWytCQfFnGcpNz/DmqHArGBh9MgVet7ON9ToYrpbamFVRmnRR99Pq9MdRP3Kwo9Wj95MZC7Q2el/ldadfUw6dqHQNscnRdbqM9wIFy7+lxPged+a5+JcwmOxR+Q7N0PeZV5vUPV3zM9BIId4Ktbk/Qy6+QPJC+cxX4Fz0D0QFBGXHh4ACjnTtWY/o8JnzXiV41PtnsUw9sS1P2BK2OMgkYcyd3YPpqFeW0LybeFFBGwS6DRhxSljFrSuvdfUFlttUzrSHEauczDhLizjLYoGMoZGii4TgDXKkXE4fXEVI3c1hbv3zN51Og75vC0oyQBGXt7W7rjEbs/IGl+Rvq+6WE/DgXtfOo1wiTSWT2BS6aJjC+Gx9zfNw6JihOdm+keLu00lDgswrLG0MB4j2ou4bc9lO45neV8CSvc0w2j2G6VD7J2ivCadihPaOv4kyOEkT7bNHbUvt2l4BhggL7vrksfAtTnjPsoYrzocN1q1gvZXd/FMFfiqaBiZ3cxQ6j0O9PGDOFsoFidzU7bw0QlqdMJQfe6Bsuj58oTUDt4ed9g7ESdBEp6nJipz/ZlGOmOBjFeHJJd+34q4r2aJf0CLB73WidGaq+Edbe5wMXmOQRq7dysPJqTrN6IFcJQHwR6JM0K2mCwp38NQ1e9/mGRUQOCXPnenvxvhT4McS3TP4AxJ448jYcTVs7YFqC0c6SeX+xc2sf67BvMmueAo7sQLhG3sAlS88Np8wSHCAqoqtbZdbMOz83kDO8GqsRaV1+MuMudE7tyMPc fuvB9Zy7 PgAhHm/5Lsbyw8MP+egBbOW5wFZkyMZxehNR7z4rA2FR5Q023r/PJQeGYlmjo3W4/KdO6liDPSzzmPlFfB82cGeu9m4zoYsVrECShw9j9pUkpexF4Q/8rbPAWHLR9U2XFEoevoxR5b/520njagTQjg4vUFMpXgNjEC6PMvNDfRjnQW33jqc4two8AaQEdTbVCCuzYukvV06hbOOg= 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: A follow-up patch will add a pud variant for this same event. Using event class makes that addition simpler. No functional change in this patch. Reviewed-by: Christophe Leroy Signed-off-by: Aneesh Kumar K.V --- arch/powerpc/mm/book3s64/hash_pgtable.c | 2 +- arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +- include/trace/events/thp.h | 23 ++++++++++++++++------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/mm/book3s64/hash_pgtable.c b/arch/powerpc/mm/book3s64/hash_pgtable.c index 51f48984abca..988948d69bc1 100644 --- a/arch/powerpc/mm/book3s64/hash_pgtable.c +++ b/arch/powerpc/mm/book3s64/hash_pgtable.c @@ -214,7 +214,7 @@ unsigned long hash__pmd_hugepage_update(struct mm_struct *mm, unsigned long addr old = be64_to_cpu(old_be); - trace_hugepage_update(addr, old, clr, set); + trace_hugepage_update_pmd(addr, old, clr, set); if (old & H_PAGE_HASHPTE) hpte_do_hugepage_flush(mm, addr, pmdp, old); return old; diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index e7ea492ac510..02e185d2e4d6 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -962,7 +962,7 @@ unsigned long radix__pmd_hugepage_update(struct mm_struct *mm, unsigned long add #endif old = radix__pte_update(mm, addr, pmdp_ptep(pmdp), clr, set, 1); - trace_hugepage_update(addr, old, clr, set); + trace_hugepage_update_pmd(addr, old, clr, set); return old; } diff --git a/include/trace/events/thp.h b/include/trace/events/thp.h index 202b3e3e67ff..a95c78b10561 100644 --- a/include/trace/events/thp.h +++ b/include/trace/events/thp.h @@ -8,25 +8,29 @@ #include #include -TRACE_EVENT(hugepage_set_pmd, +DECLARE_EVENT_CLASS(hugepage_set, - TP_PROTO(unsigned long addr, unsigned long pmd), - TP_ARGS(addr, pmd), + TP_PROTO(unsigned long addr, unsigned long pte), + TP_ARGS(addr, pte), TP_STRUCT__entry( __field(unsigned long, addr) - __field(unsigned long, pmd) + __field(unsigned long, pte) ), TP_fast_assign( __entry->addr = addr; - __entry->pmd = pmd; + __entry->pte = pte; ), - TP_printk("Set pmd with 0x%lx with 0x%lx", __entry->addr, __entry->pmd) + TP_printk("Set page table entry with 0x%lx with 0x%lx", __entry->addr, __entry->pte) ); +DEFINE_EVENT(hugepage_set, hugepage_set_pmd, + TP_PROTO(unsigned long addr, unsigned long pmd), + TP_ARGS(addr, pmd) +); -TRACE_EVENT(hugepage_update, +DECLARE_EVENT_CLASS(hugepage_update, TP_PROTO(unsigned long addr, unsigned long pte, unsigned long clr, unsigned long set), TP_ARGS(addr, pte, clr, set), @@ -48,6 +52,11 @@ TRACE_EVENT(hugepage_update, TP_printk("hugepage update at addr 0x%lx and pte = 0x%lx clr = 0x%lx, set = 0x%lx", __entry->addr, __entry->pte, __entry->clr, __entry->set) ); +DEFINE_EVENT(hugepage_update, hugepage_update_pmd, + TP_PROTO(unsigned long addr, unsigned long pmd, unsigned long clr, unsigned long set), + TP_ARGS(addr, pmd, clr, set) +); + DECLARE_EVENT_CLASS(migration_pmd, TP_PROTO(unsigned long addr, unsigned long pmd), -- 2.41.0