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 A367CC7619A for ; Thu, 6 Apr 2023 02:49:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235109AbjDFCtM (ORCPT ); Wed, 5 Apr 2023 22:49:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234987AbjDFCsP (ORCPT ); Wed, 5 Apr 2023 22:48:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40869A5C2 for ; Wed, 5 Apr 2023 19:45:45 -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 E84D1642BA for ; Thu, 6 Apr 2023 02:45:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48676C433D2; Thu, 6 Apr 2023 02:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1680749143; bh=Wd1HKIxhfSon0WPyGXmLXXgvVrJCMEEVFOXKaUrnpDI=; h=Date:To:From:Subject:From; b=rjkVnNoSZD9JQtVyzyh8sFp+7zcb6gWwFuMxc8JDFDaT8qA54IJILmjvG2uDw/wVS cKsLyHe08InKYPYZ9vujyKDaboOx3Fw0yuv1/0sXjxArMvROW7OPiz8v7hSKK/hfak NOSrthfb9OlXOzMJg+IA+4NWYGwEP3QwfK14AL9s= Date: Wed, 05 Apr 2023 19:45:42 -0700 To: mm-commits@vger.kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, louhongxiang@huawei.com, linfeilong@huawei.com, haowenchao2@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] trace-cma-remove-unnecessary-event-class-cma_alloc_class.patch removed from -mm tree Message-Id: <20230406024543.48676C433D2@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: trace: cma: remove unnecessary event class cma_alloc_class has been removed from the -mm tree. Its filename was trace-cma-remove-unnecessary-event-class-cma_alloc_class.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Wenchao Hao Subject: trace: cma: remove unnecessary event class cma_alloc_class Date: Thu, 23 Mar 2023 19:41:36 +0800 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. Link: https://lkml.kernel.org/r/20230323114136.177677-1-haowenchao2@huawei.com Signed-off-by: Wenchao Hao Acked-by: Steven Rostedt (Google) Cc: Feilong Lin Cc: Hongxiang Lou Cc: Masami Hiramatsu Signed-off-by: Andrew Morton --- include/trace/events/cma.h | 58 +++++++++++++++-------------------- 1 file changed, 25 insertions(+), 33 deletions(-) --- a/include/trace/events/cma.h~trace-cma-remove-unnecessary-event-class-cma_alloc_class +++ a/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 */ _ Patches currently in -mm which might be from haowenchao2@huawei.com are