Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <9c40ef91-b7fc-5ee6-2ab5-446a10f8c00a@amd.com>
Date:   Thu, 29 Sep 2022 12:31:13 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.3.0
Subject: Re: [PATCH 2/2] perf/x86/amd/lbr: adjust LBR regardless of filtering
Content-Language: en-US
To:     Stephane Eranian <eranian@google.com>
Cc:     linux-kernel@vger.kernel.org, peterz@infradead.org,
        ananth.narayan@amd.com, ravi.bangoria@amd.com
References: <20220928184043.408364-1-eranian@google.com>
 <20220928184043.408364-3-eranian@google.com>
From:   Sandipan Das <sandipan.das@amd.com>
In-Reply-To: <20220928184043.408364-3-eranian@google.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RUU3RGl4VVRZNXZqZmJjUW5nUVJoNnRaUUp2TUxvWG5MTkVFV0FCUlcvNk8y?=
 =?utf-8?B?Rk9jSnBoWGZrOU1CeHlLSlVWUU82UkQ1c203YUEvRS8zYVBPTWpZM1pjOXhB?=
 =?utf-8?B?YU52bHBnNFM5Qy96c2JnMy9HNzNFWkdhZ252VHd1cDg2cDhUTXVSM2dLTzR0?=
 =?utf-8?B?OGowZ1hBRHNwU3BWekVOYmI4b081bWptMUZWRlc0V3pDOEtCTWgrci9vNXc1?=
 =?utf-8?B?Q1g1WTBIUGJGVXpzcGVCaEVpdEVPbExycXhENFB3QXNGOWd6WUlkVGNVRjNu?=
 =?utf-8?B?RTlaMmgzOTN2bTNPb0hCV2xGOWNTSlFkR0JnL3c1MVhyV2I3cGgxSjRNK1VY?=
 =?utf-8?B?aWZzaC9Xd3JmN2dFa2c2eHNSMWk2c3B5Uzl4eEwxcTRoSUNRMmx5MzVYWHFq?=
 =?utf-8?B?SjREUmx5TXBRbFpkY2dZQkc3cVNqT0RUbU5NZFRvbHN0ZGQ4djNoSnFpQTJ6?=
 =?utf-8?B?WjVyV1FKVjZFT0kzQ0t2WFB5NjJMVjhrZHZHTlVJdEQrV3MyU2pzME8rMSth?=
 =?utf-8?B?M2dYTHYwMjdYL2pWZTZyVW1yNWt5TXVjczY5OW11RThYSExEMDRXZlZpZlM0?=
 =?utf-8?B?ejdKcXNscUN1d2MxTis5UTFRc1NpOTJqZGo1ZHdPejcyMytURDd1ZzBCKzVr?=
 =?utf-8?B?TUEzbWJNQVd2OWpDRUhiMThXNU5EWlM5NFVuTDBzcXNYQ0hoUzdYelZZV0J1?=
 =?utf-8?B?UUI5VmpPQmx0K3ZrbkZkSm5vb3plSXE1U1BCWE5VUVdBSmpPYTJmcW5abXo3?=
 =?utf-8?B?T0RwdmNWSFJINVlrZjZZeFF1cTNXVTBIcVQ1azFPRDNQK2hmenNFUGxzUUpq?=
 =?utf-8?B?eHRQMklwQ3N2MU5QNG80cGFuNHo3a0tpRStiOXpsbEtoTk40aSs1YUNrRDNQ?=
 =?utf-8?B?eGZrWGI5eUJmMUJQeGxlVVoySEc3WDk3NENIY3RKVnRoQVl2UmU5N3NtYVlB?=
 =?utf-8?B?TFN0cXBmNUpkclRIV01aRHdFRWlTVkJvNW5NRUpubTJTWlFUaUE1dmdjR0cv?=
 =?utf-8?B?ejZqeC8xaEgvZWhqMjh2TzhUR2Y2M2k5WE1wUDRYL2hseDRiQXVaeEErdmZH?=
 =?utf-8?B?dXhpSXhIRlhCNmJPcmRSVHpYRUVKdHJvUFBMY3h6WllUbTE3S1VockNOZXpa?=
 =?utf-8?B?OTNoVjBtM0JQSGtvK2VZcVBON3c5aW01WDZuc2M1WXdyanc2OS9MemNlU0tj?=
 =?utf-8?B?aGJDdGd2d2xxK0NJSW52TVpsSFpRUzlaUlRmbFVjOXN5bUUwa0FTVnMwcHVX?=
 =?utf-8?B?VWMrdzd3YWp3Zi9paDFCNHd1NmpiMjdQbmhNRjY4aHVsQ0lNUk1QNXVzTTdP?=
 =?utf-8?B?dnNBYWhXV2ZKc3FzMFJjSkxZSnVZSXZmK0RONVAvbHJCcC9ua0dmOFNUaDZm?=
 =?utf-8?B?Z3FOODI5bzlVNEtNMXlnelZ3aVBHTWp1WEVaVXlBVFJiYmRkVXlZb052dEVP?=
 =?utf-8?B?Z0dUNW1Pc3o2VWw3WFlCRlVIekhSVjB6N082OXZkUEZENkxEQmE4YmV5UkVp?=
 =?utf-8?B?M2hyZ08wdTg1ampCSFVUWFFLYytVeUVpaGRSMEtob2ZFNHhpU3ZQSy9YUE9N?=
 =?utf-8?B?N0lUYlNkcFRGbTIyN3RBcXFONGovaTJSSlVKNTBhOXU0S1FYWG5QajZJT2h5?=
 =?utf-8?B?cm5EUUZLUkRVMGhDS05tZE9BRHN3VDExbXlRck14ZDIxRDF4UzRwaVRjWnYw?=
 =?utf-8?B?RFJlWGdYaHBuTWRsNFE5c3JVUnQ5UGVLMnZSTFU5SWdJL2NVbkF2YVJscUJh?=
 =?utf-8?B?aGQ2SmxaYXlKS3AwWEQ1YUZIekFxVmNHNjBPYW5yME1zQ3VUNDVDamtXNXMy?=
 =?utf-8?B?NEJwNXVESXN1VEJXODliZTNnK2FDWC9BeWZWaTlRSUlrcUtaeGdKQXc5RkJn?=
 =?utf-8?B?dXZybVhYUU9ZTWNpcEJlWGg3TG1kUXlnNzhIL3BSWDY3WEl3WTF6cEZqQ2Fo?=
 =?utf-8?B?ajdVMmd3SXlFV1Q1MWkzV2ZUbkgwbVVrM0tkNkVScWIrRStHNUttMzR1aThu?=
 =?utf-8?B?anlrV3JIcHJpU01wbnJhcVhTMVpyaDFZejJTai9Ia1podm9oOEloNW9GYzIw?=
 =?utf-8?B?NUlrNW9JbkQ2VDNpbmhNSGRVOFh2Y0QySVJSL29ONmFxaWYyNDZFODgrQTRE?=
 =?utf-8?Q?Uf2wWxB+bsi7P1HkbpoFgNF/P?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: acfd934c-22f6-4d3b-5849-08daa1e86d1f
