From patchwork Thu Jul 16 05:11:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 11666665 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A676760D for ; Thu, 16 Jul 2020 05:13:59 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F163207BB for ; Thu, 16 Jul 2020 05:13:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ew2lkdoK"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="TRdSIC6d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F163207BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Lj9EWN6c/IC10VLtEvYZY1PkMAh99VFO4PzNmLgnX2Q=; b=Ew2lkdoKnK+gyF2EnXpYAcjr98 3Q091tFKtTpQaf27QT39CkVBO8JLQ/E7KJ6yq4EWaAlrMPLEBZHryeR5v6VIIw+zFBU9qkAMF8Lwb kckUEXy3TR9GSDXlnmGJLajaw6pJ/Nnp6g5wnAH/yEOtQuYTbwAULCsimdIczPh1z/VaDvBATDTNC 3uB6+Jf8XrQcESqwucPsK0Oz9o84E02ODfuBQNV4jQ8QhNfOZII5tSfC7xcsqNxMu4AEkGvkfLvj5 kgbb7M4TEDamh6H6BnnEHpUVyVdYDYpMp06wkugTe6ipYsCsoGJoD4LmZ6wm8quWo0Gknk3q4zEMM Z/IBG5NQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvwC7-0005br-W1; Thu, 16 Jul 2020 05:12:32 +0000 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvwC4-0005Zk-1h for linux-arm-kernel@lists.infradead.org; Thu, 16 Jul 2020 05:12:28 +0000 Received: by mail-pj1-x1043.google.com with SMTP id o22so4084140pjw.2 for ; Wed, 15 Jul 2020 22:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=glSQZFm7ys+cLEa0wg7dCBHtIduDXujsNwJL2d9Q+I0=; b=TRdSIC6dXy+lZ+6wWCp1mpGVWNjXOHu/5M1D3Bz65it9dKude5TzVDKZCRHyCxaYfw 0OMfKDU1jkAlpVUYkvK5m+dfi1yiL9qKqCsc4N4EOGNeWOD0E92tfrhffuTS1let1yPt Q2ADkOJBYoYvE3hZCQ3vzRe1bd4KsszHP+64SVDJtiOqirz8nttLy6d5e9xWl2YTkOQV XKAJjmPcvRTsIWmZORHiX4P5O7KL/6NEh32sEiZg4IYNQEfjCNPKysexb61QKpe2P2AP uBF90PHf0Z6DfEvb3899CmoRDDzupLKhSVfElgrK93tZFFH3QVsWgibDAZ80uJPQNdex 5+nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=glSQZFm7ys+cLEa0wg7dCBHtIduDXujsNwJL2d9Q+I0=; b=CFEdolmSoVT+PooABhjWgwBnUrGrlRrBOuwzvSQ6eZgogr59pI2sX0vZMnYF1REagp 1o8zx3wkmLLGjcTWt8GKYKylTczRYe//TOvzmgCPFt5e5XyBGr7FUbeC3xZr9jlXWzBe 36DphP+nsfi0CM3S+aJbuwvxT5riQkQxFqus3KCdsTcq7kd1jV8xphiD4i1wfdjKGFtH 6psaj2qNBrAHohv7ttwBkQxmaSae+Byu/cDjXbf/NuvfzRpFBmjeFF+9ypPwLn0ZTnrK Y9Fv6wMwNRx9HLuFTxbH13bARlcr6Ow4uV9S1j0VYk7NabInw7gNq8fsNq5WpVLXbjmu 2bXQ== X-Gm-Message-State: AOAM5301j1mc/UaN1hyCk6XulPoWVSnjDkzHrU3H5tZvoACDbdGyGlVE 2NX5pBXd3xp9oD4gQaGYVxrHlQ== X-Google-Smtp-Source: ABdhPJwnZMN7wItnqdmCQNXmc8Fzi/hRItUqa329drQ/ARnFk3gh9eNckgGM9hg+UWfxBYZjxbciLQ== X-Received: by 2002:a17:90a:3002:: with SMTP id g2mr3156915pjb.68.1594876345975; Wed, 15 Jul 2020 22:12:25 -0700 (PDT) Received: from localhost ([2400:8904::f03c:91ff:fe8a:bbe4]) by smtp.gmail.com with ESMTPSA id y7sm3247268pfq.69.2020.07.15.22.12.24 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jul 2020 22:12:25 -0700 (PDT) From: Leo Yan To: Peter Zijlstra , Will Deacon , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Catalin Marinas , Thomas Gleixner , "Ahmed S. Darwish" , "Ben Dooks (Codethink)" , Paul Cercueil , Adrian Hunter , Kan Liang , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 4/7] arm64: perf: Only advertise cap_user_time for arch_timer Date: Thu, 16 Jul 2020 13:11:27 +0800 Message-Id: <20200716051130.4359-5-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200716051130.4359-1-leo.yan@linaro.org> References: <20200716051130.4359-1-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200716_011228_122272_54A99280 X-CRM114-Status: GOOD ( 13.78 ) X-Spam-Score: 3.4 (+++) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (3.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1043 listed in] [list.dnswl.org] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [2400:8904:0:0:f03c:91ff:fe8a:bbe4 listed in] [zen.spamhaus.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Peter Zijlstra When sched_clock is running on anything other than arch_timer, don't advertise cap_user_time*. Requested-by: Will Deacon Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Leo Yan --- arch/arm64/kernel/perf_event.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 47db6c7cae6a..c016b116ae33 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -13,6 +13,8 @@ #include #include +#include + #include #include #include @@ -1170,16 +1172,15 @@ void arch_perf_update_userpage(struct perf_event *event, unsigned int seq; u64 ns; - /* - * Internal timekeeping for enabled/running/stopped times - * is always computed with the sched_clock. - */ - userpg->cap_user_time = 1; - userpg->cap_user_time_zero = 1; + userpg->cap_user_time = 0; + userpg->cap_user_time_zero = 0; do { rd = sched_clock_read_begin(&seq); + if (rd->read_sched_clock != arch_timer_read_counter) + return; + userpg->time_mult = rd->mult; userpg->time_shift = rd->shift; userpg->time_zero = rd->epoch_ns; @@ -1209,4 +1210,10 @@ void arch_perf_update_userpage(struct perf_event *event, userpg->time_mult >>= 1; } + /* + * Internal timekeeping for enabled/running/stopped times + * is always computed with the sched_clock. + */ + userpg->cap_user_time = 1; + userpg->cap_user_time_zero = 1; }