Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1666293
| From | David Howells <dhowells@redhat.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 27/27] ... and the intel_rdt driver |
| Date | 2017-06-15 00:40 +0200 |
| Message-ID | <tSp7b-2DF-9@gated-at.bofh.it> (permalink) |
| References | <tSifo-6QJ-17@gated-at.bofh.it> <tSifn-6QJ-7@gated-at.bofh.it> <tSifo-6QJ-17@gated-at.bofh.it> |
| Organization | Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 |
This also needs the attached addition to fix the intel_rdt driver.
David
---
diff --git a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
index f5af0cc7eb0d..d026701894fd 100644
--- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
+++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
@@ -35,6 +35,11 @@
#include <asm/intel_rdt.h>
#include <asm/intel_rdt_common.h>
+struct rdt_fs_context {
+ struct kernfs_fs_context kfc;
+ bool enable_cdp;
+};
+
DEFINE_STATIC_KEY_FALSE(rdt_enable_key);
struct kernfs_root *rdt_root;
struct rdtgroup rdtgroup_default;
@@ -743,22 +748,6 @@ static void cdp_disable(void)
}
}
-static int parse_rdtgroupfs_options(char *data)
-{
- char *token, *o = data;
- int ret = 0;
-
- while ((token = strsep(&o, ",")) != NULL) {
- if (!*token)
- return -EINVAL;
-
- if (!strcmp(token, "cdp"))
- ret = cdp_enable();
- }
-
- return ret;
-}
-
/*
* We don't allow rdtgroup directories to be created anywhere
* except the root directory. Thus when looking for the rdtgroup
@@ -823,11 +812,9 @@ void rdtgroup_kn_unlock(struct kernfs_node *kn)
}
}
-static struct dentry *rdt_mount(struct file_system_type *fs_type,
- int flags, const char *unused_dev_name,
- void *data)
+static int rdt_get_tree(struct fs_context *fc)
{
- struct dentry *dentry;
+ struct rdt_fs_context *ctx = container_of(fc, struct rdt_fs_context, kfc.fc);
int ret;
mutex_lock(&rdtgroup_mutex);
@@ -835,27 +822,25 @@ static struct dentry *rdt_mount(struct file_system_type *fs_type,
* resctrl file system can only be mounted once.
*/
if (static_branch_unlikely(&rdt_enable_key)) {
- dentry = ERR_PTR(-EBUSY);
+ errorf("intel_rdt: Can only mount once");
+ ret = -EBUSY;
goto out;
}
- ret = parse_rdtgroupfs_options(data);
- if (ret) {
- dentry = ERR_PTR(ret);
- goto out_cdp;
+ if (ctx->enable_cdp) {
+ ret = cdp_enable();
+ if (ret < 0)
+ goto out_cdp;
}
closid_init();
ret = rdtgroup_create_info_dir(rdtgroup_default.kn);
- if (ret) {
- dentry = ERR_PTR(ret);
+ if (ret < 0)
goto out_cdp;
- }
- dentry = kernfs_mount(fs_type, flags, rdt_root,
- RDTGROUP_SUPER_MAGIC, NULL);
- if (IS_ERR(dentry))
+ ret = kernfs_get_tree(&ctx->kfc);
+ if (ret < 0)
goto out_cdp;
static_branch_enable(&rdt_enable_key);
@@ -865,8 +850,42 @@ static struct dentry *rdt_mount(struct file_system_type *fs_type,
cdp_disable();
out:
mutex_unlock(&rdtgroup_mutex);
+ return ret;
+}
+
+static int rdt_parse_option(struct fs_context *fc, char *p)
+{
+ struct rdt_fs_context *ctx = container_of(fc, struct rdt_fs_context, kfc.fc);
- return dentry;
+ if (strcmp(p, "cdp") == 0) {
+ ctx->enable_cdp = true;
+ return 0;
+ }
+
+ return invalf("intel_rdt: Unknown option");
+}
+
+static void rdt_fs_context_free(struct fs_context *fc)
+{
+ struct rdt_fs_context *ctx = container_of(fc, struct rdt_fs_context, kfc.fc);
+
+ kernfs_free_fs_context(&ctx->kfc);
+}
+
+static const struct fs_context_operations rdt_fs_context_ops = {
+ .free = rdt_fs_context_free,
+ .parse_option = rdt_parse_option,
+ .get_tree = rdt_get_tree,
+};
+
+static int rdt_init_fs_context(struct fs_context *fc, struct super_block *src_sb)
+{
+ struct rdt_fs_context *ctx = container_of(fc, struct rdt_fs_context, kfc.fc);
+
+ ctx->kfc.root = rdt_root;
+ ctx->kfc.magic = RDTGROUP_SUPER_MAGIC;
+ ctx->kfc.fc.ops = &rdt_fs_context_ops;
+ return 0;
}
static int reset_all_ctrls(struct rdt_resource *r)
@@ -994,9 +1013,10 @@ static void rdt_kill_sb(struct super_block *sb)
}
static struct file_system_type rdt_fs_type = {
- .name = "resctrl",
- .mount = rdt_mount,
- .kill_sb = rdt_kill_sb,
+ .name = "resctrl",
+ .fs_context_size = sizeof(struct rdt_fs_context),
+ .init_fs_context = rdt_init_fs_context,
+ .kill_sb = rdt_kill_sb,
};
static int rdtgroup_mkdir(struct kernfs_node *parent_kn, const char *name,
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[RFC][PATCH 00/27] VFS: Introduce filesystem context [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 11/27] VFS: Remove unused code after filesystem context changes [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 20/27] NFS: Split nfs_parse_mount_options() [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 03/27] VFS: Make get_mnt_ns() return the namespace [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
Re: [PATCH 03/27] VFS: Make get_mnt_ns() return the namespace [ver #5] Al Viro <viro@ZenIV.linux.org.uk> - 2017-06-15 11:20 +0200
[PATCH 27/27] kernfs, sysfs, cgroup: Support fs_context [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
Re: [PATCH 27/27] kernfs, sysfs, cgroup: Support fs_context [ver #5] Tejun Heo <tj@kernel.org> - 2017-06-14 20:00 +0200
Re: [PATCH 27/27] ... and the intel_rdt driver David Howells <dhowells@redhat.com> - 2017-06-15 00:40 +0200
[PATCH 26/27] cpuset: Use fs_context [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 16/27] proc: Add fs_context support to procfs [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
Re: [PATCH 16/27] proc: Add fs_context support to procfs [ver #5] Al Viro <viro@ZenIV.linux.org.uk> - 2017-06-15 12:20 +0200
[PATCH 01/27] Provide a function to create a NUL-terminated string from unterminated data [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 09/27] VFS: Add LSM hooks for filesystem context [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 25/27] ipc: Convert mqueue fs to fs_context [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
Re: [PATCH 25/27] ipc: Convert mqueue fs to fs_context [ver #5] Al Viro <viro@ZenIV.linux.org.uk> - 2017-06-15 12:10 +0200
Re: [PATCH 25/27] ipc: Convert mqueue fs to fs_context [ver #5] David Howells <dhowells@redhat.com> - 2017-06-15 16:50 +0200
[PATCH 23/27] NFS: Do some tidying of the parsing code [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 22/27] NFS: Add a small buffer in nfs_fs_context to avoid string dup [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 14/27] VFS: Add a sample program for fsopen/fsmount [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 02/27] VFS: Clean up whitespace in fs/namespace.c and fs/super.c [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 04/27] VFS: Make get_filesystem() return the affected filesystem [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 18/27] NFS: Constify mount argument match tables [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:20 +0200
[PATCH 05/27] VFS: Provide empty name qstr [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:30 +0200
[PATCH 15/27] procfs: Move proc_fill_super() to fs/proc/root.c [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:30 +0200
[PATCH 08/27] VFS: Introduce the structs and doc for a filesystem context [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:30 +0200
Re: [PATCH 08/27] VFS: Introduce the structs and doc for a filesystem context [ver #5] Randy Dunlap <rdunlap@infradead.org> - 2017-06-14 20:10 +0200
Updated docs David Howells <dhowells@redhat.com> - 2017-06-15 01:00 +0200
Re: Updated docs Randy Dunlap <rdunlap@infradead.org> - 2017-06-15 04:00 +0200
Re: [PATCH 08/27] VFS: Introduce the structs and doc for a filesystem context [ver #5] Casey Schaufler <casey@schaufler-ca.com> - 2017-06-14 22:10 +0200
Re: [PATCH 08/27] VFS: Introduce the structs and doc for a filesystem context [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 22:50 +0200
Re: [PATCH 08/27] VFS: Introduce the structs and doc for a filesystem context [ver #5] Casey Schaufler <casey@schaufler-ca.com> - 2017-06-14 23:00 +0200
Re: [PATCH 08/27] VFS: Introduce the structs and doc for a filesystem context [ver #5] Theodore Ts'o <tytso@mit.edu> - 2017-06-17 12:00 +0200
Re: [PATCH 08/27] VFS: Introduce the structs and doc for a filesystem context [ver #5] David Howells <dhowells@redhat.com> - 2017-06-17 16:20 +0200
Re: [PATCH 08/27] VFS: Introduce the structs and doc for a filesystem context [ver #5] Jeff Layton <jlayton@redhat.com> - 2017-06-17 17:00 +0200
Re: [PATCH 08/27] VFS: Introduce the structs and doc for a filesystem context [ver #5] Randy Dunlap <rdunlap@infradead.org> - 2017-06-17 17:20 +0200
Re: [PATCH 08/27] VFS: Introduce the structs and doc for a filesystem context [ver #5] David Howells <dhowells@redhat.com> - 2017-06-19 09:50 +0200
[PATCH 21/27] NFS: Deindent nfs_fs_context_parse_option() [ver #5] David Howells <dhowells@redhat.com> - 2017-06-14 17:30 +0200
Re: [PATCH 07/27] VFS: Differentiate mount flags (MS_*) from internal superblock flags [ver #5] Al Viro <viro@ZenIV.linux.org.uk> - 2017-06-15 11:50 +0200
Re: [PATCH 07/27] VFS: Differentiate mount flags (MS_*) from internal superblock flags [ver #5] Christoph Hellwig <hch@infradead.org> - 2017-06-16 11:10 +0200
Re: [PATCH 07/27] VFS: Differentiate mount flags (MS_*) from internal superblock flags [ver #5] David Howells <dhowells@redhat.com> - 2017-06-16 17:00 +0200
Re: [PATCH 07/27] VFS: Differentiate mount flags (MS_*) from internal superblock flags [ver #5] Christoph Hellwig <hch@infradead.org> - 2017-06-16 18:00 +0200
Re: [PATCH 07/27] VFS: Differentiate mount flags (MS_*) from internal superblock flags [ver #5] David Howells <dhowells@redhat.com> - 2017-06-16 18:00 +0200
csiph-web