From patchwork Mon Mar 13 17:16:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 68991 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1318095wrd; Mon, 13 Mar 2023 10:41:59 -0700 (PDT) X-Google-Smtp-Source: AK7set8LMr7mDfbJwVG2dW9n34cfxtxiPjPLdFdetzhooZ/kYqfo7YnM3Ja6Uthp2I1L7X3A+GVz X-Received: by 2002:a62:7905:0:b0:625:2a96:2f3d with SMTP id u5-20020a627905000000b006252a962f3dmr2555293pfc.25.1678729318859; Mon, 13 Mar 2023 10:41:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678729318; cv=none; d=google.com; s=arc-20160816; b=YXz4TDsyS+kUSbGd0dwXX/0yc5vwdytVLIJtAdhFzz9kk+d05UsSuOZFDecC6XvqWB gx5YUwmCbtWJpkvqW34BSTcrvVTOOkLEJs0hhuF+JGMxeMhHkaQOhTcRN7q0VTDXsuEU HqV4+BU8WuhWvlDpparqYhqWrGDEX6woaCQnmF6YkwhhuKYeHgpXp7xmxqYxWzmgliAL NLstpVXbXnj+2XHKLk0Q4FTvB4ku+v0dAW1WM9KdqyOaLcOKVHE7HzOmimnjFXGJKNlB yyZPiO1dZCOojzs1VQGx+mk2f+cnSxaPoQg066otHrzIji722Xz61i1ClEYjTQ/d8APL Dt+A== 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=WU/wj2YBvDuADvKssJWD9G+lYj1+MwFjlT7x3TwKUdE=; b=rRY5uAm4KeGgg631edu6dL+LnYFvCLtJR3IyZngrMTUk9bMrIni5Ka3XZ3aR0Lcx17 an2wEX5D1FwHbZ1sn/3n+M7ewMWjaCqTNLmGb5ZAe/ZGz3dcRDAa7SvGOV/k/SqMslK1 bA763nYzq3JGkO8b8JnluHbTlSSqXusV8LFv+Zb9B7/+Js4w4lReHhjBIYJNIWSVATln uRKfytWiNfgaPDm56K+hdUIcOF2m7Wp/OfSG122OB1cOQg77+P9D6BJLalv3Uq5ObAvp 2GBv4swghdQ6LFachlwDFOldyjvoy+aw3Y3OVUNTXqeDZQzWBq84Lxa6qhwM154xGxSP Ay2Q== 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v184-20020a6389c1000000b00502f4cae5aesi72666pgd.24.2023.03.13.10.41.42; Mon, 13 Mar 2023 10:41:58 -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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229571AbjCMRTY convert rfc822-to-8bit (ORCPT + 99 others); Mon, 13 Mar 2023 13:19:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231617AbjCMRSZ (ORCPT ); Mon, 13 Mar 2023 13:18:25 -0400 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A313B1A8 for ; Mon, 13 Mar 2023 10:17:58 -0700 (PDT) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 32DDBo6C005100 for ; Mon, 13 Mar 2023 10:16:31 -0700 Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3p8p1jjs1w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 13 Mar 2023 10:16:31 -0700 Received: from twshared15216.17.frc2.facebook.com (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:11d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Mon, 13 Mar 2023 10:16:29 -0700 Received: by devbig932.frc1.facebook.com (Postfix, from userid 4523) id DBAD11842FC48; Mon, 13 Mar 2023 10:16:19 -0700 (PDT) From: Song Liu To: CC: , Song Liu , Peter Zijlstra , Namhyung Kim Subject: [PATCH v2] perf: fix perf_event_context->time Date: Mon, 13 Mar 2023 10:16:08 -0700 Message-ID: <20230313171608.298734-1-song@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: c5QADoIkh4ZcrNpUYWSfAFIRl_uAeI-4 X-Proofpoint-ORIG-GUID: c5QADoIkh4ZcrNpUYWSfAFIRl_uAeI-4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-13_08,2023-03-13_02,2023-02-09_01 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS 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?1760275274097937596?= X-GMAIL-MSGID: =?utf-8?q?1760275274097937596?= Time readers rely on perf_event_context->[time|timestamp|timeoffset] to get accurate time_enabled and time_running for an event. The difference between ctx->timestamp and ctx->time is the among of time when the context is not enabled. __update_context_time(ctx, false) is used to increase timestamp, but not time. Therefore, it should only be called in ctx_sched_in() when EVENT_TIME was not enabled. Fixes: 09f5e7dc7ad7 ("perf: Fix perf_event_read_local() time") Cc: Peter Zijlstra (Intel) Cc: Namhyung Kim Acked-by: Namhyung Kim Signed-off-by: Song Liu --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 380476a934e8..67478f43e26e 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3872,7 +3872,7 @@ ctx_sched_in(struct perf_event_context *ctx, enum event_type_t event_type) if (likely(!ctx->nr_events)) return; - if (is_active ^ EVENT_TIME) { + if (!(is_active & EVENT_TIME)) { /* start ctx time */ __update_context_time(ctx, false); perf_cgroup_set_timestamp(cpuctx);