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 AAA1DC433F5 for ; Mon, 11 Oct 2021 02:11:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 07AC360ED7 for ; Mon, 11 Oct 2021 02:11:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 07AC360ED7 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 563F56B006C; Sun, 10 Oct 2021 22:11:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 513F9900002; Sun, 10 Oct 2021 22:11:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 402616B0072; Sun, 10 Oct 2021 22:11:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0218.hostedemail.com [216.40.44.218]) by kanga.kvack.org (Postfix) with ESMTP id 3205C6B006C for ; Sun, 10 Oct 2021 22:11:36 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id E5BDF8249980 for ; Mon, 11 Oct 2021 02:11:35 +0000 (UTC) X-FDA: 78682530150.16.7839FE2 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf28.hostedemail.com (Postfix) with ESMTP id E9C039003C81 for ; Mon, 11 Oct 2021 02:11:34 +0000 (UTC) Received: by mail-pl1-f182.google.com with SMTP id w14so10279521pll.2 for ; Sun, 10 Oct 2021 19:11:34 -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=3W1YPacmCCYy5sTjqSS48y7QQu3vkowBEiww0ZAUWFw=; b=am8AgWiyXe4NW4Npl8JNKZlKSPiHBkT2XX9UsUPmPGQn0Mqvm64DF1s32TGoUvdkUd hoKFfB6rvMtlIDrcc4F7TfCvYprxJ7rbWM+wWqmuN/YWWK0I6b+uF9Xv/QMYKBM0As8l 3C9X5ZNEnGPong6KN1wo4q3RrZNYn1OYz1QtiJ0AMJY1R3KgZYc96woOe3RaR1VEnWwL R2yblrZHroUuY0AtxvweL86aAAO3/46/X4ePGDdGdzd7sre9vxz8GWONuGXE+OMXdNv8 F5viLWJObdEiRN68UWoHGKB5NadAaCIbDBkpqSjfBOpp8fYtje9qYGKpAJcz6QOO3ajI YAsA== 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=3W1YPacmCCYy5sTjqSS48y7QQu3vkowBEiww0ZAUWFw=; b=AacrK9S1eRCU4mzraCpn7QWHbsAKBH8yHT0gQfUGAxQZog8ZL/ur0kFY4BdXJNC1TM zx4dRwqj0xEXsa98NBnKXnWlkOoehPiCnJJJuYeJvQyaG8NT3ker85aoA8YRU+TxxGk2 QGtanhLxJmswwS9pXx+GRPhfuKrsxUiQu8D4vq8A0ui8811/h4Dtf6R+XzNCMSxYZhD0 +l4m9ZTfnVvHsgZfv3L8+PcRk2UowLBD/7l/35ml1fYcztLy2dfthI37ncFI+lMcJrEi 5uIC/ZKz9E58z/qhPQr4rG7ZZ8kJvuQNIjuJfk+3ngFp4JGQK/6HbLHnOKNNLaeYj2kV QSxA== X-Gm-Message-State: AOAM533cyI3X9z0YVc4wXfus16dtL98cEiR6kPCgDMHlSHfADz3zeN0r fuCTswrMAMVElYAC/JmRB20WnQ== X-Google-Smtp-Source: ABdhPJwsdIQU250yejq1VzBaj6zgitGurMSTcucT8crx8Hf/F04/gPH06FN+wLfVWaJtgKImmjbYMQ== X-Received: by 2002:a17:903:2341:b0:13e:ae30:412 with SMTP id c1-20020a170903234100b0013eae300412mr21951142plh.15.1633918293484; Sun, 10 Oct 2021 19:11:33 -0700 (PDT) Received: from C02FT5A6MD6R.bytedance.net ([61.120.150.76]) by smtp.gmail.com with ESMTPSA id 186sm5719383pfg.20.2021.10.10.19.11.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Oct 2021 19:11:33 -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 v3] mm: mmap_lock: remove "\n" in TP_printk and use DECLARE_EVENT_CLASS Date: Mon, 11 Oct 2021 10:11:24 +0800 Message-Id: <20211011021124.86248-1-ligang.bdlg@bytedance.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: E9C039003C81 X-Stat-Signature: 9k899m3mxpfcejy37k9q8wd78w3akrzz Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=am8AgWiy; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf28.hostedemail.com: domain of ligang.bdlg@bytedance.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=ligang.bdlg@bytedance.com X-HE-Tag: 1633918294-471313 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: Ftrace core will add "\n" automatically on print. "\n" in TP_printk will create blank line, so remove it. 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 | 48 ++++++++++---------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/include/trace/events/mmap_lock.h b/include/trace/events/mmap= _lock.h index 0abff67b96f0..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 @@ -32,15 +32,23 @@ TRACE_EVENT_FN(mmap_lock_start_locking, ), =20 TP_printk( - "mm=3D%p memcg_path=3D%s write=3D%s\n", + "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 + ) ); =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, @@ -63,7 +71,7 @@ TRACE_EVENT_FN(mmap_lock_acquire_returned, ), =20 TP_printk( - "mm=3D%p memcg_path=3D%s write=3D%s success=3D%s\n", + "mm=3D%p memcg_path=3D%s write=3D%s success=3D%s", __entry->mm, __get_str(memcg_path), __entry->write ? "true" : "false", @@ -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\n", - __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