From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2ECF3606AC15 for ; Wed, 4 Nov 2026 19:30:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=SAfHNNjx Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4jKbB464rsz30WF; Thu, 05 Nov 2026 06:30:04 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2600:3c04:e001:324:0:1991:8:25" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793820604; cv=none; b=lviffP8NxTluK16D9Eoy/hdaiFg4epeOacyrCiuxtPuG98pPbB2u3OSDhtyCRwbUjsM/7HRdoDHmv48kc/uss4z0OeXRGoMQwb5p8Cgx7GAtjIuRxbnqXjGJcCdXHoqBGDR53J6ZlAgabQs+XY4U/4BqAaR8jxNQUWP8IW94gBPVkn/T/koKwumCYIIQ2H+iXZChLZST+s7bwZ2f4TX7tx3iPSDnsdlEFeojw+u6ieIWVRP1ULrADyNLOBEhX5xzeIKkJ2YtJxNBAFCgaWiiu2B6rn+bTnzdVTcmGGw7eyNk/laa66hcZ5uC7soCNzhq7m49VYNygrsJsqoDJiMflw== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793820604; c=relaxed/relaxed; bh=KbfF7FDKuD8IgpxmK4NN79tddC7YrY9Y/+M606VrXfI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SS9isvkuHwyxElAcAFftdEya5vTsqdy576vkjNkbXYbY1LMvACYhnEMzE0v6Q/pUzs9XDHPMT+3QM4xO/2tP3nFjPyLhZ+OMn+M1VYkJjhGZm2kc/nvGnjs2ZIVc50hnm9L8ymY1o373Qeh5Hg+MFcnUv7RVMDNt3sHF53iG20vVHfVbdrv8+zSLzL6w9T7JDRhrpzWXwSbaV1UYtELAXqF+np/gVBQV6bVXKMMjep5iInIIBUU95Kv18vWxHGvHCrRue6t5yfA+QDm1G1e+QS2U51KLlEqexvUTq6uT7o+h5cJU0RFoVirWkRPpmETSzEQ/9//oC5Ns+igSrRQ9qQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=SAfHNNjx; dkim-atps=neutral; spf=pass (client-ip=2600:3c04:e001:324:0:1991:8:25; helo=tor.source.kernel.org; envelope-from=brauner@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=SAfHNNjx; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2600:3c04:e001:324:0:1991:8:25; helo=tor.source.kernel.org; envelope-from=brauner@kernel.org; receiver=lists.ozlabs.org) Received: from tor.source.kernel.org (tor.source.kernel.org [IPv6:2600:3c04:e001:324:0:1991:8:25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4jKbB326Jwz2xjQ for ; Thu, 05 Nov 2026 06:30:03 +1100 (AEDT) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 6179F60A8D; Wed, 4 Nov 2026 19:30:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36BD01F000C1; Wed, 4 Nov 2026 19:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793820601; bh=KbfF7FDKuD8IgpxmK4NN79tddC7YrY9Y/+M606VrXfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SAfHNNjxvTql4E+z1yQcRoEm/3CalSsruYEaDFEAwD2MR1+O3Ye99A+nthRvUfnOh sNn+nv5DU4hxg8sd8IUitV774fqcqp2VIOWX8POpirUeoVFOvqQmSu0pEFGlLAHGYD U87bWU9TJDKpUyRG2Fvt11MmjA/bvZTaV8Xtwfl1DJLnDy1EfMx2ldZqvi8wS8l7pU z8u/IwnNqmGhZUVhezOwwUvQynv27Lczh9RmSaROx62H78AJOuM6lf9qnQZTrXgOYI GjXIYIMTlREUsQuzCmK2Ia6wH6NcuAlyzHfRrgkTdGYoEXU8eOGVb8ZJpacNOliGBs x5gOzg3clGATQ== From: Christian Brauner To: linux-fsdevel@vger.kernel.org Cc: Linus Torvalds , Jann Horn , Josef Bacik , Chris Mason , Jeff Layton , NeilBrown , Eric Dumazet , Thomas Gleixner , Al Viro , Jonathan Corbet , Christoph Hellwig , Greg Kroah-Hartman , Joel Granados , Kees Cook , Jan Kara , Jan Kara , linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, linux-um@lists.infradead.org, linux-wireless@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, ntfs3@lists.linux.dev, platform-driver-x86@vger.kernel.org, coreteam@netfilter.org, kexec@lists.infradead.org, linux-pci@vger.kernel.org, linux-sound@vger.kernel.org, netfilter-devel@vger.kernel.org, dri-devel@lists.freedesktop.org, ibm-acpi-devel@lists.sourceforge.net, jfs-discussion@lists.sourceforge.net, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-cifs@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-mm@kvack.org, linux-sh@vger.kernel.org, linux-usb@vger.kernel.org, samba-technical@lists.samba.org, sparclinux@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-doc@vger.kernel.org, linux-serial@vger.kernel.org, linux-atm-general@lists.sourceforge.net, Takashi Iwai , linux-input@vger.kernel.org, linux-raid@vger.kernel.org, linux-ext4@vger.kernel.org, linux-modules@vger.kernel.org, linux-debuggers@vger.kernel.org, "Christian Brauner (Amutable)" , Chuck Lever Subject: [PATCH RESEND v2 02/23] proc: add pde_pin() and pde_unpin() Date: Wed, 4 Nov 2026 20:29:47 +0100 Message-ID: <20261104-work-procfs-core-v2-2-76ace653a773@kernel.org> In-Reply-To: <20261104-work-procfs-core-v2-0-76ace653a773@kernel.org> References: <20261104-work-procfs-core-v2-0-76ace653a773@kernel.org> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , Precedence: list X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=6493; i=brauner@kernel.org; h=from:subject:message-id; bh=WCaLeEgGoNbtr6H3vvQuwG4filJLGelQOjwPMQ9yV2w=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMWS9bi/ebdDe0XTixBOHxbcsFINz3ObkSvH8+eO/6mfq0 8n+EQkaHaUsDGJcDLJiiiwO7Sbhcst5KjYbZWrAzGFlAhnCwMUpABMJCmdkmLjyc2loYnKPx58S sfPOs8+JCT3z1bl78s6yrbfys18/W8/IcOrbba3Kb0tMyr/aFPrY3mpm+ScfpZKvcvT5Zh+Tzv7 bTAA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Every call into an entry that can go away is wrapped in use_pde() and unuse_pde(), and a permanent entry is called straight away. The read, write, poll, ioctl, mmap and lseek methods all spell that out as the same if-else. The next patches add a few more callers. So put it into pde_pin() and pde_unpin() and use them everywhere. No functional changes. Signed-off-by: Christian Brauner (Amutable) --- fs/proc/inode.c | 116 +++++++++++++++++++++++++++----------------------------- 1 file changed, 55 insertions(+), 61 deletions(-) diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 18f6490bfe77..66a3688757dd 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -206,6 +206,18 @@ static void unuse_pde(struct proc_dir_entry *pde) complete(pde->pde_unload_completion); } +/* Pin an entry that can go away around a call into it, see use_pde(). */ +static bool pde_pin(struct proc_dir_entry *pde) +{ + return pde_is_permanent(pde) || use_pde(pde); +} + +static void pde_unpin(struct proc_dir_entry *pde) +{ + if (!pde_is_permanent(pde)) + unuse_pde(pde); +} + /* * At most 2 contexts can enter this function: the one doing the last * close on the descriptor and whoever is deleting PDE itself. @@ -275,14 +287,12 @@ void proc_entry_rundown(struct proc_dir_entry *de) static loff_t proc_reg_llseek(struct file *file, loff_t offset, int whence) { struct proc_dir_entry *pde = PDE(file_inode(file)); - loff_t rv = -EINVAL; + loff_t rv; - if (pde_is_permanent(pde)) { - return pde->proc_ops->proc_lseek(file, offset, whence); - } else if (use_pde(pde)) { - rv = pde->proc_ops->proc_lseek(file, offset, whence); - unuse_pde(pde); - } + if (!pde_pin(pde)) + return -EINVAL; + rv = pde->proc_ops->proc_lseek(file, offset, whence); + pde_unpin(pde); return rv; } @@ -291,13 +301,10 @@ static ssize_t proc_reg_read_iter(struct kiocb *iocb, struct iov_iter *iter) struct proc_dir_entry *pde = PDE(file_inode(iocb->ki_filp)); ssize_t ret; - if (pde_is_permanent(pde)) - return pde->proc_ops->proc_read_iter(iocb, iter); - - if (!use_pde(pde)) + if (!pde_pin(pde)) return -EIO; ret = pde->proc_ops->proc_read_iter(iocb, iter); - unuse_pde(pde); + pde_unpin(pde); return ret; } @@ -312,14 +319,12 @@ static ssize_t pde_read(struct proc_dir_entry *pde, struct file *file, char __us static ssize_t proc_reg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { struct proc_dir_entry *pde = PDE(file_inode(file)); - ssize_t rv = -EIO; + ssize_t rv; - if (pde_is_permanent(pde)) { - return pde_read(pde, file, buf, count, ppos); - } else if (use_pde(pde)) { - rv = pde_read(pde, file, buf, count, ppos); - unuse_pde(pde); - } + if (!pde_pin(pde)) + return -EIO; + rv = pde_read(pde, file, buf, count, ppos); + pde_unpin(pde); return rv; } @@ -334,14 +339,12 @@ static ssize_t pde_write(struct proc_dir_entry *pde, struct file *file, const ch static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct proc_dir_entry *pde = PDE(file_inode(file)); - ssize_t rv = -EIO; + ssize_t rv; - if (pde_is_permanent(pde)) { - return pde_write(pde, file, buf, count, ppos); - } else if (use_pde(pde)) { - rv = pde_write(pde, file, buf, count, ppos); - unuse_pde(pde); - } + if (!pde_pin(pde)) + return -EIO; + rv = pde_write(pde, file, buf, count, ppos); + pde_unpin(pde); return rv; } @@ -356,14 +359,12 @@ static __poll_t pde_poll(struct proc_dir_entry *pde, struct file *file, struct p static __poll_t proc_reg_poll(struct file *file, struct poll_table_struct *pts) { struct proc_dir_entry *pde = PDE(file_inode(file)); - __poll_t rv = DEFAULT_POLLMASK; + __poll_t rv; - if (pde_is_permanent(pde)) { - return pde_poll(pde, file, pts); - } else if (use_pde(pde)) { - rv = pde_poll(pde, file, pts); - unuse_pde(pde); - } + if (!pde_pin(pde)) + return DEFAULT_POLLMASK; + rv = pde_poll(pde, file, pts); + pde_unpin(pde); return rv; } @@ -378,14 +379,12 @@ static long pde_ioctl(struct proc_dir_entry *pde, struct file *file, unsigned in static long proc_reg_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct proc_dir_entry *pde = PDE(file_inode(file)); - long rv = -ENOTTY; + long rv; - if (pde_is_permanent(pde)) { - return pde_ioctl(pde, file, cmd, arg); - } else if (use_pde(pde)) { - rv = pde_ioctl(pde, file, cmd, arg); - unuse_pde(pde); - } + if (!pde_pin(pde)) + return -ENOTTY; + rv = pde_ioctl(pde, file, cmd, arg); + pde_unpin(pde); return rv; } @@ -401,13 +400,12 @@ static long pde_compat_ioctl(struct proc_dir_entry *pde, struct file *file, unsi static long proc_reg_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct proc_dir_entry *pde = PDE(file_inode(file)); - long rv = -ENOTTY; - if (pde_is_permanent(pde)) { - return pde_compat_ioctl(pde, file, cmd, arg); - } else if (use_pde(pde)) { - rv = pde_compat_ioctl(pde, file, cmd, arg); - unuse_pde(pde); - } + long rv; + + if (!pde_pin(pde)) + return -ENOTTY; + rv = pde_compat_ioctl(pde, file, cmd, arg); + pde_unpin(pde); return rv; } #else @@ -425,14 +423,12 @@ static int pde_mmap(struct proc_dir_entry *pde, struct file *file, struct vm_are static int proc_reg_mmap(struct file *file, struct vm_area_struct *vma) { struct proc_dir_entry *pde = PDE(file_inode(file)); - int rv = -EIO; + int rv; - if (pde_is_permanent(pde)) { - return pde_mmap(pde, file, vma); - } else if (use_pde(pde)) { - rv = pde_mmap(pde, file, vma); - unuse_pde(pde); - } + if (!pde_pin(pde)) + return -EIO; + rv = pde_mmap(pde, file, vma); + pde_unpin(pde); return rv; } @@ -457,14 +453,12 @@ proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long flags) { struct proc_dir_entry *pde = PDE(file_inode(file)); - unsigned long rv = -EIO; + unsigned long rv; - if (pde_is_permanent(pde)) { - return pde_get_unmapped_area(pde, file, orig_addr, len, pgoff, flags); - } else if (use_pde(pde)) { - rv = pde_get_unmapped_area(pde, file, orig_addr, len, pgoff, flags); - unuse_pde(pde); - } + if (!pde_pin(pde)) + return -EIO; + rv = pde_get_unmapped_area(pde, file, orig_addr, len, pgoff, flags); + pde_unpin(pde); return rv; } -- 2.53.0