From nobody Sun Feb 8 20:29:24 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 8C7F624679F; Mon, 12 Jan 2026 05:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768195238; cv=none; b=QMqq8ybunBWDHibyLH/dZU1iarnl5vShJFq5ET0oc0KStEKfI1TXq0gLFOb8w6OtOYi0jySBeT9x/c8u+/mze/wNwiZVUkCLhPoQ3MN8t/48u6WW7JPP2iw27OtnFoFFBfxjOomVxRUXI/3yN1/XvUOXSmfaeKLgnI0TWjN4H7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768195238; c=relaxed/simple; bh=8swUns+f4sPnKRPagD2A6Oy6QNSylTblYdaomHLa5sw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=T1LPIQDzvSFPgxZPsVYaBhRGd30jCzyghBWcEGu61kk7DrWCZwFrqicnQsT+WT8dr+Ih8yL+979yQkmuEeUgcYFRq6Z7AkZC4scuws3L/d7SkxYZTYRnFm9l2cBk6xwfOS4dKxKJJJp1oC+pNjNECmcsZqqhYEvsr8Yyu0zCq6g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=c/HH2L2Y; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="c/HH2L2Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1768195238; x=1799731238; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8swUns+f4sPnKRPagD2A6Oy6QNSylTblYdaomHLa5sw=; b=c/HH2L2Y2H/pWse4BszJ6MPmQXwhCiW9RWFqM52EqEwFO3OSU5VDDrvH +m0GUH6H8TTPnmPx320tGtzJa84cB4+O/Tlp1EDdmvMoSz3+Gh/Gnubuz LGPGqszKkGasE0n1uCu8zs04cWQYeWHQZa4b7w/k5VLTcH/wIS45vCL3i DeJBlNnth9CVXiFjgz1cTs+PmfpQ+n4lR7GS4V6yrsNIUTmYZGeJSBVUB +V9swiR1PtLA4RiWaprLvOn+ozPusQmvZvlOBl8tYO3N38oimKnZ3CMDm ULROi0mEAZ0K7ZNHGAP9XwB1v0IVAczM5WagjZX2OLMMi64PAR09Z6YUb A==; X-CSE-ConnectionGUID: DZMkD0aQTwi0BIe6RfTD7w== X-CSE-MsgGUID: jxRWZgYXSmKHB12aODWrmw== X-IronPort-AV: E=McAfee;i="6800,10657,11668"; a="68673246" X-IronPort-AV: E=Sophos;i="6.21,219,1763452800"; d="scan'208";a="68673246" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2026 21:20:35 -0800 X-CSE-ConnectionGUID: J4SI0Cr8SuKZvPNoMB6PNw== X-CSE-MsgGUID: tV7Wyz8KSNOrm8PFC5Ra4A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,219,1763452800"; d="scan'208";a="235233470" Received: from spr.sh.intel.com ([10.112.229.196]) by fmviesa001.fm.intel.com with ESMTP; 11 Jan 2026 21:20:31 -0800 From: Dapeng Mi To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers , Adrian Hunter , Alexander Shishkin , Andi Kleen , Eranian Stephane Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Dapeng Mi , Zide Chen , Falcon Thomas , Xudong Hao , Dapeng Mi Subject: [Patch v2 6/7] perf/x86: Use macros to replace magic numbers in attr_rdpmc Date: Mon, 12 Jan 2026 13:16:48 +0800 Message-Id: <20260112051649.1113435-7-dapeng1.mi@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260112051649.1113435-1-dapeng1.mi@linux.intel.com> References: <20260112051649.1113435-1-dapeng1.mi@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace magic numbers in attr_rdpmc with macros to improve readability and make their meanings clearer for users. Signed-off-by: Dapeng Mi --- arch/x86/events/core.c | 7 ++++--- arch/x86/events/intel/p6.c | 2 +- arch/x86/events/perf_event.h | 7 +++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 0ecac9495d74..c2717cb5034f 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2163,7 +2163,8 @@ static int __init init_hw_perf_events(void) =20 pr_cont("%s PMU driver.\n", x86_pmu.name); =20 - x86_pmu.attr_rdpmc =3D 1; /* enable userspace RDPMC usage by default */ + /* enable userspace RDPMC usage by default */ + x86_pmu.attr_rdpmc =3D X86_USER_RDPMC_CONDITIONAL_ENABLE; =20 for (quirk =3D x86_pmu.quirks; quirk; quirk =3D quirk->next) quirk->func(); @@ -2643,12 +2644,12 @@ static ssize_t set_attr_rdpmc(struct device *cdev, */ if (val =3D=3D 0) static_branch_inc(&rdpmc_never_available_key); - else if (x86_pmu.attr_rdpmc =3D=3D 0) + else if (x86_pmu.attr_rdpmc =3D=3D X86_USER_RDPMC_NEVER_ENABLE) static_branch_dec(&rdpmc_never_available_key); =20 if (val =3D=3D 2) static_branch_inc(&rdpmc_always_available_key); - else if (x86_pmu.attr_rdpmc =3D=3D 2) + else if (x86_pmu.attr_rdpmc =3D=3D X86_USER_RDPMC_ALWAYS_ENABLE) static_branch_dec(&rdpmc_always_available_key); =20 on_each_cpu(cr4_update_pce, NULL, 1); diff --git a/arch/x86/events/intel/p6.c b/arch/x86/events/intel/p6.c index 6e41de355bd8..fb991e0ac614 100644 --- a/arch/x86/events/intel/p6.c +++ b/arch/x86/events/intel/p6.c @@ -243,7 +243,7 @@ static __init void p6_pmu_rdpmc_quirk(void) */ pr_warn("Userspace RDPMC support disabled due to a CPU erratum\n"); x86_pmu.attr_rdpmc_broken =3D 1; - x86_pmu.attr_rdpmc =3D 0; + x86_pmu.attr_rdpmc =3D X86_USER_RDPMC_NEVER_ENABLE; } } =20 diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index f7caabc5d487..24a81d2916e9 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -187,6 +187,13 @@ struct amd_nb { (1ULL << PERF_REG_X86_R14) | \ (1ULL << PERF_REG_X86_R15)) =20 +/* user space rdpmc control values */ +enum { + X86_USER_RDPMC_NEVER_ENABLE =3D 0, + X86_USER_RDPMC_CONDITIONAL_ENABLE =3D 1, + X86_USER_RDPMC_ALWAYS_ENABLE =3D 2, +}; + /* * Per register state. */ --=20 2.34.1