Skip to contentSkip to conversation

PCI fixes

GIT PULL Jesse Barnes 3 participants 4 messages Nov 15, 2010 – Nov 16, 2010

lore
Share & tools
lore
#0 lore raw

The following changes since commit
f6614b7bb405a9b35dd28baea989a749492c46b2:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (2010-11-09 10:34:48 -0800)

are available in the git repository at:

ssh://master.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

There's one very recent commit in here, but it's just a warning fix from Randy so should be ok.

This set includes a fix for a long standing mmap issue on /proc/bus/pci (present since we added the map range checking during that e1000 EEPROM fire drill) and a fix from Bjorn for a recent resource handling regression. It also adds a little code to better handle device power states at enable time; rather than assuming device state is unknown at enable time (which will prevent us from configuring things like MSI), we read the current state out of the device if possible, fixing some network and gfx related bugs in the process.

Bjorn Helgaas (2):
x86/PCI: coalesce overlapping host bridge windows
PCI: fix pci_bus_alloc_resource() hang, prefer positive decode

Jesse Barnes (1):
PCI: read current power state at enable time

Martin Wilck (1):
PCI: fix size checks for mmap() on /proc/bus/pci files

Randy Dunlap (1):
PCI: sysfs: fix printk warnings

Steven Rostedt (1):
PCI hotplug: ibmphp: Add check to prevent reading beyond mapped area

 arch/x86/pci/acpi.c               |  103 +++++++++++++++++++++++++++++-------
 drivers/pci/bus.c                 |   70 +++++++++++++++++--------
 drivers/pci/hotplug/ibmphp_ebda.c |    6 ++
 drivers/pci/pci-sysfs.c           |   23 ++++++--
 drivers/pci/pci.c                 |   12 ++++
 drivers/pci/pci.h                 |    7 ++-
 drivers/pci/proc.c                |    2 +-
 7 files changed, 174 insertions(+), 49 deletions(-)
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
#1 lore raw
Quoted 2 lines · Jesse Barnes

Martin Wilck (1):
PCI: fix size checks for mmap() on /proc/bus/pci files

That breaks X.

process "X" tried to map 0x00010000 bytes at page 0x00000000 on 0000:00:10.0 BAR 2 (start 0x 90000000, size 0x 10000)

------------[ cut here ]------------
WARNING: at drivers/pci/pci-sysfs.c:758
Modules linked in: usb_storage uas uinput cpufreq_conservative rfcomm cpufreq_userspace cpufreq_powersave sco bridge stp llc bnep l2cap crc16 snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device tun nf_conntrack_ipv6 nf_defrag_ipv6 ip6t_REJECT ip6t_LOG ip6table_filter ip6_tables xt_TCPMSS xt_recent ipt_MASQUERADE xt_state ipt_REJECT ipt_LOG xt_tcpudp iptable_nat nf_nat nf_conntrack_ipv4 nf_conntrack nf_defrag_ipv4 iptable_filter ip_tables x_tables loop dm_mod btusb bluetooth arc4 snd_aoa_codec_tas ecb snd_aoa_fabric_layout snd_aoa snd_aoa_i2sbus snd_pcm b43 joydev mac80211 snd_timer snd_page_alloc firewire_ohci appletouch snd soundcore cfg80211 sungem sungem_phy firewire_core rfkill sr_mod crc_itu_t sg snd_aoa_soundbus ssb cdrom sd_mod pata_macio libata scsi_mod
NIP: c0177b10 LR: c0177b10 CTR: 00000001
REGS: c2461d90 TRAP: 0700   Tainted: G        W    (2.6.37-rc2)
MSR: 00029032 <EE,ME,CE,IR,DR>  CR: 20000824  XER: 20000000

TASK = c2568d00[2009] 'X' THREAD: c2460000
GPR00: c0177b10 c2461e40 c2568d00 0000008a 00006a86 ffffffff c055fb36 c055febc
GPR08: 000069fe c0440000 c055febc c2461e00 ffffffff 1022e9e4 10226a14 00000000
GPR16: 103eadc0 00000000 00000001 1022bf1c ef136688 00000000 ffffffea 00000001
GPR24: 00000000 00000000 00000000 00010000 ef806d68 ef136688 00000002 ef806c38 NIP [c0177b10] pci_mmap_resource+0xf0/0x174
LR [c0177b10] pci_mmap_resource+0xf0/0x174

Call Trace:
[c2461e40] [c0177b10] pci_mmap_resource+0xf0/0x174 (unreliable)
[c2461e80] [c00f7514] mmap+0x74/0xfc
[c2461eb0] [c008e3e4] mmap_region+0x1e4/0x3bc
[c2461f00] [c008e93c] sys_mmap_pgoff+0xa4/0xe0
[c2461f30] [c00060a0] sys_mmap+0x28/0x40
[c2461f40] [c0010bc4] ret_from_syscall+0x0/0x40
--- Exception: c01 at 0xfa95f24
    LR = 0xfd897c8
