Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ajay Kaher <akaher@vmware.com>
To:     rostedt@goodmis.org, mhiramat@kernel.org, shuah@kernel.org
Cc:     linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
        linux-kselftest@vger.kernel.org, chinglinyu@google.com,
        namit@vmware.com, srivatsa@csail.mit.edu, amakhalov@vmware.com,
        vsirnapalli@vmware.com, tkundu@vmware.com, er.ajay.kaher@gmail.com,
        Ajay Kaher <akaher@vmware.com>
Subject: [PATCH v3 01/10] tracing: Require all trace events to have a TRACE_SYSTEM
Date:   Thu,  1 Jun 2023 14:30:04 +0530
Message-Id: <1685610013-33478-2-git-send-email-akaher@vmware.com>
In-Reply-To: <1685610013-33478-1-git-send-email-akaher@vmware.com>
References: <1685610013-33478-1-git-send-email-akaher@vmware.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TKXRfn/QKf2VpDWQQ20CGNBy0thXzD4aqOxamPPmVrNZ5ksiyde+IFNRukBk?=
 =?us-ascii?Q?8JpV3tCezstetkzEMG5wQZIxQt4rbeyQOGNwfe2kxah+VH7X/7i7s0yet5U/?=
 =?us-ascii?Q?of2TBcd0fUu4DzntQhT/kye7hAfsgdKg79p9Re45mMswiZQ+ORzDZKFedeW/?=
 =?us-ascii?Q?4KoLH4LKbgQ/9GIUb9lo3qPxP0aasoSeN3OmVc7F+i5F8sfVUj4zHv4LtUeT?=
 =?us-ascii?Q?+6PNTEvRjDbywUL+w0zLYoBN5h+yEr9g6qt6muudLXQz4s7JM7+rAkcvRiVw?=
 =?us-ascii?Q?Ebm9HONWO5TqhZ5EbNR9/cLRgKVmipvK5iLGB9ZDQdBeJImiVqA5fF4sj2fr?=
 =?us-ascii?Q?RmB/lvS/OyEThR3xGPsXNdTjm4nfPkvNxx1Y4HToGkU35abFhWkFhfj3d4E7?=
 =?us-ascii?Q?agomMg9RkFKKf6YYJKNONAF+spk1uDWSUfip26gEuK4yXaoHMsoloZ/KjwDh?=
 =?us-ascii?Q?EiKjJiuWpSsPrBsTcJTI1XGDIHN/NxwWvu/jCrm62D6iPPVCMyLWCoh3UQ5z?=
 =?us-ascii?Q?6S+YJKQwXqgrWgi1WO0LDM4Lbxs4QEOhDhbnIQ3D9DSgAnohTzjjVSljvTJx?=
 =?us-ascii?Q?romo1oBQVKFiSmHissvMp19/Y9ateWyH3ZoW4sBYk0B6vsdzth6KSr/nV3mr?=
 =?us-ascii?Q?FasK22ID/HM8Q1+nvyKaFTzNlIpjG71eFQd7gg6GH064/AFLLSbzPa1gd5O0?=
 =?us-ascii?Q?qcYquIP/ryuzbmwEeT7uxf2lNTPx7xIVAJPCJRWblzhvPxiYAnhpmJJ8+n01?=
 =?us-ascii?Q?5s33tEI/EbaOqJDJ//qYrsa0nRnfh5qAa5cg5xsm/Xi2g37UppXUKOS36+Z0?=
 =?us-ascii?Q?lDIRE7mAZVH5pTSnjwPQ1+KKqjSnrEIVVGC4pJp5+oubwIygSRnD9MIy4hcH?=
 =?us-ascii?Q?GJ3pclsw4T1ammhIqpnrn5RZDsKwmev4BjPrp3IuCJYUP289W/0t/a6mSy7S?=
 =?us-ascii?Q?gdOVTANotFcNHgqsem0ZqA4A/4ftqQWVTrHRUFK+6lXthBL29NH7b9klj4+y?=
 =?us-ascii?Q?VzIDtYMD0d7hJjhT287EnifWAWH0YO757iwhH5tF99jbO5QI+u4WqFEGK5nI?=
 =?us-ascii?Q?tjvXCZ9kkUDMjykkjCL2+23xHqi7mMhgeyWTnZYD/FTz9QlxhK+DYbB/IK6f?=
 =?us-ascii?Q?kmKu8IpHPOvhTs0jop1wK9h+yr+8lONZrc5yv6Ff2Au028Z/E58cJ2Jr2Qiv?=
 =?us-ascii?Q?i/zMu/fT+pgbu2pD5CQWSdcoDiemdcEjfMeoFLin1C0pZ2HmcaE1FXltDUIw?=
 =?us-ascii?Q?Wwj/Tdj121O2LiJ1RAfUmcyqTUgeN230iElYL+6+n5DbAFzJzNGDPreLWDsJ?=
 =?us-ascii?Q?W/twSqku3xyydKc0DVwDHIvzDjifxhWFpPNtEaoAhhipCfmThfWZXkhsTIfe?=
 =?us-ascii?Q?XVprjAOPrDRLDkzNLK2B0htYqWrz7WPvmObdbKGIa+v58vDf3tfaeET79+W+?=
 =?us-ascii?Q?Xg7TgTEr347JPvLQYGYp/OpEmw4awhreUc877n6KvO2hKK0H2BH51w5TPF0B?=
 =?us-ascii?Q?FLPuzvWp0gku4MtDx+KrtrZxGoZQBypaNeVS6w0viU135GIP/QESPflwtOBw?=
 =?us-ascii?Q?rYs2uOyX+DfrWiGrPYr0QzkSknB5iV0/J/5zo/8a?=
