3.2.40-stable review
Subsystems (90)
cover 3.2.40-stable review
This is the start of the stable review cycle for the 3.2.40 release. There are 153 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Mar 6 02:00:00 UTC 2013. Anything received after that time might be too late.
A combined patch relative to 3.2.39 will be posted as an additional response to this. A shortlog and diffstat can be found below.
Ben.
-------------
Adam Thomas (1):
UBIFS: fix double free of ubifs_orphan objects
[8afd500cb52a5d00bab4525dd5a560d199f979b9]
Al Viro (1):
[media] omap_vout: find_vma() needs ->mmap_sem held
[55ee64b30a38d688232e5eb2860467dddc493573]Alan Cox (1):
fb: rework locking to fix lock ordering on takeover
[50e244cc793d511b86adea24972f3a7264cae114]
Alex Deucher (1):
drm/radeon/evergreen+: wait for the MC to settle after MC blackout
[ed39fadd6df01095378e499fac3674883f16b853]
Alexander Duyck (1):
igb: Remove artificial restriction on RQDPC stat reading
[ae1c07a6b7ced6c0c94c99e3b53f4e7856fa8bff]
Alexey Klimov (1):
[hid] usb hid quirks for Masterkit MA901 usb radio
[0322bd3980b3ebf7dde8474e22614cb443d6479a]
Andrea Arcangeli (1):
mm: mmu_notifier: make the mmu_notifier srcu static
[70400303ce0c4ced3139499c676d5c79636b0c72]
Arnd Bergmann (2):
ARM: samsung: fix assembly syntax for new gas
[2815774bb38445006074e16251b9ef5123bdc616]
ARM: w90x900: fix legacy assembly syntax
[fa5ce5f94c0f2bfa41ba68d2d2524298e1fc405e]Ashish Sangwan (1):
ext4: fix hole punch failure when depth is greater than 0
[968dee77220768a5f52cf8b21d0bdb73486febef]
Ben Hutchings (2):
8250: use correct value for PORT_BRCM_TRUMANAGE
[not upstream; fixes deviation from mainline userland ABI]
asus-laptop: Do not call HWRS on init
[cb7da022450cdaaebd33078b6b32fb7dd2aaf6db]
Bjorn Helgaas (1):
Driver core: treat unregistered bus_types as having no devices
[4fa3e78be7e985ca814ce2aa0c09cbee404efcf7]
Bjørn Mork (3):
USB: option: add Huawei "ACM" devices using protocol = vendor
[1f3f687722fd9b29a0c2a85b4844e3b2a3585c63]
USB: option: add Yota / Megafon M100-1 4g modem
[cd565279e51bedee1b2988e84f9b3bef485adeb6]
USB: option: add and update Alcatel modems
[f8f0302bbcbd1b14655bef29f6996a2152be559d]
Christian Borntraeger (1):
s390/kvm: Fix store status for ACRS/FPRS
[15bc8d8457875f495c59d933b05770ba88d1eacb]
Clemens Ladisch (1):
ALSA: usb-audio: fix Roland A-PRO support
[7da58046482fceb17c4a0d4afefd9507ec56de7f]
Cornelia Huck (1):
KVM: s390: Handle hosts not supporting s390-virtio.
[55c171a6d90dc0574021f9c836127cfd1a7d2e30]
Dan Carpenter (1):
[media] rc: unlock on error in show_protocols()
[30ebc5e44d057a1619ad63fe32c8c1670c37c4b8]
Daniel Vetter (2):
Revert "drm: Add EDID_QUIRK_FORCE_REDUCED_BLANKING for ASUS VW222S"
[db3985e5ca8f50fc17606855ba394783d11683a5]
intel/iommu: force writebuffer-flush quirk on Gen 4 Chipsets
[210561ffd72d00eccf12c0131b8024d5436bae95]
Dave Airlie (3):
drm/usb: bind driver to correct device
[9f23de52b64f7fb801fd76f3dd8651a0dc89187b]
fbcon: don't lose the console font across generic->chip driver switch
[ae1287865f5361fa138d4d3b1b6277908b54eac9]
vgacon/vt: clear buffer attributes when we load a 512 character font (v2)
[2a2483072393b27f4336ab068a1f48ca19ff1c1e]Dave Hansen (1):
x86-32, mm: Rip out x86_32 NUMA remapping code
[f03574f2d5b2d6229dcdf2d322848065f72953c7]David Henningsson (2):
ALSA: hda - hdmi: ELD shouldn't be valid after unplug
[bbfd8a19b6913f50a362457c34d49bfafe5e456e]
ALSA: hda - hdmi: Make jacks phantom, if they're not detectable
[30efd8debd1ef30be342d374f01e993509f5b76b]
David S. Miller (1):
sunvdc: Fix off-by-one in generic_request().
[f4d9605434c0fd4cc8639bf25cfc043418c52362]
David Vrabel (2):
xen-netback: cancel the credit timer when taking the vif down
[3e55f8b306cf305832a4ac78aa82e1b40e818ece]
xen-netback: correctly return errors from netbk_count_requests()
[35876b5ffc154c357476b2c3bdab10feaf4bd8f0]
Denis Efremov (2):
ALSA: ali5451: remove irq enabling in pointer callback
[dacae5a19b4cbe1b5e3a86de23ea74cbe9ec9652]
ALSA: rme32.c irq enabling after spin_lock_irq
[f49a59c4471d81a233e09dda45187cc44fda009d]
Douglas Bagnall (1):
[media] Avoid sysfs oops when an rc_dev's raw device is absent
[720bb6436ff30fccad05cf5bdf961ea5b1f5686d]
Eric Dumazet (1):
ipv6: use a stronger hash for tcp
[08dcdbf6a7b9d14c2302c5bd0c5390ddf122f664]
Fanchaoting (1):
umount oops when remove blocklayoutdriver first
[5a12cca697aca5dfba42a7d4c3356acc0445a2b0]
Fangxiaozhi (1):
USB: storage: properly handle the endian issues of idProduct
[cd060956c5e97931c3909e4a808508469c0bb9f6]
George Spelvin (3):
pps: Add pps_lookup_dev() function
[513b032c98b4b9414aa4e9b4a315cb1bf0380101]
pps: Fix a use-after free bug when unregistering a source.
[d953e0e837e65ecc1ddaa4f9560f7925878a0de6]
pps: Use pps_lookup_dev to reduce ldisc coupling
[03a7ffe4e542310838bac70ef85acc17536b6d7c]
Greg Pearson (1):
x86/apic: Use x2apic physical mode based on FADT setting
[ea0dcf903e7d76aa5d483d876215fedcfdfe140f]
Greg Thelen (1):
tmpfs: fix use-after-free of mempolicy object
[5f00110f7273f9ff04ac69a5f85bb535a4fd0987]
H. Peter Anvin (2):
timeconst.pl: Eliminate Perl warning
[63a3f603413ffe82ad775f2d62a5afff87fd94a0]
x86: Make sure we can boot in the case the BDA contains pure garbage
[7c10093692ed2e6f318387d96b829320aa0ca64c]
Heiko Carstens (1):
s390/timer: avoid overflow when programming clock comparator
[d911e03d097bdc01363df5d81c43f69432eb785c]
Helge Deller (1):
unbreak automounter support on 64-bit kernel with 32-bit userspace (v2)
[4f4ffc3a5398ef9bdbb32db04756d7d34e356fcf]
Hugh Dickins (1):
idr: make idr_get_next() good for rcu_read_lock()
[9f7de8275b46d9d11b1505adbfe6c2bb48df4741]
Ian Abbott (4):
staging: comedi: check s->async for poll(), read() and write()
[cc400e185c07c15a42d2635995f422de5b94b696]
staging: comedi: disallow COMEDI_DEVCONFIG on non-board minors
[754ab5c0e55dd118273ca2c217c4d95e9fbc8259]
staging: comedi: ni_labpc: correct differential channel sequence for AI commands
[4c4bc25d0fa6beaf054c0b4c3b324487f266c820]
staging: comedi: ni_labpc: set up command4 register *after* command3
[22056e2b46246d97ff0f7c6e21a77b8daa07f02c]Igor Grinberg (1):
ARM: PXA3xx: program the CSMSADRCFG register
[d107a204154ddd79339203c2deeb7433f0cf6777]
J. Bruce Fields (1):
svcrpc: make svc_age_temp_xprts enqueue under sv_lock
[e75bafbff2270993926abcc31358361db74a9bc2]
James Ralston (2):
ata_piix: Add Device IDs for Intel Lynx Point-LP PCH
[389cd784969e9148fedcde0608f15bd74d6b769e]
ata_piix: Add Device IDs for Intel Wellsburg PCH
[3aee8bc52c415aba8148f144e5e5359b0fd75dd1]
Jan Beulich (2):
xen-blkback: do not leak mode property
[9d092603cc306ee6edfe917bf9ab8beb5f32d7bc]
xen-pciback: rate limit error messages from xen_pcibk_enable_msi{,x}()
[51ac8893a7a51b196501164e645583bf78138699]
Jan Kara (3):
ext4: fix possible use-after-free with AIO
[091e26dfc156aeb3b73bc5c5f277e433ad39331c]
fs: Fix possible use-after-free with AIO
[54c807e71d5ac59dee56c685f2b66e27cd54c475]
ocfs2: fix possible use-after-free with AIO
[9b171e0c74ca0549d0610990a862dd895870f04a]
Jani Nikula (1):
drm/i915: add missing \n to UTS_RELEASE in the error_state
[fdfa175d0a9cfa2082ce24e67e284e5acbba452a]
Jean Delvare (1):
pcmcia/vrc4171: Add missing spinlock init
[811af9723859884f2f771f3174f3ddedab7c53b5]
Jeff Liu (1):
ocfs2: fix ocfs2_init_security_and_acl() to initialize acl correctly
[32918dd9f19e5960af4cdfa41190bb843fb2247b]
Jim Somerville (1):
inotify: remove broken mask checks causing unmount to be EINVAL
[676a0675cf9200ac047fb50825f80867b3bb733b]
Johan Hovold (1):
USB: serial: fix null-pointer dereferences on disconnect
[b2ca699076573c94fee9a73cb0d8645383b602a0]
John David Anglin (1):
[PARISC] Purge existing TLB entries in set_pte_at and ptep_set_wrprotect
[7139bc1579901b53db7e898789e916ee2fb52d78]
Joseph Salisbury (1):
ACPI: Add DMI entry for Sony VGN-FW41E_H
[66f2fda93b67fa744d406e6dcf443f67bac204b6]
Josh Boyer (1):
USB: usb-storage: unusual_devs update for Super TOP SATA bridge
[18e03310b5caa6d11c1a8c61b982c37047693fba]
Junxiao Bi (1):
ocfs2: unlock super lock if lockres refresh failed
[3278bb748d2437eb1464765f36429e5d6aa91c38]
Jussi Kivilinna (1):
rtlwifi: usb: allocate URB control message setup_packet and data buffer separately
[bc6b89237acb3dee6af6e64e51a18255fef89cc2]
Justin Lecher (1):
fs: cachefiles: add support for large files in filesystem caching
[98c350cda2c14a343d34ea01a3d9c24fea5ec66d]
Kees Cook (2):
exec: use -ELOOP for max recursion depth
[d740269867021faf4ce38a449353d2b986c34a67]
x86: Do not leak kernel page mapping locations
[e575a86fdc50d013bf3ad3aa81d9100e8e6cc60d]
Konrad Rzeszutek Wilk (2):
doc, kernel-parameters: Document 'console=hvc<n>'
[a2fd6419174470f5ae6383f5037d0ee21ed9833f]
doc, xen: Mention 'earlyprintk=xen' in the documentation.
[2482a92e7d17187301d7313cfe5021b13393a0b4]
Larry Finger (3):
b43: Increase number of RX DMA slots
[ccae0e50c16a7f7adb029c169147400d1ce9f703]
rtlwifi: rtl8192cu: Add new USB ID
[8708aac79e4572ba673d7a21e94ddca9f3abb7fc]
rtlwifi: rtl8192cu: Fix NULL dereference BUG when using new_id
[957f4aca5fa0db69635271bc4621cc0b65b2d590]
Lars-Peter Clausen (1):
drivers/video/backlight/adp88?0_bl.c: fix resume
[5eb02c01bd1f3ef195989ab05e835e2b0711b5a9]
Laurent Pinchart (3):
[media] v4l: Reset subdev v4l2_dev field to NULL if registration fails
[317efce991620adc589b3005b9baed433dcb2a56]
usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams
[e387ef5c47ddeaeaa3cbdc54424cdb7a28dae2c0]
usb: Add quirk detection based on interface information
[80da2e0df5af700518611b7d1cc4fc9945bcaf95]
Leonid Shatz (1):
hrtimer: Prevent hrtimer_enqueue_reprogram race
[b22affe0aef429d657bc6505aacb1c569340ddd2]
Li Wei (1):
ipv4: fix a bug in ping_err().
[b531ed61a2a2a77eeb2f7c88b49aa5ec7d9880d8]
Li Zefan (2):
cgroup: fix exit() vs rmdir() race
[71b5707e119653039e6e95213f00479668c79b75]
cpuset: fix cpuset_print_task_mems_allowed() vs rename() race
[63f43f55c9bbc14f76b582644019b8a07dc8219a]
Linus Torvalds (1):
mm: fix pageblock bitmap allocation
[7c45512df987c5619db041b5c9b80d281e26d3db]
Linus Walleij (1):
drivers/rtc/rtc-pl031.c: restore ST variant functionality
[3399cfb5df9594495b876d1843a7165f77366b2b]
Lukas Czerner (3):
ext4: fix free clusters calculation in bigalloc filesystem
[304e220f0879198b1f5309ad6f0be862b4009491]
ext4: fix xattr block allocation/release with bigalloc
[1231b3a1eb5740192aeebf5344dd6d6da000febf]
ext4: rewrite punch hole to use ext4_ext_remove_space()
[5f95d21fb6f2aaa52830e5b7fb405f6c71d3ab85]
MITSUNARI Shigeo (1):
fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
[7630b661da330b35dd57b6f5d6d62b386f2dd751]
Maciej Sosnowski (1):
dca: check against empty dca_domains list before unregister provider
[c419fcfd071cf34ba00f9f65282583772d2655e7]
Majianpeng (1):
nfsd: Fix memleak
[2d32b29a1c2830f7c42caa8258c714acd983961f]
Matt Fleming (1):
x86, efi: Make "noefi" really disable EFI runtime serivces
[fb834c7acc5e140cf4f9e86da93a66de8c0514da]
Mel Gorman (2):
mm/fadvise.c: drain all pagevecs if POSIX_FADV_DONTNEED fails to discard all pages
[67d46b296a1ba1477c0df8ff3bc5e0167a0b0732]
x86/mm: Check if PUD is large when validating a kernel address
[0ee364eb316348ddf3e0dfcd986f5f13f528f821]
Michael S. Tsirkin (1):
vhost: fix length for cross region descriptor
[bd97120fc3d1a11f3124c7c9ba1d91f51829eb85]
Mika Kuoppala (1):
drm/i915: disable shared panel fitter for pipe
[24a1f16de97c4cf0029d9acd04be06db32208726]
Minchan Kim (1):
zram: Fix deadlock bug in partial read/write
[7e5a5104c6af709a8d97d5f4711e7c917761d464]
Nicholas Bellinger (2):
target: Add missing mapped_lun bounds checking during make_mappedlun setup
[fbbf8555a986ed31e54f006b6cc637ea4ff1425b]
target: Fix lookup of dynamic NodeACLs during cached demo-mode operation
[fcf29481fb8e106daad6688f2e898226ee928992]
Niu Yawei (1):
ext4: fix race in ext4_mb_add_n_trim()
[f1167009711032b0d747ec89a632a626c901a1ad]
Olaf Hering (1):
x86: Hyper-V: register clocksource only if its advertised
[32068f6527b8f1822a30671dedaf59c567325026]
Oleg Nesterov (6):
kmod: introduce call_modprobe() helper
[3e63a93b987685f02421e18b2aa452d20553a88b]
kmod: make __request_module() killable
[1cc684ab75123efe7ff446eb821d44375ba8fa30]
tty: set_termios/set_termiox should not return -EINTR
[183d95cdd834381c594d3aa801c1f9f9c0c54fa9]
usermodehelper: ____call_usermodehelper() doesn't need do_exit()
[5b9bd473e3b8a8c6c4ae99be475e6e9b27568555]
usermodehelper: implement UMH_KILLABLE
[d0bd587a80960d7ba7e0c8396e154028c9045c54]
usermodehelper: introduce umh_complete(sub_info)
[b3449922502f5a161ee2b5022a33aec8472fbf18]
Paolo Bonzini (1):
nbd: fsync and kill block device on shutdown
[3a2d63f87989e01437ba994df5f297528c353d7d]
Patrik Jakobsson (1):
drm/i915: Set i9xx sdvo clock limits according to specifications
[4f7dfb6788dd022446847fbbfbe45e13bedb5be2]
Paulo Zanoni (1):
drm: don't add inferred modes for monitors that don't support them
[196e077dc165a307efbd9e7569f81bbdbcf18f65]
Pawel Moll (1):
ALSA: usb: Fix Processing Unit Descriptor parsers
[b531f81b0d70ffbe8d70500512483227cc532608]
Phileas Fogg (1):
powerpc/kexec: Disable hard IRQ before kexec
[8520e443aa56cc157b015205ea53e7b9fc831291]
Philipp Reisner (1):
idr: idr_for_each_entry() macro
[9749f30f1a387070e6e8351f35aeb829eacc3ab6]
Rafael J. Wysocki (1):
PCI/PM: Clean up PME state when removing a device
[249bfb83cf8ba658955f0245ac3981d941f746ee]
Robin Holt (1):
mmu_notifier_unregister NULL Pointer deref and multiple ->release() callouts
[751efd8610d3d7d67b7bdf7f62646edea7365dd7]Roger Quadros (1):
USB: ehci-omap: Fix autoloading of module
[04753523266629b1cd0518091da1658755787198]
Sagi Grimberg (1):
mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule
[21a92735f660eaecf69a6f2e777f18463760ec32]
Samuel Thibault (1):
speakup: lower default software speech rate
[cfd757010691eae4e17acc246f74e7622c3a2f05]
Satoru Takeuchi (1):
efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot parameter
[1de63d60cd5b0d33a812efa455d5933bf1564a51]
Seiji Aguchi (1):
pstore: Avoid deadlock in panic and emergency-restart path
[9f244e9cfd70c7c0f82d3c92ce772ab2a92d9f64]
Seth Heasley (3):
ata_piix: IDE-mode SATA patch for Intel Avoton DeviceIDs
[aaa515277db9585eeb4fdeb4637b9f9df50a1dd9]
ata_piix: IDE-mode SATA patch for Intel DH89xxCC DeviceIDs
[96d5d96aedc29c75bb16433f6ecf8664ec3c1b46]
ata_piix: IDE-mode SATA patch for Intel Lynx Point DeviceIDs
[78140cfec503c60a178b11fbaae2fef63e9abdc0]
Shawn Guo (1):
mmc: sdhci-esdhc-imx: fix host version read
[ef4d0888bb7e1b963880f086575081c3d39cad2d]
Stanislaw Gruszka (1):
posix-cpu-timers: Fix nanosleep task_struct leak
[e6c42c295e071dd74a66b5a9fcf4f44049888ed8]
Stefan Bader (1):
xen: Send spinlock IPI to all waiters
[76eaca031f0af2bb303e405986f637811956a422]
Stephen Hemminger (1):
bridge: set priority of STP packets
[547b4e718115eea74087e28d7fa70aec619200db]
Steven Rostedt (1):
ftrace: Call ftrace cleanup module notifier after all other notifiers
[8c189ea64eea01ca20d102ddb74d6936dd16c579]
Stoney Wang (1):
x86/apic: Work around boot failure on HP ProLiant DL980 G7 Server systems
[cb214ede7657db458fd0b2a25ea0b28dbf900ebc]
Takashi Iwai (3):
ALSA: aloop: Fix Oops while PM resume
[edac894389f9c9de2a1368c78809c824b343f3a5]
ALSA: hda - Release assigned pin/cvt at error path of hdmi_pcm_open()
[2ad779b7329d6894a80df94e693e72eaa0d56790]
fb: Yet another band-aid for fixing lockdep mess
[e93a9a868792ad71cdd09d75e5a02d8067473c4e]
Tejun Heo (6):
block: fix synchronization and limit check in blk_alloc_devt()
[ce23bba842aee98092225d9576dba47c82352521]
firewire: add minor number range check to fw_device_init()
[3bec60d511179853138836ae6e1b61fe34d9235f]
idr: fix a subtle bug in idr_get_next()
[6cdae7416a1c45c2ce105a78187d9b7e8feb9e24]
idr: fix top layer handling
[326cf0f0f308933c10236280a322031f0097205d]
posix-timer: Don't call idr_find() with out-of-range ID
[e182bb38d7db7494fa5dcd82da17fe0dedf60ecf]
workqueue: consider work function when searching for busy work items
[a2c1c57be8d9fd5b716113c8991d3d702eeacf77]
Thadeu Lima de Souza Cascardo (1):
powerpc/eeh: Fix crash when adding a device in a slot with DDW
[6a040ce72598159a74969a2d01ab0ba5ee6536b3]
Theodore Ts'o (3):
ext4: fix kernel BUG on large-scale rm -rf commands
[89a4e48f8479f8145eca9698f39fe188c982212f]
ext4: return ENOMEM if sb_getblk() fails
[860d21e2c585f7ee8a4ecc06f474fdc33c9474f4]
quota: autoload the quota_v2 module for QFMT_VFS_V1 quota format
[c3ad83d9efdfe6a86efd44945a781f00c879b7b4]
Thomas Gleixner (1):
genirq: Avoid deadlock in spurious handling
[e716efde75267eab919cdb2bef5b2cb77f305326]
Tomas Henzl (1):
block: fix ext_devt_idr handling
[7b74e912785a11572da43292786ed07ada7e3e0c]
Tomasz Guszkowski (1):
p54usb: corrected USB ID for T-Com Sinus 154 data II
[008e33f733ca51acb2dd9d88ea878693b04d1d2a]
Trond Myklebust (1):
NLM: Ensure that we resend all pending blocking locks after a reclaim
[666b3d803a511fbc9bc5e5ea8ce66010cf03ea13]
Wei Liu (1):
xen: close evtchn port if binding to irq fails
[e7e44e444876478d50630f57b0c31d29f6725020]
Weston Andros Adamson (1):
NFSv4.1: Don't decode skipped layoutgets
[085b7a45c63d3da5be155faab9249a5cab224561]
Xi Wang (1):
sysctl: fix null checking in bin_dn_node_address()
[df1778be1a33edffa51d094eeda87c858ded6560]
Xiaowei.Hu (1):
ocfs2: ac->ac_allow_chain_relink=0 won't disable group relink
[309a85b6861fedbb48a22d45e0e079d1be993b3a]Documentation/kernel-parameters.txt | 5 + Makefile | 4 +- arch/arm/mach-pxa/include/mach/smemc.h | 1 + arch/arm/mach-pxa/smemc.c | 15 +- arch/arm/mach-s3c2410/include/mach/debug-macro.S | 12 +- arch/arm/mach-s3c2410/include/mach/entry-macro.S | 4 +- arch/arm/mach-s3c2410/pm-h1940.S | 2 +- arch/arm/mach-s3c2410/sleep.S | 12 +- arch/arm/mach-s3c2412/sleep.S | 12 +- arch/arm/mach-w90x900/include/mach/entry-macro.S | 4 +- arch/arm/plat-samsung/include/plat/debug-macro.S | 18 +- arch/parisc/include/asm/pgtable.h | 13 +- arch/parisc/kernel/cache.c | 18 ++ arch/powerpc/include/asm/eeh.h | 3 + arch/powerpc/kernel/machine_kexec_64.c | 5 + arch/powerpc/kernel/of_platform.c | 3 + arch/powerpc/kernel/pci-common.c | 7 +- arch/powerpc/platforms/pseries/eeh.c | 24 ++- arch/s390/kernel/time.c | 3 + arch/s390/kvm/kvm-s390.c | 8 + arch/x86/Kconfig | 2 +- arch/x86/include/asm/pgtable.h | 5 + arch/x86/kernel/apic/x2apic_phys.c | 17 +- arch/x86/kernel/cpu/mshyperv.c | 3 +- arch/x86/kernel/head.c | 53 +++-- arch/x86/mm/fault.c | 8 +- arch/x86/mm/init_64.c | 3 + arch/x86/platform/efi/efi.c | 59 +++--- arch/x86/xen/spinlock.c | 1 - block/genhd.c | 15 +- drivers/acpi/sleep.c | 8 + drivers/ata/ata_piix.c | 35 ++++ drivers/base/bus.c | 4 +- drivers/block/nbd.c | 10 + drivers/block/sunvdc.c | 2 +- drivers/block/xen-blkback/xenbus.c | 49 +++-- drivers/dca/dca-core.c | 5 + drivers/firewire/core-device.c | 4 + drivers/gpu/drm/drm_edid.c | 6 +- drivers/gpu/drm/drm_usb.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 12 +- drivers/gpu/drm/radeon/evergreen.c | 2 + drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 3 + drivers/iommu/intel-iommu.c | 8 +- drivers/media/rc/rc-main.c | 5 +- drivers/media/video/omap/omap_vout.c | 12 +- drivers/media/video/v4l2-device.c | 30 ++- drivers/mmc/host/sdhci-esdhc-imx.c | 19 +- drivers/net/ethernet/intel/igb/igb_main.c | 8 +- drivers/net/wireless/b43/dma.h | 2 +- drivers/net/wireless/p54/p54usb.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 9 +- drivers/net/wireless/rtlwifi/usb.c | 49 +++-- drivers/net/wireless/rtlwifi/usb.h | 3 +- drivers/net/xen-netback/interface.c | 3 +- drivers/net/xen-netback/netback.c | 8 +- drivers/pci/remove.c | 2 + drivers/pcmcia/vrc4171_card.c | 1 + drivers/platform/x86/asus-laptop.c | 17 +- drivers/pps/clients/pps-ldisc.c | 10 +- drivers/pps/pps.c | 47 ++++- drivers/rtc/rtc-pl031.c | 4 +- drivers/s390/kvm/kvm_virtio.c | 38 +++- drivers/staging/comedi/comedi_fops.c | 13 +- drivers/staging/comedi/drivers/ni_labpc.c | 35 ++-- drivers/staging/speakup/speakup_soft.c | 2 +- drivers/staging/zram/zram_drv.c | 4 +- drivers/target/target_core_device.c | 13 +- drivers/target/target_core_fabric_configfs.c | 12 +- drivers/target/target_core_tpg.c | 10 +- drivers/tty/serial/8250.c | 4 +- drivers/tty/tty_ioctl.c | 4 +- drivers/tty/vt/vt.c | 136 ++++++++---- drivers/usb/core/driver.c | 38 ++-- drivers/usb/core/hub.c | 10 +- drivers/usb/core/quirks.c | 151 ++++++++------ drivers/usb/core/usb.h | 4 + drivers/usb/host/ehci-omap.c | 2 +- drivers/usb/serial/ftdi_sio.c | 20 +- drivers/usb/serial/mct_u232.c | 22 +- drivers/usb/serial/option.c | 16 +- drivers/usb/serial/sierra.c | 8 +- drivers/usb/serial/ssu100.c | 19 +- drivers/usb/serial/usb-serial.c | 15 +- drivers/usb/serial/usb_wwan.c | 8 +- drivers/usb/storage/initializers.c | 4 +- drivers/usb/storage/unusual_cypress.h | 2 +- drivers/vhost/vhost.c | 2 +- drivers/video/backlight/adp8860_bl.c | 2 +- drivers/video/backlight/adp8870_bl.c | 2 +- drivers/video/console/fbcon.c | 47 ++++- drivers/video/console/vgacon.c | 22 +- drivers/video/fbmem.c | 9 +- drivers/video/fbsysfs.c | 3 + drivers/xen/evtchn.c | 10 + drivers/xen/xen-pciback/pciback_ops.c | 15 +- fs/binfmt_em86.c | 1 - fs/binfmt_misc.c | 6 - fs/binfmt_script.c | 4 +- fs/block_dev.c | 4 +- fs/cachefiles/rdwr.c | 2 +- fs/direct-io.c | 2 +- fs/exec.c | 10 +- fs/ext4/balloc.c | 9 +- fs/ext4/extents.c | 242 ++++++++++++---------- fs/ext4/indirect.c | 9 +- fs/ext4/inode.c | 11 +- fs/ext4/mballoc.c | 6 +- fs/ext4/mmp.c | 2 + fs/ext4/page-io.c | 9 +- fs/ext4/resize.c | 6 +- fs/ext4/xattr.c | 10 +- fs/lockd/clntproc.c | 3 + fs/nfs/blocklayout/blocklayout.c | 1 + fs/nfs/nfs4proc.c | 3 +- fs/nfs/objlayout/objio_osd.c | 1 + fs/nfsd/nfs4state.c | 2 + fs/notify/inotify/inotify_user.c | 4 - fs/ocfs2/aops.c | 2 +- fs/ocfs2/dlmglue.c | 5 +- fs/ocfs2/suballoc.c | 7 +- fs/ocfs2/suballoc.h | 2 +- fs/ocfs2/xattr.c | 2 +- fs/partitions/check.c | 2 +- fs/pstore/platform.c | 35 +++- fs/ubifs/orphan.c | 5 +- fs/ubifs/ubifs.h | 2 + include/linux/auto_fs.h | 25 +-- include/linux/binfmts.h | 2 - include/linux/console.h | 2 + include/linux/fs.h | 2 + include/linux/idr.h | 11 + include/linux/kmod.h | 2 + include/linux/mmu_notifier.h | 1 + include/linux/pps_kernel.h | 17 +- include/linux/pstore.h | 8 + include/linux/quota.h | 1 + include/linux/serial_core.h | 4 +- include/linux/usb/audio.h | 6 +- include/linux/vt_kern.h | 3 + include/net/inet6_hashtables.h | 8 +- include/net/inet_sock.h | 1 + include/net/ipv6.h | 12 ++ include/target/target_core_device.h | 2 +- kernel/cgroup.c | 8 + kernel/cpuset.c | 12 +- kernel/hrtimer.c | 36 ++-- kernel/irq/spurious.c | 7 +- kernel/kmod.c | 82 ++++++-- kernel/posix-cpu-timers.c | 23 +- kernel/posix-timers.c | 7 + kernel/sysctl_binary.c | 3 +- kernel/timeconst.pl | 6 +- kernel/trace/ftrace.c | 46 ++-- kernel/workqueue.c | 42 +++- lib/idr.c | 51 +++-- mm/fadvise.c | 18 +- mm/mmu_notifier.c | 147 +++++++------ mm/page_alloc.c | 15 +- mm/shmem.c | 10 +- net/bridge/br_stp_bpdu.c | 2 + net/ipv4/af_inet.c | 9 +- net/ipv4/ping.c | 4 +- net/sunrpc/svc_xprt.c | 15 +- sound/drivers/aloop.c | 5 +- sound/pci/ali5451/ali5451.c | 2 +- sound/pci/hda/patch_hdmi.c | 10 +- sound/pci/rme32.c | 2 +- sound/usb/quirks-table.h | 2 +- 171 files changed, 1638 insertions(+), 867 deletions(-)
Signature · 3 lines
Ben Hutchings Always try to do things in chronological order; it's less confusing that way.
PATCH 1/153 sunvdc: Fix off-by-one in generic_request().
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit f4d9605434c0fd4cc8639bf25cfc043418c52362 ]
The 'operations' bitmap corresponds one-for-one with the operation codes, no adjustment is necessary.
--- drivers/block/sunvdc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/sunvdc.c +1 -1
@@ -461,7 +461,7 @@ static int generic_request(struct vdc_point op_len, err;void *req_buf; -if (!(((u64 )1 << ((u64 )op -1 )) & port->operations)) +if (!(((u64 )1 << (u64 )op) & port->operations))return -EOPNOTSUPP ;switch (op) {
PATCH 2/153 genirq: Avoid deadlock in spurious handling
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit e716efde75267eab919cdb2bef5b2cb77f305326 upstream.
commit 52553ddf(genirq: fix regression in irqfixup, irqpoll) introduced a potential deadlock by calling the action handler with the irq descriptor lock held.
Remove the call and let the handling code run even for an interrupt where only a single action is registered. That matches the goal of the above commit and avoids the deadlock.
Document the confusing action = desc->action reload in the handling loop while at it.
--- kernel/irq/spurious.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/irq/spurious.c +3 -4
@@ -80,13 +80,11 @@ static int try_one_irq(int irq, struct i/* * All handlers must agree on IRQF_SHARED, so we test just the -* first. Check for action->next as well. +* first. */ action = desc->action;if (!action || !(action->flags &IRQF_SHARED ) || - (action->flags & __IRQF_TIMER) || - (action->handler (irq, action->dev_id) ==IRQ_HANDLED ) || - !action->next) + (action->flags & __IRQF_TIMER)) goto out;/* Already running on another processor */
@@ -104,6 +102,7 @@ static int try_one_irq(int irq, struct ido {if (handle_irq_event (desc) ==IRQ_HANDLED ) ret =IRQ_HANDLED ; +/* Make sure that there is still a valid action */ action = desc->action; }while ((desc->istate &IRQS_PENDING ) && action); desc->istate &= ~IRQS_POLL_INPROGRESS ;
PATCH 3/153 KVM: s390: Handle hosts not supporting s390-virtio.
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cornelia Huck <[email protected]>
commit 55c171a6d90dc0574021f9c836127cfd1a7d2e30 upstream.
Running under a kvm host does not necessarily imply the presence of a page mapped above the main memory with the virtio information; however, the code includes a hard coded access to that page.
Instead, check for the presence of the page and exit gracefully before we hit an addressing exception if it does not exist.
--- drivers/s390/kvm/kvm_virtio.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-)
drivers/s390/kvm/kvm_virtio.c +30 -8
@@ -414,6 +414,26 @@ static void kvm_extint_handler(unsigned }/* +* For s390-virtio, we expect a page above main storage containing +* the virtio configuration. Try to actually load from this area +* in order to figure out if the host provides this page. +*/ +static int __init test_devices_support (unsigned long addr) +{ +int ret = -EIO ; + + asmvolatile ( +"0: lura 0,%1\n" +"1: xgr %0,%0\n" +"2:\n" + EX_TABLE(0b,2b) +EX_TABLE (1b ,2b ) + : "+d" (ret) + : "a" (addr) + : "0", "cc"); + return ret; +} +/* * Init function for virtio * devices are in a single page above top of "normal" mem */
@@ -424,21 +444,23 @@ static int __init kvm_devices_init(void)if (!MACHINE_IS_KVM )return -ENODEV ; +if (test_devices_support (real_memory_size) <0 ) +return -ENODEV ; + + rc =vmem_add_mapping (real_memory_size,PAGE_SIZE ); +if (rc) +return rc; + + kvm_devices = (void *) real_memory_size; + kvm_root =root_device_register ("kvm_s390" );if (IS_ERR (kvm_root)) { rc =PTR_ERR (kvm_root);printk (KERN_ERR "Could not register kvm_s390 root device" ); +vmem_remove_mapping (real_memory_size,PAGE_SIZE );return rc; } - rc =vmem_add_mapping (real_memory_size,PAGE_SIZE ); -if (rc) { -root_device_unregister (kvm_root); -return rc; - } - - kvm_devices = (void *) real_memory_size; -INIT_WORK (&hotplug_work, hotplug_devices);service_subclass_irq_register ();
PATCH 4/153 workqueue: consider work function when searching for busy work items
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit a2c1c57be8d9fd5b716113c8991d3d702eeacf77 upstream.
To avoid executing the same work item concurrenlty, workqueue hashes currently busy workers according to their current work items and looks up the the table when it wants to execute a new work item. If there already is a worker which is executing the new work item, the new item is queued to the found worker so that it gets executed only after the current execution finishes.
Unfortunately, a work item may be freed while being executed and thus recycled for different purposes. If it gets recycled for a different work item and queued while the previous execution is still in progress, workqueue may make the new work item wait for the old one although the two aren't really related in any way.
In extreme cases, this false dependency may lead to deadlock although it's extremely unlikely given that there aren't too many self-freeing work item users and they usually don't wait for other work items.
To alleviate the problem, record the current work function in each busy worker and match it together with the work item address in find_worker_executing_work(). While this isn't complete, it ensures that unrelated work items don't interact with each other and in the very unlikely case where a twisted wq user triggers it, it's always onto itself making the culprit easy to spot.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=51701
[bwh: Backported to 3.2:
- Adjust context
- Incorporate earlier logging cleanup in process_one_work() from 044c782ce3a9 ('workqueue: fix checkpatch issues')]
--- kernel/workqueue.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-)
kernel/workqueue.c +31 -11
@@ -128,6 +128,7 @@ struct worker { };struct work_struct *current_work;/* L: work being processed */ +work_func_t current_func;/* L: current_work's fn */ struct cpu_workqueue_struct *current_cwq;/* L: current_work's cwq */ struct list_head scheduled;/* L: scheduled works */ struct task_struct *task;/* I: worker task */
@@ -843,7 +844,8 @@ static struct worker *__find_worker_execstruct hlist_node *tmp;hlist_for_each_entry (worker, tmp, bwh, hentry) -if (worker->current_work == work) +if (worker->current_work == work && + worker->current_func == work->func)return worker;return NULL ; }
@@ -853,9 +855,27 @@ static struct worker *__find_worker_exec* @gcwq: gcwq of interest * @work: work to find worker for * -* Find a worker which is executing @work on @gcwq. This function is -* identical to __find_worker_executing_work() except that this -* function calculates @bwh itself. +* Find a worker which is executing @work on @gcwq by searching +* @gcwq->busy_hash which is keyed by the address of @work. For a worker +* to match, its current execution should match the address of @work and +* its work function. This is to avoid unwanted dependency between +* unrelated work executions through a work item being recycled while still +* being executed. +* +* This is a bit tricky. A work item may be freed once its execution +* starts and nothing prevents the freed area from being recycled for +* another work item. If the same work item address ends up being reused +* before the original execution finishes, workqueue will identify the +* recycled work item as currently executing and make it wait until the +* current execution finishes, introducing an unwanted dependency. +* +* This function checks the work item address, work function and workqueue +* to avoid false positives. Note that this isn't complete as one may +* construct a work function which can introduce dependency onto itself +* through a recycled work item. Well, if somebody wants to shoot oneself +* in the foot that badly, there's only so much we can do, and if such +* deadlock actually occurs, it should be easy to locate the culprit work +* function. * * CONTEXT: * spin_lock_irq(gcwq->lock).
@@ -1816,7 +1836,6 @@ __acquires(&gcwq->lock)struct global_cwq *gcwq = cwq->gcwq;struct hlist_head *bwh =busy_worker_head (gcwq, work);bool cpu_intensive = cwq->wq->flags &WQ_CPU_INTENSIVE ; -work_func_t f = work->func;int work_color;struct worker *collision;#ifdef CONFIG_LOCKDEP
@@ -1845,6 +1864,7 @@ __acquires(&gcwq->lock)debug_work_deactivate (work);hlist_add_head (&worker->hentry, bwh); worker->current_work = work; + worker->current_func = work->func; worker->current_cwq = cwq; work_color =get_work_color (work);
@@ -1882,7 +1902,7 @@ __acquires(&gcwq->lock)lock_map_acquire_read (&cwq->wq->lockdep_map);lock_map_acquire (&lockdep_map);trace_workqueue_execute_start (work); -f (work); + worker->current_func (work);/* * While we must be careful to not use "work" after this, the trace * point will only record its address.
@@ -1892,11 +1912,10 @@ __acquires(&gcwq->lock)lock_map_release (&cwq->wq->lockdep_map);if (unlikely (in_atomic () ||lockdep_depth (current) >0 )) { -printk (KERN_ERR "BUG: workqueue leaked lock or atomic: " -"%s/0x%08x/%d\n" , - current->comm,preempt_count (),task_pid_nr (current)); -printk (KERN_ERR " last function: " ); -print_symbol ("%s\n" , (unsigned long )f); +pr_err ("BUG: workqueue leaked lock or atomic: %s/0x%08x/%d\n" +" last function: %pf\n" , + current->comm,preempt_count (),task_pid_nr (current), + worker->current_func);debug_show_held_locks (current);dump_stack (); }
@@ -1910,6 +1929,7 @@ __acquires(&gcwq->lock)/* we're done with it, release */ hlist_del_init (&worker->hentry); worker->current_work =NULL ; + worker->current_func =NULL ; worker->current_cwq =NULL ;cwq_dec_nr_in_flight (cwq, work_color, false); }
PATCH 5/153 v4l: Reset subdev v4l2_dev field to NULL if registration fails
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
commit 317efce991620adc589b3005b9baed433dcb2a56 upstream.
When subdev registration fails the subdev v4l2_dev field is left to a non-NULL value. Later calls to v4l2_device_unregister_subdev() will consider the subdev as registered and will module_put() the subdev module without any matching module_get().
Fix this by setting the subdev v4l2_dev field to NULL in v4l2_device_register_subdev() when the function fails.
---
drivers/media/video/v4l2-device.c +14 -16
@@ -159,31 +159,21 @@ int v4l2_device_register_subdev(struct v sd->v4l2_dev = v4l2_dev;if (sd->internal_ops && sd->internal_ops->registered) { err = sd->internal_ops->registered (sd); -if (err) { -module_put (sd->owner); -return err; - } +if (err) + goto error_module; }/* This just returns 0 if either of the two args is NULL */ err =v4l2_ctrl_add_handler (v4l2_dev->ctrl_handler, sd->ctrl_handler); -if (err) { -if (sd->internal_ops && sd->internal_ops->unregistered) - sd->internal_ops->unregistered (sd); -module_put (sd->owner); -return err; - } +if (err) + goto error_unregister;#if defined(CONFIG_MEDIA_CONTROLLER )/* Register the entity. */ if (v4l2_dev->mdev) { err =media_device_register_entity (v4l2_dev->mdev, entity); -if (err <0 ) { -if (sd->internal_ops && sd->internal_ops->unregistered) - sd->internal_ops->unregistered (sd); -module_put (sd->owner); -return err; - } +if (err <0 ) + goto error_unregister; }#endif
@@ -192,6 +182,14 @@ int v4l2_device_register_subdev(struct vspin_unlock (&v4l2_dev->lock);return 0 ; + +error_unregister: +if (sd->internal_ops && sd->internal_ops->unregistered) + sd->internal_ops->unregistered (sd); +error_module: +module_put (sd->owner); + sd->v4l2_dev =NULL ; +return err; }EXPORT_SYMBOL_GPL (v4l2_device_register_subdev);
PATCH 6/153 omap_vout: find_vma() needs ->mmap_sem held
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit 55ee64b30a38d688232e5eb2860467dddc493573 upstream.
Walking rbtree while it's modified is a Bad Idea(tm); besides, the result of find_vma() can be freed just as it's getting returned to caller. Fortunately, it's easy to fix - just take ->mmap_sem a bit earlier (and don't bother with find_vma() at all if virtp >= PAGE_OFFSET - in that case we don't even look at its result).
While we are at it, what prevents VIDIOC_PREPARE_BUF calling v4l_prepare_buf() -> (e.g) vb2_ioctl_prepare_buf() -> vb2_prepare_buf() -> __buf_prepare() -> __qbuf_userptr() -> vb2_vmalloc_get_userptr() -> find_vma(), AFAICS without having taken ->mmap_sem anywhere in process? The code flow is bloody convoluted and depends on a bunch of things done by initialization, so I certainly might've missed something...
---
drivers/media/video/omap/omap_vout.c +7 -5
@@ -206,19 +206,21 @@ static u32 omap_vout_uservirt_to_phys(u3struct vm_area_struct *vma;struct mm_struct *mm = current->mm; - vma =find_vma (mm, virtp);/* For kernel direct-mapped memory, take the easy way */ -if (virtp >=PAGE_OFFSET ) { - physp =virt_to_phys ((void *) virtp); - }else if (vma && (vma->vm_flags &VM_IO ) && vma->vm_pgoff) { +if (virtp >=PAGE_OFFSET ) +return virt_to_phys ((void *) virtp); + +down_read (¤t->mm->mmap_sem); + vma =find_vma (mm, virtp); +if (vma && (vma->vm_flags &VM_IO ) && vma->vm_pgoff) {/* this will catch, kernel-allocated, mmaped-to-usermode addresses */ physp = (vma->vm_pgoff <<PAGE_SHIFT ) + (virtp - vma->vm_start); +up_read (¤t->mm->mmap_sem); }else {/* otherwise, use get_user_pages() for general userland pages */ int res, nr_pages =1 ;struct page *pages; -down_read (¤t->mm->mmap_sem); res =get_user_pages (current, current->mm, virtp, nr_pages,1 ,0 , &pages,NULL );
PATCH 7/153 dca: check against empty dca_domains list before unregister provider
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Sosnowski <[email protected]>
commit c419fcfd071cf34ba00f9f65282583772d2655e7 upstream.
When providers get blocked unregister_dca_providers() is called ending up with dca_providers and dca_domain lists emptied. Dca should be prevented from trying to unregister any provider if dca_domain list is found empty.
--- drivers/dca/dca-core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/dca/dca-core.c +5 -0
@@ -420,6 +420,11 @@ void unregister_dca_provider(struct dca_raw_spin_lock_irqsave (&dca_lock, flags); +if (list_empty (&dca_domains)) { +raw_spin_unlock_irqrestore (&dca_lock, flags); +return ; + } +list_del (&dca->node); pci_rc =dca_pci_rc_from_dev (dev);
PATCH 8/153 powerpc/eeh: Fix crash when adding a device in a slot with DDW
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit 6a040ce72598159a74969a2d01ab0ba5ee6536b3 upstream.
The DDW code uses a eeh_dev struct from the pci_dev. However, this is not set until eeh_add_device_late is called.
Since pci_bus_add_devices is called before eeh_add_device_late, the PCI devices are added to the bus, making drivers' probe hooks to be called. These will call set_dma_mask, which will call the DDW code, which will require the eeh_dev struct from pci_dev. This would result in a crash, due to a NULL dereference.
Calling eeh_add_device_late after pci_bus_add_devices would make the system BUG, because device files shouldn't be added to devices there were not added to the system. So, a new function is needed to add such files only after pci_bus_add_devices have been called.
--- arch/powerpc/include/asm/eeh.h | 3 +++ arch/powerpc/kernel/of_platform.c | 3 +++ arch/powerpc/kernel/pci-common.c | 7 +++++-- arch/powerpc/platforms/pseries/eeh.c | 24 +++++++++++++++++++++++- 4 files changed, 34 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/eeh.h +3 -0
@@ -61,6 +61,7 @@ void __init pci_addr_cache_build(void);*/ void eeh_add_device_tree_early (struct device_node *);void eeh_add_device_tree_late (struct pci_bus *); +void eeh_add_sysfs_files (struct pci_bus *);/** * eeh_remove_device_recursive - undo EEH for device & children.
@@ -105,6 +106,8 @@ static inline void eeh_add_device_tree_estatic inline void eeh_add_device_tree_late (struct pci_bus *bus) { } +static inline void eeh_add_sysfs_files (struct pci_bus *bus) { } +static inline void eeh_remove_bus_device (struct pci_dev *dev) { }#define EEH_POSSIBLE_ERROR (val, type) (0)#define EEH_IO_ERROR_VALUE (size) (-1UL)
arch/powerpc/kernel/of_platform.c +3 -0
@@ -91,6 +91,9 @@ static int __devinit of_pci_phb_probe(st/* Add probed PCI devices to the device model */ pci_bus_add_devices (phb->bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (phb->bus); +return 0 ; }
arch/powerpc/kernel/pci-common.c +5 -2
@@ -1536,11 +1536,14 @@ void pcibios_finish_adding_to_bus(structpcibios_allocate_bus_resources (bus);pcibios_claim_one_bus (bus); +/* Fixup EEH */ +eeh_add_device_tree_late (bus); +/* Add new devices to global lists. Register in proc, sysfs. */ pci_bus_add_devices (bus); -/* Fixup EEH */ -eeh_add_device_tree_late (bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (bus); }EXPORT_SYMBOL_GPL (pcibios_finish_adding_to_bus);
arch/powerpc/platforms/pseries/eeh.c +23 -1
@@ -1238,7 +1238,6 @@ static void eeh_add_device_late(struct p pdn->pcidev = dev;pci_addr_cache_insert_device (dev); -eeh_sysfs_add_device (dev); }void eeh_add_device_tree_late (struct pci_bus *bus)
@@ -1257,6 +1256,29 @@ void eeh_add_device_tree_late(struct pciEXPORT_SYMBOL_GPL (eeh_add_device_tree_late);/** +* eeh_add_sysfs_files - Add EEH sysfs files for the indicated PCI bus +* @bus: PCI bus +* +* This routine must be used to add EEH sysfs files for PCI +* devices which are attached to the indicated PCI bus. The PCI bus +* is added after system boot through hotplug or dlpar. +*/ +void eeh_add_sysfs_files (struct pci_bus *bus) +{ +struct pci_dev *dev; + +list_for_each_entry (dev, &bus->devices, bus_list) { +eeh_sysfs_add_device (dev); +if (dev->hdr_type ==PCI_HEADER_TYPE_BRIDGE ) { +struct pci_bus *subbus = dev->subordinate; +if (subbus) +eeh_add_sysfs_files (subbus); + } + } +} +EXPORT_SYMBOL_GPL (eeh_add_sysfs_files); + +/** * eeh_remove_device - undo EEH setup for the indicated pci device * @dev: pci device to be removed *
Re: [ 008/153] powerpc/eeh: Fix crash when adding a device in a slot with DDW
This patch is breaking the celleb_defconfig on powerpc with:
arch/powerpc/kernel/of_platform.c: In function 'of_pci_phb_probe':arch/powerpc/kernel/of_platform.c:95:2: error: implicit declaration of function 'eeh_add_sysfs_files' [-Werror=implicit-function-declaration]
Mikey
Quoted 132 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit
6a040ce72598159a74969a2d01ab0ba5ee6536b3upstream.The DDW code uses a
eeh_devstruct from thepci_dev. However, this is not set untileeh_add_device_lateis called.Since
pci_bus_add_devicesis called beforeeeh_add_device_late, the PCI devices are added to the bus, making drivers' probe hooks to be called. These will callset_dma_mask, which will call the DDW code, which will require theeeh_devstruct frompci_dev. This would result in a crash, due to a NULL dereference.Calling
eeh_add_device_lateafterpci_bus_add_deviceswould make the system BUG, because device files shouldn't be added to devices there were not added to the system. So, a new function is needed to add such files only afterpci_bus_add_deviceshave been called.Signed-off-by Thadeu Lima de Souza Cascardo <[email protected]>Acked-by Gavin Shan <[email protected]>Signed-off-by Benjamin Herrenschmidt <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>--- arch/powerpc/include/asm/eeh.h | 3 +++ arch/powerpc/kernel/of_platform.c | 3 +++ arch/powerpc/kernel/pci-common.c | 7 +++++-- arch/powerpc/platforms/pseries/eeh.c | 24 +++++++++++++++++++++++- 4 files changed, 34 insertions(+), 3 deletions(-)arch/powerpc/include/asm/eeh.h +3
-0@@ -61,6 +61,7 @@ void __init pci_addr_cache_build(void);*/ void eeh_add_device_tree_early (struct device_node *);void eeh_add_device_tree_late (struct pci_bus *); +void eeh_add_sysfs_files (struct pci_bus *);/** * eeh_remove_device_recursive - undo EEH for device & children. @@ -105,6 +106,8 @@ static inline void eeh_add_device_tree_estatic inline void eeh_add_device_tree_late (struct pci_bus *bus) { } +static inline void eeh_add_sysfs_files (struct pci_bus *bus) { } +static inline void eeh_remove_bus_device (struct pci_dev *dev) { }#define EEH_POSSIBLE_ERROR (val, type) (0)#define EEH_IO_ERROR_VALUE (size) (-1UL)arch/powerpc/kernel/of_platform.c +3
-0@@ -91,6 +91,9 @@ static int __devinit of_pci_phb_probe(st/* Add probed PCI devices to the device model */ pci_bus_add_devices (phb->bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (phb->bus); +return 0 ; }arch/powerpc/kernel/pci-common.c +5
-2@@ -1536,11 +1536,14 @@ void pcibios_finish_adding_to_bus(structpcibios_allocate_bus_resources (bus);pcibios_claim_one_bus (bus); +/* Fixup EEH */ +eeh_add_device_tree_late (bus); +/* Add new devices to global lists. Register in proc, sysfs. */ pci_bus_add_devices (bus); -/* Fixup EEH */ -eeh_add_device_tree_late (bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (bus); }EXPORT_SYMBOL_GPL (pcibios_finish_adding_to_bus);arch/powerpc/platforms/pseries/eeh.c +23
-2@@ -1238,7 +1238,6 @@ static void eeh_add_device_late(struct p pdn->pcidev = dev;pci_addr_cache_insert_device (dev); -eeh_sysfs_add_device (dev); }void eeh_add_device_tree_late (struct pci_bus *bus)@@ -1257,6 +1256,29 @@ void eeh_add_device_tree_late(struct pciEXPORT_SYMBOL_GPL (eeh_add_device_tree_late);/** +* eeh_add_sysfs_files - Add EEH sysfs files for the indicated PCI bus +* @bus: PCI bus +* +* This routine must be used to add EEH sysfs files for PCI +* devices which are attached to the indicated PCI bus. The PCI bus +* is added after system boot through hotplug or dlpar. +*/ +void eeh_add_sysfs_files (struct pci_bus *bus) +{ +struct pci_dev *dev; + +list_for_each_entry (dev, &bus->devices, bus_list) { +eeh_sysfs_add_device (dev); +if (dev->hdr_type ==PCI_HEADER_TYPE_BRIDGE ) { +struct pci_bus *subbus = dev->subordinate; +if (subbus) +eeh_add_sysfs_files (subbus); + } + } +} +EXPORT_SYMBOL_GPL (eeh_add_sysfs_files); + +/** * eeh_remove_device - undo EEH setup for the indicated pci device * @dev: pci device to be removed * -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [ 008/153] powerpc/eeh: Fix crash when adding a device in a slot with DDW
Quoted 5 lines · Michael Neuling
This patch is breaking the
celleb_defconfigon powerpc with:
arch/powerpc/kernel/of_platform.c: In function 'of_pci_phb_probe':arch/powerpc/kernel/of_platform.c:95:2: error: implicit declaration of function 'eeh_add_sysfs_files' [-Werror=implicit-function-declaration]
In 3.2 this file doesn't (directly) include <asm/eeh.h> which is where the definition was added. In mainline it does.
Assuming that this change is actually required for 3.2 (which I'm not sure about), I suppose we just need to add the #include.
Ben.
Quoted 136 lines
Mikey
Quoted 132 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit
6a040ce72598159a74969a2d01ab0ba5ee6536b3upstream.The DDW code uses a
eeh_devstruct from thepci_dev. However, this is not set untileeh_add_device_lateis called.Since
pci_bus_add_devicesis called beforeeeh_add_device_late, the PCI devices are added to the bus, making drivers' probe hooks to be called. These will callset_dma_mask, which will call the DDW code, which will require theeeh_devstruct frompci_dev. This would result in a crash, due to a NULL dereference.Calling
eeh_add_device_lateafterpci_bus_add_deviceswould make the system BUG, because device files shouldn't be added to devices there were not added to the system. So, a new function is needed to add such files only afterpci_bus_add_deviceshave been called.Signed-off-by Thadeu Lima de Souza Cascardo <[email protected]>Acked-by Gavin Shan <[email protected]>Signed-off-by Benjamin Herrenschmidt <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>--- arch/powerpc/include/asm/eeh.h | 3 +++ arch/powerpc/kernel/of_platform.c | 3 +++ arch/powerpc/kernel/pci-common.c | 7 +++++-- arch/powerpc/platforms/pseries/eeh.c | 24 +++++++++++++++++++++++- 4 files changed, 34 insertions(+), 3 deletions(-)arch/powerpc/include/asm/eeh.h +3
-0@@ -61,6 +61,7 @@ void __init pci_addr_cache_build(void);*/ void eeh_add_device_tree_early (struct device_node *);void eeh_add_device_tree_late (struct pci_bus *); +void eeh_add_sysfs_files (struct pci_bus *);/** * eeh_remove_device_recursive - undo EEH for device & children. @@ -105,6 +106,8 @@ static inline void eeh_add_device_tree_estatic inline void eeh_add_device_tree_late (struct pci_bus *bus) { } +static inline void eeh_add_sysfs_files (struct pci_bus *bus) { } +static inline void eeh_remove_bus_device (struct pci_dev *dev) { }#define EEH_POSSIBLE_ERROR (val, type) (0)#define EEH_IO_ERROR_VALUE (size) (-1UL)arch/powerpc/kernel/of_platform.c +3
-0@@ -91,6 +91,9 @@ static int __devinit of_pci_phb_probe(st/* Add probed PCI devices to the device model */ pci_bus_add_devices (phb->bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (phb->bus); +return 0 ; }arch/powerpc/kernel/pci-common.c +5
-2@@ -1536,11 +1536,14 @@ void pcibios_finish_adding_to_bus(structpcibios_allocate_bus_resources (bus);pcibios_claim_one_bus (bus); +/* Fixup EEH */ +eeh_add_device_tree_late (bus); +/* Add new devices to global lists. Register in proc, sysfs. */ pci_bus_add_devices (bus); -/* Fixup EEH */ -eeh_add_device_tree_late (bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (bus); }EXPORT_SYMBOL_GPL (pcibios_finish_adding_to_bus);arch/powerpc/platforms/pseries/eeh.c +23
-2@@ -1238,7 +1238,6 @@ static void eeh_add_device_late(struct p pdn->pcidev = dev;pci_addr_cache_insert_device (dev); -eeh_sysfs_add_device (dev); }void eeh_add_device_tree_late (struct pci_bus *bus)@@ -1257,6 +1256,29 @@ void eeh_add_device_tree_late(struct pciEXPORT_SYMBOL_GPL (eeh_add_device_tree_late);/** +* eeh_add_sysfs_files - Add EEH sysfs files for the indicated PCI bus +* @bus: PCI bus +* +* This routine must be used to add EEH sysfs files for PCI +* devices which are attached to the indicated PCI bus. The PCI bus +* is added after system boot through hotplug or dlpar. +*/ +void eeh_add_sysfs_files (struct pci_bus *bus) +{ +struct pci_dev *dev; + +list_for_each_entry (dev, &bus->devices, bus_list) { +eeh_sysfs_add_device (dev); +if (dev->hdr_type ==PCI_HEADER_TYPE_BRIDGE ) { +struct pci_bus *subbus = dev->subordinate; +if (subbus) +eeh_add_sysfs_files (subbus); + } + } +} +EXPORT_SYMBOL_GPL (eeh_add_sysfs_files); + +/** * eeh_remove_device - undo EEH setup for the indicated pci device * @dev: pci device to be removed * -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 3 lines
Ben Hutchings Always try to do things in chronological order; it's less confusing that way.
powerpc/eeh: Fix compile error due to missing include file
Quoted 7 lines · Ben Hutchings
Quoted 5 lines · Michael Neuling
This patch is breaking the
celleb_defconfigon powerpc with:
arch/powerpc/kernel/of_platform.c: In function 'of_pci_phb_probe':arch/powerpc/kernel/of_platform.c:95:2: error: implicit declaration of function 'eeh_add_sysfs_files' [-Werror=implicit-function-declaration]
Quoted 5 lines
In 3.2 this file doesn't (directly) include <
asm/eeh.h> which is where the definition was added. In mainline it does.Assuming that this change is actually required for 3.2 (which I'm not sure about), I suppose we just need to add the #include.
Yep that fixes it. Patch below (for stable 3.2 only)
From: Michael Neuling <[email protected]>
Subject: powerpc/eeh: Fix compile error due to missing include file
3.2.40 fails to compile the celleb_defconfig with the following error:
arch/powerpc/kernel/of_platform.c: In function 'of_pci_phb_probe':
arch/powerpc/kernel/of_platform.c:95:2: error: implicit declaration of function 'eeh_add_sysfs_files' [-Werror=implicit-function-declaration]
The following adds the required include file to fix this.
arch/powerpc/kernel/of_platform.c +1 -0
@@ -26,6 +26,7 @@#include <asm/topology.h> #include <asm/pci-bridge.h> #include <asm/ppc-pci.h> +#include <asm/eeh.h> #include <linux/atomic.h> #ifdef CONFIG_PPC_OF_PLATFORM_PCI
Re: [ 008/153] powerpc/eeh: Fix crash when adding a device in a slot with DDW
In reply to Ben HutchingsQuoted 7 lines · Ben Hutchings
Quoted 5 lines · Michael Neuling
This patch is breaking the
celleb_defconfigon powerpc with:
arch/powerpc/kernel/of_platform.c: In function 'of_pci_phb_probe':arch/powerpc/kernel/of_platform.c:95:2: error: implicit declaration of function 'eeh_add_sysfs_files' [-Werror=implicit-function-declaration]
Quoted 8 lines
In 3.2 this file doesn't (directly) include <
asm/eeh.h> which is where the definition was added. In mainline it does.Assuming that this change is actually required for 3.2 (which I'm not sure about), I suppose we just need to add the #include.
Ben.
This is not required for 3.2. The patch that *may* have broken DLPAR (39baadbf36cee3ede5fdb8a34006d9109e5e2570) was introduced between 3.3 and 3.4.
Regards.
Cascardo.
Quoted 141 lines
Quoted 136 lines
Mikey
Quoted 132 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit
6a040ce72598159a74969a2d01ab0ba5ee6536b3upstream.The DDW code uses a
eeh_devstruct from thepci_dev. However, this is not set untileeh_add_device_lateis called.Since
pci_bus_add_devicesis called beforeeeh_add_device_late, the PCI devices are added to the bus, making drivers' probe hooks to be called. These will callset_dma_mask, which will call the DDW code, which will require theeeh_devstruct frompci_dev. This would result in a crash, due to a NULL dereference.Calling
eeh_add_device_lateafterpci_bus_add_deviceswould make the system BUG, because device files shouldn't be added to devices there were not added to the system. So, a new function is needed to add such files only afterpci_bus_add_deviceshave been called.Signed-off-by Thadeu Lima de Souza Cascardo <[email protected]>Acked-by Gavin Shan <[email protected]>Signed-off-by Benjamin Herrenschmidt <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>--- arch/powerpc/include/asm/eeh.h | 3 +++ arch/powerpc/kernel/of_platform.c | 3 +++ arch/powerpc/kernel/pci-common.c | 7 +++++-- arch/powerpc/platforms/pseries/eeh.c | 24 +++++++++++++++++++++++- 4 files changed, 34 insertions(+), 3 deletions(-)arch/powerpc/include/asm/eeh.h +3
-0@@ -61,6 +61,7 @@ void __init pci_addr_cache_build(void);*/ void eeh_add_device_tree_early (struct device_node *);void eeh_add_device_tree_late (struct pci_bus *); +void eeh_add_sysfs_files (struct pci_bus *);/** * eeh_remove_device_recursive - undo EEH for device & children. @@ -105,6 +106,8 @@ static inline void eeh_add_device_tree_estatic inline void eeh_add_device_tree_late (struct pci_bus *bus) { } +static inline void eeh_add_sysfs_files (struct pci_bus *bus) { } +static inline void eeh_remove_bus_device (struct pci_dev *dev) { }#define EEH_POSSIBLE_ERROR (val, type) (0)#define EEH_IO_ERROR_VALUE (size) (-1UL)arch/powerpc/kernel/of_platform.c +3
-0@@ -91,6 +91,9 @@ static int __devinit of_pci_phb_probe(st/* Add probed PCI devices to the device model */ pci_bus_add_devices (phb->bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (phb->bus); +return 0 ; }arch/powerpc/kernel/pci-common.c +5
-2@@ -1536,11 +1536,14 @@ void pcibios_finish_adding_to_bus(structpcibios_allocate_bus_resources (bus);pcibios_claim_one_bus (bus); +/* Fixup EEH */ +eeh_add_device_tree_late (bus); +/* Add new devices to global lists. Register in proc, sysfs. */ pci_bus_add_devices (bus); -/* Fixup EEH */ -eeh_add_device_tree_late (bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (bus); }EXPORT_SYMBOL_GPL (pcibios_finish_adding_to_bus);arch/powerpc/platforms/pseries/eeh.c +23
-2@@ -1238,7 +1238,6 @@ static void eeh_add_device_late(struct p pdn->pcidev = dev;pci_addr_cache_insert_device (dev); -eeh_sysfs_add_device (dev); }void eeh_add_device_tree_late (struct pci_bus *bus)@@ -1257,6 +1256,29 @@ void eeh_add_device_tree_late(struct pciEXPORT_SYMBOL_GPL (eeh_add_device_tree_late);/** +* eeh_add_sysfs_files - Add EEH sysfs files for the indicated PCI bus +* @bus: PCI bus +* +* This routine must be used to add EEH sysfs files for PCI +* devices which are attached to the indicated PCI bus. The PCI bus +* is added after system boot through hotplug or dlpar. +*/ +void eeh_add_sysfs_files (struct pci_bus *bus) +{ +struct pci_dev *dev; + +list_for_each_entry (dev, &bus->devices, bus_list) { +eeh_sysfs_add_device (dev); +if (dev->hdr_type ==PCI_HEADER_TYPE_BRIDGE ) { +struct pci_bus *subbus = dev->subordinate; +if (subbus) +eeh_add_sysfs_files (subbus); + } + } +} +EXPORT_SYMBOL_GPL (eeh_add_sysfs_files); + +/** * eeh_remove_device - undo EEH setup for the indicated pci device * @dev: pci device to be removed * -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/Signature · 3 lines
Ben Hutchings Always try to do things in chronological order; it's less confusing that way.
Re: [ 008/153] powerpc/eeh: Fix crash when adding a device in a slot with DDW
Quoted 14 lines · Thadeu Lima de Souza Cascardo
Quoted 13 lines · Ben Hutchings
Quoted 5 lines · Michael Neuling
This patch is breaking the
celleb_defconfigon powerpc with:
arch/powerpc/kernel/of_platform.c: In function 'of_pci_phb_probe':arch/powerpc/kernel/of_platform.c:95:2: error: implicit declaration of function 'eeh_add_sysfs_files' [-Werror=implicit-function-declaration]In 3.2 this file doesn't (directly) include <
asm/eeh.h> which is where the definition was added. In mainline it does.Assuming that this change is actually required for 3.2 (which I'm not sure about), I suppose we just need to add the #include.
Quoted 6 lines
Quoted 2 lines
Ben.
This is not required for 3.2. The patch that *may* have broken DLPAR (
39baadbf36cee3ede5fdb8a34006d9109e5e2570) was introduced between 3.3 and 3.4.
Reverting 066f289835f09a3f744d6bac96f25e25d20b3ded (from 3.2.40) fixes the problem for me so I'm ok if we do that instead.
Mikey
Quoted 147 lines
Regards.
Cascardo.Quoted 141 lines
Quoted 136 lines
Mikey
Quoted 132 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit
6a040ce72598159a74969a2d01ab0ba5ee6536b3upstream.The DDW code uses a
eeh_devstruct from thepci_dev. However, this is not set untileeh_add_device_lateis called.Since
pci_bus_add_devicesis called beforeeeh_add_device_late, the PCI devices are added to the bus, making drivers' probe hooks to be called. These will callset_dma_mask, which will call the DDW code, which will require theeeh_devstruct frompci_dev. This would result in a crash, due to a NULL dereference.Calling
eeh_add_device_lateafterpci_bus_add_deviceswould make the system BUG, because device files shouldn't be added to devices there were not added to the system. So, a new function is needed to add such files only afterpci_bus_add_deviceshave been called.Signed-off-by Thadeu Lima de Souza Cascardo <[email protected]>Acked-by Gavin Shan <[email protected]>Signed-off-by Benjamin Herrenschmidt <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>--- arch/powerpc/include/asm/eeh.h | 3 +++ arch/powerpc/kernel/of_platform.c | 3 +++ arch/powerpc/kernel/pci-common.c | 7 +++++-- arch/powerpc/platforms/pseries/eeh.c | 24 +++++++++++++++++++++++- 4 files changed, 34 insertions(+), 3 deletions(-)arch/powerpc/include/asm/eeh.h +3
-0@@ -61,6 +61,7 @@ void __init pci_addr_cache_build(void);*/ void eeh_add_device_tree_early (struct device_node *);void eeh_add_device_tree_late (struct pci_bus *); +void eeh_add_sysfs_files (struct pci_bus *);/** * eeh_remove_device_recursive - undo EEH for device & children. @@ -105,6 +106,8 @@ static inline void eeh_add_device_tree_estatic inline void eeh_add_device_tree_late (struct pci_bus *bus) { } +static inline void eeh_add_sysfs_files (struct pci_bus *bus) { } +static inline void eeh_remove_bus_device (struct pci_dev *dev) { }#define EEH_POSSIBLE_ERROR (val, type) (0)#define EEH_IO_ERROR_VALUE (size) (-1UL)arch/powerpc/kernel/of_platform.c +3
-0@@ -91,6 +91,9 @@ static int __devinit of_pci_phb_probe(st/* Add probed PCI devices to the device model */ pci_bus_add_devices (phb->bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (phb->bus); +return 0 ; }arch/powerpc/kernel/pci-common.c +5
-2@@ -1536,11 +1536,14 @@ void pcibios_finish_adding_to_bus(structpcibios_allocate_bus_resources (bus);pcibios_claim_one_bus (bus); +/* Fixup EEH */ +eeh_add_device_tree_late (bus); +/* Add new devices to global lists. Register in proc, sysfs. */ pci_bus_add_devices (bus); -/* Fixup EEH */ -eeh_add_device_tree_late (bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (bus); }EXPORT_SYMBOL_GPL (pcibios_finish_adding_to_bus);arch/powerpc/platforms/pseries/eeh.c +23
-2@@ -1238,7 +1238,6 @@ static void eeh_add_device_late(struct p pdn->pcidev = dev;pci_addr_cache_insert_device (dev); -eeh_sysfs_add_device (dev); }void eeh_add_device_tree_late (struct pci_bus *bus)@@ -1257,6 +1256,29 @@ void eeh_add_device_tree_late(struct pciEXPORT_SYMBOL_GPL (eeh_add_device_tree_late);/** +* eeh_add_sysfs_files - Add EEH sysfs files for the indicated PCI bus +* @bus: PCI bus +* +* This routine must be used to add EEH sysfs files for PCI +* devices which are attached to the indicated PCI bus. The PCI bus +* is added after system boot through hotplug or dlpar. +*/ +void eeh_add_sysfs_files (struct pci_bus *bus) +{ +struct pci_dev *dev; + +list_for_each_entry (dev, &bus->devices, bus_list) { +eeh_sysfs_add_device (dev); +if (dev->hdr_type ==PCI_HEADER_TYPE_BRIDGE ) { +struct pci_bus *subbus = dev->subordinate; +if (subbus) +eeh_add_sysfs_files (subbus); + } + } +} +EXPORT_SYMBOL_GPL (eeh_add_sysfs_files); + +/** * eeh_remove_device - undo EEH setup for the indicated pci device * @dev: pci device to be removed * -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/Signature · 3 lines
Ben Hutchings Always try to do things in chronological order; it's less confusing that way.
Re: [ 008/153] powerpc/eeh: Fix crash when adding a device in a slot with DDW
Quoted 19 lines · Michael Neuling
Quoted 17 lines · Thadeu Lima de Souza Cascardo
Quoted 15 lines · Ben Hutchings
Quoted 5 lines · Michael Neuling
This patch is breaking the
celleb_defconfigon powerpc with:
arch/powerpc/kernel/of_platform.c: In function 'of_pci_phb_probe':arch/powerpc/kernel/of_platform.c:95:2: error: implicit declaration of function 'eeh_add_sysfs_files' [-Werror=implicit-function-declaration]In 3.2 this file doesn't (directly) include <
asm/eeh.h> which is where the definition was added. In mainline it does.Assuming that this change is actually required for 3.2 (which I'm not sure about), I suppose we just need to add the #include.
Ben.
Quoted 6 lines
Quoted 3 lines
This is not required for 3.2. The patch that *may* have broken DLPAR (
39baadbf36cee3ede5fdb8a34006d9109e5e2570) was introduced between 3.3 and 3.4.Reverting
066f289835f09a3f744d6bac96f25e25d20b3ded(from 3.2.40) fixes the problem for me so I'm ok if we do that instead.
Thanks all; I've queued up the revert.
Ben.
Signature · 2 lines
Ben Hutchings Humans are not rational beings; they are rationalising beings.
PATCH 9/153 ext4: return ENOMEM if sb_getblk() fails
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit 860d21e2c585f7ee8a4ecc06f474fdc33c9474f4 upstream.
The only reason for sb_getblk() failing is if it can't allocate the buffer_head. So ENOMEM is more appropriate than EIO. In addition, make sure that the file system is marked as being inconsistent if sb_getblk() fails.
[bwh: Backported to 3.2:
- Adjust context
- Drop change to inline.c
- Call to ext4_ext_check() from ext4_ext_find_extent() is conditional]
--- fs/ext4/extents.c | 25 ++++++++++++++----------- fs/ext4/indirect.c | 9 ++++++--- fs/ext4/inline.c | 2 +- fs/ext4/inode.c | 9 +++------ fs/ext4/mmp.c | 2 ++ fs/ext4/resize.c | 8 ++++---- fs/ext4/xattr.c | 3 ++- 7 files changed, 32 insertions(+), 26 deletions(-)
fs/ext4/extents.c +14 -11
@@ -636,6 +636,7 @@ ext4_ext_find_extent(struct inode *inodestruct ext4_extent_header *eh;struct buffer_head *bh;short int depth, i, ppos =0 , alloc =0 ; +int ret; eh =ext_inode_hdr (inode); depth =ext_depth (inode);
@@ -665,12 +666,15 @@ ext4_ext_find_extent(struct inode *inode path[ppos].p_ext =NULL ; bh =sb_getblk (inode->i_sb, path[ppos].p_block); -if (unlikely (!bh)) +if (unlikely (!bh)) { + ret = -ENOMEM ; goto err; + }if (!bh_uptodate_or_lock (bh)) {trace_ext4_ext_load_extent (inode, block, path[ppos].p_block); -if (bh_submit_read (bh) <0 ) { + ret =bh_submit_read (bh); +if (ret <0 ) {put_bh (bh); goto err; }
@@ -683,13 +687,15 @@ ext4_ext_find_extent(struct inode *inodeput_bh (bh);EXT4_ERROR_INODE (inode,"ppos %d > depth %d" , ppos, depth); + ret = -EIO ; goto err; } path[ppos].p_bh = bh; path[ppos].p_hdr = eh; i--; -if (need_to_validate &&ext4_ext_check (inode, eh, i)) + ret = need_to_validate ?ext4_ext_check (inode, eh, i) :0 ; +if (ret <0 ) goto err; }
@@ -711,7 +717,7 @@ err:ext4_ext_drop_refs (path);if (alloc)kfree (path); -return ERR_PTR (-EIO ); +return ERR_PTR (ret); }/*
@@ -866,7 +872,7 @@ static int ext4_ext_split(handle_t *hand } bh =sb_getblk (inode->i_sb, newblock);if (!bh) { - err = -EIO ; + err = -ENOMEM ; goto cleanup; }lock_buffer (bh);
@@ -938,7 +944,7 @@ static int ext4_ext_split(handle_t *hand newblock = ablocks[--a]; bh =sb_getblk (inode->i_sb, newblock);if (!bh) { - err = -EIO ; + err = -ENOMEM ; goto cleanup; }lock_buffer (bh);
@@ -1049,11 +1055,8 @@ static int ext4_ext_grow_indepth(handle_return err; bh =sb_getblk (inode->i_sb, newblock); -if (!bh) { - err = -EIO ; -ext4_std_error (inode->i_sb, err); -return err; - } +if (!bh) +return -ENOMEM ;lock_buffer (bh); err =ext4_journal_get_create_access (handle, bh);
fs/ext4/indirect.c +6 -3
@@ -146,6 +146,7 @@ static Indirect *ext4_get_branch(structstruct super_block *sb = inode->i_sb;Indirect *p = chain;struct buffer_head *bh; +int ret = -EIO ; *err =0 ;/* i_data is not going away, no lock needed */
@@ -154,8 +155,10 @@ static Indirect *ext4_get_branch(struct goto no_block;while (--depth) { bh =sb_getblk (sb,le32_to_cpu (p->key)); -if (unlikely (!bh)) +if (unlikely (!bh)) { + ret = -ENOMEM ; goto failure; + }if (!bh_uptodate_or_lock (bh)) {if (bh_submit_read (bh) <0 ) {
@@ -177,7 +180,7 @@ static Indirect *ext4_get_branch(structreturn NULL ; failure: - *err = -EIO ; + *err = ret; no_block:return p; }
@@ -471,7 +474,7 @@ static int ext4_alloc_branch(handle_t *h*/ bh =sb_getblk (inode->i_sb, new_blocks[n-1 ]);if (unlikely (!bh)) { - err = -EIO ; + err = -ENOMEM ; goto failed; }
fs/ext4/inode.c +3 -6
@@ -661,7 +661,7 @@ struct buffer_head *ext4_getblk(handle_t bh =sb_getblk (inode->i_sb, map.m_pblk);if (!bh) { - *errp = -EIO ; + *errp = -ENOMEM ;return NULL ; }if (map.m_flags &EXT4_MAP_NEW ) {
@@ -3575,11 +3575,8 @@ static int __ext4_get_inode_loc(struct i iloc->offset = (inode_offset % inodes_per_block) *EXT4_INODE_SIZE (sb); bh =sb_getblk (sb, block); -if (!bh) { -EXT4_ERROR_INODE_BLOCK (inode, block, -"unable to read itable block" ); -return -EIO ; - } +if (!bh) +return -ENOMEM ;if (!buffer_uptodate (bh)) {lock_buffer (bh);
fs/ext4/mmp.c +2 -0
@@ -41,6 +41,8 @@ static int read_mmp_block(struct super_b* is not blocked in the elevator. */ if (!*bh) *bh =sb_getblk (sb, mmp_block); +if (!*bh) +return -ENOMEM ;if (*bh) {get_bh (*bh);lock_buffer (*bh);
fs/ext4/resize.c +3 -3
@@ -142,7 +142,7 @@ static struct buffer_head *bclean(handle bh =sb_getblk (sb, blk);if (!bh) -return ERR_PTR (-EIO ); +return ERR_PTR (-ENOMEM );if ((err =ext4_journal_get_write_access (handle, bh))) {brelse (bh); bh =ERR_PTR (err);
@@ -220,7 +220,7 @@ static int setup_new_group_blocks(struct gdb =sb_getblk (sb, block);if (!gdb) { - err = -EIO ; + err = -ENOMEM ; goto exit_journal; }if ((err =ext4_journal_get_write_access (handle, gdb))) {
@@ -694,7 +694,7 @@ static void update_backups(struct super_ bh =sb_getblk (sb, group * bpg + blk_off);if (!bh) { - err = -EIO ; + err = -ENOMEM ;break ; } ext4_debug("update metadata backup %#04lx\n",
fs/ext4/xattr.c +2 -1
@@ -839,16 +839,17 @@ inserted: new_bh =sb_getblk (sb, block);if (!new_bh) { + error = -ENOMEM ; getblk_failed:ext4_free_blocks (handle, inode,NULL , block,1 ,EXT4_FREE_BLOCKS_METADATA ); - error = -EIO ; goto cleanup; }lock_buffer (new_bh); error =ext4_journal_get_create_access (handle, new_bh);if (error) {unlock_buffer (new_bh); + error = -EIO ; goto getblk_failed; }memcpy (new_bh->b_data, s->base, new_bh->b_size);
PATCH 10/153 pcmcia/vrc4171: Add missing spinlock init
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean Delvare <[email protected]>
commit 811af9723859884f2f771f3174f3ddedab7c53b5 upstream.
It doesn't seem this spinlock was properly initialized. This bug was introduced by commit 7a410e8d4d97457c8c381e2de9cdc7bd3306badc.
--- drivers/pcmcia/vrc4171_card.c | 1 + 1 file changed, 1 insertion(+)
drivers/pcmcia/vrc4171_card.c +1 -0
@@ -246,6 +246,7 @@ static int pccard_init(struct pcmcia_soc socket = &vrc4171_sockets[slot]; socket->csc_irq =search_nonuse_irq (); socket->io_irq =search_nonuse_irq (); +spin_lock_init (&socket->lock);return 0 ; }
PATCH 11/153 Purge existing TLB entries in set_pte_at and ptep_set_wrprotect
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: John David Anglin <[email protected]>
commit 7139bc1579901b53db7e898789e916ee2fb52d78 upstream.
This patch goes a long way toward fixing the minifail bug, and it significantly improves the stability of SMP machines such as the rp3440. When write protecting a page for COW, we need to purge the existing translation. Otherwise, the COW break doesn't occur as expected because the TLB may still have a stale entry which allows writes.
--- arch/parisc/include/asm/pgtable.h | 13 ++++++++++--- arch/parisc/kernel/cache.c | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-)
arch/parisc/include/asm/pgtable.h +10 -3
@@ -12,11 +12,10 @@#include <linux/bitops.h> #include <linux/spinlock.h> +#include <linux/mm_types.h> #include <asm/processor.h> #include <asm/cache.h> -struct vm_area_struct ; -/* * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel * memory. For the return value to be meaningful, ADDR must be >=
@@ -40,7 +39,14 @@ struct vm_area_struct;do { \ *(pteptr) = (pteval); \ } while(0) -#define set_pte_at (mm,addr,ptep,pteval) set_pte(ptep,pteval) + +extern void purge_tlb_entries (struct mm_struct *,unsigned long ); + +#define set_pte_at (mm, addr, ptep, pteval) \ + do { \ + set_pte(ptep, pteval); \ + purge_tlb_entries(mm, addr); \ + } while (0)#endif /* !__ASSEMBLY__ */
@@ -464,6 +470,7 @@ static inline void ptep_set_wrprotect(st old =pte_val (*ptep); new = pte_val(pte_wrprotect(__pte (old))); }while (cmpxchg ((unsigned long *) ptep, old, new) != old); +purge_tlb_entries (mm, addr);#else pte_t old_pte = *ptep;set_pte_at (mm, addr, ptep,pte_wrprotect (old_pte));
arch/parisc/kernel/cache.c +18 -0
@@ -421,6 +421,24 @@ void kunmap_parisc(void *addr)EXPORT_SYMBOL (kunmap_parisc);#endif +void purge_tlb_entries (struct mm_struct *mm,unsigned long addr) +{ +unsigned long flags; + +/* Note: purge_tlb_entries can be called at startup with +no context. */ + +/* Disable preemption while we play with %sr1. */ +preempt_disable (); +mtsp (mm->context,1 ); +purge_tlb_start (flags); +pdtlb (addr); +pitlb (addr); +purge_tlb_end (flags); +preempt_enable (); +} +EXPORT_SYMBOL (purge_tlb_entries); +void __flush_tlb_range (unsigned long sid,unsigned long start,unsigned long end) {
PATCH 12/153 ARM: PXA3xx: program the CSMSADRCFG register
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Igor Grinberg <[email protected]>
commit d107a204154ddd79339203c2deeb7433f0cf6777 upstream.
The Chip Select Configuration Register must be programmed to 0x2 in order to achieve the correct behavior of the Static Memory Controller.
Without this patch devices wired to DFI and accessed through SMC cannot be accessed after resume from S2.
Do not rely on the boot loader to program the CSMSADRCFG register by programming it in the kernel smemc module.
--- arch/arm/mach-pxa/include/mach/smemc.h | 1 + arch/arm/mach-pxa/smemc.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
arch/arm/mach-pxa/include/mach/smemc.h +1 -0
@@ -37,6 +37,7 @@#define CSADRCFG1 (SMEMC_VIRT + 0x84)/* Address Configuration Register for CS1 */ #define CSADRCFG2 (SMEMC_VIRT + 0x88)/* Address Configuration Register for CS2 */ #define CSADRCFG3 (SMEMC_VIRT + 0x8C)/* Address Configuration Register for CS3 */ +#define CSMSADRCFG (SMEMC_VIRT + 0xA0)/* Chip Select Configuration Register */ /* * More handy macros for PCMCIA
arch/arm/mach-pxa/smemc.c +14 -1
@@ -40,6 +40,8 @@ static void pxa3xx_smemc_resume(void)__raw_writel (csadrcfg[1 ],CSADRCFG1 );__raw_writel (csadrcfg[2 ],CSADRCFG2 );__raw_writel (csadrcfg[3 ],CSADRCFG3 ); +/* CSMSADRCFG wakes up in its default state (0), so we need to set it */ +__raw_writel (0x2 ,CSMSADRCFG ); }static struct syscore_ops smemc_syscore_ops = {
@@ -49,8 +51,19 @@ static struct syscore_ops smemc_syscore_static int __init smemc_init (void ) { -if (cpu_is_pxa3xx ()) +if (cpu_is_pxa3xx ()) { +/* +* The only documentation we have on the +* Chip Select Configuration Register (CSMSADRCFG) is that +* it must be programmed to 0x2. +* Moreover, in the bit definitions, the second bit +* (CSMSADRCFG[1]) is called "SETALWAYS". +* Other bits are reserved in this register. +*/ +__raw_writel (0x2 ,CSMSADRCFG ); +register_syscore_ops (&smemc_syscore_ops); + }return 0 ; }
PATCH 13/153 USB: option: add and update Alcatel modems
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
commit f8f0302bbcbd1b14655bef29f6996a2152be559d upstream.
Adding three currently unsupported modems based on information from .inf driver files:
Diag VID_1BBB&PID_0052&MI_00
AGPS VID_1BBB&PID_0052&MI_01
VOICE VID_1BBB&PID_0052&MI_02
AT VID_1BBB&PID_0052&MI_03
Modem VID_1BBB&PID_0052&MI_05
wwan VID_1BBB&PID_0052&MI_06
Diag VID_1BBB&PID_00B6&MI_00
AT VID_1BBB&PID_00B6&MI_01
Modem VID_1BBB&PID_00B6&MI_02
wwan VID_1BBB&PID_00B6&MI_03
Diag VID_1BBB&PID_00B7&MI_00
AGPS VID_1BBB&PID_00B7&MI_01
VOICE VID_1BBB&PID_00B7&MI_02
AT VID_1BBB&PID_00B7&MI_03
Modem VID_1BBB&PID_00B7&MI_04
wwan VID_1BBB&PID_00B7&MI_05
Updating the blacklist info for the X060S_X200 and X220_X500D, reserving interfaces for a wwan driver, based on
wwan VID_1BBB&PID_0000&MI_04
wwan VID_1BBB&PID_0017&MI_06
--- drivers/usb/serial/option.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/usb/serial/option.c +9 -1
@@ -479,6 +479,7 @@ static const struct option_blacklist_infstatic const struct option_blacklist_info alcatel_x200_blacklist = { .sendsetup =BIT (0 ) |BIT (1 ), + .reserved =BIT (4 ), };static const struct option_blacklist_info zte_0037_blacklist = {
@@ -1215,7 +1216,14 @@ static const struct usb_device_id option { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200), .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist }, - { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D), + .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, 0x0052), + .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b6), + .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7), + .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
PATCH 14/153 quota: autoload the quota_v2 module for QFMT_VFS_V1 quota format
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit c3ad83d9efdfe6a86efd44945a781f00c879b7b4 upstream.
Otherwise, ext4 file systems with the quota featured enable will get a very confusing "No such process" error message if the quota code is built as a module and the quota_v2 module has not been loaded.
--- include/linux/quota.h | 1 + 1 file changed, 1 insertion(+)
include/linux/quota.h +1 -0
@@ -413,6 +413,7 @@ struct quota_module_name {#define INIT_QUOTA_MODULE_NAMES {\ {QFMT_VFS_OLD, "quota_v1"},\ {QFMT_VFS_V0, "quota_v2"},\ + {QFMT_VFS_V1, "quota_v2"},\ {0, NULL}}#endif /* __KERNEL__ */
PATCH 15/153 ext4: fix possible use-after-free with AIO
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 091e26dfc156aeb3b73bc5c5f277e433ad39331c upstream.
Running AIO is pinning inode in memory using file reference. Once AIO is completed using aio_complete(), file reference is put and inode can be freed from memory. So we have to be sure that calling aio_complete() is the last thing we do with the inode.
--- fs/ext4/inode.c | 2 +- fs/ext4/page-io.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-)
fs/ext4/inode.c +1 -1
@@ -2795,9 +2795,9 @@ static void ext4_end_io_dio(struct kiocbif (!(io_end->flag &EXT4_IO_END_UNWRITTEN )) {ext4_free_io_end (io_end); out: +inode_dio_done (inode);if (is_async)aio_complete (iocb, ret,0 ); -inode_dio_done (inode);return ; }
fs/ext4/page-io.c +4 -5
@@ -108,14 +108,13 @@ int ext4_end_io_nolock(ext4_io_end_t *io inode->i_ino, offset, size, ret); } -if (io->iocb) -aio_complete (io->iocb, io->result,0 ); - -if (io->flag &EXT4_IO_END_DIRECT ) -inode_dio_done (inode);/* Wake up anyone waiting on unwritten extent conversion */ if (atomic_dec_and_test (&EXT4_I (inode)->i_aiodio_unwritten))wake_up_all (ext4_ioend_wq (io->inode)); +if (io->flag &EXT4_IO_END_DIRECT ) +inode_dio_done (inode); +if (io->iocb) +aio_complete (io->iocb, io->result,0 );return ret; }
PATCH 16/153 s390/kvm: Fix store status for ACRS/FPRS
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
commit 15bc8d8457875f495c59d933b05770ba88d1eacb upstream.
On store status we need to copy the current state of registers into a save area. Currently we might save stale versions:
The sie state descriptor doesnt have fields for guest ACRS,FPRS, those registers are simply stored in the host registers. The host program must copy these away if needed. We do that in vcpu_put/load.
If we now do a store status in KVM code between vcpu_put/load, the saved values are not up-to-date. Lets collect the ACRS/FPRS before saving them.
This also fixes some strange problems with hotplug and virtio-ccw, since the low level machine check handler (on hotplug a machine check will happen) will revalidate all registers with the content of the save area.
--- arch/s390/kvm/kvm-s390.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/s390/kvm/kvm-s390.c +8 -0
@@ -597,6 +597,14 @@ int kvm_s390_vcpu_store_status(struct kv }else prefix =0 ; +/* +* The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy +* copying in vcpu load/put. Lets update our copies before we save +* it into the save area +*/ +save_fp_regs (&vcpu->arch.guest_fpregs); +save_access_regs (vcpu->arch.guest_acrs); +if (__guestcopy (vcpu, addr + offsetof(struct save_area , fp_regs), vcpu->arch.guest_fpregs.fprs,128 , prefix))return -EFAULT ;
PATCH 17/153 staging: comedi: disallow COMEDI_DEVCONFIG on non-board minors
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 754ab5c0e55dd118273ca2c217c4d95e9fbc8259 upstream.
Comedi has two sorts of minor devices:
(a) normal board minor devices in the range 0 to COMEDI_NUM_BOARD_MINORS-1 inclusive; and
(b) special subdevice minor devices in the range COMEDI_NUM_BOARD_MINORS upwards that are used to open the same underlying comedi device as the normal board minor devices, but with non-default read and write subdevices for asynchronous commands.
The special subdevice minor devices get created when a board supporting asynchronous commands is attached to a normal board minor device, and destroyed when the board is detached from the normal board minor device. One way to attach or detach a board is by using the COMEDI_DEVCONFIG ioctl. This should only be used on normal board minors as the special subdevice minors are too ephemeral. In particular, the change introduced in commit 7d3135af399e92cf4c9bbc5f86b6c140aab3b88c ("staging:
comedi: prevent auto-unconfig of manually configured devices") breaks horribly for special subdevice minor devices.
Since there's no legitimate use for the COMEDI_DEVCONFIG ioctl on a special subdevice minor device node, disallow it and return -ENOTTY.
--- drivers/staging/comedi/comedi_fops.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/staging/comedi/comedi_fops.c +5 -0
@@ -136,6 +136,11 @@ static long comedi_unlocked_ioctl(struct/* Device config is special, because it must work on * an unconfigured device. */ if (cmd ==COMEDI_DEVCONFIG ) { +if (minor >=COMEDI_NUM_BOARD_MINORS ) { +/* Device config not appropriate on non-board minors. */ + rc = -ENOTTY ; + goto done; + } rc =do_devconfig_ioctl (dev, (struct comedi_devconfig __user *)arg); goto done;
PATCH 18/153 ALSA: usb-audio: fix Roland A-PRO support
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Clemens Ladisch <[email protected]>
commit 7da58046482fceb17c4a0d4afefd9507ec56de7f upstream.
The quirk for the Roland/Cakewalk A-PRO keyboards accidentally used the wrong interface number, which prevented the driver from attaching to the device.
--- sound/usb/quirks-table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/quirks-table.h +1 -1
@@ -1624,7 +1624,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {/* .vendor_name = "Roland", */ /* .product_name = "A-PRO", */ - .ifnum =1 , + .ifnum =0 , .type =QUIRK_MIDI_FIXED_ENDPOINT , .data = & (const struct snd_usb_midi_endpoint_info ) { .out_cables =0x0003 ,
PATCH 19/153 x86-32, mm: Rip out x86_32 NUMA remapping code
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Hansen <[email protected]>
commit f03574f2d5b2d6229dcdf2d322848065f72953c7 upstream.
This code was an optimization for 32-bit NUMA systems.
It has probably been the cause of a number of subtle bugs over the years, although the conditions to excite them would have been hard to trigger. Essentially, we remap part of the kernel linear mapping area, and then sometimes part of that area gets freed back in to the bootmem allocator. If those pages get used by kernel data structures (say mem_map[] or a dentry), there's no big deal. But, if anyone ever tried to use the linear mapping for these pages _and_ cared about their physical address, bad things happen.
For instance, say you passed __GFP_ZERO to the page allocator and then happened to get handed one of these pages, it zero the remapped page, but it would make a pte to the _old_ page. There are probably a hundred other ways that it could screw with things.
We don't need to hang on to performance optimizations for these old boxes any more. All my 32-bit NUMA systems are long dead and buried, and I probably had access to more than most people.
This code is causing real things to break today:
https://lkml.org/lkml/2013/1/9/376
I looked in to actually fixing this, but it requires surgery to way too much brittle code, as well as stuff like per_cpu_ptr_to_phys().
[ hpa: Cc: this for -stable, since it is a memory corruption issue.
However, an alternative is to simply mark NUMA as depends BROKEN rather than EXPERIMENTAL in the X86_32 subclause... ]
---
arch/x86/Kconfig +1 -1
@@ -1150,7 +1150,7 @@ config DIRECT_GBPAGES config NUMA bool "Numa Memory Allocation and Scheduler Support" depends on SMP - depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) + depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && BROKEN) default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) ---help--- Enable NUMA (Non Uniform Memory Access) support.
PATCH 20/153 ALSA: hda - Release assigned pin/cvt at error path of hdmi_pcm_open()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 2ad779b7329d6894a80df94e693e72eaa0d56790 upstream.
If the driver detects and invalid ELD, it gives an open error. But it forgot to release the assigned pin, converter and spdif ctls before returning.
--- sound/pci/hda/patch_hdmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/pci/hda/patch_hdmi.c +5 -1
@@ -918,8 +918,12 @@ static int hdmi_pcm_open(struct hda_pcm_if (!static_hdmi_pcm && eld->eld_valid) {snd_hdmi_eld_update_pcm_info (eld, hinfo);if (hinfo->channels_min > hinfo->channels_max || - !hinfo->rates || !hinfo->formats) + !hinfo->rates || !hinfo->formats) { + per_cvt->assigned =0 ; + hinfo->nid =0 ; +snd_hda_spdif_ctls_unassign (codec, pin_idx);return -ENODEV ; + } }/* Store the updated parameters */
PATCH 21/153 ext4: fix race in ext4_mb_add_n_trim()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niu Yawei <[email protected]>
commit f1167009711032b0d747ec89a632a626c901a1ad upstream.
In ext4_mb_add_n_trim(), lg_prealloc_lock should be taken when changing the lg_prealloc_list.
--- fs/ext4/mballoc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/ext4/mballoc.c +3 -3
@@ -4178,7 +4178,7 @@ static void ext4_mb_add_n_trim(struct ex/* The max size of hash table is PREALLOC_TB_SIZE */ order =PREALLOC_TB_SIZE -1 ;/* Add the prealloc space to lg */ -rcu_read_lock (); +spin_lock (&lg->lg_prealloc_lock);list_for_each_entry_rcu (tmp_pa, &lg->lg_prealloc_list[order], pa_inode_list) {spin_lock (&tmp_pa->pa_lock);
@@ -4202,12 +4202,12 @@ static void ext4_mb_add_n_trim(struct exif (!added)list_add_tail_rcu (&pa->pa_inode_list, &lg->lg_prealloc_list[order]); -rcu_read_unlock (); +spin_unlock (&lg->lg_prealloc_lock);/* Now trim the list to be not more than 8 elements */ if (lg_prealloc_count >8 ) {ext4_mb_discard_lg_preallocations (sb, lg, - order, lg_prealloc_count); + order, lg_prealloc_count);return ; }return ;
PATCH 22/153 zram: Fix deadlock bug in partial read/write
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minchan Kim <[email protected]>
commit 7e5a5104c6af709a8d97d5f4711e7c917761d464 upstream.
Now zram allocates new page with GFP_KERNEL in zram I/O path if IO is partial. Unfortunately, It may cause deadlock with reclaim path like below.
write_page from fsfs_lockallocation(GFP_KERNEL)
reclaim
pageout
write_page from fs fs_lock <-- deadlock
This patch fixes it by using GFP_NOIO. In read path, we reorganize code flow so that kmap_atomic is called after the GFP_NOIO allocation.
--- drivers/staging/zram/zram_drv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/staging/zram/zram_drv.c +2 -2
@@ -242,7 +242,7 @@ static int zram_bvec_read(struct zram *zif (is_partial_io (bvec)) {/* Use a temporary buffer to decompress the page */ - uncmem =kmalloc (PAGE_SIZE ,GFP_KERNEL ); + uncmem =kmalloc (PAGE_SIZE ,GFP_NOIO );if (!uncmem) {pr_info ("Error allocating temp memory!\n" );return -ENOMEM ;
@@ -338,7 +338,7 @@ static int zram_bvec_write(struct zram ** This is a partial IO. We need to read the full page * before to write the changes. */ - uncmem =kmalloc (PAGE_SIZE ,GFP_KERNEL ); + uncmem =kmalloc (PAGE_SIZE ,GFP_NOIO );if (!uncmem) {pr_info ("Error allocating temp memory!\n" ); ret = -ENOMEM ;
PATCH 23/153 Driver core: treat unregistered bus_types as having no devices
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Helgaas <[email protected]>
commit 4fa3e78be7e985ca814ce2aa0c09cbee404efcf7 upstream.
A bus_type has a list of devices (klist_devices), but the list and the subsys_private structure that contains it are not initialized until the bus_type is registered with bus_register().
The panic/reboot path has fixups that look up devices in pci_bus_type. If we panic before registering pci_bus_type, the bus_type exists but the list does not, so mach_reboot_fixups() trips over a null pointer and panics again:
mach_reboot_fixups
pci_get_device
..
bus_find_device(&pci_bus_type, ...)
bus->p is NULLJoonsoo reported a problem when panicking before PCI was initialized. I think this patch should be sufficient to replace the patch he posted
here: https://lkml.org/lkml/2012/12/28/75 ("[PATCH] x86, reboot: skip reboot_fixups in early boot phase")
--- drivers/base/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/bus.c +2 -2
@@ -289,7 +289,7 @@ int bus_for_each_dev(struct bus_type *bustruct device *dev;int error =0 ; -if (!bus) +if (!bus || !bus->p)return -EINVAL ; klist_iter_init_node(&bus->p->klist_devices, &i,
@@ -323,7 +323,7 @@ struct device *bus_find_device(struct bustruct klist_iter i;struct device *dev; -if (!bus) +if (!bus || !bus->p)return NULL ; klist_iter_init_node(&bus->p->klist_devices, &i,
PATCH 24/153 ALSA: aloop: Fix Oops while PM resume
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit edac894389f9c9de2a1368c78809c824b343f3a5 upstream.
snd-aloop driver has no proper PM implementation, thus the PM resume may trigger Oops due to leftover timer instance. This patch adds the missing suspend/resume implementation.
--- sound/drivers/aloop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/drivers/aloop.c +4 -1
@@ -287,12 +287,14 @@ static int loopback_trigger(struct snd_ploopback_active_notify (dpcm);break ;case SNDRV_PCM_TRIGGER_PAUSE_PUSH : +case SNDRV_PCM_TRIGGER_SUSPEND :spin_lock (&cable->lock); cable->pause |= stream;spin_unlock (&cable->lock);loopback_timer_stop (dpcm);break ;case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : +case SNDRV_PCM_TRIGGER_RESUME :spin_lock (&cable->lock); dpcm->last_jiffies = jiffies; cable->pause &= ~stream;
@@ -552,7 +554,8 @@ static snd_pcm_uframes_t loopback_pointestatic struct snd_pcm_hardware loopback_pcm_hardware = { .info = (SNDRV_PCM_INFO_INTERLEAVED |SNDRV_PCM_INFO_MMAP | -SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_PAUSE ), +SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_PAUSE | +SNDRV_PCM_INFO_RESUME ), .formats = (SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S16_BE |SNDRV_PCM_FMTBIT_S32_LE |SNDRV_PCM_FMTBIT_S32_BE |SNDRV_PCM_FMTBIT_FLOAT_LE |SNDRV_PCM_FMTBIT_FLOAT_BE ),
PATCH 25/153 UBIFS: fix double free of ubifs_orphan objects
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Thomas <[email protected]>
commit 8afd500cb52a5d00bab4525dd5a560d199f979b9 upstream.
The last orphan in the dnext list has its dnext set to NULL. Because of that, ubifs_delete_orphan assumes that it is not on the dnext list and frees it immediately instead ignoring it as a second delete. The orphan is later freed again by erase_deleted.
This change adds an explicit flag to ubifs_orphan indicating whether it is pending delete.
--- fs/ubifs/orphan.c | 5 ++++- fs/ubifs/ubifs.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)
fs/ubifs/orphan.c +4 -1
@@ -130,13 +130,14 @@ void ubifs_delete_orphan(struct ubifs_inelse if (inum > o->inum) p = p->rb_right;else { -if (o->dnext) { +if (o->del) {spin_unlock (&c->orphan_lock);dbg_gen ("deleted twice ino %lu" , (unsigned long )inum);return ; }if (o->cnext) { + o->del =1 ; o->dnext = c->orph_dnext; c->orph_dnext = o;spin_unlock (&c->orphan_lock);
@@ -447,6 +448,7 @@ static void erase_deleted(struct ubifs_i orphan = dnext; dnext = orphan->dnext;ubifs_assert (!orphan->new); +ubifs_assert (orphan->del);rb_erase (&orphan->rb, &c->orph_tree);list_del (&orphan->list); c->tot_orphans -=1 ;
@@ -536,6 +538,7 @@ static int insert_dead_orphan(struct ubirb_link_node (&orphan->rb, parent, p);rb_insert_color (&orphan->rb, &c->orph_tree);list_add_tail (&orphan->list, &c->orph_list); + orphan->del =1 ; orphan->dnext = c->orph_dnext; c->orph_dnext = orphan; dbg_mnt("ino %lu, new %d, tot %d", (unsigned long)inum,
fs/ubifs/ubifs.h +2 -0
@@ -908,6 +908,7 @@ struct ubifs_budget_req {* @dnext: next orphan to delete * @inum: inode number * @new: %1 => added since the last commit, otherwise %0 +* @del: %1 => delete pending, otherwise %0 */ struct ubifs_orphan {struct rb_node rb;
@@ -917,6 +918,7 @@ struct ubifs_orphan {struct ubifs_orphan *dnext;ino_t inum;int new; + unsigned del:1; };/**
PATCH 26/153 tty: set_termios/set_termiox should not return -EINTR
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit 183d95cdd834381c594d3aa801c1f9f9c0c54fa9 upstream.
See https://bugzilla.redhat.com/show_bug.cgi?id=904907
read command causes bash to abort with double free or corruption (out).
A simple test-case from Roman:
// Compile the reproducer and send sigchld ti that process.
// EINTR occurs even if SA_RESTART flag is set.
void handler(int sig)
{
}
main()
{
struct sigaction act;
act.sa_handler = handler;
act.sa_flags = SA_RESTART;
sigaction (SIGCHLD, &act, 0);
struct termio ttp;
ioctl(0, TCGETA, &ttp);
while(1)
{
if (ioctl(0, TCSETAW, ttp) < 0)
{
if (errno == EINTR)
{
fprintf(stderr, "BUG!"); return(1);
}
}
}
}Change set_termios/set_termiox to return -ERESTARTSYS to fix this particular problem.
I didn't dare to change other EINTR's in drivers/tty/, but they look equally wrong.
--- drivers/tty/tty_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/tty_ioctl.c +2 -2
@@ -618,7 +618,7 @@ static int set_termios(struct tty_structif (opt &TERMIOS_WAIT ) {tty_wait_until_sent (tty,0 );if (signal_pending (current)) -return -EINTR ; +return -ERESTARTSYS ; }tty_set_termios (tty, &tmp_termios);
@@ -685,7 +685,7 @@ static int set_termiox(struct tty_structif (opt &TERMIOS_WAIT ) {tty_wait_until_sent (tty,0 );if (signal_pending (current)) -return -EINTR ; +return -ERESTARTSYS ; }mutex_lock (&tty->termios_mutex);
PATCH 27/153 hrtimer: Prevent hrtimer_enqueue_reprogram race
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leonid Shatz <[email protected]>
commit b22affe0aef429d657bc6505aacb1c569340ddd2 upstream.
hrtimer_enqueue_reprogram contains a race which could result in timer.base switch during unlock/lock sequence.
hrtimer_enqueue_reprogram is releasing the lock protecting the timer base for calling raise_softirq_irqsoff() due to a lock ordering issue versus rq->lock.
If during that time another CPU calls __hrtimer_start_range_ns() on the same hrtimer, the timer base might switch, before the current CPU can lock base->lock again and therefor the unlock_timer_base() call will unlock the wrong lock.
[ tglx: Added comment and massaged changelog ]
--- kernel/hrtimer.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
kernel/hrtimer.c +18 -18
@@ -640,21 +640,9 @@ static inline void hrtimer_init_hres(str* and expiry check is done in the hrtimer_interrupt or in the softirq. */ static inline int hrtimer_enqueue_reprogram (struct hrtimer *timer, -struct hrtimer_clock_base *base, -int wakeup) +struct hrtimer_clock_base *base) { -if (base->cpu_base->hres_active &&hrtimer_reprogram (timer, base)) { -if (wakeup) { -raw_spin_unlock (&base->cpu_base->lock); -raise_softirq_irqoff (HRTIMER_SOFTIRQ ); -raw_spin_lock (&base->cpu_base->lock); - }else -__raise_softirq_irqoff (HRTIMER_SOFTIRQ ); - -return 1 ; - } - -return 0 ; +return base->cpu_base->hres_active &&hrtimer_reprogram (timer, base); }static inline ktime_t hrtimer_update_base (struct hrtimer_cpu_base *base)
@@ -735,8 +723,7 @@ static inline int hrtimer_switch_to_hresstatic inline void hrtimer_force_reprogram (struct hrtimer_cpu_base *base,int skip_equal) { }static inline int hrtimer_enqueue_reprogram (struct hrtimer *timer, -struct hrtimer_clock_base *base, -int wakeup) +struct hrtimer_clock_base *base) {return 0 ; }
@@ -995,8 +982,21 @@ int __hrtimer_start_range_ns(struct hrti* * XXX send_remote_softirq() ? */ -if (leftmost && new_base->cpu_base == &__get_cpu_var (hrtimer_bases)) -hrtimer_enqueue_reprogram (timer, new_base, wakeup); +if (leftmost && new_base->cpu_base == &__get_cpu_var (hrtimer_bases) + &&hrtimer_enqueue_reprogram (timer, new_base)) { +if (wakeup) { +/* +* We need to drop cpu_base->lock to avoid a +* lock ordering issue vs. rq->lock. +*/ +raw_spin_unlock (&new_base->cpu_base->lock); +raise_softirq_irqoff (HRTIMER_SOFTIRQ ); +local_irq_restore (flags); +return ret; + }else { +__raise_softirq_irqoff (HRTIMER_SOFTIRQ ); + } + }unlock_hrtimer_base (timer, &flags);
PATCH 28/153 nfsd: Fix memleak
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: majianpeng <[email protected]>
commit 2d32b29a1c2830f7c42caa8258c714acd983961f upstream.
When free nfs-client, it must free the ->cl_stateids.
--- fs/nfsd/nfs4state.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfsd/nfs4state.c +2 -0
@@ -1009,6 +1009,8 @@ free_client(struct nfs4_client *clp)put_group_info (clp->cl_cred.cr_group_info);kfree (clp->cl_principal);kfree (clp->cl_name.data); +idr_remove_all (&clp->cl_stateids); +idr_destroy (&clp->cl_stateids);kfree (clp); }
PATCH 29/153 staging: comedi: check s->async for poll(), read() and write()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit cc400e185c07c15a42d2635995f422de5b94b696 upstream.
Some low-level comedi drivers (incorrectly) point dev->read_subdev or dev->write_subdev to a subdevice that does not support asynchronous commands. Comedi's poll(), read() and write() file operation handlers assume these subdevices do support asynchronous commands. In particular, they assume s->async is valid (where s points to the read or write subdevice), which it won't be if it has been set incorrectly. This can lead to a NULL pointer dereference.
Check s->async is non-NULL in comedi_poll(), comedi_read() and comedi_write() to avoid the bug.
--- drivers/staging/comedi/comedi_fops.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/comedi/comedi_fops.c +4 -4
@@ -1574,7 +1574,7 @@ static unsigned int comedi_poll(struct f mask =0 ; read_subdev =comedi_get_read_subdevice (dev_file_info); -if (read_subdev) { +if (read_subdev && read_subdev->async) {poll_wait (file, &read_subdev->async->wait_head, wait);if (!read_subdev->busy || comedi_buf_read_n_available(read_subdev->async) > 0
@@ -1584,7 +1584,7 @@ static unsigned int comedi_poll(struct f } } write_subdev =comedi_get_write_subdevice (dev_file_info); -if (write_subdev) { +if (write_subdev && write_subdev->async) {poll_wait (file, &write_subdev->async->wait_head, wait);comedi_buf_write_alloc (write_subdev->async, write_subdev->async->prealloc_bufsz);
@@ -1626,7 +1626,7 @@ static ssize_t comedi_write(struct file } s =comedi_get_write_subdevice (dev_file_info); -if (s ==NULL ) { +if (s ==NULL || s->async ==NULL ) { retval = -EIO ; goto done; }
@@ -1737,7 +1737,7 @@ static ssize_t comedi_read(struct file * } s =comedi_get_read_subdevice (dev_file_info); -if (s ==NULL ) { +if (s ==NULL || s->async ==NULL ) { retval = -EIO ; goto done; }
PATCH 30/153 ACPI: Add DMI entry for Sony VGN-FW41E_H
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joseph Salisbury <[email protected]>
commit 66f2fda93b67fa744d406e6dcf443f67bac204b6 upstream.
This patch adds a quirk to allow the Sony VGN-FW41E_H to suspend/resume properly.
References: http://bugs.launchpad.net/bugs/1113547
--- drivers/acpi/sleep.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/acpi/sleep.c +8 -0
@@ -156,6 +156,14 @@ static struct dmi_system_id __initdata a }, { .callback = init_nvs_nosave, + .ident = "Sony Vaio VGN-FW41E_H", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW41E_H"), + }, + }, + { + .callback = init_nvs_nosave, .ident = "Sony Vaio VGN-FW21E", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
PATCH 31/153 vgacon/vt: clear buffer attributes when we load a 512 character font (v2)
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit 2a2483072393b27f4336ab068a1f48ca19ff1c1e upstream.
When we switch from 256->512 byte font rendering mode, it means the current contents of the screen is being reinterpreted. The bit that holds the high bit of the 9-bit font, may have been previously set, and thus the new font misrenders.
The problem case we see is grub2 writes spaces with the bit set, so it ends up with data like 0x820, which gets reinterpreted into 0x120 char which the font translates into G with a circumflex. This flashes up on screen at boot and is quite ugly.
A current side effect of this patch though is that any rendering on the screen changes color to a slightly darker color, but at least the screen no longer corrupts.
v2: as suggested by hpa, always clear the attribute space, whether we are are going to or from 512 chars.
--- drivers/tty/vt/vt.c | 2 +- drivers/video/console/vgacon.c | 22 +++++++++++++++------- include/linux/vt_kern.h | 1 + 3 files changed, 17 insertions(+), 8 deletions(-)
drivers/tty/vt/vt.c +1 -1
@@ -657,7 +657,7 @@ static inline void save_screen(struct vc* Redrawing of screen */ -static void clear_buffer_attributes (struct vc_data *vc) +void clear_buffer_attributes (struct vc_data *vc) {unsigned short *p = (unsigned short *)vc->vc_origin;int count = vc->vc_screenbuf_size /2 ;
drivers/video/console/vgacon.c +15 -7
@@ -1064,7 +1064,7 @@ static int vgacon_do_font_op(struct vgasunsigned short video_port_status = vga_video_port_reg +6 ;int font_select =0x00 , beg, i;char *charmap; - +bool clear_attribs = false;if (vga_video_type !=VIDEO_TYPE_EGAM ) { charmap = (char *)VGA_MAP_MEM (colourmap,0 ); beg =0x0e ;
@@ -1169,12 +1169,6 @@ static int vgacon_do_font_op(struct vgas/* if 512 char mode is already enabled don't re-enable it. */ if ((set) && (ch512 != vga_512_chars)) { -/* attribute controller */ -for (i =0 ; i <MAX_NR_CONSOLES ; i++) { -struct vc_data *c = vc_cons[i].d; -if (c && c->vc_sw == &vga_con) - c->vc_hi_font_mask = ch512 ?0x0800 :0 ; - } vga_512_chars = ch512;/* 256-char: enable intensity bit 512-char: disable intensity bit */
@@ -1185,8 +1179,22 @@ static int vgacon_do_font_op(struct vgasit means, but it works, and it appears necessary */ inb_p (video_port_status);vga_wattr (state->vgabase,VGA_AR_ENABLE_DISPLAY ,0 ); + clear_attribs = true; }raw_spin_unlock_irq (&vga_lock); + +if (clear_attribs) { +for (i =0 ; i <MAX_NR_CONSOLES ; i++) { +struct vc_data *c = vc_cons[i].d; +if (c && c->vc_sw == &vga_con) { +/* force hi font mask to 0, so we always clear +the bit on either transition */ + c->vc_hi_font_mask =0x00 ; +clear_buffer_attributes (c); + c->vc_hi_font_mask = ch512 ?0x0800 :0 ; + } + } + }return 0 ; }
include/linux/vt_kern.h +1 -0
@@ -47,6 +47,7 @@ int con_set_cmap(unsigned char __user *cint con_get_cmap (unsigned char __user *cmap);void scrollback (struct vc_data *vc,int lines);void scrollfront (struct vc_data *vc,int lines); +void clear_buffer_attributes (struct vc_data *vc);void update_region (struct vc_data *vc,unsigned long start,int count);void redraw_screen (struct vc_data *vc,int is_switch);#define update_screen (x) redraw_screen(x, 0)
PATCH 32/153 fbcon: dont lose the console font across generic->chip driver switch
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit ae1287865f5361fa138d4d3b1b6277908b54eac9 upstream.
If grub2 loads efifb/vesafb, then when systemd starts it can set the console font on that framebuffer device, however when we then load the native KMS driver, the first thing it does is tear down the generic framebuffer driver.
The thing is the generic code is doing the right thing, it frees the font because otherwise it would leak memory. However we can assume that if you are removing the generic firmware driver (vesa/efi/offb), that a new driver *should* be loading soon after, so we effectively leak the font.
However the old code left a dangling pointer in vc->vc_font.data and we can now reuse that dangling pointer to load the font into the new driver, now that we aren't freeing it.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=892340
--- drivers/video/console/fbcon.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/video/console/fbcon.c +10 -4
@@ -991,7 +991,7 @@ static const char *fbcon_startup(void) }/* Setup default font */ -if (!p->fontdata) { +if (!p->fontdata && !vc->vc_font.data) {if (!fontname[0 ] || !(font =find_font (fontname))) font = get_default_font(info->var.xres, info->var.yres,
@@ -1001,6 +1001,8 @@ static const char *fbcon_startup(void) vc->vc_font.height = font->height; vc->vc_font.data = (void *)(p->fontdata = font->data); vc->vc_font.charcount =256 ;/* FIXME Need to support more fonts */ + }else { + p->fontdata = vc->vc_font.data; } cols =FBCON_SWAP (ops->rotate, info->var.xres, info->var.yres);
@@ -1160,9 +1162,9 @@ static void fbcon_init(struct vc_data *v ops->p = &fb_display[fg_console]; } -static void fbcon_free_font (struct display *p) +static void fbcon_free_font (struct display *p,bool freefont) { -if (p->userfont && p->fontdata && (--REFCOUNT (p->fontdata) ==0 )) +if (freefont && p->userfont && p->fontdata && (--REFCOUNT (p->fontdata) ==0 ))kfree (p->fontdata -FONT_EXTRA_WORDS *sizeof (int )); p->fontdata =NULL ; p->userfont =0 ;
@@ -1174,8 +1176,8 @@ static void fbcon_deinit(struct vc_datastruct fb_info *info;struct fbcon_ops *ops;int idx; +bool free_font = true; -fbcon_free_font (p); idx = con2fb_map[vc->vc_num];if (idx ==-1 )
@@ -1186,6 +1188,8 @@ static void fbcon_deinit(struct vc_dataif (!info) goto finished; +if (info->flags &FBINFO_MISC_FIRMWARE ) + free_font = false; ops = info->fbcon_par;if (!ops)
@@ -1197,6 +1201,8 @@ static void fbcon_deinit(struct vc_data ops->flags &= ~FBCON_FLAGS_INIT ; finished: +fbcon_free_font (p, free_font); +if (!con_is_bound (&fb_con))fbcon_exit ();
PATCH 33/153 drm/usb: bind driver to correct device
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit 9f23de52b64f7fb801fd76f3dd8651a0dc89187b upstream.
While looking at plymouth on udl I noticed that plymouth was trying to use its fb plugin not its drm one, it was trying to drmOpen a driver called usb not udl, noticed that we actually had out driver pointing at the wrong device.
--- drivers/gpu/drm/drm_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_usb.c +1 -1
@@ -19,7 +19,7 @@ int drm_get_usb_dev(struct usb_interface usbdev =interface_to_usbdev (interface); dev->usbdev = usbdev; - dev->dev = &usbdev->dev; + dev->dev = &interface->dev;mutex_lock (&drm_global_mutex);
PATCH 34/153 x86: Do not leak kernel page mapping locations
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit e575a86fdc50d013bf3ad3aa81d9100e8e6cc60d upstream.
Without this patch, it is trivial to determine kernel page mappings by examining the error code reported to dmesg[1]. Instead, declare the entire kernel memory space as a violation of a present page.
Additionally, since show_unhandled_signals is enabled by default, switch branch hinting to the more realistic expectation, and unobfuscate the setting of the PF_PROT bit to improve readability.
[1] http://vulnfactory.org/blog/2013/02/06/a-linux-memory-trick/
--- arch/x86/mm/fault.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/x86/mm/fault.c +5 -3
@@ -738,13 +738,15 @@ __bad_area_nosemaphore(struct pt_regs *r return; }#endif +/* Kernel addresses are always protection faults: */ +if (address >=TASK_SIZE ) + error_code |=PF_PROT ; -if (unlikely (show_unhandled_signals)) +if (likely (show_unhandled_signals))show_signal_msg (regs, error_code, address, tsk); -/* Kernel addresses are always protection faults: */ tsk->thread.cr2 = address; - tsk->thread.error_code = error_code | (address >=TASK_SIZE ); + tsk->thread.error_code = error_code; tsk->thread.trap_no =14 ;force_sig_info_fault (SIGSEGV , si_code, address, tsk,0 );
PATCH 35/153 timeconst.pl: Eliminate Perl warning
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: "H. Peter Anvin" <[email protected]>
commit 63a3f603413ffe82ad775f2d62a5afff87fd94a0 upstream.
defined(@array) is deprecated in Perl and gives off a warning. Restructure the code to remove that warning.
[ hpa: it would be interesting to revert to the timeconst.bc script.
It appears that the failures reported by akpm during testing of that script was due to a known broken version of make, not a problem with bc. The Makefile rules could probably be restructured to avoid the make bug, or it is probably old enough that it doesn't matter. ]
--- kernel/timeconst.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/timeconst.pl +2 -4
@@ -369,10 +369,8 @@ if ($hz eq '--can') { die "Usage: $0 HZ\n"; } - @val = @{$canned_values{$hz}}; - if (!defined(@val)) { - @val = compute_values($hz); - } + $cv = $canned_values{$hz}; + @val = defined($cv) ? @$cv : compute_values($hz); output($hz, @val); } exit 0;
PATCH 36/153 fb: rework locking to fix lock ordering on takeover
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Cox <[email protected]>
commit 50e244cc793d511b86adea24972f3a7264cae114 upstream.
Adjust the console layer to allow a take over call where the caller already holds the locks. Make the fb layer lock in order.
This is partly a band aid, the fb layer is terminally confused about the locking rules it uses for its notifiers it seems.
--- drivers/tty/vt/vt.c | 93 +++++++++++++++++++++++++++++++---------- drivers/video/console/fbcon.c | 29 ++++++++++++- drivers/video/fbmem.c | 5 +-- drivers/video/fbsysfs.c | 3 ++ include/linux/console.h | 1 + 5 files changed, 104 insertions(+), 27 deletions(-)
drivers/tty/vt/vt.c +70 -23
@@ -3016,7 +3016,7 @@ int __init vty_init(const struct file_opstatic struct class *vtconsole_class; -static int bind_con_driver (const struct consw *csw,int first,int last, +static int do_bind_con_driver (const struct consw *csw,int first,int last,int deflt) {struct module *owner = csw->owner;
@@ -3027,7 +3027,7 @@ static int bind_con_driver(const structif (!try_module_get (owner))return -ENODEV ; -console_lock (); +WARN_CONSOLE_UNLOCKED ();/* check if driver is registered */ for (i =0 ; i <MAX_NR_CON_DRIVER ; i++) {
@@ -3112,11 +3112,22 @@ static int bind_con_driver(const struct retval =0 ; err: -console_unlock ();module_put (owner);return retval; }; + +static int bind_con_driver (const struct consw *csw,int first,int last, +int deflt) +{ +int ret; + +console_lock (); + ret =do_bind_con_driver (csw, first, last, deflt); +console_unlock (); +return ret; +} +#ifdef CONFIG_VT_HW_CONSOLE_BINDING static int con_is_graphics (const struct consw *csw,int first,int last) {
@@ -3228,9 +3239,9 @@ int unbind_con_driver(const struct conswif (!con_is_bound (csw)) con_driver->flag &= ~CON_DRIVER_FLAG_INIT ; -console_unlock ();/* ignore return value, binding should not fail */ -bind_con_driver (defcsw, first, last, deflt); +do_bind_con_driver (defcsw, first, last, deflt); +console_unlock (); err:module_put (owner);return retval;
@@ -3508,28 +3519,18 @@ int con_debug_leave(void) }EXPORT_SYMBOL_GPL (con_debug_leave); -/** -* register_con_driver - register console driver to console layer -* @csw: console driver -* @first: the first console to take over, minimum value is 0 -* @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1 -* -* DESCRIPTION: This function registers a console driver which can later -* bind to a range of consoles specified by @first and @last. It will -* also initialize the console driver by calling con_startup(). -*/ -int register_con_driver (const struct consw *csw,int first,int last) +static int do_register_con_driver (const struct consw *csw,int first,int last) {struct module *owner = csw->owner;struct con_driver *con_driver;const char *desc;int i, retval =0 ; +WARN_CONSOLE_UNLOCKED (); +if (!try_module_get (owner))return -ENODEV ; -console_lock (); -for (i =0 ; i <MAX_NR_CON_DRIVER ; i++) { con_driver = ®istered_con_driver[i];
@@ -3582,10 +3583,29 @@ int register_con_driver(const struct con } err: -console_unlock ();module_put (owner);return retval; } + +/** +* register_con_driver - register console driver to console layer +* @csw: console driver +* @first: the first console to take over, minimum value is 0 +* @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1 +* +* DESCRIPTION: This function registers a console driver which can later +* bind to a range of consoles specified by @first and @last. It will +* also initialize the console driver by calling con_startup(). +*/ +int register_con_driver (const struct consw *csw,int first,int last) +{ +int retval; + +console_lock (); + retval =do_register_con_driver (csw, first, last); +console_unlock (); +return retval; +}EXPORT_SYMBOL (register_con_driver);/**
@@ -3639,17 +3659,44 @@ EXPORT_SYMBOL(unregister_con_driver);* when a driver wants to take over some existing consoles * and become default driver for newly opened ones. * -* take_over_console is basically a register followed by unbind +* take_over_console is basically a register followed by unbind +*/ +int do_take_over_console (const struct consw *csw,int first,int last,int deflt) +{ +int err; + + err =do_register_con_driver (csw, first, last); +/* +* If we get an busy error we still want to bind the console driver +* and return success, as we may have unbound the console driver +* but not unregistered it. +*/ +if (err == -EBUSY ) + err =0 ; +if (!err) +do_bind_con_driver (csw, first, last, deflt); + +return err; +} +EXPORT_SYMBOL_GPL (do_take_over_console); + +/* +* If we support more console drivers, this function is used +* when a driver wants to take over some existing consoles +* and become default driver for newly opened ones. +* +* take_over_console is basically a register followed by unbind */ int take_over_console (const struct consw *csw,int first,int last,int deflt) {int err; err =register_con_driver (csw, first, last); -/* if we get an busy error we still want to bind the console driver +/* +* If we get an busy error we still want to bind the console driver * and return success, as we may have unbound the console driver -* but not unregistered it. -*/ +* but not unregistered it. +*/ if (err == -EBUSY ) err =0 ;if (!err)
drivers/video/console/fbcon.c +28 -1
@@ -530,6 +530,33 @@ static int search_for_mapped_con(void)return retval; } +static int do_fbcon_takeover (int show_logo) +{ +int err, i; + +if (!num_registered_fb) +return -ENODEV ; + +if (!show_logo) + logo_shown =FBCON_LOGO_DONTSHOW ; + +for (i = first_fb_vc; i <= last_fb_vc; i++) + con2fb_map[i] = info_idx; + + err =do_take_over_console (&fb_con, first_fb_vc, last_fb_vc, + fbcon_is_default); + +if (err) { +for (i = first_fb_vc; i <= last_fb_vc; i++) + con2fb_map[i] =-1 ; + info_idx =-1 ; + }else { + fbcon_has_console_bind =1 ; + } + +return err; +} +static int fbcon_takeover (int show_logo) {int err, i;
@@ -3122,7 +3149,7 @@ static int fbcon_fb_registered(struct fb }if (info_idx !=-1 ) - ret =fbcon_takeover (1 ); + ret =do_fbcon_takeover (1 ); }else {for (i = first_fb_vc; i <= last_fb_vc; i++) {if (con2fb_map_boot[i] == idx)
drivers/video/fbmem.c +2 -3
@@ -1628,7 +1628,9 @@ static int do_register_framebuffer(struc event.info = fb_info;if (!lock_fb_info (fb_info))return -ENODEV ; +console_lock ();fb_notifier_call_chain (FB_EVENT_FB_REGISTERED , &event); +console_unlock ();unlock_fb_info (fb_info);return 0 ; }
@@ -1831,11 +1833,8 @@ int fb_new_modelist(struct fb_info *info err =1 ;if (!list_empty (&info->modelist)) { -if (!lock_fb_info (info)) -return -ENODEV ; event.info = info; err =fb_notifier_call_chain (FB_EVENT_NEW_MODELIST , &event); -unlock_fb_info (info); }return err;
drivers/video/fbsysfs.c +3 -0
@@ -175,6 +175,8 @@ static ssize_t store_modes(struct deviceif (i *sizeof (struct fb_videomode ) != count)return -EINVAL ; +if (!lock_fb_info (fb_info)) +return -ENODEV ;console_lock ();list_splice (&fb_info->modelist, &old_list); fb_videomode_to_modelist((const struct fb_videomode *)buf, i,
@@ -186,6 +188,7 @@ static ssize_t store_modes(struct devicefb_destroy_modelist (&old_list);console_unlock (); +unlock_fb_info (fb_info);return 0 ; }
include/linux/console.h +1 -0
@@ -78,6 +78,7 @@ int con_is_bound(const struct consw *cswint register_con_driver (const struct consw *csw,int first,int last);int unregister_con_driver (const struct consw *csw);int take_over_console (const struct consw *sw,int first,int last,int deflt); +int do_take_over_console (const struct consw *sw,int first,int last,int deflt);void give_up_console (const struct consw *sw);#ifdef CONFIG_HW_CONSOLE int con_debug_enter (struct vc_data *vc);
PATCH 37/153 fb: Yet another band-aid for fixing lockdep mess
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit e93a9a868792ad71cdd09d75e5a02d8067473c4e upstream.
I've still got lockdep warnings even after Alan's patch, and it seems that yet more band aids are required to paper over similar paths for unbind_con_driver() and unregister_con_driver(). After this hack, lockdep warnings are finally gone.
--- drivers/tty/vt/vt.c | 43 +++++++++++++++++++++++++++-------------- drivers/video/console/fbcon.c | 4 ++-- drivers/video/fbmem.c | 4 ++++ include/linux/console.h | 1 + include/linux/vt_kern.h | 2 ++ 5 files changed, 37 insertions(+), 17 deletions(-)
drivers/tty/vt/vt.c +28 -15
@@ -3164,6 +3164,18 @@ static int con_is_graphics(const struct*/ int unbind_con_driver (const struct consw *csw,int first,int last,int deflt) { +int retval; + +console_lock (); + retval =do_unbind_con_driver (csw, first, last, deflt); +console_unlock (); +return retval; +} +EXPORT_SYMBOL (unbind_con_driver); + +/* unlocked version of unbind_con_driver() */ +int do_unbind_con_driver (const struct consw *csw,int first,int last,int deflt) +{struct module *owner = csw->owner;const struct consw *defcsw =NULL ;struct con_driver *con_driver =NULL , *con_back =NULL ;
@@ -3172,7 +3184,7 @@ int unbind_con_driver(const struct conswif (!try_module_get (owner))return -ENODEV ; -console_lock (); +WARN_CONSOLE_UNLOCKED ();/* check if driver is registered and if it is unbindable */ for (i =0 ; i <MAX_NR_CON_DRIVER ; i++) {
@@ -3185,10 +3197,8 @@ int unbind_con_driver(const struct consw } } -if (retval) { -console_unlock (); +if (retval) goto err; - } retval = -ENODEV ;
@@ -3204,15 +3214,11 @@ int unbind_con_driver(const struct consw } } -if (retval) { -console_unlock (); +if (retval) goto err; - } -if (!con_is_bound (csw)) { -console_unlock (); +if (!con_is_bound (csw)) goto err; - } first =max (first, con_driver->first); last =min (last, con_driver->last);
@@ -3241,13 +3247,12 @@ int unbind_con_driver(const struct consw/* ignore return value, binding should not fail */ do_bind_con_driver (defcsw, first, last, deflt); -console_unlock (); err:module_put (owner);return retval; } -EXPORT_SYMBOL (unbind_con_driver); +EXPORT_SYMBOL_GPL (do_unbind_con_driver);static int vt_bind (struct con_driver *con) {
@@ -3621,9 +3626,18 @@ EXPORT_SYMBOL(register_con_driver);*/ int unregister_con_driver (const struct consw *csw) { -int i, retval = -ENODEV ; +int retval;console_lock (); + retval =do_unregister_con_driver (csw); +console_unlock (); +return retval; +} +EXPORT_SYMBOL (unregister_con_driver); + +int do_unregister_con_driver (const struct consw *csw) +{ +int i, retval = -ENODEV ;/* cannot unregister a bound driver */ if (con_is_bound (csw))
@@ -3649,10 +3663,9 @@ int unregister_con_driver(const struct c } } err: -console_unlock ();return retval; } -EXPORT_SYMBOL (unregister_con_driver); +EXPORT_SYMBOL_GPL (do_unregister_con_driver);/* * If we support more console drivers, this function is used
drivers/video/console/fbcon.c +2 -2
@@ -3011,7 +3011,7 @@ static int fbcon_unbind(void) {int ret; - ret =unbind_con_driver (&fb_con, first_fb_vc, last_fb_vc, + ret =do_unbind_con_driver (&fb_con, first_fb_vc, last_fb_vc, fbcon_is_default);if (!ret)
@@ -3084,7 +3084,7 @@ static int fbcon_fb_unregistered(struct primary_device =-1 ;if (!num_registered_fb) -unregister_con_driver (&fb_con); +do_unregister_con_driver (&fb_con);return 0 ; }
drivers/video/fbmem.c +4 -0
@@ -1646,8 +1646,10 @@ static int do_unregister_framebuffer(strif (!lock_fb_info (fb_info))return -ENODEV ; +console_lock (); event.info = fb_info; ret =fb_notifier_call_chain (FB_EVENT_FB_UNBIND , &event); +console_unlock ();unlock_fb_info (fb_info);if (ret)
@@ -1662,7 +1664,9 @@ static int do_unregister_framebuffer(str num_registered_fb--;fb_cleanup_device (fb_info); event.info = fb_info; +console_lock ();fb_notifier_call_chain (FB_EVENT_FB_UNREGISTERED , &event); +console_unlock ();/* this may free fb info */ put_fb_info (fb_info);
include/linux/console.h +1 -0
@@ -77,6 +77,7 @@ extern const struct consw prom_con; /* Sint con_is_bound (const struct consw *csw);int register_con_driver (const struct consw *csw,int first,int last);int unregister_con_driver (const struct consw *csw); +int do_unregister_con_driver (const struct consw *csw);int take_over_console (const struct consw *sw,int first,int last,int deflt);int do_take_over_console (const struct consw *sw,int first,int last,int deflt);void give_up_console (const struct consw *sw);
include/linux/vt_kern.h +2 -0
@@ -132,6 +132,8 @@ void vt_event_post(unsigned int event, uint vt_waitactive (int n);void change_console (struct vc_data *new_vc);void reset_vc (struct vc_data *vc); +extern int do_unbind_con_driver (const struct consw *csw,int first,int last, +int deflt);extern int unbind_con_driver (const struct consw *csw,int first,int last,int deflt);int vty_init (const struct file_operations *console_fops);
PATCH 38/153 p54usb: corrected USB ID for T-Com Sinus 154 data II
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Guszkowski <[email protected]>
commit 008e33f733ca51acb2dd9d88ea878693b04d1d2a upstream.
Corrected USB ID for T-Com Sinus 154 data II. ISL3887-based. The device was tested in managed mode with no security, WEP 128 bit and WPA-PSK (TKIP) with firmware 2.13.1.0.lm87.arm (md5sum:7d676323ac60d6e1a3b6d61e8c528248). It works.
--- drivers/net/wireless/p54/p54usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/p54/p54usb.c +1 -1
@@ -84,8 +84,8 @@ static struct usb_device_id p54u_table[] {USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */ {USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */ {USB_DEVICE(0x0803, 0x4310)}, /* Zoom 4410a */ - {USB_DEVICE(0x083a, 0x4503)}, /* T-Com Sinus 154 data II */ {USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 version 2 */ + {USB_DEVICE(0x083a, 0x4531)}, /* T-Com Sinus 154 data II */ {USB_DEVICE(0x083a, 0xc501)}, /* Zoom Wireless-G 4410 */ {USB_DEVICE(0x083a, 0xf503)}, /* Accton FD7050E ver 1010ec */ {USB_DEVICE(0x0846, 0x4240)}, /* Netgear WG111 (v2) */
PATCH 39/153 rtlwifi: rtl8192cu: Fix NULL dereference BUG when using new_id
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 957f4aca5fa0db69635271bc4621cc0b65b2d590 upstream.
When the new_id entry in /sysfs is used for a foreign USB device, rtlwifi BUGS with a NULL pointer dereference because the per-driver configuration data is not available. The probe function has been restructured as suggested by Ben Hutchings <[email protected]>.
--- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 8 +++++++- drivers/net/wireless/rtlwifi/usb.c | 5 +++-- drivers/net/wireless/rtlwifi/usb.h | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-)
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +7 -1
@@ -372,9 +372,15 @@ static struct usb_device_id rtl8192c_usbMODULE_DEVICE_TABLE (usb, rtl8192c_usb_ids); +static int rtl8192cu_probe (struct usb_interface *intf, +const struct usb_device_id *id) +{ +return rtl_usb_probe (intf, id, &rtl92cu_hal_cfg); +} +static struct usb_driver rtl8192cu_driver = { .name ="rtl8192cu" , - .probe = rtl_usb_probe, + .probe = rtl8192cu_probe, .disconnect = rtl_usb_disconnect, .id_table = rtl8192c_usb_ids,
drivers/net/wireless/rtlwifi/usb.c +3 -2
@@ -894,7 +894,8 @@ static struct rtl_intf_ops rtl_usb_ops = };int __devinit rtl_usb_probe (struct usb_interface *intf, -const struct usb_device_id *id) +const struct usb_device_id *id, +struct rtl_hal_cfg *rtl_hal_cfg) {int err;struct ieee80211_hw *hw =NULL ;
@@ -928,7 +929,7 @@ int __devinit rtl_usb_probe(struct usb_iusb_set_intfdata (intf, hw);/* init cfg & intf_ops */ rtlpriv->rtlhal.interface =INTF_USB ; - rtlpriv->cfg = (struct rtl_hal_cfg *)(id->driver_info); + rtlpriv->cfg = rtl_hal_cfg; rtlpriv->intf_ops = &rtl_usb_ops;rtl_dbgp_flag_init (hw);/* Init IO handler */
drivers/net/wireless/rtlwifi/usb.h +2 -1
@@ -158,7 +158,8 @@ struct rtl_usb_priv {int __devinit rtl_usb_probe (struct usb_interface *intf, -const struct usb_device_id *id); +const struct usb_device_id *id, +struct rtl_hal_cfg *rtl92cu_hal_cfg);void rtl_usb_disconnect (struct usb_interface *intf);int rtl_usb_suspend (struct usb_interface *pusb_intf,pm_message_t message);int rtl_usb_resume (struct usb_interface *pusb_intf);
PATCH 40/153 rtlwifi: rtl8192cu: Add new USB ID
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 8708aac79e4572ba673d7a21e94ddca9f3abb7fc upstream.
A new model of the RTL8188CUS has appeared.
--- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +1 -0
@@ -295,6 +295,7 @@ static struct usb_device_id rtl8192c_usb {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817f, rtl92cu_hal_cfg)},/* RTL8188CUS-VL */ {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x818a, rtl92cu_hal_cfg)}, + {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x819a, rtl92cu_hal_cfg)},/* 8188 Combo for BC4 */ {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)},
PATCH 41/153 USB: storage: properly handle the endian issues of idProduct
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: fangxiaozhi <[email protected]>
commit cd060956c5e97931c3909e4a808508469c0bb9f6 upstream.
1. The idProduct is little endian, so make sure its value to be compatible with the current CPU. Make no break on big endian processors.
--- drivers/usb/storage/initializers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/storage/initializers.c +2 -2
@@ -147,7 +147,7 @@ static int usb_stor_huawei_dongles_pid(sint idProduct; idesc = &us->pusb_intf->cur_altsetting->desc; - idProduct = us->pusb_dev->descriptor.idProduct; + idProduct =le16_to_cpu (us->pusb_dev->descriptor.idProduct);/* The first port is CDROM, * means the dongle in the single port mode, * and a switch command is required to be sent. */
@@ -169,7 +169,7 @@ int usb_stor_huawei_init(struct us_dataint result =0 ;if (usb_stor_huawei_dongles_pid (us)) { -if (us->pusb_dev->descriptor.idProduct >=0x1446 ) +if (le16_to_cpu (us->pusb_dev->descriptor.idProduct) >=0x1446 ) result =usb_stor_huawei_scsi_init (us);else result =usb_stor_huawei_feature_init (us);
PATCH 42/153 x86/apic: Use x2apic physical mode based on FADT setting
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Pearson <[email protected]>
commit ea0dcf903e7d76aa5d483d876215fedcfdfe140f upstream.
Provide systems that do not support x2apic cluster mode a mechanism to select x2apic physical mode using the FADT FORCE_APIC_PHYSICAL_DESTINATION_MODE bit.
Changes from v1: (based on Suresh's comments)
- removed #ifdef CONFIG_ACPI
- removed #include <linux/acpi.h>
--- arch/x86/kernel/apic/x2apic_phys.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/kernel/apic/x2apic_phys.c +6 -0
@@ -24,6 +24,12 @@ static int x2apic_acpi_madt_oem_check(ch {if (x2apic_phys)return x2apic_enabled (); +else if ((acpi_gbl_FADT.header.revision >=FADT2_REVISION_ID ) && + (acpi_gbl_FADT.flags &ACPI_FADT_APIC_PHYSICAL ) && +x2apic_enabled ()) { +printk (KERN_DEBUG "System requires x2apic physical mode\n" ); +return 1 ; + }else return 0 ; }
PATCH 43/153 x86/apic: Work around boot failure on HP ProLiant DL980 G7 Server systems
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stoney Wang <[email protected]>
commit cb214ede7657db458fd0b2a25ea0b28dbf900ebc upstream.
When a HP ProLiant DL980 G7 Server boots a regular kernel, there will be intermittent lost interrupts which could result in a hang or (in extreme cases) data loss.
The reason is that this system only supports x2apic physical mode, while the kernel boots with a logical-cluster default setting.
This bug can be worked around by specifying the "x2apic_phys" or "nox2apic" boot option, but we want to handle this system without requiring manual workarounds.
The BIOS sets ACPI_FADT_APIC_PHYSICAL in FADT table. As all apicids are smaller than 255, BIOS need to pass the control to the OS with xapic mode, according to x2apic-spec, chapter 2.9.
Current code handle x2apic when BIOS pass with xapic mode enabled:
When user specifies x2apic_phys, or FADT indicates PHYSICAL:
1. During madt oem check, apic driver is set with xapic logical or xapic phys driver at first.
2. enable_IR_x2apic() will enable x2apic_mode.
3. if user specifies x2apic_phys on the boot line, x2apic_phys_probe() will install the correct x2apic phys driver and use x2apic phys mode. Otherwise it will skip the driver will let x2apic_cluster_probe to take over to install x2apic cluster driver (wrong one) even though FADT indicates PHYSICAL, because x2apic_phys_probe does not check FADT PHYSICAL.
Add checking x2apic_fadt_phys in x2apic_phys_probe() to fix the problem.
--- arch/x86/kernel/apic/x2apic_phys.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
arch/x86/kernel/apic/x2apic_phys.c +11 -10
@@ -20,18 +20,19 @@ static int set_x2apic_phys_mode(char *ar }early_param ("x2apic_phys" , set_x2apic_phys_mode); -static int x2apic_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +static bool x2apic_fadt_phys (void ) { -if (x2apic_phys) -return x2apic_enabled (); -else if ((acpi_gbl_FADT.header.revision >=FADT2_REVISION_ID ) && - (acpi_gbl_FADT.flags &ACPI_FADT_APIC_PHYSICAL ) && -x2apic_enabled ()) { +if ((acpi_gbl_FADT.header.revision >=FADT2_REVISION_ID ) && + (acpi_gbl_FADT.flags &ACPI_FADT_APIC_PHYSICAL )) {printk (KERN_DEBUG "System requires x2apic physical mode\n" ); -return 1 ; +return true; } -else -return 0 ; +return false; +} + +static int x2apic_acpi_madt_oem_check (char *oem_id,char *oem_table_id) +{ +return x2apic_enabled () && (x2apic_phys ||x2apic_fadt_phys ()); } static void
@@ -114,7 +115,7 @@ static void init_x2apic_ldr(void)static int x2apic_phys_probe (void ) { -if (x2apic_mode && x2apic_phys) +if (x2apic_mode && (x2apic_phys ||x2apic_fadt_phys ()))return 1 ;return apic == &apic_x2apic_phys;
PATCH 44/153 ALSA: rme32.c irq enabling after spin_lock_irq
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Denis Efremov <[email protected]>
commit f49a59c4471d81a233e09dda45187cc44fda009d upstream.
According to the other code in this driver and similar code in rme96 it seems, that spin_lock_irq in snd_rme32_capture_close function should be paired with spin_unlock_irq.
Found by Linux Driver Verification project (linuxtesting.org).
--- sound/pci/rme32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/rme32.c +1 -1
@@ -1017,7 +1017,7 @@ static int snd_rme32_capture_close(strucspin_lock_irq (&rme32->lock); rme32->capture_substream =NULL ; rme32->capture_periodsize =0 ; -spin_unlock (&rme32->lock); +spin_unlock_irq (&rme32->lock);return 0 ; }
PATCH 45/153 ALSA: ali5451: remove irq enabling in pointer callback
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Denis Efremov <[email protected]>
commit dacae5a19b4cbe1b5e3a86de23ea74cbe9ec9652 upstream.
snd_ali_pointer function is called with local interrupts disabled. However it seems very strange to reenable them in such way.
Found by Linux Driver Verification project (linuxtesting.org).
--- sound/pci/ali5451/ali5451.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/ali5451/ali5451.c +1 -1
@@ -1435,7 +1435,7 @@ static snd_pcm_uframes_t snd_ali_pointerspin_lock (&codec->reg_lock);if (!pvoice->running) { -spin_unlock_irq (&codec->reg_lock); +spin_unlock (&codec->reg_lock);return 0 ; }outb (pvoice->number,ALI_REG (codec,ALI_GC_CIR ));
PATCH 46/153 drivers/rtc/rtc-pl031.c: restore ST variant functionality
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
commit 3399cfb5df9594495b876d1843a7165f77366b2b upstream.
Commit e7e034e18a0a ("drivers/rtc/rtc-pl031.c: fix the missing operation on enable") accidentally broke the ST variants of PL031.
The bit that is being poked as "clockwatch" enable bit for the ST variants does the work of bit 0 on this variant. Bit 0 is used for a clock divider on the ST variants, and setting it to 1 will affect timekeeping in a very bad way.
--- drivers/rtc/rtc-pl031.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/rtc/rtc-pl031.c +3 -1
@@ -344,7 +344,9 @@ static int pl031_probe(struct amba_devic/* Enable the clockwatch on ST Variants */ if (ldata->hw_designer ==AMBA_VENDOR_ST ) data |=RTC_CR_CWEN ; -writel (data |RTC_CR_EN , ldata->base +RTC_CR ); +else + data |=RTC_CR_EN ; +writel (data, ldata->base +RTC_CR );/* * On ST PL031 variants, the RTC reset value does not provide correct
PATCH 47/153 x86: Hyper-V: register clocksource only if its advertised
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olaf Hering <[mailto:[email protected]]>
commit 32068f6527b8f1822a30671dedaf59c567325026 upstream.
Enable hyperv_clocksource only if its advertised as a feature. XenServer 6 returns the signature which is checked in ms_hyperv_platform(), but it does not offer all features. Currently the clocksource is enabled unconditionally in ms_hyperv_init_platform(), and the result is a hanging guest.
Hyper-V spec Bit 1 indicates the availability of Partition Reference Counter. Register the clocksource only if this bit is set.
The guest in question prints this in dmesg:
[ 0.000000] Hypervisor detected: Microsoft HyperV [ 0.000000] HyperV: features 0x70, hints 0x0
This bug can be reproduced easily be setting 'viridian=1' in a HVM domU .cfg file. A workaround without this patch is to boot the HVM guest with 'clocksource=jiffies'.
--- arch/x86/kernel/cpu/mshyperv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/mshyperv.c +2 -1
@@ -68,7 +68,8 @@ static void __init ms_hyperv_init_platfoprintk (KERN_INFO "HyperV: features 0x%x, hints 0x%x\n" , ms_hyperv.features, ms_hyperv.hints); -clocksource_register_hz (&hyperv_cs,NSEC_PER_SEC /100 ); +if (ms_hyperv.features &HV_X64_MSR_TIME_REF_COUNT_AVAILABLE ) +clocksource_register_hz (&hyperv_cs,NSEC_PER_SEC /100 ); }const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
PATCH 48/153 x86/mm: Check if PUD is large when validating a kernel address
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mel Gorman <[email protected]>
commit 0ee364eb316348ddf3e0dfcd986f5f13f528f821 upstream.
A user reported the following oops when a backup process reads /proc/kcore:
BUG: unable to handle kernel paging request at ffffbb00ff33b000 IP: [<ffffffff8103157e>] kern_addr_valid+0xbe/0x110 [...] Call Trace: [<ffffffff811b8aaa>] read_kcore+0x17a/0x370 [<ffffffff811ad847>] proc_reg_read+0x77/0xc0 [<ffffffff81151687>] vfs_read+0xc7/0x130 [<ffffffff811517f3>] sys_read+0x53/0xa0 [<ffffffff81449692>] system_call_fastpath+0x16/0x1b
Investigation determined that the bug triggered when reading system RAM at the 4G mark. On this system, that was the first address using 1G pages for the virt->phys direct mapping so the PUD is pointing to a physical address, not a PMD page.
The problem is that the page table walker in kern_addr_valid() is not checking pud_large() and treats the physical address as if it was a PMD. If it happens to look like pmd_none then it'll silently fail, probably returning zeros instead of real data. If the data happens to look like a present PMD though, it will be walked resulting in the oops above.
This patch adds the necessary pud_large() check.
Unfortunately the problem was not readily reproducible and now they are running the backup program without accessing /proc/kcore so the patch has not been validated but I think it makes sense.
--- arch/x86/include/asm/pgtable.h | 5 +++++ arch/x86/mm/init_64.c | 3 +++ 2 files changed, 8 insertions(+)
arch/x86/include/asm/pgtable.h +5 -0
@@ -142,6 +142,11 @@ static inline unsigned long pmd_pfn(pmd_return (pmd_val (pmd) &PTE_PFN_MASK ) >>PAGE_SHIFT ; } +static inline unsigned long pud_pfn (pud_t pud) +{ +return (pud_val (pud) &PTE_PFN_MASK ) >>PAGE_SHIFT ; +} +#define pte_page (pte) pfn_to_page(pte_pfn(pte))static inline int pmd_large (pmd_t pte)
arch/x86/mm/init_64.c +3 -0
@@ -831,6 +831,9 @@ int kern_addr_valid(unsigned long addr)if (pud_none (*pud))return 0 ; +if (pud_large (*pud)) +return pfn_valid (pud_pfn (*pud)); + pmd =pmd_offset (pud, addr);if (pmd_none (*pmd))return 0 ;
PATCH 49/153 Revert "drm: Add EDID_QUIRK_FORCE_REDUCED_BLANKING for ASUS VW222S"
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit db3985e5ca8f50fc17606855ba394783d11683a5 upstream.
This reverts commit 6f33814bd4d9cfe76033a31b1c0c76c960cd8e4b.
The quirk cause a regression, and it looks like the original bug was simply a lack of FIFO bandwidth on the i915G of the reporter. Which should eventually be fixed as soon as we get around to implemented DSPARB FIFO reassignment on gen 3.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=52281
--- drivers/gpu/drm/drm_edid.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -3
@@ -87,9 +87,6 @@ static struct edid_quirk {int product_id;u32 quirks; } edid_quirk_list[] = { -/* ASUS VW222S */ - { "ACI", 0x22a2, EDID_QUIRK_FORCE_REDUCED_BLANKING }, -/* Acer AL1706 */ { "ACR", 44358, EDID_QUIRK_PREFER_LARGE_60 },/* Acer F51 */
PATCH 50/153 USB: option: add Yota / Megafon M100-1 4g modem
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
commit cd565279e51bedee1b2988e84f9b3bef485adeb6 upstream.
Interface layout:
00 CD-ROM
01 debug COM port
02 AP control port
03 modem
04 usb-ethernet
Bus=01 Lev=02 Prnt=02 Port=01 Cnt=02 Dev#= 4 Spd=480 MxCh= 0
D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=0408 ProdID=ea42 Rev= 0.00 S: Manufacturer=Qualcomm, Incorporated S: Product=Qualcomm CDMA Technologies MSM S: SerialNumber=353568051xxxxxx C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=84(I) Atr=03(Int.) MxPS= 64 Ivl=2ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=86(I) Atr=03(Int.) MxPS= 64 Ivl=2ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -576,6 +576,8 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) }, { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) }, { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, + { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
PATCH 51/153 USB: serial: fix null-pointer dereferences on disconnect
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit b2ca699076573c94fee9a73cb0d8645383b602a0 upstream.
Make sure serial-driver dtr_rts is called with disc_mutex held after checking the disconnected flag.
Due to a bug in the tty layer, dtr_rts may get called after a device has been disconnected and the tty-device unregistered. Some drivers have had individual checks for disconnect to make sure the disconnected interface was not accessed, but this should really be handled in usb-serial core (at least until the long-standing tty-bug has been fixed).
Note that the problem has been made more acute with commit 0998d0631001 ("device-core: Ensure drvdata = NULL when no driver is bound") as the port data is now also NULL when dtr_rts is called resulting in further oopses.
[bwh: Backported to 3.2:
- Adjust context
- Drop changes to quatech2.c]
---
drivers/usb/serial/ftdi_sio.c +9 -11
@@ -1916,24 +1916,22 @@ static void ftdi_dtr_rts(struct usb_seri {struct ftdi_private *priv =usb_get_serial_port_data (port); -mutex_lock (&port->serial->disc_mutex); -if (!port->serial->disconnected) { -/* Disable flow control */ -if (!on &&usb_control_msg (port->serial->dev, +/* Disable flow control */ +if (!on) { +if (usb_control_msg (port->serial->dev,usb_sndctrlpipe (port->serial->dev,0 ),FTDI_SIO_SET_FLOW_CTRL_REQUEST ,FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE ,0 , priv->interface,NULL ,0 ,WDR_TIMEOUT ) <0 ) { -dev_err (&port->dev,"error from flowcontrol urb\n" ); +dev_err (&port->dev,"error from flowcontrol urb\n" ); } -/* drop RTS and DTR */ -if (on) -set_mctrl (port,TIOCM_DTR |TIOCM_RTS ); -else -clear_mctrl (port,TIOCM_DTR |TIOCM_RTS ); } -mutex_unlock (&port->serial->disc_mutex); +/* drop RTS and DTR */ +if (on) +set_mctrl (port,TIOCM_DTR |TIOCM_RTS ); +else +clear_mctrl (port,TIOCM_DTR |TIOCM_RTS ); }/*
drivers/usb/serial/mct_u232.c +9 -13
@@ -558,19 +558,15 @@ static void mct_u232_dtr_rts(struct usb_unsigned int control_state;struct mct_u232_private *priv =usb_get_serial_port_data (port); -mutex_lock (&port->serial->disc_mutex); -if (!port->serial->disconnected) { -/* drop DTR and RTS */ -spin_lock_irq (&priv->lock); -if (on) - priv->control_state |=TIOCM_DTR |TIOCM_RTS ; -else - priv->control_state &= ~(TIOCM_DTR |TIOCM_RTS ); - control_state = priv->control_state; -spin_unlock_irq (&priv->lock); -mct_u232_set_modem_ctrl (port->serial, control_state); - } -mutex_unlock (&port->serial->disc_mutex); +spin_lock_irq (&priv->lock); +if (on) + priv->control_state |=TIOCM_DTR |TIOCM_RTS ; +else + priv->control_state &= ~(TIOCM_DTR |TIOCM_RTS ); + control_state = priv->control_state; +spin_unlock_irq (&priv->lock); + +mct_u232_set_modem_ctrl (port->serial, control_state); }static void mct_u232_close (struct usb_serial_port *port)
drivers/usb/serial/sierra.c +1 -7
@@ -891,19 +891,13 @@ static int sierra_open(struct tty_structstatic void sierra_dtr_rts (struct usb_serial_port *port,int on) { -struct usb_serial *serial = port->serial;struct sierra_port_private *portdata; portdata =usb_get_serial_port_data (port); portdata->rts_state = on; portdata->dtr_state = on; -if (serial->dev) { -mutex_lock (&serial->disc_mutex); -if (!serial->disconnected) -sierra_send_setup (port); -mutex_unlock (&serial->disc_mutex); - } +sierra_send_setup (port); }static int sierra_startup (struct usb_serial *serial)
drivers/usb/serial/ssu100.c +8 -11
@@ -533,19 +533,16 @@ static void ssu100_dtr_rts(struct usb_sedbg ("%s\n" , __func__); -mutex_lock (&port->serial->disc_mutex); -if (!port->serial->disconnected) { -/* Disable flow control */ -if (!on && -ssu100_setregister (dev,0 ,UART_MCR ,0 ) <0 ) +/* Disable flow control */ +if (!on) { +if (ssu100_setregister (dev,0 ,UART_MCR ,0 ) <0 )dev_err (&port->dev,"error from flowcontrol urb\n" ); -/* drop RTS and DTR */ -if (on) -set_mctrl (dev,TIOCM_DTR |TIOCM_RTS ); -else -clear_mctrl (dev,TIOCM_DTR |TIOCM_RTS ); } -mutex_unlock (&port->serial->disc_mutex); +/* drop RTS and DTR */ +if (on) +set_mctrl (dev,TIOCM_DTR |TIOCM_RTS ); +else +clear_mctrl (dev,TIOCM_DTR |TIOCM_RTS ); }static void ssu100_update_msr (struct usb_serial_port *port,u8 msr)
drivers/usb/serial/usb-serial.c +13 -2
@@ -697,9 +697,20 @@ static int serial_carrier_raised(structstatic void serial_dtr_rts (struct tty_port *port,int on) { struct usb_serial_port *p = container_of(port, struct usb_serial_port, port); -struct usb_serial_driver *drv = p->serial->type; -if (drv->dtr_rts) +struct usb_serial *serial = p->serial; +struct usb_serial_driver *drv = serial->type; + +if (!drv->dtr_rts) +return ; +/* +* Work-around bug in the tty-layer which can result in dtr_rts +* being called after a disconnect (and tty_unregister_device +* has returned). Remove once bug has been squashed. +*/ +mutex_lock (&serial->disc_mutex); +if (!serial->disconnected) drv->dtr_rts (p, on); +mutex_unlock (&serial->disc_mutex); }static const struct tty_port_operations serial_port_ops = {
drivers/usb/serial/usb_wwan.c +3 -5
@@ -41,7 +41,6 @@ static int debug;void usb_wwan_dtr_rts (struct usb_serial_port *port,int on) { -struct usb_serial *serial = port->serial;struct usb_wwan_port_private *portdata;struct usb_wwan_intf_private *intfdata;
@@ -54,12 +53,11 @@ void usb_wwan_dtr_rts(struct usb_serial_return ; portdata =usb_get_serial_port_data (port); -mutex_lock (&serial->disc_mutex); +/* FIXME: locking */ portdata->rts_state = on; portdata->dtr_state = on; -if (serial->dev) - intfdata->send_setup (port); -mutex_unlock (&serial->disc_mutex); + + intfdata->send_setup (port); }EXPORT_SYMBOL (usb_wwan_dtr_rts);
PATCH 52/153 idr: idr_for_each_entry() macro
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Reisner <[email protected]>
commit 9749f30f1a387070e6e8351f35aeb829eacc3ab6 upstream.
Inspired by the list_for_each_entry() macro
--- include/linux/idr.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/linux/idr.h +11 -0
@@ -152,4 +152,15 @@ void ida_simple_remove(struct ida *ida, unsigned int id);void __init idr_init_cache (void ); +/** +* idr_for_each_entry - iterate over an idr's elements of a given type +* @idp: idr handle +* @entry: the type * to use as cursor +* @id: id entry's key +*/ +#define idr_for_each_entry (idp, entry, id) \ + for (id = 0, entry = (typeof(entry))idr_get_next((idp), &(id)); \ + entry != NULL; \ + ++id, entry = (typeof(entry))idr_get_next((idp), &(id))) +#endif /* __IDR_H__ */
Re: [ 052/153] idr: idr_for_each_entry() macro
Quoted 11 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Reisner <[email protected]>
commit
9749f30f1a387070e6e8351f35aeb829eacc3ab6upstream.Inspired by the
list_for_each_entry()macroSigned-off-by Ben Hutchings <[email protected]>
Philipp, please can I have an explicit Signed-off-by from you? It was missing in mainline though this change appeared in a long series of drbd changes with proper Signed-off-by lines.
Ben.
Quoted 31 lines
--- include/linux/idr.h | 11 +++++++++++ 1 file changed, 11 insertions(+)include/linux/idr.h +11
-1@@ -152,4 +152,15 @@ void ida_simple_remove(struct ida *ida, unsigned int id);void __init idr_init_cache (void ); +/** +* idr_for_each_entry - iterate over an idr's elements of a given type +* @idp: idr handle +* @entry: the type * to use as cursor +* @id: id entry's key +*/ +#define idr_for_each_entry (idp, entry, id) \ + for (id = 0, entry = (typeof(entry))idr_get_next((idp), &(id)); \ + entry != NULL; \ + ++id, entry = (typeof(entry))idr_get_next((idp), &(id))) +#endif /* __IDR_H__ */ --To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 3 lines
Ben Hutchings Always try to do things in chronological order; it's less confusing that way.
Re: [ 052/153] idr: idr_for_each_entry() macro
Sure, here it is:
----------
From: Philipp Reisner <[email protected]>
commit 9749f30f1a387070e6e8351f35aeb829eacc3ab6 upstream.
Inspired by the list_for_each_entry() macro
--- include/linux/idr.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/linux/idr.h +11 -0
@@ -152,4 +152,15 @@ void ida_simple_remove(struct ida *ida, unsigned int id);void __init idr_init_cache (void ); +/** +* idr_for_each_entry - iterate over an idr's elements of a given type +* @idp: idr handle +* @entry: the type * to use as cursor +* @id: id entry's key +*/ +#define idr_for_each_entry (idp, entry, id) \ + for (id = 0, entry = (typeof(entry))idr_get_next((idp), &(id)); \ + entry != NULL; \ + ++id, entry = (typeof(entry))idr_get_next((idp), &(id))) +#endif /* __IDR_H__ */
Re: [ 052/153] idr: idr_for_each_entry() macro
Quoted 11 lines · Philipp Reisner
Sure, here it is:
----------From: Philipp Reisner <[email protected]>
commit
9749f30f1a387070e6e8351f35aeb829eacc3ab6upstream.Inspired by the
list_for_each_entry()macroSigned-off-by Ben Hutchings <[email protected]>Signed-off-by Philipp Reisner <[email protected]>
Thanks.
Ben.
Quoted 26 lines
--- include/linux/idr.h | 11 +++++++++++ 1 file changed, 11 insertions(+)include/linux/idr.h +11
-0@@ -152,4 +152,15 @@ void ida_simple_remove(struct ida *ida, unsigned int id);void __init idr_init_cache (void ); +/** +* idr_for_each_entry - iterate over an idr's elements of a given type +* @idp: idr handle +* @entry: the type * to use as cursor +* @id: id entry's key +*/ +#define idr_for_each_entry (idp, entry, id) \ + for (id = 0, entry = (typeof(entry))idr_get_next((idp), &(id)); \ + entry != NULL; \ + ++id, entry = (typeof(entry))idr_get_next((idp), &(id))) +#endif /* __IDR_H__ */
Signature · 3 lines
Ben Hutchings Always try to do things in chronological order; it's less confusing that way.
PATCH 53/153 pps: Add pps_lookup_dev() function
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Spelvin <[email protected]>
commit 513b032c98b4b9414aa4e9b4a315cb1bf0380101 upstream.
The PPS serial line discipline wants to attach a PPS device to a tty without changing the tty code to add a struct pps_device * pointer.
Since the number of PPS devices in a typical system is generally very low (n=1 is by far the most common), it's practical to search the entire list of allocated pps devices. (We capture the timestamp before the lookup, so the timing isn't affected.)
It is a bit ugly that this function, which is part of the in-kernel PPS API, has to be in pps.c as opposed to kapi,c, but that's not something that affects users.
--- drivers/pps/pps.c | 33 +++++++++++++++++++++++++++++++++ include/linux/pps_kernel.h | 17 ++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)
drivers/pps/pps.c +33 -0
@@ -350,11 +350,44 @@ free_idr:void pps_unregister_cdev (struct pps_device *pps) { + pps->lookup_cookie =NULL ;device_destroy (pps_class, pps->dev->devt);cdev_del (&pps->cdev); }/* +* Look up a pps device by magic cookie. +* The cookie is usually a pointer to some enclosing device, but this +* code doesn't care; you should never be dereferencing it. +* +* This is a bit of a kludge that is currently used only by the PPS +* serial line discipline. It may need to be tweaked when a second user +* is found. +* +* There is no function interface for setting the lookup_cookie field. +* It's initialized to NULL when the pps device is created, and if a +* client wants to use it, just fill it in afterward. +* +* The cookie is automatically set to NULL in pps_unregister_source() +* so that it will not be used again, even if the pps device cannot +* be removed from the idr due to pending references holding the minor +* number in use. +*/ +struct pps_device *pps_lookup_dev (void const *cookie) +{ +struct pps_device *pps; +unsigned id; + +rcu_read_lock (); +idr_for_each_entry (&pps_idr, pps, id) +if (cookie == pps->lookup_cookie) +break ; +rcu_read_unlock (); +return pps; +} +EXPORT_SYMBOL (pps_lookup_dev); + +/* * Module stuff */
include/linux/pps_kernel.h +14 -3
@@ -43,7 +43,7 @@ struct pps_source_info { int event, void *data); /* PPS echo function */struct module *owner; -struct device *dev; +struct device *dev;/* Parent device for device_create */ };struct pps_event_time {
@@ -69,6 +69,7 @@ struct pps_device {wait_queue_head_t queue;/* PPS event queue */ unsigned int id;/* PPS source unique ID */ +void const *lookup_cookie;/* pps_lookup_dev only */ struct cdev cdev;struct device *dev;struct fasync_struct *async_queue;/* fasync method */
@@ -82,16 +83,26 @@ struct pps_device {extern struct device_attribute pps_attrs[];/* +* Internal functions. +* +* These are not actually part of the exported API, but this is a +* convenient header file to put them in. +*/ + +extern int pps_register_cdev (struct pps_device *pps); +extern void pps_unregister_cdev (struct pps_device *pps); + +/* * Exported functions */ extern struct pps_device *pps_register_source (struct pps_source_info *info,int default_params);extern void pps_unregister_source (struct pps_device *pps); -extern int pps_register_cdev (struct pps_device *pps); -extern void pps_unregister_cdev (struct pps_device *pps);extern void pps_event (struct pps_device *pps,struct pps_event_time *ts,int event,void *data); +/* Look up a pps device by magic cookie */ +struct pps_device *pps_lookup_dev (void const *cookie);static inline void timespec_to_pps_ktime (struct pps_ktime *kt,struct timespec ts)
PATCH 54/153 pps: Use pps_lookup_dev to reduce ldisc coupling
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Spelvin <[email protected]>
commit 03a7ffe4e542310838bac70ef85acc17536b6d7c upstream.
Now that N_TTY uses tty->disc_data for its private data, 'subclass' ldiscs cannot use ->disc_data for their own private data. (This is a regression is v3.8-rc1)
Use pps_lookup_dev to associate the tty with the pps source instead.
This fixes a crashing regression in 3.8-rc1.
--- drivers/pps/clients/pps-ldisc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/pps/clients/pps-ldisc.c +4 -6
@@ -31,7 +31,7 @@static void pps_tty_dcd_change (struct tty_struct *tty,unsigned int status,struct pps_event_time *ts) { -struct pps_device *pps = (struct pps_device *)tty->disc_data; +struct pps_device *pps =pps_lookup_dev (tty);BUG_ON (pps ==NULL );
@@ -67,9 +67,9 @@ static int pps_tty_open(struct tty_strucpr_err ("cannot register PPS source \"%s\"\n" , info.path);return -ENOMEM ; } - tty->disc_data = pps; + pps->lookup_cookie = tty; -/* Should open N_TTY ldisc too */ +/* Now open the base class N_TTY ldisc */ ret =alias_n_tty_open (tty);if (ret <0 ) {pr_err ("cannot open tty ldisc \"%s\"\n" , info.path);
@@ -81,7 +81,6 @@ static int pps_tty_open(struct tty_strucreturn 0 ; err_unregister: - tty->disc_data =NULL ;pps_unregister_source (pps);return ret; }
@@ -90,11 +89,10 @@ static void (*alias_n_tty_close)(structstatic void pps_tty_close (struct tty_struct *tty) { -struct pps_device *pps = (struct pps_device *)tty->disc_data; +struct pps_device *pps =pps_lookup_dev (tty);alias_n_tty_close (tty); - tty->disc_data =NULL ;dev_info (pps->dev,"removed\n" );pps_unregister_source (pps); }
PATCH 55/153 pps: Fix a use-after free bug when unregistering a source.
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Spelvin <[email protected]>
commit d953e0e837e65ecc1ddaa4f9560f7925878a0de6 upstream.
Remove the cdev from the system (with cdev_del) *before* deallocating it (in pps_device_destruct, called via kobject_put from device_destroy).
Also prevent deallocating a device with open file handles.
A better long-term fix is probably to remove the cdev from the pps_device entirely, and instead have all devices reference one global cdev. Then the deallocation ordering becomes simpler.
But that's more complex and invasive change, so we leave that for later.
--- drivers/pps/pps.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/pps/pps.c +10 -4
@@ -247,12 +247,15 @@ static int pps_cdev_open(struct inode *istruct pps_device *pps =container_of (inode->i_cdev, struct pps_device, cdev); file->private_data = pps; - +kobject_get (&pps->dev->kobj);return 0 ; }static int pps_cdev_release (struct inode *inode,struct file *file) { +struct pps_device *pps =container_of (inode->i_cdev, + struct pps_device, cdev); +kobject_put (&pps->dev->kobj);return 0 ; }
@@ -274,8 +277,10 @@ static void pps_device_destruct(struct d {struct pps_device *pps =dev_get_drvdata (dev); -/* release id here to protect others from using it while it's -* still in use */ +cdev_del (&pps->cdev); + +/* Now we can release the ID for re-use */ +pr_debug ("deallocating pps%d\n" , pps->id);mutex_lock (&pps_idr_lock);idr_remove (&pps_idr, pps->id);mutex_unlock (&pps_idr_lock);
@@ -330,6 +335,7 @@ int pps_register_cdev(struct pps_deviceif (IS_ERR (pps->dev)) goto del_cdev; +/* Override the release function with our own */ pps->dev->release = pps_device_destruct; pr_debug("source %s got cdev (%d:%d)\n", pps->info.name,
@@ -350,9 +356,9 @@ free_idr:void pps_unregister_cdev (struct pps_device *pps) { +pr_debug ("unregistering pps%d\n" , pps->id); pps->lookup_cookie =NULL ;device_destroy (pps_class, pps->dev->devt); -cdev_del (&pps->cdev); }/*
PATCH 56/153 PCI/PM: Clean up PME state when removing a device
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Rafael J. Wysocki" <[email protected]>
commit 249bfb83cf8ba658955f0245ac3981d941f746ee upstream.
Devices are added to pci_pme_list when drivers use pci_enable_wake() or pci_wake_from_d3(), but they aren't removed from the list unless the driver explicitly disables wakeup. Many drivers never disable wakeup, so their devices remain on the list even after they are removed, e.g., via hotplug. A subsequent PME poll will oops when it tries to touch the device.
This patch disables PME# on a device before removing it, which removes the device from pci_pme_list. This is safe even if the device never had PME# enabled.
This oops can be triggered by unplugging a Thunderbolt ethernet adapter on a Macbook Pro, as reported by Daniel below.
[bhelgaas: changelog]
Reference: http://lkml.kernel.org/r/CAMVG2svG21yiM1wkH4_2pen2n+cr2-Zv7TbH3Gj+8MwevZjDbw@mail.gmail.com
--- drivers/pci/remove.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/remove.c +2 -0
@@ -19,6 +19,8 @@ static void pci_free_resources(struct pcstatic void pci_stop_dev (struct pci_dev *dev) { +pci_pme_active (dev, false); +if (dev->is_added) {pci_proc_detach_device (dev);pci_remove_sysfs_dev_files (dev);
PATCH 57/153 USB: option: add Huawei "ACM" devices using protocol = vendor
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
commit 1f3f687722fd9b29a0c2a85b4844e3b2a3585c63 upstream.
The USB device descriptor of one identity presented by a few Huawei morphing devices have serial functions with class codes 02/02/ff, indicating CDC ACM with a vendor specific protocol. This combination is often used for MSFT RNDIS functions, and the CDC ACM class driver will therefore ignore such functions.
The CDC ACM class driver cannot support functions with only 2 endpoints. The underlying serial functions of these modems are also believed to be the same as for alternate device identities already supported by the option driver. Letting the same driver handle these functions independently of the current identity ensures consistent handling and user experience.
There is no need to blacklist these devices in the rndis_host driver. Huawei serial functions will either have only 2 endpoints or a CDC ACM functional descriptor with bmCapabilities != 0, making them correctly ignored as "non RNDIS" by that driver.
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -578,8 +578,12 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
PATCH 58/153 efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot parameter
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satoru Takeuchi <[email protected]>
commit 1de63d60cd5b0d33a812efa455d5933bf1564a51 upstream.
There was a serious problem in samsung-laptop that its platform driver is designed to run under BIOS and running under EFI can cause the machine to become bricked or can cause Machine Check Exceptions.
Discussion about this problem:
https://bugs.launchpad.net/ubuntu-cdimage/+bug/1040557
https://bugzilla.kernel.org/show_bug.cgi?id=47121
The patches to fix this problem:
efi: Make 'efi_enabled' a function to query EFI facilities 83e68189745ad931c2afd45d8ee3303929233e7f
samsung-laptop: Disable on EFI hardware
e0094244e41c4d0c7ad69920681972fc45d8ce34
Unfortunately this problem comes back again if users specify "noefi" option. This parameter clears EFI_BOOT and that driver continues to run even if running under EFI. Refer to the document, this parameter should clear EFI_RUNTIME_SERVICES instead.
Documentation/kernel-parameters.txt:
===============================================================================
...
noefi [X86] Disable EFI runtime services support.
...
===============================================================================
Documentation/x86/x86_64/uefi.txt:
===============================================================================
...
- If some or all EFI runtime services don't work, you can try following kernel command line parameters to turn off some or all EFI runtime services.
noefi turn off all EFI runtime services
...
===============================================================================
--- arch/x86/platform/efi/efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/platform/efi/efi.c +1 -1
@@ -85,7 +85,7 @@ EXPORT_SYMBOL(efi_enabled);static int __init setup_noefi (char *arg) { -clear_bit (EFI_BOOT , &x86_efi_facility); +clear_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility);return 0 ; }early_param ("noefi" , setup_noefi);
PATCH 59/153 ARM: samsung: fix assembly syntax for new gas
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit 2815774bb38445006074e16251b9ef5123bdc616 upstream.
Recent assembler versions complain about extraneous whitespace inside [] brackets. This fixes all of these instances for the samsung platforms. We should backport this to all kernels that might need to be built with new binutils.
arch/arm/kernel/entry-armv.S: Assembler messages:arch/arm/kernel/entry-armv.S:214: Error: ARM register expected -- `ldr r2,[ r6,#(0x10)]'arch/arm/kernel/entry-armv.S:214: Error: ARM register expected -- `ldr r0,[ r6,#(0x14)]'arch/arm/kernel/entry-armv.S:430: Error: ARM register expected -- `ldr r2,[ r6,#(0x10)]'arch/arm/kernel/entry-armv.S:430: Error: ARM register expected -- `ldr r0,[ r6,#(0x14)]'arch/arm/mach-s3c24xx/sleep-s3c2410.S: Assembler messages:arch/arm/mach-s3c24xx/sleep-s3c2410.S:48: Error: ARM register expected -- `ldr r7,[ r4 ]'arch/arm/mach-s3c24xx/sleep-s3c2410.S:49: Error: ARM register expected -- `ldr r8,[ r5 ]'arch/arm/mach-s3c24xx/sleep-s3c2410.S:50: Error: ARM register expected -- `ldr r9,[ r6 ]'arch/arm/mach-s3c24xx/sleep-s3c2410.S:64: Error: ARM register expected -- `streq r7,[ r4 ]'arch/arm/mach-s3c24xx/sleep-s3c2410.S:65: Error: ARM register expected -- `streq r8,[ r5 ]'arch/arm/mach-s3c24xx/sleep-s3c2410.S:66: Error: ARM register expected -- `streq r9,[ r6 ]'arch/arm/kernel/debug.S: Assembler messages:arch/arm/kernel/debug.S:83: Error: ARM register expected -- `ldr r2,[ r2,#((0x0B0)+(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000))))-((0)+(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000))))]' arch/arm/kernel/debug.S:83: Error: ARM register expected -- `ldr r2,[ r3,#(0x18)]'arch/arm/kernel/debug.S:85: Error: ARM register expected -- `ldr r2,[ r2,#((0x0B0)+(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000))))-((0)+(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000))))]' arch/arm/kernel/debug.S:85: Error: ARM register expected -- `ldr r2,[ r3,#(0x18)]'arch/arm/mach-s3c24xx/pm-h1940.S: Assembler messages:arch/arm/mach-s3c24xx/pm-h1940.S:33: Error: ARM register expected -- `ldr pc,[ r0,#((0x0B8)+(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000))))-(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000)))]' arch/arm/mach-s3c24xx/sleep-s3c2412.S: Assembler messages:arch/arm/mach-s3c24xx/sleep-s3c2412.S:60: Error: ARM register expected -- `ldrne r9,[ r1 ]'arch/arm/mach-s3c24xx/sleep-s3c2412.S:61: Error: ARM register expected -- `strne r9,[ r1 ]'arch/arm/mach-s3c24xx/sleep-s3c2412.S:62: Error: ARM register expected -- `ldrne r9,[ r2 ]'arch/arm/mach-s3c24xx/sleep-s3c2412.S:63: Error: ARM register expected -- `strne r9,[ r2 ]'arch/arm/mach-s3c24xx/sleep-s3c2412.S:64: Error: ARM register expected -- `ldrne r9,[ r3 ]'arch/arm/mach-s3c24xx/sleep-s3c2412.S:65: Error: ARM register expected -- `strne r9,[ r3 ]'arch/arm/kernel/debug.S:83: Error: ARM register expected -- `ldr r2,[ r3,#(0x08)]'arch/arm/kernel/debug.S:83: Error: ARM register expected -- `ldr r2,[ r3,#(0x18)]'arch/arm/kernel/debug.S:83: Error: ARM register expected -- `ldr r2,[ r3,#(0x10)]'arch/arm/kernel/debug.S:85: Error: ARM register expected -- `ldr r2,[ r3,#(0x08)]'arch/arm/kernel/debug.S:85: Error: ARM register expected -- `ldr r2,[ r3,#(0x18)]'arch/arm/kernel/debug.S:85: Error: ARM register expected -- `ldr r2,[ r3,#(0x10)]'
---
arch/arm/mach-s3c2410/include/mach/debug-macro.S +6 -6
@@ -40,17 +40,17 @@ addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART) addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART) bic \rd, \rd, #0xff000 - ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ] + ldr \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)] and \rd, \rd, #0x00ff0000 teq \rd, #0x00440000 @ is it 2440? 1004: - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] moveq \rd, \rd, lsr #SHIFT_2440TXF tst \rd, #S3C2410_UFSTAT_TXFULL .endm .macro fifo_full_s3c2410 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] tst \rd, #S3C2410_UFSTAT_TXFULL .endm
@@ -68,18 +68,18 @@ addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART) addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART) bic \rd, \rd, #0xff000 - ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ] + ldr \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)] and \rd, \rd, #0x00ff0000 teq \rd, #0x00440000 @ is it 2440? 10000: - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] andne \rd, \rd, #S3C2410_UFSTAT_TXMASK andeq \rd, \rd, #S3C2440_UFSTAT_TXMASK .endm .macro fifo_level_s3c2410 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] and \rd, \rd, #S3C2410_UFSTAT_TXMASK .endm
arch/arm/mach-s3c2410/include/mach/entry-macro.S +2 -2
@@ -34,10 +34,10 @@ @@ try the interrupt offset register, since it is there - ldr \irqstat, [ \base, #INTPND ] + ldr \irqstat, [\base, #INTPND ] teq \irqstat, #0 beq 1002f - ldr \irqnr, [ \base, #INTOFFSET ] + ldr \irqnr, [\base, #INTOFFSET ] mov \tmp, #1 tst \irqstat, \tmp, lsl \irqnr bne 1001f
arch/arm/mach-s3c2410/pm-h1940.S +1 -1
@@ -30,4 +30,4 @@ h1940_pm_return: mov r0, #S3C2410_PA_GPIO - ldr pc, [ r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO ] + ldr pc, [r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO]
arch/arm/mach-s3c2410/sleep.S +6 -6
@@ -45,9 +45,9 @@ ENTRY(s3c2410_cpu_suspend) ldr r4, =S3C2410_REFRESH ldr r5, =S3C24XX_MISCCR ldr r6, =S3C2410_CLKCON - ldr r7, [ r4 ] @ get REFRESH (and ensure in TLB) - ldr r8, [ r5 ] @ get MISCCR (and ensure in TLB) - ldr r9, [ r6 ] @ get CLKCON (and ensure in TLB) + ldr r7, [r4] @ get REFRESH (and ensure in TLB) + ldr r8, [r5] @ get MISCCR (and ensure in TLB) + ldr r9, [r6] @ get CLKCON (and ensure in TLB) orr r7, r7, #S3C2410_REFRESH_SELF @ SDRAM sleep command orr r8, r8, #S3C2410_MISCCR_SDSLEEP @ SDRAM power-down signals
@@ -61,8 +61,8 @@ ENTRY(s3c2410_cpu_suspend) @@ align next bit of code to cache line .align 5 s3c2410_do_sleep: - streq r7, [ r4 ] @ SDRAM sleep command - streq r8, [ r5 ] @ SDRAM power-down config - streq r9, [ r6 ] @ CPU sleep + streq r7, [r4] @ SDRAM sleep command + streq r8, [r5] @ SDRAM power-down config + streq r9, [r6] @ CPU sleep 1: beq 1b mov pc, r14
arch/arm/mach-s3c2412/sleep.S +6 -6
@@ -57,12 +57,12 @@ s3c2412_sleep_enter1: * retry, as simply returning causes the system to lock. */ - ldrne r9, [ r1 ] - strne r9, [ r1 ] - ldrne r9, [ r2 ] - strne r9, [ r2 ] - ldrne r9, [ r3 ] - strne r9, [ r3 ] + ldrne r9, [r1] + strne r9, [r1] + ldrne r9, [r2] + strne r9, [r2] + ldrne r9, [r3] + strne r9, [r3] bne s3c2412_sleep_enter1 mov pc, r14
arch/arm/plat-samsung/include/plat/debug-macro.S +9 -9
@@ -14,12 +14,12 @@ /* The S5PV210/S5PC110 implementations are as belows. */ .macro fifo_level_s5pv210 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] and \rd, \rd, #S5PV210_UFSTAT_TXMASK .endm .macro fifo_full_s5pv210 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] tst \rd, #S5PV210_UFSTAT_TXFULL .endm
@@ -27,7 +27,7 @@ * most widely re-used */ .macro fifo_level_s3c2440 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] and \rd, \rd, #S3C2440_UFSTAT_TXMASK .endm
@@ -36,7 +36,7 @@ #endif .macro fifo_full_s3c2440 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] tst \rd, #S3C2440_UFSTAT_TXFULL .endm
@@ -45,11 +45,11 @@ #endif .macro senduart,rd,rx - strb \rd, [\rx, # S3C2410_UTXH ] + strb \rd, [\rx, # S3C2410_UTXH] .endm .macro busyuart, rd, rx - ldr \rd, [ \rx, # S3C2410_UFCON ] + ldr \rd, [\rx, # S3C2410_UFCON] tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled? beq 1001f @ @ FIFO enabled...
@@ -60,7 +60,7 @@ 1001: @ busy waiting for non fifo - ldr \rd, [ \rx, # S3C2410_UTRSTAT ] + ldr \rd, [\rx, # S3C2410_UTRSTAT] tst \rd, #S3C2410_UTRSTAT_TXFE beq 1001b
@@ -68,7 +68,7 @@ .endm .macro waituart,rd,rx - ldr \rd, [ \rx, # S3C2410_UFCON ] + ldr \rd, [\rx, # S3C2410_UFCON] tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled? beq 1001f @ @ FIFO enabled...
@@ -79,7 +79,7 @@ b 1002f 1001: @ idle waiting for non fifo - ldr \rd, [ \rx, # S3C2410_UTRSTAT ] + ldr \rd, [\rx, # S3C2410_UTRSTAT] tst \rd, #S3C2410_UTRSTAT_TXFE beq 1001b
PATCH 60/153 ARM: w90x900: fix legacy assembly syntax
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit fa5ce5f94c0f2bfa41ba68d2d2524298e1fc405e upstream.
New ARM binutils don't allow extraneous whitespace inside of brackets, which causes this error on all mach-w90x900 defconfigs:
arch/arm/kernel/entry-armv.S: Assembler messages:arch/arm/kernel/entry-armv.S:214: Error: ARM register expected -- ldr r0,[ r6,#(0x10C)]' arch/arm/kernel/entry-armv.S:214: Error: ARM register expected -- ldr r0,[ r6,#(0x110)]' arch/arm/kernel/entry-armv.S:430: Error: ARM register expected -- ldr r0,[ r6,#(0x10C)]' arch/arm/kernel/entry-armv.S:430: Error: ARM register expected -- ldr r0,[ r6,#(0x110)]'
This removes the whitespace in order to build the kernel again.
--- arch/arm/mach-w90x900/include/mach/entry-macro.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-w90x900/include/mach/entry-macro.S +2 -2
@@ -22,8 +22,8 @@ mov \base, #AIC_BA - ldr \irqnr, [ \base, #AIC_IPER] - ldr \irqnr, [ \base, #AIC_ISNR] + ldr \irqnr, [\base, #AIC_IPER] + ldr \irqnr, [\base, #AIC_ISNR] cmp \irqnr, #0 .endm
PATCH 61/153 USB: ehci-omap: Fix autoloading of module
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Quadros <[email protected]>
commit 04753523266629b1cd0518091da1658755787198 upstream.
The module alias should be "ehci-omap" and not "omap-ehci" to match the platform device name. The omap-ehci module should now autoload correctly.
--- drivers/usb/host/ehci-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ehci-omap.c +1 -1
@@ -337,7 +337,7 @@ static const struct hc_driver ehci_omap_ .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, }; -MODULE_ALIAS ("platform:omap-ehci" ); +MODULE_ALIAS ("platform:ehci-omap" );MODULE_AUTHOR ("Texas Instruments, Inc." );MODULE_AUTHOR ("Felipe Balbi <[email protected]>" );
PATCH 62/153 USB: usb-storage: unusual_devs update for Super TOP SATA bridge
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Boyer <[email protected]>
commit 18e03310b5caa6d11c1a8c61b982c37047693fba upstream.
The current entry in unusual_cypress.h for the Super TOP SATA bridge devices seems to be causing corruption on newer revisions of this device. This has been reported in Arch Linux and Fedora. The original patch was tested on devices with bcdDevice of 1.60, whereas the newer devices report bcdDevice as 2.20. Limit the UNUSUAL_DEV entry to devices less than 2.20.
This fixes https://bugzilla.redhat.com/show_bug.cgi?id=909591
The Arch Forum post on this is here:
https://bbs.archlinux.org/viewtopic.php?id=152011
--- drivers/usb/storage/unusual_cypress.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/unusual_cypress.h +1 -1
@@ -31,7 +31,7 @@ UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x "Cypress ISD-300LP", USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), -UNUSUAL_DEV (0x14cd ,0x6116 ,0x0000 ,0x9999 , +UNUSUAL_DEV (0x14cd ,0x6116 ,0x0000 ,0x0219 ,"Super Top" ,"USB 2.0 SATA BRIDGE" , USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
PATCH 63/153 posix-cpu-timers: Fix nanosleep task_struct leak
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit e6c42c295e071dd74a66b5a9fcf4f44049888ed8 upstream.
The trinity fuzzer triggered a task_struct reference leak via clock_nanosleep with CPU_TIMERs. do_cpu_nanosleep() calls posic_cpu_timer_create(), but misses a corresponding posix_cpu_timer_del() which leads to the task_struct reference leak.
--- kernel/posix-cpu-timers.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
kernel/posix-cpu-timers.c +21 -2
@@ -1450,8 +1450,10 @@ static int do_cpu_nanosleep(const clockiwhile (!signal_pending (current)) {if (timer.it.cpu.expires.sched ==0 ) {/* -* Our timer fired and was reset. +* Our timer fired and was reset, below +* deletion can not fail. */ +posix_cpu_timer_del (&timer);spin_unlock_irq (&timer.it_lock);return 0 ; }
@@ -1469,9 +1471,26 @@ static int do_cpu_nanosleep(const clocki* We were interrupted by a signal. */ sample_to_timespec (which_clock, timer.it.cpu.expires, rqtp); -posix_cpu_timer_set (&timer,0 , &zero_it, it); + error =posix_cpu_timer_set (&timer,0 , &zero_it, it); +if (!error) { +/* +* Timer is now unarmed, deletion can not fail. +*/ +posix_cpu_timer_del (&timer); + }spin_unlock_irq (&timer.it_lock); +while (error ==TIMER_RETRY ) { +/* +* We need to handle case when timer was or is in the +* middle of firing. In other cases we already freed +* resources. +*/ +spin_lock_irq (&timer.it_lock); + error =posix_cpu_timer_del (&timer); +spin_unlock_irq (&timer.it_lock); + } +if ((it->it_value.tv_sec | it->it_value.tv_nsec) ==0 ) {/* * It actually did fire already.
PATCH 64/153 svcrpc: make svc_age_temp_xprts enqueue under sv_lock
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: "J. Bruce Fields" <[email protected]>
commit e75bafbff2270993926abcc31358361db74a9bc2 upstream.
svc_age_temp_xprts expires xprts in a two-step process: first it takes the sv_lock and moves the xprts to expire off their server-wide list (sv_tempsocks or sv_permsocks) to a local list. Then it drops the sv_lock and enqueues and puts each one.
I see no reason for this: svc_xprt_enqueue() will take sp_lock, but the sv_lock and sp_lock are not otherwise nested anywhere (and documentation at the top of this file claims it's correct to nest these with sp_lock inside.)
--- net/sunrpc/svc_xprt.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
net/sunrpc/svc_xprt.c +2 -13
@@ -816,7 +816,6 @@ static void svc_age_temp_xprts(unsignedstruct svc_serv *serv = (struct svc_serv *)closure;struct svc_xprt *xprt;struct list_head *le, *next; -LIST_HEAD (to_be_aged);dprintk ("svc_age_temp_xprts\n" );
@@ -837,25 +836,15 @@ static void svc_age_temp_xprts(unsignedif (atomic_read (&xprt->xpt_ref.refcount) >1 ||test_bit (XPT_BUSY , &xprt->xpt_flags))continue ; -svc_xprt_get (xprt); -list_move (le, &to_be_aged); +list_del_init (le);set_bit (XPT_CLOSE , &xprt->xpt_flags);set_bit (XPT_DETACHED , &xprt->xpt_flags); - } -spin_unlock_bh (&serv->sv_lock); - -while (!list_empty (&to_be_aged)) { - le = to_be_aged.next; -/* fiddling the xpt_list node is safe 'cos we're XPT_DETACHED */ -list_del_init (le); - xprt = list_entry(le, struct svc_xprt, xpt_list); -dprintk ("queuing xprt %p for closing\n" , xprt);/* a thread will dequeue and close it soon */ svc_xprt_enqueue (xprt); -svc_xprt_put (xprt); } +spin_unlock_bh (&serv->sv_lock);mod_timer (&serv->sv_temptimer, jiffies + svc_conn_age_period *HZ ); }
PATCH 65/153 NFSv4.1: Dont decode skipped layoutgets
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weston Andros Adamson <[email protected]>
commit 085b7a45c63d3da5be155faab9249a5cab224561 upstream.
layoutget's prepare hook can call rpc_exit with status = NFS4_OK (0). Because of this, nfs4_proc_layoutget can't depend on a 0 status to mean that the RPC was successfully sent, received and parsed.
To fix this, use the result's len member to see if parsing took place.
This fixes the following OOPS -- calling xdr_init_decode() with a buffer length 0 doesn't set the stream's 'p' member and ends up using uninitialized memory in filelayout_decode_layout.
BUG: unable to handle kernel paging request at 0000000000008050 IP: [<ffffffff81282e78>] memcpy+0x18/0x120 PGD 0 Oops: 0000 [#1] SMP last sysfs file: /sys/devices/pci0000:00/0000:00:11.0/0000:02:01.0/irq CPU 1 Modules linked in: nfs_layout_nfsv41_files nfs lockd fscache auth_rpcgss nfs_acl autofs4 sunrpc ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 iptable_filter ip_tables ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables ipv6 dm_mirror dm_region_hash dm_log dm_mod ppdev parport_pc parport snd_ens1371 snd_rawmidi snd_ac97_codec ac97_bus snd_seq snd_seq_device snd_pcm snd_timer snd soundcore snd_page_alloc e1000 microcode vmware_balloon i2c_piix4 i2c_core sg shpchp ext4 mbcache jbd2 sr_mod cdrom sd_mod crc_t10dif pata_acpi ata_generic ata_piix mptspi mptscsih mptbase scsi_transport_spi [last unloaded: speedstep_lib]
Pid: 1665, comm: flush-0:22 Not tainted 2.6.32-356-test-2 #2 VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform
RIP: 0010:[<ffffffff81282e78>] [<ffffffff81282e78>] memcpy+0x18/0x120 RSP: 0018:ffff88003dfab588 EFLAGS: 00010206 RAX: ffff88003dc42000 RBX: ffff88003dfab610 RCX: 0000000000000009 RDX: 000000003f807ff0 RSI: 0000000000008050 RDI: ffff88003dc42000 RBP: ffff88003dfab5b0 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000080 R12: 0000000000000024 R13: ffff88003dc42000 R14: ffff88003f808030 R15: ffff88003dfab6a0 FS: 0000000000000000(0000) GS:ffff880003420000(0000) knlGS:0000000000000000 CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b CR2: 0000000000008050 CR3: 000000003bc92000 CR4: 00000000001407e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process flush-0:22 (pid: 1665, threadinfo ffff88003dfaa000, task ffff880037f77540) Stack: ffffffffa0398ac1 ffff8800397c5940 ffff88003dfab610 ffff88003dfab6a0 <d> ffff88003dfab5d0 ffff88003dfab680 ffffffffa01c150b ffffea0000d82e70 <d> 000000508116713b 0000000000000000 0000000000000000 0000000000000000 Call Trace: [<ffffffffa0398ac1>] ? xdr_inline_decode+0xb1/0x120 [sunrpc] [<ffffffffa01c150b>] filelayout_decode_layout+0xeb/0x350 [nfs_layout_nfsv41_files] [<ffffffffa01c17fc>] filelayout_alloc_lseg+0x8c/0x3c0 [nfs_layout_nfsv41_files] [<ffffffff8150e6ce>] ? __wait_on_bit+0x7e/0x90
--- fs/nfs/nfs4proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfs/nfs4proc.c +2 -1
@@ -5891,7 +5891,8 @@ int nfs4_proc_layoutget(struct nfs4_layo status =nfs4_wait_for_completion_rpc_task (task);if (status ==0 ) status = task->tk_status; -if (status ==0 ) +/* if layoutp->len is 0, nfs4_layoutget_prepare called rpc_exit */ +if (status ==0 && lgp->res.layoutp->len) status =pnfs_layout_process (lgp);rpc_put_task (task);dprintk ("<-- %s status=%d\n" , __func__, status);
PATCH 66/153 umount oops when remove blocklayoutdriver first
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: fanchaoting <[email protected]>
commit 5a12cca697aca5dfba42a7d4c3356acc0445a2b0 upstream.
now pnfs client uses block layout, maybe we can remove blocklayoutdriver first. if we umount later,
it can cause oops in unset_pnfs_layoutdriver. because nfss->pnfs_curr_ld->clear_layoutdriver is invalid.
reproduce it:
modprobe blocklayoutdriver
mount -t nfs4 -o minorversion=1 pnfsip:/ /mnt/
rmmod blocklayoutdriver
umount /mnt
then you can see following
CPU 0
Pid: 17023, comm: umount.nfs4 Tainted: GF O 3.7.0-rc6-pnfs #1 VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform
RIP: 0010:[<ffffffffa04cfe6d>] [<ffffffffa04cfe6d>] unset_pnfs_layoutdriver+0x1d/0x70 [nfsv4] RSP: 0018:ffff8800022d9e48 EFLAGS: 00010286 RAX: ffffffffa04a1b00 RBX: ffff88000b013800 RCX: 0000000000000001 RDX: ffffffff81ae8ee0 RSI: ffff880001ee94b8 RDI: ffff88000b013800 RBP: ffff8800022d9e58 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: ffff880001ee9400 R13: ffff8800105978c0 R14: 00007fff25846c08 R15: 0000000001bba550 FS: 00007f45ae7f0700(0000) GS:ffff880012c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: ffffffffa04a1b38 CR3: 0000000002c0c000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process umount.nfs4 (pid: 17023, threadinfo ffff8800022d8000, task ffff880006e48aa0) Stack: ffff8800105978c0 ffff88000b013800 ffff8800022d9e78 ffffffffa04cd0ce ffff8800022d9e78 ffff88000b013800 ffff8800022d9ea8 ffffffffa04755a7 ffff8800022d9ea8 ffff880002f96400 ffff88000b013800 ffff880002f96400 Call Trace: [<ffffffffa04cd0ce>] nfs4_destroy_server+0x1e/0x30 [nfsv4] [<ffffffffa04755a7>] nfs_free_server+0xb7/0x150 [nfs] [<ffffffffa047d4d5>] nfs_kill_super+0x35/0x40 [nfs] [<ffffffff81178d35>] deactivate_locked_super+0x45/0x70 [<ffffffff8117986a>] deactivate_super+0x4a/0x70 [<ffffffff81193ee2>] mntput_no_expire+0xd2/0x130 [<ffffffff81194d62>] sys_umount+0x72/0xe0 [<ffffffff8154af59>] system_call_fastpath+0x16/0x1b Code: 06 e1 b8 ea ff ff ff eb 9e 0f 1f 44 00 00 55 48 89 e5 53 48 83 ec 08 66 66 66 66 90 48 8b 87 80 03 00 00 48 89 fb 48 85 c0 74 29 <48> 8b 40 38 48 85 c0 74 02 ff d0 48 8b 03 3e ff 48 04 0f 94 c2 RIP [<ffffffffa04cfe6d>] unset_pnfs_layoutdriver+0x1d/0x70 [nfsv4] RSP <ffff8800022d9e48> CR2: ffffffffa04a1b38 ---[ end trace 29f75aaedda058bf ]---
--- fs/nfs/blocklayout/blocklayout.c | 1 + fs/nfs/objlayout/objio_osd.c | 1 + 2 files changed, 2 insertions(+)
fs/nfs/blocklayout/blocklayout.c +1 -0
@@ -1101,6 +1101,7 @@ static const struct nfs_pageio_ops bl_pgstatic struct pnfs_layoutdriver_type blocklayout_type = { .id =LAYOUT_BLOCK_VOLUME , .name ="LAYOUT_BLOCK_VOLUME" , + .owner =THIS_MODULE , .read_pagelist = bl_read_pagelist, .write_pagelist = bl_write_pagelist, .alloc_layout_hdr = bl_alloc_layout_hdr,
fs/nfs/objlayout/objio_osd.c +1 -0
@@ -569,6 +569,7 @@ static struct pnfs_layoutdriver_type obj .flags = PNFS_LAYOUTRET_ON_SETATTR | PNFS_LAYOUTRET_ON_ERROR, + .owner = THIS_MODULE, .alloc_layout_hdr = objlayout_alloc_layout_hdr, .free_layout_hdr = objlayout_free_layout_hdr,
PATCH 67/153 cgroup: fix exit() vs rmdir() race
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Zefan <[email protected]>
commit 71b5707e119653039e6e95213f00479668c79b75 upstream.
In cgroup_exit() put_css_set_taskexit() is called without any lock, which might lead to accessing a freed cgroup:
thread1 thread2
---------------------------------------------exit()
cgroup_exit()
put_css_set_taskexit()
atomic_dec(cgrp->count);
rmdir();
/* not safe !! */
check_for_release(cgrp);rcu_read_lock() can be used to make sure the cgroup is alive.
--- kernel/cgroup.c | 8 ++++++++ 1 file changed, 8 insertions(+)
kernel/cgroup.c +8 -0
@@ -361,12 +361,20 @@ static void __put_css_set(struct css_setstruct cgroup *cgrp = link->cgrp;list_del (&link->cg_link_list);list_del (&link->cgrp_link_list); + +/* +* We may not be holding cgroup_mutex, and if cgrp->count is +* dropped to 0 the cgroup can be destroyed at any time, hence +* rcu_read_lock is used to keep it alive. +*/ +rcu_read_lock ();if (atomic_dec_and_test (&cgrp->count) &¬ify_on_release (cgrp)) {if (taskexit)set_bit (CGRP_RELEASABLE , &cgrp->flags);check_for_release (cgrp); } +rcu_read_unlock ();kfree (link); }
PATCH 68/153 cpuset: fix cpuset_print_task_mems_allowed() vs rename() race
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Zefan <[email protected]>
commit 63f43f55c9bbc14f76b582644019b8a07dc8219a upstream.
rename() will change dentry->d_name. The result of this race can be worse than seeing partially rewritten name, but we might access a stale pointer because rename() will re-allocate memory to hold a longer name.
It's safe in the protection of dentry->d_lock.
v2: check NULL dentry before acquiring dentry lock.
--- kernel/cpuset.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
kernel/cpuset.c +10 -2
@@ -2507,8 +2507,16 @@ void cpuset_print_task_mems_allowed(stru dentry =task_cs (tsk)->css.cgroup->dentry;spin_lock (&cpuset_buffer_lock); -snprintf (cpuset_name,CPUSET_NAME_LEN , - dentry ? (const char *)dentry->d_name.name :"/" ); + +if (!dentry) { +strcpy (cpuset_name,"/" ); + }else { +spin_lock (&dentry->d_lock); +strlcpy (cpuset_name, (const char *)dentry->d_name.name, +CPUSET_NAME_LEN ); +spin_unlock (&dentry->d_lock); + } +nodelist_scnprintf (cpuset_nodelist,CPUSET_NODELIST_LEN , tsk->mems_allowed); printk(KERN_INFO "%s cpuset=%s mems_allowed=%s\n",
PATCH 69/153 ext4: fix xattr block allocation/release with bigalloc
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Czerner <[email protected]>
commit 1231b3a1eb5740192aeebf5344dd6d6da000febf upstream.
Currently when new xattr block is created or released we we would call dquot_free_block() or dquot_alloc_block() respectively, among the else decrementing or incrementing the number of blocks assigned to the inode by one block.
This however does not work for bigalloc file system because we always allocate/free the whole cluster so we have to count with that in dquot_free_block() and dquot_alloc_block() as well.
Use the clusters-to-blocks conversion EXT4_C2B() when passing number of blocks to the dquot_alloc/free functions to fix the problem.
The problem has been revealed by xfstests #117 (and possibly others).
--- fs/ext4/xattr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/ext4/xattr.c +4 -3
@@ -496,7 +496,7 @@ ext4_xattr_release_block(handle_t *handl error =ext4_handle_dirty_metadata (handle, inode, bh);if (IS_SYNC (inode))ext4_handle_sync (handle); -dquot_free_block (inode,1 ); +dquot_free_block (inode,EXT4_C2B (EXT4_SB (inode->i_sb),1 ));ea_bdebug (bh,"refcount now=%d; releasing" ,le32_to_cpu (BHDR (bh)->h_refcount)); }
@@ -785,7 +785,8 @@ inserted:else {/* The old block is released after updating the inode. */ - error =dquot_alloc_block (inode,1 ); + error =dquot_alloc_block (inode, +EXT4_C2B (EXT4_SB (sb),1 ));if (error) goto cleanup; error = ext4_journal_get_write_access(handle,
@@ -881,7 +882,7 @@ cleanup:return error; cleanup_dquot: -dquot_free_block (inode,1 ); +dquot_free_block (inode,EXT4_C2B (EXT4_SB (sb),1 )); goto cleanup; bad_block:
PATCH 70/153 mm: fix pageblock bitmap allocation
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit 7c45512df987c5619db041b5c9b80d281e26d3db upstream.
Commit c060f943d092 ("mm: use aligned zone start for pfn_to_bitidx calculation") fixed out calculation of the index into the pageblock bitmap when a !SPARSEMEM zome was not aligned to pageblock_nr_pages.
However, the _allocation_ of that bitmap had never taken this alignment requirement into accout, so depending on the exact size and alignment of the zone, the use of that index could then access past the allocation, resulting in some very subtle memory corruption.
This was reported (and bisected) by Ingo Molnar: one of his random config builds would hang with certain very specific kernel command line options.
In the meantime, commit c060f943d092 has been marked for stable, so this fix needs to be back-ported to the stable kernels that backported the commit to use the right alignment.
--- mm/page_alloc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
mm/page_alloc.c +9 -6
@@ -4253,10 +4253,11 @@ static void __meminit calculate_node_tot* round what is now in bits to nearest long in bits, then return it in * bytes. */ -static unsigned long __init usemap_size (unsigned long zonesize) +static unsigned long __init usemap_size (unsigned long zone_start_pfn,unsigned long zonesize) {unsigned long usemapsize; + zonesize += zone_start_pfn & (pageblock_nr_pages-1 ); usemapsize =roundup (zonesize, pageblock_nr_pages); usemapsize = usemapsize >> pageblock_order; usemapsize *=NR_PAGEBLOCK_BITS ;
@@ -4266,17 +4267,19 @@ static unsigned long __init usemap_size( }static void __init setup_usemap (struct pglist_data *pgdat, -struct zone *zone,unsigned long zonesize) +struct zone *zone, +unsigned long zone_start_pfn, +unsigned long zonesize) { -unsigned long usemapsize =usemap_size (zonesize); +unsigned long usemapsize =usemap_size (zone_start_pfn, zonesize); zone->pageblock_flags =NULL ;if (usemapsize) zone->pageblock_flags =alloc_bootmem_node_nopanic (pgdat, usemapsize); }#else -static inline void setup_usemap (struct pglist_data *pgdat, -struct zone *zone,unsigned long zonesize) {} +static inline void setup_usemap (struct pglist_data *pgdat,struct zone *zone, +unsigned long zone_start_pfn,unsigned long zonesize) {}#endif /* CONFIG_SPARSEMEM */ #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
@@ -4401,7 +4404,7 @@ static void __paginginit free_area_init_continue ;set_pageblock_order (); -setup_usemap (pgdat, zone, size); +setup_usemap (pgdat, zone, zone_start_pfn, size); ret =init_currently_empty_zone (zone, zone_start_pfn, size,MEMMAP_EARLY );BUG_ON (ret);
PATCH 71/153 rtlwifi: usb: allocate URB control message setup_packet and data buffer separately
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jussi Kivilinna <[email protected]>
commit bc6b89237acb3dee6af6e64e51a18255fef89cc2 upstream.
rtlwifi allocates both setup_packet and data buffer of control message urb, using shared kmalloc in _usbctrl_vendorreq_async_write. Structure used for allocating is:
struct {
u8 data[254];
struct usb_ctrlrequest dr;
};Because 'struct usb_ctrlrequest' is __packed, setup packet is unaligned and DMA mapping of both 'data' and 'dr' confuses ARM/sunxi, leading to memory corruptions and freezes.
Patch changes setup packet to be allocated separately.
[v2]:
- Use WARN_ON_ONCE instead of WARN_ON
--- drivers/net/wireless/rtlwifi/usb.c | 44 +++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 16 deletions(-)
drivers/net/wireless/rtlwifi/usb.c +28 -16
@@ -44,8 +44,12 @@static void usbctrl_async_callback (struct urb *urb) { -if (urb) -kfree (urb->context); +if (urb) { +/* free dr */ +kfree (urb->setup_packet); +/* free databuf */ +kfree (urb->transfer_buffer); + } } static int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request,
@@ -57,38 +61,46 @@ static int _usbctrl_vendorreq_async_writu8 reqtype;struct usb_ctrlrequest *dr;struct urb *urb; -struct rtl819x_async_write_data { -u8 data[REALTEK_USB_VENQT_MAX_BUF_SIZE ]; -struct usb_ctrlrequest dr; - } *buf; +const u16 databuf_maxlen =REALTEK_USB_VENQT_MAX_BUF_SIZE ; +u8 *databuf; + +if (WARN_ON_ONCE (len > databuf_maxlen)) + len = databuf_maxlen; pipe =usb_sndctrlpipe (udev,0 );/* write_out */ reqtype =REALTEK_USB_VENQT_WRITE ; - buf =kmalloc (sizeof (*buf),GFP_ATOMIC ); -if (!buf) + dr =kmalloc (sizeof (*dr),GFP_ATOMIC ); +if (!dr)return -ENOMEM ; + databuf =kmalloc (databuf_maxlen,GFP_ATOMIC ); +if (!databuf) { +kfree (dr); +return -ENOMEM ; + } + urb =usb_alloc_urb (0 ,GFP_ATOMIC );if (!urb) { -kfree (buf); +kfree (databuf); +kfree (dr);return -ENOMEM ; } - dr = &buf->dr; - dr->bRequestType = reqtype; dr->bRequest = request; dr->wValue =cpu_to_le16 (value); dr->wIndex =cpu_to_le16 (index); dr->wLength =cpu_to_le16 (len); -memcpy (buf, pdata, len); +memcpy (databuf, pdata, len);usb_fill_control_urb (urb, udev, pipe, - (unsigned char *)dr, buf, len, - usbctrl_async_callback, buf); + (unsigned char *)dr, databuf, len, + usbctrl_async_callback,NULL ); rc =usb_submit_urb (urb,GFP_ATOMIC ); -if (rc <0 ) -kfree (buf); +if (rc <0 ) { +kfree (databuf); +kfree (dr); + }usb_free_urb (urb);return rc; }
PATCH 72/153 target: Fix lookup of dynamic NodeACLs during cached demo-mode operation
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit fcf29481fb8e106daad6688f2e898226ee928992 upstream.
This patch fixes a bug in core_tpg_check_initiator_node_acl() -> core_tpg_get_initiator_node_acl() where a dynamically created se_node_acl generated during session login would be skipped during subsequent lookup due to the '!acl->dynamic_node_acl' check, causing a new se_node_acl to be created with a duplicate ->initiatorname.
This would occur when a fabric endpoint was configured with TFO->tpg_check_demo_mode()=1 + TPF->tpg_check_demo_mode_cache()=1 preventing the release of an existing se_node_acl during se_session shutdown.
Also, drop the unnecessary usage of core_tpg_get_initiator_node_acl() within core_dev_init_initiator_node_lun_acl() that originally required the extra '!acl->dynamic_node_acl' check, and just pass the configfs provided se_node_acl pointer instead.
---
drivers/target/target_core_device.c +4 -9
@@ -1439,24 +1439,18 @@ static struct se_lun *core_dev_get_lun(sstruct se_lun_acl *core_dev_init_initiator_node_lun_acl (struct se_portal_group *tpg, +struct se_node_acl *nacl,u32 mapped_lun, -char *initiatorname,int *ret) {struct se_lun_acl *lacl; -struct se_node_acl *nacl; -if (strlen (initiatorname) >=TRANSPORT_IQN_LEN ) { +if (strlen (nacl->initiatorname) >=TRANSPORT_IQN_LEN ) {pr_err ("%s InitiatorName exceeds maximum size.\n" , tpg->se_tpg_tfo->get_fabric_name ()); *ret = -EOVERFLOW ;return NULL ; } - nacl =core_tpg_get_initiator_node_acl (tpg, initiatorname); -if (!nacl) { - *ret = -EINVAL ; -return NULL ; - } lacl =kzalloc (sizeof (struct se_lun_acl ),GFP_KERNEL );if (!lacl) {pr_err ("Unable to allocate memory for struct se_lun_acl.\n" );
@@ -1467,7 +1461,8 @@ struct se_lun_acl *core_dev_init_initiatINIT_LIST_HEAD (&lacl->lacl_list); lacl->mapped_lun = mapped_lun; lacl->se_lun_nacl = nacl; -snprintf (lacl->initiatorname,TRANSPORT_IQN_LEN ,"%s" , initiatorname); +snprintf (lacl->initiatorname,TRANSPORT_IQN_LEN ,"%s" , + nacl->initiatorname);return lacl; }
drivers/target/target_core_fabric_configfs.c +2 -2
@@ -355,8 +355,8 @@ static struct config_group *target_fabri goto out; } - lacl =core_dev_init_initiator_node_lun_acl (se_tpg, mapped_lun, -config_item_name (acl_ci), &ret); + lacl =core_dev_init_initiator_node_lun_acl (se_tpg, se_nacl, + mapped_lun, &ret);if (!lacl) { ret = -EINVAL ; goto out;
include/target/target_core_device.h +1 -1
@@ -50,7 +50,7 @@ extern struct se_lun *core_dev_add_lun(sextern int core_dev_del_lun (struct se_portal_group *,u32 );extern struct se_lun *core_get_lun_from_tpg (struct se_portal_group *,u32 );extern struct se_lun_acl *core_dev_init_initiator_node_lun_acl (struct se_portal_group *, -u32 ,char *,int *); +struct se_node_acl *,u32 ,int *);extern int core_dev_add_initiator_node_lun_acl (struct se_portal_group *,struct se_lun_acl *,u32 ,u32 ); extern int core_dev_del_initiator_node_lun_acl(struct se_portal_group *,
drivers/target/target_core_tpg.c +2 -8
@@ -117,16 +117,10 @@ struct se_node_acl *core_tpg_get_initiatstruct se_node_acl *acl;spin_lock_irq (&tpg->acl_node_lock); -list_for_each_entry (acl, &tpg->acl_node_list, acl_list) { -if (!strcmp (acl->initiatorname, initiatorname) && - !acl->dynamic_node_acl) { -spin_unlock_irq (&tpg->acl_node_lock); -return acl; - } - } + acl =__core_tpg_get_initiator_node_acl (tpg, initiatorname);spin_unlock_irq (&tpg->acl_node_lock); -return NULL ; +return acl; }/* core_tpg_add_node_to_devs():
PATCH 73/153 target: Add missing mapped_lun bounds checking during make_mappedlun setup
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit fbbf8555a986ed31e54f006b6cc637ea4ff1425b upstream.
This patch adds missing bounds checking for the configfs provided mapped_lun value during target_fabric_make_mappedlun() setup ahead of se_lun_acl initialization.
This addresses a potential OOPs when using a mapped_lun value that exceeds the hardcoded TRANSPORT_MAX_LUNS_PER_TPG-1 value within se_node_acl->device_list[].
--- drivers/target/target_core_fabric_configfs.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/target/target_core_fabric_configfs.c +8 -0
@@ -354,6 +354,14 @@ static struct config_group *target_fabri ret = -EINVAL ; goto out; } +if (mapped_lun > (TRANSPORT_MAX_LUNS_PER_TPG -1 )) { +pr_err ("Mapped LUN: %lu exceeds TRANSPORT_MAX_LUNS_PER_TPG" +"-1: %u for Target Portal Group: %u\n" , mapped_lun, +TRANSPORT_MAX_LUNS_PER_TPG -1 , + se_tpg->se_tpg_tfo->tpg_get_tag (se_tpg)); + ret = -EINVAL ; + goto out; + } lacl =core_dev_init_initiator_node_lun_acl (se_tpg, se_nacl, mapped_lun, &ret);
PATCH 74/153 ftrace: Call ftrace cleanup module notifier after all other notifiers
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <[email protected]>
commit 8c189ea64eea01ca20d102ddb74d6936dd16c579 upstream.
Commit: c1bf08ac "ftrace: Be first to run code modification on modules"
changed ftrace module notifier's priority to INT_MAX in order to process the ftrace nops before anything else could touch them (namely kprobes). This was the correct thing to do.
Unfortunately, the ftrace module notifier also contains the ftrace clean up code. As opposed to the set up code, this code should be run *after* all the module notifiers have run in case a module is doing correct clean-up and unregisters its ftrace hooks. Basically, ftrace needs to do clean up on module removal, as it needs to know about code being removed so that it doesn't try to modify that code. But after it removes the module from its records, if a ftrace user tries to remove a probe, that removal will fail due as the record of that code segment no longer exists.
Nothing really bad happens if the probe removal is called after ftrace did the clean up, but the ftrace removal function will return an error. Correct code (such as kprobes) will produce a WARN_ON() if it fails to remove the probe. As people get annoyed by frivolous warnings, it's best to do the ftrace clean up after everything else.
By splitting the ftrace_module_notifier into two notifiers, one that does the module load setup that is run at high priority, and the other that is called for module clean up that is run at low priority, the problem is solved.
--- kernel/trace/ftrace.c | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-)
kernel/trace/ftrace.c +32 -14
@@ -3454,37 +3454,51 @@ static void ftrace_init_module(struct moftrace_process_locs (mod, start, end); } -static int ftrace_module_notify (struct notifier_block *self, -unsigned long val,void *data) +static int ftrace_module_notify_enter (struct notifier_block *self, +unsigned long val,void *data) {struct module *mod = data; -switch (val) { -case MODULE_STATE_COMING : +if (val ==MODULE_STATE_COMING )ftrace_init_module (mod, mod->ftrace_callsites, mod->ftrace_callsites + mod->num_ftrace_callsites); -break ; -case MODULE_STATE_GOING : +return 0 ; +} + +static int ftrace_module_notify_exit (struct notifier_block *self, +unsigned long val,void *data) +{ +struct module *mod = data; + +if (val ==MODULE_STATE_GOING )ftrace_release_mod (mod); -break ; - }return 0 ; }#else -static int ftrace_module_notify (struct notifier_block *self, -unsigned long val,void *data) +static int ftrace_module_notify_enter (struct notifier_block *self, +unsigned long val,void *data) +{ +return 0 ; +} +static int ftrace_module_notify_exit (struct notifier_block *self, +unsigned long val,void *data) {return 0 ; }#endif /* CONFIG_MODULES */ -struct notifier_block ftrace_module_nb = { - .notifier_call = ftrace_module_notify, +struct notifier_block ftrace_module_enter_nb = { + .notifier_call = ftrace_module_notify_enter, .priority =INT_MAX ,/* Run before anything that can use kprobes */ }; +struct notifier_block ftrace_module_exit_nb = { + .notifier_call = ftrace_module_notify_exit, + .priority =INT_MIN ,/* Run after anything that can remove kprobes */ +}; +extern unsigned long __start_mcount_loc[];extern unsigned long __stop_mcount_loc[];
@@ -3516,9 +3530,13 @@ void __init ftrace_init(void) __start_mcount_loc, __stop_mcount_loc); - ret =register_module_notifier (&ftrace_module_nb); + ret =register_module_notifier (&ftrace_module_enter_nb); +if (ret) +pr_warning ("Failed to register trace ftrace module enter notifier\n" ); + + ret =register_module_notifier (&ftrace_module_exit_nb);if (ret) -pr_warning ("Failed to register trace ftrace module notifier\n" ); +pr_warning ("Failed to register trace ftrace module exit notifier\n" );set_ftrace_early_filters ();
PATCH 75/153 b43: Increase number of RX DMA slots
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit ccae0e50c16a7f7adb029c169147400d1ce9f703 upstream.
Bastian Bittorf reported that some of the silent freezes on a Linksys WRT54G were due to overflow of the RX DMA ring buffer, which was created with 64 slots. That finding reminded me that I was seeing similar crashed on a netbook, which also has a relatively slow processor. After increasing the number of slots to 128, runs on the netbook that previously failed now worked; however, I found that 109 slots had been used in one test. For that reason, the number of slots is being increased to 256.
--- drivers/net/wireless/b43/dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/b43/dma.h +1 -1
@@ -169,7 +169,7 @@ struct b43_dmadesc_generic {/* DMA engine tuning knobs */ #define B43_TXRING_SLOTS 256 -#define B43_RXRING_SLOTS 64 +#define B43_RXRING_SLOTS 256#define B43_DMA0_RX_FW598_BUFSIZE (B43_DMA0_RX_FW598_FO + IEEE80211_MAX_FRAME_LEN)#define B43_DMA0_RX_FW351_BUFSIZE (B43_DMA0_RX_FW351_FO + IEEE80211_MAX_FRAME_LEN)
PATCH 76/153 NLM: Ensure that we resend all pending blocking locks after a reclaim
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit 666b3d803a511fbc9bc5e5ea8ce66010cf03ea13 upstream.
Currently, nlmclnt_lock will break out of the for(;;) loop when the reclaimer wakes up the blocking lock thread by setting nlm_lck_denied_grace_period. This causes the lock request to fail with an ENOLCK error.
The intention was always to ensure that we resend the lock request after the grace period has expired.
--- fs/lockd/clntproc.c | 3 +++ 1 file changed, 3 insertions(+)
fs/lockd/clntproc.c +3 -0
@@ -551,6 +551,9 @@ again: status =nlmclnt_block (block, req,NLMCLNT_POLL_TIMEOUT );if (status <0 )break ; +/* Resend the blocking lock request after a server reboot */ +if (resp->status == nlm_lck_denied_grace_period) +continue ;if (resp->status != nlm_lck_blocked)break ; }
PATCH 77/153 ALSA: hda - hdmi: ELD shouldnt be valid after unplug
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Henningsson <[email protected]>
commit bbfd8a19b6913f50a362457c34d49bfafe5e456e upstream.
Currently, eld_valid is never set to false, except at kernel module load time. This patch makes sure that eld is no longer valid when the cable is (hot-)unplugged.
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -987,6 +987,7 @@ static void hdmi_present_sense(struct hd"HDMI status: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n" , codec->addr, pin_nid, eld->monitor_present, eld_valid); + eld->eld_valid = false;if (eld_valid) {if (!snd_hdmi_get_eld (eld, codec, pin_nid))snd_hdmi_show_eld (eld);
PATCH 78/153 xen-blkback: do not leak mode property
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Beulich <[email protected]>
commit 9d092603cc306ee6edfe917bf9ab8beb5f32d7bc upstream.
"be->mode" is obtained from xenbus_read(), which does a kmalloc() for the message body. The short string is never released, so do it along with freeing "be" itself, and make sure the string isn't kept when backend_changed() doesn't complete successfully (which made it desirable to slightly re-structure that function, so that the error cleanup can be done in one place).
--- drivers/block/xen-blkback/xenbus.c | 49 ++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 25 deletions(-)
drivers/block/xen-blkback/xenbus.c +24 -25
@@ -364,6 +364,7 @@ static int xen_blkbk_remove(struct xenbu be->blkif =NULL ; } +kfree (be->mode);kfree (be);dev_set_drvdata (&dev->dev,NULL );return 0 ;
@@ -513,6 +514,7 @@ static void backend_changed(struct xenbu = container_of(watch, struct backend_info, backend_watch);struct xenbus_device *dev = be->dev;int cdrom =0 ; +unsigned long handle;char *device_type;DPRINTK ("" );
@@ -532,10 +534,10 @@ static void backend_changed(struct xenbureturn ; } -if ((be->major || be->minor) && - ((be->major != major) || (be->minor != minor))) { -pr_warn (DRV_PFX "changing physical device (from %x:%x to %x:%x) not supported.\n" , - be->major, be->minor, major, minor); +if (be->major | be->minor) { +if (be->major != major || be->minor != minor) +pr_warn (DRV_PFX "changing physical device (from %x:%x to %x:%x) not supported.\n" , + be->major, be->minor, major, minor);return ; }
@@ -553,36 +555,33 @@ static void backend_changed(struct xenbukfree (device_type); } -if (be->major ==0 && be->minor ==0 ) { -/* Front end dir is a number, which is used as the handle. */ - -char *p =strrchr (dev->otherend,'/' ) +1 ; -long handle; - err =strict_strtoul (p,0 , &handle); -if (err) -return ; +/* Front end dir is a number, which is used as the handle. */ + err =strict_strtoul (strrchr (dev->otherend,'/' ) +1 ,0 , &handle); +if (err) +return ; - be->major = major; - be->minor = minor; + be->major = major; + be->minor = minor; - err =xen_vbd_create (be->blkif, handle, major, minor, - (NULL ==strchr (be->mode,'w' )), cdrom); -if (err) { - be->major =0 ; - be->minor =0 ; -xenbus_dev_fatal (dev, err,"creating vbd structure" ); -return ; - } + err =xen_vbd_create (be->blkif, handle, major, minor, + !strchr (be->mode,'w' ), cdrom); +if (err) +xenbus_dev_fatal (dev, err,"creating vbd structure" ); +else { err =xenvbd_sysfs_addif (dev);if (err) {xen_vbd_free (&be->blkif->vbd); - be->major =0 ; - be->minor =0 ;xenbus_dev_fatal (dev, err,"creating sysfs entries" ); -return ; } + } +if (err) { +kfree (be->mode); + be->mode =NULL ; + be->major =0 ; + be->minor =0 ; + }else {/* We're potentially connected now */ xen_update_blkif_status (be->blkif); }
PATCH 79/153 drm: dont add inferred modes for monitors that dont support them
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Zanoni <[email protected]>
commit 196e077dc165a307efbd9e7569f81bbdbcf18f65 upstream.
If bit 0 of the features byte (0x18) is set to 0, then, according to the EDID spec, "the display is non-continuous frequency (multi-mode) and is only specified to accept the video timing formats that are listed in Base EDID and certain Extension Blocks".
For more information, please see the EDID spec, check the notes of the table that explains the "Feature Support" byte (18h) and also the notes on the tables of the section that explains "Display Range Limits & Additional Timing Description Definition (tag #FDh)".
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45729
--- drivers/gpu/drm/drm_edid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_edid.c +2 -1
@@ -1740,7 +1740,8 @@ int drm_add_edid_modes(struct drm_connec num_modes +=add_cvt_modes (connector, edid); num_modes +=add_standard_modes (connector, edid); num_modes +=add_established_modes (connector, edid); - num_modes +=add_inferred_modes (connector, edid); +if (edid->features &DRM_EDID_FEATURE_DEFAULT_GTF ) + num_modes +=add_inferred_modes (connector, edid);if (quirks & (EDID_QUIRK_PREFER_LARGE_60 |EDID_QUIRK_PREFER_LARGE_75 ))edid_fixup_preferred (connector, quirks);
PATCH 80/153 drm/i915: disable shared panel fitter for pipe
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mika Kuoppala <[email protected]>
commit 24a1f16de97c4cf0029d9acd04be06db32208726 upstream.
If encoder is switched off by BIOS, but the panel fitter is left on, we never try to turn off the panel fitter and leave it still attached to the pipe - which can cause blurry output elsewhere.
Based on work by Chris Wilson <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58867
[danvet: Remove the redundant HAS_PCH_SPLIT check and add a tiny comment.]
--- drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_display.c +8 -0
@@ -3242,6 +3242,7 @@ static void i9xx_crtc_disable(struct drmstruct intel_crtc *intel_crtc =to_intel_crtc (crtc);int pipe = intel_crtc->pipe;int plane = intel_crtc->plane; +u32 pctl;if (!intel_crtc->active)return ;
@@ -3257,6 +3258,13 @@ static void i9xx_crtc_disable(struct drmintel_disable_plane (dev_priv, plane, pipe);intel_disable_pipe (dev_priv, pipe); + +/* Disable pannel fitter if it is on this pipe. */ + pctl =I915_READ (PFIT_CONTROL ); +if ((pctl &PFIT_ENABLE ) && + ((pctl &PFIT_PIPE_MASK ) >>PFIT_PIPE_SHIFT ) == pipe) +I915_WRITE (PFIT_CONTROL ,0 ); +intel_disable_pll (dev_priv, pipe); intel_crtc->active = false;
PATCH 81/153 drm/i915: add missing \n to UTS_RELEASE in the error_state
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
commit fdfa175d0a9cfa2082ce24e67e284e5acbba452a upstream.
Amending
commit 4518f611ba21ba165ea3714055938a8984a44ff9
Author: Daniel Vetter <[email protected]> Date: Wed Jan 23 16:16:35 2013 +0100
drm/i915: dump UTS_RELEASE into the error_state
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -756,7 +756,7 @@ static int i915_error_state(struct seq_fseq_printf (m,"Time: %ld s %ld us\n" , error->time.tv_sec, error->time.tv_usec); -seq_printf (m,"Kernel: " UTS_RELEASE ); +seq_printf (m,"Kernel: " UTS_RELEASE "\n" );seq_printf (m,"PCI ID: 0x%04x\n" , dev->pci_device);seq_printf (m,"EIR: 0x%08x\n" , error->eir);seq_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);
PATCH 82/153 drm/i915: Set i9xx sdvo clock limits according to specifications
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrik Jakobsson <[email protected]>
commit 4f7dfb6788dd022446847fbbfbe45e13bedb5be2 upstream.
The Intel PRM says the M1 and M2 divisors must be in the range of 10-20 and 5-9. Since we do all calculations based on them being register values (which are subtracted by 2) we need to specify them accordingly.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56359
--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -138,8 +138,8 @@ static const intel_limit_t intel_limits_ .vco = { .min = 1400000, .max = 2800000 }, .n = { .min = 1, .max = 6 }, .m = { .min = 70, .max = 120 }, - .m1 = { .min = 10, .max = 22 }, - .m2 = { .min = 5, .max = 9 }, + .m1 = { .min = 8, .max = 18 }, + .m2 = { .min = 3, .max = 7 }, .p = { .min = 5, .max = 80 }, .p1 = { .min = 1, .max = 8 }, .p2 = { .dot_limit = 200000,
PATCH 83/153 intel/iommu: force writebuffer-flush quirk on Gen 4 Chipsets
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit 210561ffd72d00eccf12c0131b8024d5436bae95 upstream.
We already have the quirk entry for the mobile platform, but also reports on some desktop versions. So be paranoid and set it everywhere.
References: http://www.mail-archive.com/[email protected]/msg33138.html
--- drivers/iommu/intel-iommu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +7 -1
@@ -4140,13 +4140,19 @@ static void __devinit quirk_iommu_rwbf(s {/* * Mobile 4 Series Chipset neglects to set RWBF capability, -* but needs it: +* but needs it. Same seems to hold for the desktop versions. */ printk (KERN_INFO "DMAR: Forcing write-buffer flush capability\n" ); rwbf_quirk =1 ; }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2a40 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e00 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e10 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e20 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e30 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e40 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e90 , quirk_iommu_rwbf);#define GGC 0x52#define GGC_MEMORY_SIZE_MASK (0xf << 8)
PATCH 84/153 xen: close evtchn port if binding to irq fails
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wei Liu <[email protected]>
commit e7e44e444876478d50630f57b0c31d29f6725020 upstream.
--- drivers/xen/evtchn.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/xen/evtchn.c +10 -0
@@ -269,6 +269,14 @@ static int evtchn_bind_to_user(struct pe u->name, (void *)(unsigned long)port);if (rc >=0 ) rc =0 ; +else { +/* bind failed, should close the port now */ +struct evtchn_close close; + close.port = port; +if (HYPERVISOR_event_channel_op (EVTCHNOP_close, &close) !=0 ) +BUG (); +set_port_user (port,NULL ); + }return rc; }
@@ -277,6 +285,8 @@ static void evtchn_unbind_from_user(stru {int irq =irq_from_evtchn (port); +BUG_ON (irq <0 ); +unbind_from_irqhandler (irq, (void *)(unsigned long )port);set_port_user (port,NULL );
PATCH 85/153 xen: Send spinlock IPI to all waiters
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Bader <[email protected]>
commit 76eaca031f0af2bb303e405986f637811956a422 upstream.
There is a loophole between Xen's current implementation of pv-spinlocks and the scheduler. This was triggerable through a testcase until v3.6 changed the TLB flushing code. The problem potentially is still there just not observable in the same way.
What could happen was (is):
1. CPU n tries to schedule task x away and goes into a slow wait for the runq lock of CPU n-# (must be one with a lower number).
2. CPU n-#, while processing softirqs, tries to balance domains and goes into a slow wait for its own runq lock (for updating some records). Since this is a spin_lock_irqsave in softirq context, interrupts will be re-enabled for the duration of the poll_irq hypercall used by Xen.
3. Before the runq lock of CPU n-# is unlocked, CPU n-1 receives an interrupt (e.g. endio) and when processing the interrupt, tries to wake up task x. But that is in schedule and still on_cpu, so try_to_wake_up goes into a tight loop.
4. The runq lock of CPU n-# gets unlocked, but the message only gets sent to the first waiter, which is CPU n-# and that is busily stuck.
5. CPU n-# never returns from the nested interruption to take and release the lock because the scheduler uses a busy wait. And CPU n never finishes the task migration because the unlock notification only went to CPU n-#.
To avoid this and since the unlocking code has no real sense of which waiter is best suited to grab the lock, just send the IPI to all of them. This causes the waiters to return from the hyper- call (those not interrupted at least) and do active spinlocking.
--- arch/x86/xen/spinlock.c | 1 - 1 file changed, 1 deletion(-)
arch/x86/xen/spinlock.c +0 -1
@@ -328,7 +328,6 @@ static noinline void xen_spin_unlock_sloif (per_cpu (lock_spinners, cpu) == xl) {ADD_STATS (released_slow_kicked,1 );xen_send_IPI_one (cpu,XEN_SPIN_UNLOCK_VECTOR ); -break ; } } }
PATCH 86/153 x86, efi: Make "noefi" really disable EFI runtime serivces
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Fleming <[email protected]>
commit fb834c7acc5e140cf4f9e86da93a66de8c0514da upstream.
commit 1de63d60cd5b ("efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot parameter") attempted to make "noefi" true to its documentation and disable EFI runtime services to prevent the bricking bug described in commit e0094244e41c ("samsung-laptop:
Disable on EFI hardware"). However, it's not possible to clear EFI_RUNTIME_SERVICES from an early param function because EFI_RUNTIME_SERVICES is set in efi_init() *after* parse_early_param().
This resulted in "noefi" effectively becoming a no-op and no longer providing users with a way to disable EFI, which is bad for those users that have buggy machines.
[bwh: Backported to 3.2: efi_runtime_init() is not a separate function,
so put a whole set of statements in an if (!disable_runtime) block]
---
arch/x86/platform/efi/efi.c +31 -28
@@ -83,9 +83,10 @@ int efi_enabled(int facility) }EXPORT_SYMBOL (efi_enabled); +static bool disable_runtime = false;static int __init setup_noefi (char *arg) { -clear_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); + disable_runtime = true;return 0 ; }early_param ("noefi" , setup_noefi);
@@ -549,35 +550,37 @@ void __init efi_init(void)set_bit (EFI_CONFIG_TABLES , &x86_efi_facility); -/* -* Check out the runtime services table. We need to map -* the runtime services table so that we can grab the physical -* address of several of the EFI runtime functions, needed to -* set the firmware into virtual mode. -*/ - runtime =early_ioremap ((unsigned long )efi.systab->runtime, -sizeof (efi_runtime_services_t)); -if (runtime !=NULL ) { -/* -* We will only need *early* access to the following -* two EFI runtime services before set_virtual_address_map -* is invoked. -*/ - efi_phys.get_time = (efi_get_time_t *)runtime->get_time; - efi_phys.set_virtual_address_map = - (efi_set_virtual_address_map_t *) - runtime->set_virtual_address_map; +if (!disable_runtime) {/* -* Make efi_get_time can be called before entering -* virtual mode. +* Check out the runtime services table. We need to map +* the runtime services table so that we can grab the physical +* address of several of the EFI runtime functions, needed to +* set the firmware into virtual mode. */ - efi.get_time = phys_efi_get_time; - -set_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); - }else -printk (KERN_ERR "Could not map the EFI runtime service " -"table!\n" ); -early_iounmap (runtime,sizeof (efi_runtime_services_t)); + runtime =early_ioremap ((unsigned long )efi.systab->runtime, +sizeof (efi_runtime_services_t)); +if (runtime !=NULL ) { +/* +* We will only need *early* access to the following +* two EFI runtime services before set_virtual_address_map +* is invoked. +*/ + efi_phys.get_time = (efi_get_time_t *)runtime->get_time; + efi_phys.set_virtual_address_map = + (efi_set_virtual_address_map_t *) + runtime->set_virtual_address_map; +/* +* Make efi_get_time can be called before entering +* virtual mode. +*/ + efi.get_time = phys_efi_get_time; + +set_bit (EFI_RUNTIME_SERVICES , &x86_efi_facility); + }else +printk (KERN_ERR "Could not map the EFI runtime service " +"table!\n" ); +early_iounmap (runtime,sizeof (efi_runtime_services_t)); + }/* Map the EFI memory map */ memmap.map = early_ioremap((unsigned long)memmap.phys_map,
PATCH 87/153 ALSA: usb: Fix Processing Unit Descriptor parsers
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pawel Moll <[email protected]>
commit b531f81b0d70ffbe8d70500512483227cc532608 upstream.
Commit 99fc86450c439039d2ef88d06b222fd51a779176 "ALSA: usb-mixer:
parse descriptors with structs" introduced a set of useful parsers for descriptors. Unfortunately the parses for the Processing Unit Descriptor came with a very subtle bug...
Functions uac_processing_unit_iProcessing() and uac_processing_unit_specific() were indexing the baSourceID array forgetting the fields before the iProcessing and process-specific descriptors.
The problem was observed with Sound Blaster Extigy mixer, where nNrModes in Up/Down-mix Processing Unit Descriptor was accessed at offset 10 of the descriptor (value 0) instead of offset 15 (value 7). In result the resulting control had interesting limit values:
Simple mixer control 'Channel Routing Mode Select',0
Capabilities: volume volume-joined penum Playback channels: Mono
Capture channels: Mono
Limits: 0 - -1
Mono: -1 [100%]
Fixed by starting from the bmControls, which was calculated correctly, instead of baSourceID.
Now the mentioned control is fine:
Simple mixer control 'Channel Routing Mode Select',0
Capabilities: volume volume-joined penum Playback channels: Mono
Capture channels: Mono
Limits: 0 - 6
Mono: 0 [0%]
--- include/linux/usb/audio.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/linux/usb/audio.h +4 -2
@@ -384,14 +384,16 @@ static inline __u8 uac_processing_unit_i int protocol) {__u8 control_size =uac_processing_unit_bControlSize (desc, protocol); -return desc->baSourceID[desc->bNrInPins + control_size]; +return *(uac_processing_unit_bmControls (desc, protocol) + + control_size); }static inline __u8 *uac_processing_unit_specific (struct uac_processing_unit_descriptor *desc,int protocol) {__u8 control_size =uac_processing_unit_bControlSize (desc, protocol); -return &desc->baSourceID[desc->bNrInPins + control_size +1 ]; +return uac_processing_unit_bmControls (desc, protocol) + + control_size +1 ; }/* 4.5.2 Class-Specific AS Interface Descriptor */
PATCH 88/153 posix-timer: Dont call idr_find() with out-of-range ID
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit e182bb38d7db7494fa5dcd82da17fe0dedf60ecf upstream.
When idr_find() was fed a negative ID, it used to look up the ID ignoring the sign bit before recent ("idr: remove MAX_IDR_MASK and move left MAX_IDR_* into idr.c") patch. Now a negative ID triggers a WARN_ON_ONCE().
__lock_timer() feeds timer_id from userland directly to idr_find() without sanitizing it which can trigger the above malfunctions. Add a range check on @timer_id before invoking idr_find() in __lock_timer().
While timer_t is defined as int by all archs at the moment, Andrew worries that it may be defined as a larger type later on. Make the test cover larger integers too so that it at least is guaranteed to not return the wrong timer.
Note that WARN_ON_ONCE() in idr_find() on id < 0 is transitional precaution while moving away from ignoring MSB. Once it's gone we can remove the guard as long as timer_t isn't larger than int.
--- kernel/posix-timers.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/posix-timers.c +7 -0
@@ -639,6 +639,13 @@ static struct k_itimer *__lock_timer(tim {struct k_itimer *timr; +/* +* timer_t could be any type >= int and we want to make sure any +* @timer_id outside positive int range fails lookup. +*/ +if ((unsigned long long )timer_id >INT_MAX ) +return NULL ; +rcu_read_lock (); timr =idr_find (&posix_timers_id, (int )timer_id);if (timr) {
PATCH 89/153 inotify: remove broken mask checks causing unmount to be EINVAL
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jim Somerville <[email protected]>
commit 676a0675cf9200ac047fb50825f80867b3bb733b upstream.
Running the command:
inotifywait -e unmount /mnt/disk
immediately aborts with a -EINVAL return code. This is however a valid parameter. This abort occurs only if unmount is the sole event parameter. If other event parameters are supplied, then the unmount event wait will work.
The problem was introduced by commit 44b350fc23e ("inotify: Fix mask checks"). In that commit, it states:
The mask checks in inotify_update_existing_watch() and inotify_new_watch() are useless because inotify_arg_to_mask() sets FS_IN_IGNORED and FS_EVENT_ON_CHILD bits anyway.
But instead of removing the useless checks, it did this:
mask = inotify_arg_to_mask(arg); - if (unlikely(!mask)) + if (unlikely(!(mask & IN_ALL_EVENTS))) return -EINVAL;
The problem is that IN_ALL_EVENTS doesn't include IN_UNMOUNT, and other parts of the code keep IN_UNMOUNT separate from IN_ALL_EVENTS. So the check should be:
if (unlikely(!(mask & (IN_ALL_EVENTS | IN_UNMOUNT))))
But inotify_arg_to_mask(arg) always sets the IN_UNMOUNT bit in the mask anyway, so the check is always going to pass and thus should simply be removed. Also note that inotify_arg_to_mask completely controls what mask bits get set from arg, there's no way for invalid bits to get enabled there.
Lets fix it by simply removing the useless broken checks.
--- fs/notify/inotify/inotify_user.c | 4 ---- 1 file changed, 4 deletions(-)
fs/notify/inotify/inotify_user.c +0 -4
@@ -579,8 +579,6 @@ static int inotify_update_existing_watch/* don't allow invalid bits: we don't want flags set */ mask =inotify_arg_to_mask (arg); -if (unlikely (!(mask &IN_ALL_EVENTS ))) -return -EINVAL ; fsn_mark =fsnotify_find_inode_mark (group, inode);if (!fsn_mark)
@@ -632,8 +630,6 @@ static int inotify_new_watch(struct fsno/* don't allow invalid bits: we don't want flags set */ mask =inotify_arg_to_mask (arg); -if (unlikely (!(mask &IN_ALL_EVENTS ))) -return -EINVAL ; tmp_i_mark =kmem_cache_alloc (inotify_inode_mark_cachep,GFP_KERNEL );if (unlikely (!tmp_i_mark))
PATCH 90/153 fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: MITSUNARI Shigeo <[email protected]>
commit 7630b661da330b35dd57b6f5d6d62b386f2dd751 upstream.
We found that bdev->bd_invalidated was left set once revalidate_disk() is called, which results in page cache flush every time that device is open.
Specifically, we found this problem in MD block device. Once we resize a MD device, mdadm --monitor periodically flush all page cache for that device every 60 or 1000 seconds when it opens the device.
This bug lies since at least 3.2.0 till the latest kernel(3.6.2). Patch is attached.
The following steps will reproduce the problem.
1. prepair a block device (eg /dev/sdb).
2. create two partitions:
sudo parted /dev/sdb
mklabel gpt
mkpart primary 0% 50%
mkpart primary 50% 100%
3. create a md device.
sudo mdadm -C /dev/md/hoge -l 1 -n 2 -e 1.2 --assume-clean --auto=md --symlink=no /dev/sdb1 /dev/sdb2
4. create file system and mount it
sudo mkfs.ext3 /dev/md/hoge
sudo mkdir /mnt/test
sudo mount /dev/md/hoge /mnt/test
5. try to resize the device
sudo mdadm -G /dev/md/hoge --size=max
6. create a file to fill file cache.
sudo dd if=/dev/urandom of=/mnt/test/data bs=1M count=10
and verify the current status of file by free command.
7. mdadm monitor will open the md device every 1000 seconds and you will find all file cache on the device are cleared.
The timing can be reduced by the following steps.
a) kill mdadm and restart it with --delay option
/sbin/mdadm --monitor --delay=30 --pid-file /var/run/mdadm/monitor.pid --daemonise --scan --syslog
or open the md device directly.
sudo dd if=/dev/md/hoge of=/dev/null bs=4096 count=1
--- fs/block_dev.c | 1 + 1 file changed, 1 insertion(+)
fs/block_dev.c +1 -0
@@ -1024,6 +1024,7 @@ int revalidate_disk(struct gendisk *diskmutex_lock (&bdev->bd_mutex);check_disk_size_change (disk, bdev); + bdev->bd_invalidated =0 ;mutex_unlock (&bdev->bd_mutex);bdput (bdev);return ret;
PATCH 91/153 ocfs2: unlock super lock if lockres refresh failed
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxiao Bi <[email protected]>
commit 3278bb748d2437eb1464765f36429e5d6aa91c38 upstream.
If lockres refresh failed, the super lock will never be released which will cause some processes on other cluster nodes hung forever.
--- fs/ocfs2/dlmglue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/ocfs2/dlmglue.c +4 -1
@@ -2545,6 +2545,7 @@ int ocfs2_super_lock(struct ocfs2_super* everything is up to the caller :) */ status =ocfs2_should_refresh_lock_res (lockres);if (status <0 ) { +ocfs2_cluster_unlock (osb, lockres, level);mlog_errno (status); goto bail; }
@@ -2553,8 +2554,10 @@ int ocfs2_super_lock(struct ocfs2_superocfs2_complete_lock_res_refresh (lockres, status); -if (status <0 ) +if (status <0 ) { +ocfs2_cluster_unlock (osb, lockres, level);mlog_errno (status); + }ocfs2_track_lock_refresh (lockres); } bail:
PATCH 92/153 drivers/video/backlight/adp88?0_bl.c: fix resume
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit 5eb02c01bd1f3ef195989ab05e835e2b0711b5a9 upstream.
Clearing the NSTBY bit in the control register also automatically clears the BLEN bit. So we need to make sure to set it again during resume, otherwise the backlight will stay off.
--- drivers/video/backlight/adp8860_bl.c | 2 +- drivers/video/backlight/adp8870_bl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/adp8860_bl.c +1 -1
@@ -791,7 +791,7 @@ static int adp8860_i2c_suspend(struct i2static int adp8860_i2c_resume (struct i2c_client *client) { -adp8860_set_bits (client,ADP8860_MDCR ,NSTBY ); +adp8860_set_bits (client,ADP8860_MDCR ,NSTBY |BLEN );return 0 ; }
drivers/video/backlight/adp8870_bl.c +1 -1
@@ -965,7 +965,7 @@ static int adp8870_i2c_suspend(struct i2static int adp8870_i2c_resume (struct i2c_client *client) { -adp8870_set_bits (client,ADP8870_MDCR ,NSTBY ); +adp8870_set_bits (client,ADP8870_MDCR ,NSTBY |BLEN );return 0 ; }
PATCH 93/153 ALSA: hda - hdmi: Make jacks phantom, if theyre not detectable
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Henningsson <[email protected]>
commit 30efd8debd1ef30be342d374f01e993509f5b76b upstream.
Just as for analog codecs, a jack that isn't suitable for detection (in this case, NO_PRESENCE was set) should be a phantom Jack instead of a normal one.
Thanks to Raymond Yau for spotting.
--- sound/pci/hda/patch_hdmi.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/patch_hdmi.c +3 -0
@@ -1228,6 +1228,9 @@ static int generic_hdmi_build_jack(strucint pcmdev = spec->pcm_rec[pin_idx].device;snprintf (hdmi_str,sizeof (hdmi_str),"HDMI/DP,pcm=%d" , pcmdev); +if (!is_jack_detectable (codec, per_pin->pin_nid)) +strncat (hdmi_str," Phantom" , +sizeof (hdmi_str) -strlen (hdmi_str) -1 ); err =snd_hda_input_jack_add (codec, per_pin->pin_nid,SND_JACK_VIDEOOUT , pcmdev >0 ? hdmi_str :NULL );
Re: [ 093/153] ALSA: hda - hdmi: Make jacks phantom, if theyre not detectable
Quoted 12 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Henningsson <[email protected]>
commit
30efd8debd1ef30be342d374f01e993509f5b76bupstream.Just as for analog codecs, a jack that isn't suitable for detection (in this case,
NO_PRESENCEwas set) should be a phantom Jack instead of a normal one.
Quoted 8 lines
Thanks to Raymond Yau for spotting.
Signed-off-by David Henningsson <[email protected]>Signed-off-by Takashi Iwai <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>
David, do I need to change this further for 3.2.y?
Ben.
Quoted 23 lines
--- sound/pci/hda/patch_hdmi.c | 3 +++ 1 file changed, 3 insertions(+)sound/pci/hda/patch_hdmi.c +3
-1@@ -1228,6 +1228,9 @@ static int generic_hdmi_build_jack(strucint pcmdev = spec->pcm_rec[pin_idx].device;snprintf (hdmi_str,sizeof (hdmi_str),"HDMI/DP,pcm=%d" , pcmdev); +if (!is_jack_detectable (codec, per_pin->pin_nid)) +strncat (hdmi_str," Phantom" , +sizeof (hdmi_str) -strlen (hdmi_str) -1 ); err =snd_hda_input_jack_add (codec, per_pin->pin_nid,SND_JACK_VIDEOOUT , pcmdev >0 ? hdmi_str :NULL ); --To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 3 lines
Ben Hutchings Always try to do things in chronological order; it's less confusing that way.
Re: [ 093/153] ALSA: hda - hdmi: Make jacks phantom, if theyre not detectable
Quoted 15 lines · Ben Hutchings
Quoted 14 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Henningsson <[email protected]>
commit
30efd8debd1ef30be342d374f01e993509f5b76bupstream.Just as for analog codecs, a jack that isn't suitable for detection (in this case,
NO_PRESENCEwas set) should be a phantom Jack instead of a normal one.Thanks to Raymond Yau for spotting.
Quoted 8 lines
Quoted 6 lines
Signed-off-by David Henningsson <[email protected]>Signed-off-by Takashi Iwai <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>David, do I need to change this further for 3.2.y?
Greg and Ben,
Given some thought, the definition of is_jack_detectable has changed/improved over kernels. Therefore I think it's safer not to apply the patch at all for kernels earlier than 3.6. Let's revisit this decision if there's actually a user demand for this fix.
Quoted 27 lines
Ben.
Quoted 23 lines
--- sound/pci/hda/patch_hdmi.c | 3 +++ 1 file changed, 3 insertions(+)sound/pci/hda/patch_hdmi.c +3
-1@@ -1228,6 +1228,9 @@ static int generic_hdmi_build_jack(strucint pcmdev = spec->pcm_rec[pin_idx].device;snprintf (hdmi_str,sizeof (hdmi_str),"HDMI/DP,pcm=%d" , pcmdev); +if (!is_jack_detectable (codec, per_pin->pin_nid)) +strncat (hdmi_str," Phantom" , +sizeof (hdmi_str) -strlen (hdmi_str) -1 ); err =snd_hda_input_jack_add (codec, per_pin->pin_nid,SND_JACK_VIDEOOUT , pcmdev >0 ? hdmi_str :NULL ); --To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
David Henningsson, Canonical Ltd. https://launchpad.net/~diwic
Greg Kroah-Hartman
maintainerRe: [ 093/153] ALSA: hda - hdmi: Make jacks phantom, if theyre not detectable
Quoted 23 lines · David Henningsson
Quoted 22 lines · Ben Hutchings
Quoted 20 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Henningsson <[email protected]>
commit
30efd8debd1ef30be342d374f01e993509f5b76bupstream.Just as for analog codecs, a jack that isn't suitable for detection (in this case,
NO_PRESENCEwas set) should be a phantom Jack instead of a normal one.Thanks to Raymond Yau for spotting.
Signed-off-by David Henningsson <[email protected]>Signed-off-by Takashi Iwai <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>
Quoted 8 lines
Quoted 1 line
David, do I need to change this further for 3.2.y?
Greg and Ben,
Given some thought, the definition of
is_jack_detectablehas changed/improved over kernels. Therefore I think it's safer not to apply the patch at all for kernels earlier than 3.6. Let's revisit this decision if there's actually a user demand for this fix.
So should I revert this in the next 3.4 release, as it's now in the 3.4.35 release.
thanks,
greg k-h
Re: [ 093/153] ALSA: hda - hdmi: Make jacks phantom, if theyre not detectable
Quoted 28 lines · Greg Kroah-Hartman
Quoted 27 lines · David Henningsson
Quoted 15 lines · Ben Hutchings
Quoted 14 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Henningsson <[email protected]>
commit
30efd8debd1ef30be342d374f01e993509f5b76bupstream.Just as for analog codecs, a jack that isn't suitable for detection (in this case,
NO_PRESENCEwas set) should be a phantom Jack instead of a normal one.Thanks to Raymond Yau for spotting.
Quoted 8 lines
Quoted 6 lines
Signed-off-by David Henningsson <[email protected]>Signed-off-by Takashi Iwai <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>David, do I need to change this further for 3.2.y?
Greg and Ben,
Quoted 7 lines
Quoted 4 lines
Given some thought, the definition of
is_jack_detectablehas changed/improved over kernels. Therefore I think it's safer not to apply the patch at all for kernels earlier than 3.6. Let's revisit this decision if there's actually a user demand for this fix.So should I revert this in the next 3.4 release, as it's now in the 3.4.35 release.
That seems to be the safest option; given that we don't get people with the actual hardware to test the different options and report back which one works best.
Sorry for the late reply.
Signature · 2 lines
David Henningsson, Canonical Ltd. https://launchpad.net/~diwic
Re: [ 093/153] ALSA: hda - hdmi: Make jacks phantom, if theyre not detectable
In reply to David HenningssonQuoted 23 lines · David Henningsson
Quoted 22 lines · Ben Hutchings
Quoted 20 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Henningsson <[email protected]>
commit
30efd8debd1ef30be342d374f01e993509f5b76bupstream.Just as for analog codecs, a jack that isn't suitable for detection (in this case,
NO_PRESENCEwas set) should be a phantom Jack instead of a normal one.Thanks to Raymond Yau for spotting.
Signed-off-by David Henningsson <[email protected]>Signed-off-by Takashi Iwai <[email protected]>[bwh: Backported to 3.2: adjust context]Signed-off-by Ben Hutchings <[email protected]>
Quoted 8 lines
Quoted 1 line
David, do I need to change this further for 3.2.y?
Greg and Ben,
Given some thought, the definition of
is_jack_detectablehas changed/improved over kernels. Therefore I think it's safer not to apply the patch at all for kernels earlier than 3.6. Let's revisit this decision if there's actually a user demand for this fix.
OK, I've dropped this from the 3.2.y queue.
Ben.
Signature · 3 lines
Ben Hutchings Always try to do things in chronological order; it's less confusing that way.
PATCH 94/153 ext4: fix free clusters calculation in bigalloc filesystem
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Czerner <[email protected]>
commit 304e220f0879198b1f5309ad6f0be862b4009491 upstream.
ext4_has_free_clusters() should tell us whether there is enough free clusters to allocate, however number of free clusters in the file system is converted to blocks using EXT4_C2B() which is not only wrong use of the macro (we should have used EXT4_NUM_B2C) but it's also completely wrong concept since everything else is in cluster units.
Moreover when calculating number of root clusters we should be using macro EXT4_NUM_B2C() instead of EXT4_B2C() otherwise the result might be off by one. However r_blocks_count should always be a multiple of the cluster ratio so doing a plain bit shift should be enough here. We avoid using EXT4_B2C() because it's confusing.
As a result of the first problem number of free clusters is much bigger than it should have been and ext4_has_free_clusters() would return 1 even if there is really not enough free clusters available.
Fix this by removing the EXT4_C2B() conversion of free clusters and using bit shift when calculating number of root clusters. This bug affects number of xfstests tests covering file system ENOSPC situation handling. With this patch most of the ENOSPC problems with bigalloc file system disappear, especially the errors caused by delayed allocation not having enough space when the actual allocation is finally requested.
--- fs/ext4/balloc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/ext4/balloc.c +7 -2
@@ -420,11 +420,16 @@ static int ext4_has_free_clusters(struct free_clusters =percpu_counter_read_positive (fcc); dirty_clusters =percpu_counter_read_positive (dcc); - root_clusters =EXT4_B2C (sbi,ext4_r_blocks_count (sbi->s_es)); + +/* +* r_blocks_count should always be multiple of the cluster ratio so +* we are safe to do a plane bit shift only. +*/ + root_clusters =ext4_r_blocks_count (sbi->s_es) >> sbi->s_cluster_bits;if (free_clusters - (nclusters + root_clusters + dirty_clusters) <EXT4_FREECLUSTERS_WATERMARK ) { - free_clusters =EXT4_C2B (sbi,percpu_counter_sum_positive (fcc)); + free_clusters =percpu_counter_sum_positive (fcc); dirty_clusters =percpu_counter_sum_positive (dcc); }/* Check whether we have space after accounting for current
PATCH 95/153 fs: Fix possible use-after-free with AIO
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 54c807e71d5ac59dee56c685f2b66e27cd54c475 upstream.
Running AIO is pinning inode in memory using file reference. Once AIO is completed using aio_complete(), file reference is put and inode can be freed from memory. So we have to be sure that calling aio_complete() is the last thing we do with the inode.
--- fs/direct-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/direct-io.c +1 -1
@@ -304,9 +304,9 @@ static ssize_t dio_complete(struct dio * dio->end_io (dio->iocb, offset, transferred, dio->private, ret, is_async); }else { +inode_dio_done (dio->inode);if (is_async)aio_complete (dio->iocb, ret,0 ); -inode_dio_done (dio->inode); }return ret;
PATCH 96/153 powerpc/kexec: Disable hard IRQ before kexec
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phileas Fogg <[email protected]>
commit 8520e443aa56cc157b015205ea53e7b9fc831291 upstream.
Disable hard IRQ before kexec a new kernel image.
Not doing it can result in corrupted data in the memory segments reserved for the new kernel.
--- arch/powerpc/kernel/machine_kexec_64.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/powerpc/kernel/machine_kexec_64.c +5 -0
@@ -162,6 +162,8 @@ static int kexec_all_irq_disabled = 0;static void kexec_smp_down (void *arg) {local_irq_disable (); +hard_irq_disable (); +mb ();/* make sure our irqs are disabled before we say they are */ get_paca ()->kexec_state =KEXEC_STATE_IRQS_OFF ;while (kexec_all_irq_disabled ==0 )
@@ -244,6 +246,8 @@ static void kexec_prepare_cpus(void)wake_offline_cpus ();smp_call_function (kexec_smp_down,NULL ,/* wait */ 0 );local_irq_disable (); +hard_irq_disable (); +mb ();/* make sure IRQs are disabled before we say they are */ get_paca ()->kexec_state =KEXEC_STATE_IRQS_OFF ;
@@ -281,6 +285,7 @@ static void kexec_prepare_cpus(void)if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down (0 ,0 );local_irq_disable (); + hard_irq_disable(); }#endif /* SMP */
PATCH 97/153 mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sagi Grimberg <[email protected]>
commit 21a92735f660eaecf69a6f2e777f18463760ec32 upstream.
With an RCU based mmu_notifier implementation, any callout to mmu_notifier_invalidate_range_{start,end}() or mmu_notifier_invalidate_page() would not be allowed to call schedule() as that could potentially allow a modification to the mmu_notifier structure while it is currently being used.
Since srcu allocs 4 machine words per instance per cpu, we may end up with memory exhaustion if we use srcu per mm. So all mms share a global srcu. Note that during large mmu_notifier activity exit & unregister paths might hang for longer periods, but it is tolerable for current mmu_notifier clients.
--- include/linux/mmu_notifier.h | 1 + mm/mmu_notifier.c | 73 +++++++++++++++++++++++++++--------------- 2 files changed, 49 insertions(+), 25 deletions(-)
include/linux/mmu_notifier.h +1 -0
@@ -4,6 +4,7 @@#include <linux/list.h> #include <linux/spinlock.h> #include <linux/mm_types.h> +#include <linux/srcu.h> struct mmu_notifier ;struct mmu_notifier_ops ;
mm/mmu_notifier.c +48 -25
222 lines not on this page · raw message
PATCH 98/153 mm: mmu_notifier: make the mmu_notifier srcu static
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrea Arcangeli <[email protected]>
commit 70400303ce0c4ced3139499c676d5c79636b0c72 upstream.
The variable must be static especially given the variable name.
s/RCU/SRCU/ over a few comments.
--- mm/mmu_notifier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/mmu_notifier.c +3 -3
@@ -20,7 +20,7 @@#include <linux/slab.h> /* global SRCU for all MMs */ -struct srcu_struct srcu; +static struct srcu_struct srcu;/* * This function can't run concurrently against mmu_notifier_register
@@ -41,7 +41,7 @@ void __mmu_notifier_release(struct mm_stint id;/* -* RCU here will block mmu_notifier_unregister until +* SRCU here will block mmu_notifier_unregister until * ->release returns. */ id =srcu_read_lock (&srcu);
@@ -302,7 +302,7 @@ void mmu_notifier_unregister(struct mmu_if (!hlist_unhashed (&mn->hlist)) {/* -* RCU here will force exit_mmap to wait ->release to finish +* SRCU here will force exit_mmap to wait ->release to finish * before freeing the pages. */ int id;
PATCH 99/153 mmu_notifier_unregister NULL Pointer deref and multiple ->release() callouts
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robin Holt <[email protected]>
commit 751efd8610d3d7d67b7bdf7f62646edea7365dd7 upstream.
There is a race condition between mmu_notifier_unregister() and __mmu_notifier_release().
Assume two tasks, one calling mmu_notifier_unregister() as a result of a filp_close() ->flush() callout (task A), and the other calling mmu_notifier_release() from an mmput() (task B).
A B
t1 srcu_read_lock()
t2 if (!hlist_unhashed())
t3 srcu_read_unlock()
t4 srcu_read_lock()
t5 hlist_del_init_rcu()
t6 synchronize_srcu()
t7 srcu_read_unlock()
t8 hlist_del_rcu() <--- NULL pointer deref.
Additionally, the list traversal in __mmu_notifier_release() is not protected by the by the mmu_notifier_mm->hlist_lock which can result in callouts to the ->release() notifier from both mmu_notifier_unregister() and __mmu_notifier_release().
-stable suggestions:
The stable trees prior to 3.7.y need commits 21a92735f660 and 70400303ce0c cherry-picked in that order prior to cherry-picking this commit. The 3.7.y tree already has those two commits.
--- mm/mmu_notifier.c | 82 +++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 40 deletions(-)
mm/mmu_notifier.c +42 -40
@@ -37,49 +37,51 @@ static struct srcu_struct srcu;void __mmu_notifier_release (struct mm_struct *mm) {struct mmu_notifier *mn; -struct hlist_node *n;int id;/* -* SRCU here will block mmu_notifier_unregister until -* ->release returns. +* srcu_read_lock() here will block synchronize_srcu() in +* mmu_notifier_unregister() until all registered +* ->release() callouts this function makes have +* returned. */ id =srcu_read_lock (&srcu); -hlist_for_each_entry_rcu (mn, n, &mm->mmu_notifier_mm->list, hlist) -/* -* if ->release runs before mmu_notifier_unregister it -* must be handled as it's the only way for the driver -* to flush all existing sptes and stop the driver -* from establishing any more sptes before all the -* pages in the mm are freed. -*/ -if (mn->ops->release) - mn->ops->release (mn, mm); -srcu_read_unlock (&srcu, id); -spin_lock (&mm->mmu_notifier_mm->lock);while (unlikely (!hlist_empty (&mm->mmu_notifier_mm->list))) { mn =hlist_entry (mm->mmu_notifier_mm->list.first, struct mmu_notifier, hlist); +/* -* We arrived before mmu_notifier_unregister so -* mmu_notifier_unregister will do nothing other than -* to wait ->release to finish and -* mmu_notifier_unregister to return. +* Unlink. This will prevent mmu_notifier_unregister() +* from also making the ->release() callout. */ hlist_del_init_rcu (&mn->hlist); +spin_unlock (&mm->mmu_notifier_mm->lock); + +/* +* Clear sptes. (see 'release' description in mmu_notifier.h) +*/ +if (mn->ops->release) + mn->ops->release (mn, mm); + +spin_lock (&mm->mmu_notifier_mm->lock); }spin_unlock (&mm->mmu_notifier_mm->lock);/* -* synchronize_srcu here prevents mmu_notifier_release to -* return to exit_mmap (which would proceed freeing all pages -* in the mm) until the ->release method returns, if it was -* invoked by mmu_notifier_unregister. -* -* The mmu_notifier_mm can't go away from under us because one -* mm_count is hold by exit_mmap. +* All callouts to ->release() which we have done are complete. +* Allow synchronize_srcu() in mmu_notifier_unregister() to complete +*/ +srcu_read_unlock (&srcu, id); + +/* +* mmu_notifier_unregister() may have unlinked a notifier and may +* still be calling out to it. Additionally, other notifiers +* may have been active via vmtruncate() et. al. Block here +* to ensure that all notifier callouts for this mm have been +* completed and the sptes are really cleaned up before returning +* to exit_mmap(). */ synchronize_srcu (&srcu); }
@@ -300,31 +302,31 @@ void mmu_notifier_unregister(struct mmu_ {BUG_ON (atomic_read (&mm->mm_count) <=0 ); +spin_lock (&mm->mmu_notifier_mm->lock);if (!hlist_unhashed (&mn->hlist)) { -/* -* SRCU here will force exit_mmap to wait ->release to finish -* before freeing the pages. -*/ int id; - id =srcu_read_lock (&srcu);/* -* exit_mmap will block in mmu_notifier_release to -* guarantee ->release is called before freeing the -* pages. +* Ensure we synchronize up with __mmu_notifier_release(). */ + id =srcu_read_lock (&srcu); + +hlist_del_rcu (&mn->hlist); +spin_unlock (&mm->mmu_notifier_mm->lock); +if (mn->ops->release) mn->ops->release (mn, mm); -srcu_read_unlock (&srcu, id); -spin_lock (&mm->mmu_notifier_mm->lock); -hlist_del_rcu (&mn->hlist); +/* +* Allow __mmu_notifier_release() to complete. +*/ +srcu_read_unlock (&srcu, id); + }else spin_unlock (&mm->mmu_notifier_mm->lock); - }/* -* Wait any running method to finish, of course including -* ->release if it was run by mmu_notifier_relase instead of us. +* Wait for any running method to finish, including ->release() if it +* was run by __mmu_notifier_release() instead of us. */ synchronize_srcu (&srcu);
PATCH 100/153 mm/fadvise.c: drain all pagevecs if POSIX_FADV_DONTNEED fails to discard all pages
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mel Gorman <[email protected]>
commit 67d46b296a1ba1477c0df8ff3bc5e0167a0b0732 upstream.
Rob van der Heij reported the following (paraphrased) on private mail.
The scenario is that I want to avoid backups to fill up the page cache and purge stuff that is more likely to be used again (this is with s390x Linux on z/VM, so I don't give it as much memory that we don't care anymore). So I have something with LD_PRELOAD that intercepts the close() call (from tar, in this case) and issues a posix_fadvise() just before closing the file.
This mostly works, except for small files (less than 14 pages) that remains in page cache after the face.
Unfortunately Rob has not had a chance to test this exact patch but the test program below should be reproducing the problem he described.
The issue is the per-cpu pagevecs for LRU additions. If the pages are added by one CPU but fadvise() is called on another then the pages remain resident as the invalidate_mapping_pages() only drains the local pagevecs via its call to pagevec_release(). The user-visible effect is that a program that uses fadvise() properly is not obeyed.
A possible fix for this is to put the necessary smarts into invalidate_mapping_pages() to globally drain the LRU pagevecs if a pagevec page could not be discarded. The downside with this is that an inode cache shrink would send a global IPI and memory pressure potentially causing global IPI storms is very undesirable.
Instead, this patch adds a check during fadvise(POSIX_FADV_DONTNEED) to check if invalidate_mapping_pages() discarded all the requested pages. If a subset of pages are discarded it drains the LRU pagevecs and tries again. If the second attempt fails, it assumes it is due to the pages being mapped, locked or dirty and does not care. With this patch, an application using fadvise() correctly will be obeyed but there is a downside that a malicious application can force the kernel to send global IPIs and increase overhead.
If accepted, I would like this to be considered as a -stable candidate. It's not an urgent issue but it's a system call that is not working as advertised which is weak.
The following test program demonstrates the problem. It should never report that pages are still resident but will without this patch. It assumes that CPU 0 and 1 exist.
int main() {
int fd;
int pagesize = getpagesize();
ssize_t written = 0, expected;
char *buf;
unsigned char *vec;
int resident, i;
cpu_set_t set;
/* Prepare a buffer for writing */
expected = FILESIZE_PAGES * pagesize;
buf = malloc(expected + 1);
if (buf == NULL) {
printf("ENOMEM\n");
exit(EXIT_FAILURE);
}
buf[expected] = 0;
memset(buf, 'a', expected);
/* Prepare the mincore vec */
vec = malloc(FILESIZE_PAGES);
if (vec == NULL) {
printf("ENOMEM\n");
exit(EXIT_FAILURE);
}
/* Bind ourselves to CPU 0 */
CPU_ZERO(&set);
CPU_SET(0, &set);
if (sched_setaffinity(getpid(), sizeof(set), &set) == -1) {
perror("sched_setaffinity");
exit(EXIT_FAILURE);
}
/* open file, unlink and write buffer */
fd = open("fadvise-test-file", O_CREAT|O_EXCL|O_RDWR);
if (fd == -1) {
perror("open");
exit(EXIT_FAILURE);
}
unlink("fadvise-test-file");
while (written < expected) {
ssize_t this_write;
this_write = write(fd, buf + written, expected - written);
if (this_write == -1) {
perror("write");
exit(EXIT_FAILURE);
}
written += this_write;
}
free(buf);
/*
* Force ourselves to another CPU. If fadvise only flushes the local
* CPUs pagevecs then the fadvise will fail to discard all file pages
*/
CPU_ZERO(&set);
CPU_SET(1, &set);
if (sched_setaffinity(getpid(), sizeof(set), &set) == -1) {
perror("sched_setaffinity");
exit(EXIT_FAILURE);
}
/* sync and fadvise to discard the page cache */
fsync(fd);
if (posix_fadvise(fd, 0, expected, POSIX_FADV_DONTNEED) == -1) {
perror("posix_fadvise");
exit(EXIT_FAILURE);
}
/* map the file and use mincore to see which parts of it are resident */
buf = mmap(NULL, expected, PROT_READ, MAP_SHARED, fd, 0);
if (buf == NULL) {
perror("mmap");
exit(EXIT_FAILURE);
}
if (mincore(buf, expected, vec) == -1) {
perror("mincore");
exit(EXIT_FAILURE);
}
/* Check residency */
for (i = 0, resident = 0; i < FILESIZE_PAGES; i++) {
if (vec[i])
resident++;
}
if (resident != 0) {
printf("Nr unexpected pages resident: %d\n", resident);
exit(EXIT_FAILURE);
}
munmap(buf, expected);
close(fd);
free(vec);
exit(EXIT_SUCCESS);
}--- mm/fadvise.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
mm/fadvise.c +16 -2
@@ -17,6 +17,7 @@#include <linux/fadvise.h> #include <linux/writeback.h> #include <linux/syscalls.h> +#include <linux/swap.h> #include <asm/unistd.h>
@@ -123,9 +124,22 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, lof start_index = (offset+(PAGE_CACHE_SIZE -1 )) >>PAGE_CACHE_SHIFT ; end_index = (endbyte >>PAGE_CACHE_SHIFT ); -if (end_index >= start_index) -invalidate_mapping_pages (mapping, start_index, +if (end_index >= start_index) { +unsigned long count =invalidate_mapping_pages (mapping, + start_index, end_index); + +/* +* If fewer pages were invalidated than expected then +* it is possible that some of the pages were on +* a per-cpu pagevec for a remote CPU. Drain all +* pagevecs and try again. +*/ +if (count < (end_index - start_index +1 )) { +lru_add_drain_all (); +invalidate_mapping_pages (mapping, start_index, end_index); + } + }break ;default : ret = -EINVAL ;
PATCH 101/153 tmpfs: fix use-after-free of mempolicy object
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Thelen <[email protected]>
commit 5f00110f7273f9ff04ac69a5f85bb535a4fd0987 upstream.
The tmpfs remount logic preserves filesystem mempolicy if the mpol=M option is not specified in the remount request. A new policy can be specified if mpol=M is given.
Before this patch remounting an mpol bound tmpfs without specifying mpol= mount option in the remount request would set the filesystem's mempolicy object to a freed mempolicy object.
To reproduce the problem boot a DEBUG_PAGEALLOC kernel and run:
# mkdir /tmp/x
# mount -t tmpfs -o size=100M,mpol=interleave nodev /tmp/x
# grep /tmp/x /proc/mounts
nodev /tmp/x tmpfs rw,relatime,size=102400k,mpol=interleave:0-3 0 0# mount -o remount,size=200M nodev /tmp/x
# grep /tmp/x /proc/mounts
nodev /tmp/x tmpfs rw,relatime,size=204800k,mpol=??? 0 0
# note ? garbage in mpol=... output above # dd if=/dev/zero of=/tmp/x/f count=1
# panic herePanic:
BUG: unable to handle kernel NULL pointer dereference at (null)
IP: [< (null)>] (null)
[...]
Oops: 0010 [#1] SMP DEBUG_PAGEALLOC
Call Trace:
mpol_shared_policy_init+0xa5/0x160
shmem_get_inode+0x209/0x270
shmem_mknod+0x3e/0xf0
shmem_create+0x18/0x20
vfs_create+0xb5/0x130
do_last+0x9a1/0xea0
path_openat+0xb3/0x4d0
do_filp_open+0x42/0xa0
do_sys_open+0xfe/0x1e0
compat_sys_open+0x1b/0x20
cstar_dispatch+0x7/0x1fNon-debug kernels will not crash immediately because referencing the dangling mpol will not cause a fault. Instead the filesystem will reference a freed mempolicy object, which will cause unpredictable behavior.
The problem boils down to a dropped mpol reference below if shmem_parse_options() does not allocate a new mpol:
config = *sbinfo
shmem_parse_options(data, &config, true) mpol_put(sbinfo->mpol)
sbinfo->mpol = config.mpol /* BUG: saves unreferenced mpol */
This patch avoids the crash by not releasing the mempolicy if shmem_parse_options() doesn't create a new mpol.
How far back does this issue go? I see it in both 2.6.36 and 3.3. I did not look back further.
--- mm/shmem.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
mm/shmem.c +8 -2
@@ -2121,6 +2121,7 @@ static int shmem_remount_fs(struct superunsigned long inodes;int error = -EINVAL ; + config.mpol =NULL ;if (shmem_parse_options (data, &config, true))return error;
@@ -2145,8 +2146,13 @@ static int shmem_remount_fs(struct super sbinfo->max_inodes = config.max_inodes; sbinfo->free_inodes = config.max_inodes - inodes; -mpol_put (sbinfo->mpol); - sbinfo->mpol = config.mpol;/* transfers initial ref */ +/* +* Preserve previous mempolicy unless mpol remount option was specified. +*/ +if (config.mpol) { +mpol_put (sbinfo->mpol); + sbinfo->mpol = config.mpol;/* transfers initial ref */ + } out:spin_unlock (&sbinfo->stat_lock);return error;
PATCH 102/153 mmc: sdhci-esdhc-imx: fix host version read
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shawn Guo <[email protected]>
commit ef4d0888bb7e1b963880f086575081c3d39cad2d upstream.
When commit 95a2482 (mmc: sdhci-esdhc-imx: add basic imx6q usdhc support) works around host version issue on imx6q, it gets the register address fixup "reg ^= 2" lost for imx25/35/51/53 esdhc. Thus, the controller version on these SoCs is wrongly identified as v1 while it's actually v2.
Add the address fixup back and take a different approach to correct imx6q host version, so that the host version read gets back to work for all SoCs.
--- drivers/mmc/host/sdhci-esdhc-imx.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +11 -8
@@ -232,15 +232,18 @@ static void esdhc_writel_le(struct sdhcistatic u16 esdhc_readw_le (struct sdhci_host *host,int reg) { +struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host); +struct pltfm_imx_data *imx_data = pltfm_host->priv; +if (unlikely (reg ==SDHCI_HOST_VERSION )) { -u16 val =readw (host->ioaddr + (reg ^2 )); -/* -* uSDHC supports SDHCI v3.0, but it's encoded as value -* 0x3 in host controller version register, which violates -* SDHCI_SPEC_300 definition. Work it around here. -*/ -if ((val &SDHCI_SPEC_VER_MASK ) ==3 ) -return --val; + reg ^=2 ; +if (is_imx6q_usdhc (imx_data)) { +/* +* The usdhc register returns a wrong host version. +* Correct it here. +*/ +return SDHCI_SPEC_300 ; + } }return readw (host->ioaddr + reg);
PATCH 103/153 doc, xen: Mention earlyprintk=xen in the documentation.
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Rzeszutek Wilk <[email protected]>
commit 2482a92e7d17187301d7313cfe5021b13393a0b4 upstream.
The earlyprintk for Xen PV guests utilizes a simple hypercall (console_io) to provide output to Xen emergency console.
Note that the Xen hypervisor should be booted with 'loglevel=all' to output said information.
--- Documentation/kernel-parameters.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/kernel-parameters.txt +3 -0
@@ -703,6 +703,7 @@ bytes respectively. Such letter suffixes earlyprintk= [X86,SH,BLACKFIN] earlyprintk=vga + earlyprintk=xen earlyprintk=serial[,ttySn[,baudrate]] earlyprintk=ttySn[,baudrate] earlyprintk=dbgp[debugController#]
@@ -720,6 +721,8 @@ bytes respectively. Such letter suffixes The VGA output is eventually overwritten by the real console. + The xen output can only be used by Xen PV guests. + ekgdboc= [X86,KGDB] Allow early kernel console debugging ekgdboc=kbd
PATCH 104/153 doc, kernel-parameters: Document console=hvc<n>
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Rzeszutek Wilk <[email protected]>
commit a2fd6419174470f5ae6383f5037d0ee21ed9833f upstream.
Both the PowerPC hypervisor and Xen hypervisor can utilize the hvc driver.
--- Documentation/kernel-parameters.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/kernel-parameters.txt +2 -0
@@ -552,6 +552,8 @@ bytes respectively. Such letter suffixes UART at the specified I/O port or MMIO address, switching to the matching ttyS device later. The options are the same as for ttyS, above. + hvc<n> Use the hypervisor console device <n>. This is for + both Xen and PowerPC hypervisors. If the device connected to the port is not a TTY but a braille device, prepend "brl," before the device type, for instance
PATCH 105/153 ocfs2: fix possible use-after-free with AIO
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 9b171e0c74ca0549d0610990a862dd895870f04a upstream.
Running AIO is pinning inode in memory using file reference. Once AIO is completed using aio_complete(), file reference is put and inode can be freed from memory. So we have to be sure that calling aio_complete() is the last thing we do with the inode.
--- fs/ocfs2/aops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/aops.c +1 -1
@@ -593,9 +593,9 @@ static void ocfs2_dio_end_io(struct kioc level =ocfs2_iocb_rw_locked_level (iocb);ocfs2_rw_unlock (inode, level); +inode_dio_done (inode);if (is_async)aio_complete (iocb, ret,0 ); -inode_dio_done (inode); }/*
PATCH 106/153 x86: Make sure we can boot in the case the BDA contains pure garbage
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: "H. Peter Anvin" <[email protected]>
commit 7c10093692ed2e6f318387d96b829320aa0ca64c upstream.
On non-BIOS platforms it is possible that the BIOS data area contains garbage instead of being zeroed or something equivalent (firmware
people: we are talking of 1.5K here, so please do the sane thing.)
We need on the order of 20-30K of low memory in order to boot, which may grow up to < 64K in the future. We probably want to avoid the lowest of the low memory. At the same time, it seems extremely unlikely that a legitimate EBDA would ever reach down to the 128K (which would require it to be over half a megabyte in size.) Thus, pick 128K as the cutoff for "this is insane, ignore." We may still end up reserving a bunch of extra memory on the low megabyte, but that is not really a major issue these days. In the worst case we lose 512K of RAM.
This code really should be merged with trim_bios_range() in arch/x86/kernel/setup.c, but that is a bigger patch for a later merge window.
--- arch/x86/kernel/head.c | 53 +++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 19 deletions(-)
arch/x86/kernel/head.c +36 -21
@@ -5,8 +5,6 @@#include <asm/setup.h> #include <asm/bios_ebda.h> -#define BIOS_LOWMEM_KILOBYTES 0x413 -/* * The BIOS places the EBDA/XBDA at the top of conventional * memory, and usually decreases the reported amount of
@@ -16,17 +14,30 @@* chipset: reserve a page before VGA to prevent PCI prefetch * into it (errata #56). Usually the page is reserved anyways, * unless you have no PS/2 mouse plugged in. +* +* This functions is deliberately very conservative. Losing +* memory in the bottom megabyte is rarely a problem, as long +* as we have enough memory to install the trampoline. Using +* memory that is in use by the BIOS or by some DMA device +* the BIOS didn't shut down *is* a big problem. */ + +#define BIOS_LOWMEM_KILOBYTES 0x413 +#define LOWMEM_CAP 0x9f000U/* Absolute maximum */ +#define INSANE_CUTOFF 0x20000U/* Less than this = insane */ +void __init reserve_ebda_region (void ) {unsigned int lowmem, ebda_addr; -/* To determine the position of the EBDA and the */ -/* end of conventional memory, we need to look at */ -/* the BIOS data area. In a paravirtual environment */ -/* that area is absent. We'll just have to assume */ -/* that the paravirt case can handle memory setup */ -/* correctly, without our help. */ +/* +* To determine the position of the EBDA and the +* end of conventional memory, we need to look at +* the BIOS data area. In a paravirtual environment +* that area is absent. We'll just have to assume +* that the paravirt case can handle memory setup +* correctly, without our help. +*/ if (paravirt_enabled ())return ;
@@ -37,19 +48,23 @@ void __init reserve_ebda_region(void)/* start of EBDA area */ ebda_addr =get_bios_ebda (); -/* Fixup: bios puts an EBDA in the top 64K segment */ -/* of conventional memory, but does not adjust lowmem. */ -if ((lowmem - ebda_addr) <=0x10000 ) - lowmem = ebda_addr; - -/* Fixup: bios does not report an EBDA at all. */ -/* Some old Dells seem to need 4k anyhow (bugzilla 2990) */ -if ((ebda_addr ==0 ) && (lowmem >=0x9f000 )) - lowmem =0x9f000 ; - -/* Paranoia: should never happen, but... */ -if ((lowmem ==0 ) || (lowmem >=0x100000 )) - lowmem =0x9f000 ; +/* +* Note: some old Dells seem to need 4k EBDA without +* reporting so, so just consider the memory above 0x9f000 +* to be off limits (bugzilla 2990). +*/ + +/* If the EBDA address is below 128K, assume it is bogus */ +if (ebda_addr <INSANE_CUTOFF ) + ebda_addr =LOWMEM_CAP ; + +/* If lowmem is less than 128K, assume it is bogus */ +if (lowmem <INSANE_CUTOFF ) + lowmem =LOWMEM_CAP ; + +/* Use the lower of the lowmem and EBDA markers as the cutoff */ + lowmem =min (lowmem, ebda_addr); + lowmem =min (lowmem,LOWMEM_CAP );/* Absolute cap */ /* reserve all memory between lowmem and the 1MB mark */ memblock_x86_reserve_range (lowmem,0x100000 ,"* BIOS reserved" );
PATCH 107/153 ocfs2: fix ocfs2_init_security_and_acl() to initialize acl correctly
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Liu <[email protected]>
commit 32918dd9f19e5960af4cdfa41190bb843fb2247b upstream.
We need to re-initialize the security for a new reflinked inode with its parent dirs if it isn't specified to be preserved for ocfs2_reflink(). However, the code logic is broken at ocfs2_init_security_and_acl() although ocfs2_init_security_get() succeed. As a result, ocfs2_acl_init() does not involked and therefore the default ACL of parent dir was missing on the new inode.
Note this was introduced by 9d8f13ba3 ("security: new security_inode_init_security API adds function callback")
To reproduce:
set default ACL for the parent dir(ocfs2 in this case):
$ setfacl -m default:user:jeff:rwx ../ocfs2/
$ getfacl ../ocfs2/
# file: ../ocfs2/
# owner: jeff
# group: jeff
user::rwx
group::r-x
other::r-x
default:user::rwx
default:user:jeff:rwx
default:group::r-x
default:mask::rwx
default:other::r-x
$ touch a
$ getfacl a
# file: a
# owner: jeff
# group: jeff
user::rw-
group::rw-
other::r--
Before patching, create reflink file b from a, the user default ACL entry(user:jeff:rwx)was missing:
$ ./ocfs2_reflink a b
$ getfacl b
# file: b
# owner: jeff
# group: jeff
user::rw-
group::rw-
other::r--In this case, the end user can also observed an error message at syslog:
(ocfs2_reflink,3229,2):ocfs2_init_security_and_acl:7193 ERROR: status = 0
After applying this patch, create reflink file c from a:
$ ./ocfs2_reflink a c
$ getfacl c
# file: c
# owner: jeff
# group: jeff
user::rw-
user:jeff:rwx #effective:rw-
group::r-x #effective:r--
mask::rw-
other::r--Test program:
/* Usage: reflink <source> <dest> */
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/ioctl.h>
static int
reflink_file(char const *src_name, char const *dst_name,
bool preserve_attrs)
{
int fd;#ifndef REFLINK_ATTR_NONE
# define REFLINK_ATTR_NONE 0
#endif
#ifndef REFLINK_ATTR_PRESERVE
# define REFLINK_ATTR_PRESERVE 1
#endif
#ifndef OCFS2_IOC_REFLINK
struct reflink_arguments {
uint64_t old_path;
uint64_t new_path;
uint64_t preserve;
};# define OCFS2_IOC_REFLINK _IOW ('o', 4, struct reflink_arguments)
#endif
struct reflink_arguments args = {
.old_path = (unsigned long) src_name,
.new_path = (unsigned long) dst_name,
.preserve = preserve_attrs ? REFLINK_ATTR_PRESERVE :
REFLINK_ATTR_NONE,
};
fd = open(src_name, O_RDONLY);
if (fd < 0) {
fprintf(stderr, "Failed to open %s: %s\n",
src_name, strerror(errno));
return -1;
}
if (ioctl(fd, OCFS2_IOC_REFLINK, &args) < 0) {
fprintf(stderr, "Failed to reflink %s to %s: %s\n",
src_name, dst_name, strerror(errno));
return -1;
}
}intmain(int argc, char *argv[])
{
if (argc != 3) {
fprintf(stdout, "Usage: %s source dest\n", argv[0]);
return 1;
}
return reflink_file(argv[1], argv[2], 0);
}--- fs/ocfs2/xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/xattr.c +1 -1
@@ -7189,7 +7189,7 @@ int ocfs2_init_security_and_acl(struct istruct buffer_head *dir_bh =NULL ; ret =ocfs2_init_security_get (inode, dir, qstr,NULL ); -if (!ret) { +if (ret) {mlog_errno (ret); goto leave; }
PATCH 108/153 ocfs2: ac->ac_allow_chain_relink=0 wont disable group relink
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Xiaowei.Hu" <[email protected]>
commit 309a85b6861fedbb48a22d45e0e079d1be993b3a upstream.
ocfs2_block_group_alloc_discontig() disables chain relink by setting ac->ac_allow_chain_relink = 0 because it grabs clusters from multiple cluster groups.
It doesn't keep the credits for all chain relink,but ocfs2_claim_suballoc_bits overrides this in this call trace:
ocfs2_block_group_claim_bits()->ocfs2_claim_clusters()-> __ocfs2_claim_clusters()->ocfs2_claim_suballoc_bits() ocfs2_claim_suballoc_bits set ac->ac_allow_chain_relink = 1; then call ocfs2_search_chain() one time and disable it again, and then we run out of credits.
Fix is to allow relink by default and disable it in ocfs2_block_group_alloc_discontig.
Without this patch, End-users will run into a crash due to run out of credits, backtrace like this:
RIP: 0010:[<ffffffffa0808b14>] [<ffffffffa0808b14>]
jbd2_journal_dirty_metadata+0x164/0x170 [jbd2]
RSP: 0018:ffff8801b919b5b8 EFLAGS: 00010246
RAX: 0000000000000000 RBX: ffff88022139ddc0 RCX: ffff880159f652d0
RDX: ffff880178aa3000 RSI: ffff880159f652d0 RDI: ffff880087f09bf8
RBP: ffff8801b919b5e8 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000001e00 R11: 00000000000150b0 R12: ffff880159f652d0
R13: ffff8801a0cae908 R14: ffff880087f09bf8 R15: ffff88018d177800
FS: 00007fc9b0b6b6e0(0000) GS:ffff88022fd40000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 000000000040819c CR3: 0000000184017000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process dd (pid: 9945, threadinfo ffff8801b919a000, task ffff880149a264c0)
Call Trace:
ocfs2_journal_dirty+0x2f/0x70 [ocfs2]
ocfs2_relink_block_group+0x111/0x480 [ocfs2]
ocfs2_search_chain+0x455/0x9a0 [ocfs2]
...--- fs/ocfs2/suballoc.c | 7 +++---- fs/ocfs2/suballoc.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-)
fs/ocfs2/suballoc.c +3 -4
@@ -642,7 +642,7 @@ ocfs2_block_group_alloc_discontig(handle* cluster groups will be staying in cache for the duration of * this operation. */ - ac->ac_allow_chain_relink =0 ; + ac->ac_disable_chain_relink =1 ;/* Claim the first region */ status = ocfs2_block_group_claim_bits(osb, handle, ac, min_bits,
@@ -1823,7 +1823,7 @@ static int ocfs2_search_chain(struct ocf* Do this *after* figuring out how many bits we're taking out * of our target group. */ -if (ac->ac_allow_chain_relink && +if (!ac->ac_disable_chain_relink && (prev_group_bh) && (ocfs2_block_group_reasonably_empty (bg, res->sr_bits))) { status = ocfs2_relink_block_group(handle, alloc_inode,
@@ -1928,7 +1928,6 @@ static int ocfs2_claim_suballoc_bits(str victim =ocfs2_find_victim_chain (cl); ac->ac_chain = victim; - ac->ac_allow_chain_relink =1 ; status =ocfs2_search_chain (ac, handle, bits_wanted, min_bits, res, &bits_left);
@@ -1947,7 +1946,7 @@ static int ocfs2_claim_suballoc_bits(str* searching each chain in order. Don't allow chain relinking * because we only calculate enough journal credits for one * relink per alloc. */ - ac->ac_allow_chain_relink =0 ; + ac->ac_disable_chain_relink =1 ;for (i =0 ; i <le16_to_cpu (cl->cl_next_free_rec); i ++) {if (i == victim)continue ;
fs/ocfs2/suballoc.h +1 -1
@@ -49,7 +49,7 @@ struct ocfs2_alloc_context {/* these are used by the chain search */ u16 ac_chain; -int ac_allow_chain_relink; +int ac_disable_chain_relink;group_search_t *ac_group_search;u64 ac_last_group;
PATCH 109/153 block: fix ext_devt_idr handling
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Henzl <[email protected]>
commit 7b74e912785a11572da43292786ed07ada7e3e0c upstream.
While adding and removing a lot of disks disks and partitions this sometimes shows up:
WARNING: at fs/sysfs/dir.c:512 sysfs_add_one+0xc9/0x130() (Not tainted)
Hardware name:
sysfs: cannot create duplicate filename '/dev/block/259:751'
Modules linked in: raid1 autofs4 bnx2fc cnic uio fcoe libfcoe libfc 8021q scsi_transport_fc scsi_tgt garp stp llc sunrpc cpufreq_ondemand powernow_k8 freq_table mperf ipv6 dm_mirror dm_region_hash dm_log power_meter microcode dcdbas serio_raw amd64_edac_mod edac_core edac_mce_amd i2c_piix4 i2c_core k10temp bnx2 sg ixgbe dca mdio ext4 mbcache jbd2 dm_round_robin sr_mod cdrom sd_mod crc_t10dif ata_generic pata_acpi pata_atiixp ahci mptsas mptscsih mptbase scsi_transport_sas dm_multipath dm_mod [last unloaded: scsi_wait_scan]
Pid: 44103, comm: async/16 Not tainted 2.6.32-195.el6.x86_64 #1
Call Trace:
warn_slowpath_common+0x87/0xc0
warn_slowpath_fmt+0x46/0x50
sysfs_add_one+0xc9/0x130
sysfs_do_create_link+0x12b/0x170
sysfs_create_link+0x13/0x20
device_add+0x317/0x650
idr_get_new+0x13/0x50
add_partition+0x21c/0x390
rescan_partitions+0x32b/0x470
sd_open+0x81/0x1f0 [sd_mod]
__blkdev_get+0x1b6/0x3c0
blkdev_get+0x10/0x20
register_disk+0x155/0x170
add_disk+0xa6/0x160
sd_probe_async+0x13b/0x210 [sd_mod]
add_wait_queue+0x46/0x60
async_thread+0x102/0x250
default_wake_function+0x0/0x20
async_thread+0x0/0x250
kthread+0x96/0xa0
child_rip+0xa/0x20
kthread+0x0/0xa0
child_rip+0x0/0x20This most likely happens because dev_t is freed while the number is still used and idr_get_new() is not protected on every use. The fix adds a mutex where it wasn't before and moves the dev_t free function so it is called after device del.
--- block/genhd.c | 6 +++++- block/partition-generic.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-)
block/genhd.c +5 -1
@@ -421,14 +421,18 @@ int blk_alloc_devt(struct hd_struct *pardo {if (!idr_pre_get (&ext_devt_idr,GFP_KERNEL ))return -ENOMEM ; +mutex_lock (&ext_devt_mutex); rc =idr_get_new (&ext_devt_idr, part, &idx); +mutex_unlock (&ext_devt_mutex); }while (rc == -EAGAIN );if (rc)return rc;if (idx >MAX_EXT_DEVT ) { +mutex_lock (&ext_devt_mutex);idr_remove (&ext_devt_idr, idx); +mutex_unlock (&ext_devt_mutex);return -EBUSY ; }
@@ -645,7 +649,6 @@ void del_gendisk(struct gendisk *disk)disk_part_iter_exit (&piter);invalidate_partition (disk,0 ); -blk_free_devt (disk_to_dev (disk)->devt);set_capacity (disk,0 ); disk->flags &= ~GENHD_FL_UP ;
@@ -663,6 +666,7 @@ void del_gendisk(struct gendisk *disk)if (!sysfs_deprecated)sysfs_remove_link (block_depr,dev_name (disk_to_dev (disk)));device_del (disk_to_dev (disk)); +blk_free_devt (disk_to_dev (disk)->devt); }EXPORT_SYMBOL (del_gendisk);
fs/partitions/check.c +1 -1
@@ -399,11 +399,11 @@ void delete_partition(struct gendisk *diif (!part)return ; -blk_free_devt (part_devt (part));rcu_assign_pointer (ptbl->part[partno],NULL );rcu_assign_pointer (ptbl->last_lookup,NULL );kobject_put (part->holder_dir);device_del (part_to_dev (part)); +blk_free_devt (part_devt (part));hd_struct_put (part); }
PATCH 110/153 idr: fix a subtle bug in idr_get_next()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 6cdae7416a1c45c2ce105a78187d9b7e8feb9e24 upstream.
The iteration logic of idr_get_next() is borrowed mostly verbatim from idr_for_each(). It walks down the tree looking for the slot matching the current ID. If the matching slot is not found, the ID is incremented by the distance of single slot at the given level and repeats.
The implementation assumes that during the whole iteration id is aligned to the layer boundaries of the level closest to the leaf, which is true for all iterations starting from zero or an existing element and thus is fine for idr_for_each().
However, idr_get_next() may be given any point and if the starting id hits in the middle of a non-existent layer, increment to the next layer will end up skipping the same offset into it. For example, an IDR with IDs filled between [64, 127] would look like the following.
[ 0 64 ... ]
/----/ |
| |
NULL [ 64 ... 127 ]If idr_get_next() is called with 63 as the starting point, it will try to follow down the pointer from 0. As it is NULL, it will then try to proceed to the next slot in the same level by adding the slot distance at that level which is 64 - making the next try 127. It goes around the loop and finds and returns 127 skipping [64, 126].
Note that this bug also triggers in idr_for_each_entry() loop which deletes during iteration as deletions can make layers go away leaving the iteration with unaligned ID into missing layers.
Fix it by ensuring proceeding to the next slot doesn't carry over the unaligned offset - ie. use round_up(id + 1, slot_distance) instead of id += slot_distance.
--- lib/idr.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
lib/idr.c +8 -1
@@ -623,7 +623,14 @@ void *idr_get_next(struct idr *idp, intreturn p; } - id +=1 << n; +/* +* Proceed to the next layer at the current level. Unlike +* idr_for_each(), @id isn't guaranteed to be aligned to +* layer boundary at this point and adding 1 << n may +* incorrectly skip IDs. Make sure we jump to the +* beginning of the next layer using round_up(). +*/ + id =round_up (id +1 ,1 << n);while (n <fls (id)) { n +=IDR_BITS ; p = *--paa;
PATCH 111/153 block: fix synchronization and limit check in blk_alloc_devt()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit ce23bba842aee98092225d9576dba47c82352521 upstream.
idr allocation in blk_alloc_devt() wasn't synchronized against lookup and removal, and its limit check was off by one - 1 << MINORBITS is the number of minors allowed, not the maximum allowed minor.
Add locking and rename MAX_EXT_DEVT to NR_EXT_DEVT and fix limit checking.
--- block/genhd.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
block/genhd.c +5 -8
@@ -26,7 +26,7 @@ static DEFINE_MUTEX(block_class_lock);struct kobject *block_depr;/* for extended dynamic devt allocation, currently only one major is used */ -#define MAX_EXT_DEVT (1 << MINORBITS) +#define NR_EXT_DEVT (1 << MINORBITS)/* For extended devt allocation. ext_devt_mutex prevents look up * results from going away underneath its user.
@@ -423,19 +423,16 @@ int blk_alloc_devt(struct hd_struct *parreturn -ENOMEM ;mutex_lock (&ext_devt_mutex); rc =idr_get_new (&ext_devt_idr, part, &idx); +if (!rc && idx >=NR_EXT_DEVT ) { +idr_remove (&ext_devt_idr, idx); + rc = -EBUSY ; + }mutex_unlock (&ext_devt_mutex); }while (rc == -EAGAIN );if (rc)return rc; -if (idx >MAX_EXT_DEVT ) { -mutex_lock (&ext_devt_mutex); -idr_remove (&ext_devt_idr, idx); -mutex_unlock (&ext_devt_mutex); -return -EBUSY ; - } - *devt =MKDEV (BLOCK_EXT_MAJOR ,blk_mangle_minor (idx));return 0 ; }
PATCH 112/153 firewire: add minor number range check to fw_device_init()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 3bec60d511179853138836ae6e1b61fe34d9235f upstream.
fw_device_init() didn't check whether the allocated minor number isn't too large. Fail if it goes overflows MINORBITS.
--- drivers/firewire/core-device.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/firewire/core-device.c +4 -0
@@ -995,6 +995,10 @@ static void fw_device_init(struct work_s ret =idr_pre_get (&fw_device_idr,GFP_KERNEL ) ?idr_get_new (&fw_device_idr, device, &minor) : -ENOMEM ; +if (minor >=1 <<MINORBITS ) { +idr_remove (&fw_device_idr, minor); + minor = -ENOSPC ; + }up_write (&fw_device_rwsem);if (ret <0 )
PATCH 113/153 idr: make idr_get_next() good for rcu_read_lock()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hugh Dickins <[email protected]>
commit 9f7de8275b46d9d11b1505adbfe6c2bb48df4741 upstream.
Make one small adjustment to idr_get_next(): take the height from the top layer (stable under RCU) instead of from the root (unprotected by RCU), as idr_find() does: so that it can be used with RCU locking. Copied comment on RCU locking from idr_find().
--- lib/idr.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
lib/idr.c +5 -3
@@ -595,8 +595,10 @@ EXPORT_SYMBOL(idr_for_each);* Returns pointer to registered object with id, which is next number to * given id. After being looked up, *@nextidp will be updated for the next * iteration. +* +* This function can be called under rcu_read_lock(), given that the leaf +* pointers lifetimes are correctly managed. */ -void *idr_get_next (struct idr *idp,int *nextidp) {struct idr_layer *p, *pa[MAX_LEVEL ];
@@ -605,11 +607,11 @@ void *idr_get_next(struct idr *idp, intint n, max;/* find first ent */ - n = idp->layers *IDR_BITS ; - max =1 << n; p =rcu_dereference_raw (idp->top);if (!p)return NULL ; + n = (p->layer +1 ) *IDR_BITS ; + max =1 << n;while (id < max) {while (n >0 && p) {
PATCH 114/153 idr: fix top layer handling
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 326cf0f0f308933c10236280a322031f0097205d upstream.
Most functions in idr fail to deal with the high bits when the idr tree grows to the maximum height.
* idr_get_empty_slot() stops growing idr tree once the depth reaches MAX_IDR_LEVEL - 1, which is one depth shallower than necessary to cover the whole range. The function doesn't even notice that it didn't grow the tree enough and ends up allocating the wrong ID given sufficiently high @starting_id.
For example, on 64 bit, if the starting id is 0x7fffff01, idr_get_empty_slot() will grow the tree 5 layer deep, which only covers the 30 bits and then proceed to allocate as if the bit 30 wasn't specified. It ends up allocating 0x3fffff01 without the bit 30 but still returns 0x7fffff01.
* __idr_remove_all() will not remove anything if the tree is fully grown.
* idr_find() can't find anything if the tree is fully grown.
* idr_for_each() and idr_get_next() can't iterate anything if the tree is fully grown.
Fix it by introducing idr_max() which returns the maximum possible ID given the depth of tree and replacing the id limit checks in all affected places.
As the idr_layer pointer array pa[] needs to be 1 larger than the maximum depth, enlarge pa[] arrays by one.
While this plugs the discovered issues, the whole code base is horrible and in desparate need of rewrite. It's fragile like hell,
[bwh: Backported to 3.2:
- Adjust context
- s/MAX_IDR_LEVEL/MAX_LEVEL/; s/MAX_IDR_SHIFT/MAX_ID_SHIFT/
- Drop change to idr_alloc()]
--- lib/idr.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-)
lib/idr.c +22 -14
@@ -39,6 +39,14 @@static struct kmem_cache *idr_layer_cache;static DEFINE_SPINLOCK (simple_ida_lock); +/* the maximum ID which can be allocated given idr->layers */ +static int idr_max (int layers) +{ +int bits =min_t (int, layers *IDR_BITS ,MAX_ID_SHIFT ); + +return (1 << bits) -1 ; +} +static struct idr_layer *get_from_free_list (struct idr *idp) {struct idr_layer *p;
@@ -223,7 +231,7 @@ build_up:* Add a new layer to the top of the tree if the requested * id is larger than the currently allocated space. */ -while ((layers < (MAX_LEVEL -1 )) && (id >= (1 << (layers*IDR_BITS )))) { +while (id >idr_max (layers)) { layers++;if (!p->count) {/* special case: if the tree is currently empty,
@@ -265,7 +273,7 @@ build_up:static int idr_get_new_above_int (struct idr *idp,void *ptr,int starting_id) { -struct idr_layer *pa[MAX_LEVEL ]; +struct idr_layer *pa[MAX_LEVEL +1 ];int id; id =idr_get_empty_slot (idp, starting_id, pa);
@@ -357,7 +365,7 @@ static void idr_remove_warning(int id)static void sub_remove (struct idr *idp,int shift,int id) {struct idr_layer *p = idp->top; -struct idr_layer **pa[MAX_LEVEL ]; +struct idr_layer **pa[MAX_LEVEL +1 ];struct idr_layer ***paa = &pa[0 ];struct idr_layer *to_free;int n;
@@ -451,16 +459,16 @@ void idr_remove_all(struct idr *idp)int n, id, max;int bt_mask;struct idr_layer *p; -struct idr_layer *pa[MAX_LEVEL ]; +struct idr_layer *pa[MAX_LEVEL +1 ];struct idr_layer **paa = &pa[0 ]; n = idp->layers *IDR_BITS ; p = idp->top;rcu_assign_pointer (idp->top,NULL ); - max =1 << n; + max =idr_max (idp->layers); id =0 ; -while (id < max) { +while (id >=0 && id <= max) {while (n >IDR_BITS && p) { n -=IDR_BITS ; *paa++ = p;
@@ -519,7 +527,7 @@ void *idr_find(struct idr *idp, int id)/* Mask off upper bits we don't use for the search. */ id &=MAX_ID_MASK ; -if (id >= (1 << n)) +if (id >idr_max (p->layer +1 ))return NULL ;BUG_ON (n ==0 );
@@ -555,15 +563,15 @@ int idr_for_each(struct idr *idp, {int n, id, max, error =0 ;struct idr_layer *p; -struct idr_layer *pa[MAX_LEVEL ]; +struct idr_layer *pa[MAX_LEVEL +1 ];struct idr_layer **paa = &pa[0 ]; n = idp->layers *IDR_BITS ; p =rcu_dereference_raw (idp->top); - max =1 << n; + max =idr_max (idp->layers); id =0 ; -while (id < max) { +while (id >=0 && id <= max) {while (n >0 && p) { n -=IDR_BITS ; *paa++ = p;
@@ -601,7 +609,7 @@ EXPORT_SYMBOL(idr_for_each);*/ void *idr_get_next (struct idr *idp,int *nextidp) { -struct idr_layer *p, *pa[MAX_LEVEL ]; +struct idr_layer *p, *pa[MAX_LEVEL +1 ];struct idr_layer **paa = &pa[0 ];int id = *nextidp;int n, max;
@@ -611,9 +619,9 @@ void *idr_get_next(struct idr *idp, intif (!p)return NULL ; n = (p->layer +1 ) *IDR_BITS ; - max =1 << n; + max =idr_max (p->layer +1 ); -while (id < max) { +while (id >=0 && id <= max) {while (n >0 && p) { n -=IDR_BITS ; *paa++ = p;
@@ -787,7 +795,7 @@ EXPORT_SYMBOL(ida_pre_get);*/ int ida_get_new_above (struct ida *ida,int starting_id,int *p_id) { -struct idr_layer *pa[MAX_LEVEL ]; +struct idr_layer *pa[MAX_LEVEL +1 ];struct ida_bitmap *bitmap;unsigned long flags;int idr_id = starting_id /IDA_BITMAP_BITS ;
Re: [ 114/153] idr: fix top layer handling
Quoted 180 lines · Ben Hutchings
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit
326cf0f0f308933c10236280a322031f0097205dupstream.Most functions in idr fail to deal with the high bits when the idr tree grows to the maximum height.
*
idr_get_empty_slot()stops growing idr tree once the depth reachesMAX_IDR_LEVEL- 1, which is one depth shallower than necessary to cover the whole range. The function doesn't even notice that it didn't grow the tree enough and ends up allocating the wrong ID given sufficiently high @starting_id.For example, on 64 bit, if the starting id is
0x7fffff01,idr_get_empty_slot()will grow the tree 5 layer deep, which only covers the 30 bits and then proceed to allocate as if the bit 30 wasn't specified. It ends up allocating0x3fffff01without the bit 30 but still returns0x7fffff01.*
__idr_remove_all()will not remove anything if the tree is fully grown.*
idr_find()can't find anything if the tree is fully grown.*
idr_for_each()andidr_get_next()can't iterate anything if the tree is fully grown.Fix it by introducing
idr_max()which returns the maximum possible ID given the depth of tree and replacing the id limit checks in all affected places.As the
idr_layerpointer array pa[] needs to be 1 larger than the maximum depth, enlarge pa[] arrays by one.While this plugs the discovered issues, the whole code base is horrible and in desparate need of rewrite. It's fragile like hell,
Signed-off-by Tejun Heo <[email protected]>Cc Rusty Russell <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>[bwh: Backported to 3.2:
- Adjust context
- s/MAX_IDR_LEVEL/MAX_LEVEL/; s/MAX_IDR_SHIFT/MAX_ID_SHIFT/
- Drop change toidr_alloc()]Signed-off-by Ben Hutchings <[email protected]>--- lib/idr.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-)lib/idr.c +22
-15@@ -39,6 +39,14 @@static struct kmem_cache *idr_layer_cache;static DEFINE_SPINLOCK (simple_ida_lock); +/* the maximum ID which can be allocated given idr->layers */ +static int idr_max (int layers) +{ +int bits =min_t (int, layers *IDR_BITS ,MAX_ID_SHIFT ); + +return (1 << bits) -1 ; +} +static struct idr_layer *get_from_free_list (struct idr *idp) {struct idr_layer *p;@@ -223,7 +231,7 @@ build_up:* Add a new layer to the top of the tree if the requested * id is larger than the currently allocated space. */ -while ((layers < (MAX_LEVEL -1 )) && (id >= (1 << (layers*IDR_BITS )))) { +while (id >idr_max (layers)) { layers++;if (!p->count) {/* special case: if the tree is currently empty, @@ -265,7 +273,7 @@ build_up:static int idr_get_new_above_int (struct idr *idp,void *ptr,int starting_id) { -struct idr_layer *pa[MAX_LEVEL ]; +struct idr_layer *pa[MAX_LEVEL +1 ];int id; id =idr_get_empty_slot (idp, starting_id, pa);@@ -357,7 +365,7 @@ static void idr_remove_warning(int id)static void sub_remove (struct idr *idp,int shift,int id) {struct idr_layer *p = idp->top; -struct idr_layer **pa[MAX_LEVEL ]; +struct idr_layer **pa[MAX_LEVEL +1 ];struct idr_layer ***paa = &pa[0 ];struct idr_layer *to_free;int n;@@ -451,16 +459,16 @@ void idr_remove_all(struct idr *idp)int n, id, max;int bt_mask;struct idr_layer *p; -struct idr_layer *pa[MAX_LEVEL ]; +struct idr_layer *pa[MAX_LEVEL +1 ];struct idr_layer **paa = &pa[0 ]; n = idp->layers *IDR_BITS ; p = idp->top;rcu_assign_pointer (idp->top,NULL ); - max =1 << n; + max =idr_max (idp->layers); id =0 ; -while (id < max) { +while (id >=0 && id <= max) {while (n >IDR_BITS && p) { n -=IDR_BITS ; *paa++ = p;@@ -519,7 +527,7 @@ void *idr_find(struct idr *idp, int id)/* Mask off upper bits we don't use for the search. */ id &=MAX_ID_MASK ; -if (id >= (1 << n)) +if (id >idr_max (p->layer +1 ))return NULL ;BUG_ON (n ==0 );@@ -555,15 +563,15 @@ int idr_for_each(struct idr *idp, {int n, id, max, error =0 ;struct idr_layer *p; -struct idr_layer *pa[MAX_LEVEL ]; +struct idr_layer *pa[MAX_LEVEL +1 ];struct idr_layer **paa = &pa[0 ]; n = idp->layers *IDR_BITS ; p =rcu_dereference_raw (idp->top); - max =1 << n; + max =idr_max (idp->layers); id =0 ; -while (id < max) { +while (id >=0 && id <= max) {while (n >0 && p) { n -=IDR_BITS ; *paa++ = p;@@ -601,7 +609,7 @@ EXPORT_SYMBOL(idr_for_each);*/ void *idr_get_next (struct idr *idp,int *nextidp) { -struct idr_layer *p, *pa[MAX_LEVEL ]; +struct idr_layer *p, *pa[MAX_LEVEL +1 ];struct idr_layer **paa = &pa[0 ];int id = *nextidp;int n, max;@@ -611,9 +619,9 @@ void *idr_get_next(struct idr *idp, intif (!p)return NULL ; n = (p->layer +1 ) *IDR_BITS ; - max =1 << n; + max =idr_max (p->layer +1 ); -while (id < max) { +while (id >=0 && id <= max) {while (n >0 && p) { n -=IDR_BITS ; *paa++ = p;@@ -787,7 +795,7 @@ EXPORT_SYMBOL(ida_pre_get);*/ int ida_get_new_above (struct ida *ida,int starting_id,int *p_id) { -struct idr_layer *pa[MAX_LEVEL ]; +struct idr_layer *pa[MAX_LEVEL +1 ];struct ida_bitmap *bitmap;unsigned long flags;int idr_id = starting_id /IDA_BITMAP_BITS ; --
Quoted 3 lines
To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
I've reviewed this backport and it looks correct to me. I've queued it in the 3.5 tree as well.
Cheers,
--
Luis
PATCH 115/153 sysctl: fix null checking in bin_dn_node_address()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xi Wang <[email protected]>
commit df1778be1a33edffa51d094eeda87c858ded6560 upstream.
The null check of `strchr() + 1' is broken, which is always non-null, leading to OOB read. Instead, check the result of strchr().
--- kernel/sysctl_binary.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sysctl_binary.c +2 -1
@@ -1194,9 +1194,10 @@ static ssize_t bin_dn_node_address(struc/* Convert the decnet address to binary */ result = -EIO ; - nodep =strchr (buf,'.' ) +1 ; + nodep =strchr (buf,'.' );if (!nodep) goto out; + ++nodep; area =simple_strtoul (buf,NULL ,10 ); node =simple_strtoul (nodep,NULL ,10 );
PATCH 116/153 nbd: fsync and kill block device on shutdown
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Bonzini <[email protected]>
commit 3a2d63f87989e01437ba994df5f297528c353d7d upstream.
There are two problems with shutdown in the NBD driver.
1: Receiving the NBD_DISCONNECT ioctl does not sync the filesystem.
This patch adds the sync operation into __nbd_ioctl()'s NBD_DISCONNECT handler. This is useful because BLKFLSBUF is restricted to processes that have CAP_SYS_ADMIN, and the NBD client may not possess it (fsync of the block device does not sync the filesystem, either).
2: Once we clear the socket we have no guarantee that later reads will
come from the same backing storage.
The patch adds calls to kill_bdev() in __nbd_ioctl()'s socket clearing code so the page cache is cleaned, lest reads that hit on the page cache will return stale data from the previously-accessible disk.
Example:
# qemu-nbd -r -c/dev/nbd0 /dev/sr0
# file -s /dev/nbd0
/dev/stdin: # UDF filesystem data (version 1.5) etc.
# qemu-nbd -d /dev/nbd0
# qemu-nbd -r -c/dev/nbd0 /dev/sda
# file -s /dev/nbd0
/dev/stdin: # UDF filesystem data (version 1.5) etc.While /dev/sda has:
# file -s /dev/sda
/dev/sda: x86 boot sector; etc.[bwh: Backported to 3.2:
- Adjusted context
- s/\bnbd\b/lo/
- Incorporate export of kill_bdev() from commit ff01bb483265 ('fs: move code out of buffer.c')]
---
drivers/block/nbd.c +10 -0
@@ -584,12 +584,20 @@ static int __nbd_ioctl(struct block_devistruct request sreq;dev_info (disk_to_dev (lo->disk),"NBD_DISCONNECT\n" ); +if (!lo->sock) +return -EINVAL ; +mutex_unlock (&lo->tx_lock); +fsync_bdev (bdev); +mutex_lock (&lo->tx_lock);blk_rq_init (NULL , &sreq); sreq.cmd_type =REQ_TYPE_SPECIAL ;nbd_cmd (&sreq) =NBD_CMD_DISC ; + +/* Check again after getting mutex back. */ if (!lo->sock)return -EINVAL ; +nbd_send_req (lo, &sreq);return 0 ; }
@@ -603,6 +611,7 @@ static int __nbd_ioctl(struct block_devinbd_clear_que (lo);BUG_ON (!list_empty (&lo->queue_head));BUG_ON (!list_empty (&lo->waiting_queue)); +kill_bdev (bdev);if (file)fput (file);return 0 ;
@@ -683,6 +692,7 @@ static int __nbd_ioctl(struct block_devi lo->file =NULL ;nbd_clear_que (lo);dev_warn (disk_to_dev (lo->disk),"queue cleared\n" ); +kill_bdev (bdev);if (file)fput (file); lo->bytesize =0 ;
fs/block_dev.c +2 -1
@@ -82,13 +82,14 @@ sector_t blkdev_max_block(struct block_d }/* Kill _all_ buffers and pagecache , dirty or not.. */ -static void kill_bdev (struct block_device *bdev) +void kill_bdev (struct block_device *bdev) {if (bdev->bd_inode->i_mapping->nrpages ==0 )return ;invalidate_bh_lrus ();truncate_inode_pages (bdev->bd_inode->i_mapping,0 ); } +EXPORT_SYMBOL (kill_bdev);int set_blocksize (struct block_device *bdev,int size) {
include/linux/fs.h +2 -0
@@ -2103,6 +2103,7 @@ extern void bd_forget(struct inode *inodextern void bdput (struct block_device *);extern void invalidate_bdev (struct block_device *);extern int sync_blockdev (struct block_device *bdev); +extern void kill_bdev (struct block_device *);extern struct super_block *freeze_bdev (struct block_device *);extern void emergency_thaw_all (void );extern int thaw_bdev (struct block_device *bdev,struct super_block *sb);
@@ -2110,6 +2111,7 @@ extern int fsync_bdev(struct block_devic#else static inline void bd_forget (struct inode *inode) {}static inline int sync_blockdev (struct block_device *bdev) {return 0 ; } +static inline void kill_bdev (struct block_device *bdev) {}static inline void invalidate_bdev (struct block_device *bdev) {}static inline struct super_block *freeze_bdev (struct block_device *sb)
PATCH 117/153 igb: Remove artificial restriction on RQDPC stat reading
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Duyck <[email protected]>
commit ae1c07a6b7ced6c0c94c99e3b53f4e7856fa8bff upstream.
For some reason the reading of the RQDPC register was being artificially limited to 4K. Instead of limiting the value we should read the value and add the full amount. Otherwise this can lead to a misleading number of dropped packets when the actual value is in fact much higher.
--- drivers/net/ethernet/intel/igb/igb_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +5 -3
@@ -4681,11 +4681,13 @@ void igb_update_stats(struct igb_adapter *adapter, bytes =0 ; packets =0 ;for (i =0 ; i < adapter->num_rx_queues; i++) { -u32 rqdpc_tmp =rd32 (E1000_RQDPC (i)) &0x0FFF ; +u32 rqdpc =rd32 (E1000_RQDPC (i));struct igb_ring *ring = adapter->rx_ring[i]; - ring->rx_stats.drops += rqdpc_tmp; - net_stats->rx_fifo_errors += rqdpc_tmp; +if (rqdpc) { + ring->rx_stats.drops += rqdpc; + net_stats->rx_fifo_errors += rqdpc; + } do { start = u64_stats_fetch_begin_bh(&ring->rx_syncp);
PATCH 118/153 drm/radeon/evergreen+: wait for the MC to settle after MC blackout
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit ed39fadd6df01095378e499fac3674883f16b853 upstream.
Some chips seem to need a little delay after blacking out the MC before the requests actually stop.
May fix:
https://bugs.freedesktop.org/show_bug.cgi?id=56139
https://bugs.freedesktop.org/show_bug.cgi?id=57567
--- drivers/gpu/drm/radeon/evergreen.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/radeon/evergreen.c +2 -0
@@ -1137,6 +1137,8 @@ void evergreen_mc_stop(struct radeon_dev blackout &= ~BLACKOUT_MODE_MASK ;WREG32 (MC_SHARED_BLACKOUT_CNTL , blackout |1 ); } +/* wait for the MC to settle */ +udelay (100 ); }void evergreen_mc_resume (struct radeon_device *rdev,struct evergreen_mc_save *save)
PATCH 119/153 s390/timer: avoid overflow when programming clock comparator
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
commit d911e03d097bdc01363df5d81c43f69432eb785c upstream.
Since ed4f209 "s390/time: fix sched_clock() overflow" a new helper function is used to avoid overflows when converting TOD format values to nanosecond values.
The kvm interrupt code formerly however only worked by accident because of an overflow. It tried to program a timer that would expire in more than ~29 years. Because of the old TOD-to-nanoseconds overflow bug the real expiry value however was much smaller, but now it isn't anymore.
This however triggers yet another bug in the function that programs the clock comparator s390_next_ktime(): if the absolute "expires" value is after 2042 this will result in an overflow and the programmed value is lower than the current TOD value which immediatly triggers a clock comparator (= timer) interrupt.
Since the timer isn't expired it will be programmed immediately again and so on... the result is a dead system.
To fix this simply program the maximum possible value if an overflow is detected.
--- arch/s390/kernel/time.c | 3 +++ 1 file changed, 3 insertions(+)
arch/s390/kernel/time.c +3 -0
@@ -120,6 +120,9 @@ static int s390_next_ktime(ktime_t expires, nsecs =ktime_to_ns (ktime_add (timespec_to_ktime (ts), expires));do_div (nsecs,125 ); S390_lowcore.clock_comparator = sched_clock_base_cc + (nsecs <<9 ); +/* Program the maximum value if we have an overflow (== year 2042) */ +if (unlikely (S390_lowcore.clock_comparator < sched_clock_base_cc)) + S390_lowcore.clock_comparator =-1ULL ;set_clock_comparator (S390_lowcore.clock_comparator);return 0 ; }
PATCH 120/153 unbreak automounter support on 64-bit kernel with 32-bit userspace (v2)
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 4f4ffc3a5398ef9bdbb32db04756d7d34e356fcf upstream.
automount-support is broken on the parisc architecture, because the existing #if list does not include a check for defined(__hppa__). The HPPA (parisc) architecture is similiar to other 64bit Linux targets where we have to define autofs_wqt_t (which is passed back and forth to user space) as int type which has a size of 32bit across 32 and 64bit kernels.
During the discussion on the mailing list, H. Peter Anvin suggested to invert the #if list since only specific platforms (specifically those who do not have a 32bit userspace, like IA64 and Alpha) should have autofs_wqt_t as unsigned long type.
This suggestion is probably the best way to go, since Arm64 (and maybe others?) seems to have a non-working automounter. So in the long run even for other new upcoming architectures this inverted check seem to be the best solution, since it will not require them to change this #if again (unless they are 64bit only).
---
include/linux/auto_fs.h +8 -17
@@ -31,25 +31,16 @@#define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION/* -* Architectures where both 32- and 64-bit binaries can be executed -* on 64-bit kernels need this. This keeps the structure format -* uniform, and makes sure the wait_queue_token isn't too big to be -* passed back down to the kernel. -* -* This assumes that on these architectures: -* mode 32 bit 64 bit -* ------------------------- -* int 32 bit 32 bit -* long 32 bit 64 bit -* -* If so, 32-bit user-space code should be backwards compatible. +* The wait_queue_token (autofs_wqt_t) is part of a structure which is passed +* back to the kernel via ioctl from userspace. On architectures where 32- and +* 64-bit userspace binaries can be executed it's important that the size of +* autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we +* do not break the binary ABI interface by changing the structure size. */ - -#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \ - || defined(__powerpc__) || defined(__s390__) -typedef unsigned int autofs_wqt_t ; -#else +#if defined(__ia64__) || defined(__alpha__)/* pure 64bit architectures */ typedef unsigned long autofs_wqt_t ; +#else +typedef unsigned int autofs_wqt_t ;#endif /* Packet types */
PATCH 121/153 xen-pciback: rate limit error messages from xen_pcibk_enable_msi{,x}()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Beulich <[email protected]>
commit 51ac8893a7a51b196501164e645583bf78138699 upstream.
... as being guest triggerable (e.g. by invoking XEN_PCI_OP_enable_msi{,x} on a device not being MSI/MSI-X capable).
This is CVE-2013-0231 / XSA-43.
Also make the two messages uniform in both their wording and severity.
[bwh: Backported to 3.2: add #include <linux/ratelimited.h>, needed by
printk_ratelimited()]
--- drivers/xen/xen-pciback/pciback_ops.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/xen/xen-pciback/pciback_ops.c +8 -7
@@ -8,6 +8,7 @@#include <linux/bitops.h> #include <xen/events.h> #include <linux/sched.h> +#include <linux/ratelimit.h> #include "pciback.h" int verbose_request;
@@ -135,7 +136,6 @@ int xen_pcibk_enable_msi(struct xen_pcib struct pci_dev *dev, struct xen_pci_op *op) { struct xen_pcibk_dev_data *dev_data; -int otherend = pdev->xdev->otherend_id;int status;if (unlikely (verbose_request))
@@ -144,8 +144,9 @@ int xen_pcibk_enable_msi(struct xen_pcib status =pci_enable_msi (dev);if (status) { -printk (KERN_ERR "error enable msi for guest %x status %x\n" , - otherend, status); +pr_warn_ratelimited (DRV_NAME ": %s: error enabling MSI for guest %u: err %d\n" , +pci_name (dev), pdev->xdev->otherend_id, + status); op->value =0 ;return XEN_PCI_ERR_op_failed; }
@@ -223,10 +224,10 @@ int xen_pcibk_enable_msix(struct xen_pcipci_name (dev), i, op->msix_entries[i].vector); } - }else { - printk(KERN_WARNING DRV_NAME ": %s: failed to enable MSI-X: err %d!\n", - pci_name(dev), result); - } + }else +pr_warn_ratelimited (DRV_NAME ": %s: error enabling MSI-X for guest %u: err %d!\n" , +pci_name (dev), pdev->xdev->otherend_id, + result);kfree (entries); op->value = result;
PATCH 122/153 bridge: set priority of STP packets
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Hemminger <[email protected]>
[ Upstream commit 547b4e718115eea74087e28d7fa70aec619200db ]
Spanning Tree Protocol packets should have always been marked as control packets, this causes them to get queued in the high prirority FIFO. As Radia Perlman mentioned in her LCA talk, STP dies if bridge gets overloaded and can't communicate. This is a long-standing bug back to the first versions of Linux bridge.
--- net/bridge/br_stp_bpdu.c | 2 ++ 1 file changed, 2 insertions(+)
net/bridge/br_stp_bpdu.c +2 -0
@@ -16,6 +16,7 @@#include <linux/etherdevice.h> #include <linux/llc.h> #include <linux/slab.h> +#include <linux/pkt_sched.h> #include <net/net_namespace.h> #include <net/llc.h> #include <net/llc_pdu.h>
@@ -40,6 +41,7 @@ static void br_send_bpdu(struct net_bridge_port *p, skb->dev = p->dev; skb->protocol =htons (ETH_P_802_2 ); + skb->priority =TC_PRIO_CONTROL ;skb_reserve (skb,LLC_RESERVE );memcpy (__skb_put (skb, length), data, length);
PATCH 123/153 xen-netback: correctly return errors from netbk_count_requests()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Vrabel <[email protected]>
[ Upstream commit 35876b5ffc154c357476b2c3bdab10feaf4bd8f0 ]
netbk_count_requests() could detect an error, call netbk_fatal_tx_error() but return 0. The vif may then be used afterwards (e.g., in a call to netbk_tx_error().
Since netbk_fatal_tx_error() could set vif->refcnt to 1, the vif may be freed immediately after the call to netbk_fatal_tx_error() (e.g., if the vif is also removed).
Netback thread Xenwatch thread
-------------------------------------------netbk_fatal_tx_err() netback_remove()
xenvif_disconnect()
...
free_netdev()netbk_tx_err() Oops!
--- drivers/net/xen-netback/netback.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/xen-netback/netback.c +4 -4
@@ -883,13 +883,13 @@ static int netbk_count_requests(struct xenvif *vif,if (frags >= work_to_do) {netdev_err (vif->dev,"Need more frags\n" );netbk_fatal_tx_err (vif); -return -frags; +return -ENODATA ; }if (unlikely (frags >=MAX_SKB_FRAGS )) {netdev_err (vif->dev,"Too many frags\n" );netbk_fatal_tx_err (vif); -return -frags; +return -E2BIG ; } memcpy(txp, RING_GET_REQUEST(&vif->tx, cons + frags),
@@ -897,7 +897,7 @@ static int netbk_count_requests(struct xenvif *vif,if (txp->size > first->size) {netdev_err (vif->dev,"Frag is bigger than frame.\n" );netbk_fatal_tx_err (vif); -return -frags; +return -EIO ; } first->size -= txp->size;
@@ -907,7 +907,7 @@ static int netbk_count_requests(struct xenvif *vif,netdev_err (vif->dev,"txp->offset: %x, size: %u\n" , txp->offset, txp->size);netbk_fatal_tx_err (vif); -return -frags; +return -EINVAL ; } }while ((txp++)->flags & XEN_NETTXF_more_data);return frags;
PATCH 124/153 xen-netback: cancel the credit timer when taking the vif down
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Vrabel <[email protected]>
[ Upstream commit 3e55f8b306cf305832a4ac78aa82e1b40e818ece ]
If the credit timer is left armed after calling xen_netbk_remove_xenvif(), then it may fire and attempt to schedule the vif which will then oops as vif->netbk == NULL.
This may happen both in the fatal error path and during normal disconnection from the front end.
The sequencing during shutdown is critical to ensure that: a) vif->netbk doesn't become unexpectedly NULL; and b) the net device/vif is not freed.
1. Mark as unschedulable (netif_carrier_off()).
2. Synchronously cancel the timer.
3. Remove the vif from the schedule list.
4. Remove it from it netback thread group.
5. Wait for vif->refcnt to become 0.
--- drivers/net/xen-netback/interface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/xen-netback/interface.c +1 -2
@@ -132,6 +132,7 @@ static void xenvif_up(struct xenvif *vif)static void xenvif_down (struct xenvif *vif) {disable_irq (vif->irq); +del_timer_sync (&vif->credit_timeout);xen_netbk_deschedule_xenvif (vif);xen_netbk_remove_xenvif (vif); }
@@ -362,8 +363,6 @@ void xenvif_disconnect(struct xenvif *vif)atomic_dec (&vif->refcnt);wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); -del_timer_sync (&vif->credit_timeout); -if (vif->irq)unbind_from_irqhandler (vif->irq, vif);
PATCH 125/153 ipv4: fix a bug in ping_err().
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Wei <[email protected]>
[ Upstream commit b531ed61a2a2a77eeb2f7c88b49aa5ec7d9880d8 ]
We should get 'type' and 'code' from the outer ICMP header.
--- net/ipv4/ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/ping.c +2 -2
@@ -321,8 +321,8 @@ void ping_err(struct sk_buff *skb, u32 info)struct iphdr *iph = (struct iphdr *)skb->data;struct icmphdr *icmph = (struct icmphdr *)(skb->data+(iph->ihl<<2 ));struct inet_sock *inet_sock; -int type = icmph->type; -int code = icmph->code; +int type =icmp_hdr (skb)->type; +int code =icmp_hdr (skb)->code;struct net *net =dev_net (skb->dev);struct sock *sk;int harderr;
PATCH 126/153 ipv6: use a stronger hash for tcp
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 08dcdbf6a7b9d14c2302c5bd0c5390ddf122f664 ]
It looks like its possible to open thousands of TCP IPv6 sessions on a server, all landing in a single slot of TCP hash table. Incoming packets have to lookup sockets in a very long list.
We should hash all bits from foreign IPv6 addresses, using a salt and hash mix, not a simple XOR.
inet6_ehashfn() can also separately use the ports, instead of xoring them.
--- include/net/inet6_hashtables.h | 8 ++++---- include/net/inet_sock.h | 1 + include/net/ipv6.h | 12 ++++++++++++ net/ipv4/af_inet.c | 9 +++++++-- 4 files changed, 24 insertions(+), 6 deletions(-)
include/net/inet6_hashtables.h +4 -4
@@ -28,16 +28,16 @@struct inet_hashinfo ; -/* I have no idea if this is a good hash for v6 or not. -DaveM */ static inline unsigned int inet6_ehashfn (struct net *net,const struct in6_addr *laddr,const u16 lport,const struct in6_addr *faddr,const __be16 fport) { -u32 ports = (lport ^ (__force u16 )fport); +u32 ports = (((u32 )lport) <<16 ) | (__force u32 )fport;return jhash_3words ((__force u32 )laddr->s6_addr32[3 ], - (__force u32 )faddr->s6_addr32[3 ], - ports, inet_ehash_secret +net_hash_mix (net)); +ipv6_addr_jhash (faddr), + ports, + inet_ehash_secret +net_hash_mix (net)); }static inline int inet6_sk_ehashfn (const struct sock *sk)
include/net/inet_sock.h +1 -0
@@ -199,6 +199,7 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to,extern int inet_sk_rebuild_header (struct sock *sk);extern u32 inet_ehash_secret; +extern u32 ipv6_hash_secret;extern void build_ehash_secret (void ); static inline unsigned int inet_ehashfn(struct net *net,
include/net/ipv6.h +12 -0
@@ -15,6 +15,7 @@#include <linux/ipv6.h> #include <linux/hardirq.h> +#include <linux/jhash.h> #include <net/if_inet6.h> #include <net/ndisc.h> #include <net/flow.h>
@@ -386,6 +387,17 @@ struct ip6_create_arg {void ip6_frag_init (struct inet_frag_queue *q,void *a);int ip6_frag_match (struct inet_frag_queue *q,void *a); +/* more secured version of ipv6_addr_hash() */ +static inline u32 ipv6_addr_jhash (const struct in6_addr *a) +{ +u32 v = (__force u32 )a->s6_addr32[0 ] ^ (__force u32 )a->s6_addr32[1 ]; + +return jhash_3words (v, + (__force u32 )a->s6_addr32[2 ], + (__force u32 )a->s6_addr32[3 ], + ipv6_hash_secret); +} +static inline int ipv6_addr_any (const struct in6_addr *a) { return (a->s6_addr32[0] | a->s6_addr32[1] |
net/ipv4/af_inet.c +7 -2
@@ -226,8 +226,12 @@ EXPORT_SYMBOL(inet_listen);u32 inet_ehash_secret__read_mostly ;EXPORT_SYMBOL (inet_ehash_secret); +u32 ipv6_hash_secret__read_mostly ; +EXPORT_SYMBOL (ipv6_hash_secret); +/* -* inet_ehash_secret must be set exactly once +* inet_ehash_secret must be set exactly once, and to a non nul value +* ipv6_hash_secret must be set exactly once. */ void build_ehash_secret (void ) {
@@ -237,7 +241,8 @@ void build_ehash_secret(void)get_random_bytes (&rnd,sizeof (rnd)); }while (rnd ==0 ); -cmpxchg (&inet_ehash_secret,0 , rnd); +if (cmpxchg (&inet_ehash_secret,0 , rnd) ==0 ) +get_random_bytes (&ipv6_hash_secret,sizeof (ipv6_hash_secret)); }EXPORT_SYMBOL (build_ehash_secret);
PATCH 127/153 staging: comedi: ni_labpc: correct differential channel sequence for AI commands
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 4c4bc25d0fa6beaf054c0b4c3b324487f266c820 upstream.
Tuomas <tvainikk _at_ gmail _dot_ com> reported problems getting meaningful output from a Lab-PC+ in differential mode for AI cmds, but AI insn reads gave correct readings. He tracked it down to two problems, one of which is addressed by this patch.
It seems the setting of the channel bits for particular scanning modes was incorrect for differential mode. (Only half the number of channels are available in differential mode; comedi refers to them as channels 0, 1, 2 and 3, but the hardware documentation refers to them as channels 0, 2, 4 and 6.) In differential mode, the setting of the channel enable bits in the command1 register should depend on whether the scan enable bit is set. Effectively, we need to double the comedi channel number when the scan enable bit is not set in differential mode. The scan enable bit gets set when the AI scan mode is MODE_MULT_CHAN_UP or MODE_MULT_CHAN_DOWN, and gets cleared when the AI scan mode is MODE_SINGLE_CHAN or MODE_SINGLE_CHAN_INTERVAL. The existing test for whether the comedi channel number needs to be doubled in differential mode is incorrect in labpc_ai_cmd(). This patch corrects the test.
Thanks to Tuomas for suggesting the fix.
--- drivers/staging/comedi/drivers/ni_labpc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/ni_labpc.c +3 -1
@@ -1264,7 +1264,9 @@ static int labpc_ai_cmd(struct comedi_deelse channel =CR_CHAN (cmd->chanlist[0 ]);/* munge channel bits for differential / scan disabled mode */ -if (labpc_ai_scan_mode (cmd) !=MODE_SINGLE_CHAN && aref ==AREF_DIFF ) +if ((labpc_ai_scan_mode (cmd) ==MODE_SINGLE_CHAN || +labpc_ai_scan_mode (cmd) ==MODE_SINGLE_CHAN_INTERVAL ) && + aref ==AREF_DIFF ) channel *=2 ; devpriv->command1_bits |=ADC_CHAN_BITS (channel); devpriv->command1_bits |= thisboard->ai_range_code[range];
PATCH 128/153 staging: comedi: ni_labpc: set up command4 register *after* command3
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 22056e2b46246d97ff0f7c6e21a77b8daa07f02c upstream.
Tuomas <tvainikk _at_ gmail _dot_ com> reported problems getting meaningful output from a Lab-PC+ in differential mode for AI cmds, but AI insn reads gave correct readings. He tracked it down to two problems, one of which is addressed by this patch.
It seems that writing to the command3 register after writing to the command4 register in labpc_ai_cmd() messes up the differential reference bit setting in the command4 register. Set up the command4 register after the command3 register (as in labpc_ai_rinsn()) to avoid the problem.
Thanks to Tuomas for suggesting the fix.
--- drivers/staging/comedi/drivers/ni_labpc.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
drivers/staging/comedi/drivers/ni_labpc.c +16 -15
@@ -1282,21 +1282,6 @@ static int labpc_ai_cmd(struct comedi_de devpriv->write_byte (devpriv->command1_bits, dev->iobase +COMMAND1_REG ); } -/* setup any external triggering/pacing (command4 register) */ - devpriv->command4_bits =0 ; -if (cmd->convert_src !=TRIG_EXT ) - devpriv->command4_bits |=EXT_CONVERT_DISABLE_BIT ; -/* XXX should discard first scan when using interval scanning -* since manual says it is not synced with scan clock */ -if (labpc_use_continuous_mode (cmd) ==0 ) { - devpriv->command4_bits |=INTERVAL_SCAN_EN_BIT ; -if (cmd->scan_begin_src ==TRIG_EXT ) - devpriv->command4_bits |=EXT_SCAN_EN_BIT ; - } -/* single-ended/differential */ -if (aref ==AREF_DIFF ) - devpriv->command4_bits |=ADC_DIFF_BIT ; - devpriv->write_byte (devpriv->command4_bits, dev->iobase +COMMAND4_REG ); devpriv->write_byte (cmd->chanlist_len, dev->iobase +INTERVAL_COUNT_REG );
@@ -1376,6 +1361,22 @@ static int labpc_ai_cmd(struct comedi_de devpriv->command3_bits &= ~ADC_FNE_INTR_EN_BIT ; devpriv->write_byte (devpriv->command3_bits, dev->iobase +COMMAND3_REG ); +/* setup any external triggering/pacing (command4 register) */ + devpriv->command4_bits =0 ; +if (cmd->convert_src !=TRIG_EXT ) + devpriv->command4_bits |=EXT_CONVERT_DISABLE_BIT ; +/* XXX should discard first scan when using interval scanning +* since manual says it is not synced with scan clock */ +if (labpc_use_continuous_mode (cmd) ==0 ) { + devpriv->command4_bits |=INTERVAL_SCAN_EN_BIT ; +if (cmd->scan_begin_src ==TRIG_EXT ) + devpriv->command4_bits |=EXT_SCAN_EN_BIT ; + } +/* single-ended/differential */ +if (aref ==AREF_DIFF ) + devpriv->command4_bits |=ADC_DIFF_BIT ; + devpriv->write_byte (devpriv->command4_bits, dev->iobase +COMMAND4_REG ); +/* startup acquisition */ /* command2 reg */
PATCH 129/153 pstore: Avoid deadlock in panic and emergency-restart path
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Seiji Aguchi <[email protected]>
commit 9f244e9cfd70c7c0f82d3c92ce772ab2a92d9f64 upstream.
[Issue]
When pstore is in panic and emergency-restart paths, it may be blocked in those paths because it simply takes spin_lock.
This is an example scenario which pstore may hang up in a panic path:
- cpuA grabs psinfo->buf_lock
- cpuB panics and calls smp_send_stop
- smp_send_stop sends IRQ to cpuA
- after 1 second, cpuB gives up on cpuA and sends an NMI instead
- cpuA is now in an NMI handler while still holding buf_lock
- cpuB is deadlocked
This case may happen if a firmware has a bug and cpuA is stuck talking with it more than one second.
Also, this is a similar scenario in an emergency-restart path:
- cpuA grabs psinfo->buf_lock and stucks in a firmware
- cpuB kicks emergency-restart via either sysrq-b or hangcheck timer. And then, cpuB is deadlocked by taking psinfo->buf_lock again.
[Solution]
This patch avoids the deadlocking issues in both panic and emergency_restart paths by introducing a function, is_non_blocking_path(), to check if a cpu can be blocked in current path.
With this patch, pstore is not blocked even if another cpu has taken a spin_lock, in those paths by changing from spin_lock_irqsave to spin_trylock_irqsave.
In addition, according to a comment of emergency_restart() in kernel/sys.c, spin_lock shouldn't be taken in an emergency_restart path to avoid deadlock. This patch fits the comment below.
<snip>
/**
* emergency_restart - reboot the system
*
* Without shutting down any hardware or taking any locks * reboot the system. This is called when we know we are in * trouble so this is our best effort to reboot. This is * safe to call in interrupt context.
*/
void emergency_restart(void)
<snip>
[bwh: Backported to 3.2:
- Adjust context
- Add #include <linux/kmsg_dump.h>]
---
fs/pstore/platform.c +29 -6
@@ -72,6 +72,27 @@ static char *reason_str[] = { "Oops", "Panic", "Kexec", "Restart", "Halt", "Poweroff", "Emergency" }; +bool pstore_cannot_block_path (enum kmsg_dump_reason reason) +{ +/* +* In case of NMI path, pstore shouldn't be blocked +* regardless of reason. +*/ +if (in_nmi ()) +return true; + +switch (reason) { +/* In panic case, other cpus are stopped by smp_send_stop(). */ +case KMSG_DUMP_PANIC : +/* Emergency restart shouldn't be blocked by spin lock. */ +case KMSG_DUMP_EMERG : +return true; +default : +return false; + } +} +EXPORT_SYMBOL_GPL (pstore_cannot_block_path); +/* * callback from kmsg_dump. (s2,l2) has the most recently * written bytes, older bytes are in (s1,l1). Save as much
@@ -97,10 +118,12 @@ static void pstore_dump(struct kmsg_dumpelse why ="Unknown" ; -if (in_nmi ()) { - is_locked =spin_trylock (&psinfo->buf_lock); -if (!is_locked) -pr_err ("pstore dump routine blocked in NMI, may corrupt error record\n" ); +if (pstore_cannot_block_path (reason)) { + is_locked =spin_trylock_irqsave (&psinfo->buf_lock, flags); +if (!is_locked) { +pr_err ("pstore dump routine blocked in %s path, may corrupt error record\n" + ,in_nmi () ?"NMI" : why); + } }else spin_lock_irqsave (&psinfo->buf_lock, flags); oopscount++;
@@ -131,9 +154,9 @@ static void pstore_dump(struct kmsg_dump total += l1_cpy + l2_cpy; part++; } -if (in_nmi ()) { +if (pstore_cannot_block_path (reason)) {if (is_locked) -spin_unlock (&psinfo->buf_lock); +spin_unlock_irqrestore (&psinfo->buf_lock, flags); }else spin_unlock_irqrestore (&psinfo->buf_lock, flags); }
include/linux/pstore.h +8 -0
@@ -22,6 +22,8 @@#ifndef _LINUX_PSTORE_H#define _LINUX_PSTORE_H +#include <linux/kmsg_dump.h> +/* types */ enum pstore_type_id { PSTORE_TYPE_DMESG = 0,
@@ -50,6 +52,7 @@ struct pstore_info {#ifdef CONFIG_PSTORE extern int pstore_register (struct pstore_info *); +extern bool pstore_cannot_block_path (enum kmsg_dump_reason reason);extern int pstore_write (enum pstore_type_id type,char *buf,size_t size);#else static inline int
@@ -57,6 +60,11 @@ pstore_register(struct pstore_info *psi) {return -ENODEV ; } +static inline bool +pstore_cannot_block_path (enum kmsg_dump_reason reason) +{ +return false; +}static inline int pstore_write (enum pstore_type_id type,char *buf,size_t size) {
PATCH 130/153 ata_piix: IDE-mode SATA patch for Intel Lynx Point DeviceIDs
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Seth Heasley <[email protected]>
commit 78140cfec503c60a178b11fbaae2fef63e9abdc0 upstream.
This patch adds the IDE-mode SATA DeviceIDs for the Intel Lynx Point PCH.
--- drivers/ata/ata_piix.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/ata/ata_piix.c +8 -0
@@ -321,6 +321,14 @@ static const struct pci_device_id piix_p { 0x8086, 0x1e08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },/* SATA Controller IDE (Panther Point) */ { 0x8086, 0x1e09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (Lynx Point) */ + { 0x8086, 0x8c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, +/* SATA Controller IDE (Lynx Point) */ + { 0x8086, 0x8c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, +/* SATA Controller IDE (Lynx Point) */ + { 0x8086, 0x8c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (Lynx Point) */ + { 0x8086, 0x8c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, { } /* terminate list */ };
PATCH 131/153 ata_piix: IDE-mode SATA patch for Intel DH89xxCC DeviceIDs
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Seth Heasley <[email protected]>
commit 96d5d96aedc29c75bb16433f6ecf8664ec3c1b46 upstream.
This patch adds the IDE-mode SATA DeviceIDs for the Intel DH89xxCC PCH.
--- drivers/ata/ata_piix.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/ata/ata_piix.c +2 -0
@@ -329,6 +329,8 @@ static const struct pci_device_id piix_p { 0x8086, 0x8c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },/* SATA Controller IDE (Lynx Point) */ { 0x8086, 0x8c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (DH89xxCC) */ + { 0x8086, 0x2326, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, { } /* terminate list */ };
PATCH 132/153 ata_piix: Add Device IDs for Intel Lynx Point-LP PCH
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Ralston <[email protected]>
commit 389cd784969e9148fedcde0608f15bd74d6b769e upstream.
This patch adds the IDE-mode SATA Device IDs for the Intel Lynx Point-LP PCH
--- drivers/ata/ata_piix.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/ata/ata_piix.c +8 -0
@@ -329,6 +329,14 @@ static const struct pci_device_id piix_p { 0x8086, 0x8c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },/* SATA Controller IDE (Lynx Point) */ { 0x8086, 0x8c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (Lynx Point-LP) */ + { 0x8086, 0x9c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, +/* SATA Controller IDE (Lynx Point-LP) */ + { 0x8086, 0x9c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, +/* SATA Controller IDE (Lynx Point-LP) */ + { 0x8086, 0x9c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (Lynx Point-LP) */ + { 0x8086, 0x9c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },/* SATA Controller IDE (DH89xxCC) */ { 0x8086, 0x2326, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, { } /* terminate list */
PATCH 133/153 ata_piix: IDE-mode SATA patch for Intel Avoton DeviceIDs
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Seth Heasley <[email protected]>
commit aaa515277db9585eeb4fdeb4637b9f9df50a1dd9 upstream.
This patch adds the IDE-mode SATA DeviceIDs for the Intel Avoton SOC.
--- drivers/ata/ata_piix.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/ata/ata_piix.c +8 -0
@@ -339,6 +339,14 @@ static const struct pci_device_id piix_p { 0x8086, 0x9c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },/* SATA Controller IDE (DH89xxCC) */ { 0x8086, 0x2326, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (Avoton) */ + { 0x8086, 0x1f20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, +/* SATA Controller IDE (Avoton) */ + { 0x8086, 0x1f21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, +/* SATA Controller IDE (Avoton) */ + { 0x8086, 0x1f30, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (Avoton) */ + { 0x8086, 0x1f31, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, { } /* terminate list */ };
PATCH 134/153 ata_piix: Add Device IDs for Intel Wellsburg PCH
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Ralston <[email protected]>
commit 3aee8bc52c415aba8148f144e5e5359b0fd75dd1 upstream.
This patch adds the IDE-mode SATA Device IDs for the Intel Wellsburg PCH
--- drivers/ata/ata_piix.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/ata/ata_piix.c +9 -0
@@ -347,6 +347,15 @@ static const struct pci_device_id piix_p { 0x8086, 0x1f30, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },/* SATA Controller IDE (Avoton) */ { 0x8086, 0x1f31, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (Wellsburg) */ + { 0x8086, 0x8d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, +/* SATA Controller IDE (Wellsburg) */ + { 0x8086, 0x8d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (Wellsburg) */ + { 0x8086, 0x8d60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, +/* SATA Controller IDE (Wellsburg) */ + { 0x8086, 0x8d68, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, + { } /* terminate list */ };
PATCH 135/153 usb hid quirks for Masterkit MA901 usb radio
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Klimov <[email protected]>
commit 0322bd3980b3ebf7dde8474e22614cb443d6479a upstream.
Don't let Masterkit MA901 USB radio be handled by usb hid drivers. This device will be handled by radio-ma901.c driver.
--- drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 3 +++ 2 files changed, 4 insertions(+)
drivers/hid/hid-core.c +1 -0
@@ -1900,6 +1900,7 @@ static const struct hid_device_id hid_ig { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) }, { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) }, { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) }, + { HID_USB_DEVICE(USB_VENDOR_ID_MASTERKIT, USB_DEVICE_ID_MASTERKIT_MA901RADIO) }, { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) }, { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
drivers/hid/hid-ids.h +3 -0
@@ -506,6 +506,9 @@#define USB_VENDOR_ID_MADCATZ 0x0738#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 +#define USB_VENDOR_ID_MASTERKIT 0x16c0 +#define USB_DEVICE_ID_MASTERKIT_MA901RADIO 0x05df +#define USB_VENDOR_ID_MCC 0x09db#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
PATCH 136/153 Avoid sysfs oops when an rc_devs raw device is absent
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Bagnall <[email protected]>
commit 720bb6436ff30fccad05cf5bdf961ea5b1f5686d upstream.
For some reason, when the lirc daemon learns that a usb remote control has been unplugged, it wants to read the sysfs attributes of the disappearing device. This is useful for uncovering transient inconsistencies, but less so for keeping the system running when such inconsistencies exist.
Under some circumstances (like every time I unplug my dvb stick from my laptop), lirc catches an rc_dev whose raw event handler has been removed (presumably by ir_raw_event_unregister), and proceeds to interrogate the raw protocols supported by the NULL pointer.
This patch avoids the NULL dereference, and ignores the issue of how this state of affairs came about in the first place.
Version 2 incorporates changes recommended by Mauro Carvalho Chehab (-ENODEV instead of -EINVAL, and a signed-off-by).
--- drivers/media/rc/rc-main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/rc/rc-main.c +3 -2
@@ -774,10 +774,11 @@ static ssize_t show_protocols(struct devif (dev->driver_type ==RC_DRIVER_SCANCODE ) { enabled = dev->rc_map.rc_type; allowed = dev->allowed_protos; - }else { + }else if (dev->raw) { enabled = dev->raw->enabled_protocols; allowed =ir_raw_get_allowed_protocols (); - } + }else +return -ENODEV ; IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n", (long long)allowed,
PATCH 137/153 rc: unlock on error in show_protocols()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 30ebc5e44d057a1619ad63fe32c8c1670c37c4b8 upstream.
We recently introduced a new return -ENODEV in this function but we need to unlock before returning.
--- drivers/media/rc/rc-main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/rc/rc-main.c +3 -1
@@ -777,8 +777,10 @@ static ssize_t show_protocols(struct dev }else if (dev->raw) { enabled = dev->raw->enabled_protocols; allowed =ir_raw_get_allowed_protocols (); - }else + }else { +mutex_unlock (&dev->lock);return -ENODEV ; + } IR_dprintk(1, "allowed - 0x%llx, enabled - 0x%llx\n", (long long)allowed,
PATCH 138/153 vhost: fix length for cross region descriptor
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Michael S. Tsirkin" <[email protected]>
commit bd97120fc3d1a11f3124c7c9ba1d91f51829eb85 upstream.
If a single descriptor crosses a region, the second chunk length should be decremented
by size translated so far, instead it includes the full descriptor length.
--- drivers/vhost/vhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vhost/vhost.c +1 -1
@@ -1073,7 +1073,7 @@ static int translate_desc(struct vhost_d } _iov = iov + ret; size = reg->memory_size - addr + reg->guest_phys_addr; - _iov->iov_len =min ((u64 )len, size); + _iov->iov_len =min ((u64 )len - s, size); _iov->iov_base = (void __user *)(unsigned long ) (reg->userspace_addr + addr - reg->guest_phys_addr); s += size;
PATCH 139/153 8250: use correct value for PORT_BRCM_TRUMANAGE
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
When backporting commit ebebd49a8eab ('8250/16?50: Add support for Broadcom TruManage redirected serial port') I took the next available port type number for PORT_BRCM_TRUMANAGE (22).
However, the 8250 port type numbers are exposed to userland through the TIOC{G,S}SERIAL ioctls and so must remain stable. Redefine PORT_BRCM_TRUMANAGE as 25, matching mainline as of commit 85f024401bf807.
This leaves port types 22-24 within the valid range for 8250 but not implemented there. Change serial8250_verify_port() to specifically reject these and change serial8250_type() to return "unknown" for them (though I'm not sure why it would ever see them).
---
drivers/tty/serial/8250.c +2 -2
@@ -2695,7 +2695,7 @@ serial8250_verify_port(struct uart_portif (ser->irq >= nr_irqs || ser->irq <0 || ser->baud_base <9600 || ser->type <PORT_UNKNOWN || ser->type >=ARRAY_SIZE (uart_config) || ser->type ==PORT_CIRRUS || - ser->type ==PORT_STARTECH ) + ser->type ==PORT_STARTECH || uart_config[ser->type].name ==NULL )return -EINVAL ;return 0 ; }
@@ -2705,7 +2705,7 @@ serial8250_type(struct uart_port *port) {int type = port->type; -if (type >=ARRAY_SIZE (uart_config)) +if (type >=ARRAY_SIZE (uart_config) || uart_config[type].name ==NULL ) type =0 ;return uart_config[type].name; }
include/linux/serial_core.h +2 -2
@@ -47,8 +47,8 @@#define PORT_U6_16550A 19/* ST-Ericsson U6xxx internal UART */ #define PORT_TEGRA 20/* NVIDIA Tegra internal UART */ #define PORT_XR17D15X 21/* Exar XR17D15x UART */ -#define PORT_BRCM_TRUMANAGE 22 -#define PORT_MAX_8250 22/* max port ID */ +#define PORT_BRCM_TRUMANAGE 25 +#define PORT_MAX_8250 25/* max port ID */ /* * ARM specific type numbers. These are not currently guaranteed
PATCH 140/153 usb: Add quirk detection based on interface information
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
commit 80da2e0df5af700518611b7d1cc4fc9945bcaf95 upstream.
When a whole class of devices (possibly from a specific vendor, or across multiple vendors) require a quirk, explictly listing all devices in the class make the quirks table unnecessarily large. Fix this by allowing matching devices based on interface information.
--- drivers/usb/core/driver.c | 38 ++++++++++-------- drivers/usb/core/hub.c | 10 +++-- drivers/usb/core/quirks.c | 93 +++++++++++++++++++++++++++++++++++---------- drivers/usb/core/usb.h | 4 ++ 4 files changed, 106 insertions(+), 39 deletions(-)
drivers/usb/core/driver.c +23 -15
@@ -541,22 +541,10 @@ int usb_match_device(struct usb_device * }/* returns 0 if no match, 1 if match */ -int usb_match_one_id (struct usb_interface *interface, -const struct usb_device_id *id) +int usb_match_one_id_intf (struct usb_device *dev, +struct usb_host_interface *intf, +const struct usb_device_id *id) { -struct usb_host_interface *intf; -struct usb_device *dev; - -/* proc_connectinfo in devio.c may call us with id == NULL. */ -if (id ==NULL ) -return 0 ; - - intf = interface->cur_altsetting; - dev =interface_to_usbdev (interface); - -if (!usb_match_device (dev, id)) -return 0 ; -/* The interface class, subclass, and protocol should never be * checked for a match if the device class is Vendor Specific, * unless the match record specifies the Vendor ID. */
@@ -581,6 +569,26 @@ int usb_match_one_id(struct usb_interfacreturn 1 ; } + +/* returns 0 if no match, 1 if match */ +int usb_match_one_id (struct usb_interface *interface, +const struct usb_device_id *id) +{ +struct usb_host_interface *intf; +struct usb_device *dev; + +/* proc_connectinfo in devio.c may call us with id == NULL. */ +if (id ==NULL ) +return 0 ; + + intf = interface->cur_altsetting; + dev =interface_to_usbdev (interface); + +if (!usb_match_device (dev, id)) +return 0 ; + +return usb_match_one_id_intf (dev, intf, id); +}EXPORT_SYMBOL_GPL (usb_match_one_id);/**
drivers/usb/core/hub.c +7 -3
@@ -1883,7 +1883,7 @@ static int usb_enumerate_device(struct uif (err <0 ) {dev_err (&udev->dev,"can't read configurations, error %d\n" , err); - goto fail; +return err; } }if (udev->wusb ==1 && udev->authorized ==0 ) {
@@ -1899,8 +1899,12 @@ static int usb_enumerate_device(struct u udev->serial =usb_cache_string (udev, udev->descriptor.iSerialNumber); } err =usb_enumerate_device_otg (udev); -fail: -return err; +if (err <0 ) +return err; + +usb_detect_interface_quirks (udev); + +return 0 ; }
drivers/usb/core/quirks.c +72 -21
122 lines not on this page · raw message
drivers/usb/core/usb.h +4 -0
@@ -24,6 +24,7 @@ extern void usb_disable_device(struct usextern int usb_deauthorize_device (struct usb_device *);extern int usb_authorize_device (struct usb_device *);extern void usb_detect_quirks (struct usb_device *udev); +extern void usb_detect_interface_quirks (struct usb_device *udev);extern int usb_remove_device (struct usb_device *udev); extern int usb_get_device_descriptor(struct usb_device *dev,
@@ -35,6 +36,9 @@ extern int usb_set_configuration(structextern int usb_choose_configuration (struct usb_device *udev);extern void usb_kick_khubd (struct usb_device *dev); +extern int usb_match_one_id_intf (struct usb_device *dev, +struct usb_host_interface *intf, +const struct usb_device_id *id);extern int usb_match_device (struct usb_device *dev,const struct usb_device_id *id);extern void usb_forced_unbind_intf (struct usb_interface *intf);
PATCH 141/153 usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
commit e387ef5c47ddeaeaa3cbdc54424cdb7a28dae2c0 upstream.
Most Logitech UVC webcams (both early models that don't advertise UVC compatibility and newer UVC-advertised devices) require the RESET_RESUME quirk. Instead of listing each and every model, match the devices based on the UVC interface information.
--- drivers/usb/core/quirks.c | 58 +++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 42 deletions(-)
drivers/usb/core/quirks.c +16 -42
@@ -46,53 +46,23 @@ static const struct usb_device_id usb_qu/* Microsoft LifeCam-VX700 v2.0 */ { USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Logitech Webcam C200 */ - { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Logitech Quickcam Fusion */ + { USB_DEVICE(0x046d, 0x08c1), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Logitech Webcam C250 */ - { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Logitech Quickcam Orbit MP */ + { USB_DEVICE(0x046d, 0x08c2), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Logitech Webcam C300 */ - { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Logitech Quickcam Pro for Notebook */ + { USB_DEVICE(0x046d, 0x08c3), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Logitech Webcam B/C500 */ - { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Logitech Quickcam Pro 5000 */ + { USB_DEVICE(0x046d, 0x08c5), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Logitech Webcam C600 */ - { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Logitech Quickcam OEM Dell Notebook */ + { USB_DEVICE(0x046d, 0x08c6), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Logitech Webcam Pro 9000 */ - { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME }, - - /* Logitech Webcam C905 */ - { USB_DEVICE(0x046d, 0x080a), .driver_info = USB_QUIRK_RESET_RESUME }, - - /* Logitech Webcam C210 */ - { USB_DEVICE(0x046d, 0x0819), .driver_info = USB_QUIRK_RESET_RESUME }, - - /* Logitech Webcam C260 */ - { USB_DEVICE(0x046d, 0x081a), .driver_info = USB_QUIRK_RESET_RESUME }, - - /* Logitech Webcam C310 */ - { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME }, - - /* Logitech Webcam C910 */ - { USB_DEVICE(0x046d, 0x0821), .driver_info = USB_QUIRK_RESET_RESUME }, - - /* Logitech Webcam C160 */ - { USB_DEVICE(0x046d, 0x0824), .driver_info = USB_QUIRK_RESET_RESUME }, - - /* Logitech Webcam C270 */ - { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, - - /* Logitech Quickcam Pro 9000 */ - { USB_DEVICE(0x046d, 0x0990), .driver_info = USB_QUIRK_RESET_RESUME }, - - /* Logitech Quickcam E3500 */ - { USB_DEVICE(0x046d, 0x09a4), .driver_info = USB_QUIRK_RESET_RESUME }, - - /* Logitech Quickcam Vision Pro */ - { USB_DEVICE(0x046d, 0x09a6), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Logitech Quickcam OEM Cisco VT Camera II */ + { USB_DEVICE(0x046d, 0x08c7), .driver_info = USB_QUIRK_RESET_RESUME }, /* Logitech Harmony 700-series */ { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
@@ -169,6 +139,10 @@ static const struct usb_device_id usb_qu };static const struct usb_device_id usb_interface_quirk_list[] = { +/* Logitech UVC Cameras */ + {USB_VENDOR_AND_INTERFACE_INFO (0x046d ,USB_CLASS_VIDEO ,1 ,0 ), + .driver_info =USB_QUIRK_RESET_RESUME }, + { }/* terminating entry must be last */ };
PATCH 142/153 speakup: lower default software speech rate
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Thibault <[email protected]>
commit cfd757010691eae4e17acc246f74e7622c3a2f05 upstream.
Speech synthesis beginners need a low speech rate, and trained people want a high speech rate. A medium speech rate is thus actually not a good default for neither. Since trained people will typically know how to change the rate, better default for a low speech rate, which beginners can grasp and learn how to increase it afterwards
This was agreed with users on the speakup mailing list.
--- drivers/staging/speakup/speakup_soft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/speakup/speakup_soft.c +1 -1
@@ -46,7 +46,7 @@ static int misc_registered;static struct var_t vars[] = { {CAPS_START , .u.s = {"\x01+3p" } }, {CAPS_STOP , .u.s = {"\x01-3p" } }, - {RATE , .u.n = {"\x01%ds" ,5 ,0 ,9 ,0 ,0 ,NULL } }, + {RATE , .u.n = {"\x01%ds" ,2 ,0 ,9 ,0 ,0 ,NULL } }, {PITCH , .u.n = {"\x01%dp" ,5 ,0 ,9 ,0 ,0 ,NULL } }, {VOL , .u.n = {"\x01%dv" ,5 ,0 ,9 ,0 ,0 ,NULL } }, {TONE , .u.n = {"\x01%dx" ,1 ,0 ,2 ,0 ,0 ,NULL } },
PATCH 143/153 asus-laptop: Do not call HWRS on init
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
commit cb7da022450cdaaebd33078b6b32fb7dd2aaf6db upstream.
Since commit 8871e99f89b7 ('asus-laptop: HRWS/HWRS typo'), module initialisation is very slow on the Asus UL30A. The HWRS method takes about 12 seconds to run, and subsequent initialisation also seems to be delayed. Since we don't really need the result, don't bother calling it on init. Those who are curious can still get the result through the 'infos' device attribute.
Update the comment about HWRS in show_infos().
References: http://bugs.debian.org/692436
--- drivers/platform/x86/asus-laptop.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
drivers/platform/x86/asus-laptop.c +4 -13
@@ -820,8 +820,10 @@ static ssize_t show_infos(struct device/* * The HWRS method return informations about the hardware. * 0x80 bit is for WLAN, 0x100 for Bluetooth. +* 0x40 for WWAN, 0x10 for WIMAX. * The significance of others is yet to be found. -* If we don't find the method, we assume the device are present. +* We don't currently use this for device detection, and it +* takes several seconds to run on some systems. */ rv =acpi_evaluate_integer (asus->handle,"HWRS" ,NULL , &temp);if (!ACPI_FAILURE (rv))
@@ -1591,7 +1593,7 @@ static int asus_laptop_get_info(struct a {struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL };union acpi_object *model =NULL ; -unsigned long long bsts_result, hwrs_result; +unsigned long long bsts_result;char *string =NULL ;acpi_status status;
@@ -1653,17 +1655,6 @@ static int asus_laptop_get_info(struct aif (*string)pr_notice (" %s model detected\n" , string); -/* -* The HWRS method return informations about the hardware. -* 0x80 bit is for WLAN, 0x100 for Bluetooth, -* 0x40 for WWAN, 0x10 for WIMAX. -* The significance of others is yet to be found. -*/ - status = -acpi_evaluate_integer (asus->handle,"HWRS" ,NULL , &hwrs_result); -if (!ACPI_FAILURE (status)) -pr_notice (" HWRS returned %x" , (int )hwrs_result); -if (!acpi_check_handle (asus->handle,METHOD_WL_STATUS ,NULL )) asus->have_rsts = true;
PATCH 144/153 usermodehelper: introduce umh_complete(sub_info)
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit b3449922502f5a161ee2b5022a33aec8472fbf18 upstream.
Preparation. Add the new trivial helper, umh_complete(). Currently it simply does complete(sub_info->complete).
--- kernel/kmod.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
kernel/kmod.c +7 -2
@@ -197,6 +197,11 @@ void call_usermodehelper_freeinfo(struct }EXPORT_SYMBOL (call_usermodehelper_freeinfo); +static void umh_complete (struct subprocess_info *sub_info) +{ +complete (sub_info->complete); +} +/* Keventd can't block, but this (a child) can. */ static int wait_for_helper (void *data) {
@@ -233,7 +238,7 @@ static int wait_for_helper(void *data) sub_info->retval = ret; } -complete (sub_info->complete); +umh_complete (sub_info);return 0 ; }
@@ -267,7 +272,7 @@ static void __call_usermodehelper(structcase UMH_WAIT_EXEC :if (pid <0 ) sub_info->retval = pid; -complete (sub_info->complete); +umh_complete (sub_info); } }
PATCH 145/153 usermodehelper: implement UMH_KILLABLE
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit d0bd587a80960d7ba7e0c8396e154028c9045c54 upstream.
Implement UMH_KILLABLE, should be used along with UMH_WAIT_EXEC/PROC. The caller must ensure that subprocess_info->path/etc can not go away until call_usermodehelper_freeinfo().
call_usermodehelper_exec(UMH_KILLABLE) does wait_for_completion_killable. If it fails, it uses xchg(&sub_info->complete, NULL) to serialize with umh_complete() which does the same xhcg() to access sub_info->complete.
If call_usermodehelper_exec wins, it can safely return. umh_complete() should get NULL and call call_usermodehelper_freeinfo().
Otherwise we know that umh_complete() was already called, in this case call_usermodehelper_exec() falls back to wait_for_completion() which should succeed "very soon".
Note: UMH_NO_WAIT == -1 but it obviously should not be used with UMH_KILLABLE. We delay the neccessary cleanup to simplify the back porting.
--- include/linux/kmod.h | 2 ++ kernel/kmod.c | 27 +++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-)
include/linux/kmod.h +2 -0
@@ -54,6 +54,8 @@ enum umh_wait { UMH_WAIT_PROC = 1, /* wait for the process to complete */ }; +#define UMH_KILLABLE 4/* wait for EXEC/PROC killable */ +struct subprocess_info {struct work_struct work;struct completion *complete;
kernel/kmod.c +25 -2
@@ -199,7 +199,15 @@ EXPORT_SYMBOL(call_usermodehelper_freeinstatic void umh_complete (struct subprocess_info *sub_info) { -complete (sub_info->complete); +struct completion *comp =xchg (&sub_info->complete,NULL ); +/* +* See call_usermodehelper_exec(). If xchg() returns NULL +* we own sub_info, the UMH_KILLABLE caller has gone away. +*/ +if (comp) +complete (comp); +else +call_usermodehelper_freeinfo (sub_info); }/* Keventd can't block, but this (a child) can. */
@@ -250,6 +258,9 @@ static void __call_usermodehelper(structenum umh_wait wait = sub_info->wait;pid_t pid; +if (wait !=UMH_NO_WAIT ) + wait &= ~UMH_KILLABLE ; +/* CLONE_VFORK: wait until the usermode helper has execve'd * successfully We need the data structures to stay around * until that is done. */
@@ -440,9 +451,21 @@ int call_usermodehelper_exec(struct subpqueue_work (khelper_wq, &sub_info->work);if (wait ==UMH_NO_WAIT )/* task has freed sub_info */ goto unlock; + +if (wait &UMH_KILLABLE ) { + retval =wait_for_completion_killable (&done); +if (!retval) + goto wait_done; + +/* umh_complete() will see NULL and free sub_info */ +if (xchg (&sub_info->complete,NULL )) + goto unlock; +/* fallthrough, umh_complete() was already called */ + } +wait_for_completion (&done); +wait_done: retval = sub_info->retval; - out:call_usermodehelper_freeinfo (sub_info); unlock:
PATCH 146/153 usermodehelper: ____call_usermodehelper() doesnt need do_exit()
In reply to Ben Hutchings3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit 5b9bd473e3b8a8c6c4ae99be475e6e9b27568555 upstream.
Minor cleanup. ____call_usermodehelper() can simply return, no need to call do_exit() explicitely.
--- kernel/kmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/kmod.c +1 -1
@@ -186,7 +186,7 @@ static int ____call_usermodehelper(void/* Exec failed? */ fail: sub_info->retval = retval; -do_exit (0 ); +return 0 ; }void call_usermodehelper_freeinfo (struct subprocess_info *info)