From mboxrd@z Thu Jan 1 00:00:00 1970 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 8ABEC17BB2F for ; Wed, 10 Apr 2024 22:23:58 +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=1712787839; cv=none; b=KYk18qycS1olY5nzL54eqtUKKPsbWp5VxlxxkNLD0gAtOkjgVq+RN25+5I0o0GS1pKHXxD/rdr5I5eXkYh3acwg8/ji6xh2YnIW1KWb+Lj0C27lkvJB0x1rukmjdbtQNr7I10PcapXtTVtDtM4kD2EsM4CxoNViJuHBJ9XRIw88= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712787839; c=relaxed/simple; bh=GAU+2rZNqMkHZN8SbllEOZVUOsdEVBIYY2092Hb26Gw=; h=Date:Message-Id:Mime-Version:Subject:From:To:Content-Type; b=A4t0tfegm74xg2IHlzv6CEqXJP5Zo2Cz3Y9NbNF5Pm/0XJBulvVe0OxxSgEboM1nyzgbmpsyRa/wV586XvrID9Z3mXcVl5Ay7YYCXJakOS4pJ4VBhdVpLIrFkR2uXlCDlee3GicNqiKwXEWw0sRx0YNe2fqhdDkNHgI5bCvcACc= 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=BfaHxowS; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="BfaHxowS" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6b2682870so11235370276.0 for ; Wed, 10 Apr 2024 15:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712787837; x=1713392637; darn=vger.kernel.org; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=B+F+2wBjMyMgvGwjkNxLfH9Fpi5N9urgZl/EZiGxcNI=; b=BfaHxowS1E5//epfMSK7QJAm+KTlwWeB6m13K0yCyWVWjci28Hhj94PO6mpAh80WJP OafXkaVuGZ6AjoJiM5hRyscG2AmmsH3wf60Etvv3PquCF09/q8J+1J1QC0bmG1i7H70p +UaWZYnm7/RYgJEpsPdMc94javziLvhRJRIxaZn+oyfpJcd6vTLHODMHsEXCtl9U1YPD 5VQOJoB9UjUSgq7F8DE1YO1ADdgspGl4CpfvzhKP0uPsygxG4fvkxAaG7Hqg36qw2Dj7 eiT1yCnuAdA5UtNuaZ+CyW5Bo9hoTAw4+Jfo0Lb9aauMAS+DoJjYzP/158VZ01SWNGb4 NdXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712787837; x=1713392637; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=B+F+2wBjMyMgvGwjkNxLfH9Fpi5N9urgZl/EZiGxcNI=; b=Fk1lDhKEw7Omd9iZVQkUf5U8YWFAYzm+NgthtS+l58QHBpXXRj2Nwu+RajlFZ0w+eT zdTx4IUeR1H5MgpyPM5iMjRlvcxHIYP3PznjZxCMr3bI1oYypSGQ2qVq0afF/RrSl+og Ul1mWacfKR01KaPvwsn4hqtrz3O4f6yLCKSaRRAS8vgHzgnutDPBaW9xgFpuFVgJ2SF/ ysKpPgGe7laTeXdLRK6emKi4IzXq22lGTMVdeauu1L7MXT8x7gd8+i36wHvbz+KT6fMx XPvzu6LaFhjI4hPQ5mqcrBSxhW+sHLqvMoVnYwcWFGbNNpXkZ8PbaiA95QRHdaYd+i/R VyPQ== X-Forwarded-Encrypted: i=1; AJvYcCW0caOecfiubN1SHF4ZhjxgifpnQ4FZglQjMADHdTZJf+JdsFUMK05I/5iwSNF0B/eQ16aVdln4fbSkeoVtJ/i/64xGJ5fRpyah0zFgZhhc4Q== X-Gm-Message-State: AOJu0YxKbX/k4MYUzqut65QtfxdA8VaxVEIlhfeujdcuCpUnJctPcFk9 Coy0enn9rhacvA+okZRxHgqfZyxaTc1Ei+bNloSfLuZIJgE7Tq9Pu7GxR7WMZrQoXnYO5gnN1F5 wZy9nBA== X-Google-Smtp-Source: AGHT+IGZDqrCoL9XuzYc4FDvlUWPcnEFM/Imu3Vrs1s2cAZGxjT4+opbZnt7CdVo7ONNX0j/wcoCJo1xyqWX X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:ed7d:1d85:433a:d24c]) (user=irogers job=sendgmr) by 2002:a05:6902:1506:b0:dc7:7ce9:fb4d with SMTP id q6-20020a056902150600b00dc77ce9fb4dmr1086916ybu.12.1712787837515; Wed, 10 Apr 2024 15:23:57 -0700 (PDT) Date: Wed, 10 Apr 2024 15:23:53 -0700 Message-Id: <20240410222353.1722840-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Subject: [PATCH v1] perf list: Esacpe \r in json output From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Events like for sapphirerapids have \r in the uncore descriptions. The non-escaped versions of this fail json validation the the perf list test. Signed-off-by: Ian Rogers --- tools/perf/builtin-list.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 02bf608d585e..9333cc64c2ce 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -313,6 +313,9 @@ static void fix_escape_fprintf(FILE *fp, struct strbuf *buf, const char *fmt, .. case '\n': strbuf_addstr(buf, "\\n"); break; + case '\r': + strbuf_addstr(buf, "\\r"); + break; case '\\': fallthrough; case '\"': -- 2.44.0.478.gd926399ef9-goog