Instruction dump:
3b400000 7fff0214 813f0134 38090001 7f6a0050 3c60c03d 7fc8f378 93410008 
39200000 3863bd36 9361000c 4819c31d <0fe00000> 3800ffea 48000070 7fc4f378 
---[ end trace a096109c06ace62c ]---

Andreas.

Signature · 3 lines
Andreas Schwab, [email protected]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
#2 lore raw
Quoted 8 lines · Andreas Schwab
Quoted 2 lines · Jesse Barnes

Martin Wilck (1):
PCI: fix size checks for mmap() on /proc/bus/pci files

That breaks X.

process "X" tried to map 0x00010000 bytes at page 0x00000000 on 0000:00:10.0 BAR 2 (start 0x 90000000, size 0x 10000)

Ah, thanks. Just had the same issue on one of my laptops, too...

Regards,

Wolfram

Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#3 lore raw
In reply to Andreas Schwab
Quoted 21 lines · On Tue, 16 Nov 2010 12:16:36 +0100 Andreas Schwab <[email protected]> wrote:
Quoted 2 lines · Jesse Barnes

Martin Wilck (1):
PCI: fix size checks for mmap() on /proc/bus/pci files

That breaks X.

process "X" tried to map 0x00010000 bytes at page 0x00000000 on 0000:00:10.0 BAR 2 (start 0x 90000000, size 0x 10000)

------------[ cut here ]------------
WARNING: at drivers/pci/pci-sysfs.c:758
Modules linked in: usb_storage uas uinput cpufreq_conservative rfcomm cpufreq_userspace cpufreq_powersave sco bridge stp llc bnep l2cap crc16 snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device tun nf_conntrack_ipv6 nf_defrag_ipv6 ip6t_REJECT ip6t_LOG ip6table_filter ip6_tables xt_TCPMSS xt_recent ipt_MASQUERADE xt_state ipt_REJECT ipt_LOG xt_tcpudp iptable_nat nf_nat nf_conntrack_ipv4 nf_conntrack nf_defrag_ipv4 iptable_filter ip_tables x_tables loop dm_mod btusb bluetooth arc4 snd_aoa_codec_tas ecb snd_aoa_fabric_layout snd_aoa snd_aoa_i2sbus snd_pcm b43 joydev mac80211 snd_timer snd_page_alloc firewire_ohci appletouch snd soundcore cfg80211 sungem sungem_phy firewire_core rfkill sr_mod crc_itu_t sg snd_aoa_soundbus ssb cdrom sd_mod pata_macio libata scsi_mod
NIP: c0177b10 LR: c0177b10 CTR: 00000001
REGS: c2461d90 TRAP: 0700   Tainted: G        W    (2.6.37-rc2)
MSR: 00029032 <EE,ME,CE,IR,DR>  CR: 20000824  XER: 20000000

TASK = c2568d00[2009] 'X' THREAD: c2460000
GPR00: c0177b10 c2461e40 c2568d00 0000008a 00006a86 ffffffff c055fb36 c055febc
GPR08: 000069fe c0440000 c055febc c2461e00 ffffffff 1022e9e4 10226a14 00000000
GPR16: 103eadc0 00000000 00000001 1022bf1c ef136688 00000000 ffffffea 00000001
GPR24: 00000000 00000000 00000000 00010000 ef806d68 ef136688 00000002 ef806c38 NIP [c0177b10] pci_mmap_resource+0xf0/0x174
LR [c0177b10] pci_mmap_resource+0xf0/0x174

Quoted 13 lines
Call Trace:
[c2461e40] [c0177b10] pci_mmap_resource+0xf0/0x174 (unreliable)
[c2461e80] [c00f7514] mmap+0x74/0xfc
[c2461eb0] [c008e3e4] mmap_region+0x1e4/0x3bc
[c2461f00] [c008e93c] sys_mmap_pgoff+0xa4/0xe0
[c2461f30] [c00060a0] sys_mmap+0x28/0x40
[c2461f40] [c0010bc4] ret_from_syscall+0x0/0x40
--- Exception: c01 at 0xfa95f24
    LR = 0xfd897c8
Instruction dump:
3b400000 7fff0214 813f0134 38090001 7f6a0050 3c60c03d 7fc8f378 93410008 
39200000 3863bd36 9361000c 4819c31d <0fe00000> 3800ffea 48000070 7fc4f378 
---[ end trace a096109c06ace62c ]---

Oops, I think there's a fix here in my inbox, will either revert or send the fix asap.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center