18 Nov, 2010

1 commit


12 Nov, 2010

1 commit

  • The checks for valid mmaps of PCI resources made through /proc/bus/pci files
    that were introduced in 9eff02e2042f96fb2aedd02e032eca1c5333d767 have several
    problems:

    1. mmap() calls on /proc/bus/pci files are made with real file offsets > 0,
    whereas under /sys/bus/pci/devices, the start of the resource corresponds
    to offset 0. This may lead to false negatives in pci_mmap_fits(), which
    implicitly assumes the /sys/bus/pci/devices layout.

    2. The loop in proc_bus_pci_mmap doesn't skip empty resouces. This leads
    to false positives, because pci_mmap_fits() doesn't treat empty resources
    correctly (the calculated size is 1 << (8*sizeof(resource_size_t)-PAGE_SHIFT)
    in this case!).

    3. If a user maps resources with BAR > 0, pci_mmap_fits will emit bogus
    WARNINGS for the first resources that don't fit until the correct one is found.

    On many controllers the first 2-4 BARs are used, and the others are empty.
    In this case, an mmap attempt will first fail on the non-empty BARs
    (including the "right" BAR because of 1.) and emit bogus WARNINGS because
    of 3., and finally succeed on the first empty BAR because of 2.
    This is certainly not the intended behaviour.

    This patch addresses all 3 issues.
    Updated with an enum type for the additional parameter for pci_mmap_fits().

    Cc: stable@kernel.org
    Signed-off-by: Martin Wilck
    Signed-off-by: Jesse Barnes

    Martin Wilck
     

16 Oct, 2010

1 commit

  • All operations in the pci procfs ioctl functions are
    atomic, so no lock is needed here.

    Also add a compat_ioctl method, since all the commands
    are compatible in 32 bit mode.

    Signed-off-by: Arnd Bergmann
    Cc: Jesse Barnes
    Cc: Tejun Heo
    Cc: linux-pci@vger.kernel.org
    Signed-off-by: Jesse Barnes

    Arnd Bergmann
     

31 Jul, 2010

