Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3118798ybj; Mon, 23 Sep 2019 15:11:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWgMvNdmbhRkAILIfHHl9LSd1aFg0E5Y4QAl++0sPVbf3x4yHQd8zNYX3D6U4PHA8GeDSb X-Received: by 2002:a17:906:1394:: with SMTP id f20mr1844610ejc.274.1569276714731; Mon, 23 Sep 2019 15:11:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569276714; cv=none; d=google.com; s=arc-20160816; b=j1s/b8s5vqJGMh96FW7Uk1BQoFG2UljPJqygOR7w3WRD8tdbm5SHKbswiH9mazrd7+ LvSprcrOjFv1UchrkgyRejvJZ+7XPtbqp+Ki6MT+XO8CWnwHoGX8ABZvDgx1/RQoTbqK sNJTVekA78XXQ1xBxRxXBms++XEKbIxmr5ymnEXOAe8wWL10ftQugiFYSO7KvnWUasPU 4ZvWKXFg6Ssq817+hHkl0njOcbYIAu21+rblPw1m7sKjUjJ76qjxbt9xhp/ICPneJIgK xBmVmlTOO+ShS4VCsoqeNGe4Mrjlrf5c5KB/e3oN9cFSUsKj0K6j4m27Wf6L/N06+Xli 4teA== 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=akTGQ5/z4ojHu6feSvUKzakugCUVqhVjy4+BnD+QZ8w=; b=duwbHDX8n+yE1GflWM1rbvf+oKTSuldkUgthYyypKheH92LfO6sqK+caDd4vEO8g8F dqRR7/zqfJ1vvL7u0iyAcH+baRPaztjxvSYV0DvxH1ljGFHCsRuOBmuWYWbKgzBa1+cx z3D474Jl2pexaj2n5K/bYBC4wTkbY38z2y9RCenqqAENYxl0OwYC7vRvHhxIQuGmfnYf S2BSIyedq8EgwDHq11JIUlGUGA6Lw6EuFj4zboRtNFnWfeC2TdLhmd8s1BvY8wad1Ftt DRcwdi3s0NDwLJszyNUe5hW5CEgg41ptDo3Ocb8sX+u6mMsgV5HZStH514tTaYjoDMWb whWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=u554xWjo; 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 n8si5719655ejz.22.2019.09.23.15.11.30; Mon, 23 Sep 2019 15:11:54 -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=u554xWjo; 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 S2390683AbfIVSrS (ORCPT + 99 others); Sun, 22 Sep 2019 14:47:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:43538 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390595AbfIVSrL (ORCPT ); Sun, 22 Sep 2019 14:47:11 -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 B1575214AF; Sun, 22 Sep 2019 18:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178031; bh=B05maExQbhzmRz3QtW0v5BieCGz5HdQQOqgZortZCcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u554xWjoj7r6wI1+r8bUStDbbvUVxoatZGHyennByP6KTutoOa4j+sWCX9aLuOIc5 cnhSJhEbpIsIy+2vgAZjzxGwT+6KaGr+C6GxzEYK40oI6L8ALTjqoZZO5uHUzFSU68 VykXqqXp85trzePwmEU+rd4TkffH7XDjUNc/IhJQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gerald BAEZA , Alexander Shishkin , Alexandre Torgue , Andi Kleen , Jiri Olsa , Mathieu Poirier , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 5.3 113/203] libperf: Fix alignment trap with xyarray contents in 'perf stat' Date: Sun, 22 Sep 2019 14:42:19 -0400 Message-Id: <20190922184350.30563-113-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: Gerald BAEZA [ Upstream commit d9c5c083416500e95da098c01be092b937def7fa ] Following the patch 'perf stat: Fix --no-scale', an alignment trap happens in process_counter_values() on ARMv7 platforms due to the attempt to copy non 64 bits aligned double words (pointed by 'count') via a NEON vectored instruction ('vld1' with 64 bits alignment constraint). This patch sets a 64 bits alignment constraint on 'contents[]' field in 'struct xyarray' since the 'count' pointer used above points to such a structure. Signed-off-by: Gerald Baeza Cc: Alexander Shishkin Cc: Alexandre Torgue Cc: Andi Kleen Cc: Jiri Olsa Cc: Mathieu Poirier Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1566464769-16374-1-git-send-email-gerald.baeza@st.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/xyarray.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/xyarray.h b/tools/perf/util/xyarray.h index 7ffe562e7ae7f..2627b038b6f2a 100644 --- a/tools/perf/util/xyarray.h +++ b/tools/perf/util/xyarray.h @@ -2,6 +2,7 @@ #ifndef _PERF_XYARRAY_H_ #define _PERF_XYARRAY_H_ 1 +#include #include struct xyarray { @@ -10,7 +11,7 @@ struct xyarray { size_t entries; size_t max_x; size_t max_y; - char contents[]; + char contents[] __aligned(8); }; struct xyarray *xyarray__new(int xlen, int ylen, size_t entry_size); -- 2.20.1