From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E950F46F48A for ; Wed, 5 Aug 2026 15:02:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785942150; cv=none; b=bOaUUrsxmBoY7u0xj9gTMEubz/Ltye3JAfHePITd3mdmSeEvZmyOodWIW30QkwDNM6jao+HM8kHkc6OLGVu3BjggDOC0VFiIy0V2KSPrOe2sZasnj9xGWutGsFZ85C13KIV2ZMyM5/LZ/DlVi4HtUQ8J9Z+IhqOk28vPG+kch1s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785942150; c=relaxed/simple; bh=YrfVnORDRZngBes7E8aE7nWhzjQkqGopSGj7UdhOOx4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eH/hMqalZDULGSFKaVWLHa0FvbYZUVrOIpWLoUg1Gf7Bz3FL8KP85G1OFdChhsAYZK5NN3PYv0lt6YIgsImTp/RSFyS5akQbNrKw1lHsSbVGM56q0ZaBIsl5w30jiGXXG9rpWIZFjIKXoTI63+Un3il9gKJITbk4+dH22hKke9g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=nYLqGBq8; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nYLqGBq8" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-47fde295992so902863f8f.0 for ; Wed, 05 Aug 2026 08:02:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1785942147; x=1786546947; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Flg4QZQ4xZBxdFqtD7yG7JFgD80sYwr4xDNIvMLPrJw=; b=nYLqGBq8jO6MPTVD+r+waWgle9VThHPonhECbrYXIrQ1DrGmpKNTO1imQoldC46I9o B+pN5tr/+YZODUGGC7N9oXspseYreu5Xhg+BxB+gYsbVCDiu1YK1Fs3JRHO2tQEgw7M9 XVj87r6PE+r80nUaHJFcRYDBsjETDxK9SZrGlJw/ozgmhhChgP4vxhvuYue7l8mg3+fG sgYL5xBsYJvEMS11GbLqqOE7LO7kNHpvnxu+hIqnyCV1ZhtyfkFvOMvAchiV5WrIZ0IQ dJMoJKVOskqGHon1MgzcZGZImzn0ERJJ92BYUKLhl7MqiXLxRv6nGNknJPvgEo9HUagL WqGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785942147; x=1786546947; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Flg4QZQ4xZBxdFqtD7yG7JFgD80sYwr4xDNIvMLPrJw=; b=F/pVryXjUASCIUfbnk1J4AO21LvvT+FrEMPH97dvLjWmq88Svp4vo4/CCWLiBuiXYp NCD//6Z7ce6kUS8XNT/02CoMF6DVnupb2XrkR2ayrgiCfTwCLdnIm3l1SgYuDCL/kueV 8GizLCtuZm2Vw6P/oXiMgyevGoqdkJ741lfct5o78ZXFLbw3inopor9sjUN0sRMQG5DB aEGhtb3zqZSlrDfab+MTHhodItMERSyLtFuNTNO4AzkjiSDKLTdVKtBfeah4UlHiexeT v+jw3VEM3lQ6m1a9L2yQEE67BfA2i/qVJyZYVCcJeyhO0BdNGYjfK5LtgJ93V+BzjAUz Ermw== X-Forwarded-Encrypted: i=1; AHgh+Ro8h6NjEMWQgZ3l6N3q8qG+TUUXxSwuY1LMJePYKsG6P2CymfYooIx27palwpRMbXOGTjBrb9IrAewbp+o=@vger.kernel.org X-Gm-Message-State: AOJu0YzogBqDjRNKcffjbxdll/MHvRZqg2yAK2VU6BV8ut0ltwVIwZER meOIIuByARpuB/2tytseRUFklL3JoT6TJodo+HyMMLDbIj8fmh/b/vvxC0QSOecP+fI= X-Gm-Gg: AR+sD12594e9NQ8+2WaeeWG4wi3zDzKH8PS7+O7W3gxeAbfN5wNMvsAk2fnzpgcNDRN OTsS/eTyoOZmUIY4jWdhOxMwsSqpOxtYvTbcMy7SnjNQ+Fq7g2wfsl5Wgq0OMx3oEuZWO89Yvls BfBHsHkHHpJNFGrnnnA3gL2TTj5PQQPWwLI3EQTYnNsaAtX2VMGzkH0Y+I1gjKWPQShvHywSByZ Kv+z8RcnozhATsT4yg6F/HYiwt60Hl0bgrrYJVoziFsu5P6unjOExGKD99/j+UeXuuXjGHqmrli EjHaVnET3UAFi6AWMR2+m8OKgRUfcPUIkzxEkiXAmDBxxtrvYFQZ2okNYdAbxVMyk7Nma1Yb7Hq jOOpeNPQgSuGe0qllWU3/2dYXDQ50MclNPlPe5WLRF2Conm4z8jET6DnQdqAypslvUbJCTV7RxC lgOTG65tyW4l8U0clfax/aiAd8Vcn+qHx76uRyNpA2GF0ujEPWuEP24D3qnR2roqGT X-Received: by 2002:a5d:64e3:0:b0:47f:f002:3656 with SMTP id ffacd0b85a97d-47ff011797dmr8776881f8f.12.1785942147253; Wed, 05 Aug 2026 08:02:27 -0700 (PDT) Received: from pop-os.local ([37.18.141.193]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fec23ede6sm10308695f8f.30.2026.08.05.08.02.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2026 08:02:26 -0700 (PDT) From: James Clark Date: Wed, 05 Aug 2026 16:01:52 +0100 Subject: [PATCH 2/3] perf: arm_spe: Factor HW discard mode out of arm_spe_perf_aux_output_begin() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260805-james-spe-software-discard-v1-2-0ff0e44c4c92@linaro.org> References: <20260805-james-spe-software-discard-v1-0-0ff0e44c4c92@linaro.org> In-Reply-To: <20260805-james-spe-software-discard-v1-0-0ff0e44c4c92@linaro.org> To: Will Deacon , Mark Rutland , Leo Yan , Suzuki Poulose , Al Grant Cc: linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, James Clark X-Mailer: b4 0.15.2 Discard mode doesn't call perf_aux_output_begin() or emit aux records, and enabling it never fails. We'll add a second discard mode in the next commit so it will be cleaner if there is a separate begin function just for discard mode. No functional changes intended. Signed-off-by: James Clark --- drivers/perf/arm_spe_pmu.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c index 10d28ad81256..562a1d3be39f 100644 --- a/drivers/perf/arm_spe_pmu.c +++ b/drivers/perf/arm_spe_pmu.c @@ -363,6 +363,11 @@ static const struct attribute_group *arm_spe_pmu_attr_groups[] = { NULL, }; +static bool arm_spe_discard_mode(struct perf_event *event) +{ + return ATTR_CFG_GET_FLD(&event->attr, discard); +} + /* Convert between user ABI and register values */ static u64 arm_spe_event_to_pmscr(struct perf_event *event) { @@ -609,18 +614,23 @@ static u64 arm_spe_pmu_next_off(struct perf_output_handle *handle) return limit; } +static void arm_spe_pmu_begin_discard(struct perf_output_handle *handle, + struct perf_event *event) +{ + u64 limit; + + limit = FIELD_PREP(PMBLIMITR_EL1_FM, PMBLIMITR_EL1_FM_DISCARD); + limit |= PMBLIMITR_EL1_E; + + write_sysreg_s(limit, SYS_PMBLIMITR_EL1); +} + static int arm_spe_perf_aux_output_begin(struct perf_output_handle *handle, struct perf_event *event) { u64 base, limit; struct arm_spe_pmu_buf *buf; - if (ATTR_CFG_GET_FLD(&event->attr, discard)) { - limit = FIELD_PREP(PMBLIMITR_EL1_FM, PMBLIMITR_EL1_FM_DISCARD); - limit |= PMBLIMITR_EL1_E; - goto out_write_limit; - } - /* Start a new aux session */ buf = perf_aux_output_begin(handle, event); if (!buf) { @@ -775,6 +785,12 @@ static irqreturn_t arm_spe_pmu_irq_handler(int irq, void *dev) arm_spe_pmu_disable_and_drain_local(); break; case SPE_PMU_BUF_FAULT_ACT_OK: + if (arm_spe_discard_mode(event)) { + arm_spe_pmu_begin_discard(handle, event); + isb(); + break; + } + /* * We handled the fault (the buffer was full), so resume * profiling as long as we didn't detect truncation. @@ -864,7 +880,7 @@ static int arm_spe_pmu_event_init(struct perf_event *event) !(spe_pmu->features & SPE_PMU_FEAT_EFT)) return -EOPNOTSUPP; - if (ATTR_CFG_GET_FLD(&event->attr, discard) && + if (arm_spe_discard_mode(event) && !(spe_pmu->features & SPE_PMU_FEAT_DISCARD)) return -EOPNOTSUPP; @@ -884,7 +900,9 @@ static void arm_spe_pmu_start(struct perf_event *event, int flags) struct perf_output_handle *handle = this_cpu_ptr(spe_pmu->handle); hwc->state = 0; - if (arm_spe_perf_aux_output_begin(handle, event)) { + if (arm_spe_discard_mode(event)) { + arm_spe_pmu_begin_discard(handle, event); + } else if (arm_spe_perf_aux_output_begin(handle, event)) { arm_spe_pmu_stop(event, 0); return; } -- 2.43.0