Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp5584369img; Wed, 27 Mar 2019 11:09:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqzZGtCgFCT5eXC431qwea96x3n8axwDQNF5ymT4mHscRdSzvM/suHkHUF74m5B0TuYv7aA0 X-Received: by 2002:a63:1749:: with SMTP id 9mr34445072pgx.94.1553710158435; Wed, 27 Mar 2019 11:09:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553710158; cv=none; d=google.com; s=arc-20160816; b=rddIc+52y6Yz1CmSQ7nGTGIgMXuv46zMWjbvIugmTMytpOanTV/KkCKyX0abHBO71r kdlAoRMJJSyxgozjtwSUJA7nJ2ysAucuzd4+dEkuILj2VMtlbAgZ1yhBaT2L/e5EhxWf mbjkAwVYT6MIox/WlEBl9qsX+p4L1UbjoPSS/GyrJjqvHG6DsTqnXbWO4UVjFD0wzMn7 dV5DhSZeqM/O18yQRZkXYDyZhjxMGantQxJglZtwOD2elbeQMx3F3uIdOYenbkT56Vlt ZNmqt7zbq4fAhIp1hBuHty2ISGreQZNjzfGcExh/rEEGmpSo0dj+OAyxc9Kez7Q09DYP BRUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Uh/drPRK7BOHmMh1/18G8lCbSHF1cQ8beU/mC9XSop8=; b=rkWAojXZR1mFp8A0638T1HBqmylKcWrvJtjFG50uNgQtuvUhM/bA1b4in3hfcOl0Ox 7P/kG9/zzv5sxrJreDRnnd/almDu+4uw1eGZ4eByI7w4YQzdniMbTIXHvzNO53f3aPpP 087i4HTxRjYG4usVHnuTRy4+aDyb5rn1f05mPBFFCZfqWxzeANd44XC5S6J1ROKVIGWM /Hbhg4bctUcxXyNKfHorOWHaQ5jcQYhdaiITZ30cm+V20pSQy4gE8673pA1hjO9bIFKN ilnuyhr5/Dx1Sfuw61CjRKxn0GnyC3AFKJITnosCRTvmoffOVzOq0ClrdeZjCNryXknw NanQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0DT0s8Da; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l1si21059544pld.210.2019.03.27.11.09.03; Wed, 27 Mar 2019 11:09:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0DT0s8Da; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S2387937AbfC0SGZ (ORCPT + 99 others); Wed, 27 Mar 2019 14:06:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:47954 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387912AbfC0SGX (ORCPT ); Wed, 27 Mar 2019 14:06:23 -0400 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 F26B921734; Wed, 27 Mar 2019 18:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553709982; bh=ati3eEQZRrTC3pHzhPBOHZ1wcfKmcvxdzBHma0NJIq0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0DT0s8DaF2gQ4jpQIx55FUJU+5xrNDmn2mj5qYaCR59S0VQiFn6mRB+Xp7F+IavUA E2z6c682pIqf9WhuFha2Sm8xxXNr9TIYcTVFAtHRwrIYk0bBoMzZKp7PlDGSNURpi4 hMvgkQPo7xHhnIFbYeAIgYSxZXvIWhns06AZK8M0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Richter , Heiko Carstens , Martin Schwidefsky , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 5.0 143/262] perf report: Add s390 diagnosic sampling descriptor size Date: Wed, 27 Mar 2019 13:59:58 -0400 Message-Id: <20190327180158.10245-143-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-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: Thomas Richter [ Upstream commit 2187d87eacd46f6214ce3dc9cfd7a558375a4153 ] On IBM z13 machine types 2964 and 2965 the descriptor sizes for sampling and diagnostic sampling entries might be missing in the trailer entry and are set to zero. This leads to a perf report failure when processing diagnostic sampling entries. This patch adds missing descriptor sizes when the trailer entry contains zero for these fields. Output before: [root@s38lp82 perf]# ./perf report --stdio | fgrep Samples 0xabbf0 [0x8]: failed to process type: 68 Error: failed to process sample [root@s38lp82 perf]# Output after: [root@s38lp82 perf]# ./perf report --stdio | fgrep Samples # Total Lost Samples: 0 # Samples: 3K of event 'SF_CYCLES_BASIC_DIAG' # Samples: 162 of event 'CF_DIAG' [root@s38lp82 perf]# Fixes: 2b1444f2e28b ("perf report: Add raw report support for s390 auxiliary trace") Signed-off-by: Thomas Richter Reviewed-by: Hendrik Brueckner Cc: Heiko Carstens Cc: Martin Schwidefsky Link: http://lkml.kernel.org/r/20190211100627.85714-1-tmricht@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/s390-cpumsf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/perf/util/s390-cpumsf.c b/tools/perf/util/s390-cpumsf.c index 68b2570304ec..08073a4d59a4 100644 --- a/tools/perf/util/s390-cpumsf.c +++ b/tools/perf/util/s390-cpumsf.c @@ -301,6 +301,11 @@ static bool s390_cpumsf_validate(int machine_type, *dsdes = 85; *bsdes = 32; break; + case 2964: + case 2965: + *dsdes = 112; + *bsdes = 32; + break; default: /* Illegal trailer entry */ return false; -- 2.19.1