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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 E77DAC4CED1 for ; Thu, 3 Oct 2019 16:29:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BFB1C2054F for ; Thu, 3 Oct 2019 16:29:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120192; bh=B05maExQbhzmRz3QtW0v5BieCGz5HdQQOqgZortZCcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jqxwehYRNyfnTiXRdoPTEHz1U1M6BfL6dA5F0wTfKrZq8dwVM9g4yiypukGi2JGVj hoJRdp74EBBFRoLJIktRWgAi7pNcyaCRxA5Fnpv9VtWBXQlaXRe6/6nZdCw1avCbFi go5rzZ7UXwK61iRLXNpkkCbnkl/k96OmCzOxFIEg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391003AbfJCQ3v (ORCPT ); Thu, 3 Oct 2019 12:29:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:35482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391631AbfJCQ3u (ORCPT ); Thu, 3 Oct 2019 12:29:50 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6712320867; Thu, 3 Oct 2019 16:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120189; bh=B05maExQbhzmRz3QtW0v5BieCGz5HdQQOqgZortZCcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D7Ke/4voj5ll5GfQwav3ZCPtX39O8Lz3dFHuhImWw5z+cwNp0cGD5Vh/wQBwsm9Dp 38gF36HHf+Z5HFRLJm9uLv1fdyUjGy/WVMbKQYEBAnJexTBoqnDXCemrmyujNGPKPB uuRc5xPH2EtfORZSxOvm6H/m4FW3XOAL884G1Ibk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gerald Baeza , Alexander Shishkin , Alexandre Torgue , Andi Kleen , Jiri Olsa , Mathieu Poirier , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.2 131/313] libperf: Fix alignment trap with xyarray contents in perf stat Date: Thu, 3 Oct 2019 17:51:49 +0200 Message-Id: <20191003154545.804444227@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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