2 commits

  • Use for_each_pci_dev() to simplify the code.

    Signed-off-by: Kulikov Vasiliy
    Signed-off-by: Jesse Barnes

    Kulikov Vasiliy
     
  • I encountered the problem that /proc/bus/pci/XX/YY is not removed even
    after the corresponding device is hot-removed, if the file is still
    being opened. In addtion, accessing this file in this situation causes
    kernel panic (see below).

    Becasue the pci_proc_detach_device() doesn't call remove_proc_entry()
    if struct proc_dir_entry->count > 1, access to /proc/bus/pci/XX/YY
    would refer to struct pci_dev that was already freed.

    Though I don't know why the check for proc_dir_entry->count was added,
    I don't think it is needed. Removing this check fixes the problem.

    Steps to reproduce
    ------------------
    # cd /sys/bus/pci/slots/2/
    # PROC_BUS_PCI_FILE=/proc/bus/pci/`awk -F: '{print $2"/"$3}' < address`.0
    # sleep 10000 < $PROC_BUS_PCI_FILE &
    # echo 0 > power
    # while true; do cat $PROC_BUS_PCI_FILE > /dev/null; done

    Oops Messages
    -------------
    BUG: unable to handle kernel NULL pointer dereference at 00000042
    IP: [] pci_user_read_config_dword+0x65/0xa0
    *pdpt = 000000002185e001 *pde = 0000000476a79067
    Oops: 0000 [#1] SMP
    last sysfs file: /sys/devices/pci0000:00/0000:00:1c.0/0000:10:00.0/local_cpus
    Modules linked in: autofs4 sunrpc cpufreq_ondemand acpi_cpufreq ipv6 dm_mirror dm_region_hash dm_log dm_mod e1000e i2c_i801 i2c_core iTCO_wdt igb sg pcspkr dca iTCO_vendor_support ext4 mbcache jbd2 sd_mod crc_t10dif lpfc mptsas scsi_transport_fc mptscsih mptbase scsi_tgt scsi_transport_sas [last unloaded: microcode]

    Pid: 2997, comm: cat Not tainted 2.6.34-kk #32 SB/PRIMEQUEST 1800E
    EIP: 0060:[] EFLAGS: 00010046 CPU: 19
    EIP is at pci_user_read_config_dword+0x65/0xa0
    EAX: 00000002 EBX: e44f1800 ECX: e144df14 EDX: 155668c7
    ESI: 00000087 EDI: 00000000 EBP: e144df40 ESP: e144df0c
    DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
    Process cat (pid: 2997, ti=e144c000 task=e26f2570 task.ti=e144c000)
    Stack:
    c09ceac0 c0570f72 ffffffff 08c57000 00000000 00001000 e44f1800 c05d2404
    e144df40 00001000 00000000 00001000 08c57000 3093ae50 e420cb40 e358d5c0
    c05d2300 fffffffb c054984f e144df9c 00008000 08c57000 e358d5c0 00008000
    Call Trace:
    [] ? security_capable+0x22/0x30
    [] ? proc_bus_pci_read+0x104/0x220
    [] ? proc_bus_pci_read+0x0/0x220
    [] ? proc_reg_read+0x5f/0x90
    [] ? proc_reg_read+0x0/0x90
    [] ? vfs_read+0x9d/0x190
    [] ? audit_syscall_entry+0x204/0x230
    [] ? sys_read+0x41/0x70
    [] ? sysenter_do_call+0x12/0x28
    Code: b4 26 00 00 00 00 b8 20 88 b1 c0 c7 44 24 08 ff ff ff ff e8 3e 52 22 00 f6 83 24 04 00 00 20 75 34 8b 43 08 8d 4c 24 08 8b 53 1c 70 40 89 4c 24 04 89 f9 c7 04 24 04 00 00 00 ff 16 89 c6 f0
    EIP: [] pci_user_read_config_dword+0x65/0xa0 SS:ESP 0068:e144df0c
    CR2: 0000000000000042

    Acked-by: Greg Kroah-Hartman
    Signed-off-by: Kenji Kaneshige
    Signed-off-by: Jesse Barnes

    Kenji Kaneshige
     

30 Mar, 2010

1 commit

  • …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

08 Jan, 2009

2 commits

  • This patch moves all definitions of the PCI resource names to an 'enum',
    and also replaces some hard-coded resource variables with symbol
    names. This change eases introduction of device specific resources.

    Reviewed-by: Bjorn Helgaas
    Signed-off-by: Yu Zhao
    Signed-off-by: Jesse Barnes

    Yu Zhao
     
  • /proc/bus/pci allows you to mmap resource ranges too, so we should probably be
    checking to make sure the mapping is somewhat valid. Uses the same code as the recent sysfs mmap range checking patch from Linus.

    Acked-by: David Miller
    Signed-off-by: Jesse Barnes

    Jesse Barnes
     

23 Jul, 2008

1 commit

  • drivers/pci/proc.c:91:3: warning: cast from restricted __le16
    drivers/pci/proc.c:100:3: warning: cast from restricted __le32
    drivers/pci/proc.c:109:3: warning: cast from restricted __le16
    drivers/pci/proc.c:161:40: warning: cast to restricted __le16
    drivers/pci/proc.c:170:41: warning: cast to restricted __le32
    drivers/pci/proc.c:179:40: warning: cast to restricted __le16

    Signed-off-by: Harvey Harrison
    Signed-off-by: Jesse Barnes

    Harvey Harrison
     

11 Jun, 2008

2 commits


29 Apr, 2008

2 commits

  • Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
    be setup before gluing PDE to main tree.

    Signed-off-by: Denis V. Lunev
    Cc: Greg Kroah-Hartman
    Cc: Alexey Dobriyan
    Cc: "Eric W. Biederman"
    Cc: Peter Osterlund
    Cc: Bartlomiej Zolnierkiewicz
    Cc: Dmitry Torokhov
    Cc: Neil Brown
    Cc: Mauro Carvalho Chehab
    Cc: Bjorn Helgaas
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Denis V. Lunev
     
  • Remove proc_bus export and variable itself. Using pathnames works fine
    and is slightly more understandable and greppable.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     

22 Feb, 2008

1 commit

  • Fix wrong counter check for proc_dir_entry in pci_proc_detach_device().

    The pci_proc_detach_device() returns with -EBUSY before calling
    remove_proc_entry() if the reference counter of proc_dir_entry is not
    0. But this check is wrong and pci_proc_detach_device() always fails
    because the reference counter of proc_dir_entry is initialized with 1
    at creating time and decremented in remove_proc_entry(). This bug
    cause strange behaviour as followings:

    - Accessing /proc/bus/pci/XXXX/YY file after hot-removing pci adapter
    card causes kernel panic.

    - Repeating hot-add/hot-remove of pci adapter card increases files
    with the same name under /proc/bus/pci/XXXX/ directory. For example:

    # pwd
    /proc/bus/pci/0002:09
    # ls
    01.0
    # for i in `seq 5`
    > do
    > echo 0 > /sys/bus/pci/slots/0009_0032/power
    > echo 1 > /sys/bus/pci/slots/0009_0032/power
    > done
    # ls
    01.0 01.0 01.0 01.0 01.0 01.0

    The pci_proc_detach_device() should check if the reference counter is
    not larger than 1 instead.

    Signed-off-by: Kenji Kaneshige
    Signed-off-by: Greg Kroah-Hartman

    Kenji Kaneshige
     

02 Feb, 2008

3 commits


13 Oct, 2007

2 commits


17 Jul, 2007

1 commit

  • I forgot to remove capability.h from mm.h while removing sched.h! This
    patch remedies that, because the only inline function which was using
    CAP_something was made out of line.

    Cross-compile tested without regressions on:

    all powerpc defconfigs
    all mips defconfigs
    all m68k defconfigs
    all arm defconfigs
    all ia64 defconfigs

    alpha alpha-allnoconfig alpha-defconfig alpha-up
    arm
    i386 i386-allnoconfig i386-defconfig i386-up
    ia64 ia64-allnoconfig ia64-defconfig ia64-up
    m68k
    mips
    parisc parisc-allnoconfig parisc-defconfig parisc-up
    powerpc powerpc-up
    s390 s390-allnoconfig s390-defconfig s390-up
    sparc sparc-allnoconfig sparc-defconfig sparc-up
    sparc64 sparc64-allnoconfig sparc64-defconfig sparc64-up
    um-x86_64
    x86_64 x86_64-allnoconfig x86_64-defconfig x86_64-up

    as well as my two usual configs.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     

12 Jul, 2007

1 commit

  • On Mon, Apr 02, 2007 at 10:47:45PM -0700, Andrew Morton wrote:
    >...
    > Changes since 2.6.21-rc5-mm3:
    >...
    > +fix-82875-pci-setup.patch
    >...
    > Misc
    >...

    pci_proc_attach_device() no longer has any modular user.

    Signed-off-by: Adrian Bunk
    Signed-off-by: Greg Kroah-Hartman

    Adrian Bunk
     

09 May, 2007

1 commit


13 Feb, 2007

1 commit

  • Many struct file_operations in the kernel can be "const". Marking them const
    moves these to the .rodata section, which avoids false sharing with potential
    dirty data. In addition it'll catch accidental writes at compile time to
    these shared resources.

    Signed-off-by: Arjan van de Ven
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Arjan van de Ven
     

09 Dec, 2006

1 commit


28 Jun, 2006

2 commits


24 Mar, 2006

1 commit


10 Jan, 2006

3 commits


29 Oct, 2005

1 commit

  • Some PCI adapters (eg. ipr scsi adapters) have an exposure today in that they
    issue BIST to the adapter to reset the card. If, during the time it takes to
    complete BIST, userspace attempts to access PCI config space, the host bus
    bridge will master abort the access since the ipr adapter does not respond on
    the PCI bus for a brief period of time when running BIST. On PPC64 hardware,
    this master abort results in the host PCI bridge isolating that PCI device
    from the rest of the system, making the device unusable until Linux is
    rebooted. This patch is an attempt to close that exposure by introducing some
    blocking code in the PCI code. When blocked, writes will be humored and reads
    will return the cached value. Ben Herrenschmidt has also mentioned that he
    plans to use this in PPC power management.

    Signed-off-by: Brian King
    Cc: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    drivers/pci/access.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++
    drivers/pci/pci-sysfs.c | 20 +++++-----
    drivers/pci/pci.h | 7 +++
    drivers/pci/proc.c | 28 +++++++--------
    drivers/pci/syscall.c | 14 +++----
    include/linux/pci.h | 7 +++
    6 files changed, 134 insertions(+), 31 deletions(-)

    Brian King
     

09 Sep, 2005

1 commit


28 Jun, 2005

1 commit

  • This is an updated version of Ben's fix-pci-mmap-on-ppc-and-ppc64.patch
    which is in 2.6.12-rc4-mm1.

    It fixes the patch to work on PPC iSeries, removes some debug printks
    at Ben's request, and incorporates your
    fix-pci-mmap-on-ppc-and-ppc64-fix.patch also.

    Originally from Benjamin Herrenschmidt

    This patch was discussed at length on linux-pci and so far, the last
    iteration of it didn't raise any comment. It's effect is a nop on
    architecture that don't define the new pci_resource_to_user() callback
    anyway. It allows architecture like ppc who put weird things inside of
    PCI resource structures to convert to some different value for user
    visible ones. It also fixes mmap'ing of IO space on those archs.

    Signed-off-by: Benjamin Herrenschmidt
    Signed-off-by: Michael Ellerman
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Michael Ellerman
     

04 May, 2005

1 commit


17 Apr, 2005

1 commit

  • Initial git repository build. I'm not bothering with the full history,
    even though we have it. We can create a separate "historical" git
    archive of that later if we want to, and in the meantime it's about
    3.2GB when imported into git - space that would just make the early
    git days unnecessarily complicated, when we don't have a lot of good
    infrastructure for it.

    Let it rip!

    Linus Torvalds