From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6AF6C28CBC for ; Thu, 30 Apr 2020 14:09:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 76D2B206D9 for ; Thu, 30 Apr 2020 14:09:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588255761; bh=z/SAI+WxyxCRvHGGrJbBNLw73UFuYbefK523W+/YLqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tOQoLiQSAT76tqlxBjTXYjLYnNtUKI4b51//Gt5NF9gXSyJyO2h8VoG5T2zWf4Ilf zcvEEOvWRashjn49xa5D2bcMTOBVQLmfTx/KwT998EzIhnfouH4SdcREbd9qsy4kxD LruTt5wy4+Hr0FVk/GBu/fV5P344Tp3S8CYGpmT0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728909AbgD3OJT (ORCPT ); Thu, 30 Apr 2020 10:09:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:60712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728230AbgD3Nvy (ORCPT ); Thu, 30 Apr 2020 09:51:54 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C1531208CA; Thu, 30 Apr 2020 13:51:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254714; bh=z/SAI+WxyxCRvHGGrJbBNLw73UFuYbefK523W+/YLqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B+DqQVzJRh5PZRwPgAmq9/54yM3KLu28GNusBKTveA3Gd6i23UAvoQxy0cq6CRf1S JtJbLwrjYT3HCiUbLE6oRtyrEoirpE5NiKM3Zhveycf/TNZ3f3LsuRuU+Iy4JVy9is CGmyQUoyYU6IsTIyAAY+321qgocVE71XA17JzWp8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ian Rogers , KP Singh , Peter Zijlstra , Sasha Levin Subject: [PATCH AUTOSEL 5.6 62/79] perf/core: fix parent pid/tid in task exit events Date: Thu, 30 Apr 2020 09:50:26 -0400 Message-Id: <20200430135043.19851-62-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135043.19851-1-sashal@kernel.org> References: <20200430135043.19851-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ian Rogers [ Upstream commit f3bed55e850926614b9898fe982f66d2541a36a5 ] Current logic yields the child task as the parent. Before: $ perf record bash -c "perf list > /dev/null" $ perf script -D |grep 'FORK\|EXIT' 4387036190981094 0x5a70 [0x30]: PERF_RECORD_FORK(10472:10472):(10470:10470) 4387036606207580 0xf050 [0x30]: PERF_RECORD_EXIT(10472:10472):(10472:10472) 4387036607103839 0x17150 [0x30]: PERF_RECORD_EXIT(10470:10470):(10470:10470) ^ Note the repeated values here -------------------/ After: 383281514043 0x9d8 [0x30]: PERF_RECORD_FORK(2268:2268):(2266:2266) 383442003996 0x2180 [0x30]: PERF_RECORD_EXIT(2268:2268):(2266:2266) 383451297778 0xb70 [0x30]: PERF_RECORD_EXIT(2266:2266):(2265:2265) Fixes: 94d5d1b2d891 ("perf_counter: Report the cloning task as parent on perf_counter_fork()") Reported-by: KP Singh Signed-off-by: Ian Rogers Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20200417182842.12522-1-irogers@google.com Signed-off-by: Sasha Levin --- kernel/events/core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 533c193481899..29ace472f9168 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7278,10 +7278,17 @@ static void perf_event_task_output(struct perf_event *event, goto out; task_event->event_id.pid = perf_event_pid(event, task); - task_event->event_id.ppid = perf_event_pid(event, current); - task_event->event_id.tid = perf_event_tid(event, task); - task_event->event_id.ptid = perf_event_tid(event, current); + + if (task_event->event_id.header.type == PERF_RECORD_EXIT) { + task_event->event_id.ppid = perf_event_pid(event, + task->real_parent); + task_event->event_id.ptid = perf_event_pid(event, + task->real_parent); + } else { /* PERF_RECORD_FORK */ + task_event->event_id.ppid = perf_event_pid(event, current); + task_event->event_id.ptid = perf_event_tid(event, current); + } task_event->event_id.time = perf_event_clock(event); -- 2.20.1