From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 A25003FF1D5 for ; Mon, 29 Jun 2026 09:48:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782726498; cv=none; b=M+Tpi+IbrkuChIMGJofmW9Le1xcEoYZZfjGtgqprygKs9bprGd8jYz9KUm9q+wJmlpaShuGdFIk1MDrhx+PKOgNAziDmR5BD6+xHzngRAlMoPHwpjhzhaiWsGkkAFac6fDWA/A8ez+X1lkdIfktAIbDSaCkz6r00HyH8+8dr2rM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782726498; c=relaxed/simple; bh=crZFG5EEQ/XpebF5oR/q/KAWJip2MvYpvjgZ/M671mI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OAyxK4AQexl8eYlOzjEELHlQWxouO1Lfx/a1it126+XnyQezaT55bIYRns4numtlREgTa+bukTN8GuaGwe39oB3Nd2A/L3hguVe0mpDllwZzy39E8Bg4gA51jNWdh7ys79emGWKNQSun9Msqzz//0xMD+FLSJu3dXW86C4/Z2mI= 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=ZrcPU0Pn; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=cP2hBFUS; arc=none smtp.client-ip=205.220.168.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="ZrcPU0Pn"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="cP2hBFUS" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65T91N6L2400847 for ; Mon, 29 Jun 2026 09:48:16 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= GcR7ReLeAOcf7bVj6RK9HechYfK2p6RdYNeXOdB466A=; b=ZrcPU0PnLhkYftiT GhcWZjDT8VtFQd5zc8LIKnAye81kVkoUFrhfzjXLOM/SMBjVEy/1169iCdbFppUu N0efnzGON05XvCRMCqaSF7T8RLDF8mZZiGmwq5hOt82WE6wzcHOwFws8UNo/2tih 4OBRK3gtkNxHPmyWMcCK/Sqylo2MxIRJmL9LQ5mg+OAUFLHsQ5eJONzaz/Tdh4Fk ifp9JdWjDsBmypGiJr5BGimrsjOvKM5PJksh4WP+sABr3OwcBdcvaOJ+kaZDIfbq ijtGCjxVYVM2KLYW6RJWH69ePRJzSQGa9ulUA5Yu+/UiB9afWKO+0ojEURJgqyt2 gfZJBA== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f3nq886gr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 09:48:15 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92e5766dcb9so66321685a.3 for ; Mon, 29 Jun 2026 02:48:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782726495; x=1783331295; 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=GcR7ReLeAOcf7bVj6RK9HechYfK2p6RdYNeXOdB466A=; b=cP2hBFUSLUzuBOwHwlUuKDVr9v9dnw550WHbxF10FsqkEkGTpFB2emTMtkmvwa2E5Z NSHdoxgtCgCFp1AG+AEF32/wKLy8d1IS+0Im4lY4oVKjEKIpQjExF7iVfoLssQ7QGpyY Ea47T8acedONVbzc7qVi9jApkyJ5Ptpfxixu6tPMwzYp0cxml3vXJxKJCrgWQTMAuidi cW30a0U6MpsoCBm+Vaqd228wC6YDDQShaib+cIOLc1WIYfeScd3rtLZhr8Yp5KnW8gig 7UW0jLNEwVQ38EPAclq5IA8PYm82VOz42XmClYfTua7ZXkj7Et6xRmAPOqGdzgfIu1Gf 8MIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782726495; x=1783331295; 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=GcR7ReLeAOcf7bVj6RK9HechYfK2p6RdYNeXOdB466A=; b=S1pnW76yBwGqveLITubxyfj9C8eHP2ksgJ3KgSdzQYmvpTEGNRdnJwlCBDHICf/i3I dIcnzWq9aOOH7/QwRINjPB1Gu9c6IHdY1tlNupjZTGp9LEElxSmRxZ03aVu1BdYgf3on /ZUVCMDjAsoNH/5p/YmvYiuxx1/xTl/5FVDRF92VgHVZFPdSl1uOLfxNhSpFw9HznmgO XWwFCpMg4lo1Yw6w4CekW0nAX9v7tIo0wYdlcdHaKWcShCGdICf/uIxVxr11mQLNpYlr Sn0a5hfuAhDtaYC+56Tp0ZFxkCUZ8e3gxBlYa+kvRbbO1AlQYaCyIoFcRSifDgitH2qM 7gwQ== X-Gm-Message-State: AOJu0YwXKMJ+UAzSzja7jVrJz6dQQ11UCctnP9OS3AG7SKaaS/9NfdBB DeABKCDi1XsXw5AHRSzX1RtR1E8royrP7smGbX6J4BkyxnDeeyF/l/+N3GnbVvt2HmXzO7+q8bF f6JLPJf2lKsr9/+tXZBJr6dmG50mo+Yho+QNdxE9XI1fwlMa81PORF5SCKyq2+Tf7ELW4tjrCgI axwg== X-Gm-Gg: AfdE7clbqQlQWtJkic0wxA0rctTH+iWs1uN1TnsWfvsz53voQCE5alsukD7o/M9aS5C T7Nhoa8sB7vWVFQFbZnAZM992km5fo+6/slBcdbrSYdEixBrTF6HyB8j9JVHWJjpZQApKp2aID6 J1XKHHVR6fcgPSLaMqWh4eF3HoI+qSU/WsR8utlkXnKfIabnWe2wodfWoaByf2Lin+8nOj1xQbi huMuPIglJydbT7thkJvNq6fHfmOBI4To1QdLVFtbH9mLcccB4DHnhcLj6y62gwSfMbd9O+LXE4Q 3HrtVgrsH6QCj4ZDlIwMM0t40Xb6bX80YnoCzAeo33xw+EgJbFNLrmOz/p27JCP4ZbBYqbZl6lA voaFYoWd6NcrHSi+JlAM/SSttRNfxjGDhfTPAOfn/ X-Received: by 2002:a05:620a:1726:b0:92d:e54e:72da with SMTP id af79cd13be357-92de54e754emr951840885a.22.1782726494746; Mon, 29 Jun 2026 02:48:14 -0700 (PDT) X-Received: by 2002:a05:620a:1726:b0:92d:e54e:72da with SMTP id af79cd13be357-92de54e754emr951839385a.22.1782726494318; Mon, 29 Jun 2026 02:48:14 -0700 (PDT) Received: from brgl-qcom.local ([2a01:cb1d:dc:7e00:4640:d76a:6126:9b65]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493a4cc6659sm143728625e9.13.2026.06.29.02.48.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 02:48:13 -0700 (PDT) From: Bartosz Golaszewski Date: Mon, 29 Jun 2026 11:47:54 +0200 Subject: [PATCH v5 9/9] nvmem: protect nvmem_device::ops with SRCU 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: 7bit Message-Id: <20260629-nvmem-unbind-v5-9-233212f241c4@oss.qualcomm.com> References: <20260629-nvmem-unbind-v5-0-233212f241c4@oss.qualcomm.com> In-Reply-To: <20260629-nvmem-unbind-v5-0-233212f241c4@oss.qualcomm.com> To: Srinivas Kandagatla , Bartosz Golaszewski , Johan Hovold , Loic Poulain Cc: linux-kernel@vger.kernel.org, brgl@kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5454; i=bartosz.golaszewski@oss.qualcomm.com; h=from:subject:message-id; bh=crZFG5EEQ/XpebF5oR/q/KAWJip2MvYpvjgZ/M671mI=; b=owEBbQKS/ZANAwAKAQWdLsv/NoTDAcsmYgBqQj9QaZmPJYB1/aZna6Y5Dh8rz5cvlz88ooZT1 C2gxdqIRDKJAjMEAAEKAB0WIQSR5RMt5bVGHXuiZfwFnS7L/zaEwwUCakI/UAAKCRAFnS7L/zaE w7BVD/wI3yusTZ81Nuc2DpJiEalGgF9Px4CNTa90fMvut9anfyCdKoIL+6oxzVjKxXbXrHHgZrj qImbAgOmkxRHxpCdXC0V4p3fBtxzEriYCvhpFjkA7KhYkZoSNROGLFeHV3SenY3wWPMsfT6GnzT MDUdadOBakopf7w1wSbs5it8wo5TtXXjPjvIyeamGuU7Zx1S3IGtv6RmLYdchafCb+1xQvmjILZ N08JxC7Tdi71OsRmBiIXIJGeuFGUvd51r5NY1bCP0N//Q2AERw3T+SrhQWYSZ/zzCTvBJKUdPK0 C/+No67eOIOupPkpusEbuZmuKUfbWDLbDHaJZZm4yBzvUmFm3hprrlIUo5DcNg693MlyAiopkU8 wGfyJdANqWGKRWf849El8CRJBYKiKclxh0f89FGcVhBtDKtvbUv5k6wYkX0UA3FuCb2etNb6EBy R9hC0bhIpIgrEMph0p0QgpusjYfpKgujCw/K32eQxPu90GNjvIbeVgn6lYKbeMBcggh2wMx25Wy jjgwKv4MW9yNj6feahvHbNhGChg921Tq2kLihpgodNWZ24gn9rqTmAr5TxlLXLhOqizS40zGNGU IQYFwyEZDmynxuXXckX1CKBvrvD13Z5cxrh/ZUhclQeURkqBTh4fE6xgeYnBhyRiWcrPCdPNQGI Nlv52rZvieqU0Ag== X-Developer-Key: i=bartosz.golaszewski@oss.qualcomm.com; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 X-Proofpoint-GUID: AblvayFcBjoMA1BVngpN-RcpPjG_gMXX X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI5MDA3OSBTYWx0ZWRfXwa40p2PhaEDF e1fxue4UYyg1K7uMqBQXWr+fzvkZrxJBxzhvIpFyy/MZ/r5SR85h+5jIi55ZkKk/WmuJ5U2b5dy 30whAZ6LS4itQHOrnvdTqC9SIgzVp5k= X-Proofpoint-ORIG-GUID: AblvayFcBjoMA1BVngpN-RcpPjG_gMXX X-Authority-Analysis: v=2.4 cv=PqSjqQM3 c=1 sm=1 tr=0 ts=6a423f5f cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=ydBWjX_Uc0Q5hLJtmLYA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDA3OSBTYWx0ZWRfXw+9QuYeoPNnG cB6ZCt9d+zm5IpBEa+hdg9rVK3W5w6wDFAamTyWYNXn0jJoCY9Yf+KVkpxM1T5jevKeH/miTmTS DvJJHfq8q7aXoVpS7eRK9cac+BJU9zI6rOkzp4k1fEc3iwj54KoPPqOIN33Ttqw///ZIK3WAe/7 Gw6FkOnhNXRlooJ1H35bqmMo4YWABn0+56KoiJG7mQbHEJzcJ1oHGNJSGdI6Gte2O2oiPD5jlRE SgwUDsbT6eRkuaZEfcLnZxwUqDrO+cbIyJUPqLdpdNADXWkLvi2+MA9Nq2e42IJuQWXYpNEYXXF LEHdRWYxToMcEF+Bo5AEAWP1fCIQb8fS6+snLX90iyviP/p7c/Jtn1VTg+RD1c3N7bs0teAu6uV 0oVKVmVceFNxYtdZGgr746oi7sIs+hBzjYXPDbFnqZFgdOPrxF5MiwMKfCuH1qC5rCe25qTstgE ioTyfBeIVo6lLIa6dQA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-29_02,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 adultscore=0 clxscore=1015 lowpriorityscore=0 bulkscore=0 malwarescore=0 phishscore=0 suspectscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606290079 With the provider-owned data split out into a separate 'ops' structure, we can now protect it with SRCU. Protect all dereferences of nvmem->ops with an SRCU read lock. Synchronize SRCU in nvmem_unregister() after setting the implementation pointer to NULL. This has the effect of numbing down the device after nvmem_unregister() returns - it will no longer accept any consumer calls and return -ENODEV. The actual device will live on for as long as there are references to it but we will no longer reach into the consumer's memory which may be gone by this time. Nvmem cell entries are destroyed in .release() now as they may be still dereferenced via the nvmem_cell handles after nvmem_release(). The actual calls will still go through SRCU and fail with -ENODEV if the provider is gone. Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 44 ++++++++++++++++++++++++++++++++++++++------ drivers/nvmem/internals.h | 4 +++- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 2c6d058a20d97e039f42e45c7b8d4305344c4ba0..2e66d4ae4aedca36662171abacec02fadd5e9039 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -57,7 +57,12 @@ static BLOCKING_NOTIFIER_HEAD(nvmem_notifier); static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset, void *val, size_t bytes) { - struct nvmem_operations *ops = nvmem->ops; + struct nvmem_operations *ops; + + guard(srcu)(&nvmem->srcu); + ops = srcu_dereference(nvmem->ops, &nvmem->srcu); + if (!ops) + return -ENODEV; if (!ops->reg_read) return -EOPNOTSUPP; @@ -68,9 +73,14 @@ static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset, static int __nvmem_reg_write(struct nvmem_device *nvmem, unsigned int offset, void *val, size_t bytes) { - struct nvmem_operations *ops = nvmem->ops; + struct nvmem_operations *ops; int ret, wr_ok; + guard(srcu)(&nvmem->srcu); + ops = srcu_dereference(nvmem->ops, &nvmem->srcu); + if (!ops) + return -ENODEV; + if (!ops->reg_write) return -EOPNOTSUPP; @@ -289,7 +299,7 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj, static umode_t nvmem_bin_attr_get_umode(struct nvmem_device *nvmem) { - struct nvmem_operations *ops = nvmem->ops; + struct nvmem_operations *ops = rcu_dereference_raw(nvmem->ops); umode_t mode = 0400; @@ -333,7 +343,7 @@ static umode_t nvmem_attr_is_visible(struct kobject *kobj, { struct device *dev = kobj_to_dev(kobj); struct nvmem_device *nvmem = to_nvmem_device(dev); - struct nvmem_operations *ops = nvmem->ops; + struct nvmem_operations *ops = rcu_dereference_raw(nvmem->ops); /* * If the device has no .reg_write operation, do not allow @@ -560,7 +570,7 @@ static void nvmem_release(struct device *dev) gpiod_put(nvmem->wp_gpio); nvmem_device_remove_all_cells(nvmem); ida_free(&nvmem_ida, nvmem->id); - kfree(nvmem->ops); + cleanup_srcu_struct(&nvmem->srcu); kfree(nvmem); } @@ -936,7 +946,20 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->dev.bus = &nvmem_bus_type; nvmem->dev.parent = config->dev; INIT_LIST_HEAD(&nvmem->cells); - nvmem->ops = ops; + + /* + * Must happen before we assign the release() callback in + * device_initialize(). + */ + rval = init_srcu_struct(&nvmem->srcu); + if (rval) { + ida_free(&nvmem_ida, nvmem->id); + kfree(ops); + kfree(nvmem); + return ERR_PTR(rval); + } + + rcu_assign_pointer(nvmem->ops, ops); device_initialize(&nvmem->dev); @@ -1051,7 +1074,10 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) err_remove_compat: nvmem_sysfs_remove_compat(nvmem); err_put_device: + ops = rcu_replace_pointer(nvmem->ops, NULL, true); + synchronize_srcu(&nvmem->srcu); put_device(&nvmem->dev); + kfree(ops); return ERR_PTR(rval); } @@ -1064,13 +1090,19 @@ EXPORT_SYMBOL_GPL(nvmem_register); */ void nvmem_unregister(struct nvmem_device *nvmem) { + struct nvmem_operations *ops; + if (!nvmem) return; blocking_notifier_call_chain(&nvmem_notifier, NVMEM_REMOVE, nvmem); + ops = rcu_replace_pointer(nvmem->ops, NULL, true); + synchronize_srcu(&nvmem->srcu); + nvmem_sysfs_remove_compat(nvmem); nvmem_destroy_layout(nvmem); + kfree(ops); device_unregister(&nvmem->dev); } diff --git a/drivers/nvmem/internals.h b/drivers/nvmem/internals.h index 60daa79c404dc915872481bd3b02de2258d33406..17418fd0dcc92b101b56082fc15d74042386107d 100644 --- a/drivers/nvmem/internals.h +++ b/drivers/nvmem/internals.h @@ -6,6 +6,7 @@ #include #include #include +#include /* Hold pointers to callbacks owned by the nvmem provider module. */ struct nvmem_operations { @@ -16,6 +17,7 @@ struct nvmem_operations { struct nvmem_device { struct module *owner; struct device dev; + struct srcu_struct srcu; int stride; int word_size; int id; @@ -33,7 +35,7 @@ struct nvmem_device { unsigned int nkeepout; struct gpio_desc *wp_gpio; struct nvmem_layout *layout; - struct nvmem_operations *ops; + struct nvmem_operations __rcu *ops; void *priv; bool sysfs_cells_populated; }; -- 2.47.3