X-OriginatorOrg: vmware.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 75a50397-3b12-4630-27ea-08db627ebb7e
X-MS-Exchange-CrossTenant-AuthSource: PH0PR05MB8703.namprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2023 09:01:05.5598
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1yXTtUdSNZcUD/pW93GEcHJkpgotJF0bMpr1ZU4pCjbKZr2rbW//LyVmSOiVB88H4R47prD8nvi0qPRYzdHxxw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR05MB8617
X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Steven Rostedt (Google)" <rostedt@goodmis.org>

The creation of the trace event directory requires that a TRACE_SYSTEM is
defined that the trace event directory is added within the system it was
defined in.

The code handled the case where a TRACE_SYSTEM was not added, and would
then add the event at the events directory. But nothing should be doing
this. This code also prevents the implementation of creating dynamic
dentrys for the eventfs system.

As this path has never been hit on correct code, remove it. If it does get
hit, issues a WARN_ON_ONCE() and return ENODEV.

Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Ajay Kaher <akaher@vmware.com>
---
 kernel/trace/trace_events.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 654ffa404..16bc5ba45 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -2424,14 +2424,15 @@ event_create_dir(struct dentry *parent, struct trace_event_file *file)
 
 	/*
 	 * If the trace point header did not define TRACE_SYSTEM
-	 * then the system would be called "TRACE_SYSTEM".
+	 * then the system would be called "TRACE_SYSTEM". This should
+	 * never happen.
 	 */
-	if (strcmp(call->class->system, TRACE_SYSTEM) != 0) {
-		d_events = event_subsystem_dir(tr, call->class->system, file, parent);
-		if (!d_events)
-			return -ENOMEM;
-	} else
-		d_events = parent;
+	if (WARN_ON_ONCE(strcmp(call->class->system, TRACE_SYSTEM) == 0))
+		return -ENODEV;
+
+	d_events = event_subsystem_dir(tr, call->class->system, file, parent);
+	if (!d_events)
+		return -ENOMEM;
 
 	name = trace_event_name(call);
 	file->dir = tracefs_create_dir(name, d_events);
-- 
2.40.0