From patchwork Wed Jan 31 06:30:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 194510 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1707553dyb; Tue, 30 Jan 2024 22:41:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IERy10j899yRVbGEsqWOi++N9COIB6dGq3KIEroPH2wxMUdxmmFx9FEmufHpa1csZE4DRAc X-Received: by 2002:a17:906:190a:b0:a28:2165:7c74 with SMTP id a10-20020a170906190a00b00a2821657c74mr417620eje.13.1706683274289; Tue, 30 Jan 2024 22:41:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706683274; cv=pass; d=google.com; s=arc-20160816; b=0snMCT2C7nFsVKL5rFJfcBXW+MxvXkYpRP99o6TsriYwhENsQQVcuU7+UomKRgf3r3 o/T5mjMK4daWqf7utZwgfCKvvuDJOMU2u881yPwAZNpygtMrhsJTA/GoDKYHS/oQR7j2 lV1efHxFY1aybnGFW9ywm8ZPz4i2twlb90GfsJwiPFRFpmpjomuvkaODSrmPU0HhhQo5 Bz9TdHzVOc6TFtwNcXIKZLVdplv0OJAJMUXmyOVaZvW8AKq6AVL9+MRq2UAR1BLAc2wc DUKcxw8P4IqitSQ+2KL0Fss+2zwRimwY1CZk1YV9qcnaRfvG1PNQFfRaiee6L3+ofo3W NXcg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:from:subject:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:message-id:date:dkim-signature; bh=TRAmZ7zfR7GIpS+aIsz6syaxM6Q4TrPavG5oF05xWJs=; fh=jOkz5JBH2qY8qKQKpH7pqXl7ntJs6ItNmi4HLSJDkCk=; b=BCBAA+QXOcwn7jOfPBfLupHR8VtHlJQWltQXYvssy9aFRTIbQ66BuBmtBAc8sbdHbo /AUwDjyT/c9LmmC0ACQYFRaliF/SaCpDnylu345LntCNkBH0qbe1ESHhid9s2NbgzYR2 S4hJ8GKuiIv5FNEKBBmY0xQCwAm/irYQYueTrBl9z3iZHW493bRoLXj6Ik25cmTHyVF4 nGcYawAHCS+q36SLP7lh7A1EcYgnL3Z1Vz0EdgHdnORkQ2lXGuir6t7im9hCR64/xVql C0OnwEXRaw/NR8mFJ8qjOUMzGG1DP7Jaxgg6fvreapAzmg955PWBayF6tLmI+coVRo6W 6Jnw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=lEY1N22a; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-45836-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45836-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=1; AJvYcCUvn8sIV7StNwa7R3NBX0/25P8ZNnEPH2us/UCJJTmbUG38BtRSEg/2zX5t0vHd6ppqdmogtoIKoMI+jUvW9x0nZjJpGA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id lc8-20020a170906f90800b00a368492bf32si90065ejb.974.2024.01.30.22.41.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 22:41:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-45836-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=lEY1N22a; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-45836-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45836-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A05BF1F29629 for ; Wed, 31 Jan 2024 06:31:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3CCF64D5A6; Wed, 31 Jan 2024 06:31:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="lEY1N22a" Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 380594CB4B for ; Wed, 31 Jan 2024 06:31:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706682664; cv=none; b=Cjcq2SmCNS/XA95gfPyhSHYM8FP8I7mNqTRCF8q2WfYEaUiFAip4TyGzwp58VT7dlAHByFE6ihESPOMa3X9YIBtkxgPQQeHBppvbP/D+D/1ouMJmdgx1yASpH7wOO46yOrWhH2F8ne5Db1Ek7hEkRy80hv9daho4+/4PlfDYZRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706682664; c=relaxed/simple; bh=u2dme1MUFaWQF1BSStVrUjjYLnHIqMsZ+Wjfwetyd+o=; h=Date:Message-Id:Mime-Version:Subject:From:To:Content-Type; b=ASjI7oXFDIw1Yxw2hCTH7OWtfatYRopSrPcXnWVa3I21dK6xrT49yCEFc/VHmRoVqs9PFDstu5SWhXGRWzLWf5Md2lSapRp64DGVgrqJLY7POh+4eRvivDS/YY+BKwoaF501DIlvJYf2JCSBiJue/AnilghXrPDCcnC1+y9bePE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=lEY1N22a; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6040ffa60ddso2077417b3.2 for ; Tue, 30 Jan 2024 22:31:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706682661; x=1707287461; darn=vger.kernel.org; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=TRAmZ7zfR7GIpS+aIsz6syaxM6Q4TrPavG5oF05xWJs=; b=lEY1N22aJJjhJRhsVvGAVQPEvDbXmvRSX97spBk7Kb2HByaW1DeNHA3PKNI49OeAvV nuF3qFqv+xfoQmEsMnaJLSr0I51Xk3m6lUtvepUFZdeL5YWiJFgj6idkZSau7c2dJ3wv tQhUiIvoiy7ST5arM0rukkJQpspxEo/vjviYkqFTXAl8QFHMSKidDA2bv1utAWEs/b02 oUl7FaKzrA5I7PTQcZZK6Qf7cDzqPW5yYOLgfA8klQ+AG/xmEPQeagIf+4fbmx9iaLL6 dWj6pqNIc3iloB8cvSU4Ua85fYXDoVtEAq+QDmuAeZywfmnOLvRD4p2U9eh9R1XWWKPX YeBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706682661; x=1707287461; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=TRAmZ7zfR7GIpS+aIsz6syaxM6Q4TrPavG5oF05xWJs=; b=XIcSHmPhaxzNFWYMSYayznhuOh7htaicjk4vjrxwl0BWPYSm/iJ79RoX9r9a2Zw8QM n5gSrRI8mrzTKNVrLZ3QClNoj808AOFESiTiOAYaZco/E41bu37VxsVBYVtid0pjIUG4 bybm/FqTVd0dNgGoJ37CK33uGhLgAhajnKwUUBgzORt4GxiVLvN+mCynO627W8U3xFfT xFgi81GXpJfsQ/5adsc4vSBkI2SqmfN1WZjdsywSBRvyuj73VtFfBtALisyr3JMwQhtO tWMWlJXORQcDIS3uBK7DKy4dGe9E1MMMSPqoPFno2/LRPUSzLuficwUH4OgAbKkU7BaT Wq5A== X-Gm-Message-State: AOJu0YwUgHAME35e12iwp0zLVQD/FS/7puAenw42j/wre8OrT49GCmvm 5TtVBsA3zgVxBkKvPU+1KM5qfdJTwfS7sPaWpm8IfR8GHZIOIfDtGKl0Rs2XV8ZYx23o5S7BS1P Sudl61g== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:d0ab:43c6:7969:62ab]) (user=irogers job=sendgmr) by 2002:a81:9946:0:b0:604:45a:6740 with SMTP id q67-20020a819946000000b00604045a6740mr134886ywg.2.1706682661259; Tue, 30 Jan 2024 22:31:01 -0800 (PST) Date: Tue, 30 Jan 2024 22:30:46 -0800 Message-Id: <20240131063048.492010-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Subject: [PATCH v1 1/2] perf tsc: Add missing newlines to debug statements From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, tchen168@asu.edu, Michael Petlan X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789587121029017468 X-GMAIL-MSGID: 1789587121029017468 It is assumed that debug statements always print a newline, fix two missing ones. Signed-off-by: Ian Rogers --- This patch was inspired by bad debug output in: https://lore.kernel.org/linux-perf-users/CAGjhMsg_bVKJ_zfsLUR32+oZwGDr3OiBHV_BJ3QtFjyKAs7Sgg@mail.gmail.com/ --- tools/perf/arch/x86/util/tsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c index 9b99f48b923c..e2d6cfe21057 100644 --- a/tools/perf/arch/x86/util/tsc.c +++ b/tools/perf/arch/x86/util/tsc.c @@ -33,7 +33,7 @@ static double cpuinfo_tsc_freq(void) cpuinfo = fopen("/proc/cpuinfo", "r"); if (!cpuinfo) { - pr_err("Failed to read /proc/cpuinfo for TSC frequency"); + pr_err("Failed to read /proc/cpuinfo for TSC frequency\n"); return NAN; } while (getline(&line, &len, cpuinfo) > 0) { @@ -48,7 +48,7 @@ static double cpuinfo_tsc_freq(void) } out: if (fpclassify(result) == FP_ZERO) - pr_err("Failed to find TSC frequency in /proc/cpuinfo"); + pr_err("Failed to find TSC frequency in /proc/cpuinfo\n"); free(line); fclose(cpuinfo); From patchwork Wed Jan 31 06:30:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 194512 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1707799dyb; Tue, 30 Jan 2024 22:41:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFM8iiyatsn/ao8PPEAZJ8JafzdVBrrykBarVz1r9O/6JrtBXicK5VY6k87QKEw9sFLEbga X-Received: by 2002:a17:906:4154:b0:a36:70ce:31ba with SMTP id l20-20020a170906415400b00a3670ce31bamr422575ejk.5.1706683318553; Tue, 30 Jan 2024 22:41:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706683318; cv=pass; d=google.com; s=arc-20160816; b=Y6wz4Pll9k2ufM1JV7LQ5cr8NwVy3de0PAar2AhLqf5AoVBkotmHL3Qj1wuNvGJLJR UrhMmqgyfKLX0u1WlKVnqj9qJT0zps09who6FNUKcasZnVWQGMgnm/gotb2J7Sulu/Vu xrABtHFPRRbDWJdCz7kn4OZUXE0A3XYDgpM6MAFyfdCSNw+M8Riv4vZqkz8XSkOYArvB YsBx/ag1pLO8tb72KJu1KRExLW5jJ78Lewm+5Az4ese6zj9ITd8F5JAS07OyrMuvHpQO rSjlmoO44N9E5y3M+yI8svFOMAaiX4N7xlLtNMeIrySL40cIETrFuZeeVqdePxzq0SdB t9JA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:from:subject:references:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:in-reply-to:date :dkim-signature; bh=G1xH5pJjJI+heTB8iMmEvxa0X+0fNgErrr9gRIyth2g=; fh=Bb9GT1Fp1iBSZ3Po0YmCA3XjCUI3vgOx+eK2EHEr+po=; b=RUI6tIgt9M0MXhback9Xq0xVUsUWkwX0H7B7q9rjo07LJdyXv6WFDRzcBljjRk7r7S b2ZAwdhZtlMUrGJRWQqX0LD7WyQ7Um0CjcdfYUxNuQAagDesmE/tAusyyT3u4ZKRQa5r LSqfix87elon/bkzBrDCdsmeDX02VGkhoio2ntPI7oFdL155UNUprA9t76Zy4c1RurjO MbcTiP85uiOnDAf+t9Q4T421EjtVceZXh0/naO69cU/z1rxxKTS3LwSpkPluVz1FRyTj zFiggW5CZMw8vhPdB2cWDRTafpdEMPdKZ1u6inTstXbi9fi+9oBtp2JK4P1+umg3INyX 3hVw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=z+cNMApf; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-45837-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45837-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Forwarded-Encrypted: i=1; AJvYcCXqkUK7uCMWYNQEA/0b+FeBOGG6cqWBugj0rdaEw3if5pYDmIm/OVQywrSatobQtIm8yHpjXtqYaNFSCer6CQmYXC7Jdg== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id h13-20020a17090619cd00b00a35e32fd8a6si2158170ejd.237.2024.01.30.22.41.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 22:41:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-45837-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=z+cNMApf; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-45837-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45837-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 05FBD1F29A59 for ; Wed, 31 Jan 2024 06:31:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B34EC45013; Wed, 31 Jan 2024 06:31:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="z+cNMApf" Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D3CB4E1C7 for ; Wed, 31 Jan 2024 06:31:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706682666; cv=none; b=cgyJQ5bM2Jk+xGN1f5uXYjc0GHKvZMlV5OJXY0M1y5ArXztX0IpWAiAOyzegGjP5X01Y/jZ1VJUx2rdXS921Q/COKIB94eZmEKTSrF0cXdq8p2eGlXFTVmDL21y9q5teYNPpRofn1F4AE3wJTmEpXKCPynHubptafAdgEVNEkbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706682666; c=relaxed/simple; bh=ukGaeKDWoBnc0AIrKBff3Y2VDwj+LfqCpXcFKMzADh0=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=mZn2gzZ4lVBTsqZ9Y604z11BQZPVsvd5qhCv4dHza/9Si2RCp036Q5j4Ozaby66SfJ8deiOtfezeiUo3S9Uebqbg3DLziCE+OELzMQ4uftqV9AeLM083lfSCJ+sAJHX+hCtNeGOPwUZvh+LK2rPFp///cu3HcAQLVElhPswWJLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=z+cNMApf; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dbf618042daso7310337276.0 for ; Tue, 30 Jan 2024 22:31:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706682663; x=1707287463; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=G1xH5pJjJI+heTB8iMmEvxa0X+0fNgErrr9gRIyth2g=; b=z+cNMApfdnCiyR2tpp+pXabq1/2OzeBTR65q/VwEAJztm54xYjWQHxqxraGkSQM28l b4NS1swQgiZkmLJKpEJGdDWE1q/2/zJ4Q1XLLF8Y08JPM3JO8AXgpwmcR+DMdwBvHL5C VkPEdvUD4sXHO2JYAwhqTwEBdDppZK28KRmGaat73fUa8HHHvk44I/v2hk+1AkdV91bg Lm3Bvhg2B3o4BQVSkvTpI8bxXXTSRGm8yXzQ6DSmjst6NJ9DP+M5yEwXyroRD9rnOHSE FYS5TiztIV+elSKP3Qije8UtHth6BqV/VoFV6zPbv48Xx0cccBtco3LtIco5JmLQtkAh nshw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706682663; x=1707287463; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=G1xH5pJjJI+heTB8iMmEvxa0X+0fNgErrr9gRIyth2g=; b=RPec7CX1+IOYCuulv46M5Gk46cf2Y4GgGh0xORyb1TaiXI5I6RfDIeFG1OnKhLQLTy bSdpdUtvDIszBzT/UlHdWr1+f+CM+zKiF1+WPHlieJOM2Y1tQJRCMaHQyQgrDH63wsua 53wzDyjf06mN4rmAsWF4N0oshgzNiVdBvvaeOu/dubwWCqI67QfhRee0EH8N+0qICemt 8UO5krIMKanB+fcW5YkAoTd8ErzLx6P59KA3Aq/5xVGpFwblnWCzjmz4LfIJnUWusDJz PIRHPAu9KLUqlf0EHGrh3enBm7nmhsw8mKQtiGmDWE1o2RTFxcFzUT9L4MC2a0LL5D4a BeBg== X-Gm-Message-State: AOJu0Ywxb91yu1n0Zgd96ZmN88XXpzKxQjMYw5erhKRjvVLHfKS7hMVW 50BISUmZ9Mc5ckfIgSpOdI1vyoUi0DVq2drNYGgq3kS7yJ5TzNsRhaT2CxUMqPXlfZLi0hSrPFc oP5aPSA== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:d0ab:43c6:7969:62ab]) (user=irogers job=sendgmr) by 2002:a05:6902:1188:b0:dbe:d0a9:2be8 with SMTP id m8-20020a056902118800b00dbed0a92be8mr36777ybu.0.1706682663552; Tue, 30 Jan 2024 22:31:03 -0800 (PST) Date: Tue, 30 Jan 2024 22:30:47 -0800 In-Reply-To: <20240131063048.492010-1-irogers@google.com> Message-Id: <20240131063048.492010-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240131063048.492010-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Subject: [PATCH v1 2/2] perf parse-events: Improve error location of terms cloned from an event From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, tchen168@asu.edu, Michael Petlan X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789587167580726124 X-GMAIL-MSGID: 1789587167580726124 A PMU event/alias will have a set of format terms that replace it when an event is parsed. The location of the terms is their position when parsed for the event/alias either from sysfs or json. This location is of little use when an event fails to parse as the error will be given in terms of the location in the string of events parsed not the json or sysfs string. Fix this by making the cloned terms location that of the event/alias. If a cloned term from an event/alias is invalid the bad format is hard to determine from the error string. Add the name of the bad format into the error string. Signed-off-by: Ian Rogers --- These fixes were inspired by the poor error output in: https://lore.kernel.org/linux-perf-users/alpine.LRH.2.20.2401300733310.11354@Diego/ --- tools/perf/util/pmu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 355f813f960d..437386dedd5c 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -657,7 +657,7 @@ static int pmu_aliases_parse(struct perf_pmu *pmu) return 0; } -static int pmu_alias_terms(struct perf_pmu_alias *alias, struct list_head *terms) +static int pmu_alias_terms(struct perf_pmu_alias *alias, int err_loc, struct list_head *terms) { struct parse_events_term *term, *cloned; struct parse_events_terms clone_terms; @@ -675,6 +675,7 @@ static int pmu_alias_terms(struct perf_pmu_alias *alias, struct list_head *terms * which we don't want for implicit terms in aliases. */ cloned->weak = true; + cloned->err_term = cloned->err_val = err_loc; list_add_tail(&cloned->list, &clone_terms.terms); } list_splice_init(&clone_terms.terms, terms); @@ -1363,8 +1364,8 @@ static int pmu_config_term(const struct perf_pmu *pmu, parse_events_error__handle(err, term->err_val, asprintf(&err_str, - "value too big for format, maximum is %llu", - (unsigned long long)max_val) < 0 + "value too big for format (%s), maximum is %llu", + format->name, (unsigned long long)max_val) < 0 ? strdup("value too big for format") : err_str, NULL); @@ -1518,7 +1519,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct parse_events_terms *head_ alias = pmu_find_alias(pmu, term); if (!alias) continue; - ret = pmu_alias_terms(alias, &term->list); + ret = pmu_alias_terms(alias, term->err_term, &term->list); if (ret) { parse_events_error__handle(err, term->err_term, strdup("Failure to duplicate terms"),