From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.69 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795114345; b=3RLdgtAdPsdaxm9Eu99+2sfHqctWx8rB+R/5hsU2ybrBWp7e1tdE+tHWsTl/Usj0T0t7 9wJ+Njb8B/TTsYrxGwYk7UpbvUdO/bYgmDdMhIbf6U18/UDIQQ5kvEyz7Jme17lb/nnUq Fi+oI1HtVCPgz7Em+KhzQZW4oP9WyRXjFhAENC40xx00DzGchOmpMSDKMVNIxg8wOOs9r efFfyDUxCKutIJgQoASgJxmb5S4QyKcg+NAA5JFP+sI0km3deudKQ8qTwbPKRELsPCkcl NGTClWpXQKqNn0mxe/pzuab/ZR/ohVJs7rKmRk5FR5CYHKx7qI0PMzDKqdEglIKB4ng== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795114345; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=gDyW3lpBDMB0NqyM7GSJ8o96cb3fLFzZmtMS+6iJK0k=; b=KKuyFFvDAdQdopBXC29DAhunkXeEWZHTmyHAtypo0/B15UhOYlZxxU4UmCK7esAu5fpr q/f0y80y96lToa8/uMfVIpkcqZa9y9IZU1JodinGyXXL6ieYdfCBqwuiBjtSFaGHAucwK 0k8GTh5IVsKpKhvbaBciePf8uPLQilLF8Yy/rEpyNmTwz9C/NZn74RObN1wVUJkS2LqpH uL0qq+cNeyoGIyP3EFgaLdwV4rwrK/+7TraMaTDfAZ/gAtFQHLpYakVp/vyvUdAgfqMwT idJhgEx8jGGRT9HudIjbz94nMABE6W9ua6TKFJaTEfRY7P6FOwiI8ubpo9NIItBPN6g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=mYp484Dp; arc=none smtp.remote-ip=209.85.210.69 Received: from mail-ot1-f69.google.com (mail-ot1-f69.google.com [209.85.210.69]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFE6F60A6F63 for ; Thu, 19 Nov 2026 18:52:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org EFE6F60A6F63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=mYp484Dp Received: by mail-ot1-f69.google.com with SMTP id 46e09a7af769-86303784a96so88498a34.1 for ; Thu, 19 Nov 2026 10:52:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795114344; x=1795719144; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=gDyW3lpBDMB0NqyM7GSJ8o96cb3fLFzZmtMS+6iJK0k=; b=mYp484DpEeY/oHUMCOm9sqI0dW4VUQHG54G3nL6EO4NCkXEhChV94ldh9u6cCjxQRP Z2vtxQTgQfTSpUuPJOhDom2cN6v15ZfxEkSyujt4mZfM2xGJxwgj5ntKhOdaacfIMe5R BlCk4dgrSWqiGjS9mMRUwlAeEeup9ZKxqUMRRbM49mRrAuRTQvt9M3NHCoUUQP7OnUn+ LOm9m2vnhuym2iWgvQXNYJ3xz/JOktcOSyBhXUE/sWr8Qi5NlbiKgufyd6Z7lAKASRWo SGyyVSug9La6Vt5wXN6UdHPDrJNFrQcaVs2JDNFjr6KzFdb8wJgvxNU29wTfnojXE3u0 OXTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795114344; x=1795719144; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=gDyW3lpBDMB0NqyM7GSJ8o96cb3fLFzZmtMS+6iJK0k=; b=KfZL+axZQmLY7JijB9MQlBDFEneebheHeVBSbFhANPePSk1dxHZvfJSXgz9u+9n4ZA uyvrB1TJjkfCKkX5uvzCzzCo2ulevMiX+gKpkmM12/SZVGc9DY+xypMo8gqJ/W4Y70o7 +Agh4ad1FHEjt6DTYUrPr5F3e3h1tO2Fw3vJSrCPP8LSQnVHUN4rU4QUfadZCRYP76xB 24mJXWVSD9iLk8B2Is+r/68MsvHDWP6lKPotbIKAU7p54ykdk9ZRGUmHYxcVVwov+4+a ORbRFC4oDR9Ln3xnE5v/ofvvbHeKxSkePTJXxeQ1wEHz5RPcfGox/bXFid6b59hT68e+ 9A5Q== X-Forwarded-Encrypted: i=1; AL+hErE9DYwF3KWqXzl2LsqXRlqgvRTXn4uX6Z3VZvDY7XFpCtleXBeTLw44GeCEpEs9QH589873KABZbv4IPVk=@vger.kernel.org X-Gm-Message-State: APuU4Z9BDcuDw/LXTKZdEoeE6dFKpvmp08aLfklh1lEq/z4GGbeAL+hJ rtlywcU0zDPguWLa/LrjxyM4pZSWLhQTSVdJAqX1IZ7MVLL2mc1sBxsOG/YVgzWH9iSoCVyF1se afUd5KDofmH9ZfqqSIOzRv5toHQ== X-Received: from ilef19-n1.prod.google.com ([2002:a05:6e02:6193:10b0:51f:7667:1233]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:3189:b0:4ea:18f:64b0 with SMTP id 5614622812f47-57a0c19af8amr826925b6e.67.1795114343396; Thu, 19 Nov 2026 10:52:23 -0800 (PST) Date: Thu, 19 Nov 2026 18:51:50 +0000 In-Reply-To: <20261119185215.632334-1-coltonlewis@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261119185215.632334-1-coltonlewis@google.com> X-Mailer: git-send-email 2.56.1.809.ga0b61035b5-goog Message-ID: <20261119185215.632334-9-coltonlewis@google.com> Subject: [PATCH v10 08/33] perf: arm_pmuv3: Check cntr_mask before using pmccntr From: Colton Lewis To: Marc Zyngier , Oliver Upton Cc: Catalin Marinas , Will Deacon , Mark Rutland , Peter Zijlstra , Ingo Molnar , Paolo Bonzini , Russell King , Jonathan Corbet , Fuad Tabba , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Shuah Khan , James Clark , Alexandru Elisei , Mingwei Zhang , Ganapatrao Kulkarni , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" When the PMU is partitioned, PMCCNTR_EL0 is reserved for the guest and removed from cpuc->cntr_mask. Move the PMCCNTR_EL0 availability checks (cpuc->cntr_mask and cpuc->used_mask) into armv8pmu_can_use_pmccntr() and un-nest the 64-bit user-access fallback check in armv8pmu_get_event_idx() so host CPU_CYCLES events fall back to general-purpose event counters when PMCCNTR_EL0 is unavailable. Tested-by: James Clark Signed-off-by: Colton Lewis --- drivers/perf/arm_pmuv3.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/perf/arm_pmuv3.c b/drivers/perf/arm_pmuv3.c index 973d4abcb3a6e..9ce915754b0a5 100644 --- a/drivers/perf/arm_pmuv3.c +++ b/drivers/perf/arm_pmuv3.c @@ -1013,6 +1013,10 @@ static bool armv8pmu_can_use_pmccntr(struct pmu_hw_events *cpuc, if (cpu_pmu->avoid_pmccntr) return false; + if (!test_bit(ARMV8_PMU_CYCLE_IDX, cpuc->cntr_mask) || + test_bit(ARMV8_PMU_CYCLE_IDX, cpuc->used_mask)) + return false; + return true; } @@ -1025,14 +1029,15 @@ static int armv8pmu_get_event_idx(struct pmu_hw_events *cpuc, /* Always prefer to place a cycle counter into the cycle counter. */ if (armv8pmu_can_use_pmccntr(cpuc, event)) { - if (!test_and_set_bit(ARMV8_PMU_CYCLE_IDX, cpuc->used_mask)) - return ARMV8_PMU_CYCLE_IDX; - else if (armv8pmu_event_is_64bit(event) && - armv8pmu_event_want_user_access(event) && - !armv8pmu_has_long_event(cpu_pmu)) - return -EAGAIN; + set_bit(ARMV8_PMU_CYCLE_IDX, cpuc->used_mask); + return ARMV8_PMU_CYCLE_IDX; } + if (armv8pmu_event_is_64bit(event) && + armv8pmu_event_want_user_access(event) && + !armv8pmu_has_long_event(cpu_pmu)) + return -EAGAIN; + /* * Always prefer to place a instruction counter into the instruction counter, * but don't expose the instruction counter to userspace access as userspace -- 2.56.1.708.g77570a6a1d-goog