X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB5712.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 07:01:26.4726
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: amO7mza57uHFIp309HVyLjSiqABojLt562eHPg+inexsiW+a2XoopwM49xbEH+Bupy06dhPHeIOGknDKoXGGoQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5234
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 9/29/2022 12:10 AM, Stephane Eranian wrote:
> In case of fused compare and taken branch instructions, the AMD LBR points to
> the compare instruction instead of the branch. Users of LBR usually expects
> the from address to point to a branch instruction. The kernel has code to
> adjust the from address via get_branch_type_fused(). However this correction
> is only applied when a branch filter is applied. That means that if no
> filter is present, the quality of the data is lower.
> 
> Fix the problem by applying the adjustment regardless of the filter setting,
> bringing the AMD LBR to the same level as other LBR implementations.
> 
> Signed-off-by: Stephane Eranian <eranian@google.com>
> ---
>  arch/x86/events/amd/lbr.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/events/amd/lbr.c b/arch/x86/events/amd/lbr.c
> index 2e1c1573efe7..38a75216c12c 100644
> --- a/arch/x86/events/amd/lbr.c
> +++ b/arch/x86/events/amd/lbr.c
> @@ -99,12 +99,13 @@ static void amd_pmu_lbr_filter(void)
>  	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
>  	int br_sel = cpuc->br_sel, offset, type, i, j;
>  	bool compress = false;
> +	bool fused_only = false;
>  	u64 from, to;
>  
>  	/* If sampling all branches, there is nothing to filter */
>  	if (((br_sel & X86_BR_ALL) == X86_BR_ALL) &&
>  	    ((br_sel & X86_BR_TYPE_SAVE) != X86_BR_TYPE_SAVE))
> -		return;
> +		fused_only = true;
>  
>  	for (i = 0; i < cpuc->lbr_stack.nr; i++) {
>  		from = cpuc->lbr_entries[i].from;
> @@ -116,8 +117,11 @@ static void amd_pmu_lbr_filter(void)
>  		 * fusion where it points to an instruction preceding the
>  		 * actual branch
>  		 */
> -		if (offset)
> +		if (offset) {
>  			cpuc->lbr_entries[i].from += offset;
> +			if (fused_only)
> +				continue;
> +		}
>  
>  		/* If type does not correspond, then discard */
>  		if (type == X86_BR_NONE || (br_sel & type) != type) {

Reviewed-by: Sandipan Das <sandipan.das@amd.com>