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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3448CC433F5 for ; Sat, 9 Oct 2021 07:12:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9609A60F5B for ; Sat, 9 Oct 2021 07:12:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9609A60F5B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 3EA406B0072; Sat, 9 Oct 2021 03:12:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39A856B0073; Sat, 9 Oct 2021 03:12:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 262906B0074; Sat, 9 Oct 2021 03:12:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0231.hostedemail.com [216.40.44.231]) by kanga.kvack.org (Postfix) with ESMTP id 17A9D6B0072 for ; Sat, 9 Oct 2021 03:12:52 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id CAEDA3A7C4 for ; Sat, 9 Oct 2021 07:12:51 +0000 (UTC) X-FDA: 78676031742.29.E5AF7D0 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by imf02.hostedemail.com (Postfix) with ESMTP id 8CAD37002C83 for ; Sat, 9 Oct 2021 07:12:51 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id h3so5323309pgb.7 for ; Sat, 09 Oct 2021 00:12:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/Dz0AEQUS+5tnE4rP5Lhm0LEEfQ/t1p73p5EaBt6hmA=; b=RYKB4GOVWyquCSCVAJ61Tqp+lLP2okB3soIG8RUco+Jy0LwjYcYT1/hZcTMdM/wSDA Q644gB3MLaLus/4RAgNMC9rhDmfaA8FIROqCnaFf58Qp60wmddk+7njkaWxgKJKyawli qXg73FO/kUmOCYeiDfbLSH16Zz2nIQFmGZT6lrmxoqa0Qe4Qjbeb8MT3q3jWR4cj3CQD pyRrF7aIOHRIFczLPDXf04iXQLZ1nKYNv1/MbLR0i8ty0yNXGE7HwP/7My9YcR1JI63c KfNtjTV1DSbhVadHjgOAPGCXQx9i4I0smFFEB+sjiJLo18TqEIXYwFXUtuxH+G4dDPH8 mh7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/Dz0AEQUS+5tnE4rP5Lhm0LEEfQ/t1p73p5EaBt6hmA=; b=AY7bEBiEtiye72wiQ+VXe/8pA8UxYgg4ibkKRw80Q9GFLjIT2rhNN0C8Fz1/J2YGZe eXQRLAsINbQkb9Xm2vpKDElKGVWwyiUYCzn4lyekJu51XXPP6ID5CC0jpdSEpuGJgcvv +dQiDlDhlMa3t4XPG5X15DOSCHp2mMVYzP/HQHWjpWTdomYS18UVO54/Lrc+BybMweU3 EcOFOVpibVFz2pbj4L1MXotaMKlRe+AyvgRL5pUmtXT9pKI3tbbrPeDRRYoPBujtO4JH jnDZBvwCezVwCaaNFNaQlk1cwni7PLJ1b/hh8ZtdmtL9jl5M6wDoOicUg1egNrnGLaGC 8gaQ== X-Gm-Message-State: AOAM531fJGawFVtkYamkVfOEVXqOSUAg/lxRDm3uEznmVhz5dcLfQq+J ZPHEc5ylbBb/yQWWdxXn/IfjJXSrimo9eg== X-Google-Smtp-Source: ABdhPJwUR/+lBFkiA9E2Il0TycxTql4SR/5+2hjmhVIF/mbw+367GIWh8fh5HNofQqXzVuU8UlK9ZQ== X-Received: by 2002:a05:6a00:1512:b0:447:cb0b:8520 with SMTP id q18-20020a056a00151200b00447cb0b8520mr14085973pfu.54.1633763570627; Sat, 09 Oct 2021 00:12:50 -0700 (PDT) Received: from C02FT5A6MD6R.tiktokd.org ([139.177.225.253]) by smtp.gmail.com with ESMTPSA id k14sm1497567pgg.92.2021.10.09.00.12.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Oct 2021 00:12:50 -0700 (PDT) From: Gang Li To: rostedt@goodmis.org Cc: mingo@redhat.com, akpm@linux-foundation.org, vbabka@suse.cz, axelrasmussen@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Gang Li Subject: [PATCH v2 2/2] mm: mmap_lock: use DECLARE_EVENT_CLASS and DEFINE_EVENT_FN Date: Sat, 9 Oct 2021 15:12:43 +0800 Message-Id: <20211009071243.70286-1-ligang.bdlg@bytedance.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 8CAD37002C83 X-Stat-Signature: ia3daxumagjxfgxmanr5qu56dduj3ckz Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=RYKB4GOV; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf02.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.215.171 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com X-HE-Tag: 1633763571-566492 Content-Transfer-Encoding: quoted-printable 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: By using DECLARE_EVENT_CLASS and TRACE_EVENT_FN, we can save a lot of space from duplicate code. Signed-off-by: Gang Li --- include/trace/events/mmap_lock.h | 44 +++++++++----------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/include/trace/events/mmap_lock.h b/include/trace/events/mmap= _lock.h index 5f980c92e3e9..14db8044c1ff 100644 --- a/include/trace/events/mmap_lock.h +++ b/include/trace/events/mmap_lock.h @@ -13,7 +13,7 @@ struct mm_struct; extern int trace_mmap_lock_reg(void); extern void trace_mmap_lock_unreg(void); =20 -TRACE_EVENT_FN(mmap_lock_start_locking, +DECLARE_EVENT_CLASS(mmap_lock, =20 TP_PROTO(struct mm_struct *mm, const char *memcg_path, bool write), =20 @@ -36,11 +36,19 @@ TRACE_EVENT_FN(mmap_lock_start_locking, __entry->mm, __get_str(memcg_path), __entry->write ? "true" : "false" - ), - - trace_mmap_lock_reg, trace_mmap_lock_unreg + ) ); =20 +#define DEFINE_MMAP_LOCK_EVENT(name) = \ + DEFINE_EVENT_FN(mmap_lock, name, \ + TP_PROTO(struct mm_struct *mm, const char *memcg_path, \ + bool write), \ + TP_ARGS(mm, memcg_path, write), \ + trace_mmap_lock_reg, trace_mmap_lock_unreg) + +DEFINE_MMAP_LOCK_EVENT(mmap_lock_start_locking); +DEFINE_MMAP_LOCK_EVENT(mmap_lock_released); + TRACE_EVENT_FN(mmap_lock_acquire_returned, =20 TP_PROTO(struct mm_struct *mm, const char *memcg_path, bool write, @@ -73,34 +81,6 @@ TRACE_EVENT_FN(mmap_lock_acquire_returned, trace_mmap_lock_reg, trace_mmap_lock_unreg ); =20 -TRACE_EVENT_FN(mmap_lock_released, - - TP_PROTO(struct mm_struct *mm, const char *memcg_path, bool write), - - TP_ARGS(mm, memcg_path, write), - - TP_STRUCT__entry( - __field(struct mm_struct *, mm) - __string(memcg_path, memcg_path) - __field(bool, write) - ), - - TP_fast_assign( - __entry->mm =3D mm; - __assign_str(memcg_path, memcg_path); - __entry->write =3D write; - ), - - TP_printk( - "mm=3D%p memcg_path=3D%s write=3D%s", - __entry->mm, - __get_str(memcg_path), - __entry->write ? "true" : "false" - ), - - trace_mmap_lock_reg, trace_mmap_lock_unreg -); - #endif /* _TRACE_MMAP_LOCK_H */ =20 /* This part must be outside protection */ --=20 2.20.1