3.6.11.9-rc1-stable review
Subsystems (119)
Steven Rostedt
maintainercover 3.6.11.9-rc1-stable review
[ Yes, I know I said I would stop support of 3.6-stable, but
I had a need for another release. I may make one or two more but don't count on it. ]
This is the start of the stable review cycle for 3.6.11.9-rc1 release. There are 251 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 Sat Sep 14 00:25:47 2013. Anything received after that time might be too late.
Aaro Koskinen (1):
powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)
[fe956a1d4081ce1a959f87df397a15e252201f10]
Aaron Plattner (1):
ALSA: hda - Add new GPU codec ID to snd-hda
[d52392b1a80458c0510810789c7db4a39b88022a]
Al Viro (2):
reiserfs: fix deadlock in umount
[672fe15d091ce76d6fb98e489962e9add7c1ba4c]
livelock avoidance in sget()
[acfec9a5a892f98461f52ed5770de99a3e571ae2]
Alex Deucher (3):
drm/radeon/atom: initialize more atom interpretor elements to 0
[42a21826dc54583cdb79cc8477732e911ac9c376]
drm/radeon: improve dac adjust heuristics for legacy pdac
[03ed8cf9b28d886c64c7e705c7bb1a365fd8fb95]
drm/radeon: fix endian issues with DP handling (v3)
[34be8c9af7b8728465963740fc11136ae90dfc36]
Alex Williamson (1):
iommu/amd: Only unmap large pages from the first pte
[60d0ca3cfd199b6612bbbbf4999a3470dad38bb1]
Alexandr \\\"Sky\\\" Ivanov (1):
USB: option: add D-Link DWM-152/C1 and DWM-156/C1
[ca24763588844b14f019ffc45c7df6d9e8f932c5]Amit Shah (5):
virtio: console: return -ENODEV on all read operations after unplug
[96f97a83910cdb9d89d127c5ee523f8fc040a804]
virtio: console: fix raising SIGIO after port unplug
[92d3453815fbe74d539c86b60dab39ecdf01bb99]
virtio: console: clean up port data immediately at time of unplug
[ea3768b4386a8d1790f4cc9a35de4f55b92d6442]
virtio: console: fix race in port_fops_open() and port unplug
[671bdea2b9f210566610603ecbb6584c8a201c8c]
virtio: console: fix race with port unplug and open/close
[057b82be3ca3d066478e43b162fc082930a746c9]
Andrew Vagin (1):
tracing: Fix fields of struct trace_iterator that are zeroed by mistake
[ed5467da0e369e65b247b99eb6403cb79172bcda]
Anthony Foiani (1):
sata_fsl: save irqs while coalescing
[99bbdfa6bdcb4bdf5be914a48e9b46941bf30819]
Anton Blanchard (1):
powerpc/modules: Module CRC relocation fix causes perf issues
[0e0ed6406e61434d3f38fb58aa8464ec4722b77e]
Arnd Bergmann (2):
mtd: omap2: allow bulding as a module
[930d800bded771b26d9944c47810829130ff7c8c]
nsp32: use mdelay instead of large udelay constants
[b497ceb964a80ebada3b9b3cea4261409039e25a]
Barry Grussling (1):
usb: cp210x support SEL C662 Vendor/Device
[b579fa52f6be0b4157ca9cc5e94d44a2c89a7e95]Baruch Siach (1):
clocksource: dw_apb: Fix error check
[1a33bd2be705cbb3f57d7223b60baea441039307]
Benjamin Herrenschmidt (1):
powerpc: Don't Oops when accessing /proc/powerpc/lparcfg without hypervisor
[f5f6cbb61610b7bf9d9d96db9c3979d62a424bab]
Bjørn Mork (1):
megaraid_sas: fix memory leak if SGL has zero length entries
[7a6a731bd00ca90d0e250867c3b9c05b5ff0fa49]
Brian Austin (1):
ASoC: cs42l52: Reorder Min/Max and update to SX_TLV for Beep Volume
[e2c98a8bba958045bde861fe1d66be54315c7790]
Bu, Yitian (1):
printk: Fix rq->lock vs logbuf_lock unlock lock inversion
[dbda92d16f8655044e082930e4e9d244b87fde77]Catalin Marinas (1):
ARM: 7790/1: Fix deferred mm switch on VIVT processors
[bdae73cd374e28db544fdd9b77de689a36e3c129]
Chen Gang (2):
cifs: extend the buffer length enought for sprintf() using
[057d6332b24a4497c55a761c83c823eed9e3f23b]
powerpc/smp: Section mismatch from smp_release_cpus to __initdata spinning_secondaries
[8246aca7058f3f2c2ae503081777965cd8df7b90]
Chih-Chung Chang (1):
ASoC: max98088 - fix element type of the register cache.
[cb6f66a2d278e57a6c9d8fb59bd9ebd8ab3965c2]
Cho, Yu-Chen (1):
Bluetooth: Add support for Mediatek Bluetooth device [0e8d:763f]
[178c059e7640aa8e50213400c6f3dde00189d979]
Chris Wilson (1):
drm/i915: Invalidate TLBs for the rings after a reset
[884020bf3d2a3787a1cc6df902e98e0eec60330b]
Chuck Anderson (1):
xen/smp: initialize IPI vectors before marking CPU online
[fc78d343fa74514f6fd117b5ef4cd27e4ac30236]
Clemens Ladisch (1):
ALSA: usb-audio: do not trust too-big wMaxPacketSize values
[57e6dae1087bbaa6b33d3dd8a8e90b63888939a3]
Cong Wang (1):
vti: remove duplicated code to fix a memory leak
[ab6c7a0a43c2eaafa57583822b619b22637b49c7]
Curt Brune (1):
hwmon: (adt7470) Fix incorrect return code check
[93d783bcca69bfacc8dc739d8a050498402587b5]
Dan Carpenter (6):
Hostap: copying wrong data prism2_ioctl_giwaplist()
[909bd5926d474e275599094acad986af79671ac9]
net_sched: info leak in atm_tc_dump_class()
[8cb3b9c3642c0263d48f31d525bcee7170eedc20]
af_key: more info leaks in pfkey messages
[ff862a4668dd6dba962b1d2d8bd344afa6375683]
arcnet: cleanup sizeof parameter
[087d273caf4f7d3f2159256f255f1f432bc84a5b]
fanotify: info leak in copy_event_to_user()
[de1e0c40aceb9d5bff09c3a3b97b2f1b178af53f]
svcrdma: underflow issue in decode_write_list()
[b2781e1021525649c0b33fffd005ef219da33926]
Dan Williams (1):
usb: serial: option: add Olivetti Olicard 200
[4cf76df06ecc852633ed927d91e01c83c33bc331]
Daniel Drake (1):
drivers/platform/olpc/olpc-ec.c: initialise earlier
[93dbc1b3b506e16c1f6d5b5dcfe756a85cb1dc58]
Daniel Hansel (1):
zfcp: fix adapter (re)open recovery while link to SAN is down
[f76ccaac4f82c463a037aa4a1e4ccb85c7011814]
Dave Airlie (1):
drm/ast: invalidate page tables when pinning a BO
[3ac65259328324de323dc006b52ff7c1a5b18d19]
Dave Jones (1):
x25: Fix broken locking in ioctl error paths.
[4ccb93ce7439b63c31bc7597bfffd13567fa483d]
Dave Kleikamp (2):
jfs: fix readdir cookie incompatibility with NFSv4
[44512449c0ab368889dd13ae0031fba74ee7e1d2]
sunvnet: vnet_port_remove must call unregister_netdev
[aabb9875d02559ab9b928cd6f259a5cc4c21a589]
David Jeffery (1):
lockd: protect nlm_blocked access in nlmsvc_retry_blocked
[1c327d962fc420aea046c16215a552710bde8231]
David S. Miller (1):
net_sched: Fix stack info leak in cbq_dump_wrr().
[a0db856a95a29efb1c23db55c02d9f0ff4f0db48]
David Vrabel (3):
x86/xen: do not identity map UNUSABLE regions in the machine E820
[3bc38cbceb85881a8eb789ee1aa56678038b1909]
xen/events: initialize local per-cpu mask for all possible events
[84ca7a8e45dafb49cd5ca90a343ba033e2885c17]
xen/evtchn: avoid a deadlock when unbinding an event channel
[179fbd5a45f0d4034cc6fd37b8d367a3b79663c4]
Egbert Eich (1):
drm/mgag200: Invalidate page tables when pinning a BO
[ecaac1c866bcda4780a963b3d18cd310d971aea3]
Eldad Zack (1):
ALSA: usb-audio: 6fire: return correct XRUN indication
[be2f93a4c4981b3646b6f98f477154411b8516cb]
Emmanuel Grumbach (2):
iwlwifi: pcie: disable L1 Active after pci_enable_device
[eabc4ac5d7606a57ee2b7308cb7323ea8f60183b]
iwlwifi: add DELL SKU for 5150 HMC
[a1923f1d4723e5757cefdd60f7c7ab30e472007a]
Enrico Mioso (2):
usb: serial: option.c: remove ONDA MT825UP product ID fromdriver
[878c69aae986ae97084458c0183a8c0a059865b1]
usb: serial: option: blacklist ONDA MT689DC QMI interface
[3d1a69e726406ab662ab88fa30a3a05ed404334d]
Eric Dumazet (4):
atl1c: Fix misuse of netdev_alloc_skb in refilling rx ring
[7b70176421993866e616f1cbc4d0dd4054f1bf78]
vlan: fix a race in egress prio management
[3e3aac497513c669e1c62c71e1d552ea85c1d974]
vlan: mask vlan prio bits
[d4b812dea4a236f729526facf97df1a9d18e191c]
neighbour: fix a race in neigh_destroy()
[c9ab4d85de222f3390c67aedc9c18a50e767531e]
Eugene Surovegin (1):
powerpc/hvsi: Increase handshake timeout from 200ms to 400ms.
[d220980b701d838560a70de691b53be007e99e78]
Ewan D. Milne (1):
sd: fix crash when UA received on DIF enabled device
[085b513f97d8d799d28491239be4b451bcd8c2c5]
Fabio Estevam (1):
ASoC: sglt5000: Fix SGTL5000_PLL_FRAC_DIV_MASK
[5c78dfe87ea04b501ee000a7f03b9432ac9d008c]Felipe Balbi (1):
usb: dwc3: gadget: don't prevent gadget from being probed if we fail
[cdcedd6981194e511cc206887db661d016069d68]
Gabor Juhos (1):
rt2x00: read 5GHz TX power values from the correct offset
[0a6f3a8ebaf13407523c2c7d575b4ca2debd23ba]
Geert Uytterhoeven (1):
m68k/atari: ARAnyM - Fix NatFeat module support
[e8184e10f89736a23ea6eea8e24cd524c5c513d2]
George Cherian (1):
usb: host: xhci: Enable XHCI_SPURIOUS_SUCCESS for all controllers with xhci 1.0
[07f3cb7c28bf3f4dd80bfb136cf45810c46ac474]
Gregory CLEMENT (1):
ARM: 7722/1: zImage: Convert 32bits memory size and address from ATAG to 64bits DTB
[faefd550c45d8d314e8f260f21565320355c947f]
H.J. Lu (1):
x86, fpu: correct the asm constraints for fxsave, unbreak mxcsr.daz
[eaa5a990191d204ba0f9d35dbe5505ec2cdd1460]
Hannes Frederic Sowa (4):
ipv6: take rtnl_lock and mark mrt6 table as freed on namespace cleanup
[905a6f96a1b18e490a75f810d733ced93c39b0e5]
ipv6: in case of link failure remove route directly instead of letting it expire
[1eb4f758286884e7566627164bca4c4a16952a83]
ipv6: ip6_append_data_mtu did not care about pmtudisc and frag_size
[75a493e60ac4bbe2e977e7129d6d8cbb0dd236be]
ipv6: call udp_push_pending_frames when uncorking a socket with AF_INET pending data
[8822b64a0fa64a5dd1dfcf837c5b0be83f8c05d1]
Hannes Reinecke (1):
dm mpath: fix ioctl deadlock when no paths
[6c182cd88d179cbbd06f4f8a8a19b6977940753f]
Harshula Jayasuriya (1):
nfsd: nfsd_open: when dentry_open returns an error do not propagate as struct file
[e4daf1ffbe6cc3b12aab4d604e627829e93e9914]
Hauke Mehrtens (1):
b43: ensue that BCMA is "y" when B43 is "y"
[693026ef2e751fd94d2e6c71028e68343cc875d5]
Helmut Schaa (1):
ath9k_htc: Restore skb headroom when returning skb to mac80211
[d2e9fc141e2aa21f4b35ee27072d84e9aa6e2ba0]
Huang Rui (1):
usb: dwc3: fix wrong bit mask in dwc3_event_type
[1974d494dea05ea227cb42f5e918828801e237aa]
Ian Abbott (1):
staging: comedi: COMEDI_CANCEL ioctl should wake up read/write
[69acbaac303e8cb948801a9ddd0ac24e86cc4a1b]
Imre Deak (1):
drm/i915: ivb: fix edp voltage swing reg val
[77fa4cbd5fa389e28419bbe8ac491b5fdd54840d]
J. Bruce Fields (1):
svcrpc: fix handling of too-short rpc's
[cf3aa02cb4a0c5af5557dd47f15a08a7df33182a]
Jacob Keller (1):
ixgbe: Fix Tx Hang issue with lldpad on 82598EB
[1eb9ac14c34a948bf1538bfb9034e8ab29099a64]
Jakob Bornecrantz (1):
drm/vmwgfx: Split GMR2_REMAP commands if they are to large
[6e4dcff3adbf25acb87e74500a58e3c07bdec40f]
Jan Beulich (1):
xen-netfront: pull on receive skb may need to happen earlier
[093b9c71b6e450e375f4646ba86faed0195ec7df]
Jan Kara (2):
jbd2: Fix use after free after error in jbd2_journal_dirty_metadata()
[91aa11fae1cf8c2fd67be0609692ea9741cdcc43]
writeback: Fix periodic writeback after fs mount
[a5faeaf9109578e65e1a32e2a3e76c8b47e7dcb6]
Jason Wang (4):
macvtap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
[ece793fcfc417b3925844be88a6a6dc82ae8f7c6]
tuntap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
[885291761dba2bfe04df4c0f7bb75e4c920ab82e]
macvtap: correctly linearize skb when zerocopy is used
[61d46bf979d5cd7c164709a80ad5676a35494aae]
tuntap: correctly linearize skb when zerocopy is used
[3dd5c3308e8b671e8e8882ba972f51cefbe9fd0d]
Jeff Skirvin (1):
isci: Fix a race condition in the SSP task management path
[96f15f29038e58e1b0a96483e2b369ff446becf1]
Jeff Wu (1):
ACPI: add _STA evaluation at do_acpi_find_child()
[c7d9ca90aa9497f0b6e301ec67c52dd4b57a7852]
Jiang Liu (6):
zram: protect sysfs handler from invalid memory access
[5863e10b441e7ea4b492f930f1be180a97d026f3]
zram: avoid access beyond the zram device
[12a7ad3b810e77137d0caf97a6dd97591e075b30]
zram: avoid double free in function zram_bvec_write()
[65c484609a3b25c35e4edcd5f2c38f98f5226093]
zram: destroy all devices on error recovery path in zram_init()
[39a9b8ac9333e4268ecff7da6c9d1ab3823ff243]
zram: use zram->lock to protect zram_free_page() in swap free notify path
[57ab048532c0d975538cebd4456491b5c34248f4]
zram: avoid invalid memory access in zram_exit()
[6030ea9b35971a4200062f010341ab832e878ac9]Jianpeng Ma (1):
elevator: Fix a race in elevator switching
[d50235b7bc3ee0a0427984d763ea7534149531b4]
Jiri Olsa (2):
perf: Remove WARN_ON_ONCE() check in __perf_event_enable() for valid scenario
[06f417968beac6e6b614e17b37d347aa6a6b1d30]
perf: Clone child context from parent context pmu
[734df5ab549ca44f40de0f07af1c8803856dfb18]
Joe Perches (1):
ndisc: Add missing inline to ndisc_addr_option_pad
[d9d10a30964504af834d8d250a0c76d4ae91eb1e]
Johan Hovold (10):
USB: keyspan: fix null-deref at disconnect and release
[ff8a43c10f1440f07a5faca0c1556921259f7f76]
USB: mos7720: fix broken control requests
[ef6c8c1d733e244f0499035be0dabe1f4ed98c6f]
USB: mos7840: fix big-endian probe
[d551ec9b690f3de65b0091a2e767f1382adc792d]
USB: ti_usb_3410_5052: fix big-endian firmware handling
[e877dd2f2581628b7119df707d4cf03d940cff49]
USB: mos7840: fix pointer casts
[683a0e4d7971c3186dc4d429027debfe309129aa]
USB: mos7840: fix race in led handling
[05cf0dec5ccc696a7636c84b265b477173498156]
USB: mos7840: fix device-type detection
[40c24f2893ba0ba7df485871f6aac0c197ceef5b]
USB: mos7840: fix race in register handling
[d8a083cc746664916d9d36ed9e4d08a29525f245]
USB: ti_usb_3410_5052: fix dynamic-id matching
[1fad56424f5ad3ce4973505a357212b2e2282b3f]
USB: mos7840: fix memory leak in open
[5f8a2e68b679b41cc8e9b642f2f5aa45dd678641]Johannes Berg (4):
cfg80211: fix P2P GO interface teardown
[74418edec915d0f446debebde08d170c7b8ba0ee]
genetlink: fix family dump race
[58ad436fcf49810aa006016107f494c9ac9013db]
mac80211: fix ethtool stats for non-station interfaces
[e13bae4f807401729b3f27c7e882a96b8b292809]
mac80211: fix duplicate retransmission detection
[6b0f32745dcfba01d7be33acd1b40306c7a914c6]
Josef Bacik (2):
Btrfs: re-add root to dead root list if we stop dropping it
[d29a9f629e009c9b90e5859bce581070fd6247fc]
Btrfs: fix lock leak when resuming snapshot deletion
[fec386ac1428f9c0e672df952cbca5cebd4e4e2f]
Jussi Kivilinna (2):
zd1201: do not use stack as URB transfer_buffer
[1206ff4ff9d2ef7468a355328bc58ac6ebf5be44]
ALSA: 6fire: fix DMA issues with URB transfer_buffer usage
[ddb6b5a964371e8e52e696b2b258bda144c8bd3f]
Jóhann B. Guðmundsson (1):
USB: misc: Add Manhattan Hi-Speed USB DVI Converter to sisusbvga
[58fc90db8261b571c026bb8bf23aad48a7233118]
Jörn Engel (1):
iscsi-target: Fix tfc_tpg_nacl_auth_cit configfs length overflow
[0fbfc46fb0b2f543a8b539e94c6c293ebc0b05a6]
Karlis Ogsts (1):
staging: android: logger: Correct write offset reset on error
[72bb99cfe9c57d2044445fb34bbc95b4c0bae6f2]
Kevin Hilman (1):
regmap: Add another missing header for !CONFIG_REGMAP stubs
[3f0fa9a808f98fa10a18ba2a73f13d65fda990fb]
Konrad Rzeszutek Wilk (1):
xen/blkback: Check device permissions before allowing OP_DISCARD
[604c499cbbcc3d5fe5fb8d53306aa0fae1990109]
Konstantin Khlebnikov (1):
drm/i915: fix long-standing SNB regression in power consumption after resume v2
[7dcd2677ea912573d9ed4bcd629b0023b2d11505]
Lan Tianyu (1):
ACPI / battery: Fix parsing _BIX return value
[016d5baad04269e8559332df05f89bd95b52d6ad]
Li Zefan (1):
cgroup: fix umount vs cgroup_cfts_commit() race
[084457f284abf6789d90509ee11dae383842b23b]
Liu ShuoX (1):
PM / Sleep: avoid 'autosleep' in shutdown progress
[e5248a111bf4048a9f3fab1a9c94c4630a10592a]
Luiz Angelo Daros de Luca (1):
usb: serial: cp210x: Add USB ID for Netgear Switches embedded serial adapter
[90625070c4253377025878c4e82feed8b35c7116]Mahesh Rajashekhara (1):
aacraid: Fix for arrays are going offline in the system. System hangs
[c5bebd829dd95602c15f8da8cc50fa938b5e0254]
Mark Kettenis (1):
drm/radeon: fix combios tables on older cards
[cef1d00cd56f600121ad121875655ad410a001b8]
Markos Chandras (2):
MIPS: Expose missing pci_io{map,unmap} declarations
[78857614104a26cdada4c53eea104752042bf5a1]
lib/Kconfig.debug: Restrict FRAME_POINTER for MIPS
[25c87eae1725ed77a8b44d782a86abdc279b4ede]
Martin K. Petersen (1):
Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
[7562523e84ddc742fe1f9db8bd76b01acca89f6b]
Martin Peschke (2):
zfcp: fix schedule-inside-lock in scsi_device list loops
[924dd584b198a58aa7cb3efefd8a03326550ce8f]
zfcp: fix lock imbalance by reworking request queue locking
[d79ff142624e1be080ad8d09101f7004d79c36e1]
Mateusz Krawczuk (1):
regmap: Add missing header for !CONFIG_REGMAP stubs
[49ccc142f9cbc33fdda18e8fa90c1c5b4a79c0ad]
Matt Burtch (1):
USB-Serial: Fix error handling of usb_wwan
[6c1ee66a0b2bdbd64c078fba684d640cf2fd38a9]
Michael S. Tsirkin (3):
skb: report completion status for zero copy skbs
[e19d6763cc300fcb706bd291b24ac06be71e1ce6]
virtio_net: fix race in RX VQ processing
[cbdadbbf0c790f79350a8f36029208944c5487d0]
virtio: support unlocked queue poll
[cc229884d3f77ec3b1240e467e0236c3e0647c0c]
Michal Kazior (1):
nl80211: fix mgmt tx status and testmode reporting for netns
[a0ec570f4f69c4cb700d743a915096c2c8f56a99]
Michal Srb (1):
drm/cirrus: Invalidate page tables when pinning a BO
[109a51598869a39fdcec2d49672a9a39b6d89481]
Michal Tesar (1):
sysctl net: Keep tcp_syn_retries inside the boundary
[651e92716aaae60fc41b9652f54cb6803896e0da]
Mikulas Patocka (1):
dm verity: fix inability to use a few specific devices sizes
[b1bf2de07271932326af847a3c6a01fdfd29d4be]
Neil Horman (3):
8139cp: Add dma_mapping_error checking
[cf3c4c03060b688cbc389ebc5065ebcce5653e96]
x86/iommu/vt-d: Expand interrupt remapping quirk to cover x58 chipset
[803075dba31c17af110e1d9a915fe7262165b213]
atl1e: fix dma mapping warnings
[352900b583b2852152a1e05ea0e8b579292e731e]
NeilBrown (3):
md/raid10: remove use-after-free bug.
[0eb25bb027a100f5a9df8991f2f628e7d851bc1e]
md/raid5: fix interaction of 'replace' and 'recovery'.
[f94c0b6658c7edea8bc19d13be321e3860a3fa54]
md/raid10: fix two bugs affecting RAID10 reshape.
[78eaa0d4cbcdb345992fa3dd22b3bcbb473cc064]
Nicholas Bellinger (1):
target: Fix trailing ASCII space usage in INQUIRY vendor+model
[ee60bddba5a5f23e39598195d944aa0eb2d455e5]
Nicolas Ferre (1):
ARM: at91/DT: fix at91sam9n12ek memory node
[a57603ca2871ee0773b00839c1ea35c4a2d3eeb0]
Nicolas Pitre (1):
ARM: 7816/1: CONFIG_KUSER_HELPERS: fix help text
[ac124504ecf6b20a2457d873d0728a8b991a5b0c]
Nicolin Chen (1):
ASoC: wm8962: Remove remaining direct register cache accesses
[2e7ee15ced914e109a1a5b6dfcd463d846a13bd5]
Oleg Nesterov (2):
debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs)
[776164c1faac4966ab14418bb0922e1820da1d19]
userns: limit the maximum depth of user_namespace->parent chain
[8742f229b635bf1c1c84a3dfe5e47c814c20b5c8]Oleksij Rempel (2):
ath9k_htc: do some initial hardware configuration
[dc2a87f519a4d8cb376ab54f22b6b98a943b51ce]
xhci: fix null pointer dereference on ring_doorbell_for_active_rings
[d66eaf9f89502971fddcb0de550b01fa6f409d83]
Oliver Neukum (1):
usb: add two quirky touchscreen
[304ab4ab079a8ed03ce39f1d274964a532db036b]
Paul Mackerras (1):
powerpc: Work around gcc miscompilation of __pa() on 64-bit
[bdbc29c19b2633b1d9c52638fb732bcde7a2031a]
Peter Zijlstra (1):
perf: Fix perf_lock_task_context() vs RCU
[058ebd0eba3aff16b144eabf4510ed9510e1416e]
Piotr Sarna (1):
ext4: fix mount/remount error messages for incompatible mount options
[6ae6514b33f941d3386da0dfbe2942766eab1577]
Radu Caragea (1):
x86 get_unmapped_area(): use proper mmap base for bottom-up direction
[df54d6fa54275ce59660453e29d1228c2b45a826]
Ralf Baechle (2):
RAPIDIO: IDT_GEN2: Fix build error.
[27f62b9f294b7e2019c94c385abda43a0af6bb8b]
MIPS: Oceton: Fix build error.
[39205750efa6d335fac4f9bcd32b49c7e71c12b7]
Ren Bigcren (1):
USB: storage: Add MicroVault Flash Drive to unusual_devs
[e7a6121f4929c17215f0cdca3726f4bf3e4e9529]
Rick Farina (Zero_Chaos) (1):
USB: serial: ftdi_sio: add more RT Systems ftdi devices
[fed1f1ed90bce42ea010e2904cbc04e7b8304940]
Roger Quadros (1):
USB: EHCI: Fix resume signalling on remote wakeup
[47a64a13d54f6c669b00542848d5550be3d3310e]
Roland Dreier (1):
sg: Fix user memory corruption when SG_IO is interrupted by a signal
[35dc248383bbab0a7203fca4d722875bc81ef091]
Russ Anderson (1):
drivers/base/memory.c: fix show_mem_removable() to handle missing sections
[21ea9f5ace3a7317cc3ba1fbc749758021a83136]
Russell King (7):
ARM: make vectors page inaccessible from userspace
[a5463cd3435475386cbbe7b06e01292ac169d36f]
ARM: allow kuser helpers to be removed from the vector page
[f6f91b0d9fd971c630cef908dde8fe8795aefbf8]
ARM: update FIQ support for relocation of vectors
[e39e3f3ebfef03450cf7bfa7a974a8c61f7980c8]
ARM: use linker magic for vectors and vector stubs
[b9b32bf70f2fb710b07c94e13afbc729afe221da]
ARM: move vector stubs
[19accfd373847ac3d10623c5d20f948846299741]
ARM: poison memory between kuser helpers
[5b43e7a383d69381ffe53423e46dd0fafae07da3]
ARM: poison the vectors page
[f928d4f2a86f46b030fa0850385b4391fc2b5918]
Sami Rahman (1):
USB: cp210x: add MMB and PI ZigBee USB Device Support
[7681156982026ebf7eafd7301eb0374d7648d068]Sarah Sharp (1):
xhci: Avoid NULL pointer deref when host dies.
[203a86613fb3bf2767335659513fa98563a3eb71]
Sasha Levin (1):
9p: fix off by one causing access violations and memory corruption
[110ecd69a9feea82a152bbf9b12aba57e6396883]
Saurav Kashyap (1):
qla2xxx: Properly set the tagging for commands.
[c3ccb1d7cf4c4549151876dd37c0944a682fd9e1]
Sekhar Nori (1):
ARM: davinci: nand: specify ecc strength
[acd36357edc08649e85ff15dc4ed62353c912eff]
Sergey Senozhatsky (2):
zram: allow request end to coincide with disksize
[75c7caf5a052ffd8db3312fa7864ee2d142890c4]
radeon kms: do not flush uninitialized hotplug work
[a01c34f72e7cd2624570818f579b5ab464f93de2]
Seth Heasley (1):
ata_piix: IDE-mode SATA patch for Intel Coleto Creek DeviceIDs
[c7e8695bfa0611b39493a9dfe8bab9f63f9809bd]
Shane Huang (1):
i2c-piix4: Add AMD CZ SMBus device ID
[b996ac90f595dda271cbd858b136b45557fc1a57]
Sreekanth Reddy (1):
mpt2sas: fix firmware failure with wrong task attribute
[48ba2efc382f94fae16ca8ca011e5961a81ad1ea]
Stanislaw Gruszka (5):
iwlwifi: dvm: fix calling ieee80211_chswitch_done() with NULL
[9186a1fd9ed190739423db84bc344d258ef3e3d7]
iwl4965: reset firmware after rfkill off
[788f7a56fce1bcb2067b62b851a086fca48a0056]
iwl4965: set power mode early
[eca396d7a5bdcc1fd67b1b12f737c213ac78a6f4]
rt2x00: fix stop queue
[e2288b66fe7ff0288382b2af671b4da558b44472]
Bluetooth: ath3k: don't use stack memory for DMA
[517828a87994f41af6ae5a0f96f0f069f05baa81]
Steffen Maier (2):
zfcp: status read buffers on first adapter open with link down
[9edf7d75ee5f21663a0183d21f702682d0ef132f]
zfcp: block queue limits with data router
[5fea4291deacd80188b996d2f555fc6a1940e5d4]
Stephane Grosjean (1):
can: pcan_usb: fix wrong memcpy() bytes length
[3c322a56b01695df15c70bfdc2d02e0ccd80654e]
Stephen Boyd (1):
perf/arm: Fix armpmu_map_hw_event()
[b88a2595b6d8aedbd275c07dfa784657b4f757eb]
Stephen Warren (1):
ASoC: tegra: fix Tegra30 I2S capture parameter setup
[c90c0d7a96e634a73ef1580f1d20993606545647]
Sujith Manoharan (3):
ath9k: Enable PLL fix only for AR9340/AR9330
[19c361608ce3e73f352e323262f7e0a8264be3af]
ath9k: Do not assign noise for NULL caldata
[d3bcb7b24bbf09fde8405770e676fe0c11c79662]
ath9k_hw: Assign default xlna config for AR9485
[30d5b709da23f4ab9836c7f66d2d2e780a69cf12]
[email protected] (1):
megaraid_sas: megaraid_sas driver init fails in kdump kernel
[6431f5d7c6025f8b007af06ea090de308f7e6881]
Takashi Iwai (13):
ALSA: opti9xx: Fix conflicting driver object name
[fb615499f0ad28ed74201c1cdfddf9e64e205424]
ALSA: hda - Add inverted digital mic fixup for Acer Aspire One
[d3d3835ce919438c00c5d1270d6f9d6ffea59d03]
ALSA: hda - Add a fixup for Gateway LT27
[1801928e0f99d94c55e33c584c5eb2ff5e246ee6]
staging: line6: Fix unlocked snd_pcm_stop() call
[86f0b5b86d142b9323432fef078a6cf0fb5dda74]
ASoC: s6000: Fix unlocked snd_pcm_stop() call
[61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae]
ALSA: usx2y: Fix unlocked snd_pcm_stop() call
[5be1efb4c2ed79c3d7c0cbcbecae768377666e84]
ALSA: asihpi: Fix unlocked snd_pcm_stop() call
[60478295d6876619f8f47f6d1a5c25eaade69ee3]
ALSA: atiixp: Fix unlocked snd_pcm_stop() call
[cc7282b8d5abbd48c81d1465925d464d9e3eaa8f]
ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call
[46f6c1aaf790be9ea3c8ddfc8f235a5f677d08e2]
ALSA: ua101: Fix unlocked snd_pcm_stop() call
[9538aa46c2427d6782aa10036c4da4c541605e0e]
ALSA: 6fire: Fix unlocked snd_pcm_stop() call
[5b9ab3f7324a1b94a5a5a76d44cf92dfeb3b5e80]
ALSA: seq-oss: Initialize MIDI clients asynchronously
[256ca9c3ad5013ff8a8f165e5a82fab437628c8e]
ALSA: hda - Cache the MUX selection for generic HDMI
[bddee96b5d0db869f47b195fe48c614ca824203c]
Tejun Heo (3):
workqueue: cond_resched() after processing each work item
[b22ce2785d97423846206cceec4efee0c4afd980]
libata: make it clear that sata_inic162x is experimental
[bb9696192826a7d9279caf872e95b41bc26c7eff]
libata: skip SRST for all SIMG [34]7x port-multipliers
[7a87718d92760fc688628ad6a430643dafa16f1f]
Terry Suereth (1):
libata: apply behavioral quirks to sil3826 PMP
[8ffff94d20b7eb446e848e0046107d51b17a20a8]
Theodore Ts'o (2):
ext4: allow the mount options nodelalloc and data=journal
[59d9fa5c2e9086db11aa287bb4030151d0095a17]
ext4: make sure group number is bumped after a inode allocation race
[a34eb503742fd25155fd6cff6163daacead9fbc3]
Thomas Gleixner (2):
hrtimers: Move SMP function call to thread context
[5ec2481b7b47a4005bb446d176e5d0257400c77d]
tick: Prevent uncontrolled switch to oneshot mode
[1f73a9806bdd07a5106409bbcab3884078bd34fe]
Thomas Pugliese (1):
wusbcore: fix kernel panic when disconnecting a wireless USB->serial device
[ec58fad1feb76c323ef47efff1d1e8660ed4644c]Tomasz Moń (1):
mwifiex: Add missing endian conversion.
[83e612f632c3897be29ef02e0472f6d63e258378]
Torsten Schenk (2):
ALSA: 6fire: make buffers DMA-able (midi)
[4c2aee0032b70083dafebd733ed9c774633b2fa3]
ALSA: 6fire: make buffers DMA-able (pcm)
[5ece263f1d93fba8d992e67e3ab8a71acf674db9]
Toshi Kani (1):
ACPI / memhotplug: Fix a stale pointer in error path
[d19f503e22316a84c39bc19445e0e4fdd49b3532]
Trond Myklebust (1):
SUNRPC: Fix memory corruption issue on 32-bit highmem systems
[347e2233b7667e336d9f671f1a52dfa3f0416e2c]
Uwe Kleine-König (2):
serial/mxs-auart: increase time to wait for transmitter to become idle
[079a036f4283e2b0e5c26080b8c5112bc0cc1831]
serial/mxs-auart: fix race condition in interrupt handler
[d970d7fe65adff5efe75b4a73c4ffc9be57089f7]
Vince Weaver (1):
perf/x86: Fix intel QPI uncore event definitions
[c9601247f8f3fdc18aed7ed7e490e8dfcd07f122]
Vineet Gupta (1):
mm: fix the TLB range flushed when __tlb_remove_page() runs out of slots
[e6c495a96ce02574e765d5140039a64c8d4e8c9e]
Vinod Koul (1):
ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION
[a8d30608eaed6cc759b8e2e8a8bbbb42591f797f]
Vyacheslav Dubeyko (2):
nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detection
[4bf93b50fd04118ac7f33a3c2b8a0a1f9fa80bc9]
nilfs2: remove double bio_put() in nilfs_end_bio_write() for BIO_EOPNOTSUPP error
[2df37a19c686c2d7c4e9b4ce1505b5141e3e5552]
Wei Yongjun (1):
l2tp: add missing .owner to struct pppox_proto
[e1558a93b61962710733dc8c11a2bc765607f1cd]
Will Deacon (1):
ARM: 7809/1: perf: fix event validation for software group leaders
[c95eb3184ea1a3a2551df57190c81da695e2144b]
William Gulland (1):
usb: Clear both buffers when clearing a control transfer TT buffer.
[2c7b871b9102c497ba8f972aa5d38532f05b654d]
Wladislav Wiebe (1):
of: fdt: fix memory initialization for expanded DT
[9e40127526e857fa3f29d51e83277204fbdfc6ba]
Yinghai Lu (1):
x86: Fix /proc/mtrr with base/size more than 44bits
[d5c78673b1b28467354c2c30c3d4f003666ff385]
dingtianhong (3):
ifb: fix oops when loading the ifb failed
[f2966cd5691058b8674a20766525bedeaea9cbcf]
dummy: fix oops when loading the dummy failed
[2c8a01894a12665d8059fad8f0a293c98a264121]
ifb: fix rcu_sched self-detected stalls
[440d57bc5ff55ec1efb3efc9cbe9420b4bbdfefa]
yonghua zheng (1):
fs/proc/task_mmu.c: fix buffer overflow in add_page_map()
[8c8296223f3abb142be8fc31711b18a704c0e7d8]
zhangwei(Jovi) (2):
tracing: Fix irqs-off tag display in syscall tracing
[11034ae9c20f4057a6127fc965906417978e69b2]
uprobes: Fix return value in error handling path
[fa44063f9ef163c3a4c8d8c0465bb8a056b42035]
----
Documentation/i2c/busses/i2c-piix4 | 2 +- arch/arm/Kconfig | 3 +- arch/arm/boot/compressed/atags_to_fdt.c | 44 ++++- arch/arm/boot/dts/at91sam9n12ek.dts | 4 +- arch/arm/include/asm/mmu.h | 2 + arch/arm/include/asm/mmu_context.h | 20 ++- arch/arm/include/asm/page.h | 2 + arch/arm/include/asm/thread_info.h | 1 - arch/arm/kernel/entry-armv.S | 103 ++++++------ arch/arm/kernel/fiq.c | 19 ++- arch/arm/kernel/perf_event.c | 10 +- arch/arm/kernel/process.c | 7 +- arch/arm/kernel/traps.c | 37 +++-- arch/arm/kernel/vmlinux.lds.S | 17 ++ arch/arm/mach-davinci/board-dm355-leopard.c | 1 + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + arch/arm/mach-davinci/board-dm646x-evm.c | 1 + arch/arm/mach-davinci/board-neuros-osd2.c | 1 + arch/arm/mm/Kconfig | 37 +++++ arch/arm/mm/mmu.c | 14 +- arch/m68k/emu/natfeat.c | 23 ++- arch/mips/Kconfig | 2 +- arch/mips/cavium-octeon/setup.c | 3 +- arch/mips/include/asm/io.h | 5 + arch/powerpc/Kconfig | 1 + arch/powerpc/include/asm/module.h | 5 +- arch/powerpc/include/asm/page.h | 10 ++ arch/powerpc/kernel/lparcfg.c | 23 +-- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/vmlinux.lds.S | 3 - arch/x86/kernel/cpu/mtrr/generic.c | 21 +-- arch/x86/kernel/cpu/mtrr/main.c | 16 +- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 4 +- arch/x86/kernel/early-quirks.c | 14 +- arch/x86/kernel/i387.c | 2 +- arch/x86/kernel/sys_x86_64.c | 2 +- arch/x86/mm/mmap.c | 2 +- arch/x86/xen/setup.c | 22 +++ arch/x86/xen/smp.c | 11 +- block/cfq-iosched.c | 17 +- block/deadline-iosched.c | 16 +- block/elevator.c | 25 +-- block/noop-iosched.c | 17 +- drivers/acpi/acpi_memhotplug.c | 1 + drivers/acpi/battery.c | 2 + drivers/acpi/glue.c | 6 +- drivers/ata/Kconfig | 2 +- drivers/ata/ata_piix.c | 2 + drivers/ata/libata-pmp.c | 45 ++--- drivers/ata/sata_fsl.c | 5 +- drivers/ata/sata_inic162x.c | 14 ++ drivers/base/memory.c | 2 + drivers/block/xen-blkback/blkback.c | 13 +- drivers/bluetooth/ath3k.c | 38 ++++- drivers/bluetooth/btusb.c | 3 + drivers/char/virtio_console.c | 47 +++--- drivers/clocksource/dw_apb_timer_of.c | 2 +- drivers/gpu/drm/ast/ast_ttm.c | 1 + drivers/gpu/drm/cirrus/cirrus_ttm.c | 1 + drivers/gpu/drm/i915/i915_dma.c | 10 +- drivers/gpu/drm/i915/i915_reg.h | 4 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 12 ++ drivers/gpu/drm/mgag200/mgag200_ttm.c | 1 + drivers/gpu/drm/radeon/atom.c | 5 + drivers/gpu/drm/radeon/atombios_dp.c | 43 ++++- drivers/gpu/drm/radeon/radeon_combios.c | 151 +++++------------ drivers/gpu/drm/radeon/radeon_irq_kms.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 58 ++++--- drivers/hwmon/adt7470.c | 2 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-piix4.c | 3 +- drivers/iommu/amd_iommu.c | 6 +- drivers/macintosh/windfarm_rm31.c | 18 +- drivers/md/dm-mpath.c | 8 +- drivers/md/dm-verity.c | 5 +- drivers/md/dm.c | 9 +- drivers/md/raid10.c | 12 +- drivers/md/raid5.c | 15 +- drivers/md/raid5.h | 1 + drivers/mtd/nand/Kconfig | 2 +- drivers/net/arcnet/arcnet.c | 2 +- drivers/net/can/usb/peak_usb/pcan_usb.c | 2 +- drivers/net/dummy.c | 4 + drivers/net/ethernet/atheros/atl1c/atl1c.h | 3 + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 40 ++++- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 28 +++- drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 3 +- drivers/net/ethernet/realtek/8139cp.c | 48 +++++- drivers/net/ethernet/sun/sunvnet.c | 2 + drivers/net/ifb.c | 8 +- drivers/net/macvtap.c | 66 +++++--- drivers/net/tun.c | 69 +++++--- drivers/net/virtio_net.c | 5 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 +- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 + drivers/net/wireless/ath/ath9k/calib.c | 1 - drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 10 ++ drivers/net/wireless/ath/ath9k/main.c | 3 +- drivers/net/wireless/b43/Kconfig | 4 +- drivers/net/wireless/hostap/hostap_ioctl.c | 4 +- drivers/net/wireless/iwlegacy/4965-mac.c | 16 +- drivers/net/wireless/iwlegacy/common.c | 1 + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 5 +- drivers/net/wireless/iwlwifi/pcie/drv.c | 1 + drivers/net/wireless/iwlwifi/pcie/trans.c | 10 +- drivers/net/wireless/mwifiex/sdio.c | 4 +- drivers/net/wireless/rt2x00/rt2800lib.c | 4 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 18 +- drivers/net/wireless/rt2x00/rt61pci.c | 3 +- drivers/net/wireless/rt2x00/rt73usb.c | 3 +- drivers/net/wireless/zd1201.c | 4 +- drivers/net/xen-netfront.c | 50 ++---- drivers/of/fdt.c | 2 + drivers/platform/olpc/olpc-ec.c | 2 +- drivers/rapidio/switches/idt_gen2.c | 2 + drivers/s390/scsi/zfcp_aux.c | 5 +- drivers/s390/scsi/zfcp_erp.c | 29 +++- drivers/s390/scsi/zfcp_fsf.c | 27 ++- drivers/s390/scsi/zfcp_qdio.c | 8 +- drivers/s390/scsi/zfcp_scsi.c | 10 +- drivers/scsi/aacraid/src.c | 3 + drivers/scsi/isci/task.c | 9 +- drivers/scsi/megaraid/megaraid_sas_base.c | 30 +++- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 6 +- drivers/scsi/nsp32.c | 2 +- drivers/scsi/qla2xxx/qla_iocb.c | 11 +- drivers/scsi/scsi.c | 3 + drivers/scsi/sd.c | 22 +-- drivers/staging/android/logger.c | 4 +- drivers/staging/comedi/comedi_fops.c | 7 +- drivers/staging/line6/pcm.c | 5 +- drivers/staging/zram/zram_drv.c | 38 +++-- drivers/staging/zram/zram_drv.h | 5 +- drivers/staging/zram/zram_sysfs.c | 2 + drivers/target/iscsi/iscsi_target_configfs.c | 2 +- drivers/target/target_core_spc.c | 9 +- drivers/tty/hvc/hvsi_lib.c | 4 +- drivers/tty/serial/mxs-auart.c | 38 +++-- drivers/usb/core/hub.c | 9 + drivers/usb/core/quirks.c | 6 + drivers/usb/dwc3/core.h | 4 +- drivers/usb/dwc3/gadget.c | 1 + drivers/usb/host/ehci-hub.c | 1 + drivers/usb/host/xhci-pci.c | 1 - drivers/usb/host/xhci-ring.c | 2 +- drivers/usb/host/xhci.c | 13 +- drivers/usb/misc/sisusbvga/sisusb.c | 1 + drivers/usb/serial/cp210x.c | 4 + drivers/usb/serial/ftdi_sio.c | 31 +++- drivers/usb/serial/ftdi_sio_ids.h | 34 +++- drivers/usb/serial/keyspan.c | 2 +- drivers/usb/serial/mos7720.c | 21 ++- drivers/usb/serial/mos7840.c | 175 ++++++++++++-------- drivers/usb/serial/option.c | 14 +- drivers/usb/serial/ti_usb_3410_5052.c | 11 +- drivers/usb/serial/usb_wwan.c | 20 +-- drivers/usb/storage/unusual_devs.h | 7 + drivers/usb/wusbcore/wa-xfer.c | 9 +- drivers/vhost/vhost.c | 2 +- drivers/vhost/vhost.h | 2 +- drivers/virtio/virtio_ring.c | 54 ++++-- drivers/xen/events.c | 2 +- drivers/xen/evtchn.c | 21 +-- fs/bio.c | 20 ++- fs/block_dev.c | 9 +- fs/btrfs/extent-tree.c | 13 ++ fs/cifs/cifsencrypt.c | 2 +- fs/cifs/cifsglob.h | 1 + fs/cifs/connect.c | 7 +- fs/cifs/sess.c | 6 +- fs/debugfs/inode.c | 69 +++----- fs/ext4/ext4_jbd2.c | 8 +- fs/ext4/ialloc.c | 10 +- fs/ext4/super.c | 19 ++- fs/jfs/jfs_dtree.c | 31 +++- fs/lockd/svclock.c | 4 + fs/nfsd/vfs.c | 5 +- fs/nilfs2/segbuf.c | 5 +- fs/notify/fanotify/fanotify_user.c | 1 + fs/proc/task_mmu.c | 8 +- fs/reiserfs/procfs.c | 92 +++------- fs/reiserfs/super.c | 3 +- fs/super.c | 25 ++- include/linux/elevator.h | 6 +- include/linux/ftrace_event.h | 4 +- include/linux/if_vlan.h | 3 +- include/linux/regmap.h | 2 + include/linux/sched.h | 1 + include/linux/skbuff.h | 4 +- include/linux/user_namespace.h | 1 + include/linux/virtio.h | 4 + include/linux/wait.h | 57 +++++++ include/net/ndisc.h | 2 +- include/net/udp.h | 1 + kernel/cgroup.c | 9 +- kernel/events/core.c | 28 +++- kernel/hrtimer.c | 28 ++-- kernel/power/autosleep.c | 3 +- kernel/printk.c | 2 +- kernel/time/tick-broadcast.c | 10 +- kernel/trace/trace.c | 1 + kernel/trace/trace_syscalls.c | 21 ++- kernel/trace/trace_uprobe.c | 4 +- kernel/user_namespace.c | 4 + kernel/workqueue.c | 9 + lib/Kconfig.debug | 2 +- mm/memory.c | 9 +- net/8021q/vlan_core.c | 2 +- net/8021q/vlan_dev.c | 7 + net/9p/trans_common.c | 10 +- net/core/dev.c | 11 +- net/core/neighbour.c | 12 +- net/core/skbuff.c | 4 +- net/ipv4/ip_vti.c | 7 - net/ipv4/sysctl_net_ipv4.c | 6 +- net/ipv4/udp.c | 3 +- net/ipv6/ip6_output.c | 16 +- net/ipv6/ip6mr.c | 5 + net/ipv6/route.c | 9 +- net/ipv6/udp.c | 7 +- net/key/af_key.c | 4 + net/l2tp/l2tp_ppp.c | 3 +- net/mac80211/cfg.c | 2 + net/mac80211/rx.c | 10 +- net/netlink/genetlink.c | 7 + net/sched/sch_atm.c | 1 + net/sched/sch_cbq.c | 1 + net/sunrpc/svcsock.c | 5 +- net/sunrpc/xdr.c | 9 +- net/sunrpc/xprtrdma/svc_rdma_marshal.c | 20 ++- net/wireless/core.c | 1 + net/wireless/nl80211.c | 7 +- net/x25/af_x25.c | 15 +- sound/arm/pxa2xx-pcm-lib.c | 2 + sound/core/compress_offload.c | 2 +- sound/core/seq/oss/seq_oss_init.c | 16 +- sound/core/seq/oss/seq_oss_midi.c | 2 +- sound/isa/opti9xx/opti92x-ad1848.c | 8 +- sound/pci/asihpi/asihpi.c | 3 + sound/pci/atiixp.c | 2 + sound/pci/atiixp_modem.c | 2 + sound/pci/hda/patch_hdmi.c | 4 +- sound/pci/hda/patch_realtek.c | 2 + sound/soc/codecs/cs42l52.c | 2 +- sound/soc/codecs/max98088.c | 2 +- sound/soc/codecs/sgtl5000.h | 2 +- sound/soc/codecs/wm8962.c | 24 +-- sound/soc/s6000/s6000-pcm.c | 2 + sound/soc/tegra/tegra30_i2s.c | 2 +- sound/usb/6fire/comm.c | 38 ++++- sound/usb/6fire/comm.h | 2 +- sound/usb/6fire/midi.c | 16 +- sound/usb/6fire/midi.h | 6 +- sound/usb/6fire/pcm.c | 55 +++++- sound/usb/6fire/pcm.h | 2 +- sound/usb/endpoint.c | 13 +- sound/usb/misc/ua101.c | 14 +- sound/usb/usx2y/usbusx2yaudio.c | 4 + 259 files changed, 2152 insertions(+), 1107 deletions(-)
Steven Rostedt
maintainerPATCH 1/251 powerpc/smp: Section mismatch from smp_release_cpus to __initdata spinning_secondaries
3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Chen Gang <[email protected]>
[ Upstream commit 8246aca7058f3f2c2ae503081777965cd8df7b90 ]
the smp_release_cpus is a normal funciton and called in normal environments,
but it calls the __initdata spinning_secondaries.
need modify spinning_secondaries to match smp_release_cpus.
the related warning:
(the linker report boot_paca.33377, but it should be spinning_secondaries)
-----------------------------------------------------------------------------
WARNING: arch/powerpc/kernel/built-in.o(.text+0x23176): Section mismatch in reference from the function .smp_release_cpus() to the variable .init.data:boot_paca.33377 The function .smp_release_cpus() references
the variable __initdata boot_paca.33377.
This is often because .smp_release_cpus lacks a __initdata
annotation or the annotation of boot_paca.33377 is wrong.
WARNING: arch/powerpc/kernel/built-in.o(.text+0x231fe): Section mismatch in reference from the function .smp_release_cpus() to the variable .init.data:boot_paca.33377 The function .smp_release_cpus() references
the variable __initdata boot_paca.33377.
This is often because .smp_release_cpus lacks a __initdata
annotation or the annotation of boot_paca.33377 is wrong.
-----------------------------------------------------------------------------
--- arch/powerpc/kernel/setup_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/setup_64.c +1 -1
@@ -76,7 +76,7 @@#endif int boot_cpuid =0 ; -int __initdata spinning_secondaries; +int spinning_secondaries;u64 ppc64_pft_size;/* Pick defaults since we might want to patch instructions
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 2/251 ALSA: hda - Cache the MUX selection for generic HDMI
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit bddee96b5d0db869f47b195fe48c614ca824203c ]
When a selection to a converter MUX is changed in hdmi_pcm_open(), it should be cached so that the given connection can be restored properly at PM resume. We need just to replace the corresponding snd_hda_codec_write() call with snd_hda_codec_write_cache().
--- sound/pci/hda/patch_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/patch_hdmi.c +1 -1
@@ -908,7 +908,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, per_cvt->assigned =1 ; hinfo->nid = per_cvt->cvt_nid; -snd_hda_codec_write (codec, per_pin->pin_nid,0 , +snd_hda_codec_write_cache (codec, per_pin->pin_nid,0 ,AC_VERB_SET_CONNECT_SEL , mux_idx);snd_hda_spdif_ctls_assign (codec, pin_idx, per_cvt->cvt_nid);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 3/251 ALSA: hda - Add new GPU codec ID to snd-hda
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Aaron Plattner <[email protected]>
[ Upstream commit d52392b1a80458c0510810789c7db4a39b88022a ]
Vendor ID 0x10de0060 is used by a yet-to-be-named GPU chip.
--- sound/pci/hda/patch_hdmi.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_hdmi.c +2 -0
@@ -1921,6 +1921,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = { { .id = 0x10de0043, .name = "GPU 43 HDMI/DP", .patch = patch_generic_hdmi }, { .id = 0x10de0044, .name = "GPU 44 HDMI/DP", .patch = patch_generic_hdmi }, { .id = 0x10de0051, .name = "GPU 51 HDMI/DP", .patch = patch_generic_hdmi }, +{ .id = 0x10de0060, .name = "GPU 60 HDMI/DP", .patch = patch_generic_hdmi }, { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, { .id = 0x11069f80, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi },
@@ -1973,6 +1974,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de0042");MODULE_ALIAS ("snd-hda-codec-id:10de0043" );MODULE_ALIAS ("snd-hda-codec-id:10de0044" );MODULE_ALIAS ("snd-hda-codec-id:10de0051" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0060" );MODULE_ALIAS ("snd-hda-codec-id:10de0067" );MODULE_ALIAS ("snd-hda-codec-id:10de8001" );MODULE_ALIAS ("snd-hda-codec-id:11069f80" );
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 4/251 ALSA: seq-oss: Initialize MIDI clients asynchronously
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 256ca9c3ad5013ff8a8f165e5a82fab437628c8e ]
We've got bug reports that the module loading stuck on Debian system with 3.10 kernel. The debugging session revealed that the initial registration of OSS sequencer clients stuck at module loading time, which involves again with request_module() at the init phase. This is triggered only by special --install stuff Debian is using, but it's still not good to have such loops.
As a workaround, call the registration part asynchronously. This is a better approach irrespective of the hang fix, in anyway.
--- sound/core/seq/oss/seq_oss_init.c | 16 +++++++++++++--- sound/core/seq/oss/seq_oss_midi.c | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-)
sound/core/seq/oss/seq_oss_init.c +13 -3
@@ -31,6 +31,7 @@#include <linux/export.h> #include <linux/moduleparam.h> #include <linux/slab.h> +#include <linux/workqueue.h> /* * common variables
@@ -60,6 +61,14 @@ static void free_devinfo(void *private);#define call_ctl (type,rec) snd_seq_kernel_client_ctl(system_client, type, rec) +/* call snd_seq_oss_midi_lookup_ports() asynchronously */ +static void async_call_lookup_ports (struct work_struct *work) +{ +snd_seq_oss_midi_lookup_ports (system_client); +} + +static DECLARE_WORK(async_lookup_work, async_call_lookup_ports); +/* * create sequencer client for OSS sequencer */
@@ -85,9 +94,6 @@ snd_seq_oss_create_client(void) system_client = rc;debug_printk (("new client = %d\n" , rc)); -/* look up midi devices */ -snd_seq_oss_midi_lookup_ports (system_client); -/* create annoucement receiver port */ memset (port,0 ,sizeof (*port));strcpy (port->name,"Receiver" );
@@ -115,6 +121,9 @@ snd_seq_oss_create_client(void) } rc =0 ; +/* look up midi devices */ +schedule_work (&async_lookup_work); + __error:kfree (port);return rc;
@@ -160,6 +169,7 @@ receive_announce(struct snd_seq_event *ev, int direct, void *private, int atomicint snd_seq_oss_delete_client (void ) { +cancel_work_sync (&async_lookup_work);if (system_client >=0 )snd_seq_delete_kernel_client (system_client);
sound/core/seq/oss/seq_oss_midi.c +1 -1
@@ -72,7 +72,7 @@ static int send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev,* look up the existing ports * this looks a very exhausting job. */ -int __init +int snd_seq_oss_midi_lookup_ports (int client) {struct snd_seq_client_info *clinfo;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 5/251 ALSA: 6fire: Fix unlocked snd_pcm_stop() call
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 5b9ab3f7324a1b94a5a5a76d44cf92dfeb3b5e80 ]
snd_pcm_stop() must be called in the PCM substream lock context.
--- sound/usb/6fire/pcm.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
sound/usb/6fire/pcm.c +10 -2
@@ -639,17 +639,25 @@ int __devinit usb6fire_pcm_init(struct sfire_chip *chip)void usb6fire_pcm_abort (struct sfire_chip *chip) {struct pcm_runtime *rt = chip->pcm; +unsigned long flags;int i;if (rt) { rt->panic = true; -if (rt->playback.instance) +if (rt->playback.instance) { +snd_pcm_stream_lock_irqsave (rt->playback.instance, flags);snd_pcm_stop (rt->playback.instance,SNDRV_PCM_STATE_XRUN ); -if (rt->capture.instance) +snd_pcm_stream_unlock_irqrestore (rt->playback.instance, flags); + } + +if (rt->capture.instance) { +snd_pcm_stream_lock_irqsave (rt->capture.instance, flags);snd_pcm_stop (rt->capture.instance,SNDRV_PCM_STATE_XRUN ); +snd_pcm_stream_unlock_irqrestore (rt->capture.instance, flags); + }for (i =0 ; i <PCM_N_URBS ; i++) {usb_poison_urb (&rt->in_urbs[i].instance);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 6/251 ALSA: ua101: Fix unlocked snd_pcm_stop() call
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 9538aa46c2427d6782aa10036c4da4c541605e0e ]
snd_pcm_stop() must be called in the PCM substream lock context.
--- sound/usb/misc/ua101.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
sound/usb/misc/ua101.c +12 -2
@@ -613,14 +613,24 @@ static int start_usb_playback(struct ua101 *ua)static void abort_alsa_capture (struct ua101 *ua) { -if (test_bit (ALSA_CAPTURE_RUNNING , &ua->states)) +unsigned long flags; + +if (test_bit (ALSA_CAPTURE_RUNNING , &ua->states)) { +snd_pcm_stream_lock_irqsave (ua->capture.substream, flags);snd_pcm_stop (ua->capture.substream,SNDRV_PCM_STATE_XRUN ); +snd_pcm_stream_unlock_irqrestore (ua->capture.substream, flags); + } }static void abort_alsa_playback (struct ua101 *ua) { -if (test_bit (ALSA_PLAYBACK_RUNNING , &ua->states)) +unsigned long flags; + +if (test_bit (ALSA_PLAYBACK_RUNNING , &ua->states)) { +snd_pcm_stream_lock_irqsave (ua->playback.substream, flags);snd_pcm_stop (ua->playback.substream,SNDRV_PCM_STATE_XRUN ); +snd_pcm_stream_unlock_irqrestore (ua->playback.substream, flags); + } } static int set_stream_hw(struct ua101 *ua, struct snd_pcm_substream *substream,
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 7/251 ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 46f6c1aaf790be9ea3c8ddfc8f235a5f677d08e2 ]
snd_pcm_stop() must be called in the PCM substream lock context.
--- sound/arm/pxa2xx-pcm-lib.c | 2 ++ 1 file changed, 2 insertions(+)
sound/arm/pxa2xx-pcm-lib.c +2 -0
@@ -166,7 +166,9 @@ void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id) }else {printk (KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n" , rtd->params->name, dma_ch, dcsr); +snd_pcm_stream_lock (substream);snd_pcm_stop (substream,SNDRV_PCM_STATE_XRUN ); +snd_pcm_stream_unlock (substream); } }EXPORT_SYMBOL (pxa2xx_pcm_dma_irq);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 8/251 ALSA: atiixp: Fix unlocked snd_pcm_stop() call
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit cc7282b8d5abbd48c81d1465925d464d9e3eaa8f ]
snd_pcm_stop() must be called in the PCM substream lock context.
--- sound/pci/atiixp.c | 2 ++ sound/pci/atiixp_modem.c | 2 ++ 2 files changed, 4 insertions(+)
sound/pci/atiixp.c +2 -0
@@ -688,7 +688,9 @@ static void snd_atiixp_xrun_dma(struct atiixp *chip, struct atiixp_dma *dma)if (! dma->substream || ! dma->running)return ;snd_printdd ("atiixp: XRUN detected (DMA %d)\n" , dma->ops->type); +snd_pcm_stream_lock (dma->substream);snd_pcm_stop (dma->substream,SNDRV_PCM_STATE_XRUN ); +snd_pcm_stream_unlock (dma->substream); }/*
sound/pci/atiixp_modem.c +2 -0
@@ -638,7 +638,9 @@ static void snd_atiixp_xrun_dma(struct atiixp_modem *chip,if (! dma->substream || ! dma->running)return ;snd_printdd ("atiixp-modem: XRUN detected (DMA %d)\n" , dma->ops->type); +snd_pcm_stream_lock (dma->substream);snd_pcm_stop (dma->substream,SNDRV_PCM_STATE_XRUN ); +snd_pcm_stream_unlock (dma->substream); }/*
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 9/251 ALSA: asihpi: Fix unlocked snd_pcm_stop() call
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 60478295d6876619f8f47f6d1a5c25eaade69ee3 ]
snd_pcm_stop() must be called in the PCM substream lock context.
--- sound/pci/asihpi/asihpi.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/asihpi/asihpi.c +3 -0
@@ -769,7 +769,10 @@ static void snd_card_asihpi_timer_function(unsigned long data) s->number); ds->drained_count++;if (ds->drained_count >20 ) { +unsigned long flags; +snd_pcm_stream_lock_irqsave (s, flags);snd_pcm_stop (s,SNDRV_PCM_STATE_XRUN ); +snd_pcm_stream_unlock_irqrestore (s, flags);continue ; } }else {
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 10/251 ALSA: usx2y: Fix unlocked snd_pcm_stop() call
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 5be1efb4c2ed79c3d7c0cbcbecae768377666e84 ]
snd_pcm_stop() must be called in the PCM substream lock context.
--- sound/usb/usx2y/usbusx2yaudio.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/usb/usx2y/usbusx2yaudio.c +4 -0
@@ -273,7 +273,11 @@ static void usX2Y_clients_stop(struct usX2Ydev *usX2Y)struct snd_usX2Y_substream *subs = usX2Y->subs[s];if (subs) {if (atomic_read (&subs->state) >= state_PRERUNNING) { +unsigned long flags; + +snd_pcm_stream_lock_irqsave (subs->pcm_substream, flags);snd_pcm_stop (subs->pcm_substream,SNDRV_PCM_STATE_XRUN ); +snd_pcm_stream_unlock_irqrestore (subs->pcm_substream, flags); }for (u =0 ; u <NRURBS ; u++) {struct urb *urb = subs->urb[u];
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 11/251 libata: skip SRST for all SIMG [34]7x port-multipliers
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
[ Upstream commit 7a87718d92760fc688628ad6a430643dafa16f1f ]
For some reason, a lot of port-multipliers have issues with softreset. SIMG [34]7x series port-multipliers have been quite erratic in this regard. I recall that it was better with some firmware revisions and the current list of quirks worked fine for a while. I think it got worse with later firmwares or maybe my test coverage wasn't good enough. Anyways, HPA is reporting that his 3726 setup suffers SRST failures and then the PMP gets confused and fails to probe the last port.
The hope was that we try to stick to the standard as much as possible and soonish the PMPs and their firmwares will improve in quality, so the quirk list was kept to minimum. Well, it seems like that's never gonna happen.
Let's set NO_SRST for all [34]7x PMPs so that whatever remaining userbase of the device suffer the least. Maybe we should do the same for 57xx's but unfortunately I don't have any device left to test and I'm not even sure 57xx's have ever been made widely available, so let's leave those alone for now.
--- drivers/ata/libata-pmp.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/ata/libata-pmp.c +17 -16
@@ -389,9 +389,13 @@ static void sata_pmp_quirks(struct ata_port *ap)/* link reports offline after LPM */ link->flags |=ATA_LFLAG_NO_LPM ; -/* Class code report is unreliable. */ +/* +* Class code report is unreliable and SRST times +* out under certain configurations. +*/ if (link->pmp <5 ) - link->flags |=ATA_LFLAG_ASSUME_ATA ; + link->flags |=ATA_LFLAG_NO_SRST | +ATA_LFLAG_ASSUME_ATA ;/* port 5 is for SEMB device and it doesn't like SRST */ if (link->pmp ==5 )
@@ -399,20 +403,17 @@ static void sata_pmp_quirks(struct ata_port *ap)ATA_LFLAG_ASSUME_SEMB ; } }else if (vendor ==0x1095 && devid ==0x4723 ) { -/* sil4723 quirks */ -ata_for_each_link (link, ap,EDGE ) { -/* link reports offline after LPM */ - link->flags |=ATA_LFLAG_NO_LPM ; - -/* class code report is unreliable */ -if (link->pmp <2 ) - link->flags |=ATA_LFLAG_ASSUME_ATA ; - -/* the config device at port 2 locks up on SRST */ -if (link->pmp ==2 ) - link->flags |=ATA_LFLAG_NO_SRST | -ATA_LFLAG_ASSUME_ATA ; - } +/* +* sil4723 quirks +* +* Link reports offline after LPM. Class code report is +* unreliable. SIMG PMPs never got SRST reliable and the +* config device at port 2 locks up on SRST. +*/ +ata_for_each_link (link, ap,EDGE ) + link->flags |=ATA_LFLAG_NO_LPM | +ATA_LFLAG_NO_SRST | +ATA_LFLAG_ASSUME_ATA ; }else if (vendor ==0x1095 && devid ==0x4726 ) {/* sil4726 quirks */ ata_for_each_link (link, ap,EDGE ) {
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 12/251 ata_piix: IDE-mode SATA patch for Intel Coleto Creek DeviceIDs
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Seth Heasley <[email protected]>
[ Upstream commit c7e8695bfa0611b39493a9dfe8bab9f63f9809bd ]
This patch adds the IDE-mode SATA DeviceIDs for the Intel Coleto Creek PCH.
--- drivers/ata/ata_piix.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/ata/ata_piix.c +2 -0
@@ -344,6 +344,8 @@ static const struct pci_device_id piix_pci_tbl[] = {/* SATA Controller IDE (BayTrail) */ { 0x8086, 0x0F20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt }, { 0x8086, 0x0F21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt }, +/* SATA Controller IDE (Coleto Creek) */ + { 0x8086, 0x23a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, { } /* terminate list */ };
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 13/251 i2c-piix4: Add AMD CZ SMBus device ID
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Shane Huang <[email protected]>
[ Upstream commit b996ac90f595dda271cbd858b136b45557fc1a57 ]
To add AMD CZ SMBus controller device ID.
--- Documentation/i2c/busses/i2c-piix4 | 2 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-piix4.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-)
Documentation/i2c/busses/i2c-piix4 +1 -1
@@ -13,7 +13,7 @@ Supported adapters: * AMD SP5100 (SB700 derivative found on some server mainboards) Datasheet: Publicly available at the AMD website http://support.amd.com/us/Embedded_TechDocs/44413.pdf - * AMD Hudson-2 + * AMD Hudson-2, CZ Datasheet: Not publicly available * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge Datasheet: Publicly available at the SMSC website http://www.smsc.com
drivers/i2c/busses/Kconfig +1 -0
@@ -137,6 +137,7 @@ config I2C_PIIX4 ATI SB700/SP5100 ATI SB800 AMD Hudson-2 + AMD CZ Serverworks OSB4 Serverworks CSB5 Serverworks CSB6
drivers/i2c/busses/i2c-piix4.c +2 -1
@@ -22,7 +22,7 @@ Intel PIIX4, 440MX Serverworks OSB4, CSB5, CSB6, HT-1000, HT-1100 ATI IXP200, IXP300, IXP400, SB600, SB700/SP5100, SB800 - AMD Hudson-2 + AMD Hudson-2, CZ SMSC Victory66 Note: we assume there can only be one device, with one or more
@@ -523,6 +523,7 @@ static DEFINE_PCI_DEVICE_TABLE(piix4_ids) = { { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) }, { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4) }, { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 14/251 ASoC: s6000: Fix unlocked snd_pcm_stop() call
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae ]
snd_pcm_stop() must be called in the PCM substream lock context.
--- sound/soc/s6000/s6000-pcm.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/s6000/s6000-pcm.c +2 -0
@@ -128,7 +128,9 @@ static irqreturn_t s6000_pcm_irq(int irq, void *data) substream->runtime && snd_pcm_running(substream)) {dev_dbg (pcm->dev,"xrun\n" ); +snd_pcm_stream_lock (substream);snd_pcm_stop (substream,SNDRV_PCM_STATE_XRUN ); +snd_pcm_stream_unlock (substream); ret =IRQ_HANDLED ; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 15/251 ASoC: sglt5000: Fix SGTL5000_PLL_FRAC_DIV_MASK
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <[email protected]>
[ Upstream commit 5c78dfe87ea04b501ee000a7f03b9432ac9d008c ]
SGTL5000_PLL_FRAC_DIV_MASK is used to mask bits 0-10 (11 bits in total) of register CHIP_PLL_CTRL, so fix the mask to accomodate all this bit range.
--- sound/soc/codecs/sgtl5000.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/sgtl5000.h +1 -1
@@ -347,7 +347,7 @@#define SGTL5000_PLL_INT_DIV_MASK 0xf800#define SGTL5000_PLL_INT_DIV_SHIFT 11#define SGTL5000_PLL_INT_DIV_WIDTH 5 -#define SGTL5000_PLL_FRAC_DIV_MASK 0x0700 +#define SGTL5000_PLL_FRAC_DIV_MASK 0x07ff#define SGTL5000_PLL_FRAC_DIV_SHIFT 0#define SGTL5000_PLL_FRAC_DIV_WIDTH 11
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 16/251 md/raid10: fix two bugs affecting RAID10 reshape.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit 78eaa0d4cbcdb345992fa3dd22b3bcbb473cc064 ]
1/ If a RAID10 is being reshaped to a fewer number of devices
and is stopped while this is ongoing, then when the array is reassembled the 'mirrors' array will be allocated too small. This will lead to an access error or memory corruption.
2/ A sanity test for a reshaping RAID10 array is restarted
is slightly incorrect.
Due to the first bug, this is suitable for any -stable kernel since 3.5 where this code was introduced.
--- drivers/md/raid10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/raid10.c +2 -2
@@ -3434,7 +3434,7 @@ static struct r10conf *setup_conf(struct mddev *mddev)/* FIXME calc properly */ conf->mirrors =kzalloc (sizeof (struct raid10_info )*(mddev->raid_disks + -max (0 ,mddev->delta_disks)), +max (0 ,-mddev->delta_disks)),GFP_KERNEL );if (!conf->mirrors) goto out;
@@ -3578,7 +3578,7 @@ static int run(struct mddev *mddev) conf->geo.far_offset == 0) goto out_free_conf;if (conf->prev.far_copies !=1 && - conf->geo.far_offset ==0 ) + conf->prev.far_offset ==0 ) goto out_free_conf; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 17/251 tick: Prevent uncontrolled switch to oneshot mode
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 1f73a9806bdd07a5106409bbcab3884078bd34fe ]
When the system switches from periodic to oneshot mode, the broadcast logic causes a possibility that a CPU which has not yet switched to oneshot mode puts its own clock event device into oneshot mode without updating the state and the timer handler.
CPU0 CPU1
per cpu tickdev is in periodic mode and switched to broadcast
Switch to oneshot mode
tick_broadcast_switch_to_oneshot()
cpumask_copy(tick_oneshot_broacast_mask,
tick_broadcast_mask);
broadcast device mode = oneshot
Timer interrupt irq_enter() tick_check_oneshot_broadcast() dev->set_mode(ONESHOT); tick_handle_periodic() if (dev->mode == ONESHOT) dev->next_event += period; FAIL.
We fail, because dev->next_event contains KTIME_MAX, if the device was in periodic mode before the uncontrolled switch to oneshot happened.
We must copy the broadcast bits over to the oneshot mask, because otherwise a CPU which relies on the broadcast would not been woken up anymore after the broadcast device switched to oneshot mode.
So we need to verify in tick_check_oneshot_broadcast() whether the CPU has already switched to oneshot mode. If not, leave the device untouched and let the CPU switch controlled into oneshot mode.
This is a long standing bug, which was never noticed, because the main user of the broadcast x86 cannot run into that scenario, AFAICT. The nonarchitected timer mess of ARM creates a gazillion of differently broken abominations which trigger the shortcomings of that broadcast code, which better had never been necessary in the first place.
--- kernel/time/tick-broadcast.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
kernel/time/tick-broadcast.c +9 -1
@@ -400,7 +400,15 @@ void tick_check_oneshot_broadcast(int cpu)if (cpumask_test_cpu (cpu,to_cpumask (tick_broadcast_oneshot_mask))) {struct tick_device *td = &per_cpu (tick_cpu_device, cpu); -clockevents_set_mode (td->evtdev,CLOCK_EVT_MODE_ONESHOT ); +/* +* We might be in the middle of switching over from +* periodic to oneshot. If the CPU has not yet +* switched over, leave the device alone. +*/ +if (td->mode ==TICKDEV_MODE_ONESHOT ) { +clockevents_set_mode (td->evtdev, +CLOCK_EVT_MODE_ONESHOT ); + } } }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 18/251 clocksource: dw_apb: Fix error check
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Baruch Siach <[email protected]>
[ Upstream commit 1a33bd2be705cbb3f57d7223b60baea441039307 ]
irq_of_parse_and_map() returns 0 on error, while the code checks for NO_IRQ. This breaks on platforms that have NO_IRQ != 0.
--- drivers/clocksource/dw_apb_timer_of.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/dw_apb_timer_of.c +1 -1
@@ -44,7 +44,7 @@ static void add_clockevent(struct device_node *event_timer)u32 irq, rate; irq =irq_of_parse_and_map (event_timer,0 ); -if (irq ==NO_IRQ ) +if (irq ==0 )panic ("No IRQ for clock event timer" );timer_get_base_and_rate (event_timer, &iobase, &rate);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 19/251 rt2x00: read 5GHz TX power values from the correct offset
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit 0a6f3a8ebaf13407523c2c7d575b4ca2debd23ba ]
The current code uses the same index value both for the channel information array and for the TX power table. The index starts from 14, however the index of the TX power table must start from zero.
Fix it, in order to get the correct TX power value for a given channel.
The changes in rt61pci.c and rt73usb.c are compile tested only.
--- drivers/net/wireless/rt2x00/rt2800lib.c | 4 ++-- drivers/net/wireless/rt2x00/rt61pci.c | 3 ++- drivers/net/wireless/rt2x00/rt73usb.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/wireless/rt2x00/rt2800lib.c +2 -2
@@ -4980,8 +4980,8 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) default_power2 =rt2x00_eeprom_addr (rt2x00dev,EEPROM_TXPOWER_A2 );for (i =14 ; i < spec->num_channels; i++) { - info[i].default_power1 = default_power1[i]; - info[i].default_power2 = default_power2[i]; + info[i].default_power1 = default_power1[i -14 ]; + info[i].default_power2 = default_power2[i -14 ]; } }
drivers/net/wireless/rt2x00/rt61pci.c +2 -1
@@ -2822,7 +2822,8 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) tx_power =rt2x00_eeprom_addr (rt2x00dev,EEPROM_TXPOWER_A_START );for (i =14 ; i < spec->num_channels; i++) { info[i].max_power =MAX_TXPOWER ; - info[i].default_power1 =TXPOWER_FROM_DEV (tx_power[i]); + info[i].default_power1 = +TXPOWER_FROM_DEV (tx_power[i -14 ]); } }
drivers/net/wireless/rt2x00/rt73usb.c +2 -1
@@ -2167,7 +2167,8 @@ static int rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) tx_power =rt2x00_eeprom_addr (rt2x00dev,EEPROM_TXPOWER_A_START );for (i =14 ; i < spec->num_channels; i++) { info[i].max_power =MAX_TXPOWER ; - info[i].default_power1 =TXPOWER_FROM_DEV (tx_power[i]); + info[i].default_power1 = +TXPOWER_FROM_DEV (tx_power[i -14 ]); } }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 20/251 ath9k_hw: Assign default xlna config for AR9485
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sujith Manoharan <[email protected]>
[ Upstream commit 30d5b709da23f4ab9836c7f66d2d2e780a69cf12 ]
For AR9485 boards with XLNA, the default gpio config is not set correctly, fix this.
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 ++++++-- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +6 -2
@@ -3562,7 +3562,7 @@ static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah, int chain,static void ar9003_hw_ant_ctrl_apply (struct ath_hw *ah,bool is2ghz) {int chain; -u32 regval; +u32 regval, value;u32 ant_div_ctl1;static const u32 switch_chain_reg[AR9300_MAX_CHAINS ] = {AR_PHY_SWITCH_CHAIN_0 ,
@@ -3570,7 +3570,11 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) AR_PHY_SWITCH_CHAIN_2, }; -u32 value =ar9003_hw_ant_ctrl_common_get (ah, is2ghz); +if (AR_SREV_9485 (ah) && (ar9003_hw_get_rx_gain_idx (ah) ==0 )) +ath9k_hw_cfg_output (ah,AR9300_EXT_LNA_CTL_GPIO_AR9485 , +AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED ); + + value =ar9003_hw_ant_ctrl_common_get (ah, is2ghz);if (AR_SREV_9462 (ah)) { REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM,
drivers/net/wireless/ath/ath9k/ar9003_phy.h +2 -0
@@ -339,6 +339,8 @@#define AR_PHY_CCA_NOM_VAL_9330_2GHZ -118 +#define AR9300_EXT_LNA_CTL_GPIO_AR9485 9 +/* * AGC Field Definitions */
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 21/251 ath9k: Do not assign noise for NULL caldata
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sujith Manoharan <[email protected]>
[ Upstream commit d3bcb7b24bbf09fde8405770e676fe0c11c79662 ]
ah->noise is maintained globally and not per-channel. This is updated in the reset() routine after the NF history has been filled for the *current channel*, just before switching to the new channel. There is no need to do it inside getnf(), since ah->noise must contain a value for the new channel.
--- drivers/net/wireless/ath/ath9k/calib.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/ath/ath9k/calib.c +0 -1
@@ -388,7 +388,6 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan)if (!caldata) { chan->noisefloor = nf; - ah->noise =ath9k_hw_getchan_noise (ah, chan);return false; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 22/251 aacraid: Fix for arrays are going offline in the system. System hangs
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Mahesh Rajashekhara <[email protected]>
[ Upstream commit c5bebd829dd95602c15f8da8cc50fa938b5e0254 ]
One of the customer had reported that the set of raid logical arrays will become unavailable (I/O offline) after a long hours of IO stress test. The OS wouldn`t be accessible afterwards and require a hard reset.
This driver patch has a fix for race condition between the doorbell and the circular buffer. The driver is modified to do an extra read after clearing the doorbell in case there had been a completion posted during the small timing window.
With this fix, we ran IO stress for ~13 days. There were no IO failures.
--- drivers/scsi/aacraid/src.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/aacraid/src.c +3 -0
@@ -93,6 +93,9 @@ static irqreturn_t aac_src_intr_message(int irq, void *dev_id)int send_it =0 ;extern int aac_sync_mode; +src_writel (dev, MUnit.ODR_C, bellbits); +src_readl (dev, MUnit.ODR_C); +if (!aac_sync_mode) {src_writel (dev, MUnit.ODR_C, bellbits);src_readl (dev, MUnit.ODR_C);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 23/251 zfcp: fix adapter (re)open recovery while link to SAN is down
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Daniel Hansel <[email protected]>
[ Upstream commit f76ccaac4f82c463a037aa4a1e4ccb85c7011814 ]
FCP device remains in status ERP_FAILED when device is switched online or adapter recovery is triggered while link to SAN is down.
When Exchange Configuration Data command returns the FSF status FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE it aborts the exchange process. The only retries are done during the common error recovery procedure (i.e. max. 3 retries with 8sec sleep between) and remains in status ERP_FAILED with QDIO down.
This commit reverts the commit 0df138476c8306478d6e726f044868b4bccf411c (zfcp: Fix adapter activation on link down).
When FSF status FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE is received the adapter recovery will be finished without any retries. QDIO will be up now and status changes such as LINK UP will be received now.
--- drivers/s390/scsi/zfcp_fsf.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/s390/scsi/zfcp_fsf.c +4 -0
@@ -563,6 +563,10 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)fc_host_port_type (shost) =FC_PORTTYPE_UNKNOWN ; adapter->hydra_version =0 ; +/* avoids adapter shutdown to be able to recognize +* events such as LINK UP */ +atomic_set_mask (ZFCP_STATUS_ADAPTER_XCONFIG_OK , + &adapter->status);zfcp_fsf_link_down_info_eval (req, &qtcb->header.fsf_status_qual.link_down_info);break ;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 24/251 zfcp: block queue limits with data router
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Steffen Maier <[email protected]>
[ Upstream commit 5fea4291deacd80188b996d2f555fc6a1940e5d4 ]
Commit 86a9668a8d29ea711613e1cb37efa68e7c4db564
"[SCSI] zfcp: support for hardware data router"
reduced the initial block queue limits in the scsi_host_template to the absolute minimum and adjusted them later on. However, the adjustment was too late for the BSG devices of Scsi_Host and fc_host.
Therefore, ioctl(..., SG_IO, ...) with request or response size > 4kB to a BSG device of an fc_host or a Scsi_Host fails with EINVAL. As a result, users of such ioctl such as HBA_SendCTPassThru() in libzfcphbaapi return with error HBA_STATUS_ERROR.
Initialize the block queue limits in zfcp_scsi_host_template to the greatest common denominator (GCD).
While we cannot exploit the slightly enlarged maximum request size with data router, this should be neglectible. Doing so also avoids running into trouble after live guest relocation (LGR) / migration from a data router FCP device to an FCP device that does not support data router. In that case, zfcp would figure out the new limits on adapter recovery, but the fc_host and Scsi_Host (plus in fact all sdevs) still exist with the old and now too large queue limits.
It should also OK, not to use half the size as in the DIX case, because fc_host and Scsi_Host do not transport FCP requests including SCSI commands using protection data.
--- drivers/s390/scsi/zfcp_scsi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/s390/scsi/zfcp_scsi.c +7 -3
@@ -3,7 +3,7 @@* * Interface to Linux SCSI midlayer. * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2013 */ #define KMSG_COMPONENT "zfcp"
@@ -311,8 +311,12 @@ static struct scsi_host_template zfcp_scsi_host_template = { .proc_name = "zfcp", .can_queue = 4096, .this_id = -1, - .sg_tablesize = 1, /* adjusted later */ - .max_sectors = 8, /* adjusted later */ + .sg_tablesize = (((QDIO_MAX_ELEMENTS_PER_BUFFER -1 ) + * ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2), +/* GCD, adjusted later */ + .max_sectors = (((QDIO_MAX_ELEMENTS_PER_BUFFER -1 ) + * ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2) * 8, +/* GCD, adjusted later */ .dma_boundary = ZFCP_QDIO_SBALE_LEN - 1, .cmd_per_lun = 1, .use_clustering = 1,
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 25/251 zfcp: status read buffers on first adapter open with link down
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Steffen Maier <[email protected]>
[ Upstream commit 9edf7d75ee5f21663a0183d21f702682d0ef132f ]
Commit 64deb6efdc5504ce97b5c1c6f281fffbc150bd93
"[SCSI] zfcp: Use status_read_buf_num provided by FCP channel" started using a value returned by the channel but only evaluated the value if the fabric link is up.
Commit 8d88cf3f3b9af4713642caeb221b6d6a42019001
"[SCSI] zfcp: Update status read mempool"
introduced mempool resizings based on the above value.
On setting an FCP device online for the very first time since boot, a new zeroed adapter object is allocated. If the link is down, the number of status read requests remains zero. Since just the config data exchange is incomplete, we proceed with adapter open recovery. However, we unconditionally call mempool_resize with adapter->stat_read_buf_num == 0 in this case.
This causes a kernel message "kernel BUG at mm/mempool.c:131!" in process "zfcperp<FCP-device-bus-ID>" with last function mempool_resize in Krnl PSW and zfcp_erp_thread in the Call Trace.
Don't evaluate channel values which are invalid on link down. The number of status read requests is always valid, evaluated, and set to a positive minimum greater than zero. The adapter open recovery can proceed and the channel has status read buffers to inform us on a future link up event. While we are not aware of any other code path that could result in mempool resize attempts of size zero, we still also initialize the number of status read buffers to be posted to a static minimum number on adapter object allocation.
--- drivers/s390/scsi/zfcp_aux.c | 5 ++++- drivers/s390/scsi/zfcp_fsf.c | 23 ++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-)
drivers/s390/scsi/zfcp_aux.c +4 -1
@@ -3,7 +3,7 @@* * Module interface and handling of zfcp data structures. * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2013 */ /*
@@ -23,6 +23,7 @@* Christof Schmitt * Martin Petermann * Sven Schuetz +* Steffen Maier */ #define KMSG_COMPONENT "zfcp"
@@ -415,6 +416,8 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device) adapter->dma_parms.max_segment_size =ZFCP_QDIO_SBALE_LEN ; adapter->ccw_device->dev.dma_parms = &adapter->dma_parms; + adapter->stat_read_buf_num =FSF_STATUS_READS_RECOM ; +if (!zfcp_scsi_adapter_register (adapter))return adapter;
drivers/s390/scsi/zfcp_fsf.c +16 -7
@@ -3,7 +3,7 @@* * Implementation of FSF commands. * -* Copyright IBM Corp. 2002, 2010 +* Copyright IBM Corp. 2002, 2013 */ #define KMSG_COMPONENT "zfcp"
@@ -483,12 +483,8 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)fc_host_port_name (shost) = nsp->fl_wwpn;fc_host_node_name (shost) = nsp->fl_wwnn; -fc_host_port_id (shost) =ntoh24 (bottom->s_id); -fc_host_speed (shost) = -zfcp_fsf_convert_portspeed (bottom->fc_link_speed);fc_host_supported_classes (shost) =FC_COS_CLASS2 |FC_COS_CLASS3 ; - adapter->hydra_version = bottom->adapter_type; adapter->timer_ticks = bottom->timer_interval &ZFCP_FSF_TIMER_INT_MASK ; adapter->stat_read_buf_num =max (bottom->status_read_buf_num, (u16 )FSF_STATUS_READS_RECOM );
@@ -496,6 +492,19 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)if (fc_host_permanent_port_name (shost) ==-1 )fc_host_permanent_port_name (shost) =fc_host_port_name (shost); +zfcp_scsi_set_prot (adapter); + +/* no error return above here, otherwise must fix call chains */ +/* do not evaluate invalid fields */ +if (req->qtcb->header.fsf_status ==FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE ) +return 0 ; + +fc_host_port_id (shost) =ntoh24 (bottom->s_id); +fc_host_speed (shost) = +zfcp_fsf_convert_portspeed (bottom->fc_link_speed); + + adapter->hydra_version = bottom->adapter_type; +switch (bottom->fc_topology) {case FSF_TOPO_P2P : adapter->peer_d_id =ntoh24 (bottom->peer_d_id);
@@ -517,8 +526,6 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)return -EIO ; } -zfcp_scsi_set_prot (adapter); -return 0 ; }
@@ -569,6 +576,8 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req) &adapter->status);zfcp_fsf_link_down_info_eval (req, &qtcb->header.fsf_status_qual.link_down_info); +if (zfcp_fsf_exchange_config_evaluate (req)) +return ;break ;default :zfcp_erp_adapter_shutdown (adapter,0 ,"fsecdh3" );
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 26/251 mpt2sas: fix firmware failure with wrong task attribute
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sreekanth Reddy <[email protected]>
[ Upstream commit 48ba2efc382f94fae16ca8ca011e5961a81ad1ea ]
When SCSI command is received with task attribute not set, set it to SIMPLE. Previously it is set to untagged. This causes the firmware to fail the commands.
--- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/scsi/mpt2sas/mpt2sas_scsih.c +1 -5
@@ -3995,11 +3995,7 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))else mpi_control |=MPI2_SCSIIO_CONTROL_SIMPLEQ ; }else -/* MPI Revision I (UNIT = 0xA) - removed MPI2_SCSIIO_CONTROL_UNTAGGED */ -/* mpi_control |= MPI2_SCSIIO_CONTROL_UNTAGGED; -*/ - mpi_control |= (0x500 ); - + mpi_control |=MPI2_SCSIIO_CONTROL_SIMPLEQ ; }else mpi_control |=MPI2_SCSIIO_CONTROL_SIMPLEQ ;/* Make sure Device is not raid volume.
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 27/251 b43: ensue that BCMA is "y" when B43 is "y"
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Hauke Mehrtens <[email protected]>
[ Upstream commit 693026ef2e751fd94d2e6c71028e68343cc875d5 ]
When b43 gets build into the kernel and it should use bcma we have to ensure that bcma was also build into the kernel and not as a module. In this patch this is also done for SSB, although you can not build b43 without ssb support for now.
This fixes a build problem reported by Randy Dunlap in [email protected]
--- drivers/net/wireless/b43/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/b43/Kconfig +2 -2
@@ -28,7 +28,7 @@ config B43 config B43_BCMA bool "Support for BCMA bus" - depends on B43 && BCMA + depends on B43 && (BCMA = y || BCMA = B43) default y config B43_BCMA_EXTRA
@@ -39,7 +39,7 @@ config B43_BCMA_EXTRA config B43_SSB bool - depends on B43 && SSB + depends on B43 && (SSB = y || SSB = B43) default y # Auto-select SSB PCI-HOST support, if possible
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 28/251 printk: Fix rq->lock vs logbuf_lock unlock lock inversion
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Bu, Yitian" <[email protected]>
[ Upstream commit dbda92d16f8655044e082930e4e9d244b87fde77 ]
commit 07354eb1a74d1 ("locking printk: Annotate logbuf_lock as raw") reintroduced a lock inversion problem which was fixed in commit 0b5e1c5255 ("printk: Release console_sem after logbuf_lock"). This happened probably when fixing up patch rejects.
Restore the ordering and unlock logbuf_lock before releasing console_sem.
--- kernel/printk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/printk.c +1 -1
@@ -1364,9 +1364,9 @@ static int console_trylock_for_printk(unsigned int cpu) } } logbuf_cpu =UINT_MAX ; +raw_spin_unlock (&logbuf_lock);if (wake)up (&console_sem); -raw_spin_unlock (&logbuf_lock);return retval; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 29/251 uprobes: Fix return value in error handling path
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "zhangwei(Jovi)" <[email protected]>
[ Upstream commit fa44063f9ef163c3a4c8d8c0465bb8a056b42035 ]
When wrong argument is passed into uprobe_events it does not return an error:
[root@jovi tracing]# echo 'p:myprobe /bin/bash' > uprobe_events [root@jovi tracing]#
The proper response is:
[root@jovi tracing]# echo 'p:myprobe /bin/bash' > uprobe_events -bash: echo: write error: Invalid argument
--- kernel/trace/trace_uprobe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/trace/trace_uprobe.c +3 -1
@@ -243,8 +243,10 @@ static int create_trace_uprobe(int argc, char **argv)return -EINVAL ; } arg =strchr (argv[1 ],':' ); -if (!arg) +if (!arg) { + ret = -EINVAL ; goto fail_address_parse; + } *arg++ ='\0' ; filename = argv[1 ];
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 30/251 svcrpc: fix handling of too-short rpcs
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "J. Bruce Fields" <[email protected]>
[ Upstream commit cf3aa02cb4a0c5af5557dd47f15a08a7df33182a ]
If we detect that an rpc is too short, we abort and close the connection. Except, there's a bug here: we're leaving sk_datalen nonzero without leaving any pages in the sk_pages array. The most likely result of the inconsistency is a subsequent crash in svc_tcp_clear_pages.
Also demote the BUG_ON in svc_tcp_clear_pages to a WARN.
--- net/sunrpc/svcsock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/sunrpc/svcsock.c +4 -1
@@ -963,7 +963,10 @@ static void svc_tcp_clear_pages(struct svc_sock *svsk) len = svsk->sk_tcplen -sizeof (rpc_fraghdr); npages = (len +PAGE_SIZE -1 ) >>PAGE_SHIFT ;for (i =0 ; i < npages; i++) { -BUG_ON (svsk->sk_pages[i] ==NULL ); +if (svsk->sk_pages[i] ==NULL ) { +WARN_ON_ONCE (1 ); +continue ; + }put_page (svsk->sk_pages[i]); svsk->sk_pages[i] =NULL ; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 31/251 iommu/amd: Only unmap large pages from the first pte
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit 60d0ca3cfd199b6612bbbbf4999a3470dad38bb1 ]
If we use a large mapping, the expectation is that only unmaps from the first pte in the superpage are supported. Unmaps from offsets into the superpage should fail (ie. return zero sized unmap). In the current code, unmapping from an offset clears the size of the full mapping starting from an offset. For instance, if we map a 16k physically contiguous range at IOVA 0x0 with a large page, then attempt to unmap 4k at offset 12k, 4 ptes are cleared (12k - 28k) and the unmap returns 16k unmapped. This potentially incorrectly clears valid mappings and confuses drivers like VFIO that use the unmap size to release pinned pages.
Fix by refusing to unmap from offsets into the page.
--- drivers/iommu/amd_iommu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iommu/amd_iommu.c +5 -1
@@ -1376,6 +1376,10 @@ static unsigned long iommu_unmap_page(struct protection_domain *dom,/* Large PTE found which maps this address */ unmap_size =PTE_PAGE_SIZE (*pte); + +/* Only unmap from the first pte in the page */ +if ((unmap_size -1 ) & bus_addr) +break ; count =PAGE_SIZE_PTE_COUNT (unmap_size);for (i =0 ; i < count; i++) pte[i] =0ULL ;
@@ -1385,7 +1389,7 @@ static unsigned long iommu_unmap_page(struct protection_domain *dom, unmapped += unmap_size; } -BUG_ON (!is_power_of_2 (unmapped)); +BUG_ON (unmapped && !is_power_of_2 (unmapped));return unmapped; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 32/251 staging: line6: Fix unlocked snd_pcm_stop() call
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 86f0b5b86d142b9323432fef078a6cf0fb5dda74 ]
snd_pcm_stop() must be called in the PCM substream lock context.
--- drivers/staging/line6/pcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/line6/pcm.c +4 -1
@@ -378,8 +378,11 @@ static int snd_line6_pcm_free(struct snd_device *device)*/ static void pcm_disconnect_substream (struct snd_pcm_substream *substream) { -if (substream->runtime &&snd_pcm_running (substream)) +if (substream->runtime &&snd_pcm_running (substream)) { +snd_pcm_stream_lock_irq (substream);snd_pcm_stop (substream,SNDRV_PCM_STATE_DISCONNECTED ); +snd_pcm_stream_unlock_irq (substream); + } }/*
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 33/251 perf: Clone child context from parent context pmu
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
[ Upstream commit 734df5ab549ca44f40de0f07af1c8803856dfb18 ]
Currently when the child context for inherited events is created, it's based on the pmu object of the first event of the parent context.
This is wrong for the following scenario:
- HW context having HW and SW event
- HW event got removed (closed)
- SW event stays in HW context as the only event and its pmu is used to clone the child context
The issue starts when the cpu context object is touched based on the pmu context object (__get_cpu_context). In this case the HW context will work with SW cpu context ending up with following WARN below.
Fixing this by using parent context pmu object to clone from child context.
Addresses the following warning reported by Vince Weaver:
[ 2716.472065] ------------[ cut here ]------------ [ 2716.476035] WARNING: at kernel/events/core.c:2122 task_ctx_sched_out+0x3c/0x) [ 2716.476035] Modules linked in: nfsd auth_rpcgss oid_registry nfs_acl nfs locn [ 2716.476035] CPU: 0 PID: 3164 Comm: perf_fuzzer Not tainted 3.10.0-rc4 #2 [ 2716.476035] Hardware name: AOpen DE7000/nMCP7ALPx-DE R1.06 Oct.19.2012, BI2 [ 2716.476035] 0000000000000000 ffffffff8102e215 0000000000000000 ffff88011fc18 [ 2716.476035] ffff8801175557f0 0000000000000000 ffff880119fda88c ffffffff810ad [ 2716.476035] ffff880119fda880 ffffffff810af02a 0000000000000009 ffff880117550 [ 2716.476035] Call Trace: [ 2716.476035] [<ffffffff8102e215>] ? warn_slowpath_common+0x5b/0x70 [ 2716.476035] [<ffffffff810ab2bd>] ? task_ctx_sched_out+0x3c/0x5f [ 2716.476035] [<ffffffff810af02a>] ? perf_event_exit_task+0xbf/0x194 [ 2716.476035] [<ffffffff81032a37>] ? do_exit+0x3e7/0x90c [ 2716.476035] [<ffffffff810cd5ab>] ? __do_fault+0x359/0x394 [ 2716.476035] [<ffffffff81032fe6>] ? do_group_exit+0x66/0x98 [ 2716.476035] [<ffffffff8103dbcd>] ? get_signal_to_deliver+0x479/0x4ad [ 2716.476035] [<ffffffff810ac05c>] ? __perf_event_task_sched_out+0x230/0x2d1 [ 2716.476035] [<ffffffff8100205d>] ? do_signal+0x3c/0x432 [ 2716.476035] [<ffffffff810abbf9>] ? ctx_sched_in+0x43/0x141 [ 2716.476035] [<ffffffff810ac2ca>] ? perf_event_context_sched_in+0x7a/0x90 [ 2716.476035] [<ffffffff810ac311>] ? __perf_event_task_sched_in+0x31/0x118 [ 2716.476035] [<ffffffff81050dd9>] ? mmdrop+0xd/0x1c [ 2716.476035] [<ffffffff81051a39>] ? finish_task_switch+0x7d/0xa6 [ 2716.476035] [<ffffffff81002473>] ? do_notify_resume+0x20/0x5d [ 2716.476035] [<ffffffff813654f5>] ? retint_signal+0x3d/0x78 [ 2716.476035] ---[ end trace 827178d8a5966c3d ]---
--- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +1 -1
@@ -7002,7 +7002,7 @@ inherit_task_group(struct perf_event *event, struct task_struct *parent,* child. */ - child_ctx =alloc_perf_context (event->pmu, child); + child_ctx =alloc_perf_context (parent_ctx->pmu, child);if (!child_ctx)return -ENOMEM ;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 34/251 perf: Remove WARN_ON_ONCE() check in __perf_event_enable() for valid scenario
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
[ Upstream commit 06f417968beac6e6b614e17b37d347aa6a6b1d30 ]
The '!ctx->is_active' check has a valid scenario, so there's no need for the warning.
The reason is that there's a time window between the 'ctx->is_active' check in the perf_event_enable() function and the __perf_event_enable() function having:
- IRQs on
- ctx->lock unlocked
where the task could be killed and 'ctx' deactivated by perf_event_exit_task(), ending up with the warning below.
So remove the WARN_ON_ONCE() check and add comments to explain it all.
This addresses the following warning reported by Vince Weaver:
[ 324.983534] ------------[ cut here ]------------ [ 324.984420] WARNING: at kernel/events/core.c:1953 __perf_event_enable+0x187/0x190() [ 324.984420] Modules linked in: [ 324.984420] CPU: 19 PID: 2715 Comm: nmi_bug_snb Not tainted 3.10.0+ #246 [ 324.984420] Hardware name: Supermicro X8DTN/X8DTN, BIOS 4.6.3 01/08/2010 [ 324.984420] 0000000000000009 ffff88043fce3ec8 ffffffff8160ea0b ffff88043fce3f00 [ 324.984420] ffffffff81080ff0 ffff8802314fdc00 ffff880231a8f800 ffff88043fcf7860 [ 324.984420] 0000000000000286 ffff880231a8f800 ffff88043fce3f10 ffffffff8108103a [ 324.984420] Call Trace: [ 324.984420] <IRQ> [<ffffffff8160ea0b>] dump_stack+0x19/0x1b [ 324.984420] [<ffffffff81080ff0>] warn_slowpath_common+0x70/0xa0 [ 324.984420] [<ffffffff8108103a>] warn_slowpath_null+0x1a/0x20 [ 324.984420] [<ffffffff81134437>] __perf_event_enable+0x187/0x190 [ 324.984420] [<ffffffff81130030>] remote_function+0x40/0x50 [ 324.984420] [<ffffffff810e51de>] generic_smp_call_function_single_interrupt+0xbe/0x130 [ 324.984420] [<ffffffff81066a47>] smp_call_function_single_interrupt+0x27/0x40 [ 324.984420] [<ffffffff8161fd2f>] call_function_single_interrupt+0x6f/0x80 [ 324.984420] <EOI> [<ffffffff816161a1>] ? _raw_spin_unlock_irqrestore+0x41/0x70 [ 324.984420] [<ffffffff8113799d>] perf_event_exit_task+0x14d/0x210 [ 324.984420] [<ffffffff810acd04>] ? switch_task_namespaces+0x24/0x60 [ 324.984420] [<ffffffff81086946>] do_exit+0x2b6/0xa40 [ 324.984420] [<ffffffff8161615c>] ? _raw_spin_unlock_irq+0x2c/0x30 [ 324.984420] [<ffffffff81087279>] do_group_exit+0x49/0xc0 [ 324.984420] [<ffffffff81096854>] get_signal_to_deliver+0x254/0x620 [ 324.984420] [<ffffffff81043057>] do_signal+0x57/0x5a0 [ 324.984420] [<ffffffff8161a164>] ? __do_page_fault+0x2a4/0x4e0 [ 324.984420] [<ffffffff8161665c>] ? retint_restore_args+0xe/0xe [ 324.984420] [<ffffffff816166cd>] ? retint_signal+0x11/0x84 [ 324.984420] [<ffffffff81043605>] do_notify_resume+0x65/0x80 [ 324.984420] [<ffffffff81616702>] retint_signal+0x46/0x84 [ 324.984420] ---[ end trace 442ec2f04db3771a ]---
--- kernel/events/core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
kernel/events/core.c +10 -1
@@ -1708,7 +1708,16 @@ static int __perf_event_enable(void *info)struct perf_cpu_context *cpuctx =__get_cpu_context (ctx);int err; -if (WARN_ON_ONCE (!ctx->is_active)) +/* +* There's a time window between 'ctx->is_active' check +* in perf_event_enable function and this place having: +* - IRQs on +* - ctx->lock unlocked +* +* where the task could be killed and 'ctx' deactivated +* by perf_event_exit_task. +*/ +if (!ctx->is_active)return -EINVAL ;raw_spin_lock (&ctx->lock);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 35/251 perf: Fix perf_lock_task_context() vs RCU
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit 058ebd0eba3aff16b144eabf4510ed9510e1416e ]
Jiri managed to trigger this warning:
[] ======================================================
[] [ INFO: possible circular locking dependency detected ]
[] 3.10.0+ #228 Tainted: G W
[] -------------------------------------------------------
[] p/6613 is trying to acquire lock:
[] (rcu_node_0){..-...}, at: [<ffffffff810ca797>] rcu_read_unlock_special+0xa7/0x250 []
[] but task is already holding lock:
[] (&ctx->lock){-.-...}, at: [<ffffffff810f2879>] perf_lock_task_context+0xd9/0x2c0 []
[] which lock already depends on the new lock.
[]
[] the existing dependency chain (in reverse order) is:
[]
[] -> #4 (&ctx->lock){-.-...}:
[] -> #3 (&rq->lock){-.-.-.}:
[] -> #2 (&p->pi_lock){-.-.-.}:
[] -> #1 (&rnp->nocb_gp_wq[1]){......}:
[] -> #0 (rcu_node_0){..-...}:
Paul was quick to explain that due to preemptible RCU we cannot call rcu_read_unlock() while holding scheduler (or nested) locks when part of the read side critical section was preemptible.
Therefore solve it by making the entire RCU read side non-preemptible.
Also pull out the retry from under the non-preempt to play nice with RT.
--- kernel/events/core.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
kernel/events/core.c +14 -1
@@ -723,8 +723,18 @@ perf_lock_task_context(struct task_struct *task, int ctxn, unsigned long *flags) {struct perf_event_context *ctx; -rcu_read_lock (); retry: +/* +* One of the few rules of preemptible RCU is that one cannot do +* rcu_read_unlock() while holding a scheduler (or nested) lock when +* part of the read side critical section was preemptible -- see +* rcu_read_unlock_special(). +* +* Since ctx->lock nests under rq->lock we must ensure the entire read +* side critical section is non-preemptible. +*/ +preempt_disable (); +rcu_read_lock (); ctx =rcu_dereference (task->perf_event_ctxp[ctxn]);if (ctx) {/*
@@ -740,6 +750,8 @@ retry:raw_spin_lock_irqsave (&ctx->lock, *flags);if (ctx !=rcu_dereference (task->perf_event_ctxp[ctxn])) {raw_spin_unlock_irqrestore (&ctx->lock, *flags); +rcu_read_unlock (); +preempt_enable (); goto retry; }
@@ -749,6 +761,7 @@ retry: } }rcu_read_unlock (); +preempt_enable ();return ctx; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 36/251 tracing: Fix irqs-off tag display in syscall tracing
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "zhangwei(Jovi)" <[email protected]>
[ Upstream commit 11034ae9c20f4057a6127fc965906417978e69b2 ]
All syscall tracing irqs-off tags are wrong, the syscall enter entry doesn't disable irqs.
[root@jovi tracing]#echo "syscalls:sys_enter_open" > set_event [root@jovi tracing]# cat trace
# tracer: nop
#
# entries-in-buffer/entries-written: 13/13 #P:2
#
# _-----=> irqs-off
# / _----=> need-resched
# | / _---=> hardirq/softirq
# || / _--=> preempt-depth
# ||| / delay
# TASK-PID CPU# |||| TIMESTAMP FUNCTION
# | | | |||| | |
irqbalance-513 [000] d... 56115.496766: sys_open(filename: 804e1a6, flags: 0, mode: 1b6)
irqbalance-513 [000] d... 56115.497008: sys_open(filename: 804e1bb, flags: 0, mode: 1b6)
sendmail-771 [000] d... 56115.827982: sys_open(filename: b770e6d1, flags: 0, mode: 1b6)The reason is syscall tracing doesn't record irq_flags into buffer. The proper display is:
[root@jovi tracing]#echo "syscalls:sys_enter_open" > set_event [root@jovi tracing]# cat trace
# tracer: nop
#
# entries-in-buffer/entries-written: 14/14 #P:2
#
# _-----=> irqs-off
# / _----=> need-resched
# | / _---=> hardirq/softirq
# || / _--=> preempt-depth
# ||| / delay
# TASK-PID CPU# |||| TIMESTAMP FUNCTION
# | | | |||| | |
irqbalance-514 [001] .... 46.213921: sys_open(filename: 804e1a6, flags: 0, mode: 1b6)
irqbalance-514 [001] .... 46.214160: sys_open(filename: 804e1bb, flags: 0, mode: 1b6)
<...>-920 [001] .... 47.307260: sys_open(filename: 4e82a0c5, flags: 80000, mode: 0)--- kernel/trace/trace_syscalls.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
kernel/trace/trace_syscalls.c +17 -4
@@ -303,6 +303,8 @@ void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id)struct syscall_metadata *sys_data;struct ring_buffer_event *event;struct ring_buffer *buffer; +unsigned long irq_flags; +int pc;int size;int syscall_nr;
@@ -318,8 +320,11 @@ void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id) size =sizeof (*entry) +sizeof (unsigned long ) * sys_data->nb_args; +local_save_flags (irq_flags); + pc =preempt_count (); + event =trace_current_buffer_lock_reserve (&buffer, - sys_data->enter_event->event.type, size,0 ,0 ); + sys_data->enter_event->event.type, size, irq_flags, pc);if (!event)return ;
@@ -329,7 +334,8 @@ void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id)if (!filter_current_check_discard (buffer, sys_data->enter_event, entry, event)) -trace_current_buffer_unlock_commit (buffer, event,0 ,0 ); +trace_current_buffer_unlock_commit (buffer, event, + irq_flags, pc); }void ftrace_syscall_exit (void *ignore,struct pt_regs *regs,long ret)
@@ -338,6 +344,8 @@ void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)struct syscall_metadata *sys_data;struct ring_buffer_event *event;struct ring_buffer *buffer; +unsigned long irq_flags; +int pc;int syscall_nr; syscall_nr =syscall_get_nr (current, regs);
@@ -350,8 +358,12 @@ void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)if (!sys_data)return ; +local_save_flags (irq_flags); + pc =preempt_count (); + event =trace_current_buffer_lock_reserve (&buffer, - sys_data->exit_event->event.type,sizeof (*entry),0 ,0 ); + sys_data->exit_event->event.type,sizeof (*entry), + irq_flags, pc);if (!event)return ;
@@ -361,7 +373,8 @@ void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)if (!filter_current_check_discard (buffer, sys_data->exit_event, entry, event)) -trace_current_buffer_unlock_commit (buffer, event,0 ,0 ); +trace_current_buffer_unlock_commit (buffer, event, + irq_flags, pc); }int reg_event_syscall_enter (struct ftrace_event_call *call)
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 37/251 writeback: Fix periodic writeback after fs mount
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit a5faeaf9109578e65e1a32e2a3e76c8b47e7dcb6 ]
Code in blkdev.c moves a device inode to default_backing_dev_info when the last reference to the device is put and moves the device inode back to its bdi when the first reference is acquired. This includes moving to wb.b_dirty list if the device inode is dirty. The code however doesn't setup timer to wake corresponding flusher thread and while wb.b_dirty list is non-empty __mark_inode_dirty() will not set it up either. Thus periodic writeback is effectively disabled until a sync(2) call which can lead to unexpected data loss in case of crash or power failure.
Fix the problem by setting up a timer for periodic writeback in case we add the first dirty inode to wb.b_dirty list in bdev_inode_switch_bdi().
--- fs/block_dev.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/block_dev.c +8 -1
@@ -57,17 +57,24 @@ static void bdev_inode_switch_bdi(struct inode *inode, struct backing_dev_info *dst) {struct backing_dev_info *old = inode->i_data.backing_dev_info; +bool wakeup_bdi = false;if (unlikely (dst == old))/* deadlock avoidance */ return ;bdi_lock_two (&old->wb, &dst->wb);spin_lock (&inode->i_lock); inode->i_data.backing_dev_info = dst; -if (inode->i_state &I_DIRTY ) +if (inode->i_state &I_DIRTY ) { +if (bdi_cap_writeback_dirty (dst) && !wb_has_dirty_io (&dst->wb)) + wakeup_bdi = true;list_move (&inode->i_wb_list, &dst->wb.b_dirty); + }spin_unlock (&inode->i_lock);spin_unlock (&old->wb.list_lock);spin_unlock (&dst->wb.list_lock); + +if (wakeup_bdi) +bdi_wakeup_thread_delayed (dst); }sector_t blkdev_max_block (struct block_device *bdev)
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 38/251 neighbour: fix a race in neigh_destroy()
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit c9ab4d85de222f3390c67aedc9c18a50e767531e ]
There is a race in neighbour code, because neigh_destroy() uses skb_queue_purge(&neigh->arp_queue) without holding neighbour lock, while other parts of the code assume neighbour rwlock is what protects arp_queue
Convert all skb_queue_purge() calls to the __skb_queue_purge() variant
Use __skb_queue_head_init() instead of skb_queue_head_init() to make clear we do not use arp_queue.lock
And hold neigh->lock in neigh_destroy() to close the race.
--- net/core/neighbour.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
net/core/neighbour.c +7 -5
@@ -239,7 +239,7 @@ static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *dev)we must kill timers etc. and move it to safe state. */ -skb_queue_purge (&n->arp_queue); +__skb_queue_purge (&n->arp_queue); n->arp_queue_len_bytes =0 ; n->output = neigh_blackhole;if (n->nud_state &NUD_VALID )
@@ -302,7 +302,7 @@ static struct neighbour *neigh_alloc(struct neigh_table *tbl, struct net_deviceif (!n) goto out_entries; -skb_queue_head_init (&n->arp_queue); +__skb_queue_head_init (&n->arp_queue);rwlock_init (&n->lock);seqlock_init (&n->ha_lock); n->updated = n->used = now;
@@ -724,7 +724,9 @@ void neigh_destroy(struct neighbour *neigh)if (neigh_del_timer (neigh))pr_warn ("Impossible event\n" ); -skb_queue_purge (&neigh->arp_queue); +write_lock_bh (&neigh->lock); +__skb_queue_purge (&neigh->arp_queue); +write_unlock_bh (&neigh->lock); neigh->arp_queue_len_bytes =0 ;if (dev->netdev_ops->ndo_neigh_destroy)
@@ -870,7 +872,7 @@ static void neigh_invalidate(struct neighbour *neigh) neigh->ops->error_report (neigh, skb);write_lock (&neigh->lock); } -skb_queue_purge (&neigh->arp_queue); +__skb_queue_purge (&neigh->arp_queue); neigh->arp_queue_len_bytes =0 ; }
@@ -1222,7 +1224,7 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,write_lock_bh (&neigh->lock); } -skb_queue_purge (&neigh->arp_queue); +__skb_queue_purge (&neigh->arp_queue); neigh->arp_queue_len_bytes =0 ; } out:
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 39/251 x25: Fix broken locking in ioctl error paths.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Dave Jones <[email protected]>
[ Upstream commit 4ccb93ce7439b63c31bc7597bfffd13567fa483d ]
Two of the x25 ioctl cases have error paths that break out of the function without unlocking the socket, leading to this warning:
================================================
[ BUG: lock held when returning to user space! ]
3.10.0-rc7+ #36 Not tainted
------------------------------------------------
trinity-child2/31407 is leaving the kernel with locks still held!
1 lock held by trinity-child2/31407:
#0: (sk_lock-AF_X25){+.+.+.}, at: [<ffffffffa024b6da>] x25_ioctl+0x8a/0x740 [x25]
--- net/x25/af_x25.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
net/x25/af_x25.c +8 -7
@@ -1586,11 +1586,11 @@ out_cud_release:case SIOCX25CALLACCPTAPPRV : { rc = -EINVAL ;lock_sock (sk); -if (sk->sk_state !=TCP_CLOSE ) -break ; -clear_bit (X25_ACCPT_APPRV_FLAG , &x25->flags); +if (sk->sk_state ==TCP_CLOSE ) { +clear_bit (X25_ACCPT_APPRV_FLAG , &x25->flags); + rc =0 ; + }release_sock (sk); - rc =0 ;break ; }
@@ -1598,14 +1598,15 @@ out_cud_release: rc = -EINVAL ;lock_sock (sk);if (sk->sk_state !=TCP_ESTABLISHED ) -break ; + goto out_sendcallaccpt_release;/* must call accptapprv above */ if (test_bit (X25_ACCPT_APPRV_FLAG , &x25->flags)) -break ; + goto out_sendcallaccpt_release;x25_write_internal (sk,X25_CALL_ACCEPTED ); x25->state =X25_STATE_3 ; -release_sock (sk); rc =0 ; +out_sendcallaccpt_release: +release_sock (sk);break ; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 40/251 vti: remove duplicated code to fix a memory leak
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit ab6c7a0a43c2eaafa57583822b619b22637b49c7 ]
vti module allocates dev->tstats twice: in vti_fb_tunnel_init() and in vti_tunnel_init(), this lead to a memory leak of dev->tstats.
Just remove the duplicated operations in vti_fb_tunnel_init().
(candidate for -stable)
--- net/ipv4/ip_vti.c | 7 ------- 1 file changed, 7 deletions(-)
net/ipv4/ip_vti.c +0 -7
@@ -664,17 +664,10 @@ static int __net_init vti_fb_tunnel_init(struct net_device *dev)struct iphdr *iph = &tunnel->parms.iph;struct vti_net *ipn =net_generic (dev_net (dev), vti_net_id); - tunnel->dev = dev; -strcpy (tunnel->parms.name, dev->name); - iph->version =4 ; iph->protocol =IPPROTO_IPIP ; iph->ihl =5 ; - dev->tstats = alloc_percpu(struct pcpu_tstats); -if (!dev->tstats) -return -ENOMEM ; -dev_hold (dev);rcu_assign_pointer (ipn->tunnels_wc[0 ], tunnel);return 0 ;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 41/251 l2tp: add missing .owner to struct pppox_proto
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Wei Yongjun <[email protected]>
[ Upstream commit e1558a93b61962710733dc8c11a2bc765607f1cd ]
Add missing .owner of struct pppox_proto. This prevents the module from being removed from underneath its users.
--- net/l2tp/l2tp_ppp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/l2tp/l2tp_ppp.c +2 -1
@@ -1837,7 +1837,8 @@ static const struct proto_ops pppol2tp_ops = {static const struct pppox_proto pppol2tp_proto = { .create = pppol2tp_create, - .ioctl = pppol2tp_ioctl + .ioctl = pppol2tp_ioctl, + .owner =THIS_MODULE , };#ifdef CONFIG_L2TP_V3
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 42/251 ipv6: call udp_push_pending_frames when uncorking a socket with AF_INET pending data
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 8822b64a0fa64a5dd1dfcf837c5b0be83f8c05d1 ]
We accidentally call down to ip6_push_pending_frames when uncorking pending AF_INET data on a ipv6 socket. This results in the following splat (from Dave Jones):
skbuff: skb_under_panic: text:ffffffff816765f6 len:48 put:40 head:ffff88013deb6df0 data:ffff88013deb6dec tail:0x2c end:0xc0 dev:<NULL>
------------[ cut here ]------------ kernel BUG at net/core/skbuff.c:126! invalid opcode: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC Modules linked in: dccp_ipv4 dccp 8021q garp bridge stp dlci mpoa snd_seq_dummy sctp fuse hidp tun bnep nfnetlink scsi_transport_iscsi rfcomm can_raw can_bcm af_802154 appletalk caif_socket can caif ipt_ULOG x25 rose af_key pppoe pppox ipx phonet irda llc2 ppp_generic slhc p8023 psnap p8022 llc crc_ccitt atm bluetooth +netrom ax25 nfc rfkill rds af_rxrpc coretemp hwmon kvm_intel kvm crc32c_intel snd_hda_codec_realtek ghash_clmulni_intel microcode pcspkr snd_hda_codec_hdmi snd_hda_intel snd_hda_codec snd_hwdep usb_debug snd_seq snd_seq_device snd_pcm e1000e snd_page_alloc snd_timer ptp snd pps_core soundcore xfs libcrc32c CPU: 2 PID: 8095 Comm: trinity-child2 Not tainted 3.10.0-rc7+ #37 task: ffff8801f52c2520 ti: ffff8801e6430000 task.ti: ffff8801e6430000 RIP: 0010:[<ffffffff816e759c>] [<ffffffff816e759c>] skb_panic+0x63/0x65 RSP: 0018:ffff8801e6431de8 EFLAGS: 00010282 RAX: 0000000000000086 RBX: ffff8802353d3cc0 RCX: 0000000000000006 RDX: 0000000000003b90 RSI: ffff8801f52c2ca0 RDI: ffff8801f52c2520 RBP: ffff8801e6431e08 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000001 R12: ffff88022ea0c800 R13: ffff88022ea0cdf8 R14: ffff8802353ecb40 R15: ffffffff81cc7800 FS: 00007f5720a10740(0000) GS:ffff880244c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000005862000 CR3: 000000022843c000 CR4: 00000000001407e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000600 Stack: ffff88013deb6dec 000000000000002c 00000000000000c0 ffffffff81a3f6e4 ffff8801e6431e18 ffffffff8159a9aa ffff8801e6431e90 ffffffff816765f6 ffffffff810b756b 0000000700000002 ffff8801e6431e40 0000fea9292aa8c0 Call Trace: [<ffffffff8159a9aa>] skb_push+0x3a/0x40 [<ffffffff816765f6>] ip6_push_pending_frames+0x1f6/0x4d0 [<ffffffff810b756b>] ? mark_held_locks+0xbb/0x140 [<ffffffff81694919>] udp_v6_push_pending_frames+0x2b9/0x3d0 [<ffffffff81694660>] ? udplite_getfrag+0x20/0x20 [<ffffffff8162092a>] udp_lib_setsockopt+0x1aa/0x1f0 [<ffffffff811cc5e7>] ? fget_light+0x387/0x4f0 [<ffffffff816958a4>] udpv6_setsockopt+0x34/0x40 [<ffffffff815949f4>] sock_common_setsockopt+0x14/0x20 [<ffffffff81593c31>] SyS_setsockopt+0x71/0xd0 [<ffffffff816f5d54>] tracesys+0xdd/0xe2 Code: 00 00 48 89 44 24 10 8b 87 d8 00 00 00 48 89 44 24 08 48 8b 87 e8 00 00 00 48 c7 c7 c0 04 aa 81 48 89 04 24 31 c0 e8 e1 7e ff ff <0f> 0b 55 48 89 e5 0f 0b 55 48 89 e5 0f 0b 55 48 89 e5 0f 0b 55 RIP [<ffffffff816e759c>] skb_panic+0x63/0x65 RSP <ffff8801e6431de8>
This patch adds a check if the pending data is of address family AF_INET and directly calls udp_push_ending_frames from udp_v6_push_pending_frames if that is the case.
This bug was found by Dave Jones with trinity.
(Also move the initialization of fl6 below the AF_INET check, even if not strictly necessary.)
--- include/net/udp.h | 1 + net/ipv4/udp.c | 3 ++- net/ipv6/udp.c | 7 ++++++- 3 files changed, 9 insertions(+), 2 deletions(-)
include/net/udp.h +1 -0
@@ -181,6 +181,7 @@ extern int udp_get_port(struct sock *sk, unsigned short snum,extern void udp_err (struct sk_buff *,u32 );extern int udp_sendmsg (struct kiocb *iocb,struct sock *sk,struct msghdr *msg,size_t len); +extern int udp_push_pending_frames (struct sock *sk);extern void udp_flush_pending_frames (struct sock *sk);extern int udp_rcv (struct sk_buff *skb);extern int udp_ioctl (struct sock *sk,int cmd,unsigned long arg);
net/ipv4/udp.c +2 -1
@@ -774,7 +774,7 @@ send:/* * Push out all pending data as one UDP datagram. Socket is locked. */ -static int udp_push_pending_frames (struct sock *sk) +int udp_push_pending_frames (struct sock *sk) {struct udp_sock *up =udp_sk (sk);struct inet_sock *inet =inet_sk (sk);
@@ -793,6 +793,7 @@ out: up->pending =0 ;return err; } +EXPORT_SYMBOL (udp_push_pending_frames);int udp_sendmsg (struct kiocb *iocb,struct sock *sk,struct msghdr *msg,size_t len)
net/ipv6/udp.c +6 -1
@@ -955,11 +955,16 @@ static int udp_v6_push_pending_frames(struct sock *sk)struct udphdr *uh;struct udp_sock *up =udp_sk (sk);struct inet_sock *inet =inet_sk (sk); -struct flowi6 *fl6 = &inet->cork.fl.u.ip6; +struct flowi6 *fl6;int err =0 ;int is_udplite =IS_UDPLITE (sk);__wsum csum =0 ; +if (up->pending ==AF_INET ) +return udp_push_pending_frames (sk); + + fl6 = &inet->cork.fl.u.ip6; +/* Grab the skbuff where UDP header space exists. */ if ((skb =skb_peek (&sk->sk_write_queue)) ==NULL ) goto out;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 43/251 ipv6: ip6_append_data_mtu did not care about pmtudisc and frag_size
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 75a493e60ac4bbe2e977e7129d6d8cbb0dd236be ]
If the socket had an IPV6_MTU value set, ip6_append_data_mtu lost track of this when appending the second frame on a corked socket. This results in the following splat:
[37598.993962] ------------[ cut here ]------------ [37598.994008] kernel BUG at net/core/skbuff.c:2064! [37598.994008] invalid opcode: 0000 [#1] SMP [37598.994008] Modules linked in: tcp_lp uvcvideo videobuf2_vmalloc videobuf2_memops videobuf2_core videodev media vfat fat usb_storage fuse ebtable_nat xt_CHECKSUM bridge stp llc ipt_MASQUERADE nf_conntrack_netbios_ns nf_conntrack_broadcast ip6table_mangle ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 iptable_nat +nf_nat_ipv4 nf_nat iptable_mangle nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ebtable_filter ebtables ip6table_filter ip6_tables be2iscsi iscsi_boot_sysfs bnx2i cnic uio cxgb4i cxgb4 cxgb3i cxgb3 mdio libcxgbi ib_iser rdma_cm ib_addr iw_cm ib_cm ib_sa ib_mad ib_core iscsi_tcp libiscsi_tcp libiscsi +scsi_transport_iscsi rfcomm bnep iTCO_wdt iTCO_vendor_support snd_hda_codec_conexant arc4 iwldvm mac80211 snd_hda_intel acpi_cpufreq mperf coretemp snd_hda_codec microcode cdc_wdm cdc_acm [37598.994008] snd_hwdep cdc_ether snd_seq snd_seq_device usbnet mii joydev btusb snd_pcm bluetooth i2c_i801 e1000e lpc_ich mfd_core ptp iwlwifi pps_core snd_page_alloc mei cfg80211 snd_timer thinkpad_acpi snd tpm_tis soundcore rfkill tpm tpm_bios vhost_net tun macvtap macvlan kvm_intel kvm uinput binfmt_misc +dm_crypt i915 i2c_algo_bit drm_kms_helper drm i2c_core wmi video [37598.994008] CPU 0 [37598.994008] Pid: 27320, comm: t2 Not tainted 3.9.6-200.fc18.x86_64 #1 LENOVO 27744PG/27744PG [37598.994008] RIP: 0010:[<ffffffff815443a5>] [<ffffffff815443a5>] skb_copy_and_csum_bits+0x325/0x330 [37598.994008] RSP: 0018:ffff88003670da18 EFLAGS: 00010202 [37598.994008] RAX: ffff88018105c018 RBX: 0000000000000004 RCX: 00000000000006c0 [37598.994008] RDX: ffff88018105a6c0 RSI: ffff88018105a000 RDI: ffff8801e1b0aa00 [37598.994008] RBP: ffff88003670da78 R08: 0000000000000000 R09: ffff88018105c040 [37598.994008] R10: ffff8801e1b0aa00 R11: 0000000000000000 R12: 000000000000fff8 [37598.994008] R13: 00000000000004fc R14: 00000000ffff0504 R15: 0000000000000000 [37598.994008] FS: 00007f28eea59740(0000) GS:ffff88023bc00000(0000) knlGS:0000000000000000 [37598.994008] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [37598.994008] CR2: 0000003d935789e0 CR3: 00000000365cb000 CR4: 00000000000407f0 [37598.994008] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [37598.994008] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [37598.994008] Process t2 (pid: 27320, threadinfo ffff88003670c000, task ffff88022c162ee0) [37598.994008] Stack: [37598.994008] ffff88022e098a00 ffff88020f973fc0 0000000000000008 00000000000004c8 [37598.994008] ffff88020f973fc0 00000000000004c4 ffff88003670da78 ffff8801e1b0a200 [37598.994008] 0000000000000018 00000000000004c8 ffff88020f973fc0 00000000000004c4 [37598.994008] Call Trace: [37598.994008] [<ffffffff815fc21f>] ip6_append_data+0xccf/0xfe0 [37598.994008] [<ffffffff8158d9f0>] ? ip_copy_metadata+0x1a0/0x1a0 [37598.994008] [<ffffffff81661f66>] ? _raw_spin_lock_bh+0x16/0x40 [37598.994008] [<ffffffff8161548d>] udpv6_sendmsg+0x1ed/0xc10 [37598.994008] [<ffffffff812a2845>] ? sock_has_perm+0x75/0x90 [37598.994008] [<ffffffff815c3693>] inet_sendmsg+0x63/0xb0 [37598.994008] [<ffffffff812a2973>] ? selinux_socket_sendmsg+0x23/0x30 [37598.994008] [<ffffffff8153a450>] sock_sendmsg+0xb0/0xe0 [37598.994008] [<ffffffff810135d1>] ? __switch_to+0x181/0x4a0 [37598.994008] [<ffffffff8153d97d>] sys_sendto+0x12d/0x180 [37598.994008] [<ffffffff810dfb64>] ? __audit_syscall_entry+0x94/0xf0 [37598.994008] [<ffffffff81020ed1>] ? syscall_trace_enter+0x231/0x240 [37598.994008] [<ffffffff8166a7e7>] tracesys+0xdd/0xe2 [37598.994008] Code: fe 07 00 00 48 c7 c7 04 28 a6 81 89 45 a0 4c 89 4d b8 44 89 5d a8 e8 1b ac b1 ff 44 8b 5d a8 4c 8b 4d b8 8b 45 a0 e9 cf fe ff ff <0f> 0b 66 0f 1f 84 00 00 00 00 00 66 66 66 66 90 55 48 89 e5 48 [37598.994008] RIP [<ffffffff815443a5>] skb_copy_and_csum_bits+0x325/0x330 [37598.994008] RSP <ffff88003670da18> [37599.007323] ---[ end trace d69f6a17f8ac8eee ]---
While there, also check if path mtu discovery is activated for this socket. The logic was adapted from ip6_append_data when first writing on the corked socket.
This bug was introduced with commit 0c1833797a5a6ec23ea9261d979aa18078720b74 ("ipv6: fix incorrect ipsec fragment").
v2:
a) Replace IPV6_PMTU_DISC_DO with IPV6_PMTUDISC_PROBE.
b) Don't pass ipv6_pinfo to ip6_append_data_mtu (suggestion by Gao feng, thanks!).
c) Change mtu to unsigned int, else we get a warning about non-matching types because of the min()-macro type-check.
--- net/ipv6/ip6_output.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
net/ipv6/ip6_output.c +10 -6
@@ -1182,11 +1182,12 @@ static inline struct ipv6_rt_hdr *ip6_rthdr_dup(struct ipv6_rt_hdr *src,return src ?kmemdup (src, (src->hdrlen +1 ) *8 , gfp) :NULL ; } -static void ip6_append_data_mtu (int *mtu, +static void ip6_append_data_mtu (unsigned int *mtu,int *maxfraglen,unsigned int fragheaderlen,struct sk_buff *skb, -struct rt6_info *rt) +struct rt6_info *rt, +bool pmtuprobe) {if (!(rt->dst.flags &DST_XFRM_TUNNEL )) {if (skb ==NULL ) {
@@ -1198,7 +1199,9 @@ static void ip6_append_data_mtu(int *mtu,* this fragment is not first, the headers * space is regarded as data space. */ - *mtu =dst_mtu (rt->dst.path); + *mtu =min (*mtu, pmtuprobe ? + rt->dst.dev->mtu : +dst_mtu (rt->dst.path)); } *maxfraglen = ((*mtu - fragheaderlen) & ~7 ) + fragheaderlen -sizeof (struct frag_hdr );
@@ -1215,11 +1218,10 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,struct ipv6_pinfo *np =inet6_sk (sk);struct inet_cork *cork;struct sk_buff *skb, *skb_prev =NULL ; -unsigned int maxfraglen, fragheaderlen; +unsigned int maxfraglen, fragheaderlen, mtu;int exthdrlen;int dst_exthdrlen;int hh_len; -int mtu;int copy;int err;int offset =0 ;
@@ -1381,7 +1383,9 @@ alloc_new_skb:/* update mtu and maxfraglen if necessary */ if (skb ==NULL || skb_prev ==NULL )ip6_append_data_mtu (&mtu, &maxfraglen, - fragheaderlen, skb, rt); + fragheaderlen, skb, rt, + np->pmtudisc == +IPV6_PMTUDISC_PROBE ); skb_prev = skb;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 44/251 virtio: support unlocked queue poll
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Michael S. Tsirkin" <[email protected]>
[ Upstream commit cc229884d3f77ec3b1240e467e0236c3e0647c0c ]
This adds a way to check ring empty state after enable_cb outside any locks. Will be used by virtio_net.
Note: there's room for more optimization: caller is likely to have a memory barrier already, which means we might be able to get rid of a barrier here. Deferring this optimization until we do some benchmarking.
--- drivers/virtio/virtio_ring.c | 54 +++++++++++++++++++++++++++++++++--------- include/linux/virtio.h | 4 ++++ 2 files changed, 47 insertions(+), 11 deletions(-)
drivers/virtio/virtio_ring.c +43 -11
@@ -491,16 +491,18 @@ EXPORT_SYMBOL_GPL(virtqueue_disable_cb);* virtqueue_enable_cb - restart callbacks after disable_cb. * @vq: the struct virtqueue we're talking about. * -* This re-enables callbacks; it returns "false" if there are pending -* buffers in the queue, to detect a possible race between the driver -* checking for more work, and enabling callbacks. +* This re-enables callbacks; it returns current queue state +* in an opaque unsigned value. This value should be later tested by +* virtqueue_poll, to detect a possible race between the driver checking for +* more work, and enabling callbacks. * * Caller must ensure we don't call this with other virtqueue * operations at the same time (except where noted). */ -bool virtqueue_enable_cb (struct virtqueue *_vq) +unsigned virtqueue_enable_cb_prepare (struct virtqueue *_vq) {struct vring_virtqueue *vq =to_vvq (_vq); +u16 last_used_idx;START_USE (vq);
@@ -510,15 +512,45 @@ bool virtqueue_enable_cb(struct virtqueue *_vq)* either clear the flags bit or point the event index at the next * entry. Always do both to keep code simple. */ vq->vring.avail->flags &= ~VRING_AVAIL_F_NO_INTERRUPT ; -vring_used_event (&vq->vring) = vq->last_used_idx; +vring_used_event (&vq->vring) = last_used_idx = vq->last_used_idx; +END_USE (vq); +return last_used_idx; +} +EXPORT_SYMBOL_GPL (virtqueue_enable_cb_prepare); + +/** +* virtqueue_poll - query pending used buffers +* @vq: the struct virtqueue we're talking about. +* @last_used_idx: virtqueue state (from call to virtqueue_enable_cb_prepare). +* +* Returns "true" if there are pending used buffers in the queue. +* +* This does not need to be serialized. +*/ +bool virtqueue_poll (struct virtqueue *_vq,unsigned last_used_idx) +{ +struct vring_virtqueue *vq =to_vvq (_vq); +virtio_mb (vq); -if (unlikely (more_used (vq))) { -END_USE (vq); -return false; - } +return (u16 )last_used_idx != vq->vring.used->idx; +} +EXPORT_SYMBOL_GPL (virtqueue_poll); -END_USE (vq); -return true; +/** +* virtqueue_enable_cb - restart callbacks after disable_cb. +* @vq: the struct virtqueue we're talking about. +* +* This re-enables callbacks; it returns "false" if there are pending +* buffers in the queue, to detect a possible race between the driver +* checking for more work, and enabling callbacks. +* +* Caller must ensure we don't call this with other virtqueue +* operations at the same time (except where noted). +*/ +bool virtqueue_enable_cb (struct virtqueue *_vq) +{ +unsigned last_used_idx =virtqueue_enable_cb_prepare (_vq); +return !virtqueue_poll (_vq, last_used_idx); }EXPORT_SYMBOL_GPL (virtqueue_enable_cb);
include/linux/virtio.h +4 -0
@@ -44,6 +44,10 @@ void virtqueue_disable_cb(struct virtqueue *vq);bool virtqueue_enable_cb (struct virtqueue *vq); +unsigned virtqueue_enable_cb_prepare (struct virtqueue *vq); + +bool virtqueue_poll (struct virtqueue *vq,unsigned ); +bool virtqueue_enable_cb_delayed (struct virtqueue *vq);void *virtqueue_detach_unused_buf (struct virtqueue *vq);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 45/251 virtio_net: fix race in RX VQ processing
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Michael S. Tsirkin" <[email protected]>
[ Upstream commit cbdadbbf0c790f79350a8f36029208944c5487d0 ]
virtio net called virtqueue_enable_cq on RX path after napi_complete, so with NAPI_STATE_SCHED clear - outside the implicit napi lock. This violates the requirement to synchronize virtqueue_enable_cq wrt virtqueue_add_buf. In particular, used event can move backwards, causing us to lose interrupts.
In a debug build, this can trigger panic within START_USE.
Jason Wang reports that he can trigger the races artificially, by adding udelay() in virtqueue_enable_cb() after virtio_mb().
However, we must call napi_complete to clear NAPI_STATE_SCHED before polling the virtqueue for used buffers, otherwise napi_schedule_prep in a callback will fail, causing us to lose RX events.
To fix, call virtqueue_enable_cb_prepare with NAPI_STATE_SCHED set (under napi lock), later call virtqueue_poll with NAPI_STATE_SCHED clear (outside the lock).
--- drivers/net/virtio_net.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/virtio_net.c +3 -2
@@ -528,7 +528,7 @@ static int virtnet_poll(struct napi_struct *napi, int budget) { struct virtnet_info *vi = container_of(napi, struct virtnet_info, napi);void *buf; -unsigned int len, received =0 ; +unsigned int r, len, received =0 ; again: while (received < budget &&
@@ -545,8 +545,9 @@ again:/* Out of packets? */ if (received < budget) { + r =virtqueue_enable_cb_prepare (vi->rvq);napi_complete (napi); -if (unlikely (!virtqueue_enable_cb (vi->rvq)) && +if (unlikely (virtqueue_poll (vi->rvq, r)) &&napi_schedule_prep (napi)) {virtqueue_disable_cb (vi->rvq);__napi_schedule (napi);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 46/251 sunvnet: vnet_port_remove must call unregister_netdev
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Dave Kleikamp <[email protected]>
[ Upstream commit aabb9875d02559ab9b928cd6f259a5cc4c21a589 ]
The missing call to unregister_netdev() leaves the interface active after the driver is unloaded by rmmod.
--- drivers/net/ethernet/sun/sunvnet.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/sun/sunvnet.c +2 -0
@@ -1243,6 +1243,8 @@ static int vnet_port_remove(struct vio_dev *vdev)dev_set_drvdata (&vdev->dev,NULL );kfree (port); + +unregister_netdev (vp->dev); }return 0 ; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 47/251 ifb: fix rcu_sched self-detected stalls
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: dingtianhong <[email protected]>
[ Upstream commit 440d57bc5ff55ec1efb3efc9cbe9420b4bbdfefa ]
According to the commit 16b0dc29c1af9df341428f4c49ada4f626258082 (dummy: fix rcu_sched self-detected stalls)
Eric Dumazet fix the problem in dummy, but the ifb will occur the same problem like the dummy modules.
Trying to "modprobe ifb numifbs=30000" triggers :
INFO: rcu_sched self-detected stall on CPU
After this splat, RTNL is locked and reboot is needed.
We must call cond_resched() to avoid this, even holding RTNL.
--- drivers/net/ifb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ifb.c +3 -1
@@ -291,8 +291,10 @@ static int __init ifb_init_module(void)rtnl_lock (); err =__rtnl_link_register (&ifb_link_ops); -for (i =0 ; i < numifbs && !err; i++) +for (i =0 ; i < numifbs && !err; i++) { err =ifb_init_one (i); +cond_resched (); + }if (err)__rtnl_link_unregister (&ifb_link_ops);rtnl_unlock ();
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 48/251 tuntap: correctly linearize skb when zerocopy is used
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
[ Upstream commit 3dd5c3308e8b671e8e8882ba972f51cefbe9fd0d ]
Userspace may produce vectors greater than MAX_SKB_FRAGS. When we try to linearize parts of the skb to let the rest of iov to be fit in the frags, we need count copylen into linear when calling tun_alloc_skb() instead of partly counting it into data_len. Since this breaks zerocopy_sg_from_iovec() since its inner counter assumes nr_frags should be zero at beginning. This cause nr_frags to be increased wrongly without setting the correct frags.
This bug were introduced from 0690899b4d4501b3505be069b9a687e68ccbe15b (tun: experimental zero copy tx support)
--- drivers/net/tun.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/tun.c +6 -2
@@ -692,7 +692,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, void *msg_control, {struct tun_pi pi = {0 ,cpu_to_be16 (ETH_P_IP ) };struct sk_buff *skb; -size_t len = total_len, align =NET_SKB_PAD ; +size_t len = total_len, align =NET_SKB_PAD , linear;struct virtio_net_hdr gso = {0 };int offset =0 ;int copylen;
@@ -755,10 +755,14 @@ static ssize_t tun_get_user(struct tun_struct *tun, void *msg_control, copylen = gso.hdr_len;if (!copylen) copylen =GOODCOPY_LEN ; - }else + linear = copylen; + }else { copylen = len; + linear = gso.hdr_len; + } skb =tun_alloc_skb (tun, align, copylen, gso.hdr_len, noblock); + skb =tun_alloc_skb (tun, align, copylen, linear, noblock);if (IS_ERR (skb)) {if (PTR_ERR (skb) != -EAGAIN ) tun->dev->stats.rx_dropped++;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 49/251 macvtap: correctly linearize skb when zerocopy is used
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
[ Upstream commit 61d46bf979d5cd7c164709a80ad5676a35494aae ]
Userspace may produce vectors greater than MAX_SKB_FRAGS. When we try to linearize parts of the skb to let the rest of iov to be fit in the frags, we need count copylen into linear when calling macvtap_alloc_skb() instead of partly counting it into data_len. Since this breaks zerocopy_sg_from_iovec() since its inner counter assumes nr_frags should be zero at beginning. This cause nr_frags to be increased wrongly without setting the correct frags.
This bug were introduced from b92946e2919134ebe2a4083e4302236295ea2a73 (macvtap: zerocopy: validate vectors before building skb).
--- drivers/net/macvtap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/macvtap.c +6 -2
@@ -656,6 +656,7 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,int vnet_hdr_len =0 ;int copylen =0 ;bool zerocopy = false; +size_t linear;if (q->flags &IFF_VNET_HDR ) { vnet_hdr_len = q->vnet_hdr_sz;
@@ -710,11 +711,14 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m, copylen = vnet_hdr.hdr_len;if (!copylen) copylen =GOODCOPY_LEN ; - }else + linear = copylen; + }else { copylen = len; + linear = vnet_hdr.hdr_len; + } skb =macvtap_alloc_skb (&q->sk,NET_IP_ALIGN , copylen, - vnet_hdr.hdr_len, noblock, &err); + linear, noblock, &err);if (!skb) goto err;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 50/251 ipv6: in case of link failure remove route directly instead of letting it expire
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Hannes Frederic Sowa <[email protected]>
[ Upstream commit 1eb4f758286884e7566627164bca4c4a16952a83 ]
We could end up expiring a route which is part of an ecmp route set. Doing so would invalidate the rt->rt6i_nsiblings calculations and could provoke the following panic:
[ 80.144667] ------------[ cut here ]------------ [ 80.145172] kernel BUG at net/ipv6/ip6_fib.c:733! [ 80.145172] invalid opcode: 0000 [#1] SMP [ 80.145172] Modules linked in: 8021q nf_conntrack_netbios_ns nf_conntrack_broadcast ipt_MASQUERADE ip6table_mangle ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 iptable_nat nf_nat_ipv4 nf_nat iptable_mangle nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ebtable_filter ebtables ip6table_filter ip6_tables +snd_hda_intel snd_hda_codec snd_hwdep snd_seq snd_seq_device snd_pcm snd_page_alloc snd_timer virtio_balloon snd soundcore i2c_piix4 i2c_core virtio_net virtio_blk [ 80.145172] CPU: 1 PID: 786 Comm: ping6 Not tainted 3.10.0+ #118 [ 80.145172] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 [ 80.145172] task: ffff880117fa0000 ti: ffff880118770000 task.ti: ffff880118770000 [ 80.145172] RIP: 0010:[<ffffffff815f3b5d>] [<ffffffff815f3b5d>] fib6_add+0x75d/0x830 [ 80.145172] RSP: 0018:ffff880118771798 EFLAGS: 00010202 [ 80.145172] RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff88011350e480 [ 80.145172] RDX: ffff88011350e238 RSI: 0000000000000004 RDI: ffff88011350f738 [ 80.145172] RBP: ffff880118771848 R08: ffff880117903280 R09: 0000000000000001 [ 80.145172] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88011350f680 [ 80.145172] R13: ffff880117903280 R14: ffff880118771890 R15: ffff88011350ef90 [ 80.145172] FS: 00007f02b5127740(0000) GS:ffff88011fd00000(0000) knlGS:0000000000000000 [ 80.145172] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 80.145172] CR2: 00007f981322a000 CR3: 00000001181b1000 CR4: 00000000000006e0 [ 80.145172] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 80.145172] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 80.145172] Stack: [ 80.145172] 0000000000000001 ffff880100000000 ffff880100000000 ffff880117903280 [ 80.145172] 0000000000000000 ffff880119a4cf00 0000000000000400 00000000000007fa [ 80.145172] 0000000000000000 0000000000000000 0000000000000000 ffff88011350f680 [ 80.145172] Call Trace: [ 80.145172] [<ffffffff815eeceb>] ? rt6_bind_peer+0x4b/0x90 [ 80.145172] [<ffffffff815ed985>] __ip6_ins_rt+0x45/0x70 [ 80.145172] [<ffffffff815eee35>] ip6_ins_rt+0x35/0x40 [ 80.145172] [<ffffffff815ef1e4>] ip6_pol_route.isra.44+0x3a4/0x4b0 [ 80.145172] [<ffffffff815ef34a>] ip6_pol_route_output+0x2a/0x30 [ 80.145172] [<ffffffff81616077>] fib6_rule_action+0xd7/0x210 [ 80.145172] [<ffffffff815ef320>] ? ip6_pol_route_input+0x30/0x30 [ 80.145172] [<ffffffff81553026>] fib_rules_lookup+0xc6/0x140 [ 80.145172] [<ffffffff81616374>] fib6_rule_lookup+0x44/0x80 [ 80.145172] [<ffffffff815ef320>] ? ip6_pol_route_input+0x30/0x30 [ 80.145172] [<ffffffff815edea3>] ip6_route_output+0x73/0xb0 [ 80.145172] [<ffffffff815dfdf3>] ip6_dst_lookup_tail+0x2c3/0x2e0 [ 80.145172] [<ffffffff813007b1>] ? list_del+0x11/0x40 [ 80.145172] [<ffffffff81082a4c>] ? remove_wait_queue+0x3c/0x50 [ 80.145172] [<ffffffff815dfe4d>] ip6_dst_lookup_flow+0x3d/0xa0 [ 80.145172] [<ffffffff815fda77>] rawv6_sendmsg+0x267/0xc20 [ 80.145172] [<ffffffff815a8a83>] inet_sendmsg+0x63/0xb0 [ 80.145172] [<ffffffff8128eb93>] ? selinux_socket_sendmsg+0x23/0x30 [ 80.145172] [<ffffffff815218d6>] sock_sendmsg+0xa6/0xd0 [ 80.145172] [<ffffffff81524a68>] SYSC_sendto+0x128/0x180 [ 80.145172] [<ffffffff8109825c>] ? update_curr+0xec/0x170 [ 80.145172] [<ffffffff81041d09>] ? kvm_clock_get_cycles+0x9/0x10 [ 80.145172] [<ffffffff810afd1e>] ? __getnstimeofday+0x3e/0xd0 [ 80.145172] [<ffffffff8152509e>] SyS_sendto+0xe/0x10 [ 80.145172] [<ffffffff8164efd9>] system_call_fastpath+0x16/0x1b [ 80.145172] Code: fe ff ff 41 f6 45 2a 06 0f 85 ca fe ff ff 49 8b 7e 08 4c 89 ee e8 94 ef ff ff e9 b9 fe ff ff 48 8b 82 28 05 00 00 e9 01 ff ff ff <0f> 0b 49 8b 54 24 30 0d 00 00 40 00 89 83 14 01 00 00 48 89 53 [ 80.145172] RIP [<ffffffff815f3b5d>] fib6_add+0x75d/0x830 [ 80.145172] RSP <ffff880118771798> [ 80.387413] ---[ end trace 02f20b7a8b81ed95 ]--- [ 80.390154] Kernel panic - not syncing: Fatal exception in interrupt
--- net/ipv6/route.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/ipv6/route.c +6 -3
@@ -1076,10 +1076,13 @@ static void ip6_link_failure(struct sk_buff *skb) rt = (struct rt6_info *)skb_dst (skb);if (rt) { -if (rt->rt6i_flags &RTF_CACHE ) -rt6_update_expires (rt,0 ); -else if (rt->rt6i_node && (rt->rt6i_flags &RTF_DEFAULT )) +if (rt->rt6i_flags &RTF_CACHE ) { +dst_hold (&rt->dst); +if (ip6_del_rt (rt)) +dst_free (&rt->dst); + }else if (rt->rt6i_node && (rt->rt6i_flags &RTF_DEFAULT )) { rt->rt6i_node->fn_sernum =-1 ; + } } }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 51/251 9p: fix off by one causing access violations and memory corruption
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sasha Levin <[email protected]>
[ Upstream commit 110ecd69a9feea82a152bbf9b12aba57e6396883 ]
p9_release_pages() would attempt to dereference one value past the end of pages[]. This would cause the following crashes:
[ 6293.171817] BUG: unable to handle kernel paging request at ffff8807c96f3000 [ 6293.174146] IP: [<ffffffff8412793b>] p9_release_pages+0x3b/0x60 [ 6293.176447] PGD 79c5067 PUD 82c1e3067 PMD 82c197067 PTE 80000007c96f3060 [ 6293.180060] Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC [ 6293.180060] Modules linked in: [ 6293.180060] CPU: 62 PID: 174043 Comm: modprobe Tainted: G W 3.10.0-next-20130710-sasha #3954 [ 6293.180060] task: ffff8807b803b000 ti: ffff880787dde000 task.ti: ffff880787dde000 [ 6293.180060] RIP: 0010:[<ffffffff8412793b>] [<ffffffff8412793b>] p9_release_pages+0x3b/0x60 [ 6293.214316] RSP: 0000:ffff880787ddfc28 EFLAGS: 00010202 [ 6293.214316] RAX: 0000000000000001 RBX: ffff8807c96f2ff8 RCX: 0000000000000000 [ 6293.222017] RDX: ffff8807b803b000 RSI: 0000000000000001 RDI: ffffea001c7e3d40 [ 6293.222017] RBP: ffff880787ddfc48 R08: 0000000000000000 R09: 0000000000000000 [ 6293.222017] R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000001 [ 6293.222017] R13: 0000000000000001 R14: ffff8807cc50c070 R15: ffff8807cc50c070 [ 6293.222017] FS: 00007f572641d700(0000) GS:ffff8807f3600000(0000) knlGS:0000000000000000 [ 6293.256784] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 6293.256784] CR2: ffff8807c96f3000 CR3: 00000007c8e81000 CR4: 00000000000006e0 [ 6293.256784] Stack: [ 6293.256784] ffff880787ddfcc8 ffff880787ddfcc8 0000000000000000 ffff880787ddfcc8 [ 6293.256784] ffff880787ddfd48 ffffffff84128be8 ffff880700000002 0000000000000001 [ 6293.256784] ffff8807b803b000 ffff880787ddfce0 0000100000000000 0000000000000000 [ 6293.256784] Call Trace: [ 6293.256784] [<ffffffff84128be8>] p9_virtio_zc_request+0x598/0x630 [ 6293.256784] [<ffffffff8115c610>] ? wake_up_bit+0x40/0x40 [ 6293.256784] [<ffffffff841209b1>] p9_client_zc_rpc+0x111/0x3a0 [ 6293.256784] [<ffffffff81174b78>] ? sched_clock_cpu+0x108/0x120 [ 6293.256784] [<ffffffff84122a21>] p9_client_read+0xe1/0x2c0 [ 6293.256784] [<ffffffff81708a90>] v9fs_file_read+0x90/0xc0 [ 6293.256784] [<ffffffff812bd073>] vfs_read+0xc3/0x130 [ 6293.256784] [<ffffffff811a78bd>] ? trace_hardirqs_on+0xd/0x10 [ 6293.256784] [<ffffffff812bd5a2>] SyS_read+0x62/0xa0 [ 6293.256784] [<ffffffff841a1a00>] tracesys+0xdd/0xe2 [ 6293.256784] Code: 66 90 48 89 fb 41 89 f5 48 8b 3f 48 85 ff 74 29 85 f6 74 25 45 31 e4 66 0f 1f 84 00 00 00 00 00 e8 eb 14 12 fd 41 ff c4 49 63 c4 <48> 8b 3c c3 48 85 ff 74 05 45 39 e5 75 e7 48 83 c4 08 5b 41 5c [ 6293.256784] RIP [<ffffffff8412793b>] p9_release_pages+0x3b/0x60 [ 6293.256784] RSP <ffff880787ddfc28> [ 6293.256784] CR2: ffff8807c96f3000 [ 6293.256784] ---[ end trace 50822ee72cd360fc ]---
--- net/9p/trans_common.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/9p/trans_common.c +5 -5
@@ -24,11 +24,11 @@*/ void p9_release_pages (struct page **pages,int nr_pages) { -int i =0 ; -while (pages[i] && nr_pages--) { -put_page (pages[i]); - i++; - } +int i; + +for (i =0 ; i < nr_pages; i++) +if (pages[i]) +put_page (pages[i]); }EXPORT_SYMBOL (p9_release_pages);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 52/251 dummy: fix oops when loading the dummy failed
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: dingtianhong <[email protected]>
[ Upstream commit 2c8a01894a12665d8059fad8f0a293c98a264121 ]
We rename the dummy in modprobe.conf like this:
install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy install dummy1 /sbin/modprobe -o dummy1 --ignore-install dummy
We got oops when we run the command:
modprobe dummy0
modprobe dummy1
------------[ cut here ]------------
[ 3302.187584] BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 [ 3302.195411] IP: [<ffffffff813fe62a>] __rtnl_link_unregister+0x9a/0xd0 [ 3302.201844] PGD 85c94a067 PUD 8517bd067 PMD 0 [ 3302.206305] Oops: 0002 [#1] SMP [ 3302.299737] task: ffff88105ccea300 ti: ffff880eba4a0000 task.ti: ffff880eba4a0000 [ 3302.307186] RIP: 0010:[<ffffffff813fe62a>] [<ffffffff813fe62a>] __rtnl_link_unregister+0x9a/0xd0 [ 3302.316044] RSP: 0018:ffff880eba4a1dd8 EFLAGS: 00010246 [ 3302.321332] RAX: 0000000000000000 RBX: ffffffff81a9d738 RCX: 0000000000000002 [ 3302.328436] RDX: 0000000000000000 RSI: ffffffffa04d602c RDI: ffff880eba4a1dd8 [ 3302.335541] RBP: ffff880eba4a1e18 R08: dead000000200200 R09: dead000000100100 [ 3302.342644] R10: 0000000000000080 R11: 0000000000000003 R12: ffffffff81a9d788 [ 3302.349748] R13: ffffffffa04d7020 R14: ffffffff81a9d670 R15: ffff880eba4a1dd8 [ 3302.364910] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3302.370630] CR2: 0000000000000008 CR3: 000000085e15e000 CR4: 00000000000427e0 [ 3302.377734] DR0: 0000000000000003 DR1: 00000000000000b0 DR2: 0000000000000001 [ 3302.384838] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 3302.391940] Stack: [ 3302.393944] ffff880eba4a1dd8 ffff880eba4a1dd8 ffff880eba4a1e18 ffffffffa04d70c0 [ 3302.401350] 00000000ffffffef ffffffffa01a8000 0000000000000000 ffffffff816111c8 [ 3302.408758] ffff880eba4a1e48 ffffffffa01a80be ffff880eba4a1e48 ffffffffa04d70c0 [ 3302.416164] Call Trace: [ 3302.418605] [<ffffffffa01a8000>] ? 0xffffffffa01a7fff [ 3302.423727] [<ffffffffa01a80be>] dummy_init_module+0xbe/0x1000 [dummy0] [ 3302.430405] [<ffffffffa01a8000>] ? 0xffffffffa01a7fff [ 3302.435535] [<ffffffff81000322>] do_one_initcall+0x152/0x1b0 [ 3302.441263] [<ffffffff810ab24b>] do_init_module+0x7b/0x200 [ 3302.446824] [<ffffffff810ad3d2>] load_module+0x4e2/0x530 [ 3302.452215] [<ffffffff8127ae40>] ? ddebug_dyndbg_boot_param_cb+0x60/0x60 [ 3302.458979] [<ffffffff810ad5f1>] SyS_init_module+0xd1/0x130 [ 3302.464627] [<ffffffff814b9652>] system_call_fastpath+0x16/0x1b [ 3302.490090] RIP [<ffffffff813fe62a>] __rtnl_link_unregister+0x9a/0xd0 [ 3302.496607] RSP <ffff880eba4a1dd8> [ 3302.500084] CR2: 0000000000000008 [ 3302.503466] ---[ end trace 8342d49cd49f78ed ]---
The reason is that when loading dummy, if __rtnl_link_register() return failed, the init_module should return and avoid take the wrong path.
--- drivers/net/dummy.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/dummy.c +4 -0
@@ -175,6 +175,8 @@ static int __init dummy_init_module(void)rtnl_lock (); err =__rtnl_link_register (&dummy_link_ops); +if (err <0 ) + goto out;for (i =0 ; i < numdummies && !err; i++) { err =dummy_init_one ();
@@ -182,6 +184,8 @@ static int __init dummy_init_module(void) }if (err <0 )__rtnl_link_unregister (&dummy_link_ops); + +out:rtnl_unlock ();return err;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 53/251 ifb: fix oops when loading the ifb failed
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: dingtianhong <[email protected]>
[ Upstream commit f2966cd5691058b8674a20766525bedeaea9cbcf ]
If __rtnl_link_register() return faild when loading the ifb, it will take the wrong path and get oops, so fix it just like dummy.
--- drivers/net/ifb.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ifb.c +4 -0
@@ -290,6 +290,8 @@ static int __init ifb_init_module(void)rtnl_lock (); err =__rtnl_link_register (&ifb_link_ops); +if (err <0 ) + goto out;for (i =0 ; i < numifbs && !err; i++) { err =ifb_init_one (i);
@@ -297,6 +299,8 @@ static int __init ifb_init_module(void) }if (err)__rtnl_link_unregister (&ifb_link_ops); + +out:rtnl_unlock ();return err;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 54/251 atl1e: fix dma mapping warnings
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Neil Horman <[email protected]>
[ Upstream commit 352900b583b2852152a1e05ea0e8b579292e731e ]
Recently had this backtrace reported:
WARNING: at lib/dma-debug.c:937 check_unmap+0x47d/0x930() Hardware name: System Product Name ATL1E 0000:02:00.0: DMA-API: device driver failed to check map error[device address=0x00000000cbfd1000] [size=90 bytes] [mapped as single] Modules linked in: xt_conntrack nf_conntrack ebtable_filter ebtables
ip6table_filter ip6_tables snd_hda_codec_hdmi snd_hda_codec_realtek iTCO_wdt iTCO_vendor_support snd_hda_intel acpi_cpufreq mperf coretemp btrfs zlib_deflate snd_hda_codec snd_hwdep microcode raid6_pq libcrc32c snd_seq usblp serio_raw xor snd_seq_device joydev snd_pcm snd_page_alloc snd_timer snd lpc_ich i2c_i801 soundcore mfd_core atl1e asus_atk0110 ata_generic pata_acpi radeon i2c_algo_bit drm_kms_helper ttm drm i2c_core pata_marvell uinput
Pid: 314, comm: systemd-journal Not tainted 3.9.0-0.rc6.git2.3.fc19.x86_64 #1
Call Trace: <IRQ> [<ffffffff81069106>] warn_slowpath_common+0x66/0x80 [<ffffffff8106916c>] warn_slowpath_fmt+0x4c/0x50 [<ffffffff8138151d>] check_unmap+0x47d/0x930 [<ffffffff810ad048>] ? sched_clock_cpu+0xa8/0x100 [<ffffffff81381a2f>] debug_dma_unmap_page+0x5f/0x70 [<ffffffff8137ce30>] ? unmap_single+0x20/0x30 [<ffffffffa01569a1>] atl1e_intr+0x3a1/0x5b0 [atl1e] [<ffffffff810d53fd>] ? trace_hardirqs_off+0xd/0x10 [<ffffffff81119636>] handle_irq_event_percpu+0x56/0x390 [<ffffffff811199ad>] handle_irq_event+0x3d/0x60 [<ffffffff8111cb6a>] handle_fasteoi_irq+0x5a/0x100 [<ffffffff8101c36f>] handle_irq+0xbf/0x150 [<ffffffff811dcb2f>] ? file_sb_list_del+0x3f/0x50 [<ffffffff81073b10>] ? irq_enter+0x50/0xa0 [<ffffffff8172738d>] do_IRQ+0x4d/0xc0 [<ffffffff811dcb2f>] ? file_sb_list_del+0x3f/0x50 [<ffffffff8171c6b2>] common_interrupt+0x72/0x72 <EOI> [<ffffffff810db5b2>] ? lock_release+0xc2/0x310 [<ffffffff8109ea04>] lg_local_unlock_cpu+0x24/0x50 [<ffffffff811dcb2f>] file_sb_list_del+0x3f/0x50 [<ffffffff811dcb6d>] fput+0x2d/0xc0 [<ffffffff811d8ea1>] filp_close+0x61/0x90 [<ffffffff811fae4d>] __close_fd+0x8d/0x150 [<ffffffff811d8ef0>] sys_close+0x20/0x50 [<ffffffff81725699>] system_call_fastpath+0x16/0x1b
The usual straighforward failure to check for dma_mapping_error after a map operation is completed.
This patch should fix it, the reporter wandered off after filing this bz:
https://bugzilla.redhat.com/show_bug.cgi?id=954170
and I don't have hardware to test, but the fix is pretty straightforward, so I figured I'd post it for review.
--- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 28 ++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
drivers/net/ethernet/atheros/atl1e/atl1e_main.c +25 -3
@@ -1669,8 +1669,8 @@ check_sum:return 0 ; } -static void atl1e_tx_map (struct atl1e_adapter *adapter, -struct sk_buff *skb,struct atl1e_tpd_desc *tpd) +static int atl1e_tx_map (struct atl1e_adapter *adapter, +struct sk_buff *skb,struct atl1e_tpd_desc *tpd) {struct atl1e_tpd_desc *use_tpd =NULL ;struct atl1e_tx_buffer *tx_buffer =NULL ;
@@ -1681,6 +1681,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,u16 nr_frags;u16 f;int segment; +int ring_start = adapter->tx_ring.next_to_use; nr_frags =skb_shinfo (skb)->nr_frags; segment = (tpd->word3 >>TPD_SEGMENT_EN_SHIFT ) &TPD_SEGMENT_EN_MASK ;
@@ -1693,6 +1694,9 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter, tx_buffer->length = map_len; tx_buffer->dma =pci_map_single (adapter->pdev, skb->data, hdr_len,PCI_DMA_TODEVICE ); +if (dma_mapping_error (&adapter->pdev->dev, tx_buffer->dma)) +return -ENOSPC ; +ATL1E_SET_PCIMAP_TYPE (tx_buffer,ATL1E_TX_PCIMAP_SINGLE ); mapped_len += map_len; use_tpd->buffer_addr =cpu_to_le64 (tx_buffer->dma);
@@ -1719,6 +1723,13 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter, tx_buffer->dma =pci_map_single (adapter->pdev, skb->data + mapped_len, map_len,PCI_DMA_TODEVICE ); + +if (dma_mapping_error (&adapter->pdev->dev, tx_buffer->dma)) { +/* Reset the tx rings next pointer */ + adapter->tx_ring.next_to_use = ring_start; +return -ENOSPC ; + } +ATL1E_SET_PCIMAP_TYPE (tx_buffer,ATL1E_TX_PCIMAP_SINGLE ); mapped_len += map_len; use_tpd->buffer_addr =cpu_to_le64 (tx_buffer->dma);
@@ -1754,6 +1765,13 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter, (i *MAX_TX_BUF_LEN ), tx_buffer->length, DMA_TO_DEVICE); + +if (dma_mapping_error (&adapter->pdev->dev, tx_buffer->dma)) { +/* Reset the ring next to use pointer */ + adapter->tx_ring.next_to_use = ring_start; +return -ENOSPC ; + } +ATL1E_SET_PCIMAP_TYPE (tx_buffer,ATL1E_TX_PCIMAP_PAGE ); use_tpd->buffer_addr =cpu_to_le64 (tx_buffer->dma); use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
@@ -1771,6 +1789,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,/* The last buffer info contain the skb address, so it will be free after unmap */ tx_buffer->skb = skb; +return 0 ; } static void atl1e_tx_queue(struct atl1e_adapter *adapter, u16 count,
@@ -1838,10 +1857,13 @@ static netdev_tx_t atl1e_xmit_frame(struct sk_buff *skb,return NETDEV_TX_OK ; } -atl1e_tx_map (adapter, skb, tpd); +if (atl1e_tx_map (adapter, skb, tpd)) + goto out; +atl1e_tx_queue (adapter, tpd_req, tpd); netdev->trans_start = jiffies;/* NETIF_F_LLTX driver :( */ +out:spin_unlock_irqrestore (&adapter->tx_lock, flags);return NETDEV_TX_OK ; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 55/251 skb: report completion status for zero copy skbs
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Michael S. Tsirkin" <[email protected]>
[ Upstream commit e19d6763cc300fcb706bd291b24ac06be71e1ce6 ]
Even if skb is marked for zero copy, net core might still decide to copy it later which is somewhat slower than a copy in user context:
besides copying the data we need to pin/unpin the pages.
Add a parameter reporting such cases through zero copy callback:
if this happens a lot, device can take this into account and switch to copying in user context.
This patch updates all users but ignores the passed value for now:
it will be used by follow-up patches.
--- drivers/vhost/vhost.c | 2 +- drivers/vhost/vhost.h | 2 +- include/linux/skbuff.h | 4 +++- net/core/skbuff.c | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-)
drivers/vhost/vhost.c +1 -1
@@ -1600,7 +1600,7 @@ void vhost_ubuf_put_and_wait(struct vhost_ubuf_ref *ubufs)kfree (ubufs); } -void vhost_zerocopy_callback (struct ubuf_info *ubuf) +void vhost_zerocopy_callback (struct ubuf_info *ubuf,bool status) {struct vhost_ubuf_ref *ubufs = ubuf->ctx;struct vhost_virtqueue *vq = ubufs->vq;
drivers/vhost/vhost.h +1 -1
@@ -191,7 +191,7 @@ bool vhost_enable_notify(struct vhost_dev *, struct vhost_virtqueue *);int vhost_log_write (struct vhost_virtqueue *vq,struct vhost_log *log,unsigned int log_num,u64 len); -void vhost_zerocopy_callback (struct ubuf_info *); +void vhost_zerocopy_callback (struct ubuf_info *,bool );int vhost_zerocopy_signal_used (struct vhost_virtqueue *vq);#define vq_err (vq, fmt, ...) do { \
include/linux/skbuff.h +3 -1
@@ -235,11 +235,13 @@ enum {/* * The callback notifies userspace to release buffers when skb DMA is done in * lower device, the skb last reference should be 0 when calling this. +* The zerocopy_success argument is true if zero copy transmit occurred, +* false on data copy or out of memory error caused by data copy attempt. * The ctx field is used to track device context. * The desc field is used to track userspace buffer index. */ struct ubuf_info { -void (*callback)(struct ubuf_info *); +void (*callback)(struct ubuf_info *,bool zerocopy_success);void *ctx;unsigned long desc; };
net/core/skbuff.c +2 -2
@@ -505,7 +505,7 @@ static void skb_release_data(struct sk_buff *skb) uarg =skb_shinfo (skb)->destructor_arg;if (uarg->callback) - uarg->callback (uarg); + uarg->callback (uarg, true); }if (skb_has_frag_list (skb))
@@ -783,7 +783,7 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)for (i =0 ; i < num_frags; i++)skb_frag_unref (skb, i); - uarg->callback (uarg); + uarg->callback (uarg, false);/* skb frags point to kernel buffers */ for (i = num_frags -1 ; i >=0 ; i--) {
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 56/251 tuntap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
[ Upstream commit 885291761dba2bfe04df4c0f7bb75e4c920ab82e ]
We try to linearize part of the skb when the number of iov is greater than MAX_SKB_FRAGS. This is not enough since each single vector may occupy more than one pages, so zerocopy_sg_fromiovec() may still fail and may break the guest network.
Solve this problem by calculate the pages needed for iov before trying to do zerocopy and switch to use copy instead of zerocopy if it needs more than MAX_SKB_FRAGS.
This is done through introducing a new helper to count the pages for iov, and call uarg->callback() manually when switching from zerocopy to copy to notify vhost.
We can do further optimization on top.
The bug were introduced from commit 0690899b4d4501b3505be069b9a687e68ccbe15b (tun: experimental zero copy tx support)
--- drivers/net/tun.c | 63 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 24 deletions(-)
drivers/net/tun.c +39 -24
@@ -685,6 +685,30 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,return 0 ; } + +static unsigned long iov_pages (const struct iovec *iv,int offset, +unsigned long nr_segs) +{ +unsigned long seg, base; +int pages =0 , len, size; + +while (nr_segs && (offset >= iv->iov_len)) { + offset -= iv->iov_len; + ++iv; + --nr_segs; + } + +for (seg =0 ; seg < nr_segs; seg++) { + base = (unsigned long )iv[seg].iov_base + offset; + len = iv[seg].iov_len - offset; + size = ((base & ~PAGE_MASK ) + len + ~PAGE_MASK ) >>PAGE_SHIFT ; + pages += size; + offset =0 ; + } + +return pages; +} +/* Get packet from user space buffer */ static ssize_t tun_get_user(struct tun_struct *tun, void *msg_control, const struct iovec *iv, size_t total_len,
@@ -731,32 +755,18 @@ static ssize_t tun_get_user(struct tun_struct *tun, void *msg_control,return -EINVAL ; } -if (msg_control) - zerocopy = true; - -if (zerocopy) { -/* Userspace may produce vectors with count greater than -* MAX_SKB_FRAGS, so we need to linearize parts of the skb -* to let the rest of data to be fit in the frags. -*/ -if (count >MAX_SKB_FRAGS ) { - copylen =iov_length (iv, count -MAX_SKB_FRAGS ); -if (copylen < offset) - copylen =0 ; -else - copylen -= offset; - }else - copylen =0 ; -/* There are 256 bytes to be copied in skb, so there is enough -* room for skb expand head in case it is used. +if (msg_control) { +/* There are 256 bytes to be copied in skb, so there is +* enough room for skb expand head in case it is used. * The rest of the buffer is mapped from userspace. */ -if (copylen < gso.hdr_len) - copylen = gso.hdr_len; -if (!copylen) - copylen =GOODCOPY_LEN ; + copylen = gso.hdr_len ? gso.hdr_len :GOODCOPY_LEN ; linear = copylen; - }else { +if (iov_pages (iv, offset + copylen, count) <=MAX_SKB_FRAGS ) + zerocopy = true; + } + +if (!zerocopy) { copylen = len; linear = gso.hdr_len; }
@@ -771,8 +781,13 @@ static ssize_t tun_get_user(struct tun_struct *tun, void *msg_control,if (zerocopy) err =zerocopy_sg_from_iovec (skb, iv, offset, count); -else +else { err =skb_copy_datagram_from_iovec (skb,0 , iv, offset, len); +if (!err && msg_control) { +struct ubuf_info *uarg = msg_control; + uarg->callback (uarg, false); + } + }if (err) { tun->dev->stats.rx_dropped++;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 57/251 macvtap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
[ Upstream commit ece793fcfc417b3925844be88a6a6dc82ae8f7c6 ]
We try to linearize part of the skb when the number of iov is greater than MAX_SKB_FRAGS. This is not enough since each single vector may occupy more than one pages, so zerocopy_sg_fromiovec() may still fail and may break the guest network.
Solve this problem by calculate the pages needed for iov before trying to do zerocopy and switch to use copy instead of zerocopy if it needs more than MAX_SKB_FRAGS.
This is done through introducing a new helper to count the pages for iov, and call uarg->callback() manually when switching from zerocopy to copy to notify vhost.
We can do further optimization on top.
This bug were introduced from b92946e2919134ebe2a4083e4302236295ea2a73 (macvtap: zerocopy: validate vectors before building skb).
--- drivers/net/macvtap.c | 62 +++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 25 deletions(-)
drivers/net/macvtap.c +37 -25
@@ -642,6 +642,28 @@ static int macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,return 0 ; } +static unsigned long iov_pages (const struct iovec *iv,int offset, +unsigned long nr_segs) +{ +unsigned long seg, base; +int pages =0 , len, size; + +while (nr_segs && (offset >= iv->iov_len)) { + offset -= iv->iov_len; + ++iv; + --nr_segs; + } + +for (seg =0 ; seg < nr_segs; seg++) { + base = (unsigned long )iv[seg].iov_base + offset; + len = iv[seg].iov_len - offset; + size = ((base & ~PAGE_MASK ) + len + ~PAGE_MASK ) >>PAGE_SHIFT ; + pages += size; + offset =0 ; + } + +return pages; +}/* Get packet from user space buffer */ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
@@ -688,31 +710,15 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,if (unlikely (count >UIO_MAXIOV )) goto err; -if (m && m->msg_control &&sock_flag (&q->sk,SOCK_ZEROCOPY )) - zerocopy = true; - -if (zerocopy) { -/* Userspace may produce vectors with count greater than -* MAX_SKB_FRAGS, so we need to linearize parts of the skb -* to let the rest of data to be fit in the frags. -*/ -if (count >MAX_SKB_FRAGS ) { - copylen =iov_length (iv, count -MAX_SKB_FRAGS ); -if (copylen < vnet_hdr_len) - copylen =0 ; -else - copylen -= vnet_hdr_len; - } -/* There are 256 bytes to be copied in skb, so there is enough -* room for skb expand head in case it is used. -* The rest buffer is mapped from userspace. -*/ -if (copylen < vnet_hdr.hdr_len) - copylen = vnet_hdr.hdr_len; -if (!copylen) - copylen =GOODCOPY_LEN ; +if (m && m->msg_control &&sock_flag (&q->sk,SOCK_ZEROCOPY )) { + copylen = vnet_hdr.hdr_len ? vnet_hdr.hdr_len :GOODCOPY_LEN ; linear = copylen; - }else { +if (iov_pages (iv, vnet_hdr_len + copylen, count) + <=MAX_SKB_FRAGS ) + zerocopy = true; + } + +if (!zerocopy) { copylen = len; linear = vnet_hdr.hdr_len; }
@@ -724,9 +730,15 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,if (zerocopy) err =zerocopy_sg_from_iovec (skb, iv, vnet_hdr_len, count); -else +else { err =skb_copy_datagram_from_iovec (skb,0 , iv, vnet_hdr_len, len); +if (!err && m && m->msg_control) { +struct ubuf_info *uarg = m->msg_control; + uarg->callback (uarg, false); + } + } +if (err) goto err_kfree;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 58/251 vlan: mask vlan prio bits
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit d4b812dea4a236f729526facf97df1a9d18e191c ]
In commit 48cc32d38a52d0b68f91a171a8d00531edc6a46e ("vlan: don't deliver frames for unknown vlans to protocols") Florian made sure we set pkt_type to PACKET_OTHERHOST if the vlan id is set and we could find a vlan device for this particular id.
But we also have a problem if prio bits are set.
Steinar reported an issue on a router receiving IPv6 frames with a vlan tag of 4000 (id 0, prio 2), and tunneled into a sit device, because skb->vlan_tci is set.
Forwarded frame is completely corrupted : We can see (8100:4000) being inserted in the middle of IPv6 source address :
16:48:00.780413 IP6 2001:16d8:8100:4000:ee1c:0:9d9:bc87 > 9f94:4d95:2001:67c:29f4::: ICMP6, unknown icmp6 type (0), length 64
0x0000: 0000 0029 8000 c7c3 7103 0001 a0ae e651
0x0010: 0000 0000 ccce 0b00 0000 0000 1011 1213
0x0020: 1415 1617 1819 1a1b 1c1d 1e1f 2021 2223
0x0030: 2425 2627 2829 2a2b 2c2d 2e2f 3031 3233It seems we are not really ready to properly cope with this right now.
We can probably do better in future kernels :vlan_get_ingress_priority() should be a netdev property instead of a per vlan_dev one.
For stable kernels, lets clear vlan_tci to fix the bugs.
--- include/linux/if_vlan.h | 3 +-- net/8021q/vlan_core.c | 2 +- net/core/dev.c | 11 +++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-)
include/linux/if_vlan.h +1 -2
@@ -82,9 +82,8 @@ static inline int is_vlan_dev(struct net_device *dev) }#define vlan_tx_tag_present (__skb) ((__skb)->vlan_tci & VLAN_TAG_PRESENT) -#define vlan_tx_nonzero_tag_present (__skb) \ - (vlan_tx_tag_present(__skb) && ((__skb)->vlan_tci & VLAN_VID_MASK))#define vlan_tx_tag_get (__skb) ((__skb)->vlan_tci & ~VLAN_TAG_PRESENT) +#define vlan_tx_tag_get_id (__skb) ((__skb)->vlan_tci & VLAN_VID_MASK)#if defined(CONFIG_VLAN_8021Q ) || defined(CONFIG_VLAN_8021Q_MODULE )
net/8021q/vlan_core.c +1 -1
@@ -8,7 +8,7 @@bool vlan_do_receive (struct sk_buff **skbp) {struct sk_buff *skb = *skbp; -u16 vlan_id = skb->vlan_tci &VLAN_VID_MASK ; +u16 vlan_id =vlan_tx_tag_get_id (skb);struct net_device *vlan_dev;struct vlan_pcpu_stats *rx_stats;
net/core/dev.c +9 -2
@@ -3317,8 +3317,15 @@ ncls: } } -if (vlan_tx_nonzero_tag_present (skb)) - skb->pkt_type =PACKET_OTHERHOST ; +if (unlikely (vlan_tx_tag_present (skb))) { +if (vlan_tx_tag_get_id (skb)) + skb->pkt_type =PACKET_OTHERHOST ; +/* Note: we might in the future use prio bits +* and set skb->priority like in vlan_do_receive() +* For the time being, just ignore Priority Code Point +*/ + skb->vlan_tci =0 ; + }/* deliver only exact match when indicated */ null_or_dev = deliver_exact ? skb->dev :NULL ;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 59/251 vlan: fix a race in egress prio management
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 3e3aac497513c669e1c62c71e1d552ea85c1d974 ]
egress_priority_map[] hash table updates are protected by rtnl, and we never remove elements until device is dismantled.
We have to make sure that before inserting an new element in hash table, all its fields are committed to memory or else another cpu could find corrupt values and crash.
--- net/8021q/vlan_dev.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/8021q/vlan_dev.c +7 -0
@@ -73,6 +73,8 @@ vlan_dev_get_egress_qos_mask(struct net_device *dev, struct sk_buff *skb) {struct vlan_priority_tci_mapping *mp; +smp_rmb ();/* coupled with smp_wmb() in vlan_dev_set_egress_priority() */ + mp =vlan_dev_priv (dev)->egress_priority_map[(skb->priority &0xF )];while (mp) {if (mp->priority == skb->priority) {
@@ -248,6 +250,11 @@ int vlan_dev_set_egress_priority(const struct net_device *dev, np->next = mp; np->priority = skb_prio; np->vlan_qos = vlan_qos; +/* Before inserting this element in hash table, make sure all its fields +* are committed to memory. +* coupled with smp_rmb() in vlan_dev_get_egress_qos_mask() +*/ +smp_wmb (); vlan->egress_priority_map[skb_prio &0xF ] = np;if (vlan_qos) vlan->nr_egress_mappings++;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 60/251 MIPS: Oceton: Fix build error.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Ralf Baechle <[email protected]>
[ Upstream commit 39205750efa6d335fac4f9bcd32b49c7e71c12b7 ]
If CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB, CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION, CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT and CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT are all undefined:
arch/mips/cavium-octeon/setup.c: In function ‘prom_init’:arch/mips/cavium-octeon/setup.c:715:12: error: unused variable ‘ebase’ [-Werror=unused-variable]
--- arch/mips/cavium-octeon/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/cavium-octeon/setup.c +2 -1
@@ -6,6 +6,7 @@* Copyright (C) 2004-2007 Cavium Networks * Copyright (C) 2008 Wind River Systems */ +#include <linux/compiler.h> #include <linux/init.h> #include <linux/console.h> #include <linux/delay.h>
@@ -504,7 +505,7 @@ void __init prom_init(void)if (cvmx_read_csr (CVMX_L2D_FUS3 ) & (3ull <<34 )) {pr_info ("Skipping L2 locking due to reduced L2 cache size\n" ); }else { -uint32_t ebase =read_c0_ebase () &0x3ffff000 ; +uint32_t __maybe_unused ebase =read_c0_ebase () &0x3ffff000 ;#ifdef CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB /* TLB refill */ cvmx_l2c_lock_mem_region (ebase,0x100 );
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 61/251 RAPIDIO: IDT_GEN2: Fix build error.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Ralf Baechle <[email protected]>
[ Upstream commit 27f62b9f294b7e2019c94c385abda43a0af6bb8b ]
CC drivers/rapidio/switches/idt_gen2.odrivers/rapidio/switches/idt_gen2.c: In function ‘idtg2_show_errlog’:drivers/rapidio/switches/idt_gen2.c:379:30: error: ‘PAGE_SIZE’ undeclared (first use in this function) drivers/rapidio/switches/idt_gen2.c:379:30: note: each undeclared identifier is reported only once for each function it appears in
--- drivers/rapidio/switches/idt_gen2.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/rapidio/switches/idt_gen2.c +2 -0
@@ -15,6 +15,8 @@#include <linux/rio_drv.h> #include <linux/rio_ids.h> #include <linux/delay.h> + +#include <asm/page.h> #include "../rio.h" #define LOCAL_RTE_CONF_DESTID_SEL 0x010070
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 62/251 megaraid_sas: fix memory leak if SGL has zero length entries
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <[email protected]>
[ Upstream commit 7a6a731bd00ca90d0e250867c3b9c05b5ff0fa49 ]
commit 98cb7e44 ([SCSI] megaraid_sas: Sanity check user supplied length before passing it to dma_alloc_coherent()) introduced a memory leak. Memory allocated for entries following zero length SGL entries will not be freed.
Reference: http://bugs.debian.org/688198
--- drivers/scsi/megaraid/megaraid_sas_base.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +6 -4
@@ -4817,10 +4817,12 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance, sense, sense_handle); } -for (i =0 ; i < ioc->sge_count && kbuff_arr[i]; i++) { -dma_free_coherent (&instance->pdev->dev, - kern_sge32[i].length, - kbuff_arr[i], kern_sge32[i].phys_addr); +for (i =0 ; i < ioc->sge_count; i++) { +if (kbuff_arr[i]) +dma_free_coherent (&instance->pdev->dev, + kern_sge32[i].length, + kbuff_arr[i], + kern_sge32[i].phys_addr); }megasas_return_cmd (instance, cmd);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 63/251 lib/Kconfig.debug: Restrict FRAME_POINTER for MIPS
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Markos Chandras <[email protected]>
[ Upstream commit 25c87eae1725ed77a8b44d782a86abdc279b4ede ]
FAULT_INJECTION_STACKTRACE_FILTER selects FRAME_POINTER but that symbol is not available for MIPS.
Fixes the following problem on a randconfig:
warning: (LOCKDEP && FAULT_INJECTION_STACKTRACE_FILTER && LATENCYTOP &&
KMEMCHECK) selects FRAME_POINTER which has unmet direct dependencies
(DEBUG_KERNEL && (CRIS || M68K || FRV || UML || AVR32 || SUPERH || BLACKFIN || MN10300 || METAG) || ARCH_WANT_FRAME_POINTERS)
Patchwork: https://patchwork.linux-mips.org/patch/5441/
--- lib/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/Kconfig.debug +1 -1
@@ -1242,7 +1242,7 @@ config FAULT_INJECTION_STACKTRACE_FILTER depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT depends on !X86_64 select STACKTRACE - select FRAME_POINTER if !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND + select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND help Provide stacktrace filter for fault-injection capabilities
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 64/251 usb: serial: option: blacklist ONDA MT689DC QMI interface
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Enrico Mioso <[email protected]>
[ Upstream commit 3d1a69e726406ab662ab88fa30a3a05ed404334d ]
Prevent the option driver from binding itself to the QMI/WWAN interface, making it unusable by the proper driver.
--- drivers/usb/serial/option.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/serial/option.c +2 -1
@@ -805,7 +805,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0018, 0xff, 0xff, 0xff) }, - { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0020, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 65/251 usb: serial: option: add Olivetti Olicard 200
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
[ Upstream commit 4cf76df06ecc852633ed927d91e01c83c33bc331 ]
Speaks AT on interfaces 5 (command & PPP) and 3 (secondary), other interface protocols are unknown.
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -348,6 +348,7 @@ static void option_instat_callback(struct urb *urb);#define OLIVETTI_VENDOR_ID 0x0b3c#define OLIVETTI_PRODUCT_OLICARD100 0xc000#define OLIVETTI_PRODUCT_OLICARD145 0xc003 +#define OLIVETTI_PRODUCT_OLICARD200 0xc005/* Celot products */ #define CELOT_VENDOR_ID 0x211f
@@ -1241,6 +1242,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) }, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) }, + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200) }, { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */ { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */ { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 66/251 usb: serial: option.c: remove ONDA MT825UP product ID fromdriver
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Enrico Mioso <[email protected]>
[ Upstream commit 878c69aae986ae97084458c0183a8c0a059865b1 ]
Some (very few) early devices like mine, where not exposting a proper CDC descriptor. This was fixed with an immediate firmware update from the vendor, and pre-installed on newer devices.
So actual devices can be driven by cdc_acm.c + cdc_ether.c.
--- drivers/usb/serial/option.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/usb/serial/option.c +0 -7
@@ -354,12 +354,6 @@ static void option_instat_callback(struct urb *urb);#define CELOT_VENDOR_ID 0x211f#define CELOT_PRODUCT_CT680M 0x6801 -/* ONDA Communication vendor id */ -#define ONDA_VENDOR_ID 0x1ee8 - -/* ONDA MT825UP HSDPA 14.2 modem */ -#define ONDA_MT825UP 0x000b -/* Samsung products */ #define SAMSUNG_VENDOR_ID 0x04e8#define SAMSUNG_PRODUCT_GT_B3730 0x6889
@@ -1244,7 +1238,6 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) }, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200) }, { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */ - { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */ { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/ { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) }, { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM610) },
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 67/251 USB: option: add D-Link DWM-152/C1 and DWM-156/C1
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Alexandr \\\\\\\"Sky\\\\\\\" Ivanov" <[email protected]>
[ Upstream commit ca24763588844b14f019ffc45c7df6d9e8f932c5 ]
Adding support for D-Link DWM-152/C1 and DWM-156/C1 devices.
DWM-152/C1:
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 6 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=07d1 ProdID=3e01 Rev= 0.00 S: Product=USB Configuration S: SerialNumber=1234567890ABCDEF C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=option E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=2ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option E: Ad=83(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=option E: Ad=84(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= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option 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= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
DWM-156/C1:
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 8 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=07d1 ProdID=3e02 Rev= 0.00 S: Product=DataCard Device S: SerialNumber=1234567890ABCDEF C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=option E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=2ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option E: Ad=83(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=option E: Ad=84(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= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option 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= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -1311,6 +1311,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) }, { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) }, { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ + { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ { } /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, option_ids);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 68/251 usb: serial: cp210x: Add USB ID for Netgear Switches embedded serial adapter
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Luiz Angelo Daros de Luca <[email protected]>
[ Upstream commit 90625070c4253377025878c4e82feed8b35c7116 ]
This adds NetGear Managed Switch M4100 series, M5300 series, M7100 series USB ID (0846:0110) to the cp210x driver. Without this, the serial adapter is not recognized in Linux. Description was obtained from an Netgear Eng.
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -60,6 +60,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ { USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ + { USB_DEVICE(0x0846, 0x1100) }, /* NetGear Managed Switch M4100 series, M5300 series, M7100 series */ { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ { USB_DEVICE(0x0BED, 0x1100) }, /* MEI (TM) Cashflow-SC Bill/Voucher Acceptor */
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 69/251 USB: cp210x: add MMB and PI ZigBee USB Device Support
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sami Rahman <[email protected]>
[ Upstream commit 7681156982026ebf7eafd7301eb0374d7648d068 ]
Added support for MMB Networks and Planet Innovation Ingeni ZigBee USB devices using customized Silicon Labs' CP210x.c USB to UART bridge drivers with PIDs: 88A4, 88A5.
--- drivers/usb/serial/cp210x.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/cp210x.c +2 -0
@@ -124,6 +124,8 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ + { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */ + { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 70/251 usb: cp210x support SEL C662 Vendor/Device
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Barry Grussling <[email protected]>
[ Upstream commit b579fa52f6be0b4157ca9cc5e94d44a2c89a7e95 ]
This patch adds support for the Schweitzer Engineering Laboratories C662 USB cable based off the CP210x driver.
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -156,6 +156,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ + { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */ { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */ { USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 71/251 PM / Sleep: avoid autosleep in shutdown progress
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Liu ShuoX <[email protected]>
[ Upstream commit e5248a111bf4048a9f3fab1a9c94c4630a10592a ]
Prevent automatic system suspend from happening during system shutdown by making try_to_suspend() check system_state and return immediately if it is not SYSTEM_RUNNING.
This prevents the following breakage from happening (scenario from Zhang Yanmin):
Kernel starts shutdown and calls all device driver's shutdown callback. When a driver's shutdown is called, the last wakelock is released and suspend-to-ram starts. However, as some driver's shut down callbacks already shut down devices and disabled runtime pm, the suspend-to-ram calls driver's suspend callback without noticing that device is already off and causes crash.
--- kernel/power/autosleep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/power/autosleep.c +2 -1
@@ -32,7 +32,8 @@ static void try_to_suspend(struct work_struct *work)mutex_lock (&autosleep_lock); -if (!pm_save_wakeup_count (initial_count)) { +if (!pm_save_wakeup_count (initial_count) || + system_state !=SYSTEM_RUNNING ) {mutex_unlock (&autosleep_lock); goto out; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 72/251 lockd: protect nlm_blocked access in nlmsvc_retry_blocked
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: David Jeffery <[email protected]>
[ Upstream commit 1c327d962fc420aea046c16215a552710bde8231 ]
In nlmsvc_retry_blocked, the check that the list is non-empty and acquiring the pointer of the first entry is unprotected by any lock. This allows a rare race condition when there is only one entry on the list. A function such as nlmsvc_grant_callback() can be called, which will temporarily remove the entry from the list. Between the list_empty() and list_entry(),the list may become empty, causing an invalid pointer to be used as an nlm_block, leading to a possible crash.
This patch adds the nlm_block_lock around these calls to prevent concurrent use of the nlm_blocked list.
This was a regression introduced by f904be9cc77f361d37d71468b13ff3d1a1823dea "lockd: Mostly remove BKL from the server".
--- fs/lockd/svclock.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/lockd/svclock.c +4 -0
@@ -939,6 +939,7 @@ nlmsvc_retry_blocked(void)unsigned long timeout =MAX_SCHEDULE_TIMEOUT ;struct nlm_block *block; +spin_lock (&nlm_blocked_lock);while (!list_empty (&nlm_blocked) && !kthread_should_stop ()) { block = list_entry(nlm_blocked.next, struct nlm_block, b_list);
@@ -948,6 +949,7 @@ nlmsvc_retry_blocked(void) timeout = block->b_when - jiffies;break ; } +spin_unlock (&nlm_blocked_lock);dprintk ("nlmsvc_retry_blocked(%p, when=%ld)\n" , block, block->b_when);
@@ -957,7 +959,9 @@ nlmsvc_retry_blocked(void)retry_deferred_block (block); }else nlmsvc_grant_blocked (block); +spin_lock (&nlm_blocked_lock); } +spin_unlock (&nlm_blocked_lock);return timeout; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 73/251 hrtimers: Move SMP function call to thread context
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 5ec2481b7b47a4005bb446d176e5d0257400c77d ]
smp_call_function_* must not be called from softirq context.
But clock_was_set() which calls on_each_cpu() is called from softirq context to implement a delayed clock_was_set() for the timer interrupt handler. Though that almost never gets invoked. A recent change in the resume code uses the softirq based delayed clock_was_set to support Xens resume mechanism.
linux-next contains a new warning which warns if smp_call_function_* is called from softirq context which gets triggered by that Xen change.
Fix this by moving the delayed clock_was_set() call to a work context.
--- kernel/hrtimer.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
kernel/hrtimer.c +13 -15
@@ -719,17 +719,20 @@ static int hrtimer_switch_to_hres(void)return 1 ; } +static void clock_was_set_work (struct work_struct *work) +{ +clock_was_set (); +} + +static DECLARE_WORK(hrtimer_work, clock_was_set_work); +/* -* Called from timekeeping code to reprogramm the hrtimer interrupt -* device. If called from the timer interrupt context we defer it to -* softirq context. +* Called from timekeeping and resume code to reprogramm the hrtimer +* interrupt device on all cpus. */ void clock_was_set_delayed (void ) { -struct hrtimer_cpu_base *cpu_base = &__get_cpu_var (hrtimer_bases); - - cpu_base->clock_was_set =1 ; -__raise_softirq_irqoff (HRTIMER_SOFTIRQ ); +schedule_work (&hrtimer_work); }#else
@@ -779,8 +782,10 @@ void hrtimers_resume(void)WARN_ONCE (!irqs_disabled (),KERN_INFO "hrtimers_resume() called with IRQs enabled!" ); +/* Retrigger on the local CPU */ retrigger_next_event (NULL ); -timerfd_clock_was_set (); +/* And schedule a retrigger for all others */ +clock_was_set_delayed (); }static inline void timer_stats_hrtimer_set_start_info (struct hrtimer *timer)
@@ -1416,13 +1421,6 @@ void hrtimer_peek_ahead_timers(void)static void run_hrtimer_softirq (struct softirq_action *h) { -struct hrtimer_cpu_base *cpu_base = &__get_cpu_var (hrtimer_bases); - -if (cpu_base->clock_was_set) { - cpu_base->clock_was_set =0 ; -clock_was_set (); - } -hrtimer_peek_ahead_timers (); }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 74/251 ALSA: usb-audio: 6fire: return correct XRUN indication
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Eldad Zack <[email protected]>
[ Upstream commit be2f93a4c4981b3646b6f98f477154411b8516cb ]
Return SNDRV_PCM_POS_XRUN (snd_pcm_uframes_t) instead of SNDRV_PCM_STATE_XRUN (snd_pcm_state_t) from the pointer function of 6fire, as expected by snd_pcm_update_hw_ptr0().
Caught by sparse.
--- sound/usb/6fire/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/6fire/pcm.c +1 -1
@@ -540,7 +540,7 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer(snd_pcm_uframes_t ret;if (rt->panic || !sub) -return SNDRV_PCM_STATE_XRUN ; +return SNDRV_PCM_POS_XRUN ;spin_lock_irqsave (&sub->lock, flags); ret = sub->dma_off;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 75/251 mm: fix the TLB range flushed when __tlb_remove_page() runs out of slots
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Vineet Gupta <[email protected]>
[ Upstream commit e6c495a96ce02574e765d5140039a64c8d4e8c9e ]
zap_pte_range loops from @addr to @end. In the middle, if it runs out of batching slots, TLB entries needs to be flushed for @start to @interim, NOT @interim to @end.
Since ARC port doesn't use page free batching I can't test it myself but this seems like the right thing to do.
Observed this when working on a fix for the issue at thread:
http://www.spinics.net/lists/linux-arch/msg21736.html
--- mm/memory.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
mm/memory.c +6 -3
@@ -1106,6 +1106,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb,spinlock_t *ptl;pte_t *start_pte;pte_t *pte; +unsigned long range_start = addr; again:init_rss_vec (rss);
@@ -1211,12 +1212,14 @@ again: force_flush =0 ;#ifdef HAVE_GENERIC_MMU_GATHER - tlb->start = addr; - tlb->end = end; + tlb->start = range_start; + tlb->end = addr;#endif tlb_flush_mmu (tlb); -if (addr != end) +if (addr != end) { + range_start = addr; goto again; + } }return addr;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 76/251 iscsi-target: Fix tfc_tpg_nacl_auth_cit configfs length overflow
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?J=C3=B6rn=20Engel?= <[email protected]>
[ Upstream commit 0fbfc46fb0b2f543a8b539e94c6c293ebc0b05a6 ]
This patch fixes a potential buffer overflow while processing iscsi_node_auth input for configfs attributes within NodeACL tfc_tpg_nacl_auth_cit context.
--- drivers/target/iscsi/iscsi_target_configfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/iscsi/iscsi_target_configfs.c +1 -1
@@ -393,7 +393,7 @@ static ssize_t __iscsi_##prefix##_store_##name( \if (!capable (CAP_SYS_ADMIN )) \return -EPERM ; \ \ -snprintf (auth->name,PAGE_SIZE ,"%s" , page); \ +snprintf (auth->name,sizeof (auth->name),"%s" , page); \if (!strncmp ("NULL" , auth->name,4 )) \ auth->naf_flags &= ~flags; \else \
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 77/251 USB: storage: Add MicroVault Flash Drive to unusual_devs
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Ren Bigcren <[email protected]>
[ Upstream commit e7a6121f4929c17215f0cdca3726f4bf3e4e9529 ]
The device report an error capacity when read_capacity_16(). Using read_capacity_10() can get the correct capacity.
--- drivers/usb/storage/unusual_devs.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_devs.h +7 -0
@@ -657,6 +657,13 @@ UNUSUAL_DEV( 0x054c, 0x016a, 0x0000, 0x9999, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_FIX_INQUIRY ), +/* Submitted by Ren Bigcren <[email protected]> */ +UNUSUAL_DEV (0x054c ,0x02a5 ,0x0100 ,0x0100 , +"Sony Corp." , +"MicroVault Flash Drive" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_NO_READ_CAPACITY_16 ), +/* floppy reports multiple luns */ UNUSUAL_DEV( 0x055d, 0x2020, 0x0000, 0x0210, "SAMSUNG",
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 78/251 ASoC: max98088 - fix element type of the register cache.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Chih-Chung Chang <[email protected]>
[ Upstream commit cb6f66a2d278e57a6c9d8fb59bd9ebd8ab3965c2 ]
The registers of max98088 are 8 bits, not 16 bits. This bug causes the contents of registers to be overwritten with bad values when the codec is suspended and then resumed.
--- sound/soc/codecs/max98088.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/max98088.c +1 -1
@@ -1594,7 +1594,7 @@ static int max98088_dai2_digital_mute(struct snd_soc_dai *codec_dai, int mute)static void max98088_sync_cache (struct snd_soc_codec *codec) { -u16 *reg_cache = codec->reg_cache; +u8 *reg_cache = codec->reg_cache;int i;if (!codec->cache_sync)
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 79/251 ASoC: wm8962: Remove remaining direct register cache accesses
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
[ Upstream commit 2e7ee15ced914e109a1a5b6dfcd463d846a13bd5 ]
Also fix return values for headphone switch updates.
--- sound/soc/codecs/wm8962.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
sound/soc/codecs/wm8962.c +13 -11
@@ -1600,7 +1600,6 @@ static int wm8962_put_hp_sw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol); -u16 *reg_cache = codec->reg_cache;int ret;/* Apply the update (if any) */
@@ -1609,16 +1608,19 @@ static int wm8962_put_hp_sw(struct snd_kcontrol *kcontrol,return 0 ;/* If the left PGA is enabled hit that VU bit... */ -if (snd_soc_read (codec,WM8962_PWR_MGMT_2 ) &WM8962_HPOUTL_PGA_ENA ) -return snd_soc_write (codec,WM8962_HPOUTL_VOLUME , - reg_cache[WM8962_HPOUTL_VOLUME ]); + ret =snd_soc_read (codec,WM8962_PWR_MGMT_2 ); +if (ret &WM8962_HPOUTL_PGA_ENA ) { +snd_soc_write (codec,WM8962_HPOUTL_VOLUME , +snd_soc_read (codec,WM8962_HPOUTL_VOLUME )); +return 1 ; + }/* ...otherwise the right. The VU is stereo. */ -if (snd_soc_read (codec,WM8962_PWR_MGMT_2 ) &WM8962_HPOUTR_PGA_ENA ) -return snd_soc_write (codec,WM8962_HPOUTR_VOLUME , - reg_cache[WM8962_HPOUTR_VOLUME ]); +if (ret &WM8962_HPOUTR_PGA_ENA ) +snd_soc_write (codec,WM8962_HPOUTR_VOLUME , +snd_soc_read (codec,WM8962_HPOUTR_VOLUME )); -return 0 ; +return 1 ; }/* The VU bits for the speakers are in a different register to the mute
@@ -3378,7 +3380,6 @@ static int wm8962_probe(struct snd_soc_codec *codec)int ret;struct wm8962_priv *wm8962 =snd_soc_codec_get_drvdata (codec);struct wm8962_pdata *pdata =dev_get_platdata (codec->dev); -u16 *reg_cache = codec->reg_cache;int i, trigger, irq_pol;bool dmicclk, dmicdat;
@@ -3436,8 +3437,9 @@ static int wm8962_probe(struct snd_soc_codec *codec)/* Put the speakers into mono mode? */ if (pdata->spk_mono) - reg_cache[WM8962_CLASS_D_CONTROL_2 ] - |=WM8962_SPK_MONO ; +snd_soc_update_bits (codec,WM8962_CLASS_D_CONTROL_2 , +WM8962_SPK_MONO_MASK ,WM8962_SPK_MONO ); +/* Micbias setup, detection enable and detection * threasholds. */
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 80/251 ARM: 7722/1: zImage: Convert 32bits memory size and address from ATAG to 64bits DTB
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Gregory CLEMENT <[email protected]>
[ Upstream commit faefd550c45d8d314e8f260f21565320355c947f ]
When CONFIG_ARM_APPENDED_DTB is selected, if the bootloader provides an ATAG_MEM it replaces the memory size and the memory address in the memory node of the device tree. In the case of a system which can handle more than 4GB, the memory node cell size is 4: each data (memory size and memory address) are 64 bits and then use 2 cells.
The current code in atags_to_fdt.c made the assumption of a cell size of 2 (one cell for the memory size and one cell for the memory address), this leads to an improper write of the data and ends with a boot hang.
This patch writes the memory size and the memory address on the memory node in the device tree depending of the size of the memory node (32 bits or 64 bits).
It has been tested in the 2 cases:
- with a dtb using skeleton.dtsi
- and with a dtb using skeleton64.dtsi
--- arch/arm/boot/compressed/atags_to_fdt.c | 44 ++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-)
arch/arm/boot/compressed/atags_to_fdt.c +38 -6
@@ -53,6 +53,17 @@ static const void *getprop(const void *fdt, const char *node_path,return fdt_getprop (fdt, offset, property, len); } +static uint32_t get_cell_size (const void *fdt) +{ +int len; +uint32_t cell_size =1 ; +const uint32_t *size_len =getprop (fdt,"/" ,"#size-cells" , &len); + +if (size_len) + cell_size =fdt32_to_cpu (*size_len); +return cell_size; +} +static void merge_fdt_bootargs (void *fdt,const char *fdt_cmdline) {char cmdline[COMMAND_LINE_SIZE ];
@@ -95,9 +106,11 @@ static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline)int atags_to_fdt (void *atag_list,void *fdt,int total_space) {struct tag *atag = atag_list; -uint32_t mem_reg_property[2 *NR_BANKS ]; +/* In the case of 64 bits memory size, need to reserve 2 cells for +* address and size for each bank */ +uint32_t mem_reg_property[2 *2 *NR_BANKS ];int memcount =0 ; -int ret; +int ret, memsize;/* make sure we've got an aligned pointer */ if ((u32 )atag_list &0x3 )
@@ -137,8 +150,25 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space)continue ;if (!atag->u.mem.size)continue ; - mem_reg_property[memcount++] =cpu_to_fdt32 (atag->u.mem.start); - mem_reg_property[memcount++] =cpu_to_fdt32 (atag->u.mem.size); + memsize =get_cell_size (fdt); + +if (memsize ==2 ) { +/* if memsize is 2, that means that +* each data needs 2 cells of 32 bits, +* so the data are 64 bits */ +uint64_t *mem_reg_prop64 = + (uint64_t *)mem_reg_property; + mem_reg_prop64[memcount++] = +cpu_to_fdt64 (atag->u.mem.start); + mem_reg_prop64[memcount++] = +cpu_to_fdt64 (atag->u.mem.size); + }else { + mem_reg_property[memcount++] = +cpu_to_fdt32 (atag->u.mem.start); + mem_reg_property[memcount++] = +cpu_to_fdt32 (atag->u.mem.size); + } + }else if (atag->hdr.tag ==ATAG_INITRD2 ) {uint32_t initrd_start, initrd_size; initrd_start = atag->u.initrd.start;
@@ -150,8 +180,10 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) } } -if (memcount) -setprop (fdt,"/memory" ,"reg" , mem_reg_property,4 *memcount); +if (memcount) { +setprop (fdt,"/memory" ,"reg" , mem_reg_property, +4 * memcount * memsize); + }return fdt_pack (fdt); }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 81/251 isci: Fix a race condition in the SSP task management path
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jeff Skirvin <[email protected]>
[ Upstream commit 96f15f29038e58e1b0a96483e2b369ff446becf1 ]
This commit fixes a race condition in the isci driver abort task and SSP device task management path. The race is caused when an I/O termination in the SCU hardware is necessary because of an SSP target timeout condition, and the check of the I/O end state races against the HW-termination-driven end state. The failure of the race meant that no TMF was sent to the device to clean-up the pending I/O.
--- drivers/scsi/isci/task.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/isci/task.c +6 -3
@@ -491,6 +491,7 @@ int isci_task_abort_task(struct sas_task *task)struct isci_tmf tmf;int ret =TMF_RESP_FUNC_FAILED ;unsigned long flags; +int target_done_already =0 ;/* Get the isci_request reference from the task. Note that * this check does not depend on the pending request list
@@ -505,9 +506,11 @@ int isci_task_abort_task(struct sas_task *task)/* If task is already done, the request isn't valid */ if (!(task->task_state_flags &SAS_TASK_STATE_DONE ) && (task->task_state_flags &SAS_TASK_AT_INITIATOR ) && - old_request) + old_request) { idev =isci_get_device (task->dev->lldd_dev); - + target_done_already =test_bit (IREQ_COMPLETE_IN_TARGET , + &old_request->flags); + }spin_unlock (&task->task_state_lock);spin_unlock_irqrestore (&ihost->scic_lock, flags);
@@ -561,7 +564,7 @@ int isci_task_abort_task(struct sas_task *task)if (task->task_proto ==SAS_PROTOCOL_SMP ||sas_protocol_ata (task->task_proto) || -test_bit (IREQ_COMPLETE_IN_TARGET , &old_request->flags) || + target_done_already ||test_bit (IDEV_GONE , &idev->flags)) {spin_unlock_irqrestore (&ihost->scic_lock, flags);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 82/251 sd: fix crash when UA received on DIF enabled device
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Ewan D. Milne" <[email protected]>
[ Upstream commit 085b513f97d8d799d28491239be4b451bcd8c2c5 ]
sd_prep_fn will allocate a larger CDB for the command via mempool_alloc for devices using DIF type 2 protection. This CDB was being freed in sd_done, which results in a kernel crash if the command is retried due to a UNIT ATTENTION. This change moves the code to free the larger CDB into sd_unprep_fn instead, which is invoked after the request is complete.
It is no longer necessary to call scsi_print_command separately for this case as the ->cmnd will no longer be NULL in the normal code path.
Also removed conditional test for DIF type 2 when freeing the larger CDB because the protection_type could have been changed via sysfs while the command was executing.
--- drivers/scsi/sd.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
drivers/scsi/sd.c +7 -15
@@ -673,10 +673,17 @@ static int scsi_setup_flush_cmnd(struct scsi_device *sdp, struct request *rq)static void sd_unprep_fn (struct request_queue *q,struct request *rq) { +struct scsi_cmnd *SCpnt = rq->special; +if (rq->cmd_flags &REQ_DISCARD ) {free_page ((unsigned long )rq->buffer); rq->buffer =NULL ; } +if (SCpnt->cmnd != rq->cmd) { +mempool_free (SCpnt->cmnd, sd_cdb_pool); + SCpnt->cmnd =NULL ; + SCpnt->cmd_len =0 ; + } }/**
@@ -1540,21 +1547,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)if (rq_data_dir (SCpnt->request) ==READ &&scsi_prot_sg_count (SCpnt))sd_dif_complete (SCpnt, good_bytes); -if (scsi_host_dif_capable (sdkp->device->host, sdkp->protection_type) - ==SD_DIF_TYPE2_PROTECTION && SCpnt->cmnd != SCpnt->request->cmd) { - -/* We have to print a failed command here as the -* extended CDB gets freed before scsi_io_completion() -* is called. -*/ -if (result) -scsi_print_command (SCpnt); - -mempool_free (SCpnt->cmnd, sd_cdb_pool); - SCpnt->cmnd =NULL ; - SCpnt->cmd_len =0 ; - } -return good_bytes; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 83/251 qla2xxx: Properly set the tagging for commands.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Saurav Kashyap <[email protected]>
[ Upstream commit c3ccb1d7cf4c4549151876dd37c0944a682fd9e1 ]
This fixes a regression where Xyratex controllers and disks were lost by the driver:
https://bugzilla.kernel.org/show_bug.cgi?id=59601
--- drivers/scsi/qla2xxx/qla_iocb.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_iocb.c +9 -2
@@ -424,6 +424,8 @@ qla2x00_start_scsi(srb_t *sp)__constant_cpu_to_le16 (CF_SIMPLE_TAG );break ; } + }else { + cmd_pkt->control_flags =__constant_cpu_to_le16 (CF_SIMPLE_TAG ); }/* Load SCSI command packet. */
@@ -1353,11 +1355,11 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt, fcp_cmnd->task_attribute =TSK_ORDERED ;break ;default : - fcp_cmnd->task_attribute =0 ; + fcp_cmnd->task_attribute =TSK_SIMPLE ;break ; } }else { - fcp_cmnd->task_attribute =0 ; + fcp_cmnd->task_attribute =TSK_SIMPLE ; } cmd_pkt->fcp_rsp_dseg_len =0 ;/* Let response come in status iocb */
@@ -1563,7 +1565,12 @@ qla24xx_start_scsi(srb_t *sp)case ORDERED_QUEUE_TAG : cmd_pkt->task =TSK_ORDERED ;break ; +default : + cmd_pkt->task =TSK_SIMPLE ; +break ; } + }else { + cmd_pkt->task =TSK_SIMPLE ; }/* Load SCSI command packet. */
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 84/251 usb: host: xhci: Enable XHCI_SPURIOUS_SUCCESS for all controllers with xhci 1.0
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: George Cherian <[email protected]>
[ Upstream commit 07f3cb7c28bf3f4dd80bfb136cf45810c46ac474 ]
Xhci controllers with hci_version > 0.96 gives spurious success events on short packet completion. During webcam capture the "ERROR Transfer event TRB DMA ptr not part of current TD" was observed. The same application works fine with synopsis controllers hci_version 0.96. The same issue is seen with Intel Pantherpoint xhci controller. So enabling this quirk in xhci_gen_setup if controller verion is greater than 0.96. For xhci-pci move the quirk to much generic place xhci_gen_setup.
Note from Sarah:
The xHCI 1.0 spec changed how hardware handles short packets. The HW will notify SW of the TRB where the short packet occurred, and it will also give a successful status for the last TRB in a TD (the one with the IOC flag set). On the second successful status, that warning will be triggered in the driver.
Software is now supposed to not assume the TD is not completed until it gets that last successful status. That means we have a slight race condition, although it should have little practical impact. This patch papers over that issue.
It's on my long-term to-do list to fix this race condition, but it is a much more involved patch that will probably be too big for stable. This patch is needed for stable to avoid serious log spam.
This patch should be backported to kernels as old as 3.0, that contain the commit ad808333d8201d53075a11bc8dd83b81f3d68f0b "Intel xhci:
Ignore spurious successful event."
The patch will have to be modified for kernels older than 3.2, since that kernel added the xhci_gen_setup function for xhci platform devices. The correct conflict resolution for kernels older than 3.2 is to set XHCI_SPURIOUS_SUCCESS in xhci_pci_quirks for all xHCI 1.0 hosts.
--- drivers/usb/host/xhci-pci.c | 1 - drivers/usb/host/xhci.c | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-pci.c +0 -1
@@ -93,7 +93,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) }if (pdev->vendor ==PCI_VENDOR_ID_INTEL && pdev->device ==PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI ) { - xhci->quirks |=XHCI_SPURIOUS_SUCCESS ; xhci->quirks |=XHCI_EP_LIMIT_QUIRK ; xhci->limit_active_eps =64 ; xhci->quirks |=XHCI_SW_BW_CHECKING ;
drivers/usb/host/xhci.c +7 -0
@@ -4654,6 +4654,13 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)get_quirks (dev, xhci); +/* In xhci controllers which follow xhci 1.0 spec gives a spurious +* success event after a short transfer. This quirk will ignore such +* spurious event. +*/ +if (xhci->hci_version >0x96 ) + xhci->quirks |=XHCI_SPURIOUS_SUCCESS ; +/* Make sure the HC is halted. */ retval =xhci_halt (xhci);if (retval)
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 85/251 xhci: fix null pointer dereference on ring_doorbell_for_active_rings
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
[ Upstream commit d66eaf9f89502971fddcb0de550b01fa6f409d83 ]
in some cases where device is attched to xhci port and do not responding, for example ath9k_htc with stalled firmware, kernel will crash on ring_doorbell_for_active_rings.
This patch check if pointer exist before it is used.
This patch should be backported to kernels as old as 2.6.35, that contain the commit e9df17eb1408cfafa3d1844bfc7f22c7237b31b8 "USB: xhci:
Correct assumptions about number of rings per endpoint"
--- drivers/usb/host/xhci-ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-ring.c +1 -1
@@ -434,7 +434,7 @@ static void ring_doorbell_for_active_rings(struct xhci_hcd *xhci,/* A ring has pending URBs if its TD list is not empty */ if (!(ep->ep_state &EP_HAS_STREAMS )) { -if (!(list_empty (&ep->ring->td_list))) +if (ep->ring && !(list_empty (&ep->ring->td_list)))xhci_ring_ep_doorbell (xhci, slot_id, ep_index,0 );return ; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 86/251 xhci: Avoid NULL pointer deref when host dies.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sarah Sharp <[email protected]>
[ Upstream commit 203a86613fb3bf2767335659513fa98563a3eb71 ]
When the host controller fails to respond to an Enable Slot command, and the host fails to respond to the register write to abort the command ring, the xHCI driver will assume the host is dead, and call usb_hc_died().
The USB device's slot_id is still set to zero, and the pointer stored at xhci->devs[0] will always be NULL. The call to xhci_check_args in xhci_free_dev should have caught the NULL virt_dev pointer.
However, xhci_free_dev is designed to free the xhci_virt_device structures, even if the host is dead, so that we don't leak kernel memory. xhci_free_dev checks the return value from the generic xhci_check_args function. If the return value is -ENODEV, it carries on trying to free the virtual device.
The issue is that xhci_check_args looks at the host controller state before it looks at the xhci_virt_device pointer. It will return -ENIVAL because the host is dead, and xhci_free_dev will ignore the return value, and happily dereference the NULL xhci_virt_device pointer.
The fix is to make sure that xhci_check_args checks the xhci_virt_device pointer before it checks the host state.
See https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1203453 for further details. This patch doesn't solve the underlying issue, but will ensure we don't see any more NULL pointer dereferences because of the issue.
This patch should be backported to kernels as old as 3.1, that contain the commit 7bd89b4017f46a9b92853940fd9771319acb578a "xhci: Don't submit commands or URBs to halted hosts."
--- drivers/usb/host/xhci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/host/xhci.c +3 -3
@@ -1152,9 +1152,6 @@ static int xhci_check_args(struct usb_hcd *hcd, struct usb_device *udev, } xhci =hcd_to_xhci (hcd); -if (xhci->xhc_state &XHCI_STATE_HALTED ) -return -ENODEV ; -if (check_virt_dev) {if (!udev->slot_id || !xhci->devs[udev->slot_id]) { printk(KERN_DEBUG "xHCI %s called with unaddressed "
@@ -1170,6 +1167,9 @@ static int xhci_check_args(struct usb_hcd *hcd, struct usb_device *udev, } } +if (xhci->xhc_state &XHCI_STATE_HALTED ) +return -ENODEV ; +return 1 ; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 87/251 USB: EHCI: Fix resume signalling on remote wakeup
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Roger Quadros <[email protected]>
[ Upstream commit 47a64a13d54f6c669b00542848d5550be3d3310e ]
Set the ehci->resuming flag for the port we receive a remote wakeup on so that resume signalling can be completed.
Without this, the root hub timer will not fire again to check if the resume was completed and there will be a never-ending wait on on the port.
This effect is only observed if the HUB IRQ IN does not come after we have initiated the port resume.
--- drivers/usb/host/ehci-hub.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/ehci-hub.c +1 -0
@@ -830,6 +830,7 @@ static int ehci_hub_control (/* resume signaling for 20 msec */ ehci->reset_done[wIndex] = jiffies +msecs_to_jiffies (20 ); +set_bit (wIndex, &ehci->resuming_ports);/* check the port again */ mod_timer (&ehci_to_hcd (ehci)->rh_timer, ehci->reset_done[wIndex]);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 88/251 USB: mos7840: fix memory leak in open
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 5f8a2e68b679b41cc8e9b642f2f5aa45dd678641 ]
Allocated urbs and buffers were never freed on errors in open.
--- drivers/usb/serial/mos7840.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/usb/serial/mos7840.c +17 -8
@@ -972,20 +972,20 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) status =mos7840_get_reg_sync (port, mos7840_port->SpRegOffset, &Data);if (status <0 ) {dbg ("Reading Spreg failed" ); -return -1 ; + goto err; } Data |=0x80 ; status =mos7840_set_reg_sync (port, mos7840_port->SpRegOffset, Data);if (status <0 ) {dbg ("writing Spreg failed" ); -return -1 ; + goto err; } Data &= ~0x80 ; status =mos7840_set_reg_sync (port, mos7840_port->SpRegOffset, Data);if (status <0 ) {dbg ("writing Spreg failed" ); -return -1 ; + goto err; }/* End of block to be checked */
@@ -994,7 +994,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) &Data);if (status <0 ) {dbg ("Reading Controlreg failed" ); -return -1 ; + goto err; } Data |=0x08 ;/* Driver done bit */ Data |=0x20 ;/* rx_disable */
@@ -1002,7 +1002,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) mos7840_port->ControlRegOffset, Data);if (status <0 ) {dbg ("writing Controlreg failed" ); -return -1 ; + goto err; }/* do register settings here */ /* Set all regs to the device default values. */
@@ -1013,21 +1013,21 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) status =mos7840_set_uart_reg (port,INTERRUPT_ENABLE_REGISTER , Data);if (status <0 ) {dbg ("disabling interrupts failed" ); -return -1 ; + goto err; }/* Set FIFO_CONTROL_REGISTER to the default value */ Data =0x00 ; status =mos7840_set_uart_reg (port,FIFO_CONTROL_REGISTER , Data);if (status <0 ) {dbg ("Writing FIFO_CONTROL_REGISTER failed" ); -return -1 ; + goto err; } Data =0xcf ; status =mos7840_set_uart_reg (port,FIFO_CONTROL_REGISTER , Data);if (status <0 ) {dbg ("Writing FIFO_CONTROL_REGISTER failed" ); -return -1 ; + goto err; } Data =0x03 ;
@@ -1181,6 +1181,15 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) serial, mos7840_port, port);return 0 ; +err: +for (j =0 ; j <NUM_URBS ; ++j) { + urb = mos7840_port->write_urb_pool[j]; +if (!urb) +continue ; +kfree (urb->transfer_buffer); +usb_free_urb (urb); + } +return status; }/*****************************************************************************
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 89/251 usb: dwc3: fix wrong bit mask in dwc3_event_type
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Huang Rui <[email protected]>
[ Upstream commit 1974d494dea05ea227cb42f5e918828801e237aa ]
Per dwc3 2.50a spec, the is_devspec bit is used to distinguish the Device Endpoint-Specific Event or Device-Specific Event (DEVT). If the bit is 1, the event is represented Device-Specific Event, then use [7:1] bits as Device Specific Event to marked the type. It has 7 bits, and we can see the reserved8_31 variable name which means from 8 to 31 bits marked reserved, actually there are 24 bits not 25 bits between that. And 1 + 7 + 24 = 32, the event size is 4 byes.
So in dwc3_event_type, the bit mask should be:is_devspec [0] 1 bit
type [7:1] 7 bitsreserved8_31 [31:8] 24 bits
This patch should be backported to kernels as old as 3.2, that contain the commit 72246da40f3719af3bfd104a2365b32537c27d83 "usb: Introduce DesignWare USB3 DRD Driver".
--- drivers/usb/dwc3/core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.h +2 -2
@@ -728,8 +728,8 @@ struct dwc3 {struct dwc3_event_type {u32 is_devspec:1 ; -u32 type:6 ; -u32 reserved8_31:25 ; +u32 type:7 ; +u32 reserved8_31:24 ; } __packed;#define DWC3_DEPEVT_XFERCOMPLETE 0x01
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 90/251 usb: dwc3: gadget: dont prevent gadget from being probed if we fail
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Felipe Balbi <[email protected]>
[ Upstream commit cdcedd6981194e511cc206887db661d016069d68 ]
In case we fail our ->udc_start() callback, we should be ready to accept another modprobe following the failed one.
We had forgotten to clear dwc->gadget_driver back to NULL and, because of that, we were preventing gadget driver modprobe from being retried.
--- drivers/usb/dwc3/gadget.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/dwc3/gadget.c +1 -0
@@ -1558,6 +1558,7 @@ err1:__dwc3_gadget_ep_disable (dwc->eps[0 ]); err0: + dwc->gadget_driver =NULL ;spin_unlock_irqrestore (&dwc->lock, flags);return ret;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 91/251 USB: ti_usb_3410_5052: fix dynamic-id matching
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 1fad56424f5ad3ce4973505a357212b2e2282b3f ]
The driver failed to take the dynamic ids into account when determining the device type and therefore all devices were detected as 2-port devices when using the dynamic-id interface.
Match on the usb-serial-driver field instead of doing redundant id-table searches.
--- drivers/usb/serial/ti_usb_3410_5052.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/ti_usb_3410_5052.c +1 -1
@@ -383,7 +383,7 @@ static int ti_startup(struct usb_serial *serial)usb_set_serial_data (serial, tdev);/* determine device type */ -if (usb_match_id (serial->interface, ti_id_table_3410)) +if (serial->type == &ti_1port_device) tdev->td_is_3410 =1 ;dbg ("%s - device type is %s" , __func__, tdev->td_is_3410 ?"3410" :"5052" );
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 93/251 usb: Clear both buffers when clearing a control transfer TT buffer.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: William Gulland <[email protected]>
[ Upstream commit 2c7b871b9102c497ba8f972aa5d38532f05b654d ]
Control transfers have both IN and OUT (or SETUP) packets, so when clearing TT buffers for a control transfer it's necessary to send two HUB_CLEAR_TT_BUFFER requests to the hub.
--- drivers/usb/core/hub.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/usb/core/hub.c +9 -0
@@ -711,6 +711,15 @@ resubmit:static inline int hub_clear_tt_buffer (struct usb_device *hdev,u16 devinfo,u16 tt) { +/* Need to clear both directions for control ep */ +if (((devinfo >>11 ) &USB_ENDPOINT_XFERTYPE_MASK ) == +USB_ENDPOINT_XFER_CONTROL ) { +int status =usb_control_msg (hdev,usb_sndctrlpipe (hdev,0 ), +HUB_CLEAR_TT_BUFFER ,USB_RT_PORT , + devinfo ^0x8000 , tt,NULL ,0 ,1000 ); +if (status) +return status; + }return usb_control_msg (hdev,usb_sndctrlpipe (hdev,0 ),HUB_CLEAR_TT_BUFFER ,USB_RT_PORT , devinfo, tt,NULL ,0 ,1000 );
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 94/251 staging: comedi: COMEDI_CANCEL ioctl should wake up read/write
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
[ Upstream commit 69acbaac303e8cb948801a9ddd0ac24e86cc4a1b ]
Comedi devices can do blocking read() or write() (or poll()) if an asynchronous command has been set up, blocking for data (for read()) or buffer space (for write()). Various events associated with the asynchronous command will wake up the blocked reader or writer (or poller). It is also possible to force the asynchronous command to terminate by issuing a COMEDI_CANCEL ioctl. That shuts down the asynchronous command, but does not currently wake up the blocked reader or writer (or poller). If the blocked task could be woken up, it would see that the command is no longer active and return. The caller of the COMEDI_CANCEL ioctl could attempt to wake up the blocked task by sending a signal, but that's a nasty workaround.
Change do_cancel_ioctl() to wake up the wait queue after it returns from do_cancel(). do_cancel() can propagate an error return value from the low-level comedi driver's cancel routine, but it always shuts the command down regardless, so do_cancel_ioctl() can wake up he wait queue regardless of the return value from do_cancel().
--- drivers/staging/comedi/comedi_fops.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/comedi/comedi_fops.c +6 -1
@@ -1470,6 +1470,7 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg, void *file) {struct comedi_subdevice *s; +int ret;if (arg >= dev->n_subdevices)return -EINVAL ;
@@ -1486,7 +1487,11 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg,if (s->busy != file)return -EBUSY ; -return do_cancel (dev, s); + ret =do_cancel (dev, s); +if (comedi_get_subdevice_runflags (s) &SRF_USER ) +wake_up_interruptible (&s->async->wait_head); + +return ret; }/*
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 95/251 staging: android: logger: Correct write offset reset on error
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Karlis Ogsts <[email protected]>
[ Upstream commit 72bb99cfe9c57d2044445fb34bbc95b4c0bae6f2 ]
In the situation that a writer fails to copy data from userspace it will reset the write offset to the value it had before it went to sleep. This discarding any messages written while aquiring the mutex.
Therefore the reset offset needs to be retrieved after acquiring the mutex.
--- drivers/staging/android/logger.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/android/logger.c +3 -1
@@ -359,7 +359,7 @@ static ssize_t logger_aio_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t ppos) {struct logger_log *log =file_get_log (iocb->ki_filp); -size_t orig = log->w_off; +size_t orig;struct logger_entry header;struct timespec now;ssize_t ret =0 ;
@@ -378,6 +378,8 @@ static ssize_t logger_aio_write(struct kiocb *iocb, const struct iovec *iov,mutex_lock (&log->mutex); + orig = log->w_off; +/* * Fix up any readers, pulling them forward to the first readable * entry after (what will be) the new write offset. We do this now
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 96/251 Btrfs: fix lock leak when resuming snapshot deletion
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
[ Upstream commit fec386ac1428f9c0e672df952cbca5cebd4e4e2f ]
We aren't setting path->locks[level] when we resume a snapshot deletion which means we won't unlock the buffer when we free the path. This causes deadlocks if we happen to re-allocate the block before we've evicted the extent buffer from cache. Thanks,
--- fs/btrfs/extent-tree.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/extent-tree.c +2 -0
@@ -7007,6 +7007,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,while (1 ) {btrfs_tree_lock (path->nodes[level]);btrfs_set_lock_blocking (path->nodes[level]); + path->locks[level] =BTRFS_WRITE_LOCK_BLOCKING ; ret = btrfs_lookup_extent_info(trans, root, path->nodes[level]->start,
@@ -7023,6 +7024,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,break ;btrfs_tree_unlock (path->nodes[level]); + path->locks[level] =0 ;WARN_ON (wc->refs[level] !=1 ); level--; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 97/251 Btrfs: re-add root to dead root list if we stop dropping it
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
[ Upstream commit d29a9f629e009c9b90e5859bce581070fd6247fc ]
If we stop dropping a root for whatever reason we need to add it back to the dead root list so that we will re-start the dropping next transaction commit. The other case this happens is if we recover a drop because we will add a root without adding it to the fs radix tree, so we can leak it's root and commit root extent buffer, adding this to the dead root list makes this cleanup happen. Thanks,
--- fs/btrfs/extent-tree.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/btrfs/extent-tree.c +11 -0
@@ -6950,6 +6950,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,int err =0 ;int ret;int level; +bool root_dropped = false; path =btrfs_alloc_path ();if (!path) {
@@ -7120,12 +7121,22 @@ int btrfs_drop_snapshot(struct btrfs_root *root,free_extent_buffer (root->commit_root);kfree (root); } + root_dropped = true; out_end_trans:btrfs_end_transaction_throttle (trans, tree_root); out_free:kfree (wc);btrfs_free_path (path); out: +/* +* So if we need to stop dropping the snapshot for whatever reason we +* need to make sure to add it back to the dead root list so that we +* keep trying to do the work later. This also cleans up roots if we +* don't have it in the radix (like when we recover after a power fail +* or unmount) so we don't leak memory. +*/ +if (root_dropped == false) +btrfs_add_dead_root (root);if (err)btrfs_std_error (root->fs_info, err);return err;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 98/251 xen-netfront: pull on receive skb may need to happen earlier
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jan Beulich <[email protected]>
[ Upstream commit 093b9c71b6e450e375f4646ba86faed0195ec7df ]
Due to commit 3683243b ("xen-netfront: use __pskb_pull_tail to ensure linear area is big enough on RX") xennet_fill_frags() may end up filling MAX_SKB_FRAGS + 1 fragments in a receive skb, and only reduce the fragment count subsequently via __pskb_pull_tail(). That's a result of xennet_get_responses() allowing a maximum of one more slot to be consumed (and intermediately transformed into a fragment) if the head slot has a size less than or equal to RX_COPY_THRESHOLD.
Hence we need to adjust xennet_fill_frags() to pull earlier if we reached the maximum fragment count - due to the described behavior of xennet_get_responses() this guarantees that at least the first fragment will get completely consumed, and hence the fragment count reduced.
In order to not needlessly call __pskb_pull_tail() twice, make the original call conditional upon the pull target not having been reached yet, and defer the newly added one as much as possible (an alternative would have been to always call the function right before the call to xennet_fill_frags(), but that would imply more frequent cases of needing to call it twice).
--- drivers/net/xen-netfront.c | 50 ++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-)
drivers/net/xen-netfront.c +13 -37
@@ -275,8 +275,7 @@ no_skb:break ; } -__skb_fill_page_desc (skb,0 , page,0 ,0 ); -skb_shinfo (skb)->nr_frags =1 ; +skb_add_rx_frag (skb,0 , page,0 ,0 ,PAGE_SIZE );__skb_queue_tail (&np->rx_batch, skb); }
@@ -771,7 +770,6 @@ static RING_IDX xennet_fill_frags(struct netfront_info *np, struct sk_buff_head *list) {struct skb_shared_info *shinfo =skb_shinfo (skb); -int nr_frags = shinfo->nr_frags;RING_IDX cons = np->rx.rsp_cons;struct sk_buff *nskb;
@@ -780,19 +778,21 @@ static RING_IDX xennet_fill_frags(struct netfront_info *np,RING_GET_RESPONSE (&np->rx, ++cons);skb_frag_t *nfrag = &skb_shinfo (nskb)->frags[0 ]; -__skb_fill_page_desc (skb, nr_frags, -skb_frag_page (nfrag), - rx->offset, rx->status); +if (shinfo->nr_frags ==MAX_SKB_FRAGS ) { +unsigned int pull_to =NETFRONT_SKB_CB (skb)->pull_to; - skb->data_len += rx->status; +BUG_ON (pull_to <=skb_headlen (skb)); +__pskb_pull_tail (skb, pull_to -skb_headlen (skb)); + } +BUG_ON (shinfo->nr_frags >=MAX_SKB_FRAGS ); + +skb_add_rx_frag (skb, shinfo->nr_frags,skb_frag_page (nfrag), + rx->offset, rx->status,PAGE_SIZE );skb_shinfo (nskb)->nr_frags =0 ;kfree_skb (nskb); - - nr_frags++; } - shinfo->nr_frags = nr_frags;return cons; }
@@ -878,7 +878,8 @@ static int handle_incoming_queue(struct net_device *dev,while ((skb =__skb_dequeue (rxq)) !=NULL ) {int pull_to =NETFRONT_SKB_CB (skb)->pull_to; -__pskb_pull_tail (skb, pull_to -skb_headlen (skb)); +if (pull_to >skb_headlen (skb)) +__pskb_pull_tail (skb, pull_to -skb_headlen (skb));/* Ethernet work: Delayed to here as it peeks the header. */ skb->protocol =eth_type_trans (skb, dev);
@@ -964,35 +965,10 @@ err:skb_shinfo (skb)->frags[0 ].page_offset = rx->offset;skb_frag_size_set (&skb_shinfo (skb)->frags[0 ], rx->status); skb->data_len = rx->status; + skb->len += rx->status; i =xennet_fill_frags (np, skb, &tmpq); -/* -* Truesize approximates the size of true data plus -* any supervisor overheads. Adding hypervisor -* overheads has been shown to significantly reduce -* achievable bandwidth with the default receive -* buffer size. It is therefore not wise to account -* for it here. -* -* After alloc_skb(RX_COPY_THRESHOLD), truesize is set -* to RX_COPY_THRESHOLD + the supervisor -* overheads. Here, we add the size of the data pulled -* in xennet_fill_frags(). -* -* We also adjust for any unused space in the main -* data area by subtracting (RX_COPY_THRESHOLD - -* len). This is especially important with drivers -* which split incoming packets into header and data, -* using only 66 bytes of the main data area (see the -* e1000 driver for example.) On such systems, -* without this last adjustement, our achievable -* receive throughout using the standard receive -* buffer size was cut by 25%(!!!). -*/ - skb->truesize += skb->data_len -RX_COPY_THRESHOLD ; - skb->len += skb->data_len; -if (rx->flags & XEN_NETRXF_csum_blank) skb->ip_summed =CHECKSUM_PARTIAL ;else if (rx->flags & XEN_NETRXF_data_validated)
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 99/251 xen/blkback: Check device permissions before allowing OP_DISCARD
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Konrad Rzeszutek Wilk <[email protected]>
[ Upstream commit 604c499cbbcc3d5fe5fb8d53306aa0fae1990109 ]
We need to make sure that the device is not RO or that the request is not past the number of sectors we want to issue the DISCARD operation for.
This fixes CVE-2013-2140.
--- drivers/block/xen-blkback/blkback.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/block/xen-blkback/blkback.c +12 -1
@@ -399,7 +399,18 @@ static int dispatch_discard_io(struct xen_blkif *blkif,int status =BLKIF_RSP_OKAY ;struct block_device *bdev = blkif->vbd.bdev;unsigned long secure; +struct phys_req preq; + + preq.sector_number = req->u.discard.sector_number; + preq.nr_sects = req->u.discard.nr_sectors; + err =xen_vbd_translate (&preq, blkif,WRITE ); +if (err) { +pr_warn (DRV_PFX "access denied: DISCARD [%llu->%llu] on dev=%04x\n" , + preq.sector_number, + preq.sector_number + preq.nr_sects, blkif->vbd.pdevice); + goto fail_response; + } blkif->st_ds_req++;xen_blkif_get (blkif);
@@ -410,7 +421,7 @@ static int dispatch_discard_io(struct xen_blkif *blkif, err =blkdev_issue_discard (bdev, req->u.discard.sector_number, req->u.discard.nr_sectors,GFP_KERNEL , secure); - +fail_response:if (err == -EOPNOTSUPP ) {pr_debug (DRV_PFX "discard op failed, not supported\n" ); status =BLKIF_RSP_EOPNOTSUPP ;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 100/251 md/raid5: fix interaction of replace and recovery.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit f94c0b6658c7edea8bc19d13be321e3860a3fa54 ]
If a device in a RAID4/5/6 is being replaced while another is being recovered, then the writes to the replacement device currently don't happen, resulting in corruption when the replacement completes and the new drive takes over.
This is because the replacement writes are only triggered when 's.replacing' is set and not when the similar 's.sync' is set (which is the case during resync and recovery - it means all devices need to be read).
So schedule those writes when s.replacing is set as well.
In this case we cannot use "STRIPE_INSYNC" to record that the replacement has happened as that is needed for recording that any parity calculation is complete. So introduce STRIPE_REPLACED to record if the replacement has happened.
For safety we should also check that STRIPE_COMPUTE_RUN is not set. This has a similar effect to the "s.locked == 0" test. The latter ensure that now IO has been flagged but not started. The former checks if any parity calculation has been flagged by not started. We must wait for both of these to complete before triggering the 'replace'.
Add a similar test to the subsequent check for "are we finished yet". This possibly isn't needed (is subsumed in the STRIPE_INSYNC test), but it makes it more obvious that the REPLACE will happen before we think we are finished.
Finally if a NeedReplace device is not UPTODATE then that is an error. We really must trigger a warning.
This bug was introduced in commit 9a3e1101b827a59ac9036a672f5fa8d5279d0fe2 (md/raid5: detect and handle replacements during recovery.) which introduced replacement for raid5.
That was in 3.3-rc3, so any stable kernel since then would benefit from this fix.
--- drivers/md/raid5.c | 15 ++++++++++----- drivers/md/raid5.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-)
drivers/md/raid5.c +10 -5
@@ -3396,6 +3396,7 @@ static void handle_stripe(struct stripe_head *sh)if (test_and_clear_bit (STRIPE_SYNC_REQUESTED , &sh->state)) {set_bit (STRIPE_SYNCING , &sh->state);clear_bit (STRIPE_INSYNC , &sh->state); +clear_bit (STRIPE_REPLACED , &sh->state); }clear_bit (STRIPE_DELAYED , &sh->state);
@@ -3535,19 +3536,23 @@ static void handle_stripe(struct stripe_head *sh)handle_parity_checks5 (conf, sh, &s, disks); } -if (s.replacing && s.locked ==0 - && !test_bit (STRIPE_INSYNC , &sh->state)) { +if ((s.replacing || s.syncing) && s.locked ==0 + && !test_bit (STRIPE_COMPUTE_RUN , &sh->state) + && !test_bit (STRIPE_REPLACED , &sh->state)) {/* Write out to replacement devices where possible */ for (i =0 ; i < conf->raid_disks; i++) -if (test_bit (R5_UPTODATE , &sh->dev[i].flags) && -test_bit (R5_NeedReplace, &sh->dev[i].flags)) { +if (test_bit (R5_NeedReplace, &sh->dev[i].flags)) { +WARN_ON (!test_bit (R5_UPTODATE , &sh->dev[i].flags));set_bit (R5_WantReplace, &sh->dev[i].flags);set_bit (R5_LOCKED , &sh->dev[i].flags); s.locked++; } -set_bit (STRIPE_INSYNC , &sh->state); +if (s.replacing) +set_bit (STRIPE_INSYNC , &sh->state); +set_bit (STRIPE_REPLACED , &sh->state); }if ((s.syncing || s.replacing) && s.locked ==0 && + !test_bit (STRIPE_COMPUTE_RUN , &sh->state) &&test_bit (STRIPE_INSYNC , &sh->state)) {md_done_sync (conf->mddev,STRIPE_SECTORS ,1 );clear_bit (STRIPE_SYNCING , &sh->state);
drivers/md/raid5.h +1 -0
@@ -309,6 +309,7 @@ enum {STRIPE_SYNC_REQUESTED ,STRIPE_SYNCING ,STRIPE_INSYNC , +STRIPE_REPLACED ,STRIPE_PREREAD_ACTIVE ,STRIPE_DELAYED , STRIPE_DEGRADED,
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 101/251 md/raid10: remove use-after-free bug.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
[ Upstream commit 0eb25bb027a100f5a9df8991f2f628e7d851bc1e ]
We always need to be careful when calling generic_make_request, as it can start a chain of events which might free something that we are using.
Here is one place I wasn't careful enough. If the wbio2 is not in use, then it might get freed at the first generic_make_request call. So perform all necessary tests first.
This bug was introduced in 3.3-rc3 (24afd80d99) and can cause an oops, so fix is suitable for any -stable since then.
--- drivers/md/raid10.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/md/raid10.c +7 -1
@@ -2155,12 +2155,18 @@ static void recovery_request_write(struct mddev *mddev, struct r10bio *r10_bio) d = r10_bio->devs[1 ].devnum; wbio = r10_bio->devs[1 ].bio; wbio2 = r10_bio->devs[1 ].repl_bio; +/* Need to test wbio2->bi_end_io before we call +* generic_make_request as if the former is NULL, +* the latter is free to free wbio2. +*/ +if (wbio2 && !wbio2->bi_end_io) + wbio2 =NULL ;if (wbio->bi_end_io) {atomic_inc (&conf->mirrors[d].rdev->nr_pending);md_sync_acct (conf->mirrors[d].rdev->bdev, wbio->bi_size >>9 );generic_make_request (wbio); } -if (wbio2 && wbio2->bi_end_io) { +if (wbio2) {atomic_inc (&conf->mirrors[d].replacement->nr_pending);md_sync_acct (conf->mirrors[d].replacement->bdev, wbio2->bi_size >>9 );
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 102/251 libata: make it clear that sata_inic162x is experimental
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
[ Upstream commit bb9696192826a7d9279caf872e95b41bc26c7eff ]
sata_inic162x never reached a state where it's reliable enough for production use and data corruption is a relatively common occurrence. Make the driver generate warning about the issues and mark the Kconfig option as experimental.
If the situation doesn't improve, we'd be better off making it depend on CONFIG_BROKEN. Let's wait for several cycles and see if the kernel message draws any attention.
--- drivers/ata/Kconfig | 2 +- drivers/ata/sata_inic162x.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-)
drivers/ata/Kconfig +1 -1
@@ -93,7 +93,7 @@ config SATA_FSL If unsure, say N. config SATA_INIC162X - tristate "Initio 162x SATA support" + tristate "Initio 162x SATA support (Very Experimental)" depends on PCI help This option enables support for Initio 162x Serial ATA.
drivers/ata/sata_inic162x.c +14 -0
@@ -6,6 +6,18 @@* * This file is released under GPL v2. * +* **** WARNING **** +* +* This driver never worked properly and unfortunately data corruption is +* relatively common. There isn't anyone working on the driver and there's +* no support from the vendor. Do not use this driver in any production +* environment. +* +* http://thread.gmane.org/gmane.linux.debian.devel.bugs.rc/378525/focus=54491 +* https://bugzilla.kernel.org/show_bug.cgi?id=60565 +* +* ***************** +* * This controller is eccentric and easily locks up if something isn't * right. Documentation is available at initio's website but it only * documents registers (not programming model).
@@ -809,6 +821,8 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)ata_print_version_once (&pdev->dev,DRV_VERSION ); +dev_alert (&pdev->dev,"inic162x support is broken with common data corruption issues and will be disabled by default, contact [email protected] if in production use\n" ); +/* alloc host */ host =ata_host_alloc_pinfo (&pdev->dev, ppi,NR_PORTS ); hpriv =devm_kzalloc (&pdev->dev,sizeof (*hpriv),GFP_KERNEL );
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 103/251 svcrdma: underflow issue in decode_write_list()
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit b2781e1021525649c0b33fffd005ef219da33926 ]
My static checker marks everything from ntohl() as untrusted and it complains we could have an underflow problem doing:
return (u32 *)&ary->wc_array[nchunks];
Also on 32 bit systems the upper bound check could overflow.
--- net/sunrpc/xprtrdma/svc_rdma_marshal.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
net/sunrpc/xprtrdma/svc_rdma_marshal.c +14 -6
@@ -98,6 +98,7 @@ void svc_rdma_rcl_chunk_counts(struct rpcrdma_read_chunk *ch,*/ static u32 *decode_write_list (u32 *va,u32 *vaend) { +unsigned long start, end;int nchunks; struct rpcrdma_write_array *ary =
@@ -113,9 +114,12 @@ static u32 *decode_write_list(u32 *va, u32 *vaend)return NULL ; } nchunks =ntohl (ary->wc_nchunks); -if (((unsigned long )&ary->wc_array[0 ] + - (sizeof (struct rpcrdma_write_chunk ) * nchunks)) > - (unsigned long )vaend) { + + start = (unsigned long )&ary->wc_array[0 ]; + end = (unsigned long )vaend; +if (nchunks <0 || + nchunks > (SIZE_MAX - start) /sizeof (struct rpcrdma_write_chunk ) || + (start + (sizeof (struct rpcrdma_write_chunk ) * nchunks)) > end) {dprintk ("svcrdma: ary=%p, wc_nchunks=%d, vaend=%p\n" , ary, nchunks, vaend);return NULL ;
@@ -129,6 +133,7 @@ static u32 *decode_write_list(u32 *va, u32 *vaend)static u32 *decode_reply_array (u32 *va,u32 *vaend) { +unsigned long start, end;int nchunks;struct rpcrdma_write_array *ary = (struct rpcrdma_write_array *)va;
@@ -143,9 +148,12 @@ static u32 *decode_reply_array(u32 *va, u32 *vaend)return NULL ; } nchunks =ntohl (ary->wc_nchunks); -if (((unsigned long )&ary->wc_array[0 ] + - (sizeof (struct rpcrdma_write_chunk ) * nchunks)) > - (unsigned long )vaend) { + + start = (unsigned long )&ary->wc_array[0 ]; + end = (unsigned long )vaend; +if (nchunks <0 || + nchunks > (SIZE_MAX - start) /sizeof (struct rpcrdma_write_chunk ) || + (start + (sizeof (struct rpcrdma_write_chunk ) * nchunks)) > end) {dprintk ("svcrdma: ary=%p, wc_nchunks=%d, vaend=%p\n" , ary, nchunks, vaend);return NULL ;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 104/251 powerpc/modules: Module CRC relocation fix causes perf issues
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Anton Blanchard <[email protected]>
[ Upstream commit 0e0ed6406e61434d3f38fb58aa8464ec4722b77e ]
Module CRCs are implemented as absolute symbols that get resolved by a linker script. We build an intermediate .o that contains an unresolved symbol for each CRC. genksysms parses this .o, calculates the CRCs and writes a linker script that "resolves" the symbols to the calculated CRC.
Unfortunately the ppc64 relocatable kernel sees these CRCs as symbols that need relocating and relocates them at boot. Commit d4703aef (module: handle ppc64 relocating kcrctabs when CONFIG_RELOCATABLE=y) added a hook to reverse the bogus relocations. Part of this patch created a symbol at 0x0:
# head -2 /proc/kallsyms 0000000000000000 T reloc_start c000000000000000 T .__start
This reloc_start symbol is causing lots of confusion to perf. It thinks reloc_start is a massive function that stretches from 0x0 to 0xc000000000000000 and we get various cryptic errors out of perf, including:
problem incrementing symbol count, skipping event
This patch removes the reloc_start linker script label and instead defines it as PHYSICAL_START. We also need to wrap it with CONFIG_PPC64 because the ppc32 kernel can set a non zero PHYSICAL_START at compile time and we wouldn't want to subtract it from the CRCs in that case.
--- arch/powerpc/include/asm/module.h | 5 ++--- arch/powerpc/kernel/vmlinux.lds.S | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-)
arch/powerpc/include/asm/module.h +2 -3
@@ -87,10 +87,9 @@ struct exception_table_entry;void sort_ex_table (struct exception_table_entry *start,struct exception_table_entry *finish); -#ifdef CONFIG_MODVERSIONS +#if defined(CONFIG_MODVERSIONS ) && defined(CONFIG_PPC64 )#define ARCH_RELOCATES_KCRCTAB - -extern const unsigned long reloc_start[]; +#define reloc_start PHYSICAL_START#endif #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_MODULE_H */
arch/powerpc/kernel/vmlinux.lds.S +0 -3
@@ -38,9 +38,6 @@ jiffies = jiffies_64 + 4; #endif SECTIONS { - . = 0; - reloc_start = .; - . = KERNELBASE; /*
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 105/251 nfsd: nfsd_open: when dentry_open returns an error do not propagate as struct file
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Harshula Jayasuriya <[email protected]>
[ Upstream commit e4daf1ffbe6cc3b12aab4d604e627829e93e9914 ]
The following call chain:
------------------------------------------------------------nfs4_get_vfs_file
- nfsd_open
- dentry_open
- do_dentry_open
- __get_file_write_access
- get_write_access
- return atomic_inc_unless_negative(&inode->i_writecount) ? 0 : -ETXTBSY;
------------------------------------------------------------
can result in the following state:
------------------------------------------------------------
struct nfs4_file {
...
fi_fds = {0xffff880c1fa65c80, 0xffffffffffffffe6, 0x0},
fi_access = {{
counter = 0x1
}, {
counter = 0x0
}},...
------------------------------------------------------------
1) First time around, in nfs4_get_vfs_file() fp->fi_fds[O_WRONLY] is NULL, hence nfsd_open() is called where we get status set to an error and fp->fi_fds[O_WRONLY] to -ETXTBSY. Thus we do not reach nfs4_file_get_access() and fi_access[O_WRONLY] is not incremented.
2) Second time around, in nfs4_get_vfs_file() fp->fi_fds[O_WRONLY] is NOT NULL (-ETXTBSY), so nfsd_open() is NOT called, but nfs4_file_get_access() IS called and fi_access[O_WRONLY] is incremented. Thus we leave a landmine in the form of the nfs4_file data structure in an incorrect state.
3) Eventually, when __nfs4_file_put_access() is called it finds fi_access[O_WRONLY] being non-zero, it decrements it and calls nfs4_file_put_fd() which tries to fput -ETXTBSY.
------------------------------------------------------------
...
[exception RIP: fput+0x9]
RIP: ffffffff81177fa9 RSP: ffff88062e365c90 RFLAGS: 00010282
RAX: ffff880c2b3d99cc RBX: ffff880c2b3d9978 RCX: 0000000000000002
RDX: dead000000100101 RSI: 0000000000000001 RDI: ffffffffffffffe6
RBP: ffff88062e365c90 R8: ffff88041fe797d8 R9: ffff88062e365d58
R10: 0000000000000008 R11: 0000000000000000 R12: 0000000000000001
R13: 0000000000000007 R14: 0000000000000000 R15: 0000000000000000
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 #9 [ffff88062e365c98] __nfs4_file_put_access at ffffffffa0562334 [nfsd]
#10 [ffff88062e365cc8] nfs4_file_put_access at ffffffffa05623ab [nfsd] #11 [ffff88062e365ce8] free_generic_stateid at ffffffffa056634d [nfsd] #12 [ffff88062e365d18] release_open_stateid at ffffffffa0566e4b [nfsd] #13 [ffff88062e365d38] nfsd4_close at ffffffffa0567401 [nfsd] #14 [ffff88062e365d88] nfsd4_proc_compound at ffffffffa0557f28 [nfsd] #15 [ffff88062e365dd8] nfsd_dispatch at ffffffffa054543e [nfsd] #16 [ffff88062e365e18] svc_process_common at ffffffffa04ba5a4 [sunrpc] #17 [ffff88062e365e98] svc_process at ffffffffa04babe0 [sunrpc] #18 [ffff88062e365eb8] nfsd at ffffffffa0545b62 [nfsd]
#19 [ffff88062e365ee8] kthread at ffffffff81090886
#20 [ffff88062e365f48] kernel_thread at ffffffff8100c14a
------------------------------------------------------------
--- fs/nfsd/vfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/nfsd/vfs.c +3 -2
@@ -802,9 +802,10 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, flags =O_WRONLY |O_LARGEFILE ; } *filp =dentry_open (&path, flags,current_cred ()); -if (IS_ERR (*filp)) +if (IS_ERR (*filp)) { host_err =PTR_ERR (*filp); -else { + *filp =NULL ; + }else { host_err =ima_file_check (*filp, may_flags);if (may_flags &NFSD_MAY_64BIT_COOKIE )
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 106/251 ACPI / memhotplug: Fix a stale pointer in error path
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Toshi Kani <[email protected]>
[ Upstream commit d19f503e22316a84c39bc19445e0e4fdd49b3532 ]
device->driver_data needs to be cleared when releasing its data, mem_device, in an error path of acpi_memory_device_add().
The function evaluates the _CRS of memory device objects, and fails when it gets an unexpected resource or cannot allocate memory. A kernel crash or data corruption may occur when the kernel accesses the stale pointer.
--- drivers/acpi/acpi_memhotplug.c | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/acpi_memhotplug.c +1 -0
@@ -442,6 +442,7 @@ static int acpi_memory_device_add(struct acpi_device *device)/* Get the range from the _CRS */ result =acpi_memory_get_device_resources (mem_device);if (result) { + device->driver_data =NULL ;kfree (mem_device);return result; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 107/251 dm mpath: fix ioctl deadlock when no paths
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Hannes Reinecke <[email protected]>
[ Upstream commit 6c182cd88d179cbbd06f4f8a8a19b6977940753f ]
When multipath needs to retry an ioctl the reference to the current live table needs to be dropped. Otherwise a deadlock occurs when all paths are down:
- dm_blk_ioctl takes a reference to the current table and spins in multipath_ioctl().
- A new table is being loaded, but upon resume the process hangs in dm_table_destroy() waiting for references to drop to zero.
With this patch the reference to the old table is dropped prior to retry, thereby avoiding the deadlock.
--- drivers/md/dm-mpath.c | 8 ++------ drivers/md/dm.c | 9 ++++++++- 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/md/dm-mpath.c +2 -6
@@ -1561,7 +1561,6 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,unsigned long flags;int r; -again: bdev =NULL ; mode =0 ; r =0 ;
@@ -1579,7 +1578,7 @@ again: }if ((pgpath && m->queue_io) || (!pgpath && m->queue_if_no_path)) - r = -EAGAIN ; + r = -ENOTCONN ;else if (!bdev) r = -EIO ;
@@ -1591,11 +1590,8 @@ again:if (!r && ti->len !=i_size_read (bdev->bd_inode) >>SECTOR_SHIFT ) r =scsi_verify_blk_ioctl (NULL , cmd); -if (r == -EAGAIN && !fatal_signal_pending (current)) { +if (r == -ENOTCONN && !fatal_signal_pending (current))queue_work (kmultipathd, &m->process_queued_ios); -msleep (10 ); - goto again; - }return r ? :__blkdev_driver_ioctl (bdev, mode, cmd, arg); }
drivers/md/dm.c +8 -1
@@ -414,10 +414,12 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) {struct mapped_device *md = bdev->bd_disk->private_data; -struct dm_table *map =dm_get_live_table (md); +struct dm_table *map;struct dm_target *tgt;int r = -ENOTTY ; +retry: + map =dm_get_live_table (md);if (!map || !dm_table_get_size (map)) goto out;
@@ -438,6 +440,11 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode, out:dm_table_put (map); +if (r == -ENOTCONN ) { +msleep (10 ); + goto retry; + } +return r; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 108/251 dm verity: fix inability to use a few specific devices sizes
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
[ Upstream commit b1bf2de07271932326af847a3c6a01fdfd29d4be ]
Fix a boundary condition that caused failure for certain device sizes.
The problem is reported at
http://code.google.com/p/cryptsetup/issues/detail?id=160
For certain device sizes the number of hashes at a specific level was calculated incorrectly.
It happens for example for a device with data and metadata block size 4096 that has 16385 blocks and algorithm sha256.
The user can test if he is affected by this bug by running the "veritysetup verify" command and also by activating the dm-verity kernel driver and reading the whole block device. If it passes without an error, then the user is not affected.
The condition for the bug is:
Split the total number of data blocks (data_block_bits) into bit strings, each string has hash_per_block_bits bits. hash_per_block_bits is rounddown(log2(metadata_block_size/hash_digest_size)). Equivalently, you can say that you convert data_blocks_bits to 2^hash_per_block_bits base.
If there some zero bit string below the most significant bit string and at least one bit below this zero bit string is set, then the bug happens.
The same bug exists in the userspace veritysetup tool, so you must use fixed veritysetup too if you want to use devices that are affected by this boundary condition.
--- drivers/md/dm-verity.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/md/dm-verity.c +2 -3
@@ -842,9 +842,8 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv)for (i = v->levels -1 ; i >=0 ; i--) {sector_t s; v->hash_level_block[i] = hash_position; - s =verity_position_at_level (v, v->data_blocks, i); - s = (s >> v->hash_per_block_bits) + - !!(s & ((1 << v->hash_per_block_bits) -1 )); + s = (v->data_blocks + ((sector_t )1 << ((i +1 ) * v->hash_per_block_bits)) -1 ) + >> ((i +1 ) * v->hash_per_block_bits);if (hash_position + s < hash_position) { ti->error ="Hash device offset overflow" ; r = -E2BIG ;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 109/251 drm/radeon: fix endian issues with DP handling (v3)
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit 34be8c9af7b8728465963740fc11136ae90dfc36 ]
The atom interpreter expects data in LE format, so swap the message buffer as apprioriate.
v2: properly handle non-dw aligned byte counts.
v3: properly handle remainder
--- drivers/gpu/drm/radeon/atombios_dp.c | 43 ++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/atombios_dp.c +39 -4
@@ -45,6 +45,41 @@ static char *pre_emph_names[] = { };/***** radeon AUX functions *****/ + +/* Atom needs data in little endian format +* so swap as appropriate when copying data to +* or from atom. Note that atom operates on +* dw units. +*/ +static void radeon_copy_swap (u8 *dst,u8 *src,u8 num_bytes,bool to_le) +{ +#ifdef __BIG_ENDIAN +u8 src_tmp[20 ], dst_tmp[20 ];/* used for byteswapping */ +u32 *dst32, *src32; +int i; + +memcpy (src_tmp, src, num_bytes); + src32 = (u32 *)src_tmp; + dst32 = (u32 *)dst_tmp; +if (to_le) { +for (i =0 ; i < ((num_bytes +3 ) /4 ); i++) + dst32[i] =cpu_to_le32 (src32[i]); +memcpy (dst, dst_tmp, num_bytes); + }else { +u8 dws = num_bytes & ~3 ; +for (i =0 ; i < ((num_bytes +3 ) /4 ); i++) + dst32[i] =le32_to_cpu (src32[i]); +memcpy (dst, dst_tmp, dws); +if (num_bytes %4 ) { +for (i =0 ; i < (num_bytes %4 ); i++) + dst[dws+i] = dst_tmp[dws+i]; + } + } +#else +memcpy (dst, src, num_bytes); +#endif +} +union aux_channel_transaction {PROCESS_AUX_CHANNEL_TRANSACTION_PS_ALLOCATION v1;PROCESS_AUX_CHANNEL_TRANSACTION_PARAMETERS_V2 v2;
@@ -66,10 +101,10 @@ static int radeon_process_aux_ch(struct radeon_i2c_chan *chan, base = (unsigned char *)(rdev->mode_info.atom_context->scratch +1 ); -memcpy (base, send, send_bytes); +radeon_copy_swap (base, send, send_bytes, true); - args.v1.lpAuxRequest =0 +4 ; - args.v1.lpDataOut =16 +4 ; + args.v1.lpAuxRequest =cpu_to_le16 ((u16)(0 +4 )); + args.v1.lpDataOut =cpu_to_le16 ((u16)(16 +4 )); args.v1.ucDataOutLen =0 ; args.v1.ucChannelID = chan->rec.i2c_id; args.v1.ucDelay = delay /10 ;
@@ -103,7 +138,7 @@ static int radeon_process_aux_ch(struct radeon_i2c_chan *chan, recv_bytes = recv_size;if (recv && recv_size) -memcpy (recv, base +16 , recv_bytes); +radeon_copy_swap (recv, base +16 , recv_bytes, false);return recv_bytes; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 110/251 drm/radeon: fix combios tables on older cards
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Mark Kettenis <[email protected]>
[ Upstream commit cef1d00cd56f600121ad121875655ad410a001b8 ]
Noticed that my old Radeon 7500 hung after printing
drm: GPU not posted. posting now...
when it wasn't selected as the primary card the BIOS. Some digging revealed that it was hanging in combios_parse_mmio_table() while parsing the ASIC INIT 3 table. Looking at the BIOS ROM for the card, it becomes obvious that there is no ASIC INIT 3 table in the BIOS. The code is just processing random garbage. No surprise it hangs!
Why do I say that there is no ASIC INIT 3 table is the BIOS? This table is found through the MISC INFO table. The MISC INFO table can be found at offset 0x5e in the COMBIOS header. But the header is smaller than that. The COMBIOS header starts at offset 0x126. The standard PCI Data Structure (the bit that starts with 'PCIR') lives at offset 0x180. That means that the COMBIOS header can not be larger than 0x5a bytes and therefore cannot contain a MISC INFO table.
I looked at a dozen or so BIOS images, some my own, some downloaded from:
<http://www.techpowerup.com/vgabios/index.php?manufacturer=ATI&page=1>
It is fairly obvious that the size of the COMBIOS header can be found at offset 0x6 of the header. Not sure if it is a 16-bit number or just an 8-bit number, but that doesn't really matter since the tables seems to be always smaller than 256 bytes.
So I think combios_get_table_offset() should check if the requested table is present. This can be done by checking the offset against the size of the header. See the diff below. The diff is against the WIP OpenBSD codebase that roughly corresponds to Linux 3.8.13 at this point. But I don't think this bit of the code changed much since then.
For what it is worth:
--- drivers/gpu/drm/radeon/radeon_combios.c | 145 +++++++++---------------------- 1 file changed, 41 insertions(+), 104 deletions(-)
drivers/gpu/drm/radeon/radeon_combios.c +41 -104
@@ -147,7 +147,7 @@ static uint16_t combios_get_table_offset(struct drm_device *dev, enum radeon_combios_table_offset table) {struct radeon_device *rdev = dev->dev_private; -int rev; +int rev, size;uint16_t offset =0 , check_offset;if (!rdev->bios)
@@ -156,174 +156,106 @@ static uint16_t combios_get_table_offset(struct drm_device *dev,switch (table) {/* absolute offset tables */ case COMBIOS_ASIC_INIT_1_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0xc ); -if (check_offset) - offset = check_offset; + check_offset =0xc ;break ;case COMBIOS_BIOS_SUPPORT_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x14 ); -if (check_offset) - offset = check_offset; + check_offset =0x14 ;break ;case COMBIOS_DAC_PROGRAMMING_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x2a ); -if (check_offset) - offset = check_offset; + check_offset =0x2a ;break ;case COMBIOS_MAX_COLOR_DEPTH_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x2c ); -if (check_offset) - offset = check_offset; + check_offset =0x2c ;break ;case COMBIOS_CRTC_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x2e ); -if (check_offset) - offset = check_offset; + check_offset =0x2e ;break ;case COMBIOS_PLL_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x30 ); -if (check_offset) - offset = check_offset; + check_offset =0x30 ;break ;case COMBIOS_TV_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x32 ); -if (check_offset) - offset = check_offset; + check_offset =0x32 ;break ;case COMBIOS_DFP_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x34 ); -if (check_offset) - offset = check_offset; + check_offset =0x34 ;break ;case COMBIOS_HW_CONFIG_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x36 ); -if (check_offset) - offset = check_offset; + check_offset =0x36 ;break ;case COMBIOS_MULTIMEDIA_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x38 ); -if (check_offset) - offset = check_offset; + check_offset =0x38 ;break ;case COMBIOS_TV_STD_PATCH_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x3e ); -if (check_offset) - offset = check_offset; + check_offset =0x3e ;break ;case COMBIOS_LCD_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x40 ); -if (check_offset) - offset = check_offset; + check_offset =0x40 ;break ;case COMBIOS_MOBILE_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x42 ); -if (check_offset) - offset = check_offset; + check_offset =0x42 ;break ;case COMBIOS_PLL_INIT_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x46 ); -if (check_offset) - offset = check_offset; + check_offset =0x46 ;break ;case COMBIOS_MEM_CONFIG_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x48 ); -if (check_offset) - offset = check_offset; + check_offset =0x48 ;break ;case COMBIOS_SAVE_MASK_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x4a ); -if (check_offset) - offset = check_offset; + check_offset =0x4a ;break ;case COMBIOS_HARDCODED_EDID_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x4c ); -if (check_offset) - offset = check_offset; + check_offset =0x4c ;break ;case COMBIOS_ASIC_INIT_2_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x4e ); -if (check_offset) - offset = check_offset; + check_offset =0x4e ;break ;case COMBIOS_CONNECTOR_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x50 ); -if (check_offset) - offset = check_offset; + check_offset =0x50 ;break ;case COMBIOS_DYN_CLK_1_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x52 ); -if (check_offset) - offset = check_offset; + check_offset =0x52 ;break ;case COMBIOS_RESERVED_MEM_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x54 ); -if (check_offset) - offset = check_offset; + check_offset =0x54 ;break ;case COMBIOS_EXT_TMDS_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x58 ); -if (check_offset) - offset = check_offset; + check_offset =0x58 ;break ;case COMBIOS_MEM_CLK_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x5a ); -if (check_offset) - offset = check_offset; + check_offset =0x5a ;break ;case COMBIOS_EXT_DAC_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x5c ); -if (check_offset) - offset = check_offset; + check_offset =0x5c ;break ;case COMBIOS_MISC_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x5e ); -if (check_offset) - offset = check_offset; + check_offset =0x5e ;break ;case COMBIOS_CRT_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x60 ); -if (check_offset) - offset = check_offset; + check_offset =0x60 ;break ;case COMBIOS_INTEGRATED_SYSTEM_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x62 ); -if (check_offset) - offset = check_offset; + check_offset =0x62 ;break ;case COMBIOS_COMPONENT_VIDEO_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x64 ); -if (check_offset) - offset = check_offset; + check_offset =0x64 ;break ;case COMBIOS_FAN_SPEED_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x66 ); -if (check_offset) - offset = check_offset; + check_offset =0x66 ;break ;case COMBIOS_OVERDRIVE_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x68 ); -if (check_offset) - offset = check_offset; + check_offset =0x68 ;break ;case COMBIOS_OEM_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x6a ); -if (check_offset) - offset = check_offset; + check_offset =0x6a ;break ;case COMBIOS_DYN_CLK_2_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x6c ); -if (check_offset) - offset = check_offset; + check_offset =0x6c ;break ;case COMBIOS_POWER_CONNECTOR_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x6e ); -if (check_offset) - offset = check_offset; + check_offset =0x6e ;break ;case COMBIOS_I2C_INFO_TABLE : - check_offset =RBIOS16 (rdev->bios_header_start +0x70 ); -if (check_offset) - offset = check_offset; + check_offset =0x70 ;break ;/* relative offset tables */ case COMBIOS_ASIC_INIT_3_TABLE :/* offset from misc info */
@@ -439,11 +371,16 @@ static uint16_t combios_get_table_offset(struct drm_device *dev, }break ;default : + check_offset =0 ;break ; } -return offset; + size =RBIOS8 (rdev->bios_header_start +0x6 ); +/* check absolute offset tables */ +if (table <COMBIOS_ASIC_INIT_3_TABLE && check_offset && check_offset < size) + offset =RBIOS16 (rdev->bios_header_start + check_offset); +return offset; }bool radeon_combios_check_hardcoded_edid (struct radeon_device *rdev)
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 111/251 drm/radeon: improve dac adjust heuristics for legacy pdac
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit 03ed8cf9b28d886c64c7e705c7bb1a365fd8fb95 ]
Hopefully avoid more quirks in the future due to bogus vbios dac data.
--- drivers/gpu/drm/radeon/radeon_combios.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_combios.c +4 -2
@@ -902,8 +902,10 @@ struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(struct dac =RBIOS8 (dac_info +0x3 ) &0xf ; p_dac->ps2_pdac_adj = (bg <<8 ) | (dac); } -/* if the values are all zeros, use the table */ -if (p_dac->ps2_pdac_adj) +/* if the values are zeros, use the table */ +if ((dac ==0 ) || (bg ==0 )) + found =0 ; +else found =1 ; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 112/251 drm/i915: fix long-standing SNB regression in power consumption after resume v2
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Konstantin Khlebnikov <[email protected]>
[ Upstream commit 7dcd2677ea912573d9ed4bcd629b0023b2d11505 ]
This patch fixes regression in power consumtion of sandy bridge gpu, which exists since v3.6 Sometimes after resuming from s2ram gpu starts thinking that it's extremely busy. After that it never reaches rc6 state.
Bug exists since kernel v3.6:
commit b4ae3f22d238617ca11610b29fde16cf8c0bc6e0
Author: Jesse Barnes <[email protected]> Date: Thu Jun 14 11:04:48 2012 -0700
drm/i915: load boot context at driver init time
For some reason RC6 is already enabled at the beginning of resuming process. Following initliaztion breaks some internal state and confuses RPS engine. This patch disables RC6 at the beginnig of resume and initialization.
I've rearranged initialization sequence, because intel_disable_gt_powersave() needs initialized force_wake_get/put and some locks from the dev_priv.
Note: The culprit in the initialization sequence seems to be the write to MBCTL added in the above mentioned commit. The first version of this patch just held a forcewake reference across the clock gating init functions, which seems to have been enought to gather quite a few positive test reports. But since that smelled a bit like ad-hoc duct-tape v2 now just disables rps/rc6 across the entire hw setup.
References: https://bugs.freedesktop.org/show_bug.cgi?id=54089
References: https://bugzilla.kernel.org/show_bug.cgi?id=58971
References: https://patchwork.kernel.org/patch/2827634/ (patch v1)
[danvet: Add note about v1 vs. v2 of this patch and use standard layout for the commit citation. Also add the tested-bys from v1 and a
cc: stable.]
Cc: [email protected] (Note: tiny conflict due to the addition of the backlight lock in 3.11)
--- drivers/gpu/drm/i915/i915_dma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +5 -5
@@ -1465,6 +1465,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) dev_priv->dev = dev; dev_priv->info = info; +spin_lock_init (&dev_priv->irq_lock); +spin_lock_init (&dev_priv->error_lock); +spin_lock_init (&dev_priv->rps_lock); +spin_lock_init (&dev_priv->dpio_lock); +if (i915_get_bridge_dev (dev)) { ret = -EIO ; goto free_priv;
@@ -1585,11 +1590,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)if (!IS_I945G (dev) && !IS_I945GM (dev))pci_enable_msi (dev->pdev); -spin_lock_init (&dev_priv->irq_lock); -spin_lock_init (&dev_priv->error_lock); -spin_lock_init (&dev_priv->rps_lock); -spin_lock_init (&dev_priv->dpio_lock); -if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) dev_priv->num_pipe =3 ;else if (IS_MOBILE (dev) || !IS_GEN2 (dev))
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 113/251 drm/radeon/atom: initialize more atom interpretor elements to 0
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit 42a21826dc54583cdb79cc8477732e911ac9c376 ]
The ProcessAuxChannel table on some rv635 boards assumes the divmul members are initialized to 0 otherwise we get an invalid fb offset since it has a bad mask set when setting the fb base. While here initialize all the atom interpretor elements to 0.
Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=60639
--- drivers/gpu/drm/radeon/atom.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/radeon/atom.c +5 -0
@@ -1222,12 +1222,17 @@ int atom_execute_table(struct atom_context *ctx, int index, uint32_t * params)int r;mutex_lock (&ctx->mutex); +/* reset data block */ + ctx->data_block =0 ;/* reset reg block */ ctx->reg_block =0 ;/* reset fb window */ ctx->fb_base =0 ;/* reset io mode */ ctx->io_mode =ATOM_IO_MM ; +/* reset divmul */ + ctx->divmul[0 ] =0 ; + ctx->divmul[1 ] =0 ; r =atom_execute_table_locked (ctx, index, params);mutex_unlock (&ctx->mutex);return r;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 114/251 USB: serial: ftdi_sio: add more RT Systems ftdi devices
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Rick Farina (Zero_Chaos)" <[email protected]>
[ Upstream commit fed1f1ed90bce42ea010e2904cbc04e7b8304940 ]
RT Systems makes many usb serial cables based on the ftdi_sio driver for programming various amateur radios. This patch is a full listing of their current product offerings and should allow these cables to all be recognized.
--- drivers/usb/serial/ftdi_sio.c | 31 ++++++++++++++++++++++++++++--- drivers/usb/serial/ftdi_sio_ids.h | 34 +++++++++++++++++++++++++++++----- 2 files changed, 57 insertions(+), 8 deletions(-)
drivers/usb/serial/ftdi_sio.c +28 -3
@@ -741,9 +741,34 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_NDI_AURORA_SCU_PID), .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk }, { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, - { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_SERIAL_VX7_PID) }, - { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_CT29B_PID) }, - { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_RTS01_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_S03_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_59_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_57A_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_57B_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_29A_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_29B_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_29F_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_62B_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_S01_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_63_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_29C_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_81B_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_82B_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_K5D_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_K4Y_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_K5G_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_S05_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_60_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_61_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_62_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_63B_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_64_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_65_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_92_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_92D_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_W5R_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_A5R_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_PW1_PID) }, { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_PHI_FISCO_PID) }, { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
drivers/usb/serial/ftdi_sio_ids.h +29 -5
@@ -808,11 +808,35 @@/* * RT Systems programming cables for various ham radios */ -#define RTSYSTEMS_VID 0x2100/* Vendor ID */ -#define RTSYSTEMS_SERIAL_VX7_PID 0x9e52/* Serial converter for VX-7 Radios using FT232RL */ -#define RTSYSTEMS_CT29B_PID 0x9e54/* CT29B Radio Cable */ -#define RTSYSTEMS_RTS01_PID 0x9e57/* USB-RTS01 Radio Cable */ - +#define RTSYSTEMS_VID 0x2100/* Vendor ID */ +#define RTSYSTEMS_USB_S03_PID 0x9001/* RTS-03 USB to Serial Adapter */ +#define RTSYSTEMS_USB_59_PID 0x9e50/* USB-59 USB to 8 pin plug */ +#define RTSYSTEMS_USB_57A_PID 0x9e51/* USB-57A USB to 4pin 3.5mm plug */ +#define RTSYSTEMS_USB_57B_PID 0x9e52/* USB-57B USB to extended 4pin 3.5mm plug */ +#define RTSYSTEMS_USB_29A_PID 0x9e53/* USB-29A USB to 3.5mm stereo plug */ +#define RTSYSTEMS_USB_29B_PID 0x9e54/* USB-29B USB to 6 pin mini din */ +#define RTSYSTEMS_USB_29F_PID 0x9e55/* USB-29F USB to 6 pin modular plug */ +#define RTSYSTEMS_USB_62B_PID 0x9e56/* USB-62B USB to 8 pin mini din plug*/ +#define RTSYSTEMS_USB_S01_PID 0x9e57/* USB-RTS01 USB to 3.5 mm stereo plug*/ +#define RTSYSTEMS_USB_63_PID 0x9e58/* USB-63 USB to 9 pin female*/ +#define RTSYSTEMS_USB_29C_PID 0x9e59/* USB-29C USB to 4 pin modular plug*/ +#define RTSYSTEMS_USB_81B_PID 0x9e5A/* USB-81 USB to 8 pin mini din plug*/ +#define RTSYSTEMS_USB_82B_PID 0x9e5B/* USB-82 USB to 2.5 mm stereo plug*/ +#define RTSYSTEMS_USB_K5D_PID 0x9e5C/* USB-K5D USB to 8 pin modular plug*/ +#define RTSYSTEMS_USB_K4Y_PID 0x9e5D/* USB-K4Y USB to 2.5/3.5 mm plugs*/ +#define RTSYSTEMS_USB_K5G_PID 0x9e5E/* USB-K5G USB to 8 pin modular plug*/ +#define RTSYSTEMS_USB_S05_PID 0x9e5F/* USB-RTS05 USB to 2.5 mm stereo plug*/ +#define RTSYSTEMS_USB_60_PID 0x9e60/* USB-60 USB to 6 pin din*/ +#define RTSYSTEMS_USB_61_PID 0x9e61/* USB-61 USB to 6 pin mini din*/ +#define RTSYSTEMS_USB_62_PID 0x9e62/* USB-62 USB to 8 pin mini din*/ +#define RTSYSTEMS_USB_63B_PID 0x9e63/* USB-63 USB to 9 pin female*/ +#define RTSYSTEMS_USB_64_PID 0x9e64/* USB-64 USB to 9 pin male*/ +#define RTSYSTEMS_USB_65_PID 0x9e65/* USB-65 USB to 9 pin female null modem*/ +#define RTSYSTEMS_USB_92_PID 0x9e66/* USB-92 USB to 12 pin plug*/ +#define RTSYSTEMS_USB_92D_PID 0x9e67/* USB-92D USB to 12 pin plug data*/ +#define RTSYSTEMS_USB_W5R_PID 0x9e68/* USB-W5R USB to 8 pin modular plug*/ +#define RTSYSTEMS_USB_A5R_PID 0x9e69/* USB-A5R USB to 8 pin modular plug*/ +#define RTSYSTEMS_USB_PW1_PID 0x9e6A/* USB-PW1 USB to 8 pin modular plug*/ /* * Physik Instrumente
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 115/251 livelock avoidance in sget()
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit acfec9a5a892f98461f52ed5770de99a3e571ae2 ]
Eric Sandeen has found a nasty livelock in sget() - take a mount(2) about to fail. The superblock is on ->fs_supers, ->s_umount is held exclusive, ->s_active is 1. Along comes two more processes, trying to mount the same thing; sget() in each is picking that superblock, bumping ->s_count and trying to grab ->s_umount. ->s_active is 3 now. Original mount(2) finally gets to deactivate_locked_super() on failure; ->s_active is 2, superblock is still ->fs_supers because shutdown will *not* happen until ->s_active hits 0. ->s_umount is dropped and now we have two processes chasing each other:s_active = 2, A acquired ->s_umount, B blocked
A sees that the damn thing is stillborn, does deactivate_locked_super() s_active = 1, A drops ->s_umount, B gets it
A restarts the search and finds the same superblock. And bumps it ->s_active. s_active = 2, B holds ->s_umount, A blocked on trying to get it ... and we are in the earlier situation with A and B switched places.
The root cause, of course, is that ->s_active should not grow until we'd got MS_BORN. Then failing ->mount() will have deactivate_locked_super() shut the damn thing down. Fortunately, it's easy to do - the key point is that grab_super() is called only for superblocks currently on ->fs_supers, so it can bump ->s_count and grab ->s_umount first, then check MS_BORN and bump ->s_active; we must never increment ->s_count for superblocks past ->kill_sb(), but grab_super() is never called for those.
The bug is pretty old; we would've caught it by now, if not for accidental exclusion between sget() for block filesystems; the things like cgroup or e.g. mtd-based filesystems don't have anything of that sort, so they get bitten. The right way to deal with that is obviously to fix sget()...
--- fs/super.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)
fs/super.c +10 -15
@@ -349,19 +349,19 @@ EXPORT_SYMBOL(deactivate_super);* and want to turn it into a full-blown active reference. grab_super() * is called with sb_lock held and drops it. Returns 1 in case of * success, 0 if we had failed (superblock contents was already dead or -* dying when grab_super() had been called). +* dying when grab_super() had been called). Note that this is only +* called for superblocks not in rundown mode (== ones still on ->fs_supers +* of their type), so increment of ->s_count is OK here. */ static int grab_super (struct super_block *s)__releases (sb_lock) { -if (atomic_inc_not_zero (&s->s_active)) { -spin_unlock (&sb_lock); -return 1 ; - } -/* it's going away */ s->s_count++;spin_unlock (&sb_lock); -/* wait for it to die */ down_write (&s->s_umount); +if ((s->s_flags &MS_BORN ) &&atomic_inc_not_zero (&s->s_active)) { +put_super (s); +return 1 ; + }up_write (&s->s_umount);put_super (s);return 0 ;
@@ -493,11 +493,6 @@ retry:destroy_super (s); s =NULL ; } -down_write (&old->s_umount); -if (unlikely (!(old->s_flags &MS_BORN ))) { -deactivate_locked_super (old); - goto retry; - }return old; } }
@@ -691,10 +686,10 @@ restart:if (hlist_unhashed (&sb->s_instances))continue ;if (sb->s_bdev == bdev) { -if (grab_super (sb))/* drops sb_lock */ -return sb; -else +if (!grab_super (sb)) goto restart; +up_write (&sb->s_umount); +return sb; } }spin_unlock (&sb_lock);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 116/251 xen/evtchn: avoid a deadlock when unbinding an event channel
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: David Vrabel <[email protected]>
[ Upstream commit 179fbd5a45f0d4034cc6fd37b8d367a3b79663c4 ]
Unbinding an event channel (either with the ioctl or when the evtchn device is closed) may deadlock because disable_irq() is called with port_user_lock held which is also locked by the interrupt handler.
Think of the IOCTL_EVTCHN_UNBIND is being serviced, the routine has just taken the lock, and an interrupt happens. The evtchn_interrupt is invoked, tries to take the lock and spins forever.
A quick glance at the code shows that the spinlock is a local IRQ variant. Unfortunately that does not help as "disable_irq() waits for the interrupt handler on all CPUs to stop running. If the irq occurs on another VCPU, it tries to take port_user_lock and can't because the unbind ioctl is holding it." (from David). Hence we cannot depend on the said spinlock to protect us. We could make it a system wide IRQ disable spinlock but there is a better way.
We can piggyback on the fact that the existence of the spinlock is to make get_port_user() checks be up-to-date. And we can alter those checks to not depend on the spin lock (as it's protected by u->bind_mutex in the ioctl) and can remove the unnecessary locking (this is IOCTL_EVTCHN_UNBIND) path.
In the interrupt handler we cannot use the mutex, but we do not need it.
"The unbind disables the irq before making the port user stale, so when you clear it you are guaranteed that the interrupt handler that might use that port cannot be running." (from David).
Hence this patch removes the spinlock usage on the teardown path and piggybacks on disable_irq happening before we muck with the get_port_user() data. This ensures that the interrupt handler will never run on stale data.
--- drivers/xen/evtchn.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-)
drivers/xen/evtchn.c +2 -19
@@ -367,18 +367,12 @@ static long evtchn_ioctl(struct file *file,if (unbind.port >=NR_EVENT_CHANNELS )break ; -spin_lock_irq (&port_user_lock); - rc = -ENOTCONN ; -if (get_port_user (unbind.port) != u) { -spin_unlock_irq (&port_user_lock); +if (get_port_user (unbind.port) != u)break ; - }disable_irq (irq_from_evtchn (unbind.port)); -spin_unlock_irq (&port_user_lock); -evtchn_unbind_from_user (u, unbind.port); rc =0 ;
@@ -478,26 +472,15 @@ static int evtchn_release(struct inode *inode, struct file *filp)int i;struct per_user_data *u = filp->private_data; -spin_lock_irq (&port_user_lock); - -free_page ((unsigned long )u->ring); -for (i =0 ; i <NR_EVENT_CHANNELS ; i++) {if (get_port_user (i) != u)continue ;disable_irq (irq_from_evtchn (i)); - } - -spin_unlock_irq (&port_user_lock); - -for (i =0 ; i <NR_EVENT_CHANNELS ; i++) { -if (get_port_user (i) != u) -continue ; -evtchn_unbind_from_user (get_port_user (i), i); } +free_page ((unsigned long )u->ring);kfree (u->name);kfree (u);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 117/251 radeon kms: do not flush uninitialized hotplug work
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sergey Senozhatsky <[email protected]>
[ Upstream commit a01c34f72e7cd2624570818f579b5ab464f93de2 ]
Fix a warning from lockdep caused by calling flush_work() for uninitialized hotplug work. Initialize hotplug_work, audio_work and reset_work upon successful radeon_irq_kms_init() completion and thus perform hotplug flush_work only when rdev->irq.installed is true.
[ 4.790019] [drm] Loading CEDAR Microcode [ 4.790943] r600_cp: Failed to load firmware "radeon/CEDAR_smc.bin" [ 4.791152] [drm:evergreen_startup] *ERROR* Failed to load firmware! [ 4.791330] radeon 0000:01:00.0: disabling GPU acceleration
[ 4.792633] INFO: trying to register non-static key. [ 4.792792] the code is fine but needs lockdep annotation. [ 4.792953] turning off the locking correctness validator.
[ 4.793114] CPU: 2 PID: 1 Comm: swapper/0 Not tainted 3.11.0-rc0-dbg-10676-gfe56456-dirty #1816 [ 4.793314] Hardware name: Acer Aspire 5741G /Aspire 5741G , BIOS V1.20 02/08/2011 [ 4.793507] ffffffff821fd810 ffff8801530b9a18 ffffffff8160434e 0000000000000002 [ 4.794155] ffff8801530b9ad8 ffffffff810b8404 ffff8801530b0798 ffff8801530b0000 [ 4.794789] ffff8801530b9b00 0000000000000046 00000000000004c0 ffffffff00000000 [ 4.795418] Call Trace: [ 4.795573] [<ffffffff8160434e>] dump_stack+0x4e/0x82 [ 4.795731] [<ffffffff810b8404>] __lock_acquire+0x1a64/0x1d30 [ 4.795893] [<ffffffff814a87f0>] ? dev_vprintk_emit+0x50/0x60 [ 4.796034] [<ffffffff810b8fb4>] lock_acquire+0xa4/0x200 [ 4.796216] [<ffffffff8106cd75>] ? flush_work+0x5/0x280 [ 4.796375] [<ffffffff8106cdad>] flush_work+0x3d/0x280 [ 4.796520] [<ffffffff8106cd75>] ? flush_work+0x5/0x280 [ 4.796682] [<ffffffff810b659d>] ? trace_hardirqs_on_caller+0xfd/0x1c0 [ 4.796862] [<ffffffff8131d775>] ? delay_tsc+0x95/0xf0 [ 4.797024] [<ffffffff8141bb8b>] radeon_irq_kms_fini+0x2b/0x70 [ 4.797186] [<ffffffff814557c9>] evergreen_init+0x2a9/0x2e0 [ 4.797347] [<ffffffff813ebb1f>] radeon_device_init+0x5ef/0x700 [ 4.797511] [<ffffffff81335bc7>] ? pci_find_capability+0x47/0x50 [ 4.797672] [<ffffffff813edaed>] radeon_driver_load_kms+0x8d/0x150 [ 4.797843] [<ffffffff813ce426>] drm_get_pci_dev+0x166/0x280 [ 4.798007] [<ffffffff8116cff5>] ? kfree+0xf5/0x2e0 [ 4.798168] [<ffffffff813ea298>] ? radeon_pci_probe+0x98/0xd0 [ 4.798329] [<ffffffff813ea2aa>] radeon_pci_probe+0xaa/0xd0 [ 4.798489] [<ffffffff81339404>] pci_device_probe+0x84/0xe0 [ 4.798644] [<ffffffff814ac7d6>] driver_probe_device+0x76/0x240 [ 4.798805] [<ffffffff814aca73>] __driver_attach+0x93/0xa0 [ 4.798948] [<ffffffff814ac9e0>] ? __device_attach+0x40/0x40 [ 4.799126] [<ffffffff814aa82b>] bus_for_each_dev+0x6b/0xb0 [ 4.799272] [<ffffffff814ac2be>] driver_attach+0x1e/0x20 [ 4.799434] [<ffffffff814abec0>] bus_add_driver+0x1f0/0x280 [ 4.799596] [<ffffffff814ad0e4>] driver_register+0x74/0x150 [ 4.799758] [<ffffffff8133923d>] __pci_register_driver+0x5d/0x60 [ 4.799936] [<ffffffff81d16efc>] ? ttm_init+0x67/0x67 [ 4.800081] [<ffffffff813ce655>] drm_pci_init+0x115/0x130 [ 4.800243] [<ffffffff81d16efc>] ? ttm_init+0x67/0x67 [ 4.800405] [<ffffffff81d16f98>] radeon_init+0x9c/0xba [ 4.800586] [<ffffffff810002ca>] do_one_initcall+0xfa/0x150 [ 4.800746] [<ffffffff81073f60>] ? parse_args+0x120/0x330 [ 4.800909] [<ffffffff81cdafae>] kernel_init_freeable+0x111/0x191 [ 4.801052] [<ffffffff81cda87a>] ? do_early_param+0x88/0x88 [ 4.801233] [<ffffffff815fb670>] ? rest_init+0x140/0x140 [ 4.801393] [<ffffffff815fb67e>] kernel_init+0xe/0x180 [ 4.801556] [<ffffffff8160dcac>] ret_from_fork+0x7c/0xb0 [ 4.801718] [<ffffffff815fb670>] ? rest_init+0x140/0x140
--- drivers/gpu/drm/radeon/radeon_irq_kms.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/radeon_irq_kms.c +5 -4
@@ -243,9 +243,6 @@ int radeon_irq_kms_init(struct radeon_device *rdev) {int r =0 ; -INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); -INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); -spin_lock_init (&rdev->irq.lock); r =drm_vblank_init (rdev->ddev, rdev->num_crtc);if (r) {
@@ -267,6 +264,10 @@ int radeon_irq_kms_init(struct radeon_device *rdev) rdev->irq.installed = false;return r; } + +INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); +INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); +DRM_INFO ("radeon: irq initialized.\n" );return 0 ; }
@@ -286,8 +287,8 @@ void radeon_irq_kms_fini(struct radeon_device *rdev) rdev->irq.installed = false;if (rdev->msi_enabled)pci_disable_msi (rdev->pdev); +flush_work_sync (&rdev->hotplug_work); } -flush_work_sync (&rdev->hotplug_work); }/**
Signature · 1 line
1.7.10.4
Re: [117/251] radeon kms: do not flush uninitialized hotplug work
Quoted 3 lines · Steven Rostedt
3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
Hello,
Steven, this patch makes r100_irq_process() unhappy and there is additional fix on top of this patch.
upstream 27c505ca84e164ec66ad55dcf3f5befaac83f10a
I'll prepare a proper patch for stable.
-ss
Quoted 114 lines
------------------
From: Sergey Senozhatsky <[email protected]>
[ Upstream commit
a01c34f72e7cd2624570818f579b5ab464f93de2]Fix a warning from lockdep caused by calling
flush_work()for uninitialized hotplug work. Initializehotplug_work,audio_workandreset_workupon successfulradeon_irq_kms_init()completion and thus perform hotplugflush_workonly whenrdev->irq.installedis true.[ 4.790019] [drm] Loading CEDAR Microcode [ 4.790943] r600_cp: Failed to load firmware "radeon/CEDAR_smc.bin" [ 4.791152] [drm:evergreen_startup] *ERROR* Failed to load firmware! [ 4.791330] radeon 0000:01:00.0: disabling GPU acceleration[ 4.792633] INFO: trying to register non-static key. [ 4.792792] the code is fine but needs lockdep annotation. [ 4.792953] turning off the locking correctness validator.[ 4.793114] CPU: 2 PID: 1 Comm: swapper/0 Not tainted 3.11.0-rc0-dbg-10676-gfe56456-dirty #1816 [ 4.793314] Hardware name: Acer Aspire 5741G /Aspire 5741G , BIOS V1.20 02/08/2011 [ 4.793507] ffffffff821fd810 ffff8801530b9a18 ffffffff8160434e 0000000000000002 [ 4.794155] ffff8801530b9ad8 ffffffff810b8404 ffff8801530b0798 ffff8801530b0000 [ 4.794789] ffff8801530b9b00 0000000000000046 00000000000004c0 ffffffff00000000 [ 4.795418] Call Trace: [ 4.795573] [<ffffffff8160434e>] dump_stack+0x4e/0x82 [ 4.795731] [<ffffffff810b8404>] __lock_acquire+0x1a64/0x1d30 [ 4.795893] [<ffffffff814a87f0>] ? dev_vprintk_emit+0x50/0x60 [ 4.796034] [<ffffffff810b8fb4>] lock_acquire+0xa4/0x200 [ 4.796216] [<ffffffff8106cd75>] ? flush_work+0x5/0x280 [ 4.796375] [<ffffffff8106cdad>] flush_work+0x3d/0x280 [ 4.796520] [<ffffffff8106cd75>] ? flush_work+0x5/0x280 [ 4.796682] [<ffffffff810b659d>] ? trace_hardirqs_on_caller+0xfd/0x1c0 [ 4.796862] [<ffffffff8131d775>] ? delay_tsc+0x95/0xf0 [ 4.797024] [<ffffffff8141bb8b>] radeon_irq_kms_fini+0x2b/0x70 [ 4.797186] [<ffffffff814557c9>] evergreen_init+0x2a9/0x2e0 [ 4.797347] [<ffffffff813ebb1f>] radeon_device_init+0x5ef/0x700 [ 4.797511] [<ffffffff81335bc7>] ? pci_find_capability+0x47/0x50 [ 4.797672] [<ffffffff813edaed>] radeon_driver_load_kms+0x8d/0x150 [ 4.797843] [<ffffffff813ce426>] drm_get_pci_dev+0x166/0x280 [ 4.798007] [<ffffffff8116cff5>] ? kfree+0xf5/0x2e0 [ 4.798168] [<ffffffff813ea298>] ? radeon_pci_probe+0x98/0xd0 [ 4.798329] [<ffffffff813ea2aa>] radeon_pci_probe+0xaa/0xd0 [ 4.798489] [<ffffffff81339404>] pci_device_probe+0x84/0xe0 [ 4.798644] [<ffffffff814ac7d6>] driver_probe_device+0x76/0x240 [ 4.798805] [<ffffffff814aca73>] __driver_attach+0x93/0xa0 [ 4.798948] [<ffffffff814ac9e0>] ? __device_attach+0x40/0x40 [ 4.799126] [<ffffffff814aa82b>] bus_for_each_dev+0x6b/0xb0 [ 4.799272] [<ffffffff814ac2be>] driver_attach+0x1e/0x20 [ 4.799434] [<ffffffff814abec0>] bus_add_driver+0x1f0/0x280 [ 4.799596] [<ffffffff814ad0e4>] driver_register+0x74/0x150 [ 4.799758] [<ffffffff8133923d>] __pci_register_driver+0x5d/0x60 [ 4.799936] [<ffffffff81d16efc>] ? ttm_init+0x67/0x67 [ 4.800081] [<ffffffff813ce655>] drm_pci_init+0x115/0x130 [ 4.800243] [<ffffffff81d16efc>] ? ttm_init+0x67/0x67 [ 4.800405] [<ffffffff81d16f98>] radeon_init+0x9c/0xba [ 4.800586] [<ffffffff810002ca>] do_one_initcall+0xfa/0x150 [ 4.800746] [<ffffffff81073f60>] ? parse_args+0x120/0x330 [ 4.800909] [<ffffffff81cdafae>] kernel_init_freeable+0x111/0x191 [ 4.801052] [<ffffffff81cda87a>] ? do_early_param+0x88/0x88 [ 4.801233] [<ffffffff815fb670>] ? rest_init+0x140/0x140 [ 4.801393] [<ffffffff815fb67e>] kernel_init+0xe/0x180 [ 4.801556] [<ffffffff8160dcac>] ret_from_fork+0x7c/0xb0 [ 4.801718] [<ffffffff815fb670>] ? rest_init+0x140/0x140Signed-off-by Sergey Senozhatsky <[email protected]>Signed-off-by Alex Deucher <[email protected]>Signed-off-by Steven Rostedt <[email protected]>--- drivers/gpu/drm/radeon/radeon_irq_kms.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/gpu/drm/radeon/radeon_irq_kms.c +5
-4@@ -243,9 +243,6 @@ int radeon_irq_kms_init(struct radeon_device *rdev) {int r =0 ; -INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); -INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); -spin_lock_init (&rdev->irq.lock); r =drm_vblank_init (rdev->ddev, rdev->num_crtc);if (r) {@@ -267,6 +264,10 @@ int radeon_irq_kms_init(struct radeon_device *rdev) rdev->irq.installed = false;return r; } + +INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); +INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); +DRM_INFO ("radeon: irq initialized.\n" );return 0 ; }@@ -286,8 +287,8 @@ void radeon_irq_kms_fini(struct radeon_device *rdev) rdev->irq.installed = false;if (rdev->msi_enabled)pci_disable_msi (rdev->pdev); +flush_work_sync (&rdev->hotplug_work); } -flush_work_sync (&rdev->hotplug_work); }/** Signature · 1 line
1.7.10.4
Re: [117/251] radeon kms: do not flush uninitialized hotplug work
Quoted 9 lines · On Wed, 11 Sep 2013 12:06:49 +0300 Sergey Senozhatsky…
Quoted 3 lines · Steven Rostedt
3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.Hello,
Steven, this patch makesr100_irq_process()unhappy and there is additional fix on top of this patch.
upstream27c505ca84e164ec66ad55dcf3f5befaac83f10a
Thanks!
Quoted 3 lines
I'll prepare a proper patch for stable.
I took a crack at it. How's this look?
-- Steve
Quoted 1 line
From
39a678bf28d5c3e8266bd88ba1e831818102787eMon Sep 17 00:00:00 2001
From: Sergey Senozhatsky <[email protected]>
Date: Thu, 29 Aug 2013 12:29:35 +0300
Subject: [PATCH] radeon kms: fix uninitialised hotplug work usage in
r100_irq_process()
[ Upstream commit 27c505ca84e164ec66ad55dcf3f5befaac83f10a ]
Commit a01c34f72e7cd2624570818f579b5ab464f93de2 (radeon kms: do not flush uninitialized hotplug work) moved work initialisation phase to the last step of radeon_irq_kms_init(). Meelis Roos reported that this causes problems on his machine because drm_irq_install() uses hotplug work on r100.
hotplug work flushed in radeon_irq_kms_fini(), with two possible cases:
-- radeon_irq_kms_fini() call after successful radeon_irq_kms_init() -- radeon_irq_kms_fini() call after unsuccessful (or not called at all)
radeon_irq_kms_init()
The latter one causes flush work on uninitialised hotplug work. Move work initialisation before drm_irq_install(), but keep existing agreement to flush hotplug work in radeon_irq_kms_fini() only for `irq.installed' (successful radeon_irq_kms_init()) case.
WARNING: CPU: 0 PID: 243 at kernel/workqueue.c:1378 __queue_work+0x132/0x16d() Call Trace: [<c12319b3>] ? dump_stack+0xa/0x13 [<c1022600>] ? warn_slowpath_common+0x75/0x8a [<c1031010>] ? __queue_work+0x132/0x16d [<c1031010>] ? __queue_work+0x132/0x16d [<c102269e>] ? warn_slowpath_null+0x1b/0x1f [<c1031010>] ? __queue_work+0x132/0x16d [<c103107b>] ? queue_work_on+0x30/0x40 [<f8aed3f3>] ? r100_irq_process+0x16d/0x1e6 [radeon] [<f8ae77cf>] ? radeon_driver_irq_preinstall_kms+0xc2/0xc5 [radeon] [<f8974d77>] ? drm_irq_install+0xb2/0x1ac [drm] [<f897604d>] ? drm_vblank_init+0x196/0x1d2 [drm] [<f8ae78d3>] ? radeon_irq_kms_init+0x33/0xc6 [radeon] [<f8aef35a>] ? r100_startup+0x1a3/0x1d6 [radeon] [<f8ad77c8>] ? radeon_ttm_init+0x26e/0x287 [radeon] [<f8aef752>] ? r100_init+0x2b3/0x309 [radeon] [<c118082e>] ? vga_client_register+0x39/0x40 [<f8ac535f>] ? radeon_device_init+0x54b/0x61b [radeon] [<f8ac40fd>] ? cail_mc_write+0x13/0x13 [radeon] [<f8ac6864>] ? radeon_driver_load_kms+0x82/0xda [radeon] [<f8978bbd>] ? drm_get_pci_dev+0x136/0x22d [drm] [<f8ac409b>] ? radeon_pci_probe+0x6c/0x86 [radeon] [<c112acf6>] ? pci_device_probe+0x4c/0x83 [<c11846c7>] ? driver_probe_device+0x80/0x184 [<c112a848>] ? pci_match_id+0x18/0x36 [<c1184837>] ? __driver_attach+0x44/0x5f [<c11833f4>] ? bus_for_each_dev+0x50/0x5a [<c118433e>] ? driver_attach+0x14/0x16 [<c11847f3>] ? __device_attach+0x28/0x28 [<c1184045>] ? bus_add_driver+0xd6/0x1bf [<c1184c22>] ? driver_register+0x78/0xcf
[<f8ba8000>] ? 0xf8ba7fff
[<c10003bf>] ? do_one_initcall+0x8b/0x121
[<c101e668>] ? change_page_attr_clear+0x2e/0x33
[<f8ba8000>] ? 0xf8ba7fff
[<c101e689>] ? set_memory_ro+0x1c/0x20
[<c104de94>] ? set_page_attributes+0x11/0x12
[<c104f6e1>] ? load_module+0x12fa/0x17e8
[<c107483b>] ? map_vm_area+0x22/0x31
[<c104fc36>] ? SyS_init_module+0x67/0x7d
[<c1234245>] ? sysenter_do_call+0x12/0x26
--- drivers/gpu/drm/radeon/radeon_irq_kms.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/radeon_irq_kms.c +5 -3
@@ -258,16 +258,18 @@ int radeon_irq_kms_init(struct radeon_device *rdev)dev_info (rdev->dev,"radeon: using MSI.\n" ); } } + +INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); +INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); + rdev->irq.installed = true; r =drm_irq_install (rdev->ddev);if (r) { rdev->irq.installed = false; +flush_work (&rdev->hotplug_work);return r; } -INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); -INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); -DRM_INFO ("radeon: irq initialized.\n" );return 0 ; }
Signature · 1 line
1.7.10.4
Re: [117/251] radeon kms: do not flush uninitialized hotplug work
Quoted 5 lines · Steven Rostedt
Quoted 3 lines
I'll prepare a proper patch for stable.
I took a crack at it. How's this look?
as far as I understand this is 27c505ca84e164ec66ad55dcf3f5befaac83f10a on top of a01c34f72e7cd2624570818f579b5ab464f93de2 [both backported] with moved flush_work_sync() in radeon_irq_kms_fini() to rdev->irq.installed == true case (am I right?). if so, then looks good to me!
-ss
Quoted 108 lines
-- Steve
From
39a678bf28d5c3e8266bd88ba1e831818102787eMon Sep 17 00:00:00 2001
From: Sergey Senozhatsky <[email protected]>
Date: Thu, 29 Aug 2013 12:29:35 +0300
Subject: [PATCH] radeon kms: fix uninitialised hotplug work usage in
r100_irq_process()[ Upstream commit
27c505ca84e164ec66ad55dcf3f5befaac83f10a]Commit
a01c34f72e7cd2624570818f579b5ab464f93de2(radeon kms: do not flush uninitialized hotplug work) moved work initialisation phase to the last step ofradeon_irq_kms_init(). Meelis Roos reported that this causes problems on his machine becausedrm_irq_install()uses hotplug work on r100.hotplug work flushed in
radeon_irq_kms_fini(), with two possible cases:
--radeon_irq_kms_fini()call after successfulradeon_irq_kms_init()--radeon_irq_kms_fini()call after unsuccessful (or not called at all)
radeon_irq_kms_init()The latter one causes flush work on uninitialised hotplug work. Move work initialisation before
drm_irq_install(), but keep existing agreement to flush hotplug work inradeon_irq_kms_fini()only for `irq.installed' (successfulradeon_irq_kms_init()) case.WARNING: CPU: 0 PID: 243 at kernel/workqueue.c:1378 __queue_work+0x132/0x16d() Call Trace: [<c12319b3>] ? dump_stack+0xa/0x13 [<c1022600>] ? warn_slowpath_common+0x75/0x8a [<c1031010>] ? __queue_work+0x132/0x16d [<c1031010>] ? __queue_work+0x132/0x16d [<c102269e>] ? warn_slowpath_null+0x1b/0x1f [<c1031010>] ? __queue_work+0x132/0x16d [<c103107b>] ? queue_work_on+0x30/0x40 [<f8aed3f3>] ? r100_irq_process+0x16d/0x1e6 [radeon] [<f8ae77cf>] ? radeon_driver_irq_preinstall_kms+0xc2/0xc5 [radeon] [<f8974d77>] ? drm_irq_install+0xb2/0x1ac [drm] [<f897604d>] ? drm_vblank_init+0x196/0x1d2 [drm] [<f8ae78d3>] ? radeon_irq_kms_init+0x33/0xc6 [radeon] [<f8aef35a>] ? r100_startup+0x1a3/0x1d6 [radeon] [<f8ad77c8>] ? radeon_ttm_init+0x26e/0x287 [radeon] [<f8aef752>] ? r100_init+0x2b3/0x309 [radeon] [<c118082e>] ? vga_client_register+0x39/0x40 [<f8ac535f>] ? radeon_device_init+0x54b/0x61b [radeon] [<f8ac40fd>] ? cail_mc_write+0x13/0x13 [radeon] [<f8ac6864>] ? radeon_driver_load_kms+0x82/0xda [radeon] [<f8978bbd>] ? drm_get_pci_dev+0x136/0x22d [drm] [<f8ac409b>] ? radeon_pci_probe+0x6c/0x86 [radeon] [<c112acf6>] ? pci_device_probe+0x4c/0x83 [<c11846c7>] ? driver_probe_device+0x80/0x184 [<c112a848>] ? pci_match_id+0x18/0x36 [<c1184837>] ? __driver_attach+0x44/0x5f [<c11833f4>] ? bus_for_each_dev+0x50/0x5a [<c118433e>] ? driver_attach+0x14/0x16 [<c11847f3>] ? __device_attach+0x28/0x28 [<c1184045>] ? bus_add_driver+0xd6/0x1bf [<c1184c22>] ? driver_register+0x78/0xcf[<
f8ba8000>] ?0xf8ba7fff
[<c10003bf>] ?do_one_initcall+0x8b/0x121
[<c101e668>] ?change_page_attr_clear+0x2e/0x33
[<f8ba8000>] ?0xf8ba7fff
[<c101e689>] ?set_memory_ro+0x1c/0x20
[<c104de94>] ?set_page_attributes+0x11/0x12
[<c104f6e1>] ?load_module+0x12fa/0x17e8
[<c107483b>] ?map_vm_area+0x22/0x31
[<c104fc36>] ?SyS_init_module+0x67/0x7d
[<c1234245>] ?sysenter_do_call+0x12/0x26Reported-by Meelis Roos <[email protected]>Tested-by Meelis Roos <[email protected]>Signed-off-by Sergey Senozhatsky <[email protected]>Signed-off-by Alex Deucher <[email protected]>Signed-off-by Steven Rostedt <[email protected]>--- drivers/gpu/drm/radeon/radeon_irq_kms.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/radeon/radeon_irq_kms.c +5
-3@@ -258,16 +258,18 @@ int radeon_irq_kms_init(struct radeon_device *rdev)dev_info (rdev->dev,"radeon: using MSI.\n" ); } } + +INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); +INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); + rdev->irq.installed = true; r =drm_irq_install (rdev->ddev);if (r) { rdev->irq.installed = false; +flush_work (&rdev->hotplug_work);return r; } -INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); -INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); -DRM_INFO ("radeon: irq initialized.\n" );return 0 ; }Signature · 1 line
1.7.10.4
Sergey Senozhatsky
Tested-by Meelis RoosRe: [117/251] radeon kms: do not flush uninitialized hotplug work
In reply to Steven RostedtThis one on top of stable 3.6.11 git.
Thank you, Steven.
---
[ Upstream commit 27c505ca84e164ec66ad55dcf3f5befaac83f10a ]
Commit a01c34f72e7cd2624570818f579b5ab464f93de2 (radeon kms: do not flush uninitialized hotplug work) moved work initialisation phase to the last step of radeon_irq_kms_init(). Meelis Roos reported that this causes problems on his machine because drm_irq_install() uses hotplug work on r100.
hotplug work flushed in radeon_irq_kms_fini(), with two possible cases:
-- radeon_irq_kms_fini() call after successful radeon_irq_kms_init() -- radeon_irq_kms_fini() call after unsuccessful (or not called at all)
radeon_irq_kms_init()
The latter one causes flush work on uninitialised hotplug work. Move work initialisation before drm_irq_install(), but keep existing agreement to flush hotplug work in radeon_irq_kms_fini() only for `irq.installed' (successful radeon_irq_kms_init()) case.
WARNING: CPU: 0 PID: 243 at kernel/workqueue.c:1378 __queue_work+0x132/0x16d() Call Trace: [<c12319b3>] ? dump_stack+0xa/0x13 [<c1022600>] ? warn_slowpath_common+0x75/0x8a [<c1031010>] ? __queue_work+0x132/0x16d [<c1031010>] ? __queue_work+0x132/0x16d [<c102269e>] ? warn_slowpath_null+0x1b/0x1f [<c1031010>] ? __queue_work+0x132/0x16d [<c103107b>] ? queue_work_on+0x30/0x40 [<f8aed3f3>] ? r100_irq_process+0x16d/0x1e6 [radeon] [<f8ae77cf>] ? radeon_driver_irq_preinstall_kms+0xc2/0xc5 [radeon] [<f8974d77>] ? drm_irq_install+0xb2/0x1ac [drm] [<f897604d>] ? drm_vblank_init+0x196/0x1d2 [drm] [<f8ae78d3>] ? radeon_irq_kms_init+0x33/0xc6 [radeon] [<f8aef35a>] ? r100_startup+0x1a3/0x1d6 [radeon] [<f8ad77c8>] ? radeon_ttm_init+0x26e/0x287 [radeon] [<f8aef752>] ? r100_init+0x2b3/0x309 [radeon] [<c118082e>] ? vga_client_register+0x39/0x40 [<f8ac535f>] ? radeon_device_init+0x54b/0x61b [radeon] [<f8ac40fd>] ? cail_mc_write+0x13/0x13 [radeon] [<f8ac6864>] ? radeon_driver_load_kms+0x82/0xda [radeon] [<f8978bbd>] ? drm_get_pci_dev+0x136/0x22d [drm] [<f8ac409b>] ? radeon_pci_probe+0x6c/0x86 [radeon] [<c112acf6>] ? pci_device_probe+0x4c/0x83 [<c11846c7>] ? driver_probe_device+0x80/0x184 [<c112a848>] ? pci_match_id+0x18/0x36 [<c1184837>] ? __driver_attach+0x44/0x5f [<c11833f4>] ? bus_for_each_dev+0x50/0x5a [<c118433e>] ? driver_attach+0x14/0x16 [<c11847f3>] ? __device_attach+0x28/0x28 [<c1184045>] ? bus_add_driver+0xd6/0x1bf [<c1184c22>] ? driver_register+0x78/0xcf
[<f8ba8000>] ? 0xf8ba7fff
[<c10003bf>] ? do_one_initcall+0x8b/0x121
[<c101e668>] ? change_page_attr_clear+0x2e/0x33
[<f8ba8000>] ? 0xf8ba7fff
[<c101e689>] ? set_memory_ro+0x1c/0x20
[<c104de94>] ? set_page_attributes+0x11/0x12
[<c104f6e1>] ? load_module+0x12fa/0x17e8
[<c107483b>] ? map_vm_area+0x22/0x31
[<c104fc36>] ? SyS_init_module+0x67/0x7d
[<c1234245>] ? sysenter_do_call+0x12/0x26
---
drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/radeon_irq_kms.c +6 -4
@@ -243,9 +243,6 @@ int radeon_irq_kms_init(struct radeon_device *rdev) {int r =0 ; -INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); -INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); -spin_lock_init (&rdev->irq.lock); r =drm_vblank_init (rdev->ddev, rdev->num_crtc);if (r) {
@@ -261,10 +258,15 @@ int radeon_irq_kms_init(struct radeon_device *rdev)dev_info (rdev->dev,"radeon: using MSI.\n" ); } } + +INIT_WORK (&rdev->hotplug_work, radeon_hotplug_work_func); +INIT_WORK (&rdev->audio_work, r600_audio_update_hdmi); + rdev->irq.installed = true; r =drm_irq_install (rdev->ddev);if (r) { rdev->irq.installed = false; +flush_work (&rdev->hotplug_work);return r; }DRM_INFO ("radeon: irq initialized.\n" );
@@ -286,8 +288,8 @@ void radeon_irq_kms_fini(struct radeon_device *rdev) rdev->irq.installed = false;if (rdev->msi_enabled)pci_disable_msi (rdev->pdev); +flush_work_sync (&rdev->hotplug_work); } -flush_work_sync (&rdev->hotplug_work); }/**
Greg KH
maintainerRe: [117/251] radeon kms: do not flush uninitialized hotplug work
Quoted 1 line · Sergey Senozhatsky
This one on top of stable 3.6.11 git.
What do you mean by this?
confused,
greg k-h
Steven Rostedt
maintainerRe: [117/251] radeon kms: do not flush uninitialized hotplug work
Quoted 5 lines · On Wed, 11 Sep 2013 09:00:16 -0700 Greg KH <[email protected]> wrote:
Quoted 1 line · Sergey Senozhatsky
This one on top of stable 3.6.11 git.
What do you mean by this?
It's for my stable branch. Although, 3.6.11.8 is a far cry from 3.6.11 and the patch does not apply.
-- Steve
Re: [117/251] radeon kms: do not flush uninitialized hotplug work
Quoted 8 lines · Steven Rostedt
Quoted 5 lines · On Wed, 11 Sep 2013 09:00:16 -0700 Greg KH <[email protected]> wrote:
Quoted 1 line · Sergey Senozhatsky
This one on top of stable 3.6.11 git.
What do you mean by this?
I thought it was for linux-3.6.y stable branch. sorry, wrong assumption.
Quoted 4 lines
It's for my stable branch. Although, 3.6.11.8 is a far cry from 3.6.11 and the patch does not apply.
oh... so, we were not talking about linux-3.6.y branch fromgit://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git ?
a thousand apologies.
-ss
Steven Rostedt
maintainerRe: [117/251] radeon kms: do not flush uninitialized hotplug work
Quoted 14 lines · On Wed, 11 Sep 2013 21:48:39 +0300 Sergey Senozhatsky…
Quoted 8 lines · Steven Rostedt
Quoted 5 lines · On Wed, 11 Sep 2013 09:00:16 -0700 Greg KH <[email protected]> wrote:
Quoted 1 line · Sergey Senozhatsky
This one on top of stable 3.6.11 git.
What do you mean by this?
I thought it was for linux-3.6.y stable branch. sorry, wrong assumption.
Quoted 1 line
Quoted 9 lines
Quoted 3 lines
It's for my stable branch. Although, 3.6.11.8 is a far cry from 3.6.11 and the patch does not apply.
oh... so, we were not talking about linux-3.6.y branch from
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git?a thousand apologies.
Yeah, this is my extended stable, which is located in:
git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git
v3.6-stable
I base the stable 3.6-rt patches off of this.
-- Steve
Re: [117/251] radeon kms: do not flush uninitialized hotplug work
Quoted 21 lines · Steven Rostedt
Quoted 21 lines · Steven Rostedt
Quoted 8 lines
Quoted 5 lines · On Wed, 11 Sep 2013 09:00:16 -0700 Greg KH <[email protected]> wrote:
Quoted 1 line · Sergey Senozhatsky
This one on top of stable 3.6.11 git.
What do you mean by this?
I thought it was for linux-3.6.y stable branch. sorry, wrong assumption.
Quoted 4 lines
It's for my stable branch. Although, 3.6.11.8 is a far cry from 3.6.11 and the patch does not apply.
oh... so, we were not talking about linux-3.6.y branch from
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git?
Quoted 7 lines
Quoted 2 lines
a thousand apologies.
Yeah, this is my extended stable, which is located in:
git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git
v3.6-stable
Thanks.
Sure, I should have guessed :-) your patch looks good, sorry for inconvenience. have a nice day,
-ss
Quoted 5 lines
I base the stable 3.6-rt patches off of this.
-- Steve
Steven Rostedt
maintainerPATCH 118/251 x86: Fix /proc/mtrr with base/size more than 44bits
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Yinghai Lu <[email protected]>
[ Upstream commit d5c78673b1b28467354c2c30c3d4f003666ff385 ]
On one sytem that mtrr range is more then 44bits, in dmesg we have
[ 0.000000] MTRR default type: write-back [ 0.000000] MTRR fixed ranges enabled: [ 0.000000] 00000-9FFFF write-back [ 0.000000] A0000-BFFFF uncachable [ 0.000000] C0000-DFFFF write-through [ 0.000000] E0000-FFFFF write-protect [ 0.000000] MTRR variable ranges enabled: [ 0.000000] 0 [000080000000-0000FFFFFFFF] mask 3FFF80000000 uncachable [ 0.000000] 1 [380000000000-38FFFFFFFFFF] mask 3F0000000000 uncachable [ 0.000000] 2 [000099000000-000099FFFFFF] mask 3FFFFF000000 write-through [ 0.000000] 3 [00009A000000-00009AFFFFFF] mask 3FFFFF000000 write-through [ 0.000000] 4 [381FFA000000-381FFBFFFFFF] mask 3FFFFE000000 write-through [ 0.000000] 5 [381FFC000000-381FFC0FFFFF] mask 3FFFFFF00000 write-through [ 0.000000] 6 [0000AD000000-0000ADFFFFFF] mask 3FFFFF000000 write-through [ 0.000000] 7 [0000BD000000-0000BDFFFFFF] mask 3FFFFF000000 write-through [ 0.000000] 8 disabled [ 0.000000] 9 disabled
but /proc/mtrr report wrong:
reg00: base=0x080000000 ( 2048MB), size= 2048MB, count=1: uncachable
reg01: base=0x80000000000 (8388608MB), size=1048576MB, count=1: uncachable
reg02: base=0x099000000 ( 2448MB), size= 16MB, count=1: write-through
reg03: base=0x09a000000 ( 2464MB), size= 16MB, count=1: write-through
reg04: base=0x81ffa000000 (8519584MB), size= 32MB, count=1: write-through
reg05: base=0x81ffc000000 (8519616MB), size= 1MB, count=1: write-through
reg06: base=0x0ad000000 ( 2768MB), size= 16MB, count=1: write-through
reg07: base=0x0bd000000 ( 3024MB), size= 16MB, count=1: write-through
reg08: base=0x09b000000 ( 2480MB), size= 16MB, count=1: write-combining
so bit 44 and bit 45 get cut off.
We have problems in arch/x86/kernel/cpu/mtrr/generic.c::generic_get_mtrr().
1. for base, we miss cast base_lo to 64bit before shifting.
Fix that by adding u64 casting.
2. for size, it only can handle 44 bits aka 32bits + page_shift Fix that with 64bit mask instead of 32bit mask_lo, then range could be more than 44bits.
At the same time, we need to update size_or_mask for old cpus that does support cpuid 0x80000008 to get phys_addr. Need to set high 32bits to all 1s, otherwise will not get correct size for them.
Also fix mtrr_add_page: it should check base and (base + size - 1) instead of base and size, as base and size could be small but base + size could bigger enough to be out of boundary. We can use boot_cpu_data.x86_phys_bits directly to avoid size_or_mask.
So When are we going to have size more than 44bits? that is 16TiB.
after patch we have right ouput:
reg00: base=0x080000000 ( 2048MB), size= 2048MB, count=1: uncachable
reg01: base=0x380000000000 (58720256MB), size=1048576MB, count=1: uncachable
reg02: base=0x099000000 ( 2448MB), size= 16MB, count=1: write-through
reg03: base=0x09a000000 ( 2464MB), size= 16MB, count=1: write-through
reg04: base=0x381ffa000000 (58851232MB), size= 32MB, count=1: write-through
reg05: base=0x381ffc000000 (58851264MB), size= 1MB, count=1: write-through
reg06: base=0x0ad000000 ( 2768MB), size= 16MB, count=1: write-through
reg07: base=0x0bd000000 ( 3024MB), size= 16MB, count=1: write-through
reg08: base=0x09b000000 ( 2480MB), size= 16MB, count=1: write-combining
-v2: simply checking in mtrr_add_page according to hpa.
[ hpa: This probably wants to go into -stable only after having sat in
mainline for a bit. It is not a regression. ]
--- arch/x86/kernel/cpu/mtrr/generic.c | 21 +++++++++++---------- arch/x86/kernel/cpu/mtrr/main.c | 16 +++++++++------- 2 files changed, 20 insertions(+), 17 deletions(-)
arch/x86/kernel/cpu/mtrr/generic.c +11 -10
@@ -510,8 +510,9 @@ generic_get_free_region(unsigned long base, unsigned long size, int replace_reg)static void generic_get_mtrr (unsigned int reg,unsigned long *base,unsigned long *size,mtrr_type *type) { -unsigned int mask_lo, mask_hi, base_lo, base_hi; -unsigned int tmp, hi; +u32 mask_lo, mask_hi, base_lo, base_hi; +unsigned int hi; +u64 tmp, mask;/* * get_mtrr doesn't need to update mtrr_state, also it could be called
@@ -532,18 +533,18 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,rdmsr (MTRRphysBase_MSR (reg), base_lo, base_hi);/* Work out the shifted address mask: */ - tmp = mask_hi << (32 -PAGE_SHIFT ) | mask_lo >>PAGE_SHIFT ; - mask_lo = size_or_mask | tmp; + tmp = (u64 )mask_hi << (32 -PAGE_SHIFT ) | mask_lo >>PAGE_SHIFT ; + mask = size_or_mask | tmp;/* Expand tmp with high bits to all 1s: */ - hi =fls (tmp); + hi =fls64 (tmp);if (hi >0 ) { - tmp |= ~((1 <<(hi -1 )) -1 ); + tmp |= ~((1ULL <<(hi -1 )) -1 ); -if (tmp != mask_lo) { +if (tmp != mask) {printk (KERN_WARNING "mtrr: your BIOS has configured an incorrect mask, fixing it.\n" );add_taint (TAINT_FIRMWARE_WORKAROUND ); - mask_lo = tmp; + mask = tmp; } }
@@ -551,8 +552,8 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,* This works correctly if size is a power of two, i.e. a * contiguous range: */ - *size = -mask_lo; - *base = base_hi << (32 -PAGE_SHIFT ) | base_lo >>PAGE_SHIFT ; + *size = -mask; + *base = (u64 )base_hi << (32 -PAGE_SHIFT ) | base_lo >>PAGE_SHIFT ; *type = base_lo &0xff ; out_put_cpu:
arch/x86/kernel/cpu/mtrr/main.c +9 -7
@@ -305,7 +305,8 @@ int mtrr_add_page(unsigned long base, unsigned long size,return -EINVAL ; } -if (base & size_or_mask || size & size_or_mask) { +if ((base | (base + size -1 )) >> + (boot_cpu_data.x86_phys_bits -PAGE_SHIFT )) {pr_warning ("mtrr: base or size exceeds the MTRR width\n" );return -EINVAL ; }
@@ -583,6 +584,7 @@ static struct syscore_ops mtrr_syscore_ops = {int __initdata changed_by_mtrr_cleanup; +#define SIZE_OR_MASK_BITS (n) (~((1ULL << ((n) - PAGE_SHIFT)) - 1))/** * mtrr_bp_init - initialize mtrrs on the boot CPU *
@@ -600,7 +602,7 @@ void __init mtrr_bp_init(void)if (cpu_has_mtrr) { mtrr_if = &generic_mtrr_ops; - size_or_mask =0xff000000 ;/* 36 bits */ + size_or_mask =SIZE_OR_MASK_BITS (36 ); size_and_mask =0x00f00000 ; phys_addr =36 ;
@@ -619,7 +621,7 @@ void __init mtrr_bp_init(void) boot_cpu_data.x86_mask == 0x4)) phys_addr =36 ; - size_or_mask = ~((1ULL << (phys_addr -PAGE_SHIFT )) -1 ); + size_or_mask =SIZE_OR_MASK_BITS (phys_addr); size_and_mask = ~size_or_mask &0xfffff00000ULL ; }else if (boot_cpu_data.x86_vendor ==X86_VENDOR_CENTAUR && boot_cpu_data.x86 ==6 ) {
@@ -627,7 +629,7 @@ void __init mtrr_bp_init(void)* VIA C* family have Intel style MTRRs, * but don't support PAE */ - size_or_mask =0xfff00000 ;/* 32 bits */ + size_or_mask =SIZE_OR_MASK_BITS (32 ); size_and_mask =0 ; phys_addr =32 ; }
@@ -637,21 +639,21 @@ void __init mtrr_bp_init(void)if (cpu_has_k6_mtrr) {/* Pre-Athlon (K6) AMD CPU MTRRs */ mtrr_if = mtrr_ops[X86_VENDOR_AMD ]; - size_or_mask =0xfff00000 ;/* 32 bits */ + size_or_mask =SIZE_OR_MASK_BITS (32 ); size_and_mask =0 ; }break ;case X86_VENDOR_CENTAUR :if (cpu_has_centaur_mcr) { mtrr_if = mtrr_ops[X86_VENDOR_CENTAUR ]; - size_or_mask =0xfff00000 ;/* 32 bits */ + size_or_mask =SIZE_OR_MASK_BITS (32 ); size_and_mask =0 ; }break ;case X86_VENDOR_CYRIX :if (cpu_has_cyrix_arr) { mtrr_if = mtrr_ops[X86_VENDOR_CYRIX ]; - size_or_mask =0xfff00000 ;/* 32 bits */ + size_or_mask =SIZE_OR_MASK_BITS (32 ); size_and_mask =0 ; }break ;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 119/251 ARM: poison the vectors page
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
[ Upstream commit f928d4f2a86f46b030fa0850385b4391fc2b5918 ]
Fill the empty regions of the vectors page with an exception generating instruction. This ensures that any inappropriate branch to the vector page is appropriately trapped, rather than just encountering some code to execute. (The vectors page was filled with zero before, which corresponds with the "andeq r0, r0, r0" instruction - a no-op.)
Cc: <[email protected]>
Acked-by Nicolas Pitre <[email protected]>
--- arch/arm/kernel/traps.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/kernel/traps.c +10 -0
@@ -824,10 +824,20 @@ void __init early_trap_init(void *vectors_base)extern char __vectors_start[], __vectors_end[];extern char __kuser_helper_start[], __kuser_helper_end[];int kuser_sz = __kuser_helper_end - __kuser_helper_start; +unsigned i; vectors_page = vectors_base;/* +* Poison the vectors page with an undefined instruction. This +* instruction is chosen to be undefined for both ARM and Thumb +* ISAs. The Thumb version is an undefined instruction with a +* branch back to the undefined instruction. +*/ +for (i =0 ; i <PAGE_SIZE /sizeof (u32); i++) + ((u32 *)vectors_base)[i] =0xe7fddef1 ; + +/* * Copy the vectors, stubs and kuser helpers (in entry-armv.S) * into the vector page, mapped at 0xffff0000, and ensure these * are visible to the instruction stream.
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 120/251 ARM: poison memory between kuser helpers
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
[ Upstream commit 5b43e7a383d69381ffe53423e46dd0fafae07da3 ]
Poison the memory between each kuser helper. This ensures that any branch between the kuser helpers will be appropriately trapped.
--- arch/arm/kernel/entry-armv.S | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
arch/arm/kernel/entry-armv.S +16 -9
@@ -784,6 +784,17 @@ ENDPROC(__switch_to) #endif .endm + .macro kuser_pad, sym, size + .if (. - \sym) & 3 + .rept 4 - (. - \sym) & 3 + .byte 0 + .endr + .endif + .rept (\size - (. - \sym)) / 4 + .word 0xe7fddef1 + .endr + .endm + .align 5 .globl __kuser_helper_start __kuser_helper_start:
@@ -874,18 +885,13 @@ kuser_cmpxchg64_fixup: #error "incoherent kernel configuration" #endif - /* pad to next slot */ - .rept (16 - (. - __kuser_cmpxchg64)/4) - .word 0 - .endr - - .align 5 + kuser_pad __kuser_cmpxchg64, 64 __kuser_memory_barrier: @ 0xffff0fa0 smp_dmb arm usr_ret lr - .align 5 + kuser_pad __kuser_memory_barrier, 32 __kuser_cmpxchg: @ 0xffff0fc0
@@ -958,13 +964,14 @@ kuser_cmpxchg32_fixup: #endif - .align 5 + kuser_pad __kuser_cmpxchg, 32 __kuser_get_tls: @ 0xffff0fe0 ldr r0, [pc, #(16 - 8)] @ read TLS, set in kuser_get_tls_init usr_ret lr mrc p15, 0, r0, c13, c0, 3 @ 0xffff0fe8 hardware TLS code - .rep 4 + kuser_pad __kuser_get_tls, 16 + .rep 3 .word 0 @ 0xffff0ff0 software TLS value, then .endr @ pad up to __kuser_helper_version
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 121/251 ARM: move vector stubs
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
[ Upstream commit 19accfd373847ac3d10623c5d20f948846299741 ]
Move the machine vector stubs into the page above the vector page, which we can prevent from being visible to userspace. Also move the reset stub, and place the swi vector at a location that the 'ldr' can get to it.
This hides pointers into the kernel which could give valuable information to attackers, and reduces the number of exploitable instructions at a fixed address.
--- arch/arm/Kconfig | 3 ++- arch/arm/kernel/entry-armv.S | 50 ++++++++++++++++++++---------------------- arch/arm/kernel/traps.c | 4 ++-- arch/arm/mm/mmu.c | 10 ++++++++- 4 files changed, 37 insertions(+), 30 deletions(-)
arch/arm/Kconfig +2 -1
@@ -183,7 +183,8 @@ config VECTORS_BASE default DRAM_BASE if REMAP_VECTORS_TO_RAM default 0x00000000 help - The base address of exception vectors. + The base address of exception vectors. This must be two pages + in size. config ARM_PATCH_PHYS_VIRT bool "Patch physical to virtual translations at runtime" if EMBEDDED
arch/arm/kernel/entry-armv.S +24 -26
80 lines not on this page · raw message
arch/arm/kernel/traps.c +2 -2
@@ -843,7 +843,7 @@ void __init early_trap_init(void *vectors_base)* are visible to the instruction stream. */ memcpy ((void *)vectors, __vectors_start, __vectors_end - __vectors_start); -memcpy ((void *)vectors +0x200 , __stubs_start, __stubs_end - __stubs_start); +memcpy ((void *)vectors +0x1000 , __stubs_start, __stubs_end - __stubs_start);memcpy ((void *)vectors +0x1000 - kuser_sz, __kuser_helper_start, kuser_sz);/*
@@ -858,6 +858,6 @@ void __init early_trap_init(void *vectors_base)memcpy ((void *)(vectors +KERN_SIGRETURN_CODE -CONFIG_VECTORS_BASE ), sigreturn_codes,sizeof (sigreturn_codes)); -flush_icache_range (vectors, vectors +PAGE_SIZE ); +flush_icache_range (vectors, vectors +PAGE_SIZE *2 );modify_domain (DOMAIN_USER ,DOMAIN_CLIENT ); }
arch/arm/mm/mmu.c +9 -1
@@ -1080,7 +1080,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc)/* * Allocate the vector page early. */ - vectors =early_alloc (PAGE_SIZE ); + vectors =early_alloc (PAGE_SIZE *2 );early_trap_init (vectors);
@@ -1130,10 +1130,18 @@ static void __init devicemaps_init(struct machine_desc *mdesc)if (!vectors_high ()) { map.virtual =0 ; + map.length =PAGE_SIZE *2 ; map.type =MT_LOW_VECTORS ;create_mapping (&map); } +/* Now create a kernel read-only mapping */ + map.pfn +=1 ; + map.virtual =0xffff0000 +PAGE_SIZE ; + map.length =PAGE_SIZE ; + map.type =MT_LOW_VECTORS ; +create_mapping (&map); +/* * Ask the machine support to map in the statically mapped devices. */
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 122/251 ARM: use linker magic for vectors and vector stubs
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
[ Upstream commit b9b32bf70f2fb710b07c94e13afbc729afe221da ]
Use linker magic to create the vectors and vector stubs: we can tell the linker to place them at an appropriate VMA, but keep the LMA within the kernel. This gets rid of some unnecessary symbol manipulation, and have the linker calculate the relocations appropriately.
--- arch/arm/kernel/entry-armv.S | 28 ++++++++++------------------ arch/arm/kernel/vmlinux.lds.S | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 18 deletions(-)
arch/arm/kernel/entry-armv.S +10 -18
@@ -1035,7 +1035,7 @@ ENDPROC(vector_\name) 1: .endm - .globl __stubs_start + .section .stubs, "ax", %progbits __stubs_start: @ This must be the first word .word vector_swi
@@ -1162,24 +1162,16 @@ vector_addrexcptn: vector_fiq: subs pc, lr, #4 - .globl __stubs_end -__stubs_end: - - .equ stubs_offset, __vectors_start + 0x1000 - __stubs_start - - .globl __vectors_start + .section .vectors, "ax", %progbits __vectors_start: - W(b) vector_rst + stubs_offset - W(b) vector_und + stubs_offset - W(ldr) pc, .LCvswi + stubs_offset - W(b) vector_pabt + stubs_offset - W(b) vector_dabt + stubs_offset - W(b) vector_addrexcptn + stubs_offset - W(b) vector_irq + stubs_offset - W(b) vector_fiq + stubs_offset - - .globl __vectors_end -__vectors_end: + W(b) vector_rst + W(b) vector_und + W(ldr) pc, __vectors_start + 0x1000 + W(b) vector_pabt + W(b) vector_dabt + W(b) vector_addrexcptn + W(b) vector_irq + W(b) vector_fiq .data
arch/arm/kernel/vmlinux.lds.S +17 -0
@@ -137,6 +137,23 @@ SECTIONS . = ALIGN(PAGE_SIZE); __init_begin = .; #endif + /* + * The vectors and stubs are relocatable code, and the + * only thing that matters is their relative offsets + */ + __vectors_start = .; + .vectors 0 : AT(__vectors_start) { + *(.vectors) + } + . = __vectors_start + SIZEOF(.vectors); + __vectors_end = .; + + __stubs_start = .; + .stubs 0x1000 : AT(__stubs_start) { + *(.stubs) + } + . = __stubs_start + SIZEOF(.stubs); + __stubs_end = .; INIT_TEXT_SECTION(8) .exit.text : {
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 123/251 ARM: update FIQ support for relocation of vectors
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
[ Upstream commit e39e3f3ebfef03450cf7bfa7a974a8c61f7980c8 ]
FIQ should no longer copy the FIQ code into the user visible vector page. Instead, it should use the hidden page. This change makes that happen.
--- arch/arm/kernel/entry-armv.S | 3 +++ arch/arm/kernel/fiq.c | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-)
arch/arm/kernel/entry-armv.S +3 -0
@@ -1162,6 +1162,9 @@ vector_addrexcptn: vector_fiq: subs pc, lr, #4 + .globl vector_fiq_offset + .equ vector_fiq_offset, vector_fiq + .section .vectors, "ax", %progbits __vectors_start: W(b) vector_rst
arch/arm/kernel/fiq.c +14 -5
@@ -47,6 +47,11 @@#include <asm/irq.h> #include <asm/traps.h> +#define FIQ_OFFSET ({ \ + extern void *vector_fiq_offset; \ + (unsigned)&vector_fiq_offset; \ + }) +static unsigned long no_fiq_insn;/* Default reacquire function
@@ -80,13 +85,16 @@ int show_fiq_list(struct seq_file *p, int prec)void set_fiq_handler (void *start,unsigned int length) {#if defined(CONFIG_CPU_USE_DOMAINS ) -memcpy ((void *)0xffff001c , start, length); +void *base = (void *)0xffff0000 ;#else -memcpy (vectors_page +0x1c , start, length); +void *base = vectors_page;#endif -flush_icache_range (0xffff001c ,0xffff001c + length); +unsigned offset =FIQ_OFFSET ; + +memcpy (base + offset, start, length); +flush_icache_range (0xffff0000 + offset,0xffff0000 + offset + length);if (!vectors_high ()) -flush_icache_range (0x1c ,0x1c + length); +flush_icache_range (offset, offset + length); }int claim_fiq (struct fiq_handler *f)
@@ -144,6 +152,7 @@ EXPORT_SYMBOL(disable_fiq);void __init init_FIQ (int start) { - no_fiq_insn = *(unsigned long *)0xffff001c ; +unsigned offset =FIQ_OFFSET ; + no_fiq_insn = *(unsigned long *)(0xffff0000 + offset); fiq_start = start; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 124/251 ARM: allow kuser helpers to be removed from the vector page
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
[ Upstream commit f6f91b0d9fd971c630cef908dde8fe8795aefbf8 ]
Provide a kernel configuration option to allow the kernel user helpers to be removed from the vector page, thereby preventing their use with ROP (return orientated programming) attacks. This option is only visible for CPU architectures which natively support all the operations which kernel user helpers would normally provide, and must be enabled with caution.
--- arch/arm/kernel/entry-armv.S | 3 +++ arch/arm/kernel/traps.c | 23 ++++++++++++++--------- arch/arm/mm/Kconfig | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 9 deletions(-)
arch/arm/kernel/entry-armv.S +3 -0
@@ -795,6 +795,7 @@ ENDPROC(__switch_to) .endr .endm +#ifdef CONFIG_KUSER_HELPERS .align 5 .globl __kuser_helper_start __kuser_helper_start:
@@ -981,6 +982,8 @@ __kuser_helper_version: @ 0xffff0ffc .globl __kuser_helper_end __kuser_helper_end: +#endif + THUMB( .thumb ) /*
arch/arm/kernel/traps.c +14 -9
@@ -807,23 +807,32 @@ void __init trap_init(void)return ; } -static void __init kuser_get_tls_init (unsigned long vectors) +#ifdef CONFIG_KUSER_HELPERS +static void __init kuser_init (void *vectors) { +extern char __kuser_helper_start[], __kuser_helper_end[]; +int kuser_sz = __kuser_helper_end - __kuser_helper_start; + +memcpy (vectors +0x1000 - kuser_sz, __kuser_helper_start, kuser_sz); +/* * vectors + 0xfe0 = __kuser_get_tls * vectors + 0xfe8 = hardware TLS instruction at 0xffff0fe8 */ if (tls_emu || has_tls_reg) -memcpy ((void *)vectors +0xfe0 , (void *)vectors +0xfe8 ,4 ); +memcpy (vectors +0xfe0 , vectors +0xfe8 ,4 ); +} +#else +static void __init kuser_init (void *vectors) +{ } +#endif void __init early_trap_init (void *vectors_base) {unsigned long vectors = (unsigned long )vectors_base;extern char __stubs_start[], __stubs_end[];extern char __vectors_start[], __vectors_end[]; -extern char __kuser_helper_start[], __kuser_helper_end[]; -int kuser_sz = __kuser_helper_end - __kuser_helper_start;unsigned i; vectors_page = vectors_base;
@@ -844,12 +853,8 @@ void __init early_trap_init(void *vectors_base)*/ memcpy ((void *)vectors, __vectors_start, __vectors_end - __vectors_start);memcpy ((void *)vectors +0x1000 , __stubs_start, __stubs_end - __stubs_start); -memcpy ((void *)vectors +0x1000 - kuser_sz, __kuser_helper_start, kuser_sz); -/* -* Do processor specific fixups for the kuser helpers -*/ -kuser_get_tls_init (vectors); +kuser_init (vectors_base);/* * Copy signal return handlers into the vector page, and
arch/arm/mm/Kconfig +34 -0
@@ -400,24 +400,28 @@ config CPU_32v3 select TLS_REG_EMUL if SMP || !MMU select NEEDS_SYSCALL_FOR_CMPXCHG if SMP select CPU_USE_DOMAINS if MMU + select NEED_KUSER_HELPERS config CPU_32v4 bool select TLS_REG_EMUL if SMP || !MMU select NEEDS_SYSCALL_FOR_CMPXCHG if SMP select CPU_USE_DOMAINS if MMU + select NEED_KUSER_HELPERS config CPU_32v4T bool select TLS_REG_EMUL if SMP || !MMU select NEEDS_SYSCALL_FOR_CMPXCHG if SMP select CPU_USE_DOMAINS if MMU + select NEED_KUSER_HELPERS config CPU_32v5 bool select TLS_REG_EMUL if SMP || !MMU select NEEDS_SYSCALL_FOR_CMPXCHG if SMP select CPU_USE_DOMAINS if MMU + select NEED_KUSER_HELPERS config CPU_32v6 bool
@@ -735,6 +739,7 @@ config CPU_BPREDICT_DISABLE config TLS_REG_EMUL bool + select NEED_KUSER_HELPERS help An SMP system using a pre-ARMv6 processor (there are apparently a few prototypes like that in existence) and therefore access to
@@ -742,11 +747,40 @@ config TLS_REG_EMUL config NEEDS_SYSCALL_FOR_CMPXCHG bool + select NEED_KUSER_HELPERS help SMP on a pre-ARMv6 processor? Well OK then. Forget about fast user space cmpxchg support. It is just not possible. +config NEED_KUSER_HELPERS + bool + +config KUSER_HELPERS + bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS + default y + help + Warning: disabling this option may break user programs. + + Provide kuser helpers in the vector page. The kernel provides + helper code to userspace in read only form at a fixed location + in the high vector page to allow userspace to be independent of + the CPU type fitted to the system. This permits binaries to be + run on ARMv4 through to ARMv7 without modification. + + However, the fixed address nature of these helpers can be used + by ROP (return orientated programming) authors when creating + exploits. + + If all of the binaries and libraries which run on your platform + are built specifically for your platform, and make no use of + these helpers, then you can turn this option off. However, + when such an binary or library is run, it will receive a SIGILL + signal, which will terminate the program. + + Say N here only if you are absolutely certain that you do not + need these helpers; otherwise, the safe option is to say Y. + config DMA_CACHE_RWFO bool "Enable read/write for ownership DMA cache maintenance" depends on CPU_V6K && SMP
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 125/251 ARM: make vectors page inaccessible from userspace
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Russell King <[email protected]>
[ Upstream commit a5463cd3435475386cbbe7b06e01292ac169d36f ]
If kuser helpers are not provided by the kernel, disable user access to the vectors page. With the kuser helpers gone, there is no reason for this page to be visible to userspace.
--- arch/arm/include/asm/page.h | 2 ++ arch/arm/kernel/process.c | 7 ++++++- arch/arm/mm/mmu.c | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-)
arch/arm/include/asm/page.h +2 -0
@@ -142,7 +142,9 @@ extern void __cpu_copy_user_highpage(struct page *to, struct page *from,#define clear_page (page) memset((void *)(page), 0, PAGE_SIZE)extern void copy_page (void *to,const void *from); +#ifdef CONFIG_KUSER_HELPERS #define __HAVE_ARCH_GATE_AREA 1 +#endif #ifdef CONFIG_ARM_LPAE #include <asm/pgtable-3level-types.h>
arch/arm/kernel/process.c +6 -1
@@ -508,6 +508,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) }#ifdef CONFIG_MMU +#ifdef CONFIG_KUSER_HELPERS /* * The vectors page is always readable from user space for the * atomic helpers and the signal restart code. Insert it into the
@@ -540,9 +541,13 @@ int in_gate_area_no_mm(unsigned long addr) {return in_gate_area (NULL , addr); } +#define is_gate_vma (vma) ((vma) = &gate_vma) +#else +#define is_gate_vma (vma) 0 +#endif const char *arch_vma_name (struct vm_area_struct *vma) { -return (vma == &gate_vma) ?"[vectors]" :NULL ; +return is_gate_vma (vma) ?"[vectors]" :NULL ; }#endif
arch/arm/mm/mmu.c +4 -0
@@ -1125,7 +1125,11 @@ static void __init devicemaps_init(struct machine_desc *mdesc) map.pfn =__phys_to_pfn (virt_to_phys (vectors)); map.virtual =0xffff0000 ; map.length =PAGE_SIZE ; +#ifdef CONFIG_KUSER_HELPERS map.type =MT_HIGH_VECTORS ; +#else + map.type =MT_LOW_VECTORS ; +#endif create_mapping (&map);if (!vectors_high ()) {
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 126/251 powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Aaro Koskinen <[email protected]>
[ Upstream commit fe956a1d4081ce1a959f87df397a15e252201f10 ]
slots-fan on G5 Xserve is always running at full speed with windfarm_rm31 driver, resulting in a very high acoustic noise level. It seems the fan parameters are incorrect, and have been copied from the Drive Bay fan (RPM, not present on rm31) of the legacy therm_pm72 driver. This patch changes the parameters to match the Slots fan (PWM) of therm_pm72. With the patch, slots-fan speed drops from 99% to 19% during normal use, and slots-temp settle to ~42'C.
--- drivers/macintosh/windfarm_rm31.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/macintosh/windfarm_rm31.c +9 -9
@@ -439,15 +439,15 @@ static void backside_setup_pid(void)/* Slots fan */ static const struct wf_pid_param slots_param = { - .interval =5 , - .history_len =2 , - .gd =30 <<20 , - .gp =5 <<20 , - .gr =0 , - .itarget =40 <<16 , - .additive =1 , - .min =300 , - .max =4000 , + .interval =1 , + .history_len =20 , + .gd =0 , + .gp =0 , + .gr =0x00100000 , + .itarget =3200000 , + .additive =0 , + .min =20 , + .max =100 , };static void slots_fan_tick (void )
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 127/251 ARM: 7790/1: Fix deferred mm switch on VIVT processors
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Catalin Marinas <[email protected]>
[ Upstream commit bdae73cd374e28db544fdd9b77de689a36e3c129 ]
As of commit b9d4d42ad9 (ARM: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW on pre-ARMv6 CPUs), the mm switching on VIVT processors is done in the finish_arch_post_lock_switch() function to avoid whole cache flushing with interrupts disabled. The need for deferred mm switch is stored as a thread flag (TIF_SWITCH_MM). However, with preemption enabled, we can have another thread switch before finish_arch_post_lock_switch(). If the new thread has the same mm as the previous 'next' thread, the scheduler will not call switch_mm() and the TIF_SWITCH_MM flag won't be set for the new thread.
This patch moves the switch pending flag to the mm_context_t structure since this is specific to the mm rather than thread.
--- arch/arm/include/asm/mmu.h | 2 ++ arch/arm/include/asm/mmu_context.h | 20 ++++++++++++++++---- arch/arm/include/asm/thread_info.h | 1 - 3 files changed, 18 insertions(+), 5 deletions(-)
arch/arm/include/asm/mmu.h +2 -0
@@ -7,6 +7,8 @@ typedef struct {#ifdef CONFIG_CPU_HAS_ASID unsigned int id;raw_spinlock_t id_lock; +#else +int switch_pending;#endif unsigned int kvm_seq; } mm_context_t;
arch/arm/include/asm/mmu_context.h +16 -4
@@ -121,7 +121,7 @@ static inline void check_and_switch_context(struct mm_struct *mm,* on non-ASID CPUs, the old mm will remain valid until the * finish_arch_post_lock_switch() call. */ -set_ti_thread_flag (task_thread_info (tsk),TIF_SWITCH_MM ); + mm->context.switch_pending =1 ; else cpu_switch_mm(mm->pgd, mm); }
@@ -130,9 +130,21 @@ static inline void check_and_switch_context(struct mm_struct *mm,finish_arch_post_lock_switch static inline void finish_arch_post_lock_switch(void) { -if (test_and_clear_thread_flag (TIF_SWITCH_MM )) { -struct mm_struct *mm = current->mm; -cpu_switch_mm (mm->pgd, mm); +struct mm_struct *mm = current->mm; + +if (mm && mm->context.switch_pending) { +/* +* Preemption must be disabled during cpu_switch_mm() as we +* have some stateful cache flush implementations. Check +* switch_pending again in case we were preempted and the +* switch to this mm was already done. +*/ +preempt_disable (); +if (mm->context.switch_pending) { + mm->context.switch_pending =0 ; +cpu_switch_mm (mm->pgd, mm); + } +preempt_enable_no_resched (); } }
arch/arm/include/asm/thread_info.h +0 -1
@@ -153,7 +153,6 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,#define TIF_MEMDIE 18/* is terminating due to OOM killer */ #define TIF_RESTORE_SIGMASK 20#define TIF_SECCOMP 21 -#define TIF_SWITCH_MM 22/* deferred switch_mm */ #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 128/251 ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Vinod Koul <[email protected]>
[ Upstream commit a8d30608eaed6cc759b8e2e8a8bbbb42591f797f ]
the return value of SNDRV_COMPRESS_VERSION always return default -ENOTTY as the return value was never updated for this call
assign return value from put_user()
--- sound/core/compress_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/compress_offload.c +1 -1
@@ -582,7 +582,7 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg)mutex_lock (&stream->device->lock);switch (_IOC_NR (cmd)) {case _IOC_NR (SNDRV_COMPRESS_IOCTL_VERSION ): -put_user (SNDRV_COMPRESS_VERSION , + retval =put_user (SNDRV_COMPRESS_VERSION , (int __user *)arg) ? -EFAULT :0 ;break ;case _IOC_NR (SNDRV_COMPRESS_GET_CAPS ):
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 129/251 serial/mxs-auart: fix race condition in interrupt handler
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]>
[ Upstream commit d970d7fe65adff5efe75b4a73c4ffc9be57089f7 ]
The handler needs to ack the pending events before actually handling them. Otherwise a new event might come in after it it considered non-pending or handled and is acked then without being handled. So this event is only noticed when the next interrupt happens.
Without this patch an i.MX28 based machine running an rt-patched kernel regularly hangs during boot.
--- drivers/tty/serial/mxs-auart.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/tty/serial/mxs-auart.c +9 -8
@@ -381,11 +381,18 @@ static void mxs_auart_settermios(struct uart_port *u,static irqreturn_t mxs_auart_irq_handle (int irq,void *context) { -u32 istatus, istat; +u32 istat;struct mxs_auart_port *s = context;u32 stat =readl (s->port.membase +AUART_STAT ); - istatus = istat =readl (s->port.membase +AUART_INTR ); + istat =readl (s->port.membase +AUART_INTR ); + +/* ack irq */ +writel (istat & (AUART_INTR_RTIS + |AUART_INTR_TXIS + |AUART_INTR_RXIS + |AUART_INTR_CTSMIS ), + s->port.membase +AUART_INTR_CLR );if (istat &AUART_INTR_CTSMIS ) {uart_handle_cts_change (&s->port, stat &AUART_STAT_CTS );
@@ -404,12 +411,6 @@ static irqreturn_t mxs_auart_irq_handle(int irq, void *context) istat &= ~AUART_INTR_TXIS ; } -writel (istatus & (AUART_INTR_RTIS - |AUART_INTR_TXIS - |AUART_INTR_RXIS - |AUART_INTR_CTSMIS ), - s->port.membase +AUART_INTR_CLR ); -return IRQ_HANDLED ; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 130/251 serial/mxs-auart: increase time to wait for transmitter to become idle
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]>
[ Upstream commit 079a036f4283e2b0e5c26080b8c5112bc0cc1831 ]
Without this patch the driver waits ~1 ms for the UART to become idle. At 115200n8 this time is (theoretically) enough to transfer 11.5 characters (= 115200 bits/s / (10 Bits/char) * 1ms). As the mxs-auart has a fifo size of 16 characters the clock is gated too early. The problem is worse for lower baud rates.
This only happens to really shut down the transmitter in the middle of a transfer if /dev/ttyAPPx isn't opened in userspace (e.g. by a getty) but was at least once (because the bootloader doesn't disable the transmitter).
So increase the timeout to 20 ms which should be enough for 9600n8, too. Moreover skip gating the clock if the timeout is elapsed.
--- drivers/tty/serial/mxs-auart.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/tty/serial/mxs-auart.c +13 -8
@@ -550,7 +550,7 @@ auart_console_write(struct console *co, const char *str, unsigned int count)struct mxs_auart_port *s;struct uart_port *port;unsigned int old_ctrl0, old_ctrl2; -unsigned int to =1000 ; +unsigned int to =20000 ;if (co->index >MXS_AUART_PORTS || co->index <0 )return ;
@@ -571,18 +571,23 @@ auart_console_write(struct console *co, const char *str, unsigned int count)uart_console_write (port, str, count, mxs_auart_console_putchar); -/* -* Finally, wait for transmitter to become empty -* and restore the TCR -*/ +/* Finally, wait for transmitter to become empty ... */ while (readl (port->membase +AUART_STAT ) &AUART_STAT_BUSY ) { +udelay (1 );if (!to--)break ; -udelay (1 ); } -writel (old_ctrl0, port->membase +AUART_CTRL0 ); -writel (old_ctrl2, port->membase +AUART_CTRL2 ); +/* +* ... and restore the TCR if we waited long enough for the transmitter +* to be idle. This might keep the transmitter enabled although it is +* unused, but that is better than to disable it while it is still +* transmitting. +*/ +if (!(readl (port->membase +AUART_STAT ) &AUART_STAT_BUSY )) { +writel (old_ctrl0, port->membase +AUART_CTRL0 ); +writel (old_ctrl2, port->membase +AUART_CTRL2 ); + }clk_disable (s->clk); }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 131/251 USB: mos7840: fix race in register handling
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit d8a083cc746664916d9d36ed9e4d08a29525f245 ]
Fix race in mos7840_get_reg which unconditionally manipulated the control urb (which may already be in use) by adding a control-urb busy flag.
--- drivers/usb/serial/mos7840.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/usb/serial/mos7840.c +16 -2
@@ -187,6 +187,10 @@#define LED_ON_MS 500#define LED_OFF_MS 500 +enum mos7840_flag { +MOS7840_FLAG_CTRL_BUSY , +}; +static int device_type;static const struct usb_device_id id_table[] = {
@@ -247,6 +251,8 @@ struct moschip_port {bool led_flag;struct timer_list led_timer1;/* Timer for LED on */ struct timer_list led_timer2;/* Timer for LED off */ + +unsigned long flags; };static bool debug;
@@ -507,11 +513,11 @@ static void mos7840_control_callback(struct urb *urb)/* this urb is terminated, clean up */ dbg ("%s - urb shutting down with status: %d" , __func__, status); -return ; + goto out;default :dbg ("%s - nonzero urb status received: %d" , __func__, status); -return ; + goto out; }dbg ("%s urb buffer size is %d" , __func__, urb->actual_length);
@@ -524,6 +530,8 @@ static void mos7840_control_callback(struct urb *urb)mos7840_handle_new_msr (mos7840_port, regval); else if (mos7840_port->MsrLsr == 1) mos7840_handle_new_lsr(mos7840_port, regval); +out: +clear_bit_unlock (MOS7840_FLAG_CTRL_BUSY , &mos7840_port->flags); } static int mos7840_get_reg(struct moschip_port *mcs, __u16 Wval, __u16 reg,
@@ -534,6 +542,9 @@ static int mos7840_get_reg(struct moschip_port *mcs, __u16 Wval, __u16 reg,unsigned char *buffer = mcs->ctrl_buf;int ret; +if (test_and_set_bit_lock (MOS7840_FLAG_CTRL_BUSY , &mcs->flags)) +return -EBUSY ; + dr->bRequestType =MCS_RD_RTYPE ; dr->bRequest =MCS_RDREQ ; dr->wValue =cpu_to_le16 (Wval);/* 0 */
@@ -545,6 +556,9 @@ static int mos7840_get_reg(struct moschip_port *mcs, __u16 Wval, __u16 reg, mos7840_control_callback, mcs); mcs->control_urb->transfer_buffer_length =2 ; ret =usb_submit_urb (mcs->control_urb,GFP_ATOMIC ); +if (ret) +clear_bit_unlock (MOS7840_FLAG_CTRL_BUSY , &mcs->flags); +return ret; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 132/251 USB: mos7840: fix device-type detection
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 40c24f2893ba0ba7df485871f6aac0c197ceef5b ]
Fix race in device-type detection introduced by commit 0eafe4de ("USB:
serial: mos7840: add support for MCS7810 devices") which used a static variable to hold the device type.
Move type detection to probe and use serial data to store the device type.
--- drivers/usb/serial/mos7840.c | 75 ++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 40 deletions(-)
drivers/usb/serial/mos7840.c +35 -40
@@ -191,8 +191,6 @@ enum mos7840_flag { MOS7840_FLAG_CTRL_BUSY, }; -static int device_type; -static const struct usb_device_id id_table[] = { {USB_DEVICE (USB_VENDOR_ID_MOSCHIP ,MOSCHIP_DEVICE_ID_7840 )}, {USB_DEVICE (USB_VENDOR_ID_MOSCHIP ,MOSCHIP_DEVICE_ID_7820 )},
@@ -893,18 +891,6 @@ static void mos7840_bulk_out_data_callback(struct urb *urb)/************************************************************************/ /* D R I V E R T T Y I N T E R F A C E F U N C T I O N S */ /************************************************************************/ -#ifdef MCSSerialProbe -static int mos7840_serial_probe (struct usb_serial *serial, -const struct usb_device_id *id) -{ - -/*need to implement the mode_reg reading and updating\ -structures usb_serial_ device_type\ -(i.e num_ports, num_bulkin,bulkout etc) */ -/* Also we can update the changes attach */ -return 1 ; -} -#endif /***************************************************************************** * mos7840_open
@@ -2415,38 +2401,48 @@ static int mos7810_check(struct usb_serial *serial)return 0 ; } -static int mos7840_calc_num_ports (struct usb_serial *serial) +static int mos7840_probe (struct usb_serial *serial, +const struct usb_device_id *id) { -__u16 data =0x00 ; +u16 product = serial->dev->descriptor.idProduct;u8 *buf; -int mos7840_num_ports; +int device_type; + +if (product ==MOSCHIP_DEVICE_ID_7810 || + product ==MOSCHIP_DEVICE_ID_7820 ) { + device_type = product; + goto out; + } buf =kzalloc (VENDOR_READ_LENGTH ,GFP_KERNEL ); -if (buf) { -usb_control_msg (serial->dev,usb_rcvctrlpipe (serial->dev,0 ), +if (!buf) +return -ENOMEM ; + +usb_control_msg (serial->dev,usb_rcvctrlpipe (serial->dev,0 ),MCS_RDREQ ,MCS_RD_RTYPE ,0 ,GPIO_REGISTER , buf,VENDOR_READ_LENGTH ,MOS_WDR_TIMEOUT ); - data = *buf; -kfree (buf); - } -if (serial->dev->descriptor.idProduct ==MOSCHIP_DEVICE_ID_7810 || - serial->dev->descriptor.idProduct ==MOSCHIP_DEVICE_ID_7820 ) { - device_type = serial->dev->descriptor.idProduct; - }else { -/* For a MCS7840 device GPIO0 must be set to 1 */ -if ((data &0x01 ) ==1 ) - device_type =MOSCHIP_DEVICE_ID_7840 ; -else if (mos7810_check (serial)) - device_type =MOSCHIP_DEVICE_ID_7810 ; -else - device_type =MOSCHIP_DEVICE_ID_7820 ; - } +/* For a MCS7840 device GPIO0 must be set to 1 */ +if (buf[0 ] &0x01 ) + device_type =MOSCHIP_DEVICE_ID_7840 ; +else if (mos7810_check (serial)) + device_type =MOSCHIP_DEVICE_ID_7810 ; +else + device_type =MOSCHIP_DEVICE_ID_7820 ; + +kfree (buf); +out: +usb_set_serial_data (serial, (void *)device_type); + +return 0 ; +} + +static int mos7840_calc_num_ports (struct usb_serial *serial) +{ +int device_type = (int )usb_get_serial_data (serial); +int mos7840_num_ports; mos7840_num_ports = (device_type >>4 ) &0x000F ; - serial->num_bulk_in = mos7840_num_ports; - serial->num_bulk_out = mos7840_num_ports; - serial->num_ports = mos7840_num_ports;return mos7840_num_ports; }
@@ -2454,6 +2450,7 @@ static int mos7840_calc_num_ports(struct usb_serial *serial)static int mos7840_port_probe (struct usb_serial_port *port) {struct usb_serial *serial = port->serial; +int device_type = (int )usb_get_serial_data (serial);struct moschip_port *mos7840_port;int status;int pnum;
@@ -2744,9 +2741,7 @@ static struct usb_serial_driver moschip7840_4port_device = { .throttle = mos7840_throttle, .unthrottle = mos7840_unthrottle, .calc_num_ports = mos7840_calc_num_ports, -#ifdef MCSSerialProbe - .probe = mos7840_serial_probe, -#endif + .probe = mos7840_probe, .ioctl = mos7840_ioctl, .set_termios = mos7840_set_termios, .break_ctl = mos7840_break,
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 133/251 USB: mos7840: fix race in led handling
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 05cf0dec5ccc696a7636c84b265b477173498156 ]
Fix race in LED handling introduced by commit 0eafe4de ("USB: serial:
mos7840: add support for MCS7810 devices") which reused the port control urb for manipulating the LED without making sure that the urb is not already in use. This could lead to the control urb being manipulated while in flight.
Fix by adding a dedicated LED urb and ctrlrequest along with a LED-busy flag to handle concurrency.
--- drivers/usb/serial/mos7840.c | 59 ++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 22 deletions(-)
drivers/usb/serial/mos7840.c +37 -22
@@ -189,6 +189,7 @@enum mos7840_flag {MOS7840_FLAG_CTRL_BUSY , +MOS7840_FLAG_LED_BUSY , };static const struct usb_device_id id_table[] = {
@@ -246,9 +247,10 @@ struct moschip_port {/* For device(s) with LED indicator */ bool has_led; -bool led_flag;struct timer_list led_timer1;/* Timer for LED on */ struct timer_list led_timer2;/* Timer for LED off */ +struct urb *led_urb; +struct usb_ctrlrequest *led_dr;unsigned long flags; };
@@ -583,7 +585,7 @@ static void mos7840_set_led_async(struct moschip_port *mcs, __u16 wval, __u16 reg) {struct usb_device *dev = mcs->port->serial->dev; -struct usb_ctrlrequest *dr = mcs->dr; +struct usb_ctrlrequest *dr = mcs->led_dr; dr->bRequestType =MCS_WR_RTYPE ; dr->bRequest =MCS_WRREQ ;
@@ -591,10 +593,10 @@ static void mos7840_set_led_async(struct moschip_port *mcs, __u16 wval, dr->wIndex =cpu_to_le16 (reg); dr->wLength =cpu_to_le16 (0 ); -usb_fill_control_urb (mcs->control_urb, dev,usb_sndctrlpipe (dev,0 ), +usb_fill_control_urb (mcs->led_urb, dev,usb_sndctrlpipe (dev,0 ), (unsigned char *)dr,NULL ,0 , mos7840_set_led_callback,NULL ); -usb_submit_urb (mcs->control_urb,GFP_ATOMIC ); +usb_submit_urb (mcs->led_urb,GFP_ATOMIC ); } static void mos7840_set_led_sync(struct usb_serial_port *port, __u16 reg,
@@ -620,7 +622,19 @@ static void mos7840_led_flag_off(unsigned long arg) {struct moschip_port *mcs = (struct moschip_port *) arg; - mcs->led_flag = false; +clear_bit_unlock (MOS7840_FLAG_LED_BUSY , &mcs->flags); +} + +static void mos7840_led_activity (struct usb_serial_port *port) +{ +struct moschip_port *mos7840_port =usb_get_serial_port_data (port); + +if (test_and_set_bit_lock (MOS7840_FLAG_LED_BUSY , &mos7840_port->flags)) +return ; + +mos7840_set_led_async (mos7840_port,0x0301 ,MODEM_CONTROL_REGISTER ); +mod_timer (&mos7840_port->led_timer1, + jiffies +msecs_to_jiffies (LED_ON_MS )); }/*****************************************************************************
@@ -830,14 +844,8 @@ static void mos7840_bulk_in_callback(struct urb *urb)return ; } -/* Turn on LED */ -if (mos7840_port->has_led && !mos7840_port->led_flag) { - mos7840_port->led_flag = true; -mos7840_set_led_async (mos7840_port,0x0301 , -MODEM_CONTROL_REGISTER ); -mod_timer (&mos7840_port->led_timer1, - jiffies +msecs_to_jiffies (LED_ON_MS )); - } +if (mos7840_port->has_led) +mos7840_led_activity (port); mos7840_port->read_urb_busy = true; retval =usb_submit_urb (mos7840_port->read_urb,GFP_ATOMIC );
@@ -1576,13 +1584,8 @@ static int mos7840_write(struct tty_struct *tty, struct usb_serial_port *port, data1 = urb->transfer_buffer;dbg ("bulkout endpoint is %d" , port->bulk_out_endpointAddress); -/* Turn on LED */ -if (mos7840_port->has_led && !mos7840_port->led_flag) { - mos7840_port->led_flag = true; -mos7840_set_led_sync (port,MODEM_CONTROL_REGISTER ,0x0301 ); -mod_timer (&mos7840_port->led_timer1, - jiffies +msecs_to_jiffies (LED_ON_MS )); - } +if (mos7840_port->has_led) +mos7840_led_activity (port);/* send it down the pipe */ status =usb_submit_urb (urb,GFP_ATOMIC );
@@ -2653,6 +2656,14 @@ static int mos7840_port_probe(struct usb_serial_port *port)if (device_type ==MOSCHIP_DEVICE_ID_7810 ) { mos7840_port->has_led = true; + mos7840_port->led_urb =usb_alloc_urb (0 ,GFP_KERNEL ); + mos7840_port->led_dr =kmalloc (sizeof (*mos7840_port->led_dr), +GFP_KERNEL ); +if (!mos7840_port->led_urb || !mos7840_port->led_dr) { + status = -ENOMEM ; + goto error; + } +init_timer (&mos7840_port->led_timer1); mos7840_port->led_timer1.function = mos7840_led_off; mos7840_port->led_timer1.expires =
@@ -2668,8 +2679,6 @@ static int mos7840_port_probe(struct usb_serial_port *port) mos7840_port->led_timer2.data = (unsigned long )mos7840_port; - mos7840_port->led_flag = false; -/* Turn off LED */ mos7840_set_led_sync (port,MODEM_CONTROL_REGISTER ,0x0300 );
@@ -2695,6 +2704,8 @@ static int mos7840_port_probe(struct usb_serial_port *port) }return 0 ; error: +kfree (mos7840_port->led_dr); +usb_free_urb (mos7840_port->led_urb);kfree (mos7840_port->dr);kfree (mos7840_port->ctrl_buf);usb_free_urb (mos7840_port->control_urb);
@@ -2715,6 +2726,10 @@ static int mos7840_port_remove(struct usb_serial_port *port)del_timer_sync (&mos7840_port->led_timer1);del_timer_sync (&mos7840_port->led_timer2); + +usb_kill_urb (mos7840_port->led_urb); +usb_free_urb (mos7840_port->led_urb); +kfree (mos7840_port->led_dr); }usb_kill_urb (mos7840_port->control_urb);usb_free_urb (mos7840_port->control_urb);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 134/251 USB: mos7840: fix pointer casts
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 683a0e4d7971c3186dc4d429027debfe309129aa ]
Silence compiler warnings on 64-bit systems introduced by commit 05cf0dec ("USB: mos7840: fix race in led handling") which uses the usb-serial data pointer to temporarily store the device type during probe but failed to add the required casts.
[gregkh - change uintptr_t to unsigned long]
--- drivers/usb/serial/mos7840.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/serial/mos7840.c +3 -3
@@ -2435,14 +2435,14 @@ static int mos7840_probe(struct usb_serial *serial,kfree (buf); out: -usb_set_serial_data (serial, (void *)device_type); +usb_set_serial_data (serial, (void *)(unsigned long )device_type);return 0 ; }static int mos7840_calc_num_ports (struct usb_serial *serial) { -int device_type = (int )usb_get_serial_data (serial); +int device_type = (unsigned long )usb_get_serial_data (serial);int mos7840_num_ports; mos7840_num_ports = (device_type >>4 ) &0x000F ;
@@ -2453,7 +2453,7 @@ static int mos7840_calc_num_ports(struct usb_serial *serial)static int mos7840_port_probe (struct usb_serial_port *port) {struct usb_serial *serial = port->serial; -int device_type = (int )usb_get_serial_data (serial); +int device_type = (unsigned long )usb_get_serial_data (serial);struct moschip_port *mos7840_port;int status;int pnum;
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 135/251 iwlwifi: add DELL SKU for 5150 HMC
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Emmanuel Grumbach <[email protected]>
[ Upstream commit a1923f1d4723e5757cefdd60f7c7ab30e472007a ]
This SKU was missing in the list of supported devices
https://bugzilla.kernel.org/show_bug.cgi?id=60577
--- drivers/net/wireless/iwlwifi/pcie/drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/iwlwifi/pcie/drv.c +1 -0
@@ -132,6 +132,7 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { {IWL_PCI_DEVICE(0x423C, 0x1306, iwl5150_abg_cfg)}, /* Half Mini Card */ {IWL_PCI_DEVICE(0x423C, 0x1221, iwl5150_agn_cfg)}, /* Mini Card */ {IWL_PCI_DEVICE(0x423C, 0x1321, iwl5150_agn_cfg)}, /* Half Mini Card */ + {IWL_PCI_DEVICE(0x423C, 0x1326, iwl5150_abg_cfg)}, /* Half Mini Card */ {IWL_PCI_DEVICE(0x423D, 0x1211, iwl5150_agn_cfg)}, /* Mini Card */ {IWL_PCI_DEVICE(0x423D, 0x1311, iwl5150_agn_cfg)}, /* Half Mini Card */
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 136/251 ath9k_htc: do some initial hardware configuration
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
[ Upstream commit dc2a87f519a4d8cb376ab54f22b6b98a943b51ce ]
Currently we configure harwdare and clock, only after interface start. In this case, if we reload module or reboot PC without configuring adapter, firmware will freeze. There is no software way to reset adpter.
This patch add initial configuration and set it in disabled state, to avoid this freeze. Behaviour of this patch should be similar to: ifconfig wlan0 up; ifconfig wlan0 down.
--- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath9k/htc_drv_init.c +1 -0
@@ -824,6 +824,7 @@ static int ath9k_init_device(struct ath9k_htc_priv *priv,if (error !=0 ) goto err_rx; +ath9k_hw_disable (priv->ah);#ifdef CONFIG_MAC80211_LEDS /* must be initialized before ieee80211_register_hw */ priv->led_cdev.default_trigger = ieee80211_create_tpt_led_trigger(priv->hw,
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 137/251 nl80211: fix mgmt tx status and testmode reporting for netns
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Michal Kazior <[email protected]>
[ Upstream commit a0ec570f4f69c4cb700d743a915096c2c8f56a99 ]
These two events were sent to the default network namespace.
This caused AP mode in a non-default netns to not work correctly. Mgmt tx status was multicasted to a different (default) netns instead of the one the AP was in.
--- net/wireless/nl80211.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/wireless/nl80211.c +5 -2
@@ -5542,12 +5542,14 @@ EXPORT_SYMBOL(cfg80211_testmode_alloc_event_skb);void cfg80211_testmode_event (struct sk_buff *skb,gfp_t gfp) { +struct cfg80211_registered_device *rdev = ((void **)skb->cb)[0 ];void *hdr = ((void **)skb->cb)[1 ];struct nlattr *data = ((void **)skb->cb)[2 ];nla_nest_end (skb, data);genlmsg_end (skb, hdr); -genlmsg_multicast (skb,0 , nl80211_testmode_mcgrp.id, gfp); +genlmsg_multicast_netns (wiphy_net (&rdev->wiphy), skb,0 , + nl80211_testmode_mcgrp.id, gfp); }EXPORT_SYMBOL (cfg80211_testmode_event);#endif
@@ -8378,7 +8380,8 @@ void nl80211_send_mgmt_tx_status(struct cfg80211_registered_device *rdev,genlmsg_end (msg, hdr); -genlmsg_multicast (msg,0 , nl80211_mlme_mcgrp.id, gfp); +genlmsg_multicast_netns (wiphy_net (&rdev->wiphy), msg,0 , + nl80211_mlme_mcgrp.id, gfp);return ; nla_put_failure:
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 138/251 mac80211: fix duplicate retransmission detection
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 6b0f32745dcfba01d7be33acd1b40306c7a914c6 ]
The duplicate retransmission detection code in mac80211 erroneously attempts to do the check for every frame, even frames that don't have a sequence control field or that don't use it (QoS-Null frames.)
This is problematic because it causes the code to access data beyond the end of the SKB and depending on the data there will drop packets erroneously.
Correct the code to not do duplicate detection for such frames.
I found this error while testing AP powersave, it lead to retransmitted PS-Poll frames being dropped entirely as the data beyond the end of the SKB was always zero.
--- net/mac80211/rx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/mac80211/rx.c +8 -2
@@ -805,8 +805,14 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx)struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;struct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (rx->skb); -/* Drop duplicate 802.11 retransmissions (IEEE 802.11 Chap. 9.2.9) */ -if (rx->sta && !is_multicast_ether_addr (hdr->addr1)) { +/* +* Drop duplicate 802.11 retransmissions +* (IEEE 802.11-2012: 9.3.2.10 "Duplicate detection and recovery") +*/ +if (rx->skb->len >=24 && rx->sta && + !ieee80211_is_ctl (hdr->frame_control) && + !ieee80211_is_qos_nullfunc (hdr->frame_control) && + !is_multicast_ether_addr (hdr->addr1)) {if (unlikely (ieee80211_has_retry (hdr->frame_control) && rx->sta->last_seq_ctrl[rx->seqno_idx] == hdr->seq_ctrl)) {
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 139/251 mac80211: fix ethtool stats for non-station interfaces
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit e13bae4f807401729b3f27c7e882a96b8b292809 ]
As reported in https://bugzilla.kernel.org/show_bug.cgi?id=60514,
the station loop never initialises 'sinfo' and therefore adds up a stack values, leaking stack information (the number of times it adds values is easily obtained another way.)
Fix this by initialising the sinfo for each station to add.
--- net/mac80211/cfg.c | 2 ++ 1 file changed, 2 insertions(+)
net/mac80211/cfg.c +2 -0
@@ -554,6 +554,8 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy,if (sta->sdata->dev != dev)continue ; + sinfo.filled =0 ; +sta_set_sinfo (sta, &sinfo); i =0 ;ADD_STA_STATS (sta); }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 140/251 ixgbe: Fix Tx Hang issue with lldpad on 82598EB
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jacob Keller <[email protected]>
[ Upstream commit 1eb9ac14c34a948bf1538bfb9034e8ab29099a64 ]
This patch fixes an issue with the 82598EB device, where lldpad is causing Tx Hangs on the card as soon as it attempts to configure DCB for the device. The adapter will continually Tx hang and reset in a loop.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c +1 -2
@@ -108,9 +108,8 @@ s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,/* Enable arbiter */ reg &= ~IXGBE_DPMCS_ARBDIS ; -/* Enable DFP and Recycle mode */ - reg |= (IXGBE_DPMCS_TDPAC |IXGBE_DPMCS_TRM ); reg |=IXGBE_DPMCS_TSOEF ; +/* Configure Max TSO packet size 34KB including payload and headers */ reg |= (0x4 <<IXGBE_DPMCS_MTSOS_SHIFT );
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 141/251 Bluetooth: ath3k: dont use stack memory for DMA
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
[ Upstream commit 517828a87994f41af6ae5a0f96f0f069f05baa81 ]
Memory allocated by vmalloc (including stack) can not be used for DMA, i.e. data pointer on usb_control_msg() should not point to stack memory.
Resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=977558
--- drivers/bluetooth/ath3k.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-)
drivers/bluetooth/ath3k.c +29 -9
@@ -176,24 +176,44 @@ error:static int ath3k_get_state (struct usb_device *udev,unsigned char *state) { -int pipe =0 ; +int ret, pipe =0 ; +char *buf; + + buf =kmalloc (sizeof (*buf),GFP_KERNEL ); +if (!buf) +return -ENOMEM ; pipe =usb_rcvctrlpipe (udev,0 ); -return usb_control_msg (udev, pipe,ATH3K_GETSTATE , -USB_TYPE_VENDOR |USB_DIR_IN ,0 ,0 , - state,0x01 ,USB_CTRL_SET_TIMEOUT ); + ret =usb_control_msg (udev, pipe,ATH3K_GETSTATE , +USB_TYPE_VENDOR |USB_DIR_IN ,0 ,0 , + buf,sizeof (*buf),USB_CTRL_SET_TIMEOUT ); + + *state = *buf; +kfree (buf); + +return ret; }static int ath3k_get_version (struct usb_device *udev,struct ath3k_version *version) { -int pipe =0 ; +int ret, pipe =0 ; +struct ath3k_version *buf; +const int size =sizeof (*buf); + + buf =kmalloc (size,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; pipe =usb_rcvctrlpipe (udev,0 ); -return usb_control_msg (udev, pipe,ATH3K_GETVERSION , -USB_TYPE_VENDOR |USB_DIR_IN ,0 ,0 , version, -sizeof (struct ath3k_version ), -USB_CTRL_SET_TIMEOUT ); + ret =usb_control_msg (udev, pipe,ATH3K_GETVERSION , +USB_TYPE_VENDOR |USB_DIR_IN ,0 ,0 , + buf, size,USB_CTRL_SET_TIMEOUT ); + +memcpy (version, buf, size); +kfree (buf); + +return ret; } static int ath3k_load_fwfile(struct usb_device *udev,
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 142/251 Bluetooth: Add support for Mediatek Bluetooth device [0e8d:763f]
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Cho, Yu-Chen" <[email protected]>
[ Upstream commit 178c059e7640aa8e50213400c6f3dde00189d979 ]
This patch adds support for Mediatek Bluetooth device
T: Bus=02 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 2 Spd=480 MxCh= 0 D: Ver= 2.01 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0e8d ProdID=763f Rev= 1.00 S: Manufacturer=MediaTek S: Product=BT S: SerialNumber=1.0 C:* #Ifs= 2 Cfg#= 1 Atr=a0 MxPwr=450mA A: FirstIf#= 0 IfCount= 2 Cls=ff(vend.) Sub=ff Prot=ff I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=125us E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=125us E: Ad=82(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=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms I: If#= 1 Alt= 6 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms
--- drivers/bluetooth/btusb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bluetooth/btusb.c +3 -0
@@ -55,6 +55,9 @@ static struct usb_device_id btusb_table[] = {/* Apple-specific (Broadcom) devices */ { USB_VENDOR_AND_INTERFACE_INFO(0x05ac, 0xff, 0x01, 0x01) }, +/* MediaTek MT76x0E */ + { USB_DEVICE(0x0e8d, 0x763f) }, +/* Broadcom SoftSailing reporting vendor specific */ { USB_DEVICE(0x0a5c, 0x21e1) },
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 143/251 rt2x00: fix stop queue
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
[ Upstream commit e2288b66fe7ff0288382b2af671b4da558b44472 ]
Since we clear QUEUE_STARTED in rt2x00queue_stop_queue(), following call to rt2x00queue_pause_queue() reduce to noop, i.e we do not stop queue in mac80211.
To fix that introduce rt2x00queue_pause_queue_nocheck() function, which will stop queue in mac80211 directly.
Note that rt2x00_start_queue() explicitly set QUEUE_PAUSED bit.
Note also that reordering operations i.e. first call to rt2x00queue_pause_queue() and then clear QUEUE_STARTED bit, will race with rt2x00queue_unpause_queue(), so calling ieee80211_stop_queue() directly is the only available solution to fix the problem without major rework.
--- drivers/net/wireless/rt2x00/rt2x00queue.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/net/wireless/rt2x00/rt2x00queue.c +11 -7
@@ -875,13 +875,8 @@ void rt2x00queue_index_inc(struct queue_entry *entry, enum queue_index index)spin_unlock_irqrestore (&queue->index_lock, irqflags); } -void rt2x00queue_pause_queue (struct data_queue *queue) +void rt2x00queue_pause_queue_nocheck (struct data_queue *queue) { -if (!test_bit (DEVICE_STATE_PRESENT , &queue->rt2x00dev->flags) || - !test_bit (QUEUE_STARTED , &queue->flags) || -test_and_set_bit (QUEUE_PAUSED , &queue->flags)) -return ; -switch (queue->qid) {case QID_AC_VO :case QID_AC_VI :
@@ -897,6 +892,15 @@ void rt2x00queue_pause_queue(struct data_queue *queue)break ; } } +void rt2x00queue_pause_queue (struct data_queue *queue) +{ +if (!test_bit (DEVICE_STATE_PRESENT , &queue->rt2x00dev->flags) || + !test_bit (QUEUE_STARTED , &queue->flags) || +test_and_set_bit (QUEUE_PAUSED , &queue->flags)) +return ; + +rt2x00queue_pause_queue_nocheck (queue); +}EXPORT_SYMBOL_GPL (rt2x00queue_pause_queue);void rt2x00queue_unpause_queue (struct data_queue *queue)
@@ -958,7 +962,7 @@ void rt2x00queue_stop_queue(struct data_queue *queue)return ; } -rt2x00queue_pause_queue (queue); +rt2x00queue_pause_queue_nocheck (queue); queue->rt2x00dev->ops->lib->stop_queue (queue);
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 144/251 mwifiex: Add missing endian conversion.
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <[email protected]>
[ Upstream commit 83e612f632c3897be29ef02e0472f6d63e258378 ]
Both type and pkt_len variables are in host endian and these should be in Little Endian in the payload.
--- drivers/net/wireless/mwifiex/sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mwifiex/sdio.c +2 -2
@@ -1455,8 +1455,8 @@ static int mwifiex_sdio_host_to_card(struct mwifiex_adapter *adapter,/* Allocate buffer and copy payload */ blk_size =MWIFIEX_SDIO_BLOCK_SIZE ; buf_block_len = (pkt_len + blk_size -1 ) / blk_size; - *(u16 *) &payload[0 ] = (u16 ) pkt_len; - *(u16 *) &payload[2 ] = type; + *(__le16 *)&payload[0 ] =cpu_to_le16 ((u16 )pkt_len); + *(__le16 *)&payload[2 ] =cpu_to_le16 (type);/* * This is SDIO specific header
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 145/251 zram: avoid invalid memory access in zram_exit()
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jiang Liu <[email protected]>
[ Upstream commit 6030ea9b35971a4200062f010341ab832e878ac9 ]
Memory for zram->disk object may have already been freed after returning from destroy_device(zram), then it's unsafe for zram_reset_device(zram) to access zram->disk again.
We can't solve this bug by flipping the order of destroy_device(zram) and zram_reset_device(zram), that will cause deadlock issues to the zram sysfs handler.
So fix it by holding an extra reference to zram->disk before calling destroy_device(zram).
--- drivers/staging/zram/zram_drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/zram/zram_drv.c +2 -0
@@ -771,9 +771,11 @@ static void __exit zram_exit(void)for (i =0 ; i < num_devices; i++) { zram = &zram_devices[i]; +get_disk (zram->disk);destroy_device (zram);if (zram->init_done)zram_reset_device (zram); +put_disk (zram->disk); }unregister_blkdev (zram_major,"zram" );
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 146/251 zram: use zram->lock to protect zram_free_page() in swap free notify path
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jiang Liu <[email protected]>
[ Upstream commit 57ab048532c0d975538cebd4456491b5c34248f4 ]
zram_slot_free_notify() is free-running without any protection from concurrent operations. So there are race conditions between zram_bvec_read()/zram_bvec_write() and zram_slot_free_notify(), and possible consequences include:
1) Trigger BUG_ON(!handle) on zram_bvec_write() side.
2) Access to freed pages on zram_bvec_read() side.
3) Break some fields (bad_compress, good_compress, pages_stored) in zram->stats if the swap layer makes concurrently call to zram_slot_free_notify().
So enhance zram_slot_free_notify() to acquire writer lock on zram->lock before calling zram_free_page().
--- drivers/staging/zram/zram_drv.c | 2 ++ drivers/staging/zram/zram_drv.h | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/staging/zram/zram_drv.c +2 -0
@@ -622,7 +622,9 @@ static void zram_slot_free_notify(struct block_device *bdev,struct zram *zram; zram = bdev->bd_disk->private_data; +down_write (&zram->lock);zram_free_page (zram, index); +up_write (&zram->lock);zram_stat64_inc (zram, &zram->stats.notify_free); }
drivers/staging/zram/zram_drv.h +3 -2
@@ -92,8 +92,9 @@ struct zram {void *compress_buffer;struct table *table;spinlock_t stat64_lock;/* protect 64-bit stats */ -struct rw_semaphore lock;/* protect compression buffers and table -* against concurrent read and writes */ +struct rw_semaphore lock;/* protect compression buffers, table, +* 32bit stat counters against concurrent +* notifications, reads and writes */ struct request_queue *queue;struct gendisk *disk;int init_done;
Signature · 1 line
1.7.10.4
Re: [146/251] zram: use zram->lock to protect zram_free_page() in swap free notify path
Quoted 2 lines · Steven Rostedt
3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
This commit seems to cause regressions [1]. There's a fix for it with commit a0c516cbfc7452c8cbd564525fef66d9f20b46d1 but it doesn't apply cleanly (it probably requires several other commits to be backported). Thus, I am reverting it from the 3.5 extended stable kernel.
[1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1215513
Cheers,
Signature · 1 line
Luis
Quoted 59 lines
------------------
From: Jiang Liu <[email protected]>
[ Upstream commit
57ab048532c0d975538cebd4456491b5c34248f4]
zram_slot_free_notify()is free-running without any protection from concurrent operations. So there are race conditions between zram_bvec_read()/zram_bvec_write() andzram_slot_free_notify(), and possible consequences include:
1) TriggerBUG_ON(!handle)onzram_bvec_write()side.
2) Access to freed pages onzram_bvec_read()side.
3) Break some fields (bad_compress,good_compress,pages_stored) inzram->statsif the swap layer makes concurrently call tozram_slot_free_notify().So enhance
zram_slot_free_notify()to acquire writer lock onzram->lockbefore callingzram_free_page().Signed-off-by Jiang Liu <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Steven Rostedt <[email protected]>--- drivers/staging/zram/zram_drv.c | 2 ++ drivers/staging/zram/zram_drv.h | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-)drivers/staging/zram/zram_drv.c +2
-0@@ -622,7 +622,9 @@ static void zram_slot_free_notify(struct block_device *bdev,struct zram *zram; zram = bdev->bd_disk->private_data; +down_write (&zram->lock);zram_free_page (zram, index); +up_write (&zram->lock);zram_stat64_inc (zram, &zram->stats.notify_free); }drivers/staging/zram/zram_drv.h +3
-2@@ -92,8 +92,9 @@ struct zram {void *compress_buffer;struct table *table;spinlock_t stat64_lock;/* protect 64-bit stats */ -struct rw_semaphore lock;/* protect compression buffers and table -* against concurrent read and writes */ +struct rw_semaphore lock;/* protect compression buffers, table, +* 32bit stat counters against concurrent +* notifications, reads and writes */ struct request_queue *queue;struct gendisk *disk;int init_done;
Steven Rostedt
maintainerRe: [146/251] zram: use zram->lock to protect zram_free_page() in swap free notify path
Quoted 5 lines · On Wed, 11 Sep 2013 09:42:42 +0100 Luis Henriques…
Quoted 2 lines · Steven Rostedt
3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
Quoted 8 lines
This commit seems to cause regressions [1]. There's a fix for it with commit
a0c516cbfc7452c8cbd564525fef66d9f20b46d1but it doesn't apply cleanly (it probably requires several other commits to be backported). Thus, I am reverting it from the 3.5 extended stable kernel.[1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1215513
Thanks! I reverted it too.
-- Steve
Steven Rostedt
maintainerPATCH 147/251 zram: destroy all devices on error recovery path in zram_init()
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jiang Liu <[email protected]>
[ Upstream commit 39a9b8ac9333e4268ecff7da6c9d1ab3823ff243 ]
On error recovery path of zram_init(), it leaks the zram device object causing the failure. So change create_device() to free allocated resources on error path.
--- drivers/staging/zram/zram_drv.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/staging/zram/zram_drv.c +9 -6
@@ -635,7 +635,7 @@ static const struct block_device_operations zram_devops = {static int create_device (struct zram *zram,int device_id) { -int ret =0 ; +int ret = -ENOMEM ;init_rwsem (&zram->lock);init_rwsem (&zram->init_lock);
@@ -645,7 +645,6 @@ static int create_device(struct zram *zram, int device_id)if (!zram->queue) {pr_err ("Error allocating disk queue for device %d\n" , device_id); - ret = -ENOMEM ; goto out; }
@@ -655,11 +654,9 @@ static int create_device(struct zram *zram, int device_id)/* gendisk structure */ zram->disk =alloc_disk (1 );if (!zram->disk) { -blk_cleanup_queue (zram->queue);pr_warn ("Error allocating disk structure for device %d\n" , device_id); - ret = -ENOMEM ; - goto out; + goto out_free_queue; } zram->disk->major = zram_major;
@@ -688,11 +685,17 @@ static int create_device(struct zram *zram, int device_id) &zram_disk_attr_group);if (ret <0 ) {pr_warn ("Error creating sysfs group" ); - goto out; + goto out_free_disk; } zram->init_done =0 ; +return 0 ; +out_free_disk: +del_gendisk (zram->disk); +put_disk (zram->disk); +out_free_queue: +blk_cleanup_queue (zram->queue); out:return ret; }
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 148/251 zram: avoid double free in function zram_bvec_write()
In reply to Steven Rostedt3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Jiang Liu <[email protected]>
[ Upstream commit 65c484609a3b25c35e4edcd5f2c38f98f5226093 ]
When doing a patial write and the whole page is filled with zero, zram_bvec_write() will free uncmem twice.
--- drivers/staging/zram/zram_drv.c | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/zram/zram_drv.c +0 -2
@@ -327,8 +327,6 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,if (page_zero_filled (uncmem)) {kunmap_atomic (user_mem); -if (is_partial_io (bvec)) -kfree (uncmem);zram_stat_inc (&zram->stats.pages_zero);zram_set_flag (zram, index,ZRAM_ZERO ); ret =0 ;
Signature · 1 line
1.7.10.4