From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="i4V0nu02" Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF8CBD5B; Tue, 12 Dec 2023 15:03:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702422238; x=1733958238; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lGmUesm6oK9yWEhQ+Jh1h3QfdLQsmdyaf+eqEcUWR4A=; b=i4V0nu02IkVqZVC2ERskwkDQ8LNOn9vCHykSZHcP9/0N7hmSYuXhsLlj N5AwtymhJSGhCw+IE9sUAer/pcNcAQ66raRYyVlpMJCkfr4xcaE6mV5hk YflPcQgN6f51GuWTBtIxd2PRQ66F1t7Wk/lRD6T/+iuuzwR3oAYHyLxxn idpvzSgDCvEpThLB1W/2Mvc7mIztFjgrSnNtsiQr0NuCTjxGUJKA1GNrQ 1Ul/GiV/pYLEo0insqZcGm0FJQpt5AD34/YSXem8CjXm2dHJbi1jXgDeZ 5iyCgPoF3EwTjzGix/S9J6mlV1PpJRGzyr8zh2JXRBOQWW7De/n7+NxIZ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10922"; a="392056024" X-IronPort-AV: E=Sophos;i="6.04,271,1695711600"; d="scan'208";a="392056024" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2023 15:02:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10922"; a="864392031" X-IronPort-AV: E=Sophos;i="6.04,271,1695711600"; d="scan'208";a="864392031" Received: from node-10329.jf.intel.com ([10.54.34.22]) by FMSMGA003.fm.intel.com with ESMTP; 12 Dec 2023 15:02:56 -0800 From: weilin.wang@intel.com To: weilin.wang@intel.com, Ian Rogers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Perry Taylor , Samantha Alt , Caleb Biggers , Mark Rutland , Yang Jihong Subject: [RFC PATCH v3 14/18] perf stat: Handle NMI in hardware-grouping Date: Tue, 12 Dec 2023 15:02:20 -0800 Message-Id: <20231212230224.1473300-16-weilin.wang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231212230224.1473300-1-weilin.wang@intel.com> References: <20231212230224.1473300-1-weilin.wang@intel.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Weilin Wang Add an easy nmi watchdog support in grouping. When nmi watchdog is enabled, we reduce the total num of events could be assigned to one group by 1. A more efficient solution will be added in later. Signed-off-by: Weilin Wang --- tools/perf/util/metricgroup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 78e607f3ad56..4df04d14d602 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1852,6 +1852,10 @@ static int insert_new_group(struct list_head *head, size_t fixed_size) { INIT_LIST_HEAD(&new_group->event_head); + if (sysctl__nmi_watchdog_enabled()) { + pr_debug("NMI watchdog is enabled\n"); + size -= 1; + } fill_counter_bitmap(new_group->gp_counters, 0, size); fill_counter_bitmap(new_group->fixed_counters, 0, fixed_size); new_group->taken_alone = false; -- 2.39.3