From: "Sylvain 'ythier' Hitier" <sylvain.hitier@gmail.com>
To: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Oleg Nesterov <oleg@redhat.com>, Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH] fork.c: copy_process(): fix cleanup WRT perf_event_free_task()
Date: Fri, 26 Sep 2014 21:06:52 +0000 [thread overview]
Message-ID: <20140926210652.GA27199@erable> (raw)
Date: Fri Sep 26 20:56:07 2014 +0000
fork.c: copy_process(): fix cleanup WRT perf_event_free_task()
Currently, in copy_process(), a failure of either sched_fork() or
perf_event_init_task() does trigger perf_event_free_task()!
Moreover, the label bad_fork_cleanup_policy does more than what its name
implies, because it includes perf_event_free_task()!
Let's explain the change with a grASCIIcally-enhanced kind-of-diff which
provides an adequate context.
// Read vertically this column
// | | | | | | | | |
// v v v v v v v v v
{
//SNIP//
if (clone_flags & CLONE_THREAD)
threadgroup_change_begin(current);
//SNIP//
#ifdef CONFIG_NUMA
p->mempolicy = mpol_dup(p->mempolicy);
if (IS_ERR(p->mempolicy)) {
//SNIP//
goto bad_fork_cleanup_threadgroup_lock;
}
#endif
//SNIP//
retval = sched_fork(clone_flags, p);
if (retval)
// // mustn't perf_event_free_task()
goto bad_fork_cleanup_policy;
retval = perf_event_init_task(p);
if (retval)
// // mustn't perf_event_free_task()
goto bad_fork_cleanup_policy;
retval = audit_alloc(p);
if (retval)
// // must perf_event_free_task()
// @@ Hence change this way:
- goto bad_fork_cleanup_policy;
+ goto bad_fork_cleanup_perf;
//SNIP//
bad_fork_cleanup_audit:
audit_free(p);
// // let's clean perf up
// @@ Hence change this way:
-bad_fork_cleanup_policy:
+bad_fork_cleanup_perf:
perf_event_free_task(p);
// // no (longer) need to clean perf up
// @@ Hence change this way:
+bad_fork_cleanup_policy:
#ifdef CONFIG_NUMA
mpol_put(p->mempolicy);
bad_fork_cleanup_threadgroup_lock:
#endif
if (clone_flags & CLONE_THREAD)
threadgroup_change_end(current);
//SNIP//
}
Signed-off-by: Sylvain "ythier" Hitier <sylvain.hitier@gmail.com>
---
kernel/fork.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/fork.c b/kernel/fork.c
index 0cf9cdb..a91e47d 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1360,7 +1360,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
goto bad_fork_cleanup_policy;
retval = audit_alloc(p);
if (retval)
- goto bad_fork_cleanup_policy;
+ goto bad_fork_cleanup_perf;
/* copy all the process information */
shm_init_task(p);
retval = copy_semundo(clone_flags, p);
@@ -1566,8 +1566,9 @@ bad_fork_cleanup_semundo:
exit_sem(p);
bad_fork_cleanup_audit:
audit_free(p);
-bad_fork_cleanup_policy:
+bad_fork_cleanup_perf:
perf_event_free_task(p);
+bad_fork_cleanup_policy:
#ifdef CONFIG_NUMA
mpol_put(p->mempolicy);
bad_fork_cleanup_threadgroup_lock:
Regards,
Sylvain "ythier" Hitier
--
Business is about being busy, not being rich...
Lived 777 days in a Debian package => http://en.wikipedia.org/wiki/Apt,_Vaucluse
There's THE room for ideals in this mechanical place!
next reply other threads:[~2014-09-26 21:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-26 21:06 Sylvain 'ythier' Hitier [this message]
2014-09-27 18:07 ` [PATCH] fork.c: copy_process(): fix cleanup WRT perf_event_free_task() Oleg Nesterov
2014-09-29 10:12 ` Peter Zijlstra
2014-09-29 12:07 ` Ingo Molnar
2014-09-29 14:00 ` Peter Zijlstra
2014-10-01 22:44 ` Andrew Morton
2014-09-29 22:28 ` Oleg Nesterov
2014-10-03 5:27 ` [tip:perf/urgent] perf: Fix perf bug in fork() tip-bot for Peter Zijlstra
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=20140926210652.GA27199@erable \
--to=sylvain.hitier@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.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 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.