linux/drivers/nubus/proc.c

202 lines
5.1 KiB
C
Raw Normal View History

License cleanup: add SPDX GPL-2.0 license identifier to files with no license Many source files in the tree are missing licensing information, which makes it harder for compliance tools to determine the correct license. By default all files without license information are under the default license of the kernel, which is GPL version 2. Update the files which contain no license information with the 'GPL-2.0' SPDX license identifier. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text. This patch is based on work done by Thomas Gleixner and Kate Stewart and Philippe Ombredanne. How this work was done: Patches were generated and checked against linux-4.14-rc6 for a subset of the use cases: - file had no licensing information it it. - file was a */uapi/* one with no licensing information in it, - file was a */uapi/* one with existing licensing information, Further patches will be generated in subsequent months to fix up cases where non-standard license headers were used, and references to license had to be inferred by heuristics based on keywords. The analysis to determine which SPDX License Identifier to be applied to a file was done in a spreadsheet of side by side results from of the output of two independent scanners (ScanCode & Windriver) producing SPDX tag:value files created by Philippe Ombredanne. Philippe prepared the base worksheet, and did an initial spot review of a few 1000 files. The 4.13 kernel was the starting point of the analysis with 60,537 files assessed. Kate Stewart did a file by file comparison of the scanner results in the spreadsheet to determine which SPDX license identifier(s) to be applied to the file. She confirmed any determination that was not immediately clear with lawyers working with the Linux Foundation. Criteria used to select files for SPDX license identifier tagging was: - Files considered eligible had to be source code files. - Make and config files were included as candidates if they contained >5 lines of source - File already had some variant of a license header in it (even if <5 lines). All documentation files were explicitly excluded. The following heuristics were used to determine which SPDX license identifiers to apply. - when both scanners couldn't find any license traces, file was considered to have no license information in it, and the top level COPYING file license applied. For non */uapi/* files that summary was: SPDX license identifier # files ---------------------------------------------------|------- GPL-2.0 11139 and resulted in the first patch in this series. If that file was a */uapi/* path one, it was "GPL-2.0 WITH Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was: SPDX license identifier # files ---------------------------------------------------|------- GPL-2.0 WITH Linux-syscall-note 930 and resulted in the second patch in this series. - if a file had some form of licensing information in it, and was one of the */uapi/* ones, it was denoted with the Linux-syscall-note if any GPL family license was found in the file or had no licensing in it (per prior point). Results summary: SPDX license identifier # files ---------------------------------------------------|------ GPL-2.0 WITH Linux-syscall-note 270 GPL-2.0+ WITH Linux-syscall-note 169 ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21 ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17 LGPL-2.1+ WITH Linux-syscall-note 15 GPL-1.0+ WITH Linux-syscall-note 14 ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5 LGPL-2.0+ WITH Linux-syscall-note 4 LGPL-2.1 WITH Linux-syscall-note 3 ((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3 ((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1 and that resulted in the third patch in this series. - when the two scanners agreed on the detected license(s), that became the concluded license(s). - when there was disagreement between the two scanners (one detected a license but the other didn't, or they both detected different licenses) a manual inspection of the file occurred. - In most cases a manual inspection of the information in the file resulted in a clear resolution of the license that should apply (and which scanner probably needed to revisit its heuristics). - When it was not immediately clear, the license identifier was confirmed with lawyers working with the Linux Foundation. - If there was any question as to the appropriate license identifier, the file was flagged for further research and to be revisited later in time. In total, over 70 hours of logged manual review was done on the spreadsheet to determine the SPDX license identifiers to apply to the source files by Kate, Philippe, Thomas and, in some cases, confirmation by lawyers working with the Linux Foundation. Kate also obtained a third independent scan of the 4.13 code base from FOSSology, and compared selected files where the other two scanners disagreed against that SPDX file, to see if there was new insights. The Windriver scanner is based on an older version of FOSSology in part, so they are related. Thomas did random spot checks in about 500 files from the spreadsheets for the uapi headers and agreed with SPDX license identifier in the files he inspected. For the non-uapi files Thomas did random spot checks in about 15000 files. In initial set of patches against 4.14-rc6, 3 files were found to have copy/paste license identifier errors, and have been fixed to reflect the correct identifier. Additionally Philippe spent 10 hours this week doing a detailed manual inspection and review of the 12,461 patched files from the initial patch version early this week with: - a full scancode scan run, collecting the matched texts, detected license ids and scores - reviewing anything where there was a license detected (about 500+ files) to ensure that the applied SPDX license was correct - reviewing anything where there was no detection but the patch license was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied SPDX license was correct This produced a worksheet with 20 files needing minor correction. This worksheet was then exported into 3 different .csv files for the different types of files to be modified. These .csv files were then reviewed by Greg. Thomas wrote a script to parse the csv files and add the proper SPDX tag to the file, in the format that the file expected. This script was further refined by Greg based on the output to detect more types of files automatically and to distinguish between header and source .c files (which need different comment types.) Finally Greg ran the script using the .csv files to generate the patches. Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org> Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
// SPDX-License-Identifier: GPL-2.0
/* drivers/nubus/proc.c: Proc FS interface for NuBus.
By David Huggins-Daines <dhd@debian.org>
Much code and many ideas from drivers/pci/proc.c:
Copyright (c) 1997, 1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
This is initially based on the Zorro and PCI interfaces. However,
it works somewhat differently. The intent is to provide a
structure in /proc analogous to the structure of the NuBus ROM
resources.
Therefore each board function gets a directory, which may in turn
contain subdirectories. Each slot resource is a file. Unrecognized
resources are empty files, since every resource ID requires a special
case (e.g. if the resource ID implies a directory or block, then its
value has to be interpreted as a slot ROM pointer etc.).
*/
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/nubus.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/uaccess.h>
#include <asm/byteorder.h>
/*
* /proc/bus/nubus/devices stuff
*/
static int
nubus_devices_proc_show(struct seq_file *m, void *v)
{
struct nubus_rsrc *fres;
for_each_func_rsrc(fres)
seq_printf(m, "%x\t%04x %04x %04x %04x\t%08lx\n",
fres->board->slot, fres->category, fres->type,
fres->dr_sw, fres->dr_hw, fres->board->slot_addr);
return 0;
}
static struct proc_dir_entry *proc_bus_nubus_dir;
/*
* /proc/bus/nubus/x/ stuff
*/
struct proc_dir_entry *nubus_proc_add_board(struct nubus_board *board)
{
char name[2];
if (!proc_bus_nubus_dir || !nubus_populate_procfs)
return NULL;
snprintf(name, sizeof(name), "%x", board->slot);
return proc_mkdir(name, proc_bus_nubus_dir);
}
/* The PDE private data for any directory under /proc/bus/nubus/x/
* is the bytelanes value for the board in slot x.
*/
struct proc_dir_entry *nubus_proc_add_rsrc_dir(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent,
struct nubus_board *board)
{
char name[9];
int lanes = board->lanes;
if (!procdir || !nubus_populate_procfs)
return NULL;
snprintf(name, sizeof(name), "%x", ent->type);
nubus: Remove proc entries before adding them The config ROMs on some Nubus cards contain mistakes such as resource duplication. This results in a warning from proc_register(): NuBus: Scanning NuBus slots. ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at fs/proc/generic.c:376 proc_register+0xbc/0xda proc_dir_entry '24/5' already registered Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 6.1.0-5-m68k #1 Debian 6.1.12-1 Stack from 00829d18: 00829d18 00451507 00451507 00000000 00000009 0038c57c 00451507 00386bae 00442945 0045f062 00000178 00868580 00868f50 00386c42 0045f062 00000178 00166fc8 00000009 00000000 00829d78 008685e4 0037f9ec 00000025 00248808 0045f0df 00829d94 00166fc8 0045f062 00000178 00000009 0045f0df 008689e4 008685e4 fafe3a20 00868980 00829df3 00829e32 00000024 00829dc0 00167332 00868980 00868580 00829e40 00248d36 00829df3 00008124 00868980 00248b0c Call Trace: [<0038c57c>] dump_stack+0xc/0x10 [<00386bae>] __warn+0x70/0xbc [<00386c42>] warn_slowpath_fmt+0x48/0x66 [<00166fc8>] proc_register+0xbc/0xda [<0037f9ec>] memcmp+0x0/0x56 [<00248808>] nubus_get_rsrc_str+0x0/0x5e [<00166fc8>] proc_register+0xbc/0xda [<00167332>] proc_create_single_data+0x40/0x48 [<00248d36>] nubus_proc_add_rsrc_mem+0x68/0xa4 [<00008124>] amiga_mksound+0xb8/0xc8 [<00248b0c>] nubus_proc_rsrc_show+0x0/0xa4 [<00386180>] memset+0x0/0x94 [<0024864a>] nubus_readdir+0x0/0x66 [<00560f35>] nubus_get_vendorinfo.isra.0+0x87/0x10e [<00560fb4>] nubus_get_vendorinfo.isra.0+0x106/0x10e [<00248d72>] nubus_proc_add_rsrc+0x0/0x8e [<001f6f50>] __dynamic_pr_debug+0x0/0x96 [<0038741e>] _printk+0x0/0x18 [<0016fafe>] kernfs_link_sibling+0x9a/0xaa [<00561cb0>] nubus_init+0x660/0x79c [<0037f7c6>] strcpy+0x0/0x1c [<0003f58c>] parse_args+0x0/0x308 [<00002104>] do_one_initcall+0x0/0x184 [<00561650>] nubus_init+0x0/0x79c [<00010000>] frc1_dst+0xe/0x14 [<00002172>] do_one_initcall+0x6e/0x184 [<0037f7c6>] strcpy+0x0/0x1c [<0003f58c>] parse_args+0x0/0x308 [<00002104>] do_one_initcall+0x0/0x184 [<0054b25c>] kernel_init_freeable+0x192/0x19c [<00561650>] nubus_init+0x0/0x79c [<0038c6c4>] kernel_init+0x0/0xec [<0038c6d8>] kernel_init+0x14/0xec [<0038c6c4>] kernel_init+0x0/0xec [<0000297c>] ret_from_kernel_thread+0xc/0x14 ---[ end trace 0000000000000000 ]--- This particular card (a Radius video card) contains a duplicated resource hence the /proc/bus/nubus/a/1/24/5 entry got registered twice. (A date resource has ID 5, the vendor info directory has ID 24) The solution for this is to remove a potentially pre-existing entry before adding the procfs entry for the resource. Reported-and-tested-by: Stan Johnson <userm57@yahoo.com> Signed-off-by: Finn Thain <fthain@linux-m68k.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/dd1b560bbe426b351cdbb3bbf89414753c3d0117.1679446472.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2023-03-22 08:54:32 +08:00
remove_proc_subtree(name, procdir);
return proc_mkdir_data(name, 0555, procdir, (void *)lanes);
}
/* The PDE private data for a file under /proc/bus/nubus/x/ is a pointer to
* an instance of the following structure, which gives the location and size
* of the resource data in the slot ROM. For slot resources which hold only a
* small integer, this integer value is stored directly and size is set to 0.
* A NULL private data pointer indicates an unrecognized resource.
*/
struct nubus_proc_pde_data {
unsigned char *res_ptr;
unsigned int res_size;
};
static struct nubus_proc_pde_data *
nubus_proc_alloc_pde_data(unsigned char *ptr, unsigned int size)
{
struct nubus_proc_pde_data *pded;
pded = kmalloc(sizeof(*pded), GFP_KERNEL);
if (!pded)
return NULL;
pded->res_ptr = ptr;
pded->res_size = size;
return pded;
}
static int nubus_proc_rsrc_show(struct seq_file *m, void *v)
{
struct inode *inode = m->private;
struct nubus_proc_pde_data *pded;
pded = pde_data(inode);
if (!pded)
return 0;
if (pded->res_size > m->size)
return -EFBIG;
if (pded->res_size) {
int lanes = (int)proc_get_parent_data(inode);
struct nubus_dirent ent;
if (!lanes)
return 0;
ent.mask = lanes;
ent.base = pded->res_ptr;
ent.data = 0;
nubus_seq_write_rsrc_mem(m, &ent, pded->res_size);
} else {
unsigned int data = (unsigned int)pded->res_ptr;
seq_putc(m, data >> 16);
seq_putc(m, data >> 8);
seq_putc(m, data >> 0);
}
return 0;
}
nubus: Partially revert proc_create_single_data() conversion The conversion to proc_create_single_data() introduced a regression whereby reading a file in /proc/bus/nubus results in a seg fault: # grep -r . /proc/bus/nubus/e/ Data read fault at 0x00000020 in Super Data (pc=0x1074c2) BAD KERNEL BUSERR Oops: 00000000 Modules linked in: PC: [<001074c2>] PDE_DATA+0xc/0x16 SR: 2010 SP: 38284958 a2: 01152370 d0: 00000001 d1: 01013000 d2: 01002790 d3: 00000000 d4: 00000001 d5: 0008ce2e a0: 00000000 a1: 00222a40 Process grep (pid: 45, task=142f8727) Frame format=B ssw=074d isc=2008 isb=4e5e daddr=00000020 dobuf=01199e70 baddr=001074c8 dibuf=ffffffff ver=f Stack from 01199e48: 01199e70 00222a58 01002790 00000000 011a3000 01199eb0 015000c0 00000000 00000000 01199ec0 01199ec0 000d551a 011a3000 00000001 00000000 00018000 d003f000 00000003 00000001 0002800d 01052840 01199fa8 c01f8000 00000000 00000029 0b532b80 00000000 00000000 00000029 0b532b80 01199ee4 00103640 011198c0 d003f000 00018000 01199fa8 00000000 011198c0 00000000 01199f4c 000b3344 011198c0 d003f000 00018000 01199fa8 00000000 00018000 011198c0 Call Trace: [<00222a58>] nubus_proc_rsrc_show+0x18/0xa0 [<000d551a>] seq_read+0xc4/0x510 [<00018000>] fp_fcos+0x2/0x82 [<0002800d>] __sys_setreuid+0x115/0x1c6 [<00103640>] proc_reg_read+0x5c/0xb0 [<00018000>] fp_fcos+0x2/0x82 [<000b3344>] __vfs_read+0x2c/0x13c [<00018000>] fp_fcos+0x2/0x82 [<00018000>] fp_fcos+0x2/0x82 [<000b8aa2>] sys_statx+0x60/0x7e [<000b34b6>] vfs_read+0x62/0x12a [<00018000>] fp_fcos+0x2/0x82 [<00018000>] fp_fcos+0x2/0x82 [<000b39c2>] ksys_read+0x48/0xbe [<00018000>] fp_fcos+0x2/0x82 [<000b3a4e>] sys_read+0x16/0x1a [<00018000>] fp_fcos+0x2/0x82 [<00002b84>] syscall+0x8/0xc [<00018000>] fp_fcos+0x2/0x82 [<0000c016>] not_ext+0xa/0x18 Code: 4e5e 4e75 4e56 0000 206e 0008 2068 ffe8 <2068> 0020 2008 4e5e 4e75 4e56 0000 2f0b 206e 0008 2068 0004 2668 0020 206b ffe8 Disabling lock debugging due to kernel taint Segmentation fault The proc_create_single_data() conversion does not work because single_open(file, nubus_proc_rsrc_show, PDE_DATA(inode)) is not equivalent to the original code. Fixes: 3f3942aca6da ("proc: introduce proc_create_single{,_data}") Cc: Christoph Hellwig <hch@lst.de> Cc: stable@vger.kernel.org # 5.6+ Signed-off-by: Finn Thain <fthain@linux-m68k.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/d4e2a586e793cc8d9442595684ab8a077c0fe726.1678783919.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2023-03-14 16:51:59 +08:00
static int nubus_rsrc_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, nubus_proc_rsrc_show, inode);
}
static const struct proc_ops nubus_rsrc_proc_ops = {
.proc_open = nubus_rsrc_proc_open,
.proc_read = seq_read,
.proc_lseek = seq_lseek,
.proc_release = single_release,
};
void nubus_proc_add_rsrc_mem(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent,
unsigned int size)
{
char name[9];
struct nubus_proc_pde_data *pded;
if (!procdir || !nubus_populate_procfs)
return;
nubus: Call proc_mkdir() not more than once per slot directory This patch fixes the following WARNING. proc_dir_entry 'nubus/a' already registered Modules linked in: CPU: 0 PID: 1 Comm: swapper Tainted: G W 4.13.0-00036-gd57552077387 #1 Stack from 01c1bd9c: 01c1bd9c 003c2c8b 01c1bdc0 0001b0fe 00000000 00322f4a 01c43a20 01c43b0c 01c8c420 01c1bde8 0001b1b8 003a4ac3 00000148 000faa26 00000009 00000000 01c1bde0 003a4b6c 01c1bdfc 01c1be20 000faa26 003a4ac3 00000148 003a4b6c 01c43a71 01c8c471 01c10000 00326430 0043d00c 00000005 01c71a00 0020bce0 00322964 01c1be38 000fac04 01c43a20 01c8c420 01c1bee0 01c8c420 01c1be50 000fac4c 01c1bee0 00000000 01c43a20 00000000 01c1bee8 0020bd26 01c1bee0 Call Trace: [<0001b0fe>] __warn+0xae/0xde [<00322f4a>] memcmp+0x0/0x5c [<0001b1b8>] warn_slowpath_fmt+0x2e/0x36 [<000faa26>] proc_register+0xbe/0xd8 [<000faa26>] proc_register+0xbe/0xd8 [<00326430>] sprintf+0x0/0x20 [<0020bce0>] nubus_proc_attach_device+0x0/0x1b8 [<00322964>] strcpy+0x0/0x22 [<000fac04>] proc_mkdir_data+0x64/0x96 [<000fac4c>] proc_mkdir+0x16/0x1c [<0020bd26>] nubus_proc_attach_device+0x46/0x1b8 [<0020bce0>] nubus_proc_attach_device+0x0/0x1b8 [<00322964>] strcpy+0x0/0x22 [<00001ba6>] kernel_pg_dir+0xba6/0x1000 [<004339a2>] proc_bus_nubus_add_devices+0x1a/0x2e [<000faa40>] proc_create_data+0x0/0xf2 [<0003297c>] parse_args+0x0/0x2d4 [<00433a08>] nubus_proc_init+0x52/0x5a [<00433944>] nubus_init+0x0/0x44 [<00433982>] nubus_init+0x3e/0x44 [<000020dc>] do_one_initcall+0x38/0x196 [<000020a4>] do_one_initcall+0x0/0x196 [<0003297c>] parse_args+0x0/0x2d4 [<00322964>] strcpy+0x0/0x22 [<00040004>] __up_read+0xe/0x40 [<004231d4>] repair_env_string+0x0/0x7a [<0042312e>] kernel_init_freeable+0xee/0x194 [<00423146>] kernel_init_freeable+0x106/0x194 [<00433944>] nubus_init+0x0/0x44 [<000a6000>] kfree+0x0/0x156 [<0032768c>] kernel_init+0x0/0xda [<00327698>] kernel_init+0xc/0xda [<0032768c>] kernel_init+0x0/0xda [<00002a90>] ret_from_kernel_thread+0xc/0x14 ---[ end trace 14a6d619908ea253 ]--- ------------[ cut here ]------------ This gets repeated with each additional functional reasource. The problem here is the call to proc_mkdir() when the directory already exists. Each nubus_board gets a directory, such as /proc/bus/nubus/s/ where s is the hex slot number. Therefore, store the 'procdir' pointer in struct nubus_board instead of struct nubus_dev. Tested-by: Stan Johnson <userm57@yahoo.com> Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2018-01-14 06:37:13 +08:00
snprintf(name, sizeof(name), "%x", ent->type);
if (size)
pded = nubus_proc_alloc_pde_data(nubus_dirptr(ent), size);
else
pded = NULL;
nubus: Remove proc entries before adding them The config ROMs on some Nubus cards contain mistakes such as resource duplication. This results in a warning from proc_register(): NuBus: Scanning NuBus slots. ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at fs/proc/generic.c:376 proc_register+0xbc/0xda proc_dir_entry '24/5' already registered Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 6.1.0-5-m68k #1 Debian 6.1.12-1 Stack from 00829d18: 00829d18 00451507 00451507 00000000 00000009 0038c57c 00451507 00386bae 00442945 0045f062 00000178 00868580 00868f50 00386c42 0045f062 00000178 00166fc8 00000009 00000000 00829d78 008685e4 0037f9ec 00000025 00248808 0045f0df 00829d94 00166fc8 0045f062 00000178 00000009 0045f0df 008689e4 008685e4 fafe3a20 00868980 00829df3 00829e32 00000024 00829dc0 00167332 00868980 00868580 00829e40 00248d36 00829df3 00008124 00868980 00248b0c Call Trace: [<0038c57c>] dump_stack+0xc/0x10 [<00386bae>] __warn+0x70/0xbc [<00386c42>] warn_slowpath_fmt+0x48/0x66 [<00166fc8>] proc_register+0xbc/0xda [<0037f9ec>] memcmp+0x0/0x56 [<00248808>] nubus_get_rsrc_str+0x0/0x5e [<00166fc8>] proc_register+0xbc/0xda [<00167332>] proc_create_single_data+0x40/0x48 [<00248d36>] nubus_proc_add_rsrc_mem+0x68/0xa4 [<00008124>] amiga_mksound+0xb8/0xc8 [<00248b0c>] nubus_proc_rsrc_show+0x0/0xa4 [<00386180>] memset+0x0/0x94 [<0024864a>] nubus_readdir+0x0/0x66 [<00560f35>] nubus_get_vendorinfo.isra.0+0x87/0x10e [<00560fb4>] nubus_get_vendorinfo.isra.0+0x106/0x10e [<00248d72>] nubus_proc_add_rsrc+0x0/0x8e [<001f6f50>] __dynamic_pr_debug+0x0/0x96 [<0038741e>] _printk+0x0/0x18 [<0016fafe>] kernfs_link_sibling+0x9a/0xaa [<00561cb0>] nubus_init+0x660/0x79c [<0037f7c6>] strcpy+0x0/0x1c [<0003f58c>] parse_args+0x0/0x308 [<00002104>] do_one_initcall+0x0/0x184 [<00561650>] nubus_init+0x0/0x79c [<00010000>] frc1_dst+0xe/0x14 [<00002172>] do_one_initcall+0x6e/0x184 [<0037f7c6>] strcpy+0x0/0x1c [<0003f58c>] parse_args+0x0/0x308 [<00002104>] do_one_initcall+0x0/0x184 [<0054b25c>] kernel_init_freeable+0x192/0x19c [<00561650>] nubus_init+0x0/0x79c [<0038c6c4>] kernel_init+0x0/0xec [<0038c6d8>] kernel_init+0x14/0xec [<0038c6c4>] kernel_init+0x0/0xec [<0000297c>] ret_from_kernel_thread+0xc/0x14 ---[ end trace 0000000000000000 ]--- This particular card (a Radius video card) contains a duplicated resource hence the /proc/bus/nubus/a/1/24/5 entry got registered twice. (A date resource has ID 5, the vendor info directory has ID 24) The solution for this is to remove a potentially pre-existing entry before adding the procfs entry for the resource. Reported-and-tested-by: Stan Johnson <userm57@yahoo.com> Signed-off-by: Finn Thain <fthain@linux-m68k.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/dd1b560bbe426b351cdbb3bbf89414753c3d0117.1679446472.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2023-03-22 08:54:32 +08:00
remove_proc_subtree(name, procdir);
nubus: Partially revert proc_create_single_data() conversion The conversion to proc_create_single_data() introduced a regression whereby reading a file in /proc/bus/nubus results in a seg fault: # grep -r . /proc/bus/nubus/e/ Data read fault at 0x00000020 in Super Data (pc=0x1074c2) BAD KERNEL BUSERR Oops: 00000000 Modules linked in: PC: [<001074c2>] PDE_DATA+0xc/0x16 SR: 2010 SP: 38284958 a2: 01152370 d0: 00000001 d1: 01013000 d2: 01002790 d3: 00000000 d4: 00000001 d5: 0008ce2e a0: 00000000 a1: 00222a40 Process grep (pid: 45, task=142f8727) Frame format=B ssw=074d isc=2008 isb=4e5e daddr=00000020 dobuf=01199e70 baddr=001074c8 dibuf=ffffffff ver=f Stack from 01199e48: 01199e70 00222a58 01002790 00000000 011a3000 01199eb0 015000c0 00000000 00000000 01199ec0 01199ec0 000d551a 011a3000 00000001 00000000 00018000 d003f000 00000003 00000001 0002800d 01052840 01199fa8 c01f8000 00000000 00000029 0b532b80 00000000 00000000 00000029 0b532b80 01199ee4 00103640 011198c0 d003f000 00018000 01199fa8 00000000 011198c0 00000000 01199f4c 000b3344 011198c0 d003f000 00018000 01199fa8 00000000 00018000 011198c0 Call Trace: [<00222a58>] nubus_proc_rsrc_show+0x18/0xa0 [<000d551a>] seq_read+0xc4/0x510 [<00018000>] fp_fcos+0x2/0x82 [<0002800d>] __sys_setreuid+0x115/0x1c6 [<00103640>] proc_reg_read+0x5c/0xb0 [<00018000>] fp_fcos+0x2/0x82 [<000b3344>] __vfs_read+0x2c/0x13c [<00018000>] fp_fcos+0x2/0x82 [<00018000>] fp_fcos+0x2/0x82 [<000b8aa2>] sys_statx+0x60/0x7e [<000b34b6>] vfs_read+0x62/0x12a [<00018000>] fp_fcos+0x2/0x82 [<00018000>] fp_fcos+0x2/0x82 [<000b39c2>] ksys_read+0x48/0xbe [<00018000>] fp_fcos+0x2/0x82 [<000b3a4e>] sys_read+0x16/0x1a [<00018000>] fp_fcos+0x2/0x82 [<00002b84>] syscall+0x8/0xc [<00018000>] fp_fcos+0x2/0x82 [<0000c016>] not_ext+0xa/0x18 Code: 4e5e 4e75 4e56 0000 206e 0008 2068 ffe8 <2068> 0020 2008 4e5e 4e75 4e56 0000 2f0b 206e 0008 2068 0004 2668 0020 206b ffe8 Disabling lock debugging due to kernel taint Segmentation fault The proc_create_single_data() conversion does not work because single_open(file, nubus_proc_rsrc_show, PDE_DATA(inode)) is not equivalent to the original code. Fixes: 3f3942aca6da ("proc: introduce proc_create_single{,_data}") Cc: Christoph Hellwig <hch@lst.de> Cc: stable@vger.kernel.org # 5.6+ Signed-off-by: Finn Thain <fthain@linux-m68k.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/d4e2a586e793cc8d9442595684ab8a077c0fe726.1678783919.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2023-03-14 16:51:59 +08:00
proc_create_data(name, S_IFREG | 0444, procdir,
&nubus_rsrc_proc_ops, pded);
}
void nubus_proc_add_rsrc(struct proc_dir_entry *procdir,
const struct nubus_dirent *ent)
{
char name[9];
unsigned char *data = (unsigned char *)ent->data;
if (!procdir || !nubus_populate_procfs)
return;
snprintf(name, sizeof(name), "%x", ent->type);
nubus: Remove proc entries before adding them The config ROMs on some Nubus cards contain mistakes such as resource duplication. This results in a warning from proc_register(): NuBus: Scanning NuBus slots. ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at fs/proc/generic.c:376 proc_register+0xbc/0xda proc_dir_entry '24/5' already registered Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 6.1.0-5-m68k #1 Debian 6.1.12-1 Stack from 00829d18: 00829d18 00451507 00451507 00000000 00000009 0038c57c 00451507 00386bae 00442945 0045f062 00000178 00868580 00868f50 00386c42 0045f062 00000178 00166fc8 00000009 00000000 00829d78 008685e4 0037f9ec 00000025 00248808 0045f0df 00829d94 00166fc8 0045f062 00000178 00000009 0045f0df 008689e4 008685e4 fafe3a20 00868980 00829df3 00829e32 00000024 00829dc0 00167332 00868980 00868580 00829e40 00248d36 00829df3 00008124 00868980 00248b0c Call Trace: [<0038c57c>] dump_stack+0xc/0x10 [<00386bae>] __warn+0x70/0xbc [<00386c42>] warn_slowpath_fmt+0x48/0x66 [<00166fc8>] proc_register+0xbc/0xda [<0037f9ec>] memcmp+0x0/0x56 [<00248808>] nubus_get_rsrc_str+0x0/0x5e [<00166fc8>] proc_register+0xbc/0xda [<00167332>] proc_create_single_data+0x40/0x48 [<00248d36>] nubus_proc_add_rsrc_mem+0x68/0xa4 [<00008124>] amiga_mksound+0xb8/0xc8 [<00248b0c>] nubus_proc_rsrc_show+0x0/0xa4 [<00386180>] memset+0x0/0x94 [<0024864a>] nubus_readdir+0x0/0x66 [<00560f35>] nubus_get_vendorinfo.isra.0+0x87/0x10e [<00560fb4>] nubus_get_vendorinfo.isra.0+0x106/0x10e [<00248d72>] nubus_proc_add_rsrc+0x0/0x8e [<001f6f50>] __dynamic_pr_debug+0x0/0x96 [<0038741e>] _printk+0x0/0x18 [<0016fafe>] kernfs_link_sibling+0x9a/0xaa [<00561cb0>] nubus_init+0x660/0x79c [<0037f7c6>] strcpy+0x0/0x1c [<0003f58c>] parse_args+0x0/0x308 [<00002104>] do_one_initcall+0x0/0x184 [<00561650>] nubus_init+0x0/0x79c [<00010000>] frc1_dst+0xe/0x14 [<00002172>] do_one_initcall+0x6e/0x184 [<0037f7c6>] strcpy+0x0/0x1c [<0003f58c>] parse_args+0x0/0x308 [<00002104>] do_one_initcall+0x0/0x184 [<0054b25c>] kernel_init_freeable+0x192/0x19c [<00561650>] nubus_init+0x0/0x79c [<0038c6c4>] kernel_init+0x0/0xec [<0038c6d8>] kernel_init+0x14/0xec [<0038c6c4>] kernel_init+0x0/0xec [<0000297c>] ret_from_kernel_thread+0xc/0x14 ---[ end trace 0000000000000000 ]--- This particular card (a Radius video card) contains a duplicated resource hence the /proc/bus/nubus/a/1/24/5 entry got registered twice. (A date resource has ID 5, the vendor info directory has ID 24) The solution for this is to remove a potentially pre-existing entry before adding the procfs entry for the resource. Reported-and-tested-by: Stan Johnson <userm57@yahoo.com> Signed-off-by: Finn Thain <fthain@linux-m68k.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/dd1b560bbe426b351cdbb3bbf89414753c3d0117.1679446472.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2023-03-22 08:54:32 +08:00
remove_proc_subtree(name, procdir);
nubus: Partially revert proc_create_single_data() conversion The conversion to proc_create_single_data() introduced a regression whereby reading a file in /proc/bus/nubus results in a seg fault: # grep -r . /proc/bus/nubus/e/ Data read fault at 0x00000020 in Super Data (pc=0x1074c2) BAD KERNEL BUSERR Oops: 00000000 Modules linked in: PC: [<001074c2>] PDE_DATA+0xc/0x16 SR: 2010 SP: 38284958 a2: 01152370 d0: 00000001 d1: 01013000 d2: 01002790 d3: 00000000 d4: 00000001 d5: 0008ce2e a0: 00000000 a1: 00222a40 Process grep (pid: 45, task=142f8727) Frame format=B ssw=074d isc=2008 isb=4e5e daddr=00000020 dobuf=01199e70 baddr=001074c8 dibuf=ffffffff ver=f Stack from 01199e48: 01199e70 00222a58 01002790 00000000 011a3000 01199eb0 015000c0 00000000 00000000 01199ec0 01199ec0 000d551a 011a3000 00000001 00000000 00018000 d003f000 00000003 00000001 0002800d 01052840 01199fa8 c01f8000 00000000 00000029 0b532b80 00000000 00000000 00000029 0b532b80 01199ee4 00103640 011198c0 d003f000 00018000 01199fa8 00000000 011198c0 00000000 01199f4c 000b3344 011198c0 d003f000 00018000 01199fa8 00000000 00018000 011198c0 Call Trace: [<00222a58>] nubus_proc_rsrc_show+0x18/0xa0 [<000d551a>] seq_read+0xc4/0x510 [<00018000>] fp_fcos+0x2/0x82 [<0002800d>] __sys_setreuid+0x115/0x1c6 [<00103640>] proc_reg_read+0x5c/0xb0 [<00018000>] fp_fcos+0x2/0x82 [<000b3344>] __vfs_read+0x2c/0x13c [<00018000>] fp_fcos+0x2/0x82 [<00018000>] fp_fcos+0x2/0x82 [<000b8aa2>] sys_statx+0x60/0x7e [<000b34b6>] vfs_read+0x62/0x12a [<00018000>] fp_fcos+0x2/0x82 [<00018000>] fp_fcos+0x2/0x82 [<000b39c2>] ksys_read+0x48/0xbe [<00018000>] fp_fcos+0x2/0x82 [<000b3a4e>] sys_read+0x16/0x1a [<00018000>] fp_fcos+0x2/0x82 [<00002b84>] syscall+0x8/0xc [<00018000>] fp_fcos+0x2/0x82 [<0000c016>] not_ext+0xa/0x18 Code: 4e5e 4e75 4e56 0000 206e 0008 2068 ffe8 <2068> 0020 2008 4e5e 4e75 4e56 0000 2f0b 206e 0008 2068 0004 2668 0020 206b ffe8 Disabling lock debugging due to kernel taint Segmentation fault The proc_create_single_data() conversion does not work because single_open(file, nubus_proc_rsrc_show, PDE_DATA(inode)) is not equivalent to the original code. Fixes: 3f3942aca6da ("proc: introduce proc_create_single{,_data}") Cc: Christoph Hellwig <hch@lst.de> Cc: stable@vger.kernel.org # 5.6+ Signed-off-by: Finn Thain <fthain@linux-m68k.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/d4e2a586e793cc8d9442595684ab8a077c0fe726.1678783919.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2023-03-14 16:51:59 +08:00
proc_create_data(name, S_IFREG | 0444, procdir,
&nubus_rsrc_proc_ops,
nubus_proc_alloc_pde_data(data, 0));
}
/*
* /proc/nubus stuff
*/
void __init nubus_proc_init(void)
{
proc_create_single("nubus", 0, NULL, nubus_proc_show);
proc_bus_nubus_dir = proc_mkdir("bus/nubus", NULL);
if (!proc_bus_nubus_dir)
return;
proc_create_single("devices", 0, proc_bus_nubus_dir,
nubus_devices_proc_show);
}