From nobody Mon Feb 9 04:14:05 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 0D7FC2C21F6 for ; Mon, 5 Jan 2026 14:16:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767622578; cv=none; b=PCPjzZraJzyv8HsSZJjpd6q4JUUd3tfeif+7/0S1Ootc5tjIUcbUBF9uyEBUWhi1cv9lace6TSL9aZi8SgWn4KgnsNzvmn9wUPh2+NlpWj6EXzwst9S6T2xcFiDiE7Q9YNarJf3c9Tfh5RZOOClNQf8gbu1pI4SYSG1mNIiKBCQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767622578; c=relaxed/simple; bh=JJk/DuSBK3NlC+tovpjXAEdBF+qG9FHVR2Oq+pgvCt4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=n/dh3TRRyzfnVv53RwP1dBC8wdHu93G+AEXEX1zwXEsakZWobx7skNaWpt1tcovQ+bnEaqfrANpCVLz1Kz9MXk5llGtJMf1OlLo5xNC8BX/6eFrOFr/d4uHPd/LPnA+Oi340UZmfsHWgxkS61kXvX4fz2w9Uj8B/wGZSQ9guadg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=AC09yTs8; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=YlcosUlM; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="AC09yTs8"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="YlcosUlM" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 605AYtao937219 for ; Mon, 5 Jan 2026 14:16:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= XkcqGytjnt8e5Fy84JWJc3tUSYAsEqGUrIKqAwrgqFA=; b=AC09yTs8MGypvorz jPjGLWFpXrz2EIDcuvvO7JVmO24UvqbN/ncJ1rx9VOzACnlkqyqqKNaOQ/EK0TpP hn8OMwyQKE9Z0OFqmpDzogSLU3wq6CHPVSuvSSj4vvvnABaIWay8z6CCIYCpwDvO 6f60AdGapCf1rwPj5qiypD8CEWRjq2TCBIHi8l58gJ86mRLOHrUBf1UgPQPTspUh SSjAFjQIEY70SPl0hM3xmVETnAnvgjIRcQzxlC2a2t9HbZgk/+AZTdkAh3QXo8EX GuQ5/iAsfFyusbIYh/ziRczERhq9VodURamxxwaGkXAc1kYt40CMCE4JSn2u+qxY Zi16OQ== Received: from mail-vk1-f198.google.com (mail-vk1-f198.google.com [209.85.221.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bgbnv8gvs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 05 Jan 2026 14:16:14 +0000 (GMT) Received: by mail-vk1-f198.google.com with SMTP id 71dfb90a1353d-55b2b3ef606so7248516e0c.1 for ; Mon, 05 Jan 2026 06:16:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1767622574; x=1768227374; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=XkcqGytjnt8e5Fy84JWJc3tUSYAsEqGUrIKqAwrgqFA=; b=YlcosUlM0H9kYVu9Bn+XiV58t1Ow1kpTqj+c33rddPASU/KdtHOVUaCkJUOygnwlHd PH6ogXn4y46YqbH8wQpHdBMj5HnNeYNG/DIIdTIWx3Hke2Qc+5knOCIx0liGNbQH+m1E h+zW087NMkMbZKnqMPxFmmSXe+YNI0IRyl0kwe8fqOHQzImKsohbyEo82n6+dgsSKoDu qp0RvM1xKxM8MWc0UznqmYDwsHul5C/d3aM2XGPfn2q0cQupDG6tQ4uh1OciYEz22RrN E17k/Yvcvyx1LfM4h55fEtrE7wHBhlJ6PyUnbw71jmBHtxe0Kh5kwASOUE+RWSUtxnWk 8INA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767622574; x=1768227374; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=XkcqGytjnt8e5Fy84JWJc3tUSYAsEqGUrIKqAwrgqFA=; b=qGiD5yEjRulhqsXN9tZI3kIckhE3/EeHz/5BCs4l6bteyFrQ9CivpfLAfthnuQqhEz Mtd1OFpWGz5MI9vGpYa8pWa7AnQjHDjQ2ayNiCjmmkZiHht7lFMdKy9WNrJJzfbYMSqy EgpU5dwmo2FCEtpF7FEsFODfLI2hYKjq81xiOluM1PR2ywZrnRAy1/XYQJJHPFy37lQp WLVzz7J1gSIHIuXCW68OyV85lEiUi+DCuL+hRJV6uxnABbH8MkcI0aNV/HBRgOELLN48 uxKXpoW0Tdy8ypksikfLM3yf0s98l3tzoOk6uKS1CIlgTKgo9tJbuDV1O9P5JmmhZUdC HbTA== X-Gm-Message-State: AOJu0YxmjcHwbpJXyMaQ2vHt6SJ6Gpikx06YDpcFmPvMvo9WQiSKxWYK ICpDhdT/EQq9ZBDOv16CCcPXy8Yy91IntbFPTuEaTAI6l89aenV3HhD7TOAdtKFls+BDa20hKZo GgN779cWUgKv4s3QPcQs7LCR8vmbweVR2BOJgihb2sLTwrYvw7DY+Kf75096WdTk12os= X-Gm-Gg: AY/fxX6S+cXNgsF0qjn+uV4Pt5uCaZrePSM2XVLV9cfdpDHWtbSe9iiywZNPmdYMIYZ uYYMMR6nd5vXzaZD8m4EvSYcyMSmLusGHq7UO3te848kw3VyUSpvTlyR18Hrxa/2ZB+xgr30631 BVkhQx5nS/kCo8Xc1SB98Bts8eOABu4+G9XKb7pXCNALQkG17uMU0j0R5/RBU7lgDwjiCKkvs5g LSrxGjAUUQRzrkA6RAguxvTs9Nmu8sQ47Zee7EBLdGIC+Dz/MfYr20ZUjYt3ADgp5slLIr3kwwN WF2WlWMTh7il33J4UXzHDBIwtt1QM8pK/sbvQsSjUD1LwwsM55fR0G8T9xN3EeKc36Sy/OArQ7i cMAAfX+djif+PlKBWCL2owwHDsHX6+oZ1mVyDm6w= X-Received: by 2002:a05:6122:801b:10b0:55e:82c3:e1f9 with SMTP id 71dfb90a1353d-5631911c6e9mr1814630e0c.9.1767622573964; Mon, 05 Jan 2026 06:16:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJr3VS5bqizHEtO+YGqBGtSrHQrdZzxmQVh1Bvz/TrtSNvWI8zWUzAvVI34SG0j4Ey73ov6w== X-Received: by 2002:a05:6122:801b:10b0:55e:82c3:e1f9 with SMTP id 71dfb90a1353d-5631911c6e9mr1814614e0c.9.1767622573483; Mon, 05 Jan 2026 06:16:13 -0800 (PST) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:dd3b:c635:dd06:9574]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324ea1aef7sm100774703f8f.7.2026.01.05.06.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 06:16:13 -0800 (PST) From: Bartosz Golaszewski Date: Mon, 05 Jan 2026 15:15:29 +0100 Subject: [PATCH 10/15] reset: protect struct reset_controller_dev with its own mutex 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: <20260105-reset-core-refactor-v1-10-ac443103498d@oss.qualcomm.com> References: <20260105-reset-core-refactor-v1-0-ac443103498d@oss.qualcomm.com> In-Reply-To: <20260105-reset-core-refactor-v1-0-ac443103498d@oss.qualcomm.com> To: Krzysztof Kozlowski , Philipp Zabel Cc: linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4635; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=JJk/DuSBK3NlC+tovpjXAEdBF+qG9FHVR2Oq+pgvCt4=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBpW8edN+sMJbcER7LtQHw8lq/QIt8btxf2Hiw+7 CARCMu2DgGJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCaVvHnQAKCRAFnS7L/zaE w0tuD/9vbft43tMPk4XoSDwUvSnn8HeFfTK+GhJ90TF+VCyHK2cwI2B6lOrP4x4S2lEWtHZ8853 rtbw/iUAiVOyJLtQViwLekDiH2KM/ovcrBae9m8OSOnB8gukvPSlluecEyGbguTUU7epEX7PC0d q3TLSz4qOpzPUB3Uds9V9B9Iu8E4lnv2kDpfI8ge0glQd0zJZ0qxXNg9zGPjd7gMUo9PLy5X4NM MUTnCko1uONPPR+0PmJFvaCr5GHa+Ow6DwOa89uG5N97UVx5MSUkx8pV+4C7DnnomP/ryqgrJ08 oAL1QlnTJZq/sdSJmZjtfgluZYUUq+IgC6EuuBuSKykm96osSUoizSA9exPbzufFcpEBTRUutwb 1NtNM7aWYZqszjX4Sz1XGC9ltbJ3Qx17DSfp/m3uk0xuuAJ8KU80atIEap8CMlVlqFTU+wadI1w XgyXZBhDudU3S2TBI/25UB/ADWNzTKx4NH+uOCZQnoFumYSKI9a6ftpYFvkSAIYOoumIt9PmoB9 8CReXsDg2dJP7gPPikK7Z7LebrFX9jfNJI7JeShrMj6e9gqM4K/I1TaiKPD1sVb7thLQaaNfQb8 e0PRu8/V2Xkzi2VnNp5XZb8+4KOc0HYoHXqTiQQL4CH8xfdeCRIy5M6xAWLXdWFbjci4Ipeg6gl leK6plopiz2TdCg== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Authority-Analysis: v=2.4 cv=I5Vohdgg c=1 sm=1 tr=0 ts=695bc7ae cx=c_pps a=1Os3MKEOqt8YzSjcPV0cFA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=nQ7P6-40-II7rw7jOZoA:9 a=QEXdDO2ut3YA:10 a=hhpmQAJR8DioWGSBphRh:22 X-Proofpoint-GUID: sMKOgGi5GR16CYfI82_LCinFaYLZg2bY X-Proofpoint-ORIG-GUID: sMKOgGi5GR16CYfI82_LCinFaYLZg2bY X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTA1MDEyNSBTYWx0ZWRfXzQBjLQFK1aXx Kw8DRfmi/1tB7TgqP8cdJp71mB8s4aC6QcW1Xf51w4C7coZwxO3p7ZSTbGdMkEqmNBY/9HeBI8K 14N/xzMGxaUNocG4B2CVaCEuDEsE0UBAlJnjnMMoh0nZ8AbC/4C8lbgrTRz42vHjIrJWK/RA7im BusKdXTNgHnaufNsP3N/61pal0weOa5ahYxZrtMx/JkfuA5JktB1mBxRRH1C0WjMBmuoYNdO51K G8oVHk1x7vtJDA/8oyCE/sW0PGejc1JVzjDdo34StPA3PqVqPEyW2TeMu4gRyxUIyVUn5INOs94 YuDvQD4JIEdlAq1l9bwXVAFA7fcbkBSUc/ckxuIL9sb/qwGJBpZjK0dBn7pWWK+nJcDrXbPJK7R Ii3LLLi3EFd9z7uNKBpl7+oHaODX2j1EMUuv8Oso9ycC1hHKiRSVh/RuQdLBlMPgWUtJwyiHh+s Qs+NgQtmm3PEtFn3FRg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-05_01,2026-01-05_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 priorityscore=1501 bulkscore=0 adultscore=0 suspectscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601050125 Currently we use a single, global mutex - misleadingly names reset_list_mutex - to protect the global list of reset devices, per-controller list of reset control handles and also internal fields of struct reset_control. Locking can be made a lot more fine-grained if we use a separate mutex for serializing operations on the list AND accessing the reset controller device. Signed-off-by: Bartosz Golaszewski --- drivers/reset/core.c | 44 ++++++++++++++++++++++++------------= ---- include/linux/reset-controller.h | 3 +++ 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/drivers/reset/core.c b/drivers/reset/core.c index a7992b8ad1c1fbd974d221544da00d4ab3938f70..a53d445fbbfc4601c062e7e5f17= 278417bd37836 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -131,6 +131,7 @@ int reset_controller_register(struct reset_controller_d= ev *rcdev) } =20 INIT_LIST_HEAD(&rcdev->reset_control_head); + mutex_init(&rcdev->lock); =20 guard(mutex)(&reset_list_mutex); =20 @@ -143,6 +144,8 @@ EXPORT_SYMBOL_GPL(reset_controller_register); static void reset_controller_remove(struct reset_controller_dev *rcdev, struct reset_control *rstc) { + lockdep_assert_held(&rcdev->lock); + list_del(&rstc->list); module_put(rcdev->owner); put_device(rcdev->dev); @@ -156,19 +159,22 @@ void reset_controller_unregister(struct reset_control= ler_dev *rcdev) { struct reset_control *rstc, *pos; =20 - guard(mutex)(&reset_list_mutex); - - list_del(&rcdev->list); + scoped_guard(mutex, &reset_list_mutex) + list_del(&rcdev->list); =20 - /* - * Numb but don't free the remaining reset control handles that are - * still held by consumers. - */ - list_for_each_entry_safe(rstc, pos, &rcdev->reset_control_head, list) { - rcu_assign_pointer(rstc->rcdev, NULL); - synchronize_srcu(&rstc->srcu); - reset_controller_remove(rcdev, rstc); + scoped_guard(mutex, &rcdev->lock) { + /* + * Numb but don't free the remaining reset control handles that are + * still held by consumers. + */ + list_for_each_entry_safe(rstc, pos, &rcdev->reset_control_head, list) { + rcu_assign_pointer(rstc->rcdev, NULL); + synchronize_srcu(&rstc->srcu); + reset_controller_remove(rcdev, rstc); + } } + + mutex_destroy(&rcdev->lock); } EXPORT_SYMBOL_GPL(reset_controller_unregister); =20 @@ -712,10 +718,12 @@ int reset_control_acquire(struct reset_control *rstc) if (!rcdev) return -ENODEV; =20 - list_for_each_entry(rc, &rcdev->reset_control_head, list) { - if (rstc !=3D rc && rstc->id =3D=3D rc->id) { - if (rc->acquired) - return -EBUSY; + scoped_guard(mutex, &rcdev->lock) { + list_for_each_entry(rc, &rcdev->reset_control_head, list) { + if (rstc !=3D rc && rstc->id =3D=3D rc->id) { + if (rc->acquired) + return -EBUSY; + } } } =20 @@ -806,7 +814,7 @@ __reset_control_get_internal(struct reset_controller_de= v *rcdev, struct reset_control *rstc; int ret; =20 - lockdep_assert_held(&reset_list_mutex); + lockdep_assert_held(&rcdev->lock); =20 /* Expect callers to filter out OPTIONAL and DEASSERTED bits */ if (WARN_ON(flags & ~(RESET_CONTROL_FLAGS_BIT_SHARED | @@ -868,8 +876,10 @@ static void __reset_control_release(struct kref *kref) =20 scoped_guard(srcu, &rstc->srcu) { rcdev =3D rcu_replace_pointer(rstc->rcdev, NULL, true); - if (rcdev) + if (rcdev) { + guard(mutex)(&rcdev->lock); reset_controller_remove(rcdev, rstc); + } } =20 synchronize_srcu(&rstc->srcu); diff --git a/include/linux/reset-controller.h b/include/linux/reset-control= ler.h index aa95b460fdf86f10002a465e285cd0119da6eeaf..2fecb4edeba1a2b1f5f5db2b34c= 867362c5f9c18 100644 --- a/include/linux/reset-controller.h +++ b/include/linux/reset-controller.h @@ -3,6 +3,7 @@ #define _LINUX_RESET_CONTROLLER_H_ =20 #include +#include =20 struct reset_controller_dev; =20 @@ -40,6 +41,7 @@ struct of_phandle_args; * device tree to id as given to the reset control ops, defaults * to :c:func:`of_reset_simple_xlate`. * @nr_resets: number of reset controls in this reset controller device + * @lock: synchronizes concurrent access to the structure's fields */ struct reset_controller_dev { const struct reset_control_ops *ops; @@ -52,6 +54,7 @@ struct reset_controller_dev { int (*of_xlate)(struct reset_controller_dev *rcdev, const struct of_phandle_args *reset_spec); unsigned int nr_resets; + struct mutex lock; }; =20 #if IS_ENABLED(CONFIG_RESET_CONTROLLER) --=20 2.47.3