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=-8.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=unavailable 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 2F81DC43613 for ; Thu, 20 Jun 2019 18:31:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BE3220665 for ; Thu, 20 Jun 2019 18:31:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561055487; bh=dbapNoTXx8QGVGPfMYQkU6PrijipkxRNTYwkr3ttbAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JeVep3WDq43SN9AXVdyI9ilXUR/Kvb89WtWKC2SS93Utmq6mfk8Cd1wRN/FlD6ag2 YlPj7L1LCItJp2BRDAzpg7bAnV58CTA/UeUa/gysZskxSG2fn486LZINNJ0CfR5tEP r/FeUEscaaGl21HaDzbWObX6vEJGmR3dOoZwBmDM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725864AbfFTR7p (ORCPT ); Thu, 20 Jun 2019 13:59:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:47504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726673AbfFTR7l (ORCPT ); Thu, 20 Jun 2019 13:59:41 -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 1CD2B2083B; Thu, 20 Jun 2019 17:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561053580; bh=dbapNoTXx8QGVGPfMYQkU6PrijipkxRNTYwkr3ttbAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0UIRTDrzFmRbuO6U1vyBTlBR2vUpNnF6B6+JfDmxlB7OTToe6kOr4DQzJd+5QfH79 AERjQy51csCshRfY99bqhxV7sbJxuLN1p7onrn1vWGW+L6i/KqjyB2E6nORbiUxpRu 4PyDVX8/yAMD7eHVCm4ub3IOYlTy3sBW0fdrhJA8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephane Eranian , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , jolsa@redhat.com, kan.liang@intel.com, vincent.weaver@maine.edu, Ingo Molnar , Sasha Levin Subject: [PATCH 4.4 10/84] perf/x86/intel: Allow PEBS multi-entry in watermark mode Date: Thu, 20 Jun 2019 19:56:07 +0200 Message-Id: <20190620174339.136089234@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190620174337.538228162@linuxfoundation.org> References: <20190620174337.538228162@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 [ Upstream commit c7a286577d7592720c2f179aadfb325a1ff48c95 ] This patch fixes a restriction/bug introduced by: 583feb08e7f7 ("perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS") The original patch prevented using multi-entry PEBS when wakeup_events != 0. However given that wakeup_events is part of a union with wakeup_watermark, it means that in watermark mode, PEBS multi-entry is also disabled which is not the intent. This patch fixes this by checking is watermark mode is enabled. Signed-off-by: Stephane Eranian Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: jolsa@redhat.com Cc: kan.liang@intel.com Cc: vincent.weaver@maine.edu Fixes: 583feb08e7f7 ("perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS") Link: http://lkml.kernel.org/r/20190514003400.224340-1-eranian@google.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/perf_event_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index 325ed90511cf..3572434a73cb 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c @@ -2513,7 +2513,7 @@ static int intel_pmu_hw_config(struct perf_event *event) return ret; if (event->attr.precise_ip) { - if (!(event->attr.freq || event->attr.wakeup_events)) { + if (!(event->attr.freq || (event->attr.wakeup_events && !event->attr.watermark))) { event->hw.flags |= PERF_X86_EVENT_AUTO_RELOAD; if (!(event->attr.sample_type & ~intel_pmu_free_running_flags(event))) -- 2.20.1