Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3440107pxk; Mon, 21 Sep 2020 13:51:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPfKE3UDTUUJKv9EVrBqWY1jbHKD6i2Pq9EjQTJo5K2tyIBEYCaHfv2qBYRySJQd6KQY+u X-Received: by 2002:aa7:c70a:: with SMTP id i10mr782113edq.218.1600721469198; Mon, 21 Sep 2020 13:51:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600721469; cv=none; d=google.com; s=arc-20160816; b=BKaDTxetW9/qMFI3d1QKJonJIiCJsBzx+XMUtYSNh7Y+vgzSxnDDWuY+eydt4f7YWf cNWcfoRLyzeDw/Plptnapiqsl8vrn/ZyzXmUVeejCv8pCYQRxLd+92dvQSfLJaBCRv+3 4/V4535jmoSJVZ6TNYHEHT7Gy2ORK57ipNin63EmSai98gBjDsUf1lManXCiMwIsl59O PZQKSmbzpgCzkg1uWXBEYme5yaTKEEwxdrr0SqJAobooO+nBqAV5wa0px1D8JkYRQH5O 68kZSVS1j0tcDrf5MiYWuxRtLP+3WMLWKRHdl0bmvqZAPLkhNieq/FK7nmN0HKwnX2NR jg6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :mime-version:user-agent:date:message-id:subject:to:from; bh=5c6yh2d8nZJGEZ3Hk/x5Md5sRjTtXO0JidALCx0K1u4=; b=beIwhSHYwL9hWJnRifkmmXWqslYLQvLJINigawjsXfC7myo65GmFvw4/29kruH4Eq5 F4a8i66W4bPZyqw4VlZunTusrycrvT5FpXL27+JE6+9rlBOzdNanBfHEUUSm/V15whWM 0omiFY09BTzes5zV6bst7J120a/AWIGRr3nUJZ8qOvt9dXdoq+TER8QzYzyUDVP5Ns0g ojrP3aK84UzkJF+jhwWUOIMCG9+kGjNDbM4XsdGsh0KFVsKc0HQTuTRZ3uqogzLCqj6f cqv85wTaFiaNQ5/ekaAzPTTUEKtsgArw4bxeSQ8eA6oCHeAriNUY0nIV6F9dM3Ti60BQ IfKA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cf14si8921978ejb.441.2020.09.21.13.50.45; Mon, 21 Sep 2020 13:51:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726886AbgIUUql (ORCPT + 99 others); Mon, 21 Sep 2020 16:46:41 -0400 Received: from foss.arm.com ([217.140.110.172]:55448 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726427AbgIUUqk (ORCPT ); Mon, 21 Sep 2020 16:46:40 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5049D147A; Mon, 21 Sep 2020 13:46:40 -0700 (PDT) Received: from [10.57.47.88] (unknown [10.57.47.88]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0D8403F718; Mon, 21 Sep 2020 13:46:38 -0700 (PDT) From: Al Grant To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Jiri Olsa , Namhyung Kim , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Shishkin Subject: [PATCH] perf: correct SNOOPX field offset Message-ID: <4ac9f5cc-4388-b34a-9999-418a4099415d@foss.arm.com> Date: Mon, 21 Sep 2020 21:46:37 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org perf_event.h has macros that define the field offsets in the data_src bitmask in perf records. The SNOOPX and REMOTE offsets were both 37. These are distinct fields, and the bitfield layout in perf_mem_data_src confirms that SNOOPX should be at offset 38. Fixes: 52839e653b5629bd ("perf tools: Add support for printing new mem_info encodings") Signed-off-by: Al Grant Reviewed-by: Andi Kleen --- include/uapi/linux/perf_event.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 077e7ee69e3d..3e5dcdd48a49 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -1196,7 +1196,7 @@ union perf_mem_data_src { #define PERF_MEM_SNOOPX_FWD 0x01 /* forward */ /* 1 free */ -#define PERF_MEM_SNOOPX_SHIFT 37 +#define PERF_MEM_SNOOPX_SHIFT 38 /* locked instruction */ #define PERF_MEM_LOCK_NA 0x01 /* not available */