From patchwork Thu Jul 29 09:28:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 12408175 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7CF0C4338F for ; Thu, 29 Jul 2021 09:28:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3775A61054 for ; Thu, 29 Jul 2021 09:28:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3775A61054 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 CECDA6B006C; Thu, 29 Jul 2021 05:28:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C9E1F8D0001; Thu, 29 Jul 2021 05:28:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B65C56B0071; Thu, 29 Jul 2021 05:28:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0251.hostedemail.com [216.40.44.251]) by kanga.kvack.org (Postfix) with ESMTP id 9D80F6B006C for ; Thu, 29 Jul 2021 05:28:51 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 52E9C1801ABF2 for ; Thu, 29 Jul 2021 09:28:51 +0000 (UTC) X-FDA: 78415100862.26.10482ED Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by imf15.hostedemail.com (Postfix) with ESMTP id 80CF8D000F4D for ; Thu, 29 Jul 2021 09:28:50 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id e21so6271832pla.5 for ; Thu, 29 Jul 2021 02:28:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kbKd6mIKJ8w6ikea0jy7SiRuyXcKRZHwxw3CSR6P5ys=; b=0BvP4nmCX32RPP47Vd0bP89SOBvqodO5aLveC0qLasWXWHOaz5wS6+hlPr6m1m/zN6 qG/47KzrBsahiqBRsVmgoYx8JxFwKbe6K82WgkHAZ78xlFqHDx5erSdgUPhMRpgVddG9 7u5Ofars4QcUInqOKoe2pgJmbQqQdcvo25TVttCP6obVFt7zkbZLXUaRin9Xh0G4y/+d Dr3XPnXzNtCm9GELN7/Qpxd+OoaRElWZw+L3G6O5pdeVr4Mbj2iKSDwkVTxUfy1M4IFN Dp9XiVWUMBI428ny8fNrOvAjcMU2p7IjBSeheLi3m0u6m2ScrTw9Andpa+2zWcJNTa/g 5JwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kbKd6mIKJ8w6ikea0jy7SiRuyXcKRZHwxw3CSR6P5ys=; b=Vjwfa7FDW5QLBSHM4C64uJBI60ZlPDjU+Y+M9Q6dYW4vVCyKYACRG1TS++NX17XGsb EBtQndONXkXwagiQ6aOKkLY8OojXYjosJQLhwtyujof088sQX5Kgfko1AQOBxuAr6xZn tqv9hR2JliLnmuuWFjghzbUMWKhYRoxx6pVqtpWozyTUryBYok58Q0ov0q6gp6gT9rbN 1D0Shp0anoKEzUTdxc6hGcv7DmeQHf8LeN6w8BxOMLZrVVqCNBu0wvQlG8VaFnvggx+6 hO7caBfRj8k35q4iuTYVndVs+nJJ4kSm2Qh6M1LxRM/r6GPEZ16hJs6cQ0i4SBXPy7W9 GkSA== X-Gm-Message-State: AOAM532nzvdK10FdfqbV+6J0wA4BgI+7VocIE+2Cat0J1Uav0w8S1hny YKS2MKhJOlrc/XQ5vTACOQDzRw== X-Google-Smtp-Source: ABdhPJzCwrUDOsV9ECzyNF5Llxx7AvntM4hn93q4egIPLtU12gsW1V5wULfaY3iGbHhmHynOd13CbQ== X-Received: by 2002:a05:6a00:168a:b029:2fb:6bb0:aba with SMTP id k10-20020a056a00168ab02902fb6bb00abamr4304046pfc.32.1627550929658; Thu, 29 Jul 2021 02:28:49 -0700 (PDT) Received: from C02FT5A6MD6R.tiktokd.org ([139.177.225.241]) by smtp.gmail.com with ESMTPSA id az15sm2603578pjb.57.2021.07.29.02.28.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jul 2021 02:28:49 -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 2/3] mm: mmap_lock: use DECLARE_EVENT_CLASS and DEFINE_EVENT_FN Date: Thu, 29 Jul 2021 17:28:41 +0800 Message-Id: <20210729092841.38175-1-ligang.bdlg@bytedance.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) MIME-Version: 1.0 Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=bytedance-com.20150623.gappssmtp.com header.s=20150623 header.b=0BvP4nmC; spf=pass (imf15.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.214.195 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 80CF8D000F4D X-Stat-Signature: uudtfarmpggfrfqbto8cgskmjnz7rgt8 X-HE-Tag: 1627550930-683494 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 Reviewed-by: Axel Rasmussen Reviewed-by: Muchun Song --- 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..b9dd66f9c226 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); -TRACE_EVENT_FN(mmap_lock_start_locking, +DECLARE_EVENT_CLASS(mmap_lock, TP_PROTO(struct mm_struct *mm, const char *memcg_path, bool write), @@ -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 + ) ); +#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, 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 ); -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 = mm; - __assign_str(memcg_path, memcg_path); - __entry->write = write; - ), - - TP_printk( - "mm=%p memcg_path=%s write=%s", - __entry->mm, - __get_str(memcg_path), - __entry->write ? "true" : "false" - ), - - trace_mmap_lock_reg, trace_mmap_lock_unreg -); - #endif /* _TRACE_MMAP_LOCK_H */ /* This part must be outside protection */