From nobody Sat Jul 25 18:54:46 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (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 9776D4D98E0; Tue, 14 Jul 2026 16:51:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784047919; cv=none; b=HHxjUTlnLNJEoB/haNdOtCtSLCaFfsxvPe8xz1kCk4W2qnMf24wiDHUkuHuba4MU6My9/KL8bA7BxFkdEcU2vU/hxlyTvPDwM8D/PEAwuIh73zGn7p+NxA4m6n/vU2I95gcFOyhNuiU6LNDT5UHgbdt8BTq689Y7B/1kj/IRF58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784047919; c=relaxed/simple; bh=g89D7a4XpoHeRm3Z+DDM6ulsaVeCNUY/pAXw/B1rrIk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AYZJMTbHf0iEOi4ujsU2PZ/yGGXML83xD/FwMOadgGOxI7FfK7fY5hkF4kTXTVKikAPtkFjT1q1I6wKzUmh6avVy3QNn8scrdVfjNzqaql67375t+Et1IKfNkk/aOuPoiUFCvJHoldDQwWBtgK94gZvqMIFAX+ietK73ixtajEs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=RyYhrUuY; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="RyYhrUuY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1784047914; bh=g89D7a4XpoHeRm3Z+DDM6ulsaVeCNUY/pAXw/B1rrIk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RyYhrUuY0VRYIxcc9jWksSkw7dIf0uM/QpFUvw4D6iOEoFlbFIW2ghfJRleLK/WNQ rey2x6MFE92RNNXOIwhwvX6xLLST98AEg4K+nKvLxlguxYiWa22Mt2e548F4Dtwvr/ 0PbWPM6Nq0WBZlQHJvhrSADefcIap0eArXNpynw4= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 14 Jul 2026 18:51:48 +0200 Subject: [PATCH 1/3] x86/mce: Use __DEVICE_ATTR() macro to initialize dev_ext_attribute 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: quoted-printable Message-Id: <20260714-sysfs-const-attr-dev_ext_attr-v1-1-6b2c0435d621@weissschuh.net> References: <20260714-sysfs-const-attr-dev_ext_attr-v1-0-6b2c0435d621@weissschuh.net> In-Reply-To: <20260714-sysfs-const-attr-dev_ext_attr-v1-0-6b2c0435d621@weissschuh.net> To: Tony Luck , Borislav Petkov , Thomas Gleixner , Ingo Molnar , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Will Deacon , Mark Rutland , Jonathan Cameron , Yushan Wang , Jijie Shao , Khuong Dinh , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-cxl@vger.kernel.org, linux-arm-msm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, driver-core@lists.linux.dev, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784047913; l=1433; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=g89D7a4XpoHeRm3Z+DDM6ulsaVeCNUY/pAXw/B1rrIk=; b=al6DQcUFY/kmhepddTJ9a3tiSk4uB2AABkAFZK53JWe7hXFh8iP5oigjsKCNTsx5CGLx1aAPi S+roPX/wX0VCQ+JQgOIpHnCiy71QTSy4QX9NJBT275qiNhAXHQF7RQx X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= The upcoming constification of the device_show_int() and device_show_bool() signatures requires the users to handle the transition automatically. Switch to the __DEVICE_ATTR() macro which can do this. Signed-off-by: Thomas Wei=C3=9Fschuh --- arch/x86/kernel/cpu/mce/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 9bba1e2f03af..7fc9aa9e2ec9 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -2621,17 +2621,17 @@ static DEVICE_BOOL_ATTR(dont_log_ce, 0644, mca_cfg.= dont_log_ce); static DEVICE_BOOL_ATTR(print_all, 0644, mca_cfg.print_all); =20 static struct dev_ext_attribute dev_attr_check_interval =3D { - __ATTR(check_interval, 0644, device_show_int, store_int_with_restart), + __DEVICE_ATTR(check_interval, 0644, device_show_int, store_int_with_resta= rt), &check_interval }; =20 static struct dev_ext_attribute dev_attr_ignore_ce =3D { - __ATTR(ignore_ce, 0644, device_show_bool, set_ignore_ce), + __DEVICE_ATTR(ignore_ce, 0644, device_show_bool, set_ignore_ce), &mca_cfg.ignore_ce }; =20 static struct dev_ext_attribute dev_attr_cmci_disabled =3D { - __ATTR(cmci_disabled, 0644, device_show_bool, set_cmci_disabled), + __DEVICE_ATTR(cmci_disabled, 0644, device_show_bool, set_cmci_disabled), &mca_cfg.cmci_disabled }; =20 --=20 2.55.0 From nobody Sat Jul 25 18:54:46 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (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 5C1864D90DD; Tue, 14 Jul 2026 16:51:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784047919; cv=none; b=q0uRuSZYJEBKik3Pu56TLYfPSqovNuq+2MFWDWQ2s06cNMj966ytD75ZjHFqs7lclz7H5Fl0O+HYURft1Pq79pPadKYV90vdCgluuvXd/MZ7DFue5X7liYycd3a9gjbNH/XgJaWvpGQAC5eDJFkzVP/ODwhtTfzRW78HOUKsX1I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784047919; c=relaxed/simple; bh=0NYj325MCxYfzA0iMFtFlFNm7KVwpEWpQsm1qEOkdJ0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lXtGAIbwRn8Jk0J5bjq+0gLYAe6StxeC9L09i2VBew4ewEaBnILgrbUoOVsu53pm1u4Hgsd6NYuhZM1qOkA1THI1YLLsp5JNpLneIUn4NUiHevIjp7BhAArtgi6/kMVYDv2gsVw3q0TRDFYS4DNLjc+KNFaPNsJ1ETaUJf6FDK8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=ZiOS6GD2; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="ZiOS6GD2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1784047914; bh=0NYj325MCxYfzA0iMFtFlFNm7KVwpEWpQsm1qEOkdJ0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ZiOS6GD2z8CvGbtL0moHrrPujbDO5n6tgv6RfCwYJrs1wGp6CPFXJIc5ew43nmhV2 0to+rX9ljKOqdVHsN/XqIZzsELt5CLzdYptOivPMSQ3cIQ+Nd7lHJF5El9WRcmWJUA SMS1lP7vprHJQLaGAhwBfMpj4StwXZx/qNXkRmpQ= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 14 Jul 2026 18:51:49 +0200 Subject: [PATCH 2/3] drivers: perf: Use __DEVICE_ATTR() macro to initialize dev_ext_attribute 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: quoted-printable Message-Id: <20260714-sysfs-const-attr-dev_ext_attr-v1-2-6b2c0435d621@weissschuh.net> References: <20260714-sysfs-const-attr-dev_ext_attr-v1-0-6b2c0435d621@weissschuh.net> In-Reply-To: <20260714-sysfs-const-attr-dev_ext_attr-v1-0-6b2c0435d621@weissschuh.net> To: Tony Luck , Borislav Petkov , Thomas Gleixner , Ingo Molnar , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Will Deacon , Mark Rutland , Jonathan Cameron , Yushan Wang , Jijie Shao , Khuong Dinh , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-cxl@vger.kernel.org, linux-arm-msm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, driver-core@lists.linux.dev, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784047913; l=9437; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=0NYj325MCxYfzA0iMFtFlFNm7KVwpEWpQsm1qEOkdJ0=; b=taFfFE7aDqhB7yKmzGYYYePgDR3Gq0wU8bj7GfGE+vF5SobjgvamevsFQjF1lGuaA4rzQZtbQ g8UOoXRQfZaBitkIOv3PDEqpf2XYWku0enMWHxYIssSWEOwfK+bF7zt X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= The upcoming constification of the device_show_*() callback signatures requires the users to handle the transition automatically. Switch to the __DEVICE_ATTR() macro which can do this. Signed-off-by: Thomas Wei=C3=9Fschuh --- drivers/perf/arm-cci.c | 2 +- drivers/perf/arm-ccn.c | 2 +- drivers/perf/arm_cspmu/arm_cspmu.h | 2 +- drivers/perf/arm_dsu_pmu.c | 2 +- drivers/perf/cxl_pmu.c | 10 +++++----- drivers/perf/fujitsu_uncore_pmu.c | 2 +- drivers/perf/hisilicon/hisi_pcie_pmu.c | 2 +- drivers/perf/hisilicon/hisi_uncore_pmu.h | 6 +++--- drivers/perf/hisilicon/hns3_pmu.c | 6 +++--- drivers/perf/nvidia_t410_c2c_pmu.c | 2 +- drivers/perf/nvidia_t410_cmem_latency_pmu.c | 12 ++++++------ drivers/perf/qcom_l3_pmu.c | 8 ++++---- drivers/perf/xgene_pmu.c | 2 +- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c index 1cc3214d6b6d..374a00ae4e48 100644 --- a/drivers/perf/arm-cci.c +++ b/drivers/perf/arm-cci.c @@ -132,7 +132,7 @@ static ssize_t __maybe_unused cci_pmu_event_show(struct= device *dev, =20 #define CCI_EXT_ATTR_ENTRY(_name, _func, _config) \ &((struct dev_ext_attribute[]) { \ - { __ATTR(_name, S_IRUGO, _func, NULL), (void *)_config } \ + { __DEVICE_ATTR(_name, S_IRUGO, _func, NULL), (void *)_config } \ })[0].attr.attr =20 #define CCI_FORMAT_EXT_ATTR_ENTRY(_name, _config) \ diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c index 8af3563fdf60..955cb5c2b77b 100644 --- a/drivers/perf/arm-ccn.c +++ b/drivers/perf/arm-ccn.c @@ -217,7 +217,7 @@ static void arm_ccn_pmu_config_set(u64 *config, u32 nod= e_xp, u32 type, u32 port) =20 #define CCN_FORMAT_ATTR(_name, _config) \ struct dev_ext_attribute arm_ccn_pmu_format_attr_##_name =3D \ - { __ATTR(_name, S_IRUGO, device_show_string, \ + { __DEVICE_ATTR(_name, S_IRUGO, device_show_string, \ NULL), _config } =20 static CCN_FORMAT_ATTR(node, "config:0-7"); diff --git a/drivers/perf/arm_cspmu/arm_cspmu.h b/drivers/perf/arm_cspmu/ar= m_cspmu.h index 3fc5c8d77266..841b04ea02a4 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.h +++ b/drivers/perf/arm_cspmu/arm_cspmu.h @@ -23,7 +23,7 @@ #define ARM_CSPMU_EXT_ATTR(_name, _func, _config) \ (&((struct dev_ext_attribute[]){ \ { \ - .attr =3D __ATTR(_name, 0444, _func, NULL), \ + .attr =3D __DEVICE_ATTR(_name, 0444, _func, NULL),\ .var =3D (void *)_config \ } \ })[0].attr.attr) diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c index 32b0dd7c693b..1d7def95645f 100644 --- a/drivers/perf/arm_dsu_pmu.c +++ b/drivers/perf/arm_dsu_pmu.c @@ -69,7 +69,7 @@ #define DSU_EXT_ATTR(_name, _func, _config) \ (&((struct dev_ext_attribute[]) { \ { \ - .attr =3D __ATTR(_name, 0444, _func, NULL), \ + .attr =3D __DEVICE_ATTR(_name, 0444, _func, NULL),\ .var =3D (void *)_config \ } \ })[0].attr.attr) diff --git a/drivers/perf/cxl_pmu.c b/drivers/perf/cxl_pmu.c index 68a54d97d2a8..4ab3360a9004 100644 --- a/drivers/perf/cxl_pmu.c +++ b/drivers/perf/cxl_pmu.c @@ -209,11 +209,11 @@ static int cxl_pmu_parse_caps(struct device *dev, str= uct cxl_pmu_info *info) } =20 #define CXL_PMU_FORMAT_ATTR(_name, _format)\ - (&((struct dev_ext_attribute[]) { \ - { \ - .attr =3D __ATTR(_name, 0444, device_show_string, NULL), \ - .var =3D (void *)_format \ - } \ + (&((struct dev_ext_attribute[]) { \ + { \ + .attr =3D __DEVICE_ATTR(_name, 0444, device_show_string, NULL), \ + .var =3D (void *)_format \ + } \ })[0].attr.attr) =20 enum { diff --git a/drivers/perf/fujitsu_uncore_pmu.c b/drivers/perf/fujitsu_uncor= e_pmu.c index c3c6f56474ad..b83fdaf59324 100644 --- a/drivers/perf/fujitsu_uncore_pmu.c +++ b/drivers/perf/fujitsu_uncore_pmu.c @@ -292,7 +292,7 @@ static void fujitsu_uncore_event_read(struct perf_event= *event) =20 #define UNCORE_PMU_FORMAT_ATTR(_name, _config) \ (&((struct dev_ext_attribute[]) { \ - { .attr =3D __ATTR(_name, 0444, device_show_string, NULL), \ + { .attr =3D __DEVICE_ATTR(_name, 0444, device_show_string, NULL), \ .var =3D (void *)_config, } \ })[0].attr.attr) =20 diff --git a/drivers/perf/hisilicon/hisi_pcie_pmu.c b/drivers/perf/hisilico= n/hisi_pcie_pmu.c index c5394d007b61..2dc19b7c8cbf 100644 --- a/drivers/perf/hisilicon/hisi_pcie_pmu.c +++ b/drivers/perf/hisilicon/hisi_pcie_pmu.c @@ -110,7 +110,7 @@ static ssize_t hisi_pcie_event_sysfs_show(struct device= *dev, struct device_attr =20 #define HISI_PCIE_PMU_FORMAT_ATTR(_name, _format) = \ (&((struct dev_ext_attribute[]){ \ - { .attr =3D __ATTR(_name, 0444, device_show_string, NULL), \ + { .attr =3D __DEVICE_ATTR(_name, 0444, device_show_string, NULL),\ .var =3D (void *)_format } \ })[0].attr.attr) =20 diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.h b/drivers/perf/hisili= con/hisi_uncore_pmu.h index 3ffe6acda653..a4cb9ed7ea20 100644 --- a/drivers/perf/hisilicon/hisi_uncore_pmu.h +++ b/drivers/perf/hisilicon/hisi_uncore_pmu.h @@ -27,9 +27,9 @@ #define HISI_MAX_COUNTERS 0x18 #define to_hisi_pmu(p) (container_of(p, struct hisi_pmu, pmu)) =20 -#define HISI_PMU_ATTR(_name, _func, _config) \ - (&((struct dev_ext_attribute[]) { \ - { __ATTR(_name, 0444, _func, NULL), (void *)_config } \ +#define HISI_PMU_ATTR(_name, _func, _config) \ + (&((struct dev_ext_attribute[]) { \ + { __DEVICE_ATTR(_name, 0444, _func, NULL), (void *)_config } \ })[0].attr.attr) =20 #define HISI_PMU_FORMAT_ATTR(_name, _config) \ diff --git a/drivers/perf/hisilicon/hns3_pmu.c b/drivers/perf/hisilicon/hns= 3_pmu.c index c157f3572cae..88a1129e9b90 100644 --- a/drivers/perf/hisilicon/hns3_pmu.c +++ b/drivers/perf/hisilicon/hns3_pmu.c @@ -405,9 +405,9 @@ static ssize_t hns3_pmu_filter_mode_show(struct device = *dev, return len; } =20 -#define HNS3_PMU_ATTR(_name, _func, _config) \ - (&((struct dev_ext_attribute[]) { \ - { __ATTR(_name, 0444, _func, NULL), (void *)_config } \ +#define HNS3_PMU_ATTR(_name, _func, _config) \ + (&((struct dev_ext_attribute[]) { \ + { __DEVICE_ATTR(_name, 0444, _func, NULL), (void *)_config } \ })[0].attr.attr) =20 #define HNS3_PMU_FORMAT_ATTR(_name, _format) \ diff --git a/drivers/perf/nvidia_t410_c2c_pmu.c b/drivers/perf/nvidia_t410_= c2c_pmu.c index 411987153ff3..930cb3e8aad2 100644 --- a/drivers/perf/nvidia_t410_c2c_pmu.c +++ b/drivers/perf/nvidia_t410_c2c_pmu.c @@ -545,7 +545,7 @@ static struct attribute_group nv_c2c_pmu_peer_attr_grou= p =3D { #define NV_C2C_PMU_EXT_ATTR(_name, _func, _config) \ (&((struct dev_ext_attribute[]){ \ { \ - .attr =3D __ATTR(_name, 0444, _func, NULL), \ + .attr =3D __DEVICE_ATTR(_name, 0444, _func, NULL),\ .var =3D (void *)_config \ } \ })[0].attr.attr) diff --git a/drivers/perf/nvidia_t410_cmem_latency_pmu.c b/drivers/perf/nvi= dia_t410_cmem_latency_pmu.c index acb8f5571522..d6e02b70a7cf 100644 --- a/drivers/perf/nvidia_t410_cmem_latency_pmu.c +++ b/drivers/perf/nvidia_t410_cmem_latency_pmu.c @@ -435,12 +435,12 @@ static struct attribute_group cmem_lat_pmu_identifier= _attr_group =3D { =20 /* Format attributes. */ =20 -#define NV_PMU_EXT_ATTR(_name, _func, _config) \ - (&((struct dev_ext_attribute[]){ \ - { \ - .attr =3D __ATTR(_name, 0444, _func, NULL), \ - .var =3D (void *)_config \ - } \ +#define NV_PMU_EXT_ATTR(_name, _func, _config) \ + (&((struct dev_ext_attribute[]){ \ + { \ + .attr =3D __DEVICE_ATTR(_name, 0444, _func, NULL), \ + .var =3D (void *)_config \ + } \ })[0].attr.attr) =20 static struct attribute *cmem_lat_pmu_formats[] =3D { diff --git a/drivers/perf/qcom_l3_pmu.c b/drivers/perf/qcom_l3_pmu.c index 66e6cabd6fff..d5aa6ace847a 100644 --- a/drivers/perf/qcom_l3_pmu.c +++ b/drivers/perf/qcom_l3_pmu.c @@ -609,10 +609,10 @@ static void qcom_l3_cache__event_read(struct perf_eve= nt *event) =20 /* formats */ =20 -#define L3CACHE_PMU_FORMAT_ATTR(_name, _config) \ - (&((struct dev_ext_attribute[]) { \ - { .attr =3D __ATTR(_name, 0444, device_show_string, NULL), \ - .var =3D (void *) _config, } \ +#define L3CACHE_PMU_FORMAT_ATTR(_name, _config) \ + (&((struct dev_ext_attribute[]) { \ + { .attr =3D __DEVICE_ATTR(_name, 0444, device_show_string, NULL), \ + .var =3D (void *) _config, } \ })[0].attr.attr) =20 static struct attribute *qcom_l3_cache_pmu_formats[] =3D { diff --git a/drivers/perf/xgene_pmu.c b/drivers/perf/xgene_pmu.c index 33b5497bdc06..3f23611fd4c7 100644 --- a/drivers/perf/xgene_pmu.c +++ b/drivers/perf/xgene_pmu.c @@ -164,7 +164,7 @@ enum xgene_pmu_dev_type { */ #define XGENE_PMU_FORMAT_ATTR(_name, _config) \ (&((struct dev_ext_attribute[]) { \ - { .attr =3D __ATTR(_name, S_IRUGO, device_show_string, NULL), \ + { .attr =3D __DEVICE_ATTR(_name, S_IRUGO, device_show_string, NULL), \ .var =3D (void *) _config, } \ })[0].attr.attr) =20 --=20 2.55.0 From nobody Sat Jul 25 18:54:46 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (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 412914D90CF; Tue, 14 Jul 2026 16:51:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784047921; cv=none; b=BLzWlBYPwEneRhWJhFGnW/y5Eh91kg18iUAYqXTZ0jCPe6fG0Y7EnUTeBh4oTYjoIuHLMc9itZQpnc0bJrhCz2zmiOqh198e8wE1VGOYWpdlvo63O2zCiEjL1otRGYPZQ2r3LdhfJWlp6WbDt40uPJGRxK15XhEhTMmYtTZZUTI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784047921; c=relaxed/simple; bh=y+nMsMtnPzeoRMm6XOGdcqLiE1JJKdTJFdXgVfqhtcg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EwUUPNJqa6zmAHjAT/2xSETCTcp4QDJWiYWpeDBctPsDRMei9pBWTrxOIOtN4nYDRCSPiStsktiu2G83qbqfJ50LOgStWzRqUvp9JPiIrsZYPjkzpnBN4/SgIJ6s8C68/m6bNQnPgQJWpVdbtEeh4AlXvVIUZLKUDWkv1kLwYmM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=AfRCxkVh; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="AfRCxkVh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1784047914; bh=y+nMsMtnPzeoRMm6XOGdcqLiE1JJKdTJFdXgVfqhtcg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AfRCxkVhMPXaeJ4X2pakjBoLYVMtENgqh6kslhbd+3AQg3WfIGgBcX2hDtINAVg+v Hw6tnma1FmLBkiT/Ldj7crCME1oCD5BjCY6CJbbzBhJYmNVDVsdn5FyukoGu1QvVSV BKkbdrDrb2bAHn8Ii1Z7+wIuZQYUY5Pu5/df8wFo= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 14 Jul 2026 18:51:50 +0200 Subject: [PATCH 3/3] driver core: Constify the signature of device_show/store_*() 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: quoted-printable Message-Id: <20260714-sysfs-const-attr-dev_ext_attr-v1-3-6b2c0435d621@weissschuh.net> References: <20260714-sysfs-const-attr-dev_ext_attr-v1-0-6b2c0435d621@weissschuh.net> In-Reply-To: <20260714-sysfs-const-attr-dev_ext_attr-v1-0-6b2c0435d621@weissschuh.net> To: Tony Luck , Borislav Petkov , Thomas Gleixner , Ingo Molnar , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Will Deacon , Mark Rutland , Jonathan Cameron , Yushan Wang , Jijie Shao , Khuong Dinh , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-cxl@vger.kernel.org, linux-arm-msm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, driver-core@lists.linux.dev, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784047913; l=5833; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=y+nMsMtnPzeoRMm6XOGdcqLiE1JJKdTJFdXgVfqhtcg=; b=CE/PLEPjEk9Clk2ILAqAI/VCFiwwgxAk66fuzdwrBCBYf62zj4nI5gb6xVcT3JfCfpR44koSU BdRAPrwT0zcBc20cdAFo7P5079v7q7Z6w6civBd2ZOcqPBwj5qITrGA X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Prepare for the constification of 'struct dev_ext_attribute' by changing the signature of the standard callback functions. Signed-off-by: Thomas Wei=C3=9Fschuh --- arch/powerpc/perf/hv-24x7.c | 2 +- drivers/base/core.c | 30 +++++++++++++++--------------- include/linux/device.h | 14 +++++++------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c index abb4cfb11fcc..c0abac00e026 100644 --- a/arch/powerpc/perf/hv-24x7.c +++ b/arch/powerpc/perf/hv-24x7.c @@ -462,7 +462,7 @@ static struct attribute *device_str_attr_create_(char *= name, char *str) attr->var =3D str; attr->attr.attr.name =3D name; attr->attr.attr.mode =3D 0444; - attr->attr.show =3D device_show_string; + attr->attr.show_const =3D device_show_string; =20 return &attr->attr.attr; } diff --git a/drivers/base/core.c b/drivers/base/core.c index 4d026682944f..649b8a126920 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -2513,13 +2513,13 @@ static const struct sysfs_ops dev_sysfs_ops =3D { .store =3D dev_attr_store, }; =20 -#define to_ext_attr(x) container_of(x, struct dev_ext_attribute, attr) +#define to_ext_attr(x) container_of_const(x, struct dev_ext_attribute, att= r) =20 ssize_t device_store_ulong(struct device *dev, - struct device_attribute *attr, + const struct device_attribute *attr, const char *buf, size_t size) { - struct dev_ext_attribute *ea =3D to_ext_attr(attr); + const struct dev_ext_attribute *ea =3D to_ext_attr(attr); int ret; unsigned long new; =20 @@ -2533,19 +2533,19 @@ ssize_t device_store_ulong(struct device *dev, EXPORT_SYMBOL_GPL(device_store_ulong); =20 ssize_t device_show_ulong(struct device *dev, - struct device_attribute *attr, + const struct device_attribute *attr, char *buf) { - struct dev_ext_attribute *ea =3D to_ext_attr(attr); + const struct dev_ext_attribute *ea =3D to_ext_attr(attr); return sysfs_emit(buf, "%lx\n", *(unsigned long *)(ea->var)); } EXPORT_SYMBOL_GPL(device_show_ulong); =20 ssize_t device_store_int(struct device *dev, - struct device_attribute *attr, + const struct device_attribute *attr, const char *buf, size_t size) { - struct dev_ext_attribute *ea =3D to_ext_attr(attr); + const struct dev_ext_attribute *ea =3D to_ext_attr(attr); int ret; long new; =20 @@ -2562,19 +2562,19 @@ ssize_t device_store_int(struct device *dev, EXPORT_SYMBOL_GPL(device_store_int); =20 ssize_t device_show_int(struct device *dev, - struct device_attribute *attr, + const struct device_attribute *attr, char *buf) { - struct dev_ext_attribute *ea =3D to_ext_attr(attr); + const struct dev_ext_attribute *ea =3D to_ext_attr(attr); =20 return sysfs_emit(buf, "%d\n", *(int *)(ea->var)); } EXPORT_SYMBOL_GPL(device_show_int); =20 -ssize_t device_store_bool(struct device *dev, struct device_attribute *att= r, +ssize_t device_store_bool(struct device *dev, const struct device_attribut= e *attr, const char *buf, size_t size) { - struct dev_ext_attribute *ea =3D to_ext_attr(attr); + const struct dev_ext_attribute *ea =3D to_ext_attr(attr); =20 if (kstrtobool(buf, ea->var) < 0) return -EINVAL; @@ -2583,19 +2583,19 @@ ssize_t device_store_bool(struct device *dev, struc= t device_attribute *attr, } EXPORT_SYMBOL_GPL(device_store_bool); =20 -ssize_t device_show_bool(struct device *dev, struct device_attribute *attr, +ssize_t device_show_bool(struct device *dev, const struct device_attribute= *attr, char *buf) { - struct dev_ext_attribute *ea =3D to_ext_attr(attr); + const struct dev_ext_attribute *ea =3D to_ext_attr(attr); =20 return sysfs_emit(buf, "%d\n", *(bool *)(ea->var)); } EXPORT_SYMBOL_GPL(device_show_bool); =20 ssize_t device_show_string(struct device *dev, - struct device_attribute *attr, char *buf) + const struct device_attribute *attr, char *buf) { - struct dev_ext_attribute *ea =3D to_ext_attr(attr); + const struct dev_ext_attribute *ea =3D to_ext_attr(attr); =20 return sysfs_emit(buf, "%s\n", (char *)ea->var); } diff --git a/include/linux/device.h b/include/linux/device.h index 7b2baffdd2f5..61e2b98b38a4 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -127,19 +127,19 @@ struct dev_ext_attribute { void *var; }; =20 -ssize_t device_show_ulong(struct device *dev, struct device_attribute *att= r, +ssize_t device_show_ulong(struct device *dev, const struct device_attribut= e *attr, char *buf); -ssize_t device_store_ulong(struct device *dev, struct device_attribute *at= tr, +ssize_t device_store_ulong(struct device *dev, const struct device_attribu= te *attr, const char *buf, size_t count); -ssize_t device_show_int(struct device *dev, struct device_attribute *attr, +ssize_t device_show_int(struct device *dev, const struct device_attribute = *attr, char *buf); -ssize_t device_store_int(struct device *dev, struct device_attribute *attr, +ssize_t device_store_int(struct device *dev, const struct device_attribute= *attr, const char *buf, size_t count); -ssize_t device_show_bool(struct device *dev, struct device_attribute *attr, +ssize_t device_show_bool(struct device *dev, const struct device_attribute= *attr, char *buf); -ssize_t device_store_bool(struct device *dev, struct device_attribute *att= r, +ssize_t device_store_bool(struct device *dev, const struct device_attribut= e *attr, const char *buf, size_t count); -ssize_t device_show_string(struct device *dev, struct device_attribute *at= tr, +ssize_t device_show_string(struct device *dev, const struct device_attribu= te *attr, char *buf); =20 typedef ssize_t __device_show_handler_const(struct device *dev, const stru= ct device_attribute *attr, --=20 2.55.0