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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 72974C282C8 for ; Mon, 28 Jan 2019 16:07:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35B612147A for ; Mon, 28 Jan 2019 16:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691655; bh=f2bfUr/EtzNT43pnnLIalrWvmm4G99uDBUZcdRjpS2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Vt9QU/7St99pkeHzjNpPFdZPs+ySrM00piS/BAS6C21O2nBzgjL01hWLaD9WfcHeP 6kh9jwZ60uIlX0FAq2GDG67yMJ+aN4AlX9Zlv1ZCR6g25lhGuz8Dz91LXOZhY0VYm9 pc/4CSsqtYnzDah5IZ+YRmxJxpcR1qUKnilmBTK4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732228AbfA1QHe (ORCPT ); Mon, 28 Jan 2019 11:07:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:58246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732212AbfA1QHa (ORCPT ); Mon, 28 Jan 2019 11:07:30 -0500 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 758792147A; Mon, 28 Jan 2019 16:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691650; bh=f2bfUr/EtzNT43pnnLIalrWvmm4G99uDBUZcdRjpS2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=frp1hY/MZBNJbjKLY4RfC5gVH1SFUpvrDiFNeExyKnJXc7U93+5Wx464g7WELqPDM K4S8BWgGQU4lO/maIovRPnWlZQ3lr0ir+x7bO2p3TNvr6VdWGCGU8VfozvJlZ4EFWi DReLRW4icE2EbN3CPrUN6icOFKoweCrLIPPOHS4U= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Doug Smythies , Doug Smythies , "Rafael J . Wysocki" , Sasha Levin Subject: [PATCH AUTOSEL 4.19 173/258] tools/power/x86/intel_pstate_tracer: Fix non root execution for post processing a trace file Date: Mon, 28 Jan 2019 10:57:59 -0500 Message-Id: <20190128155924.51521-173-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128155924.51521-1-sashal@kernel.org> References: <20190128155924.51521-1-sashal@kernel.org> MIME-Version: 1.0 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: Doug Smythies [ Upstream commit 663546903c835fe46308b1b1e53d32d1f2b33da9 ] This script is supposed to be allowed to run with regular user privileges if a previously captured trace is being post processed. Commit fbe313884d7d (tools/power/x86/intel_pstate_tracer: Free the trace buffer memory) introduced a bug that breaks that option. Commit 35459105deb2 (tools/power/x86/intel_pstate_tracer: Add optional setting of trace buffer memory allocation) moved the code but kept the bug. This patch fixes the issue. Fixes: 35459105deb2 (tools/power/x86/intel_pstate_tracer: Add optional ...) Signed-off-by: Doug Smythies Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py b/tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py index 84e2b648e622..2fa3c5757bcb 100755 --- a/tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py +++ b/tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py @@ -585,9 +585,9 @@ current_max_cpu = 0 read_trace_data(filename) -clear_trace_file() -# Free the memory if interval: + clear_trace_file() + # Free the memory free_trace_buffer() if graph_data_present == False: -- 2.19.1