* [PATCH] perf: Remove a redundant check
@ 2016-06-07 12:44 Alexander Shishkin
2016-06-08 14:20 ` [tip:perf/urgent] perf/core: " tip-bot for Alexander Shishkin
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Shishkin @ 2016-06-07 12:44 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Ingo Molnar, linux-kernel, vince, eranian,
Arnaldo Carvalho de Melo, Alexander Shishkin
There is no way to end up in _free_event() with event::pmu being NULL.
The latter is initialized in event allocation path and remains set
forever. In case of allocation failure, the error path doesn't use
_free_event().
Having the check, however, suggests that it is possible to have a
event::pmu==NULL situation in _free_event() and confuses the robots.
This patch gets rid of the check.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---
kernel/events/core.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 050a290c72..87e945d6eb 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3862,10 +3862,8 @@ static void _free_event(struct perf_event *event)
if (event->ctx)
put_ctx(event->ctx);
- if (event->pmu) {
- exclusive_event_destroy(event);
- module_put(event->pmu->module);
- }
+ exclusive_event_destroy(event);
+ module_put(event->pmu->module);
call_rcu(&event->rcu_head, free_event_rcu);
}
--
2.8.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:perf/urgent] perf/core: Remove a redundant check
2016-06-07 12:44 [PATCH] perf: Remove a redundant check Alexander Shishkin
@ 2016-06-08 14:20 ` tip-bot for Alexander Shishkin
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Alexander Shishkin @ 2016-06-08 14:20 UTC (permalink / raw)
To: linux-tip-commits
Cc: dan.carpenter, mingo, tglx, acme, hpa, torvalds,
alexander.shishkin, peterz, linux-kernel
Commit-ID: 62a92c8f553e49270a0ee391b8733da71ab0aebc
Gitweb: http://git.kernel.org/tip/62a92c8f553e49270a0ee391b8733da71ab0aebc
Author: Alexander Shishkin <alexander.shishkin@linux.intel.com>
AuthorDate: Tue, 7 Jun 2016 15:44:15 +0300
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 8 Jun 2016 14:30:01 +0200
perf/core: Remove a redundant check
There is no way to end up in _free_event() with event::pmu being NULL.
The latter is initialized in event allocation path and remains set
forever. In case of allocation failure, the error path doesn't use
_free_event().
Having the check, however, suggests that it is possible to have a
event::pmu==NULL situation in _free_event() and confuses the robots.
This patch gets rid of the check.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: eranian@google.com
Cc: vince@deater.net
Link: http://lkml.kernel.org/r/1465303455-26032-1-git-send-email-alexander.shishkin@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/events/core.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 050a290..87e945d 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3862,10 +3862,8 @@ static void _free_event(struct perf_event *event)
if (event->ctx)
put_ctx(event->ctx);
- if (event->pmu) {
- exclusive_event_destroy(event);
- module_put(event->pmu->module);
- }
+ exclusive_event_destroy(event);
+ module_put(event->pmu->module);
call_rcu(&event->rcu_head, free_event_rcu);
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-08 14:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-07 12:44 [PATCH] perf: Remove a redundant check Alexander Shishkin
2016-06-08 14:20 ` [tip:perf/urgent] perf/core: " tip-bot for Alexander Shishkin
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.