From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D80C9480DC9 for ; Tue, 21 Jul 2026 10:36:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.69 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784630186; cv=none; b=oik7AiRoIx9PeULtN279/H6kJwXfjJnvECbC0bDdM7EmPSA001Gmgy7CMmhKfikgcp7WunWJxypT5EEl9FzEiCXr+F6euEoFTVeJQnMQ9sxEX96I3IrqdQ+6xoe7K3zTQUsYHjDCSuBcV07/wtOKkE0BQzRaietuNEBLhylsI28= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784630186; c=relaxed/simple; bh=6z6Hgr5Se1nYrOJpknz1wYe0tpfMt+yj4nJy1W77u0Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fKW3SwP/Z5D4bmqikhVYTXowNhxSUjxd+dC5oA1eIl2znjMzycfqCxkNR1zx2X1E2ILR9yLjKB3liuXvrkswaqIhpqLpYn0Ynm+GXb/2H+FCdqFAdyUHFU+s8lJx1VC3hj/Sf987GvzcEFH88yzlGYX35Id8tHAs69D+MOIf5xM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WBsbmPZk; arc=none smtp.client-ip=209.85.221.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WBsbmPZk" Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-47f835ac1aeso38461f8f.3 for ; Tue, 21 Jul 2026 03:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784630183; x=1785234983; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=U46404N2O17keEhb8k4oMOseiDpHIAvg2Uqnc1/YP1E=; b=WBsbmPZkbjWS7cZIjTuu+Hx3MY+dh1RR4hxweLQLJiJQiMsKQYjC3iMOZjO20sULFJ iJsBM4n8KP2qMEz45RjCItgsBEfpOvkkgLgM50eLnGoTfIcPTrlquom4Qbw9lAfL5Ehn BUF6EpuNBqu5RXi4NzPHlLPdU2s0lbQmC/5za8mEvhffhkXPLV1BP2uQlxw9cMpE6n6P K/E7M/IanY86xanLTSF647HuxgL+vg4VdSYpviJ/OCOYtlo+aC+a3WD5UImrQhM/m2KC es7KfQ/EZ64iMBfJ2M1ddKzv0m0Kue8FUSQPpq7BcGY8LtRKlZiCx8CZy+Ma2hVJrWLd QtUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784630183; x=1785234983; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=U46404N2O17keEhb8k4oMOseiDpHIAvg2Uqnc1/YP1E=; b=mRlVKVbGTM1sPawNXqpCWqO9z4yJ9Qk12Jz4eVsV3eUHIK+2C2FJivR6rXz30nOUJE KxZeX8am+7hTt+Yhd4RtQ+/bnquthswwa9YHw92aZ7JQG4o3f6LNbDNujB6rObiJf/40 N2AuK/6BmUh10aRLInfMwkfR14y9iJlqfiW5oE2IgF6wAEHoQqxLpBIITmAIWIFXdVmr B3Q5rV/S7KM/JEj0Q137ct0OvJ8Bzg5Pb4OLldExphTalk3nlyaEniR9ulpBwaVBDSln f6o1GUWSAPqY0zmB1idlt4ucundqzexthVnKaiF80DosHSzYk7jRvgvcel3tjIF3Vz3+ lDtA== X-Forwarded-Encrypted: i=1; AHgh+Rr1IdRuQ9nSjMP5GR3xcFOlcFvuuQKs/45FNGqzFzMXpg/MXNkoSZ1Y6SvGMHOhoV1wYQskXXwtU8MUOe9UPmtyjts=@vger.kernel.org X-Gm-Message-State: AOJu0Yyht3ArjqtYnwxnXoRGVvJEXl5vVu1FGqsdZYVzlSQLXOPsJEEP RQo3EZoms45KGf7llGS+fW9qGItUtxYdkjyCGAmTnVudShpweS3h+Y97RQ2eyD+ruuVYPRBgu9P ejZIHKCa4iJkRajV1fPv37w== X-Received: from wrbdr5.prod.google.com ([2002:a5d:5f85:0:b0:472:37b2:f9e6]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2c12:b0:45d:4a00:b927 with SMTP id ffacd0b85a97d-47f6232c65dmr20192135f8f.31.1784630182789; Tue, 21 Jul 2026 03:36:22 -0700 (PDT) Date: Tue, 21 Jul 2026 11:35:47 +0100 In-Reply-To: <20260721103603.342266-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260721103603.342266-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260721103603.342266-3-vdonnefort@google.com> Subject: [PATCH v3 02/18] tracing/remotes: Release tracefs,eventfs on registration failure From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, linux-trace-kernel@vger.kernel.org Cc: mathieu.desnoyers@efficios.com, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Type: text/plain; charset="UTF-8" In trace_remote_register(), if registration of events or the init callback fails, the created tracefs and eventfs directories are leaked. Release the entire eventfs and tracefs hierarchy on trace_remote registration failure. Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c index 522f3e67f17b..2bc3afe1204c 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -45,7 +45,8 @@ struct trace_remote { struct trace_buffer *trace_buffer; struct trace_buffer_desc *trace_buffer_desc; struct dentry *dentry; - struct eventfs_inode *eventfs; + struct eventfs_inode *eventfs_root; + struct eventfs_inode *eventfs_subdir; struct remote_event *events; unsigned long nr_events; unsigned long trace_buffer_size; @@ -60,6 +61,7 @@ struct trace_remote { static DEFINE_MUTEX(trace_remotes_lock); static LIST_HEAD(trace_remotes); +static struct dentry *trace_remotes_root; static bool trace_remote_loaded(struct trace_remote *remote) { @@ -865,23 +867,21 @@ static const struct file_operations trace_fops = { static int trace_remote_init_tracefs(const char *name, struct trace_remote *remote) { struct dentry *remote_d, *percpu_d, *d; - static struct dentry *root; - static DEFINE_MUTEX(lock); bool root_inited = false; int cpu; - guard(mutex)(&lock); + lockdep_assert_held(&trace_remotes_lock); - if (!root) { - root = tracefs_create_dir(TRACEFS_DIR, NULL); - if (!root) { + if (!trace_remotes_root) { + trace_remotes_root = tracefs_create_dir(TRACEFS_DIR, NULL); + if (!trace_remotes_root) { pr_err("Failed to create tracefs dir "TRACEFS_DIR"\n"); return -ENOMEM; } root_inited = true; } - remote_d = tracefs_create_dir(name, root); + remote_d = tracefs_create_dir(name, trace_remotes_root); if (!remote_d) { pr_err("Failed to create tracefs dir "TRACEFS_DIR"%s/\n", name); goto err; @@ -939,8 +939,8 @@ static int trace_remote_init_tracefs(const char *name, struct trace_remote *remo err: if (root_inited) { - tracefs_remove(root); - root = NULL; + tracefs_remove(trace_remotes_root); + trace_remotes_root = NULL; } else { tracefs_remove(remote_d); } @@ -948,8 +948,26 @@ static int trace_remote_init_tracefs(const char *name, struct trace_remote *remo return -ENOMEM; } +static void trace_remote_remove_tracefs(struct trace_remote *remote) +{ + lockdep_assert_held(&trace_remotes_lock); + + if (!remote->dentry) + return; + + tracefs_remove(remote->dentry); + remote->dentry = NULL; + + if (!list_empty(&trace_remotes)) + return; + + tracefs_remove(trace_remotes_root); + trace_remotes_root = NULL; +} + static int trace_remote_register_events(const char *remote_name, struct trace_remote *remote, struct remote_event *events, size_t nr_events); +static void trace_remote_unregister_events(struct trace_remote *remote); /** * trace_remote_register() - Register a Tracefs remote @@ -972,10 +990,9 @@ static int trace_remote_register_events(const char *remote_name, struct trace_re int trace_remote_register(const char *name, struct trace_remote_callbacks *cbs, void *priv, struct remote_event *events, size_t nr_events) { - struct trace_remote *remote; + struct trace_remote *remote __free(kfree) = kzalloc_obj(*remote); int ret; - remote = kzalloc_obj(*remote); if (!remote) return -ENOMEM; @@ -986,13 +1003,15 @@ int trace_remote_register(const char *name, struct trace_remote_callbacks *cbs, mutex_init(&remote->lock); init_rwsem(&remote->reader_lock); - if (trace_remote_init_tracefs(name, remote)) { - kfree(remote); - return -ENOMEM; - } + guard(mutex)(&trace_remotes_lock); + + ret = trace_remote_init_tracefs(name, remote); + if (ret) + return ret; ret = trace_remote_register_events(name, remote, events, nr_events); if (ret) { + trace_remote_remove_tracefs(remote); pr_err("Failed to register events for trace remote '%s' (%d)\n", name, ret); return ret; @@ -1000,13 +1019,16 @@ int trace_remote_register(const char *name, struct trace_remote_callbacks *cbs, ret = cbs->init ? cbs->init(remote->dentry, priv) : 0; if (ret) { + trace_remote_unregister_events(remote); + trace_remote_remove_tracefs(remote); pr_err("Init failed for trace remote '%s' (%d)\n", name, ret); - } else { - guard(mutex)(&trace_remotes_lock); - list_add(&remote->node, &trace_remotes); + return ret; } - return ret; + list_add(&remote->node, &trace_remotes); + retain_and_null_ptr(remote); + + return 0; } EXPORT_SYMBOL_GPL(trace_remote_register); @@ -1335,7 +1357,6 @@ static int remote_events_dir_callback(const char *name, umode_t *mode, void **da static int trace_remote_init_eventfs(const char *remote_name, struct trace_remote *remote, struct remote_event *evt) { - struct eventfs_inode *eventfs = remote->eventfs; static struct eventfs_entry dir_entries[] = { { .name = "enable", @@ -1360,35 +1381,37 @@ static int trace_remote_init_eventfs(const char *remote_name, struct trace_remot .callback = remote_event_callback, } }; - bool eventfs_create = false; + struct eventfs_inode *eventfs_root, *eventfs_subdir, *e; - if (!eventfs) { - eventfs = eventfs_create_events_dir("events", remote->dentry, dir_entries, - ARRAY_SIZE(dir_entries), remote); - if (IS_ERR(eventfs)) - return PTR_ERR(eventfs); + eventfs_root = remote->eventfs_root; + eventfs_subdir = remote->eventfs_subdir; + if (!eventfs_root) { + eventfs_root = eventfs_create_events_dir("events", remote->dentry, dir_entries, + ARRAY_SIZE(dir_entries), remote); + if (IS_ERR(eventfs_root)) + return PTR_ERR(eventfs_root); /* * Create similar hierarchy as local events even if a single system is supported at * the moment */ - eventfs = eventfs_create_dir(remote_name, eventfs, NULL, 0, NULL); - if (IS_ERR(eventfs)) - return PTR_ERR(eventfs); - - remote->eventfs = eventfs; - eventfs_create = true; - } - - eventfs = eventfs_create_dir(evt->name, eventfs, entries, ARRAY_SIZE(entries), evt); - if (IS_ERR(eventfs)) { - if (eventfs_create) { - eventfs_remove_events_dir(remote->eventfs); - remote->eventfs = NULL; + eventfs_subdir = eventfs_create_dir(remote_name, eventfs_root, NULL, 0, NULL); + if (IS_ERR(eventfs_subdir)) { + eventfs_remove_events_dir(eventfs_root); + return PTR_ERR(eventfs_subdir); } - return PTR_ERR(eventfs); } + e = eventfs_create_dir(evt->name, eventfs_subdir, entries, ARRAY_SIZE(entries), evt); + if (IS_ERR(e)) { + if (!remote->eventfs_root) + eventfs_remove_events_dir(eventfs_root); + return PTR_ERR(e); + } + + remote->eventfs_root = eventfs_root; + remote->eventfs_subdir = eventfs_subdir; + return 0; } @@ -1403,11 +1426,11 @@ static int trace_remote_attach_events(struct trace_remote *remote, struct remote if (evt->remote) return -EEXIST; - evt->remote = remote; - /* We need events to be sorted for efficient lookup */ if (i && evt->id <= events[i - 1].id) return -EINVAL; + + evt->remote = remote; } remote->events = events; @@ -1416,14 +1439,33 @@ static int trace_remote_attach_events(struct trace_remote *remote, struct remote return 0; } +static void trace_remote_detach_events(struct trace_remote *remote, struct remote_event *events, + size_t nr_events) +{ + int i; + + for (i = 0; i < nr_events; i++) { + struct remote_event *evt = &events[i]; + + if (evt->remote == remote) + evt->remote = NULL; + } + + remote->events = NULL; + remote->nr_events = 0; +} + static int trace_remote_register_events(const char *remote_name, struct trace_remote *remote, struct remote_event *events, size_t nr_events) { int i, ret; ret = trace_remote_attach_events(remote, events, nr_events); - if (ret) + if (ret) { + /* It is safe to call detach on a half-registered array */ + trace_remote_detach_events(remote, events, nr_events); return ret; + } for (i = 0; i < nr_events; i++) { struct remote_event *evt = &events[i]; @@ -1437,6 +1479,13 @@ static int trace_remote_register_events(const char *remote_name, struct trace_re return 0; } +static void trace_remote_unregister_events(struct trace_remote *remote) +{ + trace_remote_detach_events(remote, remote->events, remote->nr_events); + if (remote->eventfs_root) + eventfs_remove_events_dir(remote->eventfs_root); +} + static int __cmp_events(const void *key, const void *data) { const struct remote_event *evt = data; -- 2.55.0.229.g6434b31f56-goog