From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xenproject.org
Cc: Juergen Gross <jgross@suse.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
George Dunlap <george.dunlap@citrix.com>,
Ian Jackson <iwj@xenproject.org>, Jan Beulich <jbeulich@suse.com>,
Julien Grall <julien@xen.org>,
Stefano Stabellini <sstabellini@kernel.org>, Wei Liu <wl@xen.org>
Subject: [PATCH v2 12/17] xen/hypfs: add new enter() and exit() per node callbacks
Date: Tue, 1 Dec 2020 09:21:23 +0100 [thread overview]
Message-ID: <20201201082128.15239-13-jgross@suse.com> (raw)
In-Reply-To: <20201201082128.15239-1-jgross@suse.com>
In order to better support resource allocation and locking for dynamic
hypfs nodes add enter() and exit() callbacks to struct hypfs_funcs.
The enter() callback is called when entering a node during hypfs user
actions (traversing, reading or writing it), while the exit() callback
is called when leaving a node (accessing another node at the same or a
higher directory level, or when returning to the user).
For avoiding recursion this requires a parent pointer in each node.
Let the enter() callback return the entry address which is stored as
the last accessed node in order to be able to use a template entry for
that purpose in case of dynamic entries.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
V2:
- new patch
---
xen/common/hypfs.c | 79 +++++++++++++++++++++++++++++++++++++++++
xen/include/xen/hypfs.h | 5 +++
2 files changed, 84 insertions(+)
diff --git a/xen/common/hypfs.c b/xen/common/hypfs.c
index 83c5cacdca..e5adc9defe 100644
--- a/xen/common/hypfs.c
+++ b/xen/common/hypfs.c
@@ -25,30 +25,40 @@ CHECK_hypfs_dirlistentry;
ROUNDUP((name_len) + 1, alignof(struct xen_hypfs_direntry)))
const struct hypfs_funcs hypfs_dir_funcs = {
+ .enter = hypfs_node_enter,
+ .exit = hypfs_node_exit,
.read = hypfs_read_dir,
.write = hypfs_write_deny,
.getsize = hypfs_getsize,
.findentry = hypfs_dir_findentry,
};
const struct hypfs_funcs hypfs_leaf_ro_funcs = {
+ .enter = hypfs_node_enter,
+ .exit = hypfs_node_exit,
.read = hypfs_read_leaf,
.write = hypfs_write_deny,
.getsize = hypfs_getsize,
.findentry = hypfs_leaf_findentry,
};
const struct hypfs_funcs hypfs_leaf_wr_funcs = {
+ .enter = hypfs_node_enter,
+ .exit = hypfs_node_exit,
.read = hypfs_read_leaf,
.write = hypfs_write_leaf,
.getsize = hypfs_getsize,
.findentry = hypfs_leaf_findentry,
};
const struct hypfs_funcs hypfs_bool_wr_funcs = {
+ .enter = hypfs_node_enter,
+ .exit = hypfs_node_exit,
.read = hypfs_read_leaf,
.write = hypfs_write_bool,
.getsize = hypfs_getsize,
.findentry = hypfs_leaf_findentry,
};
const struct hypfs_funcs hypfs_custom_wr_funcs = {
+ .enter = hypfs_node_enter,
+ .exit = hypfs_node_exit,
.read = hypfs_read_leaf,
.write = hypfs_write_custom,
.getsize = hypfs_getsize,
@@ -63,6 +73,8 @@ enum hypfs_lock_state {
};
static DEFINE_PER_CPU(enum hypfs_lock_state, hypfs_locked);
+static DEFINE_PER_CPU(const struct hypfs_entry *, hypfs_last_node_entered);
+
HYPFS_DIR_INIT(hypfs_root, "");
static void hypfs_read_lock(void)
@@ -100,11 +112,58 @@ static void hypfs_unlock(void)
}
}
+const struct hypfs_entry *hypfs_node_enter(const struct hypfs_entry *entry)
+{
+ return entry;
+}
+
+void hypfs_node_exit(const struct hypfs_entry *entry)
+{
+}
+
+static int node_enter(const struct hypfs_entry *entry)
+{
+ const struct hypfs_entry **last = &this_cpu(hypfs_last_node_entered);
+
+ entry = entry->funcs->enter(entry);
+ if ( IS_ERR(entry) )
+ return PTR_ERR(entry);
+
+ ASSERT(!*last || *last == entry->parent);
+
+ *last = entry;
+
+ return 0;
+}
+
+static void node_exit(const struct hypfs_entry *entry)
+{
+ const struct hypfs_entry **last = &this_cpu(hypfs_last_node_entered);
+
+ if ( !*last )
+ return;
+
+ ASSERT(*last == entry);
+ *last = entry->parent;
+
+ entry->funcs->exit(entry);
+}
+
+static void node_exit_all(void)
+{
+ const struct hypfs_entry **last = &this_cpu(hypfs_last_node_entered);
+
+ while ( *last )
+ node_exit(*last);
+}
+
static int add_entry(struct hypfs_entry_dir *parent, struct hypfs_entry *new)
{
int ret = -ENOENT;
struct hypfs_entry *e;
+ ASSERT(new->funcs->enter);
+ ASSERT(new->funcs->exit);
ASSERT(new->funcs->read);
ASSERT(new->funcs->write);
ASSERT(new->funcs->getsize);
@@ -140,6 +199,7 @@ static int add_entry(struct hypfs_entry_dir *parent, struct hypfs_entry *new)
unsigned int sz = strlen(new->name);
parent->e.size += DIRENTRY_SIZE(sz);
+ new->parent = &parent->e;
}
hypfs_unlock();
@@ -221,6 +281,7 @@ static struct hypfs_entry *hypfs_get_entry_rel(struct hypfs_entry_dir *dir,
const char *end;
struct hypfs_entry *entry;
unsigned int name_len;
+ int ret;
for ( ; ; )
{
@@ -235,6 +296,10 @@ static struct hypfs_entry *hypfs_get_entry_rel(struct hypfs_entry_dir *dir,
end = strchr(path, '\0');
name_len = end - path;
+ ret = node_enter(&dir->e);
+ if ( ret )
+ return ERR_PTR(ret);
+
entry = dir->e.funcs->findentry(dir, path, name_len);
if ( IS_ERR(entry) || !*end )
return entry;
@@ -265,6 +330,7 @@ int hypfs_read_dir(const struct hypfs_entry *entry,
const struct hypfs_entry_dir *d;
const struct hypfs_entry *e;
unsigned int size = entry->funcs->getsize(entry);
+ int ret;
ASSERT(this_cpu(hypfs_locked) != hypfs_unlocked);
@@ -276,12 +342,19 @@ int hypfs_read_dir(const struct hypfs_entry *entry,
unsigned int e_namelen = strlen(e->name);
unsigned int e_len = DIRENTRY_SIZE(e_namelen);
+ ret = node_enter(e);
+ if ( ret )
+ return ret;
+
direntry.e.pad = 0;
direntry.e.type = e->type;
direntry.e.encoding = e->encoding;
direntry.e.content_len = e->funcs->getsize(e);
direntry.e.max_write_len = e->max_size;
direntry.off_next = list_is_last(&e->list, &d->dirlist) ? 0 : e_len;
+
+ node_exit(e);
+
if ( copy_to_guest(uaddr, &direntry, 1) )
return -EFAULT;
@@ -490,6 +563,10 @@ long do_hypfs_op(unsigned int cmd,
goto out;
}
+ ret = node_enter(entry);
+ if ( ret )
+ goto out;
+
switch ( cmd )
{
case XEN_HYPFS_OP_read:
@@ -506,6 +583,8 @@ long do_hypfs_op(unsigned int cmd,
}
out:
+ node_exit_all();
+
hypfs_unlock();
return ret;
diff --git a/xen/include/xen/hypfs.h b/xen/include/xen/hypfs.h
index 53f50772b4..8d96abd805 100644
--- a/xen/include/xen/hypfs.h
+++ b/xen/include/xen/hypfs.h
@@ -35,6 +35,8 @@ struct hypfs_entry;
* "/a/b/c" findentry() will be called for "/", "/a", and "/a/b").
*/
struct hypfs_funcs {
+ const struct hypfs_entry *(*enter)(const struct hypfs_entry *entry);
+ void (*exit)(const struct hypfs_entry *entry);
int (*read)(const struct hypfs_entry *entry,
XEN_GUEST_HANDLE_PARAM(void) uaddr);
int (*write)(struct hypfs_entry_leaf *leaf,
@@ -56,6 +58,7 @@ struct hypfs_entry {
unsigned int size;
unsigned int max_size;
const char *name;
+ struct hypfs_entry *parent;
struct list_head list;
const struct hypfs_funcs *funcs;
};
@@ -149,6 +152,8 @@ int hypfs_add_dir(struct hypfs_entry_dir *parent,
struct hypfs_entry_dir *dir, bool nofault);
int hypfs_add_leaf(struct hypfs_entry_dir *parent,
struct hypfs_entry_leaf *leaf, bool nofault);
+const struct hypfs_entry *hypfs_node_enter(const struct hypfs_entry *entry);
+void hypfs_node_exit(const struct hypfs_entry *entry);
int hypfs_read_dir(const struct hypfs_entry *entry,
XEN_GUEST_HANDLE_PARAM(void) uaddr);
int hypfs_read_leaf(const struct hypfs_entry *entry,
--
2.26.2
next prev parent reply other threads:[~2020-12-01 8:22 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 8:21 [PATCH v2 00/17] xen: support per-cpupool scheduling granularity Juergen Gross
2020-12-01 8:21 ` [PATCH v2 01/17] xen/cpupool: add cpu to sched_res_mask when removing it from cpupool Juergen Gross
2020-12-01 8:21 ` [PATCH v2 02/17] xen/cpupool: add missing bits for per-cpupool scheduling granularity Juergen Gross
2020-12-01 8:21 ` [PATCH v2 03/17] xen/cpupool: sort included headers in cpupool.c Juergen Gross
2020-12-01 8:21 ` [PATCH v2 04/17] xen/cpupool: switch cpupool id to unsigned Juergen Gross
2020-12-01 8:55 ` Jan Beulich
2020-12-01 9:01 ` Jürgen Groß
2020-12-01 9:07 ` Jan Beulich
2020-12-07 9:59 ` Jan Beulich
2020-12-07 14:48 ` Jürgen Groß
2020-12-07 15:00 ` Jan Beulich
2020-12-04 15:52 ` Dario Faggioli
2020-12-07 9:58 ` Jan Beulich
2020-12-07 15:21 ` Jan Beulich
2020-12-01 8:21 ` [PATCH v2 05/17] xen/cpupool: switch cpupool list to normal list interface Juergen Gross
2020-12-01 9:12 ` Jan Beulich
2020-12-01 9:18 ` Jürgen Groß
2020-12-04 16:13 ` Dario Faggioli
2020-12-04 16:16 ` Jürgen Groß
2020-12-04 16:25 ` Dario Faggioli
2020-12-04 16:56 ` Dario Faggioli
2020-12-01 8:21 ` [PATCH v2 06/17] xen/cpupool: use ERR_PTR() for returning error cause from cpupool_create() Juergen Gross
2020-12-02 8:58 ` Jan Beulich
2020-12-02 9:56 ` Jürgen Groß
2020-12-02 10:46 ` Jan Beulich
2020-12-02 10:58 ` Jürgen Groß
2020-12-04 16:29 ` Dario Faggioli
2020-12-01 8:21 ` [PATCH v2 07/17] xen/cpupool: support moving domain between cpupools with different granularity Juergen Gross
2020-12-01 8:21 ` [PATCH v2 08/17] docs: fix hypfs path documentation Juergen Gross
2020-12-01 8:21 ` [PATCH v2 09/17] xen/hypfs: move per-node function pointers into a dedicated struct Juergen Gross
2020-12-02 15:36 ` Jan Beulich
2020-12-02 15:41 ` Jürgen Groß
2020-12-03 8:47 ` Jürgen Groß
2020-12-03 9:12 ` Jan Beulich
2020-12-03 9:51 ` Jürgen Groß
2020-12-01 8:21 ` [PATCH v2 10/17] xen/hypfs: pass real failure reason up from hypfs_get_entry() Juergen Gross
2020-12-01 8:21 ` [PATCH v2 11/17] xen/hypfs: add getsize() and findentry() callbacks to hypfs_funcs Juergen Gross
2020-12-02 15:42 ` Jan Beulich
2020-12-02 15:51 ` Jürgen Groß
2020-12-03 8:12 ` Jan Beulich
2020-12-03 9:39 ` Jürgen Groß
2020-12-04 8:58 ` Jan Beulich
2020-12-04 11:14 ` Jürgen Groß
2020-12-01 8:21 ` Juergen Gross [this message]
2020-12-03 14:59 ` [PATCH v2 12/17] xen/hypfs: add new enter() and exit() per node callbacks Jan Beulich
2020-12-03 15:14 ` Jürgen Groß
2020-12-03 15:29 ` Jan Beulich
2020-12-04 8:33 ` Jürgen Groß
2020-12-04 8:30 ` Jan Beulich
2020-12-04 8:35 ` Jürgen Groß
2020-12-01 8:21 ` [PATCH v2 13/17] xen/hypfs: support dynamic hypfs nodes Juergen Gross
2020-12-03 15:08 ` Jan Beulich
2020-12-03 15:18 ` Jürgen Groß
2020-12-01 8:21 ` [PATCH v2 14/17] xen/hypfs: add support for id-based dynamic directories Juergen Gross
2020-12-03 15:44 ` Jan Beulich
2020-12-04 8:52 ` Jürgen Groß
2020-12-04 9:16 ` Jan Beulich
2020-12-04 13:08 ` Jürgen Groß
2020-12-07 7:54 ` Jan Beulich
2020-12-01 8:21 ` [PATCH v2 15/17] xen/cpupool: add cpupool directories Juergen Gross
2020-12-01 9:00 ` Jan Beulich
2020-12-01 9:03 ` Jürgen Groß
2020-12-02 15:46 ` Jürgen Groß
2020-12-03 14:46 ` Jan Beulich
2020-12-03 15:11 ` Jürgen Groß
2020-12-04 9:10 ` Jan Beulich
2020-12-04 11:08 ` Jürgen Groß
2020-12-04 11:54 ` Jan Beulich
2020-12-01 8:21 ` [PATCH v2 16/17] xen/cpupool: add scheduling granularity entry to cpupool entries Juergen Gross
2020-12-01 8:21 ` [PATCH v2 17/17] xen/cpupool: make per-cpupool sched-gran hypfs node writable Juergen Gross
2020-12-04 23:53 ` [PATCH v2 00/17] xen: support per-cpupool scheduling granularity Andrew Cooper
2020-12-05 7:41 ` Jürgen Groß
2020-12-07 9:00 ` Jan Beulich
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=20201201082128.15239-13-jgross@suse.com \
--to=jgross@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=george.dunlap@citrix.com \
--cc=iwj@xenproject.org \
--cc=jbeulich@suse.com \
--cc=julien@xen.org \
--cc=sstabellini@kernel.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/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;
as well as URLs for NNTP newsgroup(s).