From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> To: Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>, Linus Torvalds <torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> Cc: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>, "Rafael J. Wysocki" <rafael-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-raid-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH 04/23] devtmpfs: refactor devtmpfsd() Date: Tue, 28 Jul 2020 18:33:57 +0200 [thread overview] Message-ID: <20200728163416.556521-5-hch@lst.de> (raw) In-Reply-To: <20200728163416.556521-1-hch-jcswGhMUV9g@public.gmane.org> Split the main worker loop into a separate function. This allows devtmpfsd_setup to be marked __init, which will allows us to call __init routines for the setup work. devtmpfѕ itself needs a __ref marker for that to work, and a comment explaining why it works. Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> --- drivers/base/devtmpfs.c | 52 ++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index c9017e0584c003..d697634bc0d48c 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -378,7 +378,30 @@ static int handle(const char *name, umode_t mode, kuid_t uid, kgid_t gid, return handle_remove(name, dev); } -static int devtmpfs_setup(void *p) +static void __noreturn devtmpfs_work_loop(void) +{ + while (1) { + spin_lock(&req_lock); + while (requests) { + struct req *req = requests; + requests = NULL; + spin_unlock(&req_lock); + while (req) { + struct req *next = req->next; + req->err = handle(req->name, req->mode, + req->uid, req->gid, req->dev); + complete(&req->done); + req = next; + } + spin_lock(&req_lock); + } + __set_current_state(TASK_INTERRUPTIBLE); + spin_unlock(&req_lock); + schedule(); + } +} + +static int __init devtmpfs_setup(void *p) { int err; @@ -396,31 +419,18 @@ static int devtmpfs_setup(void *p) return err; } -static int devtmpfsd(void *p) +/* + * The __ref is because devtmpfs_setup needs to be __init for the routines it + * calls. That call is done while devtmpfs_init, which is marked __init, + * synchronously waits for it to complete. + */ +static int __ref devtmpfsd(void *p) { int err = devtmpfs_setup(p); if (err) return err; - while (1) { - spin_lock(&req_lock); - while (requests) { - struct req *req = requests; - requests = NULL; - spin_unlock(&req_lock); - while (req) { - struct req *next = req->next; - req->err = handle(req->name, req->mode, - req->uid, req->gid, req->dev); - complete(&req->done); - req = next; - } - spin_lock(&req_lock); - } - __set_current_state(TASK_INTERRUPTIBLE); - spin_unlock(&req_lock); - schedule(); - } + devtmpfs_work_loop(); return 0; } -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Al Viro <viro@zeniv.linux.org.uk>, Linus Torvalds <torvalds@linux-foundation.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J. Wysocki" <rafael@kernel.org>, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org Subject: [PATCH 04/23] devtmpfs: refactor devtmpfsd() Date: Tue, 28 Jul 2020 18:33:57 +0200 [thread overview] Message-ID: <20200728163416.556521-5-hch@lst.de> (raw) In-Reply-To: <20200728163416.556521-1-hch@lst.de> Split the main worker loop into a separate function. This allows devtmpfsd_setup to be marked __init, which will allows us to call __init routines for the setup work. devtmpfѕ itself needs a __ref marker for that to work, and a comment explaining why it works. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/base/devtmpfs.c | 52 ++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index c9017e0584c003..d697634bc0d48c 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -378,7 +378,30 @@ static int handle(const char *name, umode_t mode, kuid_t uid, kgid_t gid, return handle_remove(name, dev); } -static int devtmpfs_setup(void *p) +static void __noreturn devtmpfs_work_loop(void) +{ + while (1) { + spin_lock(&req_lock); + while (requests) { + struct req *req = requests; + requests = NULL; + spin_unlock(&req_lock); + while (req) { + struct req *next = req->next; + req->err = handle(req->name, req->mode, + req->uid, req->gid, req->dev); + complete(&req->done); + req = next; + } + spin_lock(&req_lock); + } + __set_current_state(TASK_INTERRUPTIBLE); + spin_unlock(&req_lock); + schedule(); + } +} + +static int __init devtmpfs_setup(void *p) { int err; @@ -396,31 +419,18 @@ static int devtmpfs_setup(void *p) return err; } -static int devtmpfsd(void *p) +/* + * The __ref is because devtmpfs_setup needs to be __init for the routines it + * calls. That call is done while devtmpfs_init, which is marked __init, + * synchronously waits for it to complete. + */ +static int __ref devtmpfsd(void *p) { int err = devtmpfs_setup(p); if (err) return err; - while (1) { - spin_lock(&req_lock); - while (requests) { - struct req *req = requests; - requests = NULL; - spin_unlock(&req_lock); - while (req) { - struct req *next = req->next; - req->err = handle(req->name, req->mode, - req->uid, req->gid, req->dev); - complete(&req->done); - req = next; - } - spin_lock(&req_lock); - } - __set_current_state(TASK_INTERRUPTIBLE); - spin_unlock(&req_lock); - schedule(); - } + devtmpfs_work_loop(); return 0; } -- 2.27.0
next prev parent reply other threads:[~2020-07-28 16:33 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-28 16:33 add file system helpers that take kernel pointers for the init code v4 Christoph Hellwig 2020-07-28 16:33 ` [PATCH 01/23] fs: refactor do_mount Christoph Hellwig 2020-07-28 16:33 ` [PATCH 02/23] fs: refactor ksys_umount Christoph Hellwig [not found] ` <20200728163416.556521-3-hch-jcswGhMUV9g@public.gmane.org> 2020-08-06 14:44 ` Naresh Kamboju 2020-08-06 14:44 ` [LTP] " Naresh Kamboju 2020-08-06 14:44 ` Naresh Kamboju 2020-08-17 13:44 ` Naresh Kamboju 2020-08-17 13:44 ` [LTP] " Naresh Kamboju 2020-07-28 16:33 ` [PATCH 03/23] fs: push the getname from do_rmdir into the callers Christoph Hellwig 2020-07-28 16:33 ` [PATCH 05/23] init: initialize ramdisk_execute_command at compile time Christoph Hellwig 2020-07-28 16:34 ` [PATCH 08/23] init: add an init_mount helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 09/23] init: add an init_umount helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 10/23] init: add an init_unlink helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 11/23] init: add an init_rmdir helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 12/23] init: add an init_chdir helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 13/23] init: add an init_chroot helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 14/23] init: add an init_chown helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 15/23] init: add an init_chmod helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 16/23] init: add an init_eaccess helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 17/23] init: add an init_link helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 18/23] init: add an init_symlink helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 19/23] init: add an init_mkdir helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 20/23] init: add an init_mknod helper Christoph Hellwig 2020-07-28 16:34 ` [PATCH 21/23] init: add an init_stat helper Christoph Hellwig 2020-09-04 13:53 ` [PATCH] init: fix error check in clean_path() Barret Rhoden 2020-09-04 16:04 ` Christoph Hellwig [not found] ` <20200728163416.556521-1-hch-jcswGhMUV9g@public.gmane.org> 2020-07-28 16:33 ` Christoph Hellwig [this message] 2020-07-28 16:33 ` [PATCH 04/23] devtmpfs: refactor devtmpfsd() Christoph Hellwig 2020-07-28 16:59 ` Greg Kroah-Hartman 2020-07-28 16:33 ` [PATCH 06/23] init: mark console_on_rootfs as __init Christoph Hellwig 2020-07-28 16:33 ` Christoph Hellwig 2020-07-28 16:34 ` [PATCH 07/23] init: mark create_dev " Christoph Hellwig 2020-07-28 16:34 ` Christoph Hellwig 2020-07-28 16:34 ` [PATCH 22/23] init: add an init_utimes helper Christoph Hellwig 2020-07-28 16:34 ` Christoph Hellwig 2020-07-28 16:34 ` [PATCH 23/23] init: add an init_dup helper Christoph Hellwig 2020-07-29 19:51 ` add file system helpers that take kernel pointers for the init code v4 Al Viro 2020-07-30 6:25 ` Christoph Hellwig 2020-07-31 2:14 ` Al Viro [not found] ` <20200731021424.GG1236603-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org> 2020-07-31 6:33 ` Christoph Hellwig 2020-07-31 6:33 ` Christoph Hellwig 2020-08-03 14:56 ` Qian Cai [not found] ` <20200803145622.GB4631-J5quhbR+WMc@public.gmane.org> 2020-08-03 15:08 ` Christoph Hellwig 2020-08-03 15:08 ` Christoph Hellwig
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=20200728163416.556521-5-hch@lst.de \ --to=hch-jcswghmuv9g@public.gmane.org \ --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \ --cc=linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-raid-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=rafael-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \ --cc=viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.