From patchwork Thu Feb 8 11:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 198319 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp99622dyd; Thu, 8 Feb 2024 03:32:41 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVnFPYDIkd95A/42+Q7bLaxQYMwnrz07M4vn239etwvC2PeUtsp7CWNeXnUAB0gOVDh6vY4aOuee4cm2w/3cT43H2zxFA== X-Google-Smtp-Source: AGHT+IGkukuMXOMSWy9E2f3nIIFtLCuGWmhPGmv+g5ncCAnG/xyokaXtXEQwVK5TDQfZ2XRY4xqz X-Received: by 2002:ac8:5712:0:b0:42c:3cf5:bb3 with SMTP id 18-20020ac85712000000b0042c3cf50bb3mr7027596qtw.50.1707391961573; Thu, 08 Feb 2024 03:32:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707391961; cv=pass; d=google.com; s=arc-20160816; b=Q2+PfyeCr/Cmd1sa51VvQ+vNqZkpeb9U6OUYftTwRT1OOWBspZ3sG7ofxuKooOhBV2 a3/d45DUXJ0ve4Y2KY7aq8iRCuE5eKq37/6+D5N99ImI8pB6QR04oZhDWMPb8SIqlVil tydWIQYYKndO087O/7jf7EhFZ9KFei7uQHou9PlMa/fLVtrIo4p9jt0RPzKCK1aCmj3p 0IKZW9jvVMOT3Cbe3rpbO3qk6dPMB7jqrE7WLo/PCccUq0Hv23+8AKDpEqnVDsW67pbD SFMsRC+oMkghmY2x610GnrJ9DJfg6oylbsbwTmRFjBxF8srRSl6uXOj7nH9cq2fSRV7w 5XVQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:organization:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=ZAoJh1j0Di4wYSFbYTDDnq6BgTH3rz9aDeDz64xNdmw=; fh=5ZIEUNHPYls9wQMtD8/u5c8Szvu8eN7vHJ/I/9hrVcU=; b=Co+YSeptu7lv+Cv2bt9WrRCQpspqbuNAPBJz00MlFIRsgT2mv5Eh7s2eCb0jjPRFsq rcwCSmI2pT41gkz3tfKY8481+BdDkER0/wkDe3wZjI2EvgcMiDPRzS7eZmVvrqAwKyYJ YFHVdKABUMqZqr6JWZ1/An/VNwz/TGIfdQi8go8Pa3sRIvuChXbhtqrBNu1MMRyZA/C3 Jl2rmVLQubA3TG5a87Mgeutq9Tzlk813FqjlpccZIgW+CHY3Nf3heeInlnGTNFEXxWHd DGcxpe/vPuvUe8vqYaKuTJM+znttjbk7POp2rMggFzZCPOXgu/VJvy1Fc+dWFV6pekBc ywDw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ihNFAZ8u; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-57961-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-57961-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=2; AJvYcCWgGFWEhSsG0/kjfLAepmNR/AeyuB9+YR4d1UI7IN8ajK2CNRFvYhVUluJoYAnUPyyxG7g62nyi9/ynmCuQXe/IKP8/FQ== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id o13-20020a05622a044d00b0042c0c755099si2941790qtx.243.2024.02.08.03.32.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 03:32:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-57961-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ihNFAZ8u; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-57961-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-57961-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 4D05E1C212A7 for ; Thu, 8 Feb 2024 11:32:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B3ABE71B33; Thu, 8 Feb 2024 11:32:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ihNFAZ8u" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A30F6F532; Thu, 8 Feb 2024 11:31:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707391918; cv=none; b=S385zmfrbhBRA6b+DpsTkjHfS92280XShXBdLODWP61gsTtsHqAg6vZ0xa+7sW9B+37kDKOqYi32EtauBziAxsFbOqaWWbub+97ftQ4ZfMPa/PzKT8h1YXKfIE1wMxnEvzbAxzn/9E2WRNfD62Q8a2zKLWNCNIQ9AcDIDF7fug8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707391918; c=relaxed/simple; bh=dfTBIiFpANJlz5aBagh7IAvClVgFJ19Fw8e6sothvfM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TPyc9J7TvV4r0uQ9KMM20WcPLFpZxl/nlJGyEd+uf5J7Od8s1999Co2hnnyDCnrSihgAkaUVUh9iV+hcVnq+ewwK4a++Mu9cuPlRh8H3j3s/uVb2zOUCNAlviqu7I7B3ASCW53t10D2H7rYeYIWjHJXqoLgBdLBv0tdondnnG8E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ihNFAZ8u; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707391917; x=1738927917; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dfTBIiFpANJlz5aBagh7IAvClVgFJ19Fw8e6sothvfM=; b=ihNFAZ8uMJv+JUJrwgkq4PV0WW4bMn4npY4loQ+lc6M21vpgdSk13SyD ns2Cc4BpvuTazfKep/tR5wYimU6C+qc/nRXKATSQaRU07FmnJ/2r2QtPG ValUcCEAo4uLdNUNVsah3gQgTDHUixYHB8CZxv9L5NyZ5lcCBPF2Pgdhw 66ERWwLTDryWanqmbjRj5jN1PLOX8hQfjC5fedBbvohZ1LV2UNKX80waV TzvhPSzAwkwm58fdju0jniYcwgSd8YEOHDwa41jiAAAe5GDs/9AuFTmYO 7pat5a0YPG7x7XQFm7ordpv8xlvVZ6yeamyQEwbu/aWB6yZOiWXJlYTxK A==; X-IronPort-AV: E=McAfee;i="6600,9927,10977"; a="1345467" X-IronPort-AV: E=Sophos;i="6.05,253,1701158400"; d="scan'208";a="1345467" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2024 03:31:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,253,1701158400"; d="scan'208";a="1957440" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.251.219.88]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2024 03:31:50 -0800 From: Adrian Hunter To: Peter Zijlstra Cc: Ingo Molnar , Mark Rutland , Alexander Shishkin , Heiko Carstens , Thomas Richter , Hendrik Brueckner , Suzuki K Poulose , Mike Leach , James Clark , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, Yicong Yang , Jonathan Cameron , Will Deacon , Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH V5 02/12] perf/x86/intel/pt: Add support for pause / resume Date: Thu, 8 Feb 2024 13:31:17 +0200 Message-Id: <20240208113127.22216-3-adrian.hunter@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240208113127.22216-1-adrian.hunter@intel.com> References: <20240208113127.22216-1-adrian.hunter@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790330233167565512 X-GMAIL-MSGID: 1790330233167565512 Prevent tracing to start if aux_paused. Implement support for PERF_EF_PAUSE / PERF_EF_RESUME. When aux_paused, stop tracing. When not aux_paused, only start tracing if it isn't currently meant to be stopped. Signed-off-by: Adrian Hunter --- arch/x86/events/intel/pt.c | 63 ++++++++++++++++++++++++++++++++++++-- arch/x86/events/intel/pt.h | 4 +++ 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c index 8e2a12235e62..b6e838f2c6d5 100644 --- a/arch/x86/events/intel/pt.c +++ b/arch/x86/events/intel/pt.c @@ -418,6 +418,9 @@ static void pt_config_start(struct perf_event *event) struct pt *pt = this_cpu_ptr(&pt_ctx); u64 ctl = event->hw.config; + if (READ_ONCE(event->aux_paused)) + return; + ctl |= RTIT_CTL_TRACEEN; if (READ_ONCE(pt->vmx_on)) perf_aux_output_flag(&pt->handle, PERF_AUX_FLAG_PARTIAL); @@ -534,7 +537,20 @@ static void pt_config(struct perf_event *event) reg |= (event->attr.config & PT_CONFIG_MASK); event->hw.config = reg; + + /* + * Allow resume before starting so as not to overwrite a value set by a + * PMI. + */ + WRITE_ONCE(pt->resume_allowed, 1); + pt_config_start(event); + + /* + * Allow pause after starting so its pt_config_stop() doesn't race with + * pt_config_start(). + */ + WRITE_ONCE(pt->pause_allowed, 1); } static void pt_config_stop(struct perf_event *event) @@ -1511,6 +1527,7 @@ void intel_pt_interrupt(void) buf = perf_aux_output_begin(&pt->handle, event); if (!buf) { event->hw.state = PERF_HES_STOPPED; + pt->resume_allowed = 0; return; } @@ -1519,6 +1536,7 @@ void intel_pt_interrupt(void) ret = pt_buffer_reset_markers(buf, &pt->handle); if (ret) { perf_aux_output_end(&pt->handle, 0); + pt->resume_allowed = 0; return; } @@ -1573,6 +1591,26 @@ static void pt_event_start(struct perf_event *event, int mode) struct pt *pt = this_cpu_ptr(&pt_ctx); struct pt_buffer *buf; + if (mode & PERF_EF_RESUME) { + if (READ_ONCE(pt->resume_allowed)) { + u64 status; + + /* + * Only if the trace is not active and the error and + * stopped bits are clear, is it safe to start, but a + * PMI might have just cleared these, so resume_allowed + * must be checked again also. + */ + rdmsrl(MSR_IA32_RTIT_STATUS, status); + if (!(status & (RTIT_STATUS_TRIGGEREN | + RTIT_STATUS_ERROR | + RTIT_STATUS_STOPPED)) && + READ_ONCE(pt->resume_allowed)) + pt_config_start(event); + } + return; + } + buf = perf_aux_output_begin(&pt->handle, event); if (!buf) goto fail_stop; @@ -1601,6 +1639,16 @@ static void pt_event_stop(struct perf_event *event, int mode) { struct pt *pt = this_cpu_ptr(&pt_ctx); + if (mode & PERF_EF_PAUSE) { + if (READ_ONCE(pt->pause_allowed)) + pt_config_stop(event); + return; + } + + /* Protect against racing */ + WRITE_ONCE(pt->pause_allowed, 0); + WRITE_ONCE(pt->resume_allowed, 0); + /* * Protect against the PMI racing with disabling wrmsr, * see comment in intel_pt_interrupt(). @@ -1659,8 +1707,12 @@ static long pt_event_snapshot_aux(struct perf_event *event, /* * Here, handle_nmi tells us if the tracing is on */ - if (READ_ONCE(pt->handle_nmi)) + if (READ_ONCE(pt->handle_nmi)) { + /* Protect against racing */ + WRITE_ONCE(pt->pause_allowed, 0); + WRITE_ONCE(pt->resume_allowed, 0); pt_config_stop(event); + } pt_read_offset(buf); pt_update_head(pt); @@ -1677,8 +1729,11 @@ static long pt_event_snapshot_aux(struct perf_event *event, * Compiler barrier not needed as we couldn't have been * preempted by anything that touches pt->handle_nmi. */ - if (pt->handle_nmi) + if (pt->handle_nmi) { + WRITE_ONCE(pt->resume_allowed, 1); pt_config_start(event); + WRITE_ONCE(pt->pause_allowed, 1); + } return ret; } @@ -1794,7 +1849,9 @@ static __init int pt_init(void) if (!intel_pt_validate_hw_cap(PT_CAP_topa_multiple_entries)) pt_pmu.pmu.capabilities = PERF_PMU_CAP_AUX_NO_SG; - pt_pmu.pmu.capabilities |= PERF_PMU_CAP_EXCLUSIVE | PERF_PMU_CAP_ITRACE; + pt_pmu.pmu.capabilities |= PERF_PMU_CAP_EXCLUSIVE | + PERF_PMU_CAP_ITRACE | + PERF_PMU_CAP_AUX_PAUSE; pt_pmu.pmu.attr_groups = pt_attr_groups; pt_pmu.pmu.task_ctx_nr = perf_sw_context; pt_pmu.pmu.event_init = pt_event_init; diff --git a/arch/x86/events/intel/pt.h b/arch/x86/events/intel/pt.h index 96906a62aacd..b9527205e028 100644 --- a/arch/x86/events/intel/pt.h +++ b/arch/x86/events/intel/pt.h @@ -117,6 +117,8 @@ struct pt_filters { * @filters: last configured filters * @handle_nmi: do handle PT PMI on this cpu, there's an active event * @vmx_on: 1 if VMX is ON on this cpu + * @pause_allowed: PERF_EF_PAUSE is allowed to stop tracing + * @resume_allowed: PERF_EF_RESUME is allowed to start tracing * @output_base: cached RTIT_OUTPUT_BASE MSR value * @output_mask: cached RTIT_OUTPUT_MASK MSR value */ @@ -125,6 +127,8 @@ struct pt { struct pt_filters filters; int handle_nmi; int vmx_on; + int pause_allowed; + int resume_allowed; u64 output_base; u64 output_mask; };