| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <567792eb7a51a42306cad82c8d3d8c00959eeddc.1497455937.git.shli@fb.com>
Date: Wed, 14 Jun 2017 09:12:04 -0700
From: Shaohua Li <shli@...nel.org>
To: linux-kernel@...r.kernel.org, linux-block@...r.kernel.org
Cc: tj@...nel.org, gregkh@...uxfoundation.org, hch@....de,
axboe@...com, rostedt@...dmis.org, lizefan@...wei.com,
Kernel-team@...com, Shaohua Li <shli@...com>
Subject: [PATCH V2 06/12] kernfs: add exportfs operations
From: Shaohua Li <shli@...com>
Now we have the facilities to implement exportfs operations. The idea is
cgroup can export the fhandle info to userspace, then userspace uses
fhandle to find the cgroup name. Another example is userspace can get
fhandle for a cgroup and BPF uses the fhandle to filter info for the
cgroup.
Signed-off-by: Shaohua Li <shli@...com>
---
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 2 +-
fs/kernfs/mount.c | 113 ++++++++++++++++++++++++++++++-
fs/sysfs/mount.c | 2 +-
include/linux/exportfs.h | 11 +++
include/linux/kernfs.h | 23 +++++--
kernel/cgroup/cgroup.c | 3 +-
6 files changed, 144 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
index f5af0cc..fee2126 100644
--- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
+++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
@@ -854,7 +854,7 @@ static struct dentry *rdt_mount(struct file_system_type *fs_type,
}
dentry = kernfs_mount(fs_type, flags, rdt_root,
- RDTGROUP_SUPER_MAGIC, NULL);
+ RDTGROUP_SUPER_MAGIC, NULL, false);
if (IS_ERR(dentry))
goto out_cdp;
diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c
index 462a40c..5af73a8 100644
--- a/fs/kernfs/mount.c
+++ b/fs/kernfs/mount.c
@@ -16,6 +16,7 @@
#include <linux/pagemap.h>
#include <linux/namei.h>
#include <linux/seq_file.h>
+#include <linux/exportfs.h>
#include "kernfs-internal.h"
@@ -64,6 +65,107 @@ const struct super_operations kernfs_sops = {
.show_path = kernfs_sop_show_path,
};
+static int kernfs_encode_fh(struct inode *inode, __u32 *fh, int *max_len,
+ struct inode *parent)
+{
+ struct kernfs_fid *fid = (struct kernfs_fid *)fh;
+
+ if (parent && (*max_len) < KERNFS_FID_WITH_PARENT_LEN) {
+ *max_len = KERNFS_FID_WITH_PARENT_LEN;
+ return FILEID_INVALID;
+ } else if ((*max_len) < KERNFS_FID_WITHOUT_PARENT_LEN) {
+ *max_len = KERNFS_FID_WITHOUT_PARENT_LEN;
+ return FILEID_INVALID;
+ }
+
+ fid->ino = inode->i_ino;
+ fid->gen = inode->i_generation;
+ if (parent) {
+ fid->parent_ino = parent->i_ino;
+ fid->parent_gen = parent->i_generation;
+ *max_len = KERNFS_FID_WITH_PARENT_LEN;
+ return FILEID_KERNFS_WITH_PARENT;
+ } else {
+ *max_len = KERNFS_FID_WITHOUT_PARENT_LEN;
+ return FILEID_KERNFS_WITHOUT_PARENT;
+ }
+}
+
+static struct inode *kernfs_fh_get_inode(struct super_block *sb,
+ u64 ino, u32 generation)
+{
+ struct kernfs_super_info *info = kernfs_info(sb);
+ struct inode *inode;
+ struct kernfs_node *kn;
+
+ if (ino == 0)
+ return ERR_PTR(-ESTALE);
+
+ kn = kernfs_find_and_get_node_by_ino(info->root, ino);
+ if (!kn)
+ return ERR_PTR(-ESTALE);
+ inode = kernfs_get_inode(sb, kn);
+ kernfs_put(kn);
+ if (IS_ERR(inode))
+ return ERR_CAST(inode);
+
+ if (inode->i_generation != generation) {
+ /* we didn't find the right inode.. */
+ iput(inode);
+ return ERR_PTR(-ESTALE);
+ }
+ return inode;
+}
+
+static struct dentry *kernfs_fh_to_dentry(struct super_block *sb, struct fid *fid,
+ int fh_len, int fh_type)
+{
+ struct kernfs_fid *kfid = (struct kernfs_fid *)fid;
+ struct inode *inode = NULL;
+
+ if (fh_len < KERNFS_FID_WITHOUT_PARENT_LEN)
+ return NULL;
+
+ switch (fh_type) {
+ case FILEID_KERNFS_WITHOUT_PARENT:
+ case FILEID_KERNFS_WITH_PARENT:
+ inode = kernfs_fh_get_inode(sb, kfid->ino, kfid->gen);
+ break;
+ }
+
+ return d_obtain_alias(inode);
+}
+
+static struct dentry *kernfs_fh_to_parent(struct super_block *sb, struct fid *fid,
+ int fh_len, int fh_type)
+{
+ struct kernfs_fid *kfid = (struct kernfs_fid *)fid;
+ struct inode *inode = NULL;
+
+ if (fh_len < KERNFS_FID_WITH_PARENT_LEN)
+ return NULL;
+
+ if (fh_type == FILEID_KERNFS_WITH_PARENT)
+ inode = kernfs_fh_get_inode(sb, kfid->parent_ino,
+ kfid->parent_gen);
+
+ return d_obtain_alias(inode);
+}
+
+static struct dentry *kernfs_get_parent_dentry(struct dentry *child)
+{
+ struct kernfs_node *kn = kernfs_dentry_node(child);
+
+ return d_obtain_alias(kernfs_get_inode(child->d_sb, kn->parent));
+}
+
+static const struct export_operations kernfs_export_ops = {
+ .encode_fh = kernfs_encode_fh,
+ .fh_to_dentry = kernfs_fh_to_dentry,
+ .fh_to_parent = kernfs_fh_to_parent,
+ .get_parent = kernfs_get_parent_dentry,
+};
+
/**
* kernfs_root_from_sb - determine kernfs_root associated with a super_block
* @sb: the super_block in question
@@ -145,7 +247,8 @@ struct dentry *kernfs_node_dentry(struct kernfs_node *kn,
} while (true);
}
-static int kernfs_fill_super(struct super_block *sb, unsigned long magic)
+static int kernfs_fill_super(struct super_block *sb, unsigned long magic,
+ bool enable_expop)
{
struct kernfs_super_info *info = kernfs_info(sb);
struct inode *inode;
@@ -159,6 +262,8 @@ static int kernfs_fill_super(struct super_block *sb, unsigned long magic)
sb->s_magic = magic;
sb->s_op = &kernfs_sops;
sb->s_xattr = kernfs_xattr_handlers;
+ if (enable_expop)
+ sb->s_export_op = &kernfs_export_ops;
sb->s_time_gran = 1;
/* get root inode, initialize and unlock it */
@@ -219,6 +324,7 @@ const void *kernfs_super_ns(struct super_block *sb)
* @magic: file system specific magic number
* @new_sb_created: tell the caller if we allocated a new superblock
* @ns: optional namespace tag of the mount
+ * @enable_expop: if adding fhandle support
*
* This is to be called from each kernfs user's file_system_type->mount()
* implementation, which should pass through the specified @fs_type and
@@ -229,7 +335,8 @@ const void *kernfs_super_ns(struct super_block *sb)
*/
struct dentry *kernfs_mount_ns(struct file_system_type *fs_type, int flags,
struct kernfs_root *root, unsigned long magic,
- bool *new_sb_created, const void *ns)
+ bool *new_sb_created, const void *ns,
+ bool enable_expop)
{
struct super_block *sb;
struct kernfs_super_info *info;
@@ -255,7 +362,7 @@ struct dentry *kernfs_mount_ns(struct file_system_type *fs_type, int flags,
if (!sb->s_root) {
struct kernfs_super_info *info = kernfs_info(sb);
- error = kernfs_fill_super(sb, magic);
+ error = kernfs_fill_super(sb, magic, enable_expop);
if (error) {
deactivate_locked_super(sb);
return ERR_PTR(error);
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 20b8f82..d1a3336b 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -37,7 +37,7 @@ static struct dentry *sysfs_mount(struct file_system_type *fs_type,
ns = kobj_ns_grab_current(KOBJ_NS_TYPE_NET);
root = kernfs_mount_ns(fs_type, flags, sysfs_root,
- SYSFS_MAGIC, &new_sb, ns);
+ SYSFS_MAGIC, &new_sb, ns, false);
if (IS_ERR(root) || !new_sb)
kobj_ns_drop(KOBJ_NS_TYPE_NET, ns);
else if (new_sb)
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index 5ab958c..e9abf75 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -104,6 +104,17 @@ enum fid_type {
FILEID_LUSTRE = 0x97,
/*
+ * 64 bit inode number, 32 bit generation number
+ */
+ FILEID_KERNFS_WITHOUT_PARENT = 0x91,
+
+ /*
+ * 64 bit inode number, 32 bit generation number
+ * 32 bit parent generation bumber, 64 bit parent inode number
+ */
+ FILEID_KERNFS_WITH_PARENT = 0x92,
+
+ /*
* Filesystems must not use 0xff file ID.
*/
FILEID_INVALID = 0xff,
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index 6be2d57..3b38bdf 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -101,6 +101,20 @@ struct kernfs_node_id {
u32 generation;
} __attribute__((packed));
+struct kernfs_fid {
+ /*
+ * the first two fields should have the identical layout as
+ * kernfs_node_id
+ */
+ u64 ino;
+ u32 gen;
+ u32 parent_gen;
+ u64 parent_ino;
+} __attribute__((packed));
+#define KERNFS_FID_WITHOUT_PARENT_LEN (offsetof(struct kernfs_fid, \
+ parent_gen) / 4)
+#define KERNFS_FID_WITH_PARENT_LEN (sizeof(struct kernfs_fid) / 4)
+
/*
* kernfs_node - the building block of kernfs hierarchy. Each and every
* kernfs node is represented by single kernfs_node. Most fields are
@@ -337,7 +351,8 @@ void kernfs_notify(struct kernfs_node *kn);
const void *kernfs_super_ns(struct super_block *sb);
struct dentry *kernfs_mount_ns(struct file_system_type *fs_type, int flags,
struct kernfs_root *root, unsigned long magic,
- bool *new_sb_created, const void *ns);
+ bool *new_sb_created, const void *ns,
+ bool enable_expop);
void kernfs_kill_sb(struct super_block *sb);
struct super_block *kernfs_pin_sb(struct kernfs_root *root, const void *ns);
@@ -440,7 +455,7 @@ static inline const void *kernfs_super_ns(struct super_block *sb)
static inline struct dentry *
kernfs_mount_ns(struct file_system_type *fs_type, int flags,
struct kernfs_root *root, unsigned long magic,
- bool *new_sb_created, const void *ns)
+ bool *new_sb_created, const void *ns, bool enable_expop)
{ return ERR_PTR(-ENOSYS); }
static inline void kernfs_kill_sb(struct super_block *sb) { }
@@ -521,10 +536,10 @@ static inline int kernfs_rename(struct kernfs_node *kn,
static inline struct dentry *
kernfs_mount(struct file_system_type *fs_type, int flags,
struct kernfs_root *root, unsigned long magic,
- bool *new_sb_created)
+ bool *new_sb_created, bool enable_expop)
{
return kernfs_mount_ns(fs_type, flags, root,
- magic, new_sb_created, NULL);
+ magic, new_sb_created, NULL, enable_expop);
}
#endif /* __LINUX_KERNFS_H */
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 8d4e85e..639e27d 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -1749,7 +1749,8 @@ struct dentry *cgroup_do_mount(struct file_system_type *fs_type, int flags,
struct dentry *dentry;
bool new_sb;
- dentry = kernfs_mount(fs_type, flags, root->kf_root, magic, &new_sb);
+ dentry = kernfs_mount(fs_type, flags, root->kf_root, magic, &new_sb,
+ true);
/*
* In non-init cgroup namespace, instead of root cgroup's dentry,
--
2.9.3
Powered by blists - more mailing lists