From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 6371D3CF05D for ; Wed, 7 Oct 2026 10:52:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791370398; cv=none; b=tR3v8ahXV2DmzkPmQJ9cp3MCjXLZmOCZbxLTtt3rMue56Ok97cRN4SKdADMLRpqVY/MtvAv8a/avsCVIh3q86m/Y5boupKduQdqaEimPE6QbHFj9PpXJeazcfPh7EQnYzZH1RzUYXKQW3k5ZK1h8JtNoK8wyH7zvEkApmE9Brwg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791370398; c=relaxed/simple; bh=S2uUX2Fk8n+vP/qgMl3qIzP8JEsoknNWZdUieCr5bPk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I/QmMGWm0DBzgXgRiZsjpBAILw3GYlFHt/hkBHNb1wPjWe+KdEAWIRfqKZcGoQs1zX0KmOXFRRlDSZD6vZ0eRxOEFwroFo7BSctUUb/jalrzbUOn3QzA8Z6aoqPqoFIN1i6cl5zd8Vx5Ijdo/eWY/wlCjNHq0vQLbScmOjYAFE0= 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=YeMxNrvs; arc=none smtp.client-ip=209.85.221.46 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="YeMxNrvs" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-48afcfc4bf5so3254590f8f.1 for ; Wed, 07 Oct 2026 03:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1791370365; x=1791975165; 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=NRTKpE752UBxEVvsukPxz0g+FDjlA3TSMkGVEa1/WS8=; b=YeMxNrvsXIbz/EQEMrM/nybThVdsvgOf1veUzIsXYapu6R9ZQBxUjbpcMgG8i9Vlvg Lgt4jcgka59fJld5DQbWku3L2aBTyzb2PjiidqOu/wtjQQb6wCBrMd5iiIXXhxPl1HDd 0MCODKQz6KqJQW6+7HRaot7XVnpAgSYzkBrZOPnALmaFzRFd/E81dKpnw+QviJ4PpRIT L6EDXJagdnoTxP7Gi5Y1ZTs6wqx/IduWQw4g5WiM3Rk8J8s/j9BQOnlOr85qCDHxdHX/ SwcvutFiGmvrR+nWZJz2GvkWPcJkJE1T9z79srwNzzkNHy74zqVkA/gwD24JtkZvc2AS yaXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791370365; x=1791975165; 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=NRTKpE752UBxEVvsukPxz0g+FDjlA3TSMkGVEa1/WS8=; b=xOXuaa/gUI02LqwWr2aBHu6IEuG4U9bAwY9lUbjaJjCQcWjZ55aqIAWhWXH/SvLgz3 ZAU4Wb8yI7yHPjyKv6WtZ4DunzZYD4ujU4g1pX10SFilr+GVeG6m29JNjk5PtUF4eDva 2tgEWJ0Exzp4lT8jVSviphkSPU6JBHwddQBG6Bq8SU7UTWCHo9d0cUIWd5WtKJeWogsF 5HDzQl5hh8IDEVfK65N0TELWIcBBYBEBY0lwrlzzuPCaMLrpirnA55vObHc4Y7OfgQt4 J34HKVM+Q1vrjK0xKeLSYCCbRNqWUcxcDwpT7HltKTMQhqIjaosduJudiW/uWQMG0VLF HXqg== X-Forwarded-Encrypted: i=1; AKwUvBwHC9i6Geq7l7eXjLvxqXB9/+I5CBcEb/tZe59zUBw7caMOvddG8xcyG/monzaXJ2lyJh8T7JbpDS9uhFbTj0I7@vger.kernel.org X-Gm-Message-State: AFq9FYJV7fEkXJ6z6iJg+wVddYC0jvKoiNnwG5zSrQ3WrG2H9TwkWpQh lmfOco5E7Gi7pJvpvaLPgEGnuwaMC/44s7SFIQTwEeDbxbBmYt/UIhLd7WrKm/wKwbo= X-Gm-Gg: AYBFou1NWpaRSzuOGIowK9NgU/MMTyMMEfgLmOND54kqlqyHsqi+R0hW96R/41MxxDY PJqO29KKET3KDkqADYjtqOBdoGZFpAGAkrRm0fytJ91xxs+Xpe+48QA+7wT/pFBWtCJsQUuPb7z CW8410eUjHhEL9soXfuvNTncUTIoF2OefvOj7LFoRQ4bHxS4IZz/djastDLFKP/O3OnbgCJQ9Lz FrjEQbbKAVUeIF0XhbtsHGsGaQ+dOXXCLIf4RA9FcQxunkKVeQV12atda/vSK39QH113ZCG7KFl E6Ij3IEPzWeBAnlIPmIeht+jNcVxw5LnSuNoazb7wueHYh7thR/Gbh/FF5ThNVZFpZkRrYGyHtb xX/x8/IsugwGLr8DugUTETrkPbXkXdWeeZpS2TdUf9PwOvJOvelR6MnvM495EbNgpC5BxHY9TyS hSIR6q5gwyDY94MiA8BnHfHTcLAxXL39pNYLJP+YBuO6UJrkSNLQI1PiJX1l64HC4lup6eKbMac tg/6Ku2KT1O X-Received: by 2002:a05:6000:46d6:b0:488:83b1:16a1 with SMTP id ffacd0b85a97d-48c727288b1mr2055193f8f.7.1791370365226; Wed, 07 Oct 2026 03:52:45 -0700 (PDT) Received: from pop-os.local ([37.18.141.193]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48c71d31767sm5182781f8f.51.2026.10.07.03.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2026 03:52:44 -0700 (PDT) From: James Clark Date: Wed, 07 Oct 2026 11:52:12 +0100 Subject: [PATCH v6 1/2] perf tests: mmap-basic: Only test userspace reading on supported platforms Precedence: bulk X-Mailing-List: linux-perf-users@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: <20261007-rdpmc-detection-logic-v6-1-d7ed6a85f864@linaro.org> References: <20261007-rdpmc-detection-logic-v6-0-d7ed6a85f864@linaro.org> In-Reply-To: <20261007-rdpmc-detection-logic-v6-0-d7ed6a85f864@linaro.org> To: Ian Rogers , Michael Petlan , Qiao Zhao , Arnaldo Carvalho de Melo , Namhyung Kim Cc: Leo Yan , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, James Clark X-Mailer: b4 0.15.2 mmap_user_read_instr() and mmap_user_read_instr_disabled() are the same test for platforms that libperf doesn't support userspace counter reading for. Only run the 'enabled' test for platforms that do support it in order to simplify it in the next commit and not run the same test twice. The test can then assert stronger guarantees and have fewer edge cases to handle as we know it only runs in places where 'rdmpc_supported' will be true. "unsupported" hasn't been a relevant skip reason since commit 588d22b40480 ("perf test: Expand user space event reading (rdpmc) tests") added the UNKNOWN fallback for unsupported platforms. Remove it and leave only "permissions". Signed-off-by: James Clark --- tools/perf/tests/mmap-basic.c | 51 ++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c index 5cec7644952c..208cd889f23d 100644 --- a/tools/perf/tests/mmap-basic.c +++ b/tools/perf/tests/mmap-basic.c @@ -378,13 +378,13 @@ static int test_stat_user_read(u64 event, enum user_read_state enabled) return ret; } -static int test__mmap_user_read_instr(struct test_suite *test __maybe_unused, +static int __maybe_unused test__mmap_user_read_instr(struct test_suite *test __maybe_unused, int subtest __maybe_unused) { return test_stat_user_read(PERF_COUNT_HW_INSTRUCTIONS, USER_READ_ENABLED); } -static int test__mmap_user_read_cycles(struct test_suite *test __maybe_unused, +static int __maybe_unused test__mmap_user_read_cycles(struct test_suite *test __maybe_unused, int subtest __maybe_unused) { return test_stat_user_read(PERF_COUNT_HW_CPU_CYCLES, USER_READ_ENABLED); @@ -406,42 +406,29 @@ static struct test_case tests__basic_mmap[] = { TEST_CASE_REASON("Read samples using the mmap interface", basic_mmap, "permissions"), - TEST_CASE_REASON_EXCLUSIVE("User space counter reading of instructions", - mmap_user_read_instr, + #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ (defined(__riscv) && __riscv_xlen == 64) - "permissions" -#else - "unsupported" -#endif - ), + /* + * libperf only supports userspace read for these platforms, see + * tools/lib/perf/mmap.c + */ + TEST_CASE_REASON_EXCLUSIVE("User space counter reading of instructions", + mmap_user_read_instr, + "permissions"), TEST_CASE_REASON_EXCLUSIVE("User space counter reading of cycles", - mmap_user_read_cycles, -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ - (defined(__riscv) && __riscv_xlen == 64) - "permissions" -#else - "unsupported" + mmap_user_read_cycles, + "permissions"), #endif - ), + + /* Counter read via userpage fallback is supported on all platforms */ TEST_CASE_REASON_EXCLUSIVE("User space counter disabling instructions", - mmap_user_read_instr_disabled, -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ - (defined(__riscv) && __riscv_xlen == 64) - "permissions" -#else - "unsupported" -#endif - ), + mmap_user_read_instr_disabled, + "permissions"), TEST_CASE_REASON_EXCLUSIVE("User space counter disabling cycles", - mmap_user_read_cycles_disabled, -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ - (defined(__riscv) && __riscv_xlen == 64) - "permissions" -#else - "unsupported" -#endif - ), + mmap_user_read_cycles_disabled, + "permissions"), + { .name = NULL, } }; -- 2.43.0