From patchwork Wed Apr 12 09:52:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 82372 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp219258vqo; Wed, 12 Apr 2023 03:34:54 -0700 (PDT) X-Google-Smtp-Source: AKy350Zdb9ZEUfp5NgjhfrqPEBbM9OchbjrN0ub7eqFykAasR+V2CH2v87GGtcUropUIGPbWwkHY X-Received: by 2002:a17:90b:4c85:b0:244:b508:1815 with SMTP id my5-20020a17090b4c8500b00244b5081815mr18527704pjb.16.1681295694251; Wed, 12 Apr 2023 03:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681295694; cv=none; d=google.com; s=arc-20160816; b=PDQ/2QD1uXjGqYR19TpfjqJl2csJa4HMX5jAVUoelkOji9aQeCS4Viwpkj+eP+1UCg H4mHgP11QUDvVkNL9sBe3uimByPLFZo4vflHzAJWymJNveN/wd9Erz3xWcohCQS7FnHN gmDHX2GmSeR0D6dzagPWv10wFj2f0EKQuhcOHbOnP2Ln56PLPukbGDUTwcJ+9tDc7qEj 6OBk7V/fJNVyHVgultTy4xVJKNMj67XU0JUj4JyLajVpZP6gI1Gk1ctgwiNGV5K+Smh4 d7R7UCe2lnVMXI+DDv5nVWmiJBU//xxRrR+T0/lNkYC5Sie/3z+R0I7nAlF/POeFHXgZ 457Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=ydjCJln26jSUwLQ+TMUDTNFAS8VHriKdxkTwv3J/3JQ=; b=JU6HsZLnNY70wziiSWmFTk6y4n1LSuvnMBx+yOBXlB7UbahGMn/1tA0uLk7jMtt/2z vPpEA5dt+ACOFEltNrV7SNk2+d4jNlVQQFqf55xEG1TlFmF1UFMZvOIRI992L42dG49v lZ/RIZfs18j6mNMp5VlVy2NQlqiIT7EFxVxYbbRdlg6AywUscyBm6nmsvM5dcuJ9abpX fqI0U7OwMrW+nwc6af3a1Db1MFE0jyTulWwv/dhTOhMPKX/Pkcjo/gEq9esGMKzNoDEY 8k+QV2mAsXdmvD1LgTQKVDL+XUE2cNdtMA5iEK4UJ6u1NtcdcetrwbNjBiD6xbZ4zXN5 nrOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id om16-20020a17090b3a9000b0023d276137a5si1812782pjb.30.2023.04.12.03.34.42; Wed, 12 Apr 2023 03:34:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230152AbjDLJyi (ORCPT + 99 others); Wed, 12 Apr 2023 05:54:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229586AbjDLJyg (ORCPT ); Wed, 12 Apr 2023 05:54:36 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B39526BE; Wed, 12 Apr 2023 02:54:34 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PxHyp38YFz16Ny5; Wed, 12 Apr 2023 17:50:58 +0800 (CST) Received: from localhost.localdomain (10.67.174.95) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Wed, 12 Apr 2023 17:54:31 +0800 From: Yang Jihong To: , , , , , , , , , , CC: Subject: [PATCH] perf/core: Fix perf_sample_data not properly initialized for different swevents in perf_tp_event() Date: Wed, 12 Apr 2023 09:52:40 +0000 Message-ID: <20230412095240.181516-1-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT MIME-Version: 1.0 X-Originating-IP: [10.67.174.95] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762966313489396006?= X-GMAIL-MSGID: =?utf-8?q?1762966313489396006?= data->sample_flags may be modified in perf_prepare_sample(), in perf_tp_event(), different swevents use the same on-stack perf_sample_data, the previous swevent may change sample_flags in perf_prepare_sample(), as a result, some members of perf_sample_data are not correctly initialized when next swevent_event preparing sample (for example data->id, the value varies according to swevent). A simple scenario triggers this problem is as follows: # perf record -e sched:sched_switch --switch-output-event sched:sched_switch -a sleep 1 [ perf record: dump data: Woken up 0 times ] [ perf record: Dump perf.data.2023041209014396 ] [ perf record: dump data: Woken up 0 times ] [ perf record: Dump perf.data.2023041209014662 ] [ perf record: dump data: Woken up 0 times ] [ perf record: Dump perf.data.2023041209014910 ] [ perf record: Woken up 0 times to write data ] [ perf record: Dump perf.data.2023041209015164 ] [ perf record: Captured and wrote 0.069 MB perf.data. ] # ls -l total 860 -rw------- 1 root root 95694 Apr 12 09:01 perf.data.2023041209014396 -rw------- 1 root root 606430 Apr 12 09:01 perf.data.2023041209014662 -rw------- 1 root root 82246 Apr 12 09:01 perf.data.2023041209014910 -rw------- 1 root root 82342 Apr 12 09:01 perf.data.2023041209015164 # perf script -i perf.data.2023041209014396 0x11d58 [0x80]: failed to process type: 9 [Bad address] Solution: Add perf_sample_data_flags_{save, restore} helpers to save and restore sample_flags when processing different swevents After fix: # perf record -e sched:sched_switch --switch-output-event sched:sched_switch -a sleep 1 [ perf record: dump data: Woken up 0 times ] [ perf record: Dump perf.data.2023041209442259 ] [ perf record: dump data: Woken up 0 times ] [ perf record: Dump perf.data.2023041209442514 ] [ perf record: dump data: Woken up 0 times ] [ perf record: Dump perf.data.2023041209442760 ] [ perf record: Woken up 0 times to write data ] [ perf record: Dump perf.data.2023041209443003 ] [ perf record: Captured and wrote 0.069 MB perf.data. ] # ls -l total 864 -rw------- 1 root root 100166 Apr 12 09:44 perf.data.2023041209442259 -rw------- 1 root root 606438 Apr 12 09:44 perf.data.2023041209442514 -rw------- 1 root root 82246 Apr 12 09:44 perf.data.2023041209442760 -rw------- 1 root root 82342 Apr 12 09:44 perf.data.2023041209443003 # perf script -i perf.data.2023041209442259 | head -n 5 perf 232 [000] 66.846217: sched:sched_switch: prev_comm=perf prev_pid=232 prev_prio=120 prev_state=D ==> next_comm=perf next_pid=234 next_prio=120 perf 234 [000] 66.846449: sched:sched_switch: prev_comm=perf prev_pid=234 prev_prio=120 prev_state=S ==> next_comm=perf next_pid=232 next_prio=120 perf 232 [000] 66.846546: sched:sched_switch: prev_comm=perf prev_pid=232 prev_prio=120 prev_state=R ==> next_comm=perf next_pid=234 next_prio=120 perf 234 [000] 66.846606: sched:sched_switch: prev_comm=perf prev_pid=234 prev_prio=120 prev_state=S ==> next_comm=perf next_pid=232 next_prio=120 perf 232 [000] 66.846646: sched:sched_switch: prev_comm=perf prev_pid=232 prev_prio=120 prev_state=R ==> next_comm=perf next_pid=234 next_prio=120 Fixes: bb447c27a467 ("perf/core: Set data->sample_flags in perf_prepare_sample()") Signed-off-by: Yang Jihong --- include/linux/perf_event.h | 11 +++++++++++ kernel/events/core.c | 13 ++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index d5628a7b5eaa..7499bd3a2ed5 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1185,6 +1185,17 @@ struct perf_sample_data { PERF_MEM_S(LOCK, NA) |\ PERF_MEM_S(TLB, NA)) +/* Note: caller must ensure flags is not NULL */ +static inline void perf_sample_data_flags_save(struct perf_sample_data *data, u64 *flags) +{ + *flags = data->sample_flags; +} + +static inline void perf_sample_data_flags_restore(struct perf_sample_data *data, u64 flags) +{ + data->sample_flags = flags; +} + static inline void perf_sample_data_init(struct perf_sample_data *data, u64 addr, u64 period) { diff --git a/kernel/events/core.c b/kernel/events/core.c index 435815d3be3f..ea1fb63a6037 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -10136,6 +10136,7 @@ void perf_tp_event(u16 event_type, u64 count, void *record, int entry_size, { struct perf_sample_data data; struct perf_event *event; + u64 sample_flags; struct perf_raw_record raw = { .frag = { @@ -10150,8 +10151,18 @@ void perf_tp_event(u16 event_type, u64 count, void *record, int entry_size, perf_trace_buf_update(record, event_type); hlist_for_each_entry_rcu(event, head, hlist_entry) { - if (perf_tp_event_match(event, &data, regs)) + if (perf_tp_event_match(event, &data, regs)) { + /* + * sample_flags may be modified in perf_event_output_* + * (see perf_prepare_sample). For different swevents, + * use the same on-stack perf_sample_data, therefore, + * need to save samle_flags, and restore it + * after perf_swevent_event. + */ + perf_sample_data_flags_save(&data, &sample_flags); perf_swevent_event(event, count, &data, regs); + perf_sample_data_flags_restore(&data, sample_flags); + } } /*