From: Philo Lu <lulie@linux.alibaba.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, zhou.kete@h3c.com,
zhao_lei1@hoperun.com, nabijaczleweli@nabijaczleweli.xyz,
kunyu@nfschina.com, zhang.zhengming@h3c.com,
gregkh@linuxfoundation.org, xuanzhuo@linux.alibaba.com,
dust.li@linux.alibaba.com, alibuda@linux.alibaba.com,
guwen@linux.alibaba.com, hengqi@linux.alibaba.com
Subject: [PATCH] relay: avoid relay_open_buf inproperly fails in buffer-only mode
Date: Tue, 20 Feb 2024 18:58:36 +0800 [thread overview]
Message-ID: <20240220105836.15815-1-lulie@linux.alibaba.com> (raw)
In buffer-only mode, relay_open(NULL, NULL, ...) is used to create the
buffer first, where chan->has_base_filename is not set. Though we still
need to call chan->cb->create_buf_file in relay_open_buf() to retrieve
global info for global buffer, the create_buf_file callback should
return NULL. However, with IS_ERR_OR_NULL() checking, relay_open fails
because the returned dentry == NULL.
This patch remove the IS_ERR_OR_NULL() for compatibility and update the
comment to explain the behavior.
Here is a create_buf_file callback example after fix:
```
struct dentry *my_create_buf_file(const char *filename,
struct dentry *parent, umode_t mode,
struct rchan_buf *buf, int *is_global)
{
if (!filename)
return NULL;
return debugfs_create_file(filename, mode, parent, buf,
&relay_file_operations);
}
relay_cb.create_buf_file = my_create_buf_file
relay_chan = relay_open(NULL, NULL,
subbuf_size, subbuf_num,
&relay_cb, NULL);
relay_late_setup_files(relay_chan, filename, parent);
```
But before fix, the callback must be something like:
```
struct dentry *my_create_buf_file(const char *filename,
struct dentry *parent, umode_t mode,
struct rchan_buf *buf, int *is_global)
{
if (!filename)
return ERR_PTR(1); // a valid ptr is necessary for relay_open
return debugfs_create_file(filename, mode, parent, buf,
&relay_file_operations);
}
```
Fixes: 2c1cf00eeacb ("relay: check return of create_buf_file() properly")
Signed-off-by: Philo Lu <lulie@linux.alibaba.com>
---
kernel/relay.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/kernel/relay.c b/kernel/relay.c
index a8e90e98bf2c..0d8b8325530a 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -391,12 +391,13 @@ static struct rchan_buf *relay_open_buf(struct rchan *chan, unsigned int cpu)
goto free_buf;
relay_set_buf_dentry(buf, dentry);
} else {
- /* Only retrieve global info, nothing more, nothing less */
+ /* In buffer-only mode, relay_open_buf is called with
+ * filename=NULL, but create_buf_file is still needed to
+ * retrieve is_global info. So dentry should be NULL here.
+ */
dentry = chan->cb->create_buf_file(NULL, NULL,
S_IRUSR, buf,
&chan->is_global);
- if (IS_ERR_OR_NULL(dentry))
- goto free_buf;
}
buf->cpu = cpu;
--
2.32.0.3.g01195cf9f
next reply other threads:[~2024-02-20 10:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-20 10:58 Philo Lu [this message]
2024-03-15 2:39 ` zhangzhengming
2024-03-15 3:22 ` Philo Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240220105836.15815-1-lulie@linux.alibaba.com \
--to=lulie@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=alibuda@linux.alibaba.com \
--cc=dust.li@linux.alibaba.com \
--cc=gregkh@linuxfoundation.org \
--cc=guwen@linux.alibaba.com \
--cc=hengqi@linux.alibaba.com \
--cc=kunyu@nfschina.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nabijaczleweli@nabijaczleweli.xyz \
--cc=xuanzhuo@linux.alibaba.com \
--cc=zhang.zhengming@h3c.com \
--cc=zhao_lei1@hoperun.com \
--cc=zhou.kete@h3c.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®