From patchwork Thu Jul 6 08:58:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 13303381 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 17004EB64D9 for ; Thu, 6 Jul 2023 08:59:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A62328D0003; Thu, 6 Jul 2023 04:59:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A11638D0001; Thu, 6 Jul 2023 04:59:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D9468D0003; Thu, 6 Jul 2023 04:59:29 -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 7EF798D0001 for ; Thu, 6 Jul 2023 04:59:29 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 537B0C0B7C for ; Thu, 6 Jul 2023 08:59:29 +0000 (UTC) X-FDA: 80980588458.09.F805E44 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf13.hostedemail.com (Postfix) with ESMTP id B7C5120023 for ; Thu, 6 Jul 2023 08:59:26 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=iruaTUnh; spf=pass (imf13.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 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=1688633966; 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=HJ59ItgsLbPBAoIVj3eoS5U1bMjw9YWn4IbBZYPC7LI=; b=fRh9TrWItVVEkAg2DFs0txly91LZxPhEun026u/H9gJTJlj7HhjUfJTUPfZjH0gAogjd55 zo8xosRNZo/zOOsS6mhDAgdSq+rMplvyEZjOx3tjqKIU4Xsy/P17CLEYTyRuVb6uzKYhYV 9wUvAUi7rrL5vW2v9bb+73LnqsS18bA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688633966; a=rsa-sha256; cv=none; b=r/InYgJUiYNBA3Qs7PKv9TF/m+b6gVHOkkOlCfbYNl0sXr/6b3jPARI61I9rSVR5pCgxTX yHxHe7yL5vqfhxkb68vaTeIMjZPJ6Q+f4ncXwfRqK77LkWRze6GQGi+m3+xste3rhFps8r oYFKa3BUiiFwAhzmTE3Ou8tNmmZNa3s= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=iruaTUnh; spf=pass (imf13.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3668vRud005067; Thu, 6 Jul 2023 08:59: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=HJ59ItgsLbPBAoIVj3eoS5U1bMjw9YWn4IbBZYPC7LI=; b=iruaTUnhh3vZ5rC4jmA3MkzkOBry/hYwBt+a7RrMVQoJT9W1/MjwWfguhSXfnIq9IAmw vfKVshpOJ8FWXU8vT12hGv7lSPaUHPtrqpQDuRILVdEzDk0h+UxKD4F7KlTD3AYcwCXX DFVJfx/A5jRufQM12XtJdx/1k1XOl84dCOwZdBlzKkhC4S8dqk9QxToqc7jjM2hUbbY8 BOosVaQvVWT3AP6Bajbfy413N9HNwkIzHkoM+FZQ8yl4vqWRf/g8/KKqaHE9c49EMIFf k8sS2rsQufyyEcYwwr07eyP1K4ce604LCPowBwEUebxOJlWrJyGF0UAkvHrasTcFHls2 ZA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rntjd00qa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 06 Jul 2023 08:59:16 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3668xFM6009795; Thu, 6 Jul 2023 08:59:15 GMT Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rntjd00py-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 06 Jul 2023 08:59:15 +0000 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3668KQ1l008582; Thu, 6 Jul 2023 08:59:14 GMT Received: from smtprelay05.dal12v.mail.ibm.com ([9.208.130.101]) by ppma01dal.us.ibm.com (PPS) with ESMTPS id 3rjbs6d49r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 06 Jul 2023 08:59:14 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay05.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3668xDY18323832 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 6 Jul 2023 08:59:13 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 29B8758057; Thu, 6 Jul 2023 08:59:13 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AECC758058; Thu, 6 Jul 2023 08:59:08 +0000 (GMT) Received: from skywalker.in.ibm.com (unknown [9.109.212.144]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTP; Thu, 6 Jul 2023 08:59: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 v3 08/13] powerpc/mm/trace: Convert trace event to trace event class Date: Thu, 6 Jul 2023 14:28:14 +0530 Message-ID: <20230706085819.827761-9-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230706085819.827761-1-aneesh.kumar@linux.ibm.com> References: <20230706085819.827761-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: SWHhsA7jhyy6zDkZZ_IOCtlX5118KuPd X-Proofpoint-ORIG-GUID: WmutxBFBjIqixMIn3o3lYHM4RIvwGYST 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-06_05,2023-07-06_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 impostorscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2307060075 X-Rspamd-Queue-Id: B7C5120023 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: nqq5bbn3bjsarfg8gg859rbafxyu3ax9 X-HE-Tag: 1688633966-44556 X-HE-Meta: U2FsdGVkX19Ua/Ecif38GEvSOwFIaefUiu1OZDfNtPhWy/owbn3PJc/jGP/y7URCeuR9hB2IWw1+h86FDLFtwBj6d/pRx2blUXyHh+bo4y3YPBLB3t8WyBSYUF4Kfa6Z1KFhNUdyphJYeYW5czj7ttyhP8/ibmLJnJyxVagy/ArsdDMybMzEWP9cqICyzTYYlivek913ScQuTrIR31jKr6V8MfAJceYf92GsrpJyO1TWgDpRPcL0LAcVDNagnWZQHQGMn+JmUHD4FAQaWOAd/8elcIrnEbL/AUsBxX/qE8igo+qzltu8C34dB2jlLHAm+VWIgJGdz7MC3+4iygXPRtxTv6Ma1IUsuMCte9mfFKuyTe+3Jg97V2RBIn0/2aySoJVdTmpUecd+mHaKhwCHXqyPRjGdef/IELXgjSHPKSKYK/Iresp/7zrfvr4Mfh+M10RA4kt58Xg+hVS/eJ25jIP7k/owwEdCAUNvd3lZVDHwG1H3PsPsyNApWVveAN+2mkrOkGMnQPvu/M5teOesLan//tH48FXTU6KFLdhgnzio3CEAleVChcygcgacNkNhNre/wxOT6gYKei+Ky4bRVBPFnr+JfvHHbNbbOCZELTY2YMYPdfEB//WuBbjkstJFvatr3Uvp6SuN74bDMDsrpTs71Ji2PUz3J3AB9bWlVOqMfdU/xbyqmJvlHjoPlO/5Xxb3zDVKGBRH1gJY8onQRXlcYWevkFvLrCEIXIBP2sppfR7XEgDP8lka6jjHGO+YEfkc7FWVqWDIC5YNrNDKwWttbJqMRTF0Gt8EpvXst4IU0WR+BP2WF8zKENYvrH7ISjs3L/Ai9LJ4+GCqwjTakNDIkAcXEax3A2sPWBF6ZBfg8jkSLCviaaVfii4un8X2vW76095VOH4C4F+o4IWSbaDsNdfos41LBB/PdO5SN2c/F/YU7gma1AW/Gp8Wgq+0Nt32mDoOPSIT7ANzeOo k6Oq1KyB BQh4ZnxEc2vaUZv53+WGydjFwJR3Q1dCb1pbvF2qoUgdExTY9KHLWon3i7mGou64OrjLRcNEXWuNCKnRT9GyJFzH9GpeqGtglUbDakP297j1qzY85EX1l4MyGI/sSKglP1soavakfk+lJ50VRHgQF4ixPfP0XIPzKHgImj85+ZeAicec71Z5ru8iA3l16Vz9D840KlTaI3hli0fBF7S/k/V8Do4IYhPwW81/1Be+VYdUmrFE= 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. 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),