From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E565C607074A for ; Wed, 4 Nov 2026 19:43:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=2wSmWrRG; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=KZ1raRI6 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=Q/r9Fhg2Z0/w3CqoKnG0DKCxv08Z9PpiFGMKT+radK4=; b=2wSmWrRGBotv5Q lnNz7AX+mQqf5ltdDzsY0a4IhYbkcQNYdRBPYmcXYz6o9LrpBwDNJMIWFmpSMxJqcN+RyaeoW1GPe 9p2krUD5qkNgB19b3ZIKxQq3ODVOMiRHABf3ZBgHQvb7kIA4Vv1SuaFO7J8Sxg9BSEnrjCL0qWcfL 67IVjLj8Z3tJeLqC+BSRnTFnokP//EgYAPqCvCIrLkKI8JfAYwHHTnz/9UIfVJJ9yabOm7ApP6C5r t6x49aztYLV0FW6lc/UnrQwMldCJ/2tXlnicUGvjQ4wi5aDzfw/m8nWLbd3jKdHlcOgF3EFjhnm0O f8xZk22dmV4sSWW6zXZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xOgtb-00000006jBk-0v0t; Wed, 04 Nov 2026 19:43:43 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xOgtZ-00000006jAu-0Mn1; Wed, 04 Nov 2026 19:43:41 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 75CC343D85; Wed, 4 Nov 2026 19:43:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C7721F000C1; Wed, 4 Nov 2026 19:43:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793821420; bh=Q/r9Fhg2Z0/w3CqoKnG0DKCxv08Z9PpiFGMKT+radK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KZ1raRI68GhT/XlXjqAtcujYMj6ekVEJnVbT4x9Mzm70KXld0AlBQN8rUNIo5mZiB v3zJfRoTx9WShvsapVrEfRLIh+JuiUCfmb2ZUX+PNF5aJyawlAjxV+5tufKSc1hVWN VvPh24+PpQcho7riTX/8XuQc8iS04jARE2V6OzsbbxkTRQ7Vo0aBZoFeGZZv1hLQVS Hkr6MNWkpqa3975/oQHgz3pITvq9gQ4JYehhDDJQLj/WHKcKawkPFVUPWwmjxCdrYt 4tLwomtdk6B+7RV5x8bRuXG3/mtBiQigiySV/b1v9b2+3q4lMlVQMUvKy0hVdMduzc enqFVJsBMRBJA== 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 05/26] PCI/proc: let procfs handle the ioctls Date: Wed, 4 Nov 2026 20:43:25 +0100 Message-ID: <20261104-work-procfs-drivers-v2-5-245e54e87116@kernel.org> In-Reply-To: <20261104-work-procfs-drivers-v2-0-245e54e87116@kernel.org> References: <20261104-work-procfs-drivers-v2-0-245e54e87116@kernel.org> 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=2106; i=brauner@kernel.org; h=from:subject:message-id; bh=2F6i7ISm6IP0WfraLShTjEfHw8rrOdRgm90gAFJMkQE=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMWS97qrM1Vwiw7U2st/BZEXS4y1RZxM3sfk86zgQ1MPQt WzJg3/dHaUsDGJcDLJiiiwO7Sbhcst5KjYbZWrAzGFlAhnCwMUpABPZxsXIcNz/xGT2BwfN+fis PXL3f3M6eWnrx6KbjrqRz9jkwj7pRzAydGzMjXAJ2Pg4UJN1p/usyxfL45+dWzV/cmURT1nhaud 6BgA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Content-Transfer-Encoding: 8bit X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-um" X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,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 The PCIIOC_* commands take and return plain values and don't touch userspace memory. Implement ->proc_ioctl_buf() and list them with nothing to copy. 32-bit tasks go through the same table, so the compat hook goes away. Unknown commands fail with -ENOTTY from procfs now instead of -EINVAL, and instead of -EPERM under lockdown, since they never reach the handler. Signed-off-by: Christian Brauner (Amutable) --- drivers/pci/proc.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index a8d7469f222b..6b0cb5bcbea3 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c @@ -192,8 +192,7 @@ struct pci_filp_private { }; #endif /* HAVE_PCI_MMAP */ -static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) +static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd, void *arg) { struct pci_dev *dev = pde_data(file_inode(file)); #ifdef HAVE_PCI_MMAP @@ -321,16 +320,23 @@ static int proc_bus_pci_release(struct inode *inode, struct file *file) } #endif /* HAVE_PCI_MMAP */ +/* The commands take and return plain values. */ +static const struct proc_ioctl_arg proc_bus_pci_ioctl_args[] = { + PROC_IOCTL_ARG(PCIIOC_CONTROLLER, 0, 0), + PROC_IOCTL_ARG(PCIIOC_MMAP_IS_IO, 0, 0), + PROC_IOCTL_ARG(PCIIOC_MMAP_IS_MEM, 0, 0), + PROC_IOCTL_ARG(PCIIOC_WRITE_COMBINE, 0, 0), +}; + static const struct proc_ops proc_bus_pci_ops = { .proc_flags = PROC_ENTRY_SHORT_WRITES, .proc_lseek = proc_bus_pci_lseek, .proc_read_buf = proc_bus_pci_read, .proc_write_buf = proc_bus_pci_write, .proc_write_size = PCI_CFG_SPACE_EXP_SIZE, - .proc_ioctl = proc_bus_pci_ioctl, -#ifdef CONFIG_COMPAT - .proc_compat_ioctl = proc_bus_pci_ioctl, -#endif + .proc_ioctl_buf = proc_bus_pci_ioctl, + .proc_ioctl_args = proc_bus_pci_ioctl_args, + .proc_nr_ioctl_args = ARRAY_SIZE(proc_bus_pci_ioctl_args), #ifdef HAVE_PCI_MMAP .proc_open = proc_bus_pci_open, .proc_release = proc_bus_pci_release, -- 2.53.0