ipc: use a work queue to free_ipc
PATCH 1/1 ipc: use a work queue to free_ipc
it avoids blocking on synchronize_rcu() in kern_umount().
the code:
\#define _GNU_SOURCE
\#include <sched.h>
\#include <error.h>
\#include <errno.h>
\#include <stdlib.h>
int main()
{
int i;
for (i = 0; i < 1000; i++)
if (unshare (CLONE_NEWIPC) < 0)
error (EXIT_FAILURE, errno, "unshare");
}
gets from:
Command being timed: "./ipc-namespace" User time (seconds): 0.00 System time (seconds): 0.06 Percent of CPU this job got: 0% Elapsed (wall clock) time (h:mm:ss or m:ss): 0:08.05
to:
Command being timed: "./ipc-namespace" User time (seconds): 0.00 System time (seconds): 0.02 Percent of CPU this job got: 96% Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.03
--- include/linux/ipc_namespace.h | 2 ++ ipc/namespace.c | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
include/linux/ipc_namespace.h +2 -0
@@ -68,6 +68,8 @@ struct ipc_namespace {struct user_namespace *user_ns;struct ucounts *ucounts; +struct llist_node mnt_llist; +struct ns_common ns; } __randomize_layout;
ipc/namespace.c +15 -2
@@ -117,6 +117,7 @@ void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,static void free_ipc_ns (struct ipc_namespace *ns) { +mq_put_mnt (ns);sem_exit_ns (ns);msg_exit_ns (ns);shm_exit_ns (ns);
@@ -127,6 +128,17 @@ static void free_ipc_ns(struct ipc_namespace *ns)kfree (ns); } +static LLIST_HEAD (free_ipc_list); +static void free_ipc (struct work_struct *unused) +{ +struct llist_node *node =llist_del_all (&free_ipc_list); +struct ipc_namespace *n, *t; + +llist_for_each_entry_safe (n, t, node, mnt_llist) +free_ipc_ns (n); +} +static DECLARE_WORK(free_ipc_work, free_ipc); +/* * put_ipc_ns - drop a reference to an ipc namespace. * @ns: the namespace to put
@@ -148,8 +160,9 @@ void put_ipc_ns(struct ipc_namespace *ns)if (refcount_dec_and_lock (&ns->count, &mq_lock)) {mq_clear_sbinfo (ns);spin_unlock (&mq_lock); -mq_put_mnt (ns); -free_ipc_ns (ns); + +if (llist_add (&ns->mnt_llist, &free_ipc_list)) +schedule_work (&free_ipc_work); } }
Signature · 1 line
2.24.1
Paul E. McKenney
maintainerQuoted 25 lines · Giuseppe Scrivano
it avoids blocking on
synchronize_rcu()inkern_umount().the code:
\#define
_GNU_SOURCE
\#include <sched.h>
\#include <error.h>
\#include <errno.h>
\#include <stdlib.h>
intmain()
{
int i;
for (i = 0; i < 1000; i++)
if (unshare (CLONE_NEWIPC) < 0)
error (EXIT_FAILURE, errno, "unshare");
}gets from:
Command being timed: "./ipc-namespace" User time (seconds): 0.00 System time (seconds): 0.06 Percent of CPU this job got: 0% Elapsed (wall clock) time (h:mm:ss or m:ss): 0:08.05
Quoted 7 lines
to:
Command being timed: "./ipc-namespace" User time (seconds): 0.00 System time (seconds): 0.02 Percent of CPU this job got: 96% Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.03
Nice speedup!
However, I am not convinced that the code shown below is safe.
I believe that you need either a synchronize_rcu() in your free_ipc() function or that you need to pass free_ipc() to queue_rcu_work() instead of directly schedule_work(). As things are, I would expect you to see free_ipc_ns() being invoke too soon on heavily loaded CONFIG_PREEMPT=y kernels. Which can be quite a pain to debug!
Or am I missing something?
Thanx, Paul
Quoted 64 lines
Signed-off-by Giuseppe Scrivano <[email protected]>--- include/linux/ipc_namespace.h | 2 ++ ipc/namespace.c | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)include/linux/ipc_namespace.h +2
-0@@ -68,6 +68,8 @@ struct ipc_namespace {struct user_namespace *user_ns;struct ucounts *ucounts; +struct llist_node mnt_llist; +struct ns_common ns; } __randomize_layout;ipc/namespace.c +15
-2@@ -117,6 +117,7 @@ void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,static void free_ipc_ns (struct ipc_namespace *ns) { +mq_put_mnt (ns);sem_exit_ns (ns);msg_exit_ns (ns);shm_exit_ns (ns);@@ -127,6 +128,17 @@ static void free_ipc_ns(struct ipc_namespace *ns)kfree (ns); } +static LLIST_HEAD (free_ipc_list); +static void free_ipc (struct work_struct *unused) +{ +struct llist_node *node =llist_del_all (&free_ipc_list); +struct ipc_namespace *n, *t; + +llist_for_each_entry_safe (n, t, node, mnt_llist) +free_ipc_ns (n); +} +static DECLARE_WORK(free_ipc_work, free_ipc); +/* * put_ipc_ns - drop a reference to an ipc namespace. * @ns: the namespace to put @@ -148,8 +160,9 @@ void put_ipc_ns(struct ipc_namespace *ns)if (refcount_dec_and_lock (&ns->count, &mq_lock)) {mq_clear_sbinfo (ns);spin_unlock (&mq_lock); -mq_put_mnt (ns); -free_ipc_ns (ns); + +if (llist_add (&ns->mnt_llist, &free_ipc_list)) +schedule_work (&free_ipc_work); } }Signature · 1 line
2.24.1
Hi Paul,
Quoted 11 lines · Paul E. McKenney
Nice speedup!
However, I am not convinced that the code shown below is safe.
I believe that you need either a
synchronize_rcu()in yourfree_ipc()function or that you need to passfree_ipc()toqueue_rcu_work()instead of directlyschedule_work(). As things are, I would expect you to seefree_ipc_ns()being invoke too soon on heavily loadedCONFIG_PREEMPT=ykernels. Which can be quite a pain to debug!Or am I missing something?
thanks for the review!
Would being called too soon be a problem? The current version calls free_ipc_ns() as part of the put_ipc_ns cleanup.
free_ipc() calls immediately synchronize_rcu() through free_ipc_ns():
free_ipc_ns() -> mq_put_mnt() -> kern_unmount() -> synchronize_rcu()
Do you think we should make it more explicit and add a synchronize_rcu() as part of the free_ipc_ns() function itself?
Regards,
Giuseppe
Quoted 67 lines
Thanx, Paul
Quoted 64 lines
Signed-off-by Giuseppe Scrivano <[email protected]>--- include/linux/ipc_namespace.h | 2 ++ ipc/namespace.c | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)include/linux/ipc_namespace.h +2
-0@@ -68,6 +68,8 @@ struct ipc_namespace {struct user_namespace *user_ns;struct ucounts *ucounts; +struct llist_node mnt_llist; +struct ns_common ns; } __randomize_layout;ipc/namespace.c +15
-2@@ -117,6 +117,7 @@ void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,static void free_ipc_ns (struct ipc_namespace *ns) { +mq_put_mnt (ns);sem_exit_ns (ns);msg_exit_ns (ns);shm_exit_ns (ns);@@ -127,6 +128,17 @@ static void free_ipc_ns(struct ipc_namespace *ns)kfree (ns); } +static LLIST_HEAD (free_ipc_list); +static void free_ipc (struct work_struct *unused) +{ +struct llist_node *node =llist_del_all (&free_ipc_list); +struct ipc_namespace *n, *t; + +llist_for_each_entry_safe (n, t, node, mnt_llist) +free_ipc_ns (n); +} +static DECLARE_WORK(free_ipc_work, free_ipc); +/* * put_ipc_ns - drop a reference to an ipc namespace. * @ns: the namespace to put @@ -148,8 +160,9 @@ void put_ipc_ns(struct ipc_namespace *ns)if (refcount_dec_and_lock (&ns->count, &mq_lock)) {mq_clear_sbinfo (ns);spin_unlock (&mq_lock); -mq_put_mnt (ns); -free_ipc_ns (ns); + +if (llist_add (&ns->mnt_llist, &free_ipc_list)) +schedule_work (&free_ipc_work); } }Signature · 1 line
2.24.1
Paul E. McKenney
maintainerQuoted 16 lines · Giuseppe Scrivano
Hi Paul,
Quoted 11 lines · Paul E. McKenney
Nice speedup!
However, I am not convinced that the code shown below is safe.
I believe that you need either a
synchronize_rcu()in yourfree_ipc()function or that you need to passfree_ipc()toqueue_rcu_work()instead of directlyschedule_work(). As things are, I would expect you to seefree_ipc_ns()being invoke too soon on heavily loadedCONFIG_PREEMPT=ykernels. Which can be quite a pain to debug!Or am I missing something?
Quoted 8 lines
thanks for the review!
Would being called too soon be a problem? The current version calls
free_ipc_ns()as part of theput_ipc_nscleanup.
free_ipc()calls immediatelysynchronize_rcu()throughfree_ipc_ns():
free_ipc_ns()->mq_put_mnt()->kern_unmount()->synchronize_rcu()
Ah, I did not look deeply enough.
Quoted 2 lines
Do you think we should make it more explicit and add a
synchronize_rcu()as part of thefree_ipc_ns()function itself?
Maybe just a comment on the free_ipc_ns() saying that it waits for a grace period.
Thanx, Paul
Quoted 72 lines
Regards,
GiuseppeQuoted 67 lines
Thanx, Paul
Quoted 64 lines
Signed-off-by Giuseppe Scrivano <[email protected]>--- include/linux/ipc_namespace.h | 2 ++ ipc/namespace.c | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)include/linux/ipc_namespace.h +2
-0@@ -68,6 +68,8 @@ struct ipc_namespace {struct user_namespace *user_ns;struct ucounts *ucounts; +struct llist_node mnt_llist; +struct ns_common ns; } __randomize_layout;ipc/namespace.c +15
-2@@ -117,6 +117,7 @@ void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,static void free_ipc_ns (struct ipc_namespace *ns) { +mq_put_mnt (ns);sem_exit_ns (ns);msg_exit_ns (ns);shm_exit_ns (ns);@@ -127,6 +128,17 @@ static void free_ipc_ns(struct ipc_namespace *ns)kfree (ns); } +static LLIST_HEAD (free_ipc_list); +static void free_ipc (struct work_struct *unused) +{ +struct llist_node *node =llist_del_all (&free_ipc_list); +struct ipc_namespace *n, *t; + +llist_for_each_entry_safe (n, t, node, mnt_llist) +free_ipc_ns (n); +} +static DECLARE_WORK(free_ipc_work, free_ipc); +/* * put_ipc_ns - drop a reference to an ipc namespace. * @ns: the namespace to put @@ -148,8 +160,9 @@ void put_ipc_ns(struct ipc_namespace *ns)if (refcount_dec_and_lock (&ns->count, &mq_lock)) {mq_clear_sbinfo (ns);spin_unlock (&mq_lock); -mq_put_mnt (ns); -free_ipc_ns (ns); + +if (llist_add (&ns->mnt_llist, &free_ipc_list)) +schedule_work (&free_ipc_work); } }Signature · 1 line
2.24.1