From: Boaz Harrosh <boazh@xxxxxxxxxx>
In zus we support dynamic-debug prints. ie user can
turn on and off the prints at run time by writing
to some special files.
The API is exactly the same as the Kernel's dynamic-prints
only the special file that we perform read/write on is:
/sys/fs/zuf/ddbg
But otherwise it is identical to Kernel.
The Kernel code is a thin wrapper to dispatch to/from
the read/write of /sys/fs/zuf/ddbg file to the zus
server.
The heavy lifting is done by the zus project build system
and core code. See zus project how this is done
This facility is dispatched on the mount-thread and not
the regular ZTs. Because it is available globally before
any mounts.
Signed-off-by: Boaz Harrosh <boazh@xxxxxxxxxx>
---
fs/zuf/zuf-core.c | 1 +
fs/zuf/zuf-root.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++
fs/zuf/zus_api.h | 12 +++++++-
3 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/fs/zuf/zuf-core.c b/fs/zuf/zuf-core.c
index 2afccfcf90bb..a9034bb196db 100644
--- a/fs/zuf/zuf-core.c
+++ b/fs/zuf/zuf-core.c
@@ -777,6 +777,7 @@ const char *zuf_op_name(enum e_zufs_operation op)
CASE_ENUM_NAME(ZUFS_OP_READDIR );
CASE_ENUM_NAME(ZUFS_OP_CLONE );
CASE_ENUM_NAME(ZUFS_OP_COPY );
+
CASE_ENUM_NAME(ZUFS_OP_READ );
CASE_ENUM_NAME(ZUFS_OP_PRE_READ );
CASE_ENUM_NAME(ZUFS_OP_WRITE );
diff --git a/fs/zuf/zuf-root.c b/fs/zuf/zuf-root.c
index 37b70ca33d3c..5c8c4af1a7e7 100644
--- a/fs/zuf/zuf-root.c
+++ b/fs/zuf/zuf-root.c
@@ -79,6 +79,82 @@ static void _fs_type_free(struct zuf_fs_type *zft)
}
#endif /*CONFIG_LOCKDEP*/
+#define DDBG_MAX_BUF_SIZE (8 * PAGE_SIZE)
+/* We use ppos as a cookie for the dynamic debug ID we want to read from */
+static ssize_t _zus_ddbg_read(struct file *file, char __user *buf, size_t len,
+ loff_t *ppos)
+{
+ struct zufs_ioc_mount *zim;
+ size_t buf_size = (DDBG_MAX_BUF_SIZE <= len) ? DDBG_MAX_BUF_SIZE : len;
+ size_t zim_size = sizeof(zim->hdr) + sizeof(zim->zdi);
+ ssize_t err;
+
+ zim = vzalloc(zim_size + buf_size);
+ if (unlikely(!zim))
+ return -ENOMEM;
+
+ /* null terminate the 1st character in the buffer, hence the '+ 1' */
+ zim->hdr.in_len = zim_size + 1;
+ zim->hdr.out_len = zim_size + buf_size;
+ zim->zdi.len = buf_size;
+ zim->zdi.id = *ppos;
+ *ppos = 0;
+
+ err = __zufc_dispatch_mount(ZRI(file->f_inode->i_sb), ZUFS_M_DDBG_RD,
+ zim);
+ if (unlikely(err)) {
+ zuf_err("error dispatching contorl message => %ld\n", err);
+ goto out;
+ }
+
+ err = simple_read_from_buffer(buf, zim->zdi.len, ppos, zim->zdi.msg,
+ buf_size);
+ if (unlikely(err <= 0))
+ goto out;
+
+ *ppos = zim->zdi.id;
+out:
+ vfree(zim);
+ return err;
+}
+
+static ssize_t _zus_ddbg_write(struct file *file, const char __user *buf,
+ size_t len, loff_t *ofst)
+{
+ struct _ddbg_info {
+ struct zufs_ioc_mount zim;
+ char buf[512];
+ } ddi = {};
+ ssize_t err;
+
+ if (unlikely(512 < len)) {
+ zuf_err("ddbg control message to long\n");
+ return -EINVAL;
+ }
+
+ memset(&ddi, 0, sizeof(ddi));
+ if (copy_from_user(ddi.zim.zdi.msg, buf, len))
+ return -EFAULT;
+
+ ddi.zim.hdr.in_len = sizeof(ddi);
+ ddi.zim.hdr.out_len = sizeof(ddi.zim);
+ err = __zufc_dispatch_mount(ZRI(file->f_inode->i_sb), ZUFS_M_DDBG_WR,
+ &ddi.zim);
+ if (unlikely(err)) {
+ zuf_err("error dispatching contorl message => %ld\n", err);
+ return err;
+ }
+
+ return len;
+}
+
+static const struct file_operations _zus_ddbg_ops = {
+ .open = nonseekable_open,
+ .read = _zus_ddbg_read,
+ .write = _zus_ddbg_write,
+ .llseek = no_llseek,
+};
+
int zufr_register_fs(struct super_block *sb, struct zufs_ioc_register_fs *rfs)
{
struct zuf_fs_type *zft = _fs_type_alloc();
@@ -256,6 +332,7 @@ static const struct super_operations zufr_super_operations = {
static int zufr_fill_super(struct super_block *sb, void *data, int silent)
{
static struct tree_descr zufr_files[] = {
+ [2] = {"ddbg", &_zus_ddbg_ops, S_IFREG | 0600},
{""},
};
struct zuf_root_info *zri;
diff --git a/fs/zuf/zus_api.h b/fs/zuf/zus_api.h
index 95fb5c35cde5..14ada4c760ae 100644
--- a/fs/zuf/zus_api.h
+++ b/fs/zuf/zus_api.h
@@ -268,10 +268,20 @@ struct zufs_mount_info {
struct zufs_parse_options po;
};
+struct zufs_ddbg_info {
+ __u64 id; /* IN where to start from, OUT last ID */
+ /* IN size of buffer, OUT size of dynamic debug message */
+ __u64 len;
+ char msg[0];
+};
+
/* mount / umount */
struct zufs_ioc_mount {
struct zufs_ioc_hdr hdr;
- struct zufs_mount_info zmi;
+ union {
+ struct zufs_mount_info zmi;
+ struct zufs_ddbg_info zdi;
+ };
};
#define ZU_IOC_MOUNT _IOWR('Z', 11, struct zufs_ioc_mount)
--
2.20.1
