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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45AFFC6FD20 for ; Fri, 24 Mar 2023 03:13:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229948AbjCXDNT (ORCPT ); Thu, 23 Mar 2023 23:13:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230040AbjCXDNS (ORCPT ); Thu, 23 Mar 2023 23:13:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72AD14C05; Thu, 23 Mar 2023 20:13:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 01D686293D; Fri, 24 Mar 2023 03:13:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B330C4339B; Fri, 24 Mar 2023 03:13:13 +0000 (UTC) Date: Thu, 23 Mar 2023 23:13:11 -0400 From: Steven Rostedt To: Wenchao Hao Cc: Masami Hiramatsu , Andrew Morton , , , , Subject: Re: [PATCH] trace:cma: remove unnecessary event class cma_alloc_class Message-ID: <20230323231311.4a11c7f7@rorschach.local.home> In-Reply-To: <20230323114136.177677-1-haowenchao2@huawei.com> References: <20230323114136.177677-1-haowenchao2@huawei.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-trace-kernel@vger.kernel.org On Thu, 23 Mar 2023 19:41:36 +0800 Wenchao Hao wrote: > After commit cb6c33d4dc09 ("cma: tracing: print alloc result in > trace_cma_alloc_finish"), cma_alloc_class has only one event which is > cma_alloc_busy_retry. So we can remove the cma_alloc_class. > This is fine for an aesthetic view, but it has no functional change. TRACE_EVENT() is simply defined as: #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ DECLARE_EVENT_CLASS(name, \ PARAMS(proto), \ PARAMS(args), \ PARAMS(tstruct), \ PARAMS(assign), \ PARAMS(print)); \ DEFINE_EVENT(name, name, PARAMS(proto), PARAMS(args)); https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/trace/trace_events.h#n29 This patch simply un-open-codes it. Acked-by: Steven Rostedt (Google) Cheers, -- Steve > Signed-off-by: Wenchao Hao > --- > include/trace/events/cma.h | 58 ++++++++++++++++---------------------- > 1 file changed, 25 insertions(+), 33 deletions(-) > > diff --git a/include/trace/events/cma.h b/include/trace/events/cma.h > index ef75ea606ab2..25103e67737c 100644 > --- a/include/trace/events/cma.h > +++ b/include/trace/events/cma.h > @@ -8,37 +8,6 @@ > #include > #include > > -DECLARE_EVENT_CLASS(cma_alloc_class, > - > - TP_PROTO(const char *name, unsigned long pfn, const struct page *page, > - unsigned long count, unsigned int align), > - > - TP_ARGS(name, pfn, page, count, align), > - > - TP_STRUCT__entry( > - __string(name, name) > - __field(unsigned long, pfn) > - __field(const struct page *, page) > - __field(unsigned long, count) > - __field(unsigned int, align) > - ), > - > - TP_fast_assign( > - __assign_str(name, name); > - __entry->pfn = pfn; > - __entry->page = page; > - __entry->count = count; > - __entry->align = align; > - ), > - > - TP_printk("name=%s pfn=0x%lx page=%p count=%lu align=%u", > - __get_str(name), > - __entry->pfn, > - __entry->page, > - __entry->count, > - __entry->align) > -); > - > TRACE_EVENT(cma_release, > > TP_PROTO(const char *name, unsigned long pfn, const struct page *page, > @@ -125,12 +94,35 @@ TRACE_EVENT(cma_alloc_finish, > __entry->errorno) > ); > > -DEFINE_EVENT(cma_alloc_class, cma_alloc_busy_retry, > +TRACE_EVENT(cma_alloc_busy_retry, > > TP_PROTO(const char *name, unsigned long pfn, const struct page *page, > unsigned long count, unsigned int align), > > - TP_ARGS(name, pfn, page, count, align) > + TP_ARGS(name, pfn, page, count, align), > + > + TP_STRUCT__entry( > + __string(name, name) > + __field(unsigned long, pfn) > + __field(const struct page *, page) > + __field(unsigned long, count) > + __field(unsigned int, align) > + ), > + > + TP_fast_assign( > + __assign_str(name, name); > + __entry->pfn = pfn; > + __entry->page = page; > + __entry->count = count; > + __entry->align = align; > + ), > + > + TP_printk("name=%s pfn=0x%lx page=%p count=%lu align=%u", > + __get_str(name), > + __entry->pfn, > + __entry->page, > + __entry->count, > + __entry->align) > ); > > #endif /* _TRACE_CMA_H */