Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp5978548ybc; Wed, 27 Nov 2019 12:47:07 -0800 (PST) X-Google-Smtp-Source: APXvYqwdf0KfTLRpy/tXZ0NQ6nMu1+arqKIiZxuD3UA/3Yc5kSrui0V0OGtPAsxe9O86IfAk+4Dx X-Received: by 2002:a17:906:641:: with SMTP id t1mr34639063ejb.1.1574887627117; Wed, 27 Nov 2019 12:47:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574887627; cv=none; d=google.com; s=arc-20160816; b=nJUVGCcR5ffO7E+4BqVpR5AqvPs4pepbpqYpbKyKdVxFQh5OWFHJb0cbIEZVuASn6p oykN2zuwggrvaUl372uAtsguRqYsVfLUO7m4JZBlKh69KvsWM1qirNtkzTPrrhS3H9Y9 eJdqnvmvTtAhK9g2WG9N79sfs+ti7B5Szvu2sy/fYwihwk6TZfzLMs3UkMkeu7N27RKO 7XF7Orcsi2iVByCdFd2+2X5YTVctAO/T410DShU2n/9mYESzFN01nLpPZ6RQrTmnp2wC ygLQTeRHonV6+KweZyKAVkqu4BG36EA1q4/niBAEp2Xp5t/LaCw4me4f822y+WSzViKg iwIQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Lz2CXcvd91vkesAG0buZ/YI2TPLDpDI4do904/nhIc4=; b=zq45Wp6eHn/n8lzKQvsHXJnJNhJLyHI87snFlLob+XgD7TE43Pn/9jiB2xaDqXX6gY OEGGIoaYe0ABQB7YfVYSwpG0EhCbZK8YzIYNWPP+nEVPK7VMTYJkQQww1E7D/ye8lmk4 0P5vpEK4iAjynZat01KEN29gBbZBkgK5WIAzWb6/jTMn4gHbl6ulHfAuKcpQSOuynswb qpjQ74+4BD0Shy8MvBW8lOsUiASzMom74mVxhClI4gfHzyeCdi4zQigTKWH64YacvFw/ AZcvSzsU0RmMi2l7rh69u4cURI/fFwSyC+eKelSFR+ymvavsK0I11LJi14m1tJosmnBe DEUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GFBj2Urm; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id jr4si9982594ejb.287.2019.11.27.12.46.43; Wed, 27 Nov 2019 12:47:07 -0800 (PST) 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=GFBj2Urm; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729069AbfK0UoR (ORCPT + 99 others); Wed, 27 Nov 2019 15:44:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:53230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727739AbfK0UoP (ORCPT ); Wed, 27 Nov 2019 15:44:15 -0500 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 82C12217AB; Wed, 27 Nov 2019 20:44:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887454; bh=rMbU6ZdTyqmaJm652PJ0y8rsplYjV86nTgjhjbsJCn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GFBj2Urm09SdpvwJbgYviMZCzbMf3psrIqh/KO1UiWRaoZfKhu6sWk74vozUVzuZW uApexgTi82YeKT7RhsSoNFHzLEyMc3lpuXXs6/bS5ZFjy9GC8R49jMNBamo3bMrPM2 isP4w2jAbHp/n22Wr7oZC04zyxqDGjKINBX7+QiI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexey Brodkin , Vineet Gupta Subject: [PATCH 4.9 118/151] ARC: perf: Accommodate big-endian CPU Date: Wed, 27 Nov 2019 21:31:41 +0100 Message-Id: <20191127203044.514735968@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203000.773542911@linuxfoundation.org> References: <20191127203000.773542911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexey Brodkin commit 5effc09c4907901f0e71e68e5f2e14211d9a203f upstream. 8-letter strings representing ARC perf events are stores in two 32-bit registers as ASCII characters like that: "IJMP", "IALL", "IJMPTAK" etc. And the same order of bytes in the word is used regardless CPU endianness. Which means in case of big-endian CPU core we need to swap bytes to get the same order as if it was on little-endian CPU. Otherwise we're seeing the following error message on boot: ------------------------->8---------------------- ARC perf : 8 counters (32 bits), 40 conditions, [overflow IRQ support] sysfs: cannot create duplicate filename '/devices/arc_pct/events/pmji' CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.2.18 #3 Stack Trace: arc_unwind_core+0xd4/0xfc dump_stack+0x64/0x80 sysfs_warn_dup+0x46/0x58 sysfs_add_file_mode_ns+0xb2/0x168 create_files+0x70/0x2a0 ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at kernel/events/core.c:12144 perf_event_sysfs_init+0x70/0xa0 Failed to register pmu: arc_pct, reason -17 Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.2.18 #3 Stack Trace: arc_unwind_core+0xd4/0xfc dump_stack+0x64/0x80 __warn+0x9c/0xd4 warn_slowpath_fmt+0x22/0x2c perf_event_sysfs_init+0x70/0xa0 ---[ end trace a75fb9a9837bd1ec ]--- ------------------------->8---------------------- What happens here we're trying to register more than one raw perf event with the same name "PMJI". Why? Because ARC perf events are 4 to 8 letters and encoded into two 32-bit words. In this particular case we deal with 2 events: * "IJMP____" which counts all jump & branch instructions * "IJMPC___" which counts only conditional jumps & branches Those strings are split in two 32-bit words this way "IJMP" + "____" & "IJMP" + "C___" correspondingly. Now if we read them swapped due to CPU core being big-endian then we read "PMJI" + "____" & "PMJI" + "___C". And since we interpret read array of ASCII letters as a null-terminated string on big-endian CPU we end up with 2 events of the same name "PMJI". Signed-off-by: Alexey Brodkin Cc: stable@vger.kernel.org Signed-off-by: Vineet Gupta Signed-off-by: Greg Kroah-Hartman --- arch/arc/kernel/perf_event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/arc/kernel/perf_event.c +++ b/arch/arc/kernel/perf_event.c @@ -488,8 +488,8 @@ static int arc_pmu_device_probe(struct p /* loop thru all available h/w condition indexes */ for (j = 0; j < cc_bcr.c; j++) { write_aux_reg(ARC_REG_CC_INDEX, j); - cc_name.indiv.word0 = read_aux_reg(ARC_REG_CC_NAME0); - cc_name.indiv.word1 = read_aux_reg(ARC_REG_CC_NAME1); + cc_name.indiv.word0 = le32_to_cpu(read_aux_reg(ARC_REG_CC_NAME0)); + cc_name.indiv.word1 = le32_to_cpu(read_aux_reg(ARC_REG_CC_NAME1)); /* See if it has been mapped to a perf event_id */ for (i = 0; i < ARRAY_SIZE(arc_pmu_ev_hw_map); i++) {