3.10.33-stable review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 3.10.33-stable review
This is the start of the stable review cycle for the 3.10.33 release. There are 97 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 6 20:03:11 UTC 2014. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.10.33-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.10.33-rc1
Alex Deucher <[email protected]>
drm/radeon: disable pll sharing for DP on DCE4.1
Christian König <[email protected]>
drm/radeon: fix missing bo reservation
Alex Deucher <[email protected]>
drm/radeon: print the supported atpx function mask
Mike Snitzer <[email protected]>
dm thin: fix the error path for the thin device constructor
Mike Snitzer <[email protected]>
dm thin: avoid metadata commit if a pool's thin devices haven't changed
Hannes Reinecke <[email protected]>
dm mpath: fix stalls when handling invalid ioctls
Linus Walleij <[email protected]>
dma: ste_dma40: don't dereference free:d descriptor
Jean Delvare <[email protected]>
i7300_edac: Fix device reference count
Dr. Greg Wettstein <[email protected]>
qla2xxx: Fix kernel panic on selective retransmission request
Will Deacon <[email protected]>
ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lock
Will Deacon <[email protected]>
ARM: 7749/1: spinlock: retry trylock operation if strex fails on free lock
Stephen Warren <[email protected]>
ARM: tegra: only run PL310 init on systems with one
Olof Johansson <[email protected]>
ARM64: unwind: Fix PC calculation
James Hogan <[email protected]>
irq-metag*: stop set_affinity vectoring to offline cpus
Charles Keepax <[email protected]>
Input - arizona-haptics: Fix double lock of dapm_mutex
Davidlohr Bueso <[email protected]>
ipc,mqueue: remove limits for the amount of system-wide queues
Jan Kara <[email protected]>
quota: Fix race between dqput() and dquot_scan_active()
Eric Paris <[email protected]>
SELinux: bigendian problems with filename trans rules
Max Filippov <[email protected]>
xtensa: introduce spill_registers_kernel macro
Takashi Iwai <[email protected]>
ALSA: hda - Add a fixup for HP Folio 13 mute LED
Peter Zijlstra <[email protected]>
perf: Fix hotplug splat
Denis CIOCCA <[email protected]>
iio:gyro: bug on L3GD20H gyroscope support
Arve Hjønnevåg <[email protected]>
staging: binder: Fix death notifications
Lai Jiangshan <[email protected]>
workqueue: ensure @task is valid across kthread_stop()
Guenter Roeck <[email protected]>
hwmon: (max1668) Fix writing the minimum temperature
Chao Bi <[email protected]>
mei: set client's read_cb to NULL when flow control fails
Joerg Dorchain <[email protected]>
USB: ftdi_sio: add Cressi Leonardo PID
Stanislaw Gruszka <[email protected]>
usb: ehci: fix deadlock when threadirqs option is used
Aleksander Morgado <[email protected]>
USB: serial: option: blacklist interface 4 for Cinterion PHS8 and PXS8
Florian Fainelli <[email protected]>
usb: gadget: bcm63xx_udc: fix build failure on DMA channel code
Matthieu CASTET <[email protected]>
usb: chipidea: need to mask when writting endptflush and endptprime
Olivier Sobrie <[email protected]>
can: kvaser_usb: check number of channels returned by HW
Lan Tianyu <[email protected]>
ACPI / processor: Rework processor throttling with work_on_cpu()
Hans de Goede <[email protected]>
ACPI / video: Filter the _BCL table for duplicate brightness values
Jean Delvare <[email protected]>
i7core_edac: Fix PCI device reference count
Tomasz Nowicki <[email protected]>
ACPI / PCI: Fix memory leak in acpi_pci_irq_enable()
Bjorn Helgaas <[email protected]>
PCI: Enable INTx if BIOS left them disabled
Srivatsa S. Bhat <[email protected]>
cpufreq: powernow-k8: Initialize per-cpu data-structures properly
Tejun Heo <[email protected]>
sata_sil: apply MOD15WRITE quirk to TOSHIBA MK2561GSYN
Denis V. Lunev <[email protected]>
ata: enable quirk from jmicron JMB350 for JMB394
Peter Zijlstra <[email protected]>
perf/x86: Fix event scheduling
Marek Szyprowski <[email protected]>
x86: dma-mapping: fix GFP_ATOMIC macro usage
Levente Kurusa <[email protected]>
ahci: disable NCQ on Samsung pci-e SSDs on macbooks
Laurent Dufour <[email protected]>
powerpc/crashdump : Fix page frame number check in copy_oldmem_page
Tony Breeds <[email protected]>
powerpc/le: Ensure that the 'stop-self' RTAS token is handled correctly
Trond Myklebust <[email protected]>
SUNRPC: Fix races in xs_nospace()
Lars-Peter Clausen <[email protected]>
ASoC: wm8958-dsp: Fix firmware block loading
Takashi Iwai <[email protected]>
ASoC: sta32x: Fix array access overflow
Takashi Iwai <[email protected]>
ASoC: sta32x: Fix wrong enum for limiter2 release rate
Lars-Peter Clausen <[email protected]>
ASoC: sta32x: Fix cache sync
Mark Brown <[email protected]>
ASoC: da732x: Mark DC offset control registers volatile
Takashi Iwai <[email protected]>
ASoC: wm8770: Fix wrong number of enum items
Dylan Reid <[email protected]>
ASoC: max98090: sync regcache on entering STANDBY
Andrew Honig <[email protected]>
kvm: x86: fix emulator buffer overflow (CVE-2014-0049)
Hui Wang <[email protected]>
ALSA: hda - Enable front audio jacks on one HP desktop model
Hsin-Yu Chao <[email protected]>
ALSA: hda/ca0132 - Fix recording from mode id 0x8
Hsin-Yu Chao <[email protected]>
ALSA: hda/ca0132 - setup/cleanup streams
Clemens Ladisch <[email protected]>
ALSA: usb-audio: work around KEF X300A firmware bug
Christoph Hellwig <[email protected]>
fs: fix iversion handling
Michal Hocko <[email protected]>
memcg: fix endless loop caused by mem_cgroup_iter
Eric Dumazet <[email protected]>
net: use __GFP_NORETRY for high order allocations
Florian Westphal <[email protected]>
net: ip, ipv6: handle gso skbs in forwarding path
Florian Westphal <[email protected]>
net: core: introduce netif_skb_dev_features
Florian Westphal <[email protected]>
net: add and use skb_gso_transport_seglen()
Daniel Borkmann <[email protected]>
net: sctp: fix sctp_connectx abi for ia32 emulation/compat mode
Duan Jiong <[email protected]>
ipv4: fix counter in_slow_tot
Jiri Bohac <[email protected]>
bonding: 802.3ad: make aggregator_identifier bond-private
Emil Goode <[email protected]>
usbnet: remove generic hard_header_len check
Emil Goode <[email protected]>
net: asix: add missing flag to struct driver_info
Nithin Sujir <[email protected]>
tg3: Fix deadlock in tg3_change_mtu()
John Ogness <[email protected]>
tcp: tsq: fix nonagle handling
Bjørn Mork <[email protected]>
net: qmi_wwan: add Netgear Aircard 340U
Sabrina Dubroca <[email protected]>
netpoll: fix netconsole IPv6 setup
Maciej Żenczykowski <[email protected]>
net: fix 'ip rule' iif/oif device rename
Geert Uytterhoeven <[email protected]>
ipv4: Fix runtime WARNING in rtmsg_ifa()
Oliver Hartkopp <[email protected]>
can: add destructor for self generated skbs
Richard Yao <[email protected]>
9p/trans_virtio.c: Fix broken zero-copy on vmalloc() buffers
Eric Dumazet <[email protected]>
6lowpan: fix lockdep splats
Olivier Langlois <[email protected]>
rtlwifi: rtl8192ce: Fix too long disable of IRQs
Olivier Langlois <[email protected]>
rtlwifi: Fix incorrect return from rtl_ps_enable_nic()
Stanislaw Gruszka <[email protected]>
rtl8187: fix regression on MIPS without coherent DMA
Pavel Shilovsky <[email protected]>
CIFS: Fix too big maxBuf size for SMB3 mounts
Jeff Layton <[email protected]>
cifs: ensure that uncached writes handle unmapped areas correctly
Chen Gang <[email protected]>
avr32: Makefile: add '-D__linux__' flag for gcc-4.4.7 use
Paul Gortmaker <[email protected]>
avr32: fix missing module.h causing build failure in mimc200/fram.c
Pekon Gupta <[email protected]>
ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
Pekon Gupta <[email protected]>
ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module
Vinayak Kale <[email protected]>
ARM: 7957/1: add DSB after icache flush in __flush_icache_all()
Will Deacon <[email protected]>
ARM: 7953/1: mm: ensure TLB invalidation is complete before enabling MMU
Marek Szyprowski <[email protected]>
ARM: dma-mapping: fix GFP_ATOMIC macro usage
Theodore Ts'o <[email protected]>
ext4: don't leave i_crtime.tv_sec uninitialized
Theodore Ts'o <[email protected]>
ext4: fix online resize with a non-standard blocks per group setting
Theodore Ts'o <[email protected]>
ext4: fix online resize with very large inode tables
Theodore Ts'o <[email protected]>
ext4: don't try to modify s_flags if the the file system is read-only
Zheng Liu <[email protected]>
ext4: fix error paths in swap_inode_boot_loader()
Ilia Mirkin <[email protected]>
drm/nv50/disp: use correct register to determine DP display bpp
Ilia Mirkin <[email protected]>
drm/nouveau: set irq_enabled manually
-------------
Diffstat:
Makefile | 4 +- arch/arm/include/asm/cacheflush.h | 1 + arch/arm/include/asm/spinlock.h | 82 +++++++++++++++---------- arch/arm/mach-omap2/gpmc.c | 4 +- arch/arm/mach-tegra/common.c | 11 ++++ arch/arm/mm/dma-mapping.c | 2 +- arch/arm/mm/proc-v6.S | 3 +- arch/arm/mm/proc-v7.S | 2 +- arch/arm64/kernel/stacktrace.c | 6 +- arch/avr32/Makefile | 2 +- arch/avr32/boards/mimc200/fram.c | 1 + arch/powerpc/kernel/crash_dump.c | 8 ++- arch/powerpc/platforms/pseries/hotplug-cpu.c | 22 +++---- arch/x86/kernel/cpu/perf_event.c | 3 + arch/x86/kernel/pci-dma.c | 4 +- arch/x86/kvm/x86.c | 2 +- arch/xtensa/include/asm/traps.h | 44 ++++++++----- arch/xtensa/kernel/entry.S | 60 ++++++++++++++---- drivers/acpi/pci_irq.c | 1 + drivers/acpi/processor_throttling.c | 69 ++++++++++----------- drivers/acpi/video.c | 8 ++- drivers/ata/ahci.c | 14 +++++ drivers/ata/libata-pmp.c | 7 ++- drivers/ata/sata_sil.c | 1 + drivers/cpufreq/powernow-k8.c | 10 ++- drivers/dma/ste_dma40.c | 4 +- drivers/edac/i7300_edac.c | 38 ++++++------ drivers/edac/i7core_edac.c | 9 ++- drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 3 + drivers/gpu/drm/radeon/atombios_crtc.c | 16 ++++- drivers/gpu/drm/radeon/radeon_atpx_handler.c | 3 +- drivers/gpu/drm/radeon/radeon_kms.c | 6 ++ drivers/hwmon/max1668.c | 2 +- drivers/iio/gyro/Kconfig | 2 +- drivers/iio/gyro/st_gyro.h | 1 - drivers/iio/gyro/st_gyro_core.c | 9 ++- drivers/iio/gyro/st_gyro_i2c.c | 1 - drivers/iio/gyro/st_gyro_spi.c | 1 - drivers/input/misc/arizona-haptics.c | 11 ++-- drivers/irqchip/irq-metag-ext.c | 2 +- drivers/irqchip/irq-metag.c | 2 +- drivers/md/dm-mpath.c | 7 ++- drivers/md/dm-thin-metadata.c | 17 +++++ drivers/md/dm-thin-metadata.h | 2 + drivers/md/dm-thin.c | 8 ++- drivers/misc/mei/client.c | 4 +- drivers/net/bonding/bond_3ad.c | 6 +- drivers/net/bonding/bond_3ad.h | 1 + drivers/net/can/dev.c | 15 +---- drivers/net/can/janz-ican3.c | 18 ++---- drivers/net/can/usb/kvaser_usb.c | 2 + drivers/net/can/vcan.c | 9 ++- drivers/net/ethernet/broadcom/tg3.c | 4 +- drivers/net/usb/asix_devices.c | 3 +- drivers/net/usb/ax88179_178a.c | 4 ++ drivers/net/usb/gl620a.c | 4 ++ drivers/net/usb/mcs7830.c | 5 +- drivers/net/usb/net1080.c | 4 ++ drivers/net/usb/qmi_wwan.c | 9 +-- drivers/net/usb/rndis_host.c | 4 ++ drivers/net/usb/smsc75xx.c | 4 ++ drivers/net/usb/smsc95xx.c | 4 ++ drivers/net/usb/usbnet.c | 25 +++----- drivers/net/wireless/rtl818x/rtl8187/rtl8187.h | 10 ++- drivers/net/wireless/rtlwifi/ps.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 18 +++++- drivers/pci/pci.c | 10 +++ drivers/scsi/qla2xxx/qla_target.c | 3 +- drivers/staging/android/binder.c | 3 +- drivers/usb/chipidea/udc.c | 4 +- drivers/usb/gadget/bcm63xx_udc.c | 58 +++++++++-------- drivers/usb/host/ehci-hcd.c | 13 +++- drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 6 ++ drivers/usb/serial/option.c | 3 +- fs/attr.c | 5 -- fs/btrfs/inode.c | 8 ++- fs/cifs/file.c | 37 ++++++++++- fs/cifs/smb2glob.h | 3 + fs/cifs/smb2ops.c | 14 ++--- fs/cifs/smb2pdu.c | 3 + fs/ext4/ext4.h | 2 + fs/ext4/inode.c | 4 ++ fs/ext4/ioctl.c | 3 +- fs/ext4/resize.c | 34 ++++++---- fs/ext4/super.c | 20 +++--- fs/quota/dquot.c | 14 ++++- include/linux/can/skb.h | 38 ++++++++++++ include/linux/ipc_namespace.h | 2 - include/linux/netdevice.h | 7 ++- include/linux/skbuff.h | 19 ++++++ ipc/mq_sysctl.c | 18 ++++-- ipc/mqueue.c | 6 +- kernel/events/core.c | 12 ++-- kernel/workqueue.c | 7 +++ mm/memcontrol.c | 4 +- net/9p/trans_virtio.c | 5 +- net/can/af_can.c | 3 +- net/can/bcm.c | 4 +- net/core/dev.c | 27 ++++---- net/core/fib_rules.c | 7 +++ net/core/netpoll.c | 4 +- net/core/skbuff.c | 25 ++++++++ net/core/sock.c | 2 +- net/ieee802154/6lowpan.c | 20 ++++++ net/ipv4/devinet.c | 3 +- net/ipv4/ip_forward.c | 71 ++++++++++++++++++++- net/ipv4/route.c | 4 +- net/ipv4/tcp_output.c | 13 +++- net/ipv6/ip6_output.c | 17 ++++- net/sctp/socket.c | 41 ++++++++++--- net/sunrpc/xprtsock.c | 6 +- security/selinux/ss/policydb.c | 8 +-- sound/pci/hda/patch_ca0132.c | 68 +++----------------- sound/pci/hda/patch_sigmatel.c | 33 ++++++++++ sound/soc/codecs/da732x.c | 12 ++++ sound/soc/codecs/max98090.c | 20 +++--- sound/soc/codecs/sta32x.c | 76 +++++++++++------------ sound/soc/codecs/wm8770.c | 4 +- sound/soc/codecs/wm8958-dsp2.c | 2 +- sound/usb/mixer_maps.c | 9 +++ 122 files changed, 1025 insertions(+), 493 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/97 drm/nouveau: set irq_enabled manually
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilia Mirkin <[email protected]>
commit 7d3428cd4b2ad51af86fdbdf8284ca38fa95e601 upstream.
Since commit 0fa9061ae8c ("drm/nouveau/mc: handle irq-related setup ourselves"), drm_device->irq_enabled remained unset. This is needed in order to properly wait for a vblank event in the generic drm code.
See https://bugs.freedesktop.org/show_bug.cgi?id=74195
--- drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/nouveau/nouveau_drm.c +3 -0
@@ -339,6 +339,8 @@ nouveau_drm_load(struct drm_device *dev,if (ret) goto fail_device; + dev->irq_enabled = true; +/* workaround an odd issue on nvc1 by disabling the device's * nosnoop capability. hopefully won't cause issues until a * better fix is found - assuming there is one...
@@ -426,6 +428,7 @@ nouveau_drm_remove(struct pci_dev *pdev)struct nouveau_drm *drm =nouveau_drm (dev);struct nouveau_object *device; + dev->irq_enabled = false; device = drm->client.base.device;drm_put_dev (dev);
Greg Kroah-Hartman
maintainerPATCH 2/97 drm/nv50/disp: use correct register to determine DP display bpp
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilia Mirkin <[email protected]>
commit a7f1c1e65b68e1e1ab70898528d5977ed68a0a7d upstream.
Commit 0a0afd282f ("drm/nv50-/disp: move DP link training to core and train from supervisor") added code that uses the wrong register for computing the display bpp, used for bandwidth calculation. Adjust to use the same register as used by exec_clkcmp and nv50_disp_intr_unk20_2_dp.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67628
--- drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c +1 -1
@@ -1112,7 +1112,7 @@ nv50_disp_intr_unk20_2(struct nv50_disp_if (conf != ~0 ) {if (outp.location ==0 && outp.type ==DCB_OUTPUT_DP ) {u32 soff = (ffs (outp.or) -1 ) *0x08 ; -u32 ctrl =nv_rd32 (priv,0x610798 + soff); +u32 ctrl =nv_rd32 (priv,0x610794 + soff);u32 datarate;switch ((ctrl &0x000f0000 ) >>16 ) {
Greg Kroah-Hartman
maintainerPATCH 3/97 ext4: fix error paths in swap_inode_boot_loader()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Liu <[email protected]>
commit 30d29b119ef01776e0a301444ab24defe8d8bef3 upstream.
In swap_inode_boot_loader() we forgot to release ->i_mutex and resume unlocked dio for inode and inode_bl if there is an error starting the journal handle. This commit fixes this issue.
--- fs/ext4/ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext4/ioctl.c +2 -1
@@ -145,7 +145,7 @@ static long swap_inode_boot_loader(struc handle =ext4_journal_start (inode_bl,EXT4_HT_MOVE_EXTENTS ,2 );if (IS_ERR (handle)) { err = -EINVAL ; - goto swap_boot_out; + goto journal_err_out; }/* Protect extent tree against block allocations via delalloc */
@@ -203,6 +203,7 @@ static long swap_inode_boot_loader(strucext4_double_up_write_data_sem (inode, inode_bl); +journal_err_out:ext4_inode_resume_unlocked_dio (inode);ext4_inode_resume_unlocked_dio (inode_bl);
Greg Kroah-Hartman
maintainerPATCH 4/97 ext4: dont try to modify s_flags if the the file system is read-only
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit 23301410972330c0ae9a8afc379ba2005e249cc6 upstream.
If an ext4 file system is created by some tool other than mke2fs (perhaps by someone who has a pathalogical fear of the GPL) that doesn't set one or the other of the EXT2_FLAGS_{UN}SIGNED_HASH flags, and that file system is then mounted read-only, don't try to modify the s_flags field. Otherwise, if dm_verity is in use, the superblock will change, causing an dm_verity failure.
--- fs/ext4/super.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
fs/ext4/super.c +13 -7
@@ -3592,16 +3592,22 @@ static int ext4_fill_super(struct super_for (i =0 ; i <4 ; i++) sbi->s_hash_seed[i] =le32_to_cpu (es->s_hash_seed[i]); sbi->s_def_hash_version = es->s_def_hash_version; - i =le32_to_cpu (es->s_flags); -if (i &EXT2_FLAGS_UNSIGNED_HASH ) - sbi->s_hash_unsigned =3 ; -else if ((i &EXT2_FLAGS_SIGNED_HASH ) ==0 ) { +if (EXT4_HAS_COMPAT_FEATURE (sb,EXT4_FEATURE_COMPAT_DIR_INDEX )) { + i =le32_to_cpu (es->s_flags); +if (i &EXT2_FLAGS_UNSIGNED_HASH ) + sbi->s_hash_unsigned =3 ; +else if ((i &EXT2_FLAGS_SIGNED_HASH ) ==0 ) {#ifdef __CHAR_UNSIGNED__ - es->s_flags |=cpu_to_le32 (EXT2_FLAGS_UNSIGNED_HASH ); - sbi->s_hash_unsigned =3 ; +if (!(sb->s_flags &MS_RDONLY )) + es->s_flags |= +cpu_to_le32 (EXT2_FLAGS_UNSIGNED_HASH ); + sbi->s_hash_unsigned =3 ;#else - es->s_flags |=cpu_to_le32 (EXT2_FLAGS_SIGNED_HASH ); +if (!(sb->s_flags &MS_RDONLY )) + es->s_flags |= +cpu_to_le32 (EXT2_FLAGS_SIGNED_HASH );#endif + } }/* Handle clustersize */
Greg Kroah-Hartman
maintainerPATCH 5/97 ext4: fix online resize with very large inode tables
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit b93c95353413041a8cebad915a8109619f66bcc6 upstream.
If a file system has a large number of inodes per block group, all of the metadata blocks in a flex_bg may be larger than what can fit in a single block group. Unfortunately, ext4_alloc_group_tables() in resize.c was never tested to see if it would handle this case correctly, and there were a large number of bugs which caused the following sequence to result in a BUG_ON:
kernel bug at fs/ext4/resize.c:409!
...
call trace:
[<ffffffff81256768>] ext4_flex_group_add+0x1448/0x1830 [<ffffffff81257de2>] ext4_resize_fs+0x7b2/0xe80 [<ffffffff8123ac50>] ext4_ioctl+0xbf0/0xf00 [<ffffffff811c111d>] do_vfs_ioctl+0x2dd/0x4b0 [<ffffffff811b9df2>] ? final_putname+0x22/0x50 [<ffffffff811c1371>] sys_ioctl+0x81/0xa0 [<ffffffff81676aa9>] system_call_fastpath+0x16/0x1b
code: c8 4c 89 df e8 41 96 f8 ff 44 89 e8 49 01 c4 44 29 6d d4 0 rip [<ffffffff81254fa1>] set_flexbg_block_bitmap+0x171/0x180
This can be reproduced with the following command sequence:
mke2fs -t ext4 -i 4096 /dev/vdd 1G
mount -t ext4 /dev/vdd /vdd
resize2fs /dev/vdd 8G
To fix this, we need to make sure the right thing happens when a block group's inode table straddles two block groups, which means the following bugs had to be fixed:
1) Not clearing the BLOCK_UNINIT flag in the second block group in ext4_alloc_group_tables --- the was proximate cause of the BUG_ON.
2) Incorrectly determining how many block groups contained contiguous free blocks in ext4_alloc_group_tables().
3) Incorrectly setting the start of the next block range to be marked in use after a discontinuity in setup_new_flex_group_blocks().
--- fs/ext4/resize.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)
fs/ext4/resize.c +20 -12
@@ -238,6 +238,7 @@ static int ext4_alloc_group_tables(strucext4_group_t group;ext4_group_t last_group;unsigned overhead; +__u16 uninit_mask = (flexbg_size >1 ) ? ~EXT4_BG_BLOCK_UNINIT : ~0 ;BUG_ON (flex_gd->count ==0 || group_data ==NULL );
@@ -261,7 +262,7 @@ next_group: src_group++;for (; src_group <= last_group; src_group++) { overhead =ext4_group_overhead_blocks (sb, src_group); -if (overhead !=0 ) +if (overhead ==0 ) last_blk += group_data[src_group - group].blocks_count;else break ;
@@ -275,8 +276,7 @@ next_group: group =ext4_get_group_number (sb, start_blk -1 ); group -= group_data[0 ].group; group_data[group].free_blocks_count--; -if (flexbg_size >1 ) - flex_gd->bg_flags[group] &= ~EXT4_BG_BLOCK_UNINIT ; + flex_gd->bg_flags[group] &= uninit_mask; }/* Allocate inode bitmaps */
@@ -287,22 +287,30 @@ next_group: group =ext4_get_group_number (sb, start_blk -1 ); group -= group_data[0 ].group; group_data[group].free_blocks_count--; -if (flexbg_size >1 ) - flex_gd->bg_flags[group] &= ~EXT4_BG_BLOCK_UNINIT ; + flex_gd->bg_flags[group] &= uninit_mask; }/* Allocate inode tables */ for (; it_index < flex_gd->count; it_index++) { -if (start_blk +EXT4_SB (sb)->s_itb_per_group > last_blk) +unsigned int itb =EXT4_SB (sb)->s_itb_per_group; +ext4_fsblk_t next_group_start; + +if (start_blk + itb > last_blk) goto next_group; group_data[it_index].inode_table = start_blk; - group =ext4_get_group_number (sb, start_blk -1 ); + group =ext4_get_group_number (sb, start_blk); + next_group_start =ext4_group_first_block_no (sb, group +1 ); group -= group_data[0 ].group; - group_data[group].free_blocks_count -= -EXT4_SB (sb)->s_itb_per_group; -if (flexbg_size >1 ) - flex_gd->bg_flags[group] &= ~EXT4_BG_BLOCK_UNINIT ; +if (start_blk + itb > next_group_start) { + flex_gd->bg_flags[group +1 ] &= uninit_mask; + overhead = start_blk + itb - next_group_start; + group_data[group +1 ].free_blocks_count -= overhead; + itb -= overhead; + } + + group_data[group].free_blocks_count -= itb; + flex_gd->bg_flags[group] &= uninit_mask; start_blk +=EXT4_SB (sb)->s_itb_per_group; }
@@ -615,7 +623,7 @@ handle_ib:if (err) goto out; count = group_table_count[j]; - start = group_data[i].block_bitmap; + start = (&group_data[i].block_bitmap)[j]; block = start; }
Greg Kroah-Hartman
maintainerPATCH 6/97 ext4: fix online resize with a non-standard blocks per group setting
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit 3d2660d0c9c2f296837078c189b68a47f6b2e3b5 upstream.
The set_flexbg_block_bitmap() function assumed that the number of blocks in a blockgroup was sb->blocksize * 8, which is normally true, but not always! Use EXT4_BLOCKS_PER_GROUP(sb) instead, to fix block bitmap corruption after:
mke2fs -t ext4 -g 3072 -i 4096 /dev/vdd 1G
mount -t ext4 /dev/vdd /vdd
resize2fs /dev/vdd 8G
--- fs/ext4/resize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/resize.c +1 -1
@@ -404,7 +404,7 @@ static int set_flexbg_block_bitmap(struc start =ext4_group_first_block_no (sb, group); group -= flex_gd->groups[0 ].group; - count2 = sb->s_blocksize *8 - (block - start); + count2 =EXT4_BLOCKS_PER_GROUP (sb) - (block - start);if (count2 > count) count2 = count;
Greg Kroah-Hartman
maintainerPATCH 7/97 ext4: dont leave i_crtime.tv_sec uninitialized
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit 19ea80603715d473600cd993b9987bc97d042e02 upstream.
If the i_crtime field is not present in the inode, don't leave the field uninitialized.
--- fs/ext4/ext4.h | 2 ++ 1 file changed, 2 insertions(+)
fs/ext4/ext4.h +2 -0
@@ -774,6 +774,8 @@ do { \if (EXT4_FITS_IN_INODE (raw_inode, einode, xtime)) \ (einode)->xtime.tv_sec = \ (signed )le32_to_cpu ((raw_inode)->xtime); \ +else \ + (einode)->xtime.tv_sec =0 ; \ if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra)) \ext4_decode_extra_time (&(einode)->xtime, \ raw_inode->xtime ## _extra); \
Greg Kroah-Hartman
maintainerPATCH 8/97 ARM: dma-mapping: fix GFP_ATOMIC macro usage
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
commit 10c8562f932d89c030083e15f9279971ed637136 upstream.
GFP_ATOMIC is not a single gfp flag, but a macro which expands to the other flags and LACK of __GFP_WAIT flag. To check if caller wanted to perform an atomic allocation, the code must test __GFP_WAIT flag presence. This patch fixes the issue introduced in v3.6-rc5
--- arch/arm/mm/dma-mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mm/dma-mapping.c +1 -1
@@ -1311,7 +1311,7 @@ static void *arm_iommu_alloc_attrs(struc *handle =DMA_ERROR_CODE ; size =PAGE_ALIGN (size); -if (gfp &GFP_ATOMIC ) +if (!(gfp & __GFP_WAIT))return __iommu_alloc_atomic (dev, size, handle); pages =__iommu_alloc_buffer (dev, size, gfp, attrs);
Greg Kroah-Hartman
maintainerPATCH 9/97 ARM: 7953/1: mm: ensure TLB invalidation is complete before enabling MMU
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Will Deacon <[email protected]>
commit bae0ca2bc550d1ec6a118fb8f2696f18c4da3d8e upstream.
During __v{6,7}_setup, we invalidate the TLBs since we are about to enable the MMU on return to head.S. Unfortunately, without a subsequent dsb instruction, the invalidation is not guaranteed to have completed by the time we write to the sctlr, potentially exposing us to junk/stale translations cached in the TLB.
This patch reworks the init functions so that the dsb used to ensure completion of cache/predictor maintenance is also used to ensure completion of the TLB invalidation.
--- arch/arm/mm/proc-v6.S | 3 ++- arch/arm/mm/proc-v7.S | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/mm/proc-v6.S +2 -1
@@ -206,7 +206,6 @@ __v6_setup: mcr p15, 0, r0, c7, c14, 0 @ clean+invalidate D cache mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache mcr p15, 0, r0, c7, c15, 0 @ clean+invalidate cache - mcr p15, 0, r0, c7, c10, 4 @ drain write buffer #ifdef CONFIG_MMU mcr p15, 0, r0, c8, c7, 0 @ invalidate I + D TLBs mcr p15, 0, r0, c2, c0, 2 @ TTB control register
@@ -216,6 +215,8 @@ __v6_setup: ALT_UP(orr r8, r8, #TTB_FLAGS_UP) mcr p15, 0, r8, c2, c0, 1 @ load TTB1 #endif /* CONFIG_MMU */ + mcr p15, 0, r0, c7, c10, 4 @ drain write buffer and + @ complete invalidations adr r5, v6_crval ldmia r5, {r5, r6} #ifdef CONFIG_CPU_ENDIAN_BE8
arch/arm/mm/proc-v7.S +1 -1
@@ -329,7 +329,6 @@ __v7_setup: 3: mov r10, #0 mcr p15, 0, r10, c7, c5, 0 @ I+BTB cache invalidate - dsb #ifdef CONFIG_MMU mcr p15, 0, r10, c8, c7, 0 @ invalidate I + D TLBs v7_ttb_setup r10, r4, r8, r5 @ TTBCR, TTBRx setup
@@ -338,6 +337,7 @@ __v7_setup: mcr p15, 0, r5, c10, c2, 0 @ write PRRR mcr p15, 0, r6, c10, c2, 1 @ write NMRR #endif + dsb @ Complete invalidations #ifndef CONFIG_ARM_THUMBEE mrc p15, 0, r0, c0, c1, 0 @ read ID_PFR0 for ThumbEE and r0, r0, #(0xf << 12) @ ThumbEE enabled field
Greg Kroah-Hartman
maintainerPATCH 10/97 ARM: 7957/1: add DSB after icache flush in __flush_icache_all()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vinayak Kale <[email protected]>
commit 39544ac9df20f73e49fc6b9ac19ff533388c82c0 upstream.
Add DSB after icache flush to complete the cache maintenance operation.
--- arch/arm/include/asm/cacheflush.h | 1 + 1 file changed, 1 insertion(+)
arch/arm/include/asm/cacheflush.h +1 -0
@@ -212,6 +212,7 @@ extern void copy_to_user_page(struct vm_static inline void __flush_icache_all (void ) {__flush_icache_preferred (); +dsb (); }/*
Greg Kroah-Hartman
maintainerPATCH 11/97 ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pekon Gupta <[email protected]>
commit 6b187b21c92b6e2c7e8ef0b450181c37a3f31681 upstream.
ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND
OMAP SoC(s) depend on GPMC controller driver to parse GPMC DT child nodes and register them platform_device for NAND driver to probe later. However this does not happen if generic MTD_NAND framework is built as module (CONFIG_MTD_NAND=m).
Therefore, when MTD/NAND and MTD/NAND/OMAP2 modules are loaded, they are unable to find any matching platform_device and remain un-binded. This causes on board NAND flash to remain un-detected.
This patch causes GPMC controller to parse DT nodes when CONFIG_MTD_NAND=y || CONFIG_MTD_NAND=m
--- arch/arm/mach-omap2/gpmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/gpmc.c +1 -1
@@ -1335,7 +1335,7 @@ static void __maybe_unused gpmc_read_timof_property_read_bool (np,"gpmc,time-para-granularity" ); } -#ifdef CONFIG_MTD_NAND +#if IS_ENABLED (CONFIG_MTD_NAND )static const char *const nand_ecc_opts[] = { [OMAP_ECC_HAMMING_CODE_DEFAULT] = "sw",
Greg Kroah-Hartman
maintainerPATCH 12/97 ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pekon Gupta <[email protected]>
commit 980386d2d6d49e0b42f48550853ef1ad6aa5d79a upstream.
ARM: OMAP2+: gpmc: add DT bindings for OneNAND
OMAP SoC(s) depend on GPMC controller driver to parse GPMC DT child nodes and register them platform_device for ONENAND driver to probe later. However this does not happen if generic MTD_ONENAND framework is built as module (CONFIG_MTD_ONENAND=m).
Therefore, when MTD/ONENAND and MTD/ONENAND/OMAP2 modules are loaded, they are unable to find any matching platform_device and remain un-binded. This causes on board ONENAND flash to remain un-detected.
This patch causes GPMC controller to parse DT nodes when CONFIG_MTD_ONENAND=y || CONFIG_MTD_ONENAND=m
--- arch/arm/mach-omap2/gpmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/gpmc.c +1 -1
@@ -1391,7 +1391,7 @@ static int gpmc_probe_nand_child(struct }#endif -#ifdef CONFIG_MTD_ONENAND +#if IS_ENABLED (CONFIG_MTD_ONENAND )static int gpmc_probe_onenand_child (struct platform_device *pdev,struct device_node *child) {
Greg Kroah-Hartman
maintainerPATCH 13/97 avr32: fix missing module.h causing build failure in mimc200/fram.c
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Gortmaker <[email protected]>
commit 5745d6a41a4f4aec29e2ccd591c6fb09ed73a955 upstream.
Causing this:
In file included from arch/avr32/boards/mimc200/fram.c:13:include/linux/miscdevice.h:51: error: field 'list' has incomplete type include/linux/miscdevice.h:55: error: expected specifier-qualifier-list before 'mode_t' arch/avr32/boards/mimc200/fram.c:42: error: 'THIS_MODULE' undeclared here (not in a function)
--- arch/avr32/boards/mimc200/fram.c | 1 + 1 file changed, 1 insertion(+)
arch/avr32/boards/mimc200/fram.c +1 -0
@@ -11,6 +11,7 @@#define FRAM_VERSION "1.0"#include <linux/miscdevice.h> +#include <linux/module.h> #include <linux/proc_fs.h> #include <linux/mm.h> #include <linux/io.h>
Greg Kroah-Hartman
maintainerPATCH 14/97 avr32: Makefile: add -D__linux__ flag for gcc-4.4.7 use
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Gang <[email protected]>
commit 8d80390cfc9434d5aa4fb9e5f9768a66b30cb8a6 upstream.
For avr32 cross compiler, do not define '__linux__' internally, so it will cause issue with allmodconfig.
The related error:
CC [M] fs/coda/psdev.o
In file included from include/linux/coda.h:64,
from fs/coda/psdev.c:45:
include/uapi/linux/coda.h:221: error: expected specifier-qualifier-list before 'u_quad_t'
The related toolchain version (which only download, not re-compile):
[root@gchen linux-next]# /upstream/toolchain/download/avr32-gnu-toolchain-linux_x86/bin/avr32-gcc -v
Using built-in specs.
Target: avr32
Configured with: /data2/home/toolsbuild/jenkins-knuth/workspace/avr32-gnu-toolchain/src/gcc/configure --target=avr32 --host=i686-pc-linux-gnu --build=x86_64-pc-linux-gnu --prefix=/home/toolsbuild/jenkins-knuth/workspace/avr32-gnu-toolchain/avr32-gnu-toolchain-linux_x86 --enable-languages=c,c++ --disable-nls --disable-libssp --disable-libstdcxx-pch --with-dwarf2 --enable-version-specific-runtime-libs --disable-shared --enable-doc --with-mpfr-lib=/home/toolsbuild/jenkins-knuth/workspace/avr32-gnu-toolchain/avr32-gnu-toolchain-linux_x86/lib --with-mpfr-include=/home/toolsbuild/jenkins-knuth/workspace/avr32-gnu-toolchain/avr32-gnu-toolchain-linux_x86/include
--with-gmp=/home/toolsbuild/jenkins-knuth/workspace/avr32-gnu-toolchain/avr32-gnu-toolchain-linux_x86 --with-mpc=/home/toolsbuild/jenkins-knuth/workspace/avr32-gnu-toolchain/avr32-gnu-toolchain-linux_x86 --enable-__cxa_atexit --disable-shared --with-newlib --with-pkgversion=AVR_32_bit_GNU_Toolchain_3.4.2_435 --with-bugurl=http://www
.atmel.com/avr
Thread model: single
gcc version 4.4.7 (AVR_32_bit_GNU_Toolchain_3.4.2_435)
--- arch/avr32/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/avr32/Makefile +1 -1
@@ -11,7 +11,7 @@ all: uImage vmlinux.elf KBUILD_DEFCONFIG := atstk1002_defconfig -KBUILD_CFLAGS += -pipe -fno-builtin -mno-pic +KBUILD_CFLAGS += -pipe -fno-builtin -mno-pic -D__linux__ KBUILD_AFLAGS += -mrelax -mno-pic KBUILD_CFLAGS_MODULE += -mno-relax LDFLAGS_vmlinux += --relax
Greg Kroah-Hartman
maintainerPATCH 15/97 cifs: ensure that uncached writes handle unmapped areas correctly
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
commit 5d81de8e8667da7135d3a32a964087c0faf5483f upstream.
It's possible for userland to pass down an iovec via writev() that has a bogus user pointer in it. If that happens and we're doing an uncached write, then we can end up getting less bytes than we expect from the call to iov_iter_copy_from_user. This is CVE-2014-0069
cifs_iovec_write isn't set up to handle that situation however. It'll blindly keep chugging through the page array and not filling those pages with anything useful. Worse yet, we'll later end up with a negative number in wdata->tailsz, which will confuse the sending routines and cause an oops at the very least.
Fix this by having the copy phase of cifs_iovec_write stop copying data in this situation and send the last write as a short one. At the same time, we want to avoid sending a zero-length write to the server, so break out of the loop and set rc to -EFAULT if that happens. This also allows us to handle the case where no address in the iovec is valid.
[Note: Marking this for stable on v3.4+ kernels, but kernels as old as
v2.6.38 may have a similar problem and may need similar fix]
--- fs/cifs/file.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-)
fs/cifs/file.c +34 -3
@@ -2353,7 +2353,7 @@ cifs_iovec_write(struct file *file, cons unsigned long nr_segs, loff_t *poffset) { unsigned long nr_pages, i; -size_t copied, len, cur_len; +size_t bytes, copied, len, cur_len;ssize_t total_written =0 ;loff_t offset;struct iov_iter it;
@@ -2408,14 +2408,45 @@ cifs_iovec_write(struct file *file, cons save_len = cur_len;for (i =0 ; i < nr_pages; i++) { - copied = min_t(const size_t, cur_len, PAGE_SIZE); + bytes = min_t(const size_t, cur_len, PAGE_SIZE); copied =iov_iter_copy_from_user (wdata->pages[i], &it, -0 , copied); +0 , bytes); cur_len -= copied;iov_iter_advance (&it, copied); +/* +* If we didn't copy as much as we expected, then that +* may mean we trod into an unmapped area. Stop copying +* at that point. On the next pass through the big +* loop, we'll likely end up getting a zero-length +* write and bailing out of it. +*/ +if (copied < bytes) +break ; } cur_len = save_len - cur_len; +/* +* If we have no data to send, then that probably means that +* the copy above failed altogether. That's most likely because +* the address in the iovec was bogus. Set the rc to -EFAULT, +* free anything we allocated and bail out. +*/ +if (!cur_len) { +for (i =0 ; i < nr_pages; i++) +put_page (wdata->pages[i]); +kfree (wdata); + rc = -EFAULT ; +break ; + } + +/* +* i + 1 now represents the number of pages we actually used in +* the copy phase above. Bring nr_pages down to that, and free +* any pages that we didn't use. +*/ +for ( ; nr_pages > i +1 ; nr_pages--) +put_page (wdata->pages[nr_pages -1 ]); + wdata->sync_mode =WB_SYNC_ALL ; wdata->nr_pages = nr_pages; wdata->offset = (__u64 )offset;
Greg Kroah-Hartman
maintainerPATCH 16/97 CIFS: Fix too big maxBuf size for SMB3 mounts
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Shilovsky <[email protected]>
commit 2365c4eaf077c48574ab6f143960048fc0f31518 upstream.
SMB3 servers can respond with MaxTransactSize of more than 4M that can cause a memory allocation error returned from kmalloc in a lock codepath. Also the client doesn't support multicredit requests now and allows buffer sizes of 65536 bytes only. Set MaxTransactSize to this maximum supported value.
--- fs/cifs/smb2glob.h | 3 +++ fs/cifs/smb2ops.c | 14 ++++---------- fs/cifs/smb2pdu.c | 3 +++ 3 files changed, 10 insertions(+), 10 deletions(-)
fs/cifs/smb2glob.h +3 -0
@@ -55,4 +55,7 @@#define SMB2_NTLMV2_SESSKEY_SIZE (16)#define SMB2_HMACSHA256_SIZE (32) +/* Maximum buffer size value we can send with 1 credit */ +#define SMB2_MAX_BUFFER_SIZE 65536 +#endif /* _SMB2_GLOB_H */
fs/cifs/smb2ops.c +4 -10
@@ -181,11 +181,8 @@ smb2_negotiate_wsize(struct cifs_tcon *t/* start with specified wsize, or default */ wsize = volume_info->wsize ? volume_info->wsize :CIFS_DEFAULT_IOSIZE ; wsize = min_t(unsigned int, wsize, server->max_write); -/* -* limit write size to 2 ** 16, because we don't support multicredit -* requests now. -*/ - wsize = min_t(unsigned int, wsize, 2 << 15); +/* set it to the maximum buffer size value we can send with 1 credit */ + wsize = min_t(unsigned int, wsize, SMB2_MAX_BUFFER_SIZE);return wsize; }
@@ -199,11 +196,8 @@ smb2_negotiate_rsize(struct cifs_tcon *t/* start with specified rsize, or default */ rsize = volume_info->rsize ? volume_info->rsize :CIFS_DEFAULT_IOSIZE ; rsize = min_t(unsigned int, rsize, server->max_read); -/* -* limit write size to 2 ** 16, because we don't support multicredit -* requests now. -*/ - rsize = min_t(unsigned int, rsize, 2 << 15); +/* set it to the maximum buffer size value we can send with 1 credit */ + rsize = min_t(unsigned int, rsize, SMB2_MAX_BUFFER_SIZE);return rsize; }
fs/cifs/smb2pdu.c +3 -0
@@ -408,6 +408,9 @@ SMB2_negotiate(const unsigned int xid, s server->dialect =le16_to_cpu (rsp->DialectRevision); server->maxBuf =le32_to_cpu (rsp->MaxTransactSize); +/* set it to the maximum buffer size value we can send with 1 credit */ + server->maxBuf = min_t(unsigned int, le32_to_cpu(rsp->MaxTransactSize), +SMB2_MAX_BUFFER_SIZE ); server->max_read =le32_to_cpu (rsp->MaxReadSize); server->max_write =le32_to_cpu (rsp->MaxWriteSize);/* BB Do we need to validate the SecurityMode? */
Greg Kroah-Hartman
maintainerPATCH 17/97 rtl8187: fix regression on MIPS without coherent DMA
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit b6213e413a4e0c66548153516b074df14f9d08e0 upstream.
This patch fixes regression caused by commit a16dad77634 "MIPS: Fix potencial corruption". That commit fixes one corruption scenario in cost of adding another one, which actually start to cause crashes on Yeeloong laptop when rtl8187 driver is used.
For correct DMA read operation on machines without DMA coherence, kernel have to invalidate cache, such it will refill later with new data that device wrote to memory, when that data is needed to process. We can only invalidate full cache line. Hence when cache line includes both dma buffer and some other data (written in cache, but not yet in main memory), the other data can not hit memory due to invalidation. That happen on rtl8187 where struct rtl8187_priv fields are located just before and after small buffers that are passed to USB layer and DMA is performed on them.
To fix the problem we align buffers and reserve space after them to make them match cache line.
This patch does not resolve all possible MIPS problems entirely, for that we have to assure that we always map cache aligned buffers for DMA, what can be complex or even not possible. But patch fixes visible and reproducible regression and seems other possible corruptions do not happen in practice, since Yeeloong laptop works stable without rtl8187 driver.
Bug report:
https://bugzilla.kernel.org/show_bug.cgi?id=54391
--- drivers/net/wireless/rtl818x/rtl8187/rtl8187.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/wireless/rtl818x/rtl8187/rtl8187.h +8 -2
@@ -15,6 +15,8 @@#ifndef RTL8187_H #define RTL8187_H +#include <linux/cache.h> +#include "rtl818x.h" #include "leds.h"
@@ -139,7 +141,10 @@ struct rtl8187_priv {u8 aifsn[4 ];u8 rfkill_mask;struct { -__le64 buf; +union { +__le64 buf; +u8 dummy1[L1_CACHE_BYTES ]; + }____cacheline_aligned ;struct sk_buff_head queue; } b_tx_status;/* This queue is used by both -b and non-b devices */ struct mutex io_mutex;
@@ -147,7 +152,8 @@ struct rtl8187_priv {u8 bits8;__le16 bits16;__le32 bits32; - } *io_dmabuf; +u8 dummy2[L1_CACHE_BYTES ]; + } *io_dmabuf____cacheline_aligned ;bool rfkill_off;u16 seqno; };
Greg Kroah-Hartman
maintainerPATCH 18/97 rtlwifi: Fix incorrect return from rtl_ps_enable_nic()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olivier Langlois <[email protected]>
commit 2e8c5e56b307271c2dab6f8bfd1d8a3822ca2390 upstream.
rtl_ps_enable_nic() is called from loops that will loop until this function returns true or a maximum number of retries is performed.
hw_init() returns non-zero on error. In that situation return false to restore the original design intent to retry hw init when it fails.
--- drivers/net/wireless/rtlwifi/ps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/rtlwifi/ps.c +1 -1
@@ -48,7 +48,7 @@ bool rtl_ps_enable_nic(struct ieee80211_/*<2> Enable Adapter */ if (rtlpriv->cfg->ops->hw_init (hw)) -return 1 ; +return false;RT_CLEAR_PS_LEVEL (ppsc,RT_RF_OFF_LEVL_HALT_NIC );/*<3> Enable Interrupt */
Greg Kroah-Hartman
maintainerPATCH 19/97 rtlwifi: rtl8192ce: Fix too long disable of IRQs
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olivier Langlois <[email protected]>
commit f78bccd79ba3cd9d9664981b501d57bdb81ab8a4 upstream.
rtl8192ce is disabling for too long the local interrupts during hw initiatialisation when performing scans
The observable symptoms in dmesg can be:
- underruns from ALSA playback
- clock freezes (tstamps do not change for several dmesg entries until irqs are finaly reenabled):
[ 250.817669] rtlwifi:rtl_op_config():<0-0-0> 0x100 [ 250.817685] rtl8192ce:_rtl92ce_phy_set_rf_power_state():<0-1-0> IPS Set eRf nic enable [ 250.817732] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.817796] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.817910] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.818024] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.818139] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.818253] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.818367] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.818472] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.818472] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.818472] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.818472] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:18051d59:11 [ 250.818472] rtl8192ce:_rtl92ce_init_mac():<0-1-0> reg0xec:98053f15:10 [ 250.818472] rtl8192ce:rtl92ce_sw_led_on():<0-1-0> LedAddr:4E ledpin=1 [ 250.818472] rtl8192c_common:rtl92c_download_fw():<0-1-0> Firmware Version(49), Signature(0x88c1),Size(32) [ 250.818472] rtl8192ce:rtl92ce_enable_hw_security_config():<0-1-0> PairwiseEncAlgorithm = 0 GroupEncAlgorithm = 0 [ 250.818472] rtl8192ce:rtl92ce_enable_hw_security_config():<0-1-0> The SECR-value cc [ 250.818472] rtl8192c_common:rtl92c_dm_check_txpower_tracking_thermal_meter():<0-1-0> Schedule TxPowerTracking direct call!! [ 250.818472] rtl8192c_common:rtl92c_dm_txpower_tracking_callback_thermalmeter():<0-1-0> rtl92c_dm_txpower_tracking_callback_thermalmeter [ 250.818472] rtl8192c_common:rtl92c_dm_txpower_tracking_callback_thermalmeter():<0-1-0> Readback Thermal Meter = 0xe pre thermal meter 0xf eeprom_thermalmeter 0xf [ 250.818472] rtl8192c_common:rtl92c_dm_txpower_tracking_callback_thermalmeter():<0-1-0> Initial pathA ele_d reg0xc80 = 0x40000000, ofdm_index=0xc [ 250.818472] rtl8192c_common:rtl92c_dm_txpower_tracking_callback_thermalmeter():<0-1-0> Initial reg0xa24 = 0x90e1317, cck_index=0xc, ch14 0 [ 250.818472] rtl8192c_common:rtl92c_dm_txpower_tracking_callback_thermalmeter():<0-1-0> Readback Thermal Meter = 0xe pre thermal meter 0xf eeprom_thermalmeter 0xf delta 0x1 delta_lck 0x0 delta_iqk 0x0 [ 250.818472] rtl8192c_common:rtl92c_dm_txpower_tracking_callback_thermalmeter():<0-1-0> <=== [ 250.818472] rtl8192c_common:rtl92c_dm_initialize_txpower_tracking_thermalmeter():<0-1-0> pMgntInfo->txpower_tracking = 1 [ 250.818472] rtl8192ce:rtl92ce_led_control():<0-1-0> ledaction 3 [ 250.818472] rtl8192ce:rtl92ce_sw_led_on():<0-1-0> LedAddr:4E ledpin=1 [ 250.818472] rtlwifi:rtl_ips_nic_on():<0-1-0> before spin_unlock_irqrestore [ 251.154656] PCM: Lost interrupts? [Q]-0 (stream=0, delta=15903, new_hw_ptr=293408, old_hw_ptr=277505)
The exact code flow that causes that is:
1. wpa_supplicant send a start_scan request to the nl80211 driver
2. mac80211 module call rtl_op_config with IEEE80211_CONF_CHANGE_IDLE
3. rtl_ips_nic_on is called which disable local irqs
4. rtl92c_phy_set_rf_power_state() is called
5. rtl_ps_enable_nic() is called and hw_init()is executed and then the interrupts on the device are enabled
A good solution could be to refactor the code to avoid calling rtl92ce_hw_init() with the irqs disabled but a quick and dirty solution that has proven to work is
to reenable the irqs during the function rtl92ce_hw_init().
I think that it is safe doing so since the device interrupt will only be enabled after the init function succeed.
--- drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +16 -2
@@ -937,14 +937,26 @@ int rtl92ce_hw_init(struct ieee80211_hwbool is92c;int err;u8 tmp_u1b; +unsigned long flags; rtlpci->being_init_adapter = true; + +/* Since this function can take a very long time (up to 350 ms) +* and can be called with irqs disabled, reenable the irqs +* to let the other devices continue being serviced. +* +* It is safe doing so since our own interrupts will only be enabled +* in a subsequent step. +*/ +local_save_flags (flags); +local_irq_enable (); + rtlpriv->intf_ops->disable_aspm (hw); rtstatus =_rtl92ce_init_mac (hw);if (!rtstatus) {RT_TRACE (rtlpriv,COMP_ERR ,DBG_EMERG ,"Init MAC failed\n" ); err =1 ; -return err; + goto exit; } err =rtl92c_download_fw (hw);
@@ -952,7 +964,7 @@ int rtl92ce_hw_init(struct ieee80211_hwRT_TRACE (rtlpriv,COMP_ERR ,DBG_WARNING ,"Failed to download FW. Init HW without FW now..\n" ); err =1 ; -return err; + goto exit; } rtlhal->last_hmeboxnum =0 ;
@@ -1032,6 +1044,8 @@ int rtl92ce_hw_init(struct ieee80211_hwRT_TRACE (rtlpriv,COMP_INIT ,DBG_TRACE ,"under 1.5V\n" ); }rtl92c_dm_init (hw); +exit: +local_irq_restore (flags); rtlpci->being_init_adapter = false;return err; }
Greg Kroah-Hartman
maintainerPATCH 20/97 6lowpan: fix lockdep splats
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 20e7c4e80dcd01dad5e6c8b32455228b8fe9c619 ]
When a device ndo_start_xmit() calls again dev_queue_xmit(), lockdep can complain because dev_queue_xmit() is re-entered and the spinlocks protecting tx queues share a common lockdep class.
Same issue was fixed for bonding/l2tp/ppp in commits
0daa2303028a6 ("[PATCH] bonding: lockdep annotation") 49ee49202b4ac ("bonding: set qdisc_tx_busylock to avoid LOCKDEP splat") 23d3b8bfb8eb2 ("net: qdisc busylock needs lockdep annotations ") 303c07db487be ("ppp: set qdisc_tx_busylock to avoid LOCKDEP splat ")
--- net/ieee802154/6lowpan.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
net/ieee802154/6lowpan.c +20 -0
@@ -1173,7 +1173,27 @@ static struct header_ops lowpan_header_o .create = lowpan_header_create, }; +static struct lock_class_key lowpan_tx_busylock; +static struct lock_class_key lowpan_netdev_xmit_lock_key; + +static void lowpan_set_lockdep_class_one (struct net_device *dev, +struct netdev_queue *txq, +void *_unused) +{ +lockdep_set_class (&txq->_xmit_lock, + &lowpan_netdev_xmit_lock_key); +} + + +static int lowpan_dev_init (struct net_device *dev) +{ +netdev_for_each_tx_queue (dev, lowpan_set_lockdep_class_one,NULL ); + dev->qdisc_tx_busylock = &lowpan_tx_busylock; +return 0 ; +} +static const struct net_device_ops lowpan_netdev_ops = { + .ndo_init = lowpan_dev_init, .ndo_start_xmit = lowpan_xmit, .ndo_set_mac_address = lowpan_set_address, };
Greg Kroah-Hartman
maintainerPATCH 21/97 9p/trans_virtio.c: Fix broken zero-copy on vmalloc() buffers
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Yao <[email protected]>
[ Upstream commit b6f52ae2f0d32387bde2b89883e3b64d88b9bfe8 ]
The 9p-virtio transport does zero copy on things larger than 1024 bytes in size. It accomplishes this by returning the physical addresses of pages to the virtio-pci device. At present, the translation is usually a bit shift.
That approach produces an invalid page address when we read/write to vmalloc buffers, such as those used for Linux kernel modules. Any attempt to load a Linux kernel module from 9p-virtio produces the following stack.
[<ffffffff814878ce>] p9_virtio_zc_request+0x45e/0x510 [<ffffffff814814ed>] p9_client_zc_rpc.constprop.16+0xfd/0x4f0 [<ffffffff814839dd>] p9_client_read+0x15d/0x240 [<ffffffff811c8440>] v9fs_fid_readn+0x50/0xa0 [<ffffffff811c84a0>] v9fs_file_readn+0x10/0x20 [<ffffffff811c84e7>] v9fs_file_read+0x37/0x70 [<ffffffff8114e3fb>] vfs_read+0x9b/0x160 [<ffffffff81153571>] kernel_read+0x41/0x60 [<ffffffff810c83ab>] copy_module_from_fd.isra.34+0xfb/0x180
Subsequently, QEMU will die printing:
qemu-system-x86_64: virtio: trying to map MMIO memory
This patch enables 9p-virtio to correctly handle this case. This not only enables us to load Linux kernel modules off virtfs, but also enables ZFS file-based vdevs on virtfs to be used without killing QEMU.
Special thanks to both Avi Kivity and Alexander Graf for their interpretation of QEMU backtraces. Without their guidence, tracking down this bug would have taken much longer. Also, special thanks to Linus Torvalds for his insightful explanation of why this should use is_vmalloc_addr() instead of is_vmalloc_or_module_addr():
https://lkml.org/lkml/2014/2/8/272
--- net/9p/trans_virtio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/9p/trans_virtio.c +4 -1
@@ -340,7 +340,10 @@ static int p9_get_mapped_pages(struct viint count = nr_pages;while (nr_pages) { s =rest_of_page (data); - pages[index++] =kmap_to_page (data); +if (is_vmalloc_addr (data)) + pages[index++] =vmalloc_to_page (data); +else + pages[index++] =kmap_to_page (data); data += s; nr_pages--; }
Greg Kroah-Hartman
maintainerPATCH 22/97 can: add destructor for self generated skbs
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Hartkopp <[email protected]>
[ Upstream commit 0ae89beb283a0db5980d1d4781c7d7be2f2810d6 ]
Self generated skbuffs in net/can/bcm.c are setting a skb->sk reference but no explicit destructor which is enforced since Linux 3.11 with commit 376c7311bdb6 (net: add a temporary sanity check in skb_orphan()).
This patch adds some helper functions to make sure that a destructor is properly defined when a sock reference is assigned to a CAN related skb. To create an unshared skb owned by the original sock a common helper function has been introduced to replace open coded functions to create CAN echo skbs.
--- drivers/net/can/dev.c | 15 +++------------ drivers/net/can/janz-ican3.c | 18 ++++-------------- drivers/net/can/vcan.c | 9 ++++----- include/linux/can/skb.h | 38 ++++++++++++++++++++++++++++++++++++++ net/can/af_can.c | 3 ++- net/can/bcm.c | 4 ++-- 6 files changed, 53 insertions(+), 34 deletions(-)
drivers/net/can/dev.c +3 -12
@@ -324,19 +324,10 @@ void can_put_echo_skb(struct sk_buff *sk }if (!priv->echo_skb[idx]) { -struct sock *srcsk = skb->sk; -if (atomic_read (&skb->users) !=1 ) { -struct sk_buff *old_skb = skb; - - skb =skb_clone (old_skb,GFP_ATOMIC ); -kfree_skb (old_skb); -if (!skb) -return ; - }else -skb_orphan (skb); - - skb->sk = srcsk; + skb =can_create_echo_skb (skb); +if (!skb) +return ;/* make settings for echo to reduce code in irq context */ skb->protocol =htons (ETH_P_CAN );
drivers/net/can/janz-ican3.c +4 -14
@@ -19,6 +19,7 @@#include <linux/netdevice.h> #include <linux/can.h> #include <linux/can/dev.h> +#include <linux/can/skb.h> #include <linux/can/error.h> #include <linux/mfd/janz.h>
@@ -1134,20 +1135,9 @@ static void ican3_handle_message(struct*/ static void ican3_put_echo_skb (struct ican3_dev *mod,struct sk_buff *skb) { -struct sock *srcsk = skb->sk; - -if (atomic_read (&skb->users) !=1 ) { -struct sk_buff *old_skb = skb; - - skb =skb_clone (old_skb,GFP_ATOMIC ); -kfree_skb (old_skb); -if (!skb) -return ; - }else { -skb_orphan (skb); - } - - skb->sk = srcsk; + skb =can_create_echo_skb (skb); +if (!skb) +return ;/* save this skb for tx interrupt echo handling */ skb_queue_tail (&mod->echoq, skb);
drivers/net/can/vcan.c +4 -5
@@ -46,6 +46,7 @@#include <linux/if_ether.h> #include <linux/can.h> #include <linux/can/dev.h> +#include <linux/can/skb.h> #include <linux/slab.h> #include <net/rtnetlink.h>
@@ -109,25 +110,23 @@ static netdev_tx_t vcan_tx(struct sk_buf stats->rx_packets++; stats->rx_bytes += cfd->len; } -kfree_skb (skb); +consume_skb (skb);return NETDEV_TX_OK ; }/* perform standard echo handling for CAN network interfaces */ if (loop) { -struct sock *srcsk = skb->sk; - skb =skb_share_check (skb,GFP_ATOMIC ); + skb =can_create_echo_skb (skb);if (!skb)return NETDEV_TX_OK ;/* receive with packet counting */ - skb->sk = srcsk;vcan_rx (skb, dev); }else {/* no looped packets => no counting */ -kfree_skb (skb); +consume_skb (skb); }return NETDEV_TX_OK ; }
include/linux/can/skb.h +38 -0
@@ -11,7 +11,9 @@#define CAN_SKB_H #include <linux/types.h> +#include <linux/skbuff.h> #include <linux/can.h> +#include <net/sock.h> /* * The struct can_skb_priv is used to transport additional information along
@@ -42,4 +44,40 @@ static inline void can_skb_reserve(strucskb_reserve (skb,sizeof (struct can_skb_priv )); } +static inline void can_skb_destructor (struct sk_buff *skb) +{ +sock_put (skb->sk); +} + +static inline void can_skb_set_owner (struct sk_buff *skb,struct sock *sk) +{ +if (sk) { +sock_hold (sk); + skb->destructor = can_skb_destructor; + skb->sk = sk; + } +} + +/* +* returns an unshared skb owned by the original sock to be echo'ed back +*/ +static inline struct sk_buff *can_create_echo_skb (struct sk_buff *skb) +{ +if (skb_shared (skb)) { +struct sk_buff *nskb =skb_clone (skb,GFP_ATOMIC ); + +if (likely (nskb)) { +can_skb_set_owner (nskb, skb->sk); +consume_skb (skb); +return nskb; + }else { +kfree_skb (skb); +return NULL ; + } + } + +/* we can assume to have an unshared skb with proper owner */ +return skb; +} +#endif /* CAN_SKB_H */
net/can/af_can.c +2 -1
@@ -57,6 +57,7 @@#include <linux/skbuff.h> #include <linux/can.h> #include <linux/can/core.h> +#include <linux/can/skb.h> #include <linux/ratelimit.h> #include <net/net_namespace.h> #include <net/sock.h>
@@ -290,7 +291,7 @@ int can_send(struct sk_buff *skb, int loreturn -ENOMEM ; } - newskb->sk = skb->sk; +can_skb_set_owner (newskb, skb->sk); newskb->ip_summed =CHECKSUM_UNNECESSARY ; newskb->pkt_type =PACKET_BROADCAST ; }
net/can/bcm.c +2 -2
@@ -268,7 +268,7 @@ static void bcm_can_tx(struct bcm_op *op/* send with loopback */ skb->dev = dev; - skb->sk = op->sk; +can_skb_set_owner (skb, op->sk);can_send (skb,1 );/* update statistics */
@@ -1223,7 +1223,7 @@ static int bcm_tx_send(struct msghdr *mscan_skb_prv (skb)->ifindex = dev->ifindex; skb->dev = dev; - skb->sk = sk; +can_skb_set_owner (skb, sk); err =can_send (skb,1 );/* send with loopback */ dev_put (dev);
Greg Kroah-Hartman
maintainerPATCH 23/97 ipv4: Fix runtime WARNING in rtmsg_ifa()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 63b5f152eb4a5bb79b9caf7ec37b4201d12f6e66 ]
On m68k/ARAnyM:
WARNING: CPU: 0 PID: 407 at net/ipv4/devinet.c:1599 0x316a99()
Modules linked in:
CPU: 0 PID: 407 Comm: ifconfig Not tainted
3.13.0-atari-09263-g0c71d68014d1 #1378
Stack from 10c4fdf0:
10c4fdf0 002ffabb 000243e8 00000000 008ced6c 00024416 00316a99 0000063f
00316a99 00000009 00000000 002501b4 00316a99 0000063f c0a86117 00000080
c0a86117 00ad0c90 00250a5a 00000014 00ad0c90 00000000 00000000 00000001
00b02dd0 00356594 00000000 00356594 c0a86117 eff6c9e4 008ced6c 00000002
008ced60 0024f9b4 00250b52 00ad0c90 00000000 00000000 00252390 00ad0c90
eff6c9e4 0000004f 00000000 00000000 eff6c9e4 8000e25c eff6c9e4 80001020
Call Trace: [<000243e8>] warn_slowpath_common+0x52/0x6c
[<00024416>] warn_slowpath_null+0x14/0x1a
[<002501b4>] rtmsg_ifa+0xdc/0xf0
[<00250a5a>] __inet_insert_ifa+0xd6/0x1c2
[<0024f9b4>] inet_abc_len+0x0/0x42
[<00250b52>] inet_insert_ifa+0xc/0x12
[<00252390>] devinet_ioctl+0x2ae/0x5d6Adding some debugging code reveals that net_fill_ifaddr() fails in
put_cacheinfo(skb, ifa->ifa_cstamp, ifa->ifa_tstamp,
preferred, valid))nla_put complains:
lib/nlattr.c:454: skb_tailroom(skb) = 12, nla_total_size(attrlen) = 20
Apparently commit 5c766d642bcaffd0c2a5b354db2068515b3846cf ("ipv4:
introduce address lifetime") forgot to take into account the addition of struct ifa_cacheinfo in inet_nlmsg_size(). Hence add it, like is already done for ipv6.
--- net/ipv4/devinet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/devinet.c +2 -1
@@ -1433,7 +1433,8 @@ static size_t inet_nlmsg_size(void) +nla_total_size (4 )/* IFA_ADDRESS */ +nla_total_size (4 )/* IFA_LOCAL */ +nla_total_size (4 )/* IFA_BROADCAST */ - +nla_total_size (IFNAMSIZ );/* IFA_LABEL */ + +nla_total_size (IFNAMSIZ )/* IFA_LABEL */ + +nla_total_size (sizeof (struct ifa_cacheinfo ));/* IFA_CACHEINFO */ }static inline u32 cstamp_delta (unsigned long cstamp)
Greg Kroah-Hartman
maintainerPATCH 25/97 netpoll: fix netconsole IPv6 setup
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sabrina Dubroca <[email protected]>
[ Upstream commit 00fe11b3c67dc670fe6391d22f1fe64e7c99a8ec ]
Currently, to make netconsole start over IPv6, the source address needs to be specified. Without a source address, netpoll_parse_options assumes we're setting up over IPv4 and the destination IPv6 address is rejected.
Check if the IP version has been forced by a source address before checking for a version mismatch when parsing the destination address.
--- net/core/netpoll.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/core/netpoll.c +3 -1
@@ -948,6 +948,7 @@ int netpoll_parse_options(struct netpoll {char *cur=opt, *delim;int ipv6; +bool ipversion_set = false;if (*cur !='@' ) {if ((delim =strchr (cur,'@' )) ==NULL )
@@ -960,6 +961,7 @@ int netpoll_parse_options(struct netpoll cur++;if (*cur !='/' ) { + ipversion_set = true;if ((delim =strchr (cur,'/' )) ==NULL ) goto parse_failed; *delim =0 ;
@@ -1002,7 +1004,7 @@ int netpoll_parse_options(struct netpoll ipv6 =netpoll_parse_ip_addr (cur, &np->remote_ip);if (ipv6 <0 ) goto parse_failed; -else if (np->ipv6 != (bool )ipv6) +else if (ipversion_set && np->ipv6 != (bool )ipv6) goto parse_failed;else np->ipv6 = (bool )ipv6;
Greg Kroah-Hartman
maintainerPATCH 27/97 tcp: tsq: fix nonagle handling
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Ogness <[email protected]>
[ Upstream commit bf06200e732de613a1277984bf34d1a21c2de03d ]
Commit 46d3ceabd8d9 ("tcp: TCP Small Queues") introduced a possible regression for applications using TCP_NODELAY.
If TCP session is throttled because of tsq, we should consult tp->nonagle when TX completion is done and allow us to send additional segment, especially if this segment is not a full MSS. Otherwise this segment is sent after an RTO.
[edumazet] : Cooked the changelog, added another fix about testing sk_wmem_alloc twice because TX completion can happen right before setting TSQ_THROTTLED bit.
This problem is particularly visible with recent auto corking, but might also be triggered with low tcp_limit_output_bytes values or NIC drivers delaying TX completion by hundred of usec, and very low rtt.
Thomas Glanzmann for example reported an iscsi regression, caused by tcp auto corking making this bug quite visible.
--- net/ipv4/tcp_output.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
net/ipv4/tcp_output.c +11 -2
@@ -686,7 +686,8 @@ static void tcp_tsq_handler(struct sockif ((1 << sk->sk_state) & (TCPF_ESTABLISHED |TCPF_FIN_WAIT1 |TCPF_CLOSING |TCPF_CLOSE_WAIT |TCPF_LAST_ACK )) -tcp_write_xmit (sk,tcp_current_mss (sk),0 ,0 ,GFP_ATOMIC ); +tcp_write_xmit (sk,tcp_current_mss (sk),tcp_sk (sk)->nonagle, +0 ,GFP_ATOMIC ); }/* * One tasklest per cpu tries to send more skbs.
@@ -1875,7 +1876,15 @@ static bool tcp_write_xmit(struct sock *if (atomic_read (&sk->sk_wmem_alloc) > limit) {set_bit (TSQ_THROTTLED , &tp->tsq_flags); -break ; +/* It is possible TX completion already happened +* before we set TSQ_THROTTLED, so we must +* test again the condition. +* We abuse smp_mb__after_clear_bit() because +* there is no smp_mb__after_set_bit() yet +*/ +smp_mb__after_clear_bit (); +if (atomic_read (&sk->sk_wmem_alloc) > limit) +break ; } limit = mss_now;
Greg Kroah-Hartman
maintainerPATCH 28/97 tg3: Fix deadlock in tg3_change_mtu()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nithin Sujir <[email protected]>
[ Upstream commit c6993dfd7db9b0c6b7ca7503a56fda9236a4710f ]
Quoting David Vrabel -
"5780 cards cannot have jumbo frames and TSO enabled together. When jumbo frames are enabled by setting the MTU, the TSO feature must be cleared. This is done indirectly by calling netdev_update_features() which will call tg3_fix_features() to actually clear the flags.
netdev_update_features() will also trigger a new netlink message for the feature change event which will result in a call to tg3_get_stats64() which deadlocks on the tg3 lock."
tg3_set_mtu() does not need to be under the tg3 lock since converting the flags to use set_bit(). Move it out to after tg3_netif_stop().
--- drivers/net/ethernet/broadcom/tg3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/tg3.c +2 -2
@@ -13777,12 +13777,12 @@ static int tg3_change_mtu(struct net_devtg3_netif_stop (tp); +tg3_set_mtu (dev, tp, new_mtu); +tg3_full_lock (tp,1 );tg3_halt (tp,RESET_KIND_SHUTDOWN ,1 ); -tg3_set_mtu (dev, tp, new_mtu); -/* Reset PHY, otherwise the read DMA engine will be in a mode that * breaks all requests to 256 bytes. */
Greg Kroah-Hartman
maintainerPATCH 30/97 usbnet: remove generic hard_header_len check
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emil Goode <[email protected]>
[ Upstream commit eb85569fe2d06c2fbf4de7b66c263ca095b397aa ]
This patch removes a generic hard_header_len check from the usbnet module that is causing dropped packages under certain circumstances for devices that send rx packets that cross urb boundaries.
One example is the AX88772B which occasionally send rx packets that cross urb boundaries where the remaining partial packet is sent with no hardware header. When the buffer with a partial packet is of less number of octets than the value of hard_header_len the buffer is discarded by the usbnet module.
With AX88772B this can be reproduced by using ping with a packet size between 1965-1976.
The bug has been reported here:
https://bugzilla.kernel.org/show_bug.cgi?id=29082
This patch introduces the following changes:
- Removes the generic hard_header_len check in the rx_complete function in the usbnet module.
- Introduces a ETH_HLEN check for skbs that are not cloned from within a rx_fixup callback.
- For safety a hard_header_len check is added to each rx_fixup callback function that could be affected by this change. These extra checks could possibly be removed by someone who has the hardware to test.
- Removes a call to dev_kfree_skb_any() and instead utilizes the dev->done list to queue skbs for cleanup.
The changes place full responsibility on the rx_fixup callback functions that clone skbs to only pass valid skbs to the usbnet_skb_return function.
--- drivers/net/usb/ax88179_178a.c | 4 ++++ drivers/net/usb/gl620a.c | 4 ++++ drivers/net/usb/mcs7830.c | 5 +++-- drivers/net/usb/net1080.c | 4 ++++ drivers/net/usb/qmi_wwan.c | 8 ++++---- drivers/net/usb/rndis_host.c | 4 ++++ drivers/net/usb/smsc75xx.c | 4 ++++ drivers/net/usb/smsc95xx.c | 4 ++++ drivers/net/usb/usbnet.c | 25 ++++++++++--------------- 9 files changed, 41 insertions(+), 21 deletions(-)
drivers/net/usb/ax88179_178a.c +4 -0
@@ -1109,6 +1109,10 @@ static int ax88179_rx_fixup(struct usbneu16 hdr_off;u32 *pkt_hdr; +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +skb_trim (skb, skb->len -4 );memcpy (&rx_hdr,skb_tail_pointer (skb),4 );le32_to_cpus (&rx_hdr);
drivers/net/usb/gl620a.c +4 -0
@@ -86,6 +86,10 @@ static int genelink_rx_fixup(struct usbnu32 size;u32 count; +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; + header = (struct gl_header *) skb->data;// get the packet count of the received skb
drivers/net/usb/mcs7830.c +3 -2
@@ -529,8 +529,9 @@ static int mcs7830_rx_fixup(struct usbne {u8 status; -if (skb->len ==0 ) { -dev_err (&dev->udev->dev,"unexpected empty rx frame\n" ); +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) { +dev_err (&dev->udev->dev,"unexpected tiny rx frame\n" );return 0 ; }
drivers/net/usb/net1080.c +4 -0
@@ -366,6 +366,10 @@ static int net1080_rx_fixup(struct usbnestruct nc_trailer *trailer;u16 hdr_len, packet_len; +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +if (!(skb->len &0x01 )) { netdev_dbg(dev->net, "rx framesize %d range %d..%d mtu %d\n", skb->len, dev->net->hard_header_len, dev->hard_mtu,
drivers/net/usb/qmi_wwan.c +4 -4
@@ -80,10 +80,10 @@ static int qmi_wwan_rx_fixup(struct usbn {__be16 proto; -/* usbnet rx_complete guarantees that skb->len is at least -* hard_header_len, so we can inspect the dest address without -* checking skb->len -*/ +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +switch (skb->data[0 ] &0xf0 ) {case 0x40 : proto =htons (ETH_P_IP );
drivers/net/usb/rndis_host.c +4 -0
@@ -494,6 +494,10 @@ EXPORT_SYMBOL_GPL(rndis_unbind);*/ int rndis_rx_fixup (struct usbnet *dev,struct sk_buff *skb) { +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +/* peripheral may have batched packets to us... */ while (likely (skb->len)) {struct rndis_data_hdr *hdr = (void *)skb->data;
drivers/net/usb/smsc75xx.c +4 -0
@@ -2108,6 +2108,10 @@ static void smsc75xx_rx_csum_offload(strstatic int smsc75xx_rx_fixup (struct usbnet *dev,struct sk_buff *skb) { +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +while (skb->len >0 ) {u32 rx_cmd_a, rx_cmd_b, align_count, size;struct sk_buff *ax_skb;
drivers/net/usb/smsc95xx.c +4 -0
@@ -1725,6 +1725,10 @@ static void smsc95xx_rx_csum_offload(strstatic int smsc95xx_rx_fixup (struct usbnet *dev,struct sk_buff *skb) { +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +while (skb->len >0 ) {u32 header, align_count;struct sk_buff *ax_skb;
drivers/net/usb/usbnet.c +10 -15
@@ -517,17 +517,19 @@ static inline void rx_process (struct us }// else network stack removes extra byte if we forced a short packet -if (skb->len) { -/* all data was already cloned from skb inside the driver */ -if (dev->driver_info->flags &FLAG_MULTI_PACKET ) -dev_kfree_skb_any (skb); -else -usbnet_skb_return (dev, skb); +/* all data was already cloned from skb inside the driver */ +if (dev->driver_info->flags &FLAG_MULTI_PACKET ) + goto done; + +if (skb->len <ETH_HLEN ) { + dev->net->stats.rx_errors++; + dev->net->stats.rx_length_errors++; +netif_dbg (dev, rx_err, dev->net,"rx length %d\n" , skb->len); + }else { +usbnet_skb_return (dev, skb);return ; } -netif_dbg (dev, rx_err, dev->net,"drop\n" ); - dev->net->stats.rx_errors++; done:skb_queue_tail (&dev->done, skb); }
@@ -549,13 +551,6 @@ static void rx_complete (struct urb *urbswitch (urb_status) {/* success */ case 0 : -if (skb->len < dev->net->hard_header_len) { - state = rx_cleanup; - dev->net->stats.rx_errors++; - dev->net->stats.rx_length_errors++; -netif_dbg (dev, rx_err, dev->net, -"rx length %d\n" , skb->len); - }break ;/* stalls need manual reset. this is rare ... except that
Greg Kroah-Hartman
maintainerPATCH 31/97 bonding: 802.3ad: make aggregator_identifier bond-private
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Bohac <[email protected]>
[ Upstream commit 163c8ff30dbe473abfbb24a7eac5536c87f3baa9 ]
aggregator_identifier is used to assign unique aggregator identifiers to aggregators of a bond during device enslaving.
aggregator_identifier is currently a global variable that is zeroed in bond_3ad_initialize().
This sequence will lead to duplicate aggregator identifiers for eth1 and eth3:
create bond0
change bond0 mode to 802.3ad
enslave eth0 to bond0 //eth0 gets agg id 1
enslave eth1 to bond0 //eth1 gets agg id 2
create bond1
change bond1 mode to 802.3ad
enslave eth2 to bond1 //aggregator_identifier is reset to 0
//eth2 gets agg id 1
enslave eth3 to bond0 //eth3 gets agg id 2
Fix this by making aggregator_identifier private to the bond.
--- drivers/net/bonding/bond_3ad.c | 6 ++---- drivers/net/bonding/bond_3ad.h | 1 + 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/bonding/bond_3ad.c +2 -4
@@ -1854,8 +1854,6 @@ void bond_3ad_initiate_agg_selection(strBOND_AD_INFO (bond).agg_select_timer = timeout; } -static u16 aggregator_identifier; -/** * bond_3ad_initialize - initialize a bond's 802.3ad parameters and structures * @bond: bonding struct to work on
@@ -1869,7 +1867,7 @@ void bond_3ad_initialize(struct bondingif (MAC_ADDRESS_COMPARE (&(BOND_AD_INFO (bond).system.sys_mac_addr), bond->dev->dev_addr)) { - aggregator_identifier =0 ; +BOND_AD_INFO (bond).aggregator_identifier =0 ;BOND_AD_INFO (bond).system.sys_priority =0xFFFF ;BOND_AD_INFO (bond).system.sys_mac_addr = *((struct mac_addr *)bond->dev->dev_addr);
@@ -1940,7 +1938,7 @@ int bond_3ad_bind_slave(struct slave *slad_initialize_agg (aggregator); aggregator->aggregator_mac_address = *((struct mac_addr *)bond->dev->dev_addr); - aggregator->aggregator_identifier = (++aggregator_identifier); + aggregator->aggregator_identifier = ++BOND_AD_INFO (bond).aggregator_identifier; aggregator->slave = slave; aggregator->is_active =0 ; aggregator->num_of_ports =0 ;
drivers/net/bonding/bond_3ad.h +1 -0
@@ -253,6 +253,7 @@ struct ad_system {struct ad_bond_info {struct ad_system system;/* 802.3ad system structure */ u32 agg_select_timer;// Timer to select aggregator after all adapter's hand shakes +u16 aggregator_identifier; };struct ad_slave_info {
Greg Kroah-Hartman
maintainerPATCH 32/97 ipv4: fix counter in_slow_tot
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Duan Jiong <[email protected]>
[ Upstream commit a6254864c08109c66a194612585afc0439005286 ]
since commit 89aef8921bf("ipv4: Delete routing cache."), the counter in_slow_tot can't work correctly.
The counter in_slow_tot increase by one when fib_lookup() return successfully in ip_route_input_slow(), but actually the dst struct maybe not be created and cached, so we can increase in_slow_tot after the dst struct is created.
--- net/ipv4/route.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/route.c +2 -2
@@ -1544,6 +1544,7 @@ static int __mkroute_input(struct sk_buf rth->rt_gateway =0 ; rth->rt_uses_gateway =0 ;INIT_LIST_HEAD (&rth->rt_uncached); +RT_CACHE_STAT_INC (in_slow_tot); rth->dst.input = ip_forward; rth->dst.output = ip_output;
@@ -1645,8 +1646,6 @@ static int ip_route_input_slow(struct skif (err !=0 ) goto no_route; -RT_CACHE_STAT_INC (in_slow_tot); -if (res.type ==RTN_BROADCAST ) goto brd_input;
@@ -1715,6 +1714,7 @@ local_input: rth->rt_gateway =0 ; rth->rt_uses_gateway =0 ;INIT_LIST_HEAD (&rth->rt_uncached); +RT_CACHE_STAT_INC (in_slow_tot);if (res.type ==RTN_UNREACHABLE ) { rth->dst.input= ip_error; rth->dst.error= -err;
Greg Kroah-Hartman
maintainerPATCH 33/97 net: sctp: fix sctp_connectx abi for ia32 emulation/compat mode
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit ffd5939381c609056b33b7585fb05a77b4c695f3 ]
SCTP's sctp_connectx() abi breaks for 64bit kernels compiled with 32bit emulation (e.g. ia32 emulation or x86_x32). Due to internal usage of 'struct sctp_getaddrs_old' which includes a struct sockaddr pointer, sizeof(param) check will always fail in kernel as the structure in 64bit kernel space is 4bytes larger than for user binaries compiled in 32bit mode. Thus, applications making use of sctp_connectx() won't be able to run under such circumstances.
Introduce a compat interface in the kernel to deal with such situations by using a 'struct compat_sctp_getaddrs_old' structure where user data is copied into it, and then sucessively transformed into a 'struct sctp_getaddrs_old' structure with the help of compat_ptr(). That fixes sctp_connectx() abi without any changes needed in user space, and lets the SCTP test suite pass when compiled in 32bit and run on 64bit kernels.
--- net/sctp/socket.c | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-)
net/sctp/socket.c +32 -9
@@ -71,6 +71,7 @@#include <linux/crypto.h> #include <linux/slab.h> #include <linux/file.h> +#include <linux/compat.h> #include <net/ip.h> #include <net/icmp.h>
@@ -1384,11 +1385,19 @@ SCTP_STATIC int sctp_setsockopt_connectx/* * New (hopefully final) interface for the API. * We use the sctp_getaddrs_old structure so that use-space library -* can avoid any unnecessary allocations. The only defferent part +* can avoid any unnecessary allocations. The only different part * is that we store the actual length of the address buffer into the -* addrs_num structure member. That way we can re-use the existing +* addrs_num structure member. That way we can re-use the existing * code. */ +#ifdef CONFIG_COMPAT +struct compat_sctp_getaddrs_old { +sctp_assoc_t assoc_id; +s32 addr_num; +compat_uptr_t addrs;/* struct sockaddr * */ +}; +#endif + SCTP_STATIC int sctp_getsockopt_connectx3(struct sock* sk, int len,char __user *optval,int __user *optlen)
@@ -1397,16 +1406,30 @@ SCTP_STATIC int sctp_getsockopt_connectxsctp_assoc_t assoc_id =0 ;int err =0 ; -if (len <sizeof (param)) -return -EINVAL ; +#ifdef CONFIG_COMPAT +if (is_compat_task ()) { +struct compat_sctp_getaddrs_old param32; -if (copy_from_user (¶m, optval,sizeof (param))) -return -EFAULT ; +if (len <sizeof (param32)) +return -EINVAL ; +if (copy_from_user (¶m32, optval,sizeof (param32))) +return -EFAULT ; - err =__sctp_setsockopt_connectx (sk, - (struct sockaddr __user *)param.addrs, - param.addr_num, &assoc_id); + param.assoc_id = param32.assoc_id; + param.addr_num = param32.addr_num; + param.addrs =compat_ptr (param32.addrs); + } else +#endif + { +if (len <sizeof (param)) +return -EINVAL ; +if (copy_from_user (¶m, optval,sizeof (param))) +return -EFAULT ; + } + err =__sctp_setsockopt_connectx (sk, (struct sockaddr __user *) + param.addrs, param.addr_num, + &assoc_id);if (err ==0 || err == -EINPROGRESS ) {if (copy_to_user (optval, &assoc_id,sizeof (assoc_id)))return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 34/97 net: add and use skb_gso_transport_seglen()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
commit de960aa9ab4decc3304959f69533eef64d05d8e8 upstream.
[ no skb_gso_seglen helper in 3.10, leave tbf alone ]
This moves part of Eric Dumazets skb_gso_seglen helper from tbf sched to skbuff core so it may be reused by upcoming ip forwarding path patch.
--- include/linux/skbuff.h | 2 ++ net/core/skbuff.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+)
include/linux/skbuff.h +2 -0
@@ -2488,6 +2488,8 @@ extern int skb_shift(struct sk_buextern struct sk_buff *skb_segment (struct sk_buff *skb,netdev_features_t features); +unsigned int skb_gso_transport_seglen (const struct sk_buff *skb); +static inline void *skb_header_pointer (const struct sk_buff *skb,int offset,int len,void *buffer) {
net/core/skbuff.c +25 -0
@@ -47,6 +47,8 @@#include <linux/in.h> #include <linux/inet.h> #include <linux/slab.h> +#include <linux/tcp.h> +#include <linux/udp.h> #include <linux/netdevice.h> #ifdef CONFIG_NET_CLS_ACT #include <net/pkt_sched.h>
@@ -3471,3 +3473,26 @@ bool skb_try_coalesce(struct sk_buff *toreturn true; }EXPORT_SYMBOL (skb_try_coalesce); + +/** +* skb_gso_transport_seglen - Return length of individual segments of a gso packet +* +* @skb: GSO skb +* +* skb_gso_transport_seglen is used to determine the real size of the +* individual segments, including Layer4 headers (TCP/UDP). +* +* The MAC/L2 or network (IP, IPv6) headers are not accounted for. +*/ +unsigned int skb_gso_transport_seglen (const struct sk_buff *skb) +{ +const struct skb_shared_info *shinfo =skb_shinfo (skb); +unsigned int hdr_len; + +if (likely (shinfo->gso_type & (SKB_GSO_TCPV4 |SKB_GSO_TCPV6 ))) + hdr_len =tcp_hdrlen (skb); +else + hdr_len =sizeof (struct udphdr ); +return hdr_len + shinfo->gso_size; +} +EXPORT_SYMBOL_GPL (skb_gso_transport_seglen);
Greg Kroah-Hartman
maintainerPATCH 35/97 net: core: introduce netif_skb_dev_features
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
commit d206940319c41df4299db75ed56142177bb2e5f6 upstream.
Will be used by upcoming ipv4 forward path change that needs to determine feature mask using skb->dst->dev instead of skb->dev.
--- include/linux/netdevice.h | 7 ++++++- net/core/dev.c | 27 ++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-)
include/linux/netdevice.h +6 -1
@@ -2761,7 +2761,12 @@ void netdev_change_features(struct net_dvoid netif_stacked_transfer_operstate (const struct net_device *rootdev,struct net_device *dev); -netdev_features_t netif_skb_features (struct sk_buff *skb); +netdev_features_t netif_skb_dev_features (struct sk_buff *skb, +const struct net_device *dev); +static inline netdev_features_t netif_skb_features (struct sk_buff *skb) +{ +return netif_skb_dev_features (skb, skb->dev); +}static inline bool net_gso_ok (netdev_features_t features,int gso_type) {
net/core/dev.c +16 -11
@@ -2374,7 +2374,7 @@ EXPORT_SYMBOL(netdev_rx_csum_fault);* 2. No high memory really exists on this machine. */ -static int illegal_highdma (struct net_device *dev,struct sk_buff *skb) +static int illegal_highdma (const struct net_device *dev,struct sk_buff *skb) {#ifdef CONFIG_HIGHMEM int i;
@@ -2454,46 +2454,51 @@ static int dev_gso_segment(struct sk_buf }static netdev_features_t harmonize_features (struct sk_buff *skb, -__be16 protocol,netdev_features_t features) +__be16 protocol, +const struct net_device *dev, +netdev_features_t features) {if (skb->ip_summed !=CHECKSUM_NONE && !can_checksum_protocol (features, protocol)) { features &= ~NETIF_F_ALL_CSUM ; - }else if (illegal_highdma (skb->dev, skb)) { + }else if (illegal_highdma (dev, skb)) { features &= ~NETIF_F_SG ; }return features; } -netdev_features_t netif_skb_features (struct sk_buff *skb) +netdev_features_t netif_skb_dev_features (struct sk_buff *skb, +const struct net_device *dev) {__be16 protocol = skb->protocol; -netdev_features_t features = skb->dev->features; +netdev_features_t features = dev->features; -if (skb_shinfo (skb)->gso_segs > skb->dev->gso_max_segs) +if (skb_shinfo (skb)->gso_segs > dev->gso_max_segs) features &= ~NETIF_F_GSO_MASK ;if (protocol ==htons (ETH_P_8021Q ) || protocol ==htons (ETH_P_8021AD )) {struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data; protocol = veh->h_vlan_encapsulated_proto; }else if (!vlan_tx_tag_present (skb)) { -return harmonize_features (skb, protocol, features); +return harmonize_features (skb, protocol, dev, features); } - features &= (skb->dev->vlan_features |NETIF_F_HW_VLAN_CTAG_TX | + features &= (dev->vlan_features |NETIF_F_HW_VLAN_CTAG_TX |NETIF_F_HW_VLAN_STAG_TX );if (protocol !=htons (ETH_P_8021Q ) && protocol !=htons (ETH_P_8021AD )) { -return harmonize_features (skb, protocol, features); +return harmonize_features (skb, protocol, dev, features); }else { features &=NETIF_F_SG |NETIF_F_HIGHDMA |NETIF_F_FRAGLIST |NETIF_F_GEN_CSUM |NETIF_F_HW_VLAN_CTAG_TX |NETIF_F_HW_VLAN_STAG_TX ; -return harmonize_features (skb, protocol, features); +return harmonize_features (skb, protocol, dev, features); } + +return harmonize_features (skb, protocol, dev, features); } -EXPORT_SYMBOL (netif_skb_features); +EXPORT_SYMBOL (netif_skb_dev_features);/* * Returns true if either:
Greg Kroah-Hartman
maintainerPATCH 36/97 net: ip, ipv6: handle gso skbs in forwarding path
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
commit fe6cc55f3a9a053482a76f5a6b2257cee51b4663 upstream.
Marcelo Ricardo Leitner reported problems when the forwarding link path has a lower mtu than the incoming one if the inbound interface supports GRO.
Given:
Host <mtu1500> R1 <mtu1200> R2
Host sends tcp stream which is routed via R1 and R2. R1 performs GRO.
In this case, the kernel will fail to send ICMP fragmentation needed messages (or pkt too big for ipv6), as GSO packets currently bypass dstmtu checks in forward path. Instead, Linux tries to send out packets exceeding the mtu.
When locking route MTU on Host (i.e., no ipv4 DF bit set), R1 does not fragment the packets when forwarding, and again tries to send out packets exceeding R1-R2 link mtu.
This alters the forwarding dstmtu checks to take the individual gso segment lengths into account.
For ipv6, we send out pkt too big error for gso if the individual segments are too big.
For ipv4, we either send icmp fragmentation needed, or, if the DF bit is not set, perform software segmentation and let the output path create fragments when the packet is leaving the machine.
It is not 100% correct as the error message will contain the headers of the GRO skb instead of the original/segmented one, but it seems to work fine in my (limited) tests.
Eric Dumazet suggested to simply shrink mss via ->gso_size to avoid sofware segmentation.
However it turns out that skb_segment() assumes skb nr_frags is related to mss size so we would BUG there. I don't want to mess with it considering Herbert and Eric disagree on what the correct behavior should be.
Hannes Frederic Sowa notes that when we would shrink gso_size skb_segment would then also need to deal with the case where SKB_MAX_FRAGS would be exceeded.
This uses sofware segmentation in the forward path when we hit ipv4 non-DF packets and the outgoing link mtu is too small. Its not perfect, but given the lack of bug reports wrt. GRO fwd being broken this is a rare case anyway. Also its not like this could not be improved later once the dust settles.
--- include/linux/skbuff.h | 17 +++++++++++ net/ipv4/ip_forward.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++-- net/ipv6/ip6_output.c | 17 ++++++++++- 3 files changed, 101 insertions(+), 4 deletions(-)
include/linux/skbuff.h +17 -0
@@ -2913,5 +2913,22 @@ static inline bool skb_head_is_locked(co {return !skb->head_frag ||skb_cloned (skb); } + +/** +* skb_gso_network_seglen - Return length of individual segments of a gso packet +* +* @skb: GSO skb +* +* skb_gso_network_seglen is used to determine the real size of the +* individual segments, including Layer3 (IP, IPv6) and L4 headers (TCP/UDP). +* +* The MAC/L2 header is not accounted for. +*/ +static inline unsigned int skb_gso_network_seglen (const struct sk_buff *skb) +{ +unsigned int hdr_len =skb_transport_header (skb) - +skb_network_header (skb); +return hdr_len +skb_gso_transport_seglen (skb); +}#endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */
net/ipv4/ip_forward.c +69 -2
89 lines not on this page · raw message
net/ipv6/ip6_output.c +15 -2
@@ -345,6 +345,20 @@ static inline int ip6_forward_finish(strreturn dst_output (skb); } +static bool ip6_pkt_too_big (const struct sk_buff *skb,unsigned int mtu) +{ +if (skb->len <= mtu || skb->local_df) +return false; + +if (IP6CB (skb)->frag_max_size &&IP6CB (skb)->frag_max_size > mtu) +return true; + +if (skb_is_gso (skb) &&skb_gso_network_seglen (skb) <= mtu) +return false; + +return true; +} +int ip6_forward (struct sk_buff *skb) {struct dst_entry *dst =skb_dst (skb);
@@ -467,8 +481,7 @@ int ip6_forward(struct sk_buff *skb)if (mtu <IPV6_MIN_MTU ) mtu =IPV6_MIN_MTU ; -if ((!skb->local_df && skb->len > mtu && !skb_is_gso (skb)) || - (IP6CB (skb)->frag_max_size &&IP6CB (skb)->frag_max_size > mtu)) { +if (ip6_pkt_too_big (skb, mtu)) {/* Again, force OUTPUT device used as source address */ skb->dev = dst->dev;icmpv6_send (skb,ICMPV6_PKT_TOOBIG ,0 , mtu);
Greg Kroah-Hartman
maintainerPATCH 37/97 net: use __GFP_NORETRY for high order allocations
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit ed98df3361f059db42786c830ea96e2d18b8d4db ]
sock_alloc_send_pskb() & sk_page_frag_refill()
have a loop trying high order allocations to prepare skb with low number of fragments as this increases performance.
Problem is that under memory pressure/fragmentation, this can trigger OOM while the intent was only to try the high order allocations, then fallback to order-0 allocations.
We had various reports from unexpected regressions.
According to David, setting __GFP_NORETRY should be fine, as the asynchronous compaction is still enabled, and this will prevent OOM from kicking as in :
CFSClientEventm invoked oom-killer: gfp_mask=0x42d0, order=3, oom_adj=0, oom_score_adj=0, oom_score_badness=2 (enabled),memcg_scoring=disabled CFSClientEventm
Call Trace: [<ffffffff8043766c>] dump_header+0xe1/0x23e [<ffffffff80437a02>] oom_kill_process+0x6a/0x323 [<ffffffff80438443>] out_of_memory+0x4b3/0x50d [<ffffffff8043a4a6>] __alloc_pages_may_oom+0xa2/0xc7 [<ffffffff80236f42>] __alloc_pages_nodemask+0x1002/0x17f0 [<ffffffff8024bd23>] alloc_pages_current+0x103/0x2b0 [<ffffffff8028567f>] sk_page_frag_refill+0x8f/0x160 [<ffffffff80295fa0>] tcp_sendmsg+0x560/0xee0 [<ffffffff802a5037>] inet_sendmsg+0x67/0x100 [<ffffffff80283c9c>] __sock_sendmsg_nosec+0x6c/0x90 [<ffffffff80283e85>] sock_sendmsg+0xc5/0xf0 [<ffffffff802847b6>] __sys_sendmsg+0x136/0x430 [<ffffffff80284ec8>] sys_sendmsg+0x88/0x110 [<ffffffff80711472>] system_call_fastpath+0x16/0x1b
Out of Memory: Kill process 2856 (bash) score 9999 or sacrifice child
--- net/core/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/sock.c +1 -1
@@ -1814,7 +1814,7 @@ bool sk_page_frag_refill(struct sock *skgfp_t gfp = sk->sk_allocation;if (order) - gfp |= __GFP_COMP | __GFP_NOWARN; + gfp |= __GFP_COMP | __GFP_NOWARN | __GFP_NORETRY; pfrag->page =alloc_pages (gfp, order);if (likely (pfrag->page)) { pfrag->offset =0 ;
Greg Kroah-Hartman
maintainerPATCH 38/97 memcg: fix endless loop caused by mem_cgroup_iter
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Hocko <[email protected]>
commit ecc736fc3c71c411a9d201d8588c9e7e049e5d8c upstream.
Hugh has reported an endless loop when the hardlimit reclaim sees the same group all the time. This might happen when the reclaim races with the memcg removal.
shrink_zone
[rmdir root]
mem_cgroup_iter(root, NULL, reclaim)
// prev = NULL
rcu_read_lock()
mem_cgroup_iter_load
last_visited = iter->last_visited // gets root || NULL
css_tryget(last_visited) // failed
last_visited = NULL [1]
memcg = root = __mem_cgroup_iter_next(root, NULL)
mem_cgroup_iter_update
iter->last_visited = root;
reclaim->generation = iter->generation mem_cgroup_iter(root, root, reclaim)
// prev = root
rcu_read_lock
mem_cgroup_iter_load
last_visited = iter->last_visited // gets root
css_tryget(last_visited) // failed
[1]The issue seemed to be introduced by commit 5f5781619718 ("memcg: relax memcg iter caching") which has replaced unconditional css_get/css_put by css_tryget/css_put for the cached iterator.
This patch fixes the issue by skipping css_tryget on the root of the tree walk in mem_cgroup_iter_load and symmetrically doesn't release it in mem_cgroup_iter_update.
--- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/memcontrol.c +2 -2
@@ -1220,7 +1220,7 @@ struct mem_cgroup *mem_cgroup_iter(strucif (dead_count == iter->last_dead_count) {smp_rmb (); last_visited = iter->last_visited; -if (last_visited && +if (last_visited && last_visited != root && !css_tryget (&last_visited->css)) last_visited =NULL ; }
@@ -1229,7 +1229,7 @@ struct mem_cgroup *mem_cgroup_iter(struc memcg =__mem_cgroup_iter_next (root, last_visited);if (reclaim) { -if (last_visited) +if (last_visited && last_visited != root)css_put (&last_visited->css); iter->last_visited = memcg;
Greg Kroah-Hartman
maintainerPATCH 39/97 fs: fix iversion handling
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
commit dff6efc326a4d5f305797d4a6bba14f374fdd633 upstream.
Currently notify_change directly updates i_version for size updates, which not only is counter to how all other fields are updated through struct iattr, but also breaks XFS, which need inode updates to happen under its own lock, and synchronized to the structure that gets written to the log.
Remove the update in the common code, and it to btrfs and ext4, XFS already does a proper updaste internally and currently gets a double update with the existing code.
IMHO this is 3.13 and -stable material and should go in through the XFS tree.
--- fs/attr.c | 5 ----- fs/btrfs/inode.c | 8 ++++++-- fs/ext4/inode.c | 4 ++++ 3 files changed, 10 insertions(+), 7 deletions(-)
fs/attr.c +0 -5
@@ -182,11 +182,6 @@ int notify_change(struct dentry * dentryreturn -EPERM ; } -if ((ia_valid &ATTR_SIZE ) &&IS_I_VERSION (inode)) { -if (attr->ia_size != inode->i_size) -inode_inc_iversion (inode); - } -if ((ia_valid &ATTR_MODE )) {umode_t amode = attr->ia_mode;/* Flag setting protected by i_mutex */
fs/btrfs/inode.c +6 -2
@@ -4527,8 +4527,12 @@ static int btrfs_setsize(struct inode *i* these flags set. For all other operations the VFS set these flags * explicitly if it wants a timestamp update. */ -if (newsize != oldsize && (!(mask & (ATTR_CTIME |ATTR_MTIME )))) - inode->i_ctime = inode->i_mtime =current_fs_time (inode->i_sb); +if (newsize != oldsize) { +inode_inc_iversion (inode); +if (!(mask & (ATTR_CTIME |ATTR_MTIME ))) + inode->i_ctime = inode->i_mtime = +current_fs_time (inode->i_sb); + }if (newsize > oldsize) {truncate_pagecache (inode, oldsize, newsize);
fs/ext4/inode.c +4 -0
@@ -4704,6 +4704,10 @@ int ext4_setattr(struct dentry *dentry,if (attr->ia_size > sbi->s_bitmap_maxbytes)return -EFBIG ; } + +if (IS_I_VERSION (inode) && attr->ia_size != inode->i_size) +inode_inc_iversion (inode); +if (S_ISREG (inode->i_mode) && (attr->ia_size < inode->i_size)) {if (ext4_should_order_data (inode)) {
Greg Kroah-Hartman
maintainerPATCH 40/97 ALSA: usb-audio: work around KEF X300A firmware bug
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Clemens Ladisch <[email protected]>
commit 624aef494f86ed0c58056361c06347ad62b26806 upstream.
When the driver tries to access Function Unit 10, the KEF X300A speakers' firmware apparently locks up, making even PCM streaming impossible. Work around this by ignoring this FU.
--- sound/usb/mixer_maps.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/usb/mixer_maps.c +9 -0
@@ -322,6 +322,11 @@ static struct usbmix_name_map hercules_u { 0 } /* terminator */ }; +static const struct usbmix_name_map kef_x300a_map[] = { + {10 ,NULL },/* firmware locks up (?) when we try to access this FU */ + {0 } +}; +/* * Control map entries */
@@ -409,6 +414,10 @@ static struct usbmix_ctl_map usbmix_ctl_ .id = USB_ID(0x200c, 0x1018), .map = ebox44_map, }, + { + .id = USB_ID(0x27ac, 0x1000), + .map = kef_x300a_map, + }, { 0 } /* terminator */ };
Greg Kroah-Hartman
maintainerPATCH 41/97 ALSA: hda/ca0132 - setup/cleanup streams
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsin-Yu Chao <[email protected]>
commit 28fba95087a7f3d107a3a6728aef7dbfaf3fd782 upstream.
When a HDMI stream is opened with the same stream tag as a following opened stream to ca0132, audio will be heard from two ports simultaneously.
Fix this issue by change to use snd_hda_codec_setup_stream and snd_hda_codec_cleanup_stream instead, so that an inactive stream can be marked as 'dirty' when found with a conflict stream tag, and then get purified.
--- sound/pci/hda/patch_ca0132.c | 66 ++++--------------------------------------- 1 file changed, 7 insertions(+), 59 deletions(-)
sound/pci/hda/patch_ca0132.c +7 -59
@@ -2662,60 +2662,6 @@ static bool dspload_wait_loaded(struct h }/* -* PCM stuffs -*/ -static void ca0132_setup_stream (struct hda_codec *codec,hda_nid_t nid, -u32 stream_tag, -int channel_id,int format) -{ -unsigned int oldval, newval; - -if (!nid) -return ; - -snd_printdd ( -"ca0132_setup_stream: NID=0x%x, stream=0x%x, " -"channel=%d, format=0x%x\n" , - nid, stream_tag, channel_id, format); - -/* update the format-id if changed */ - oldval =snd_hda_codec_read (codec, nid,0 , -AC_VERB_GET_STREAM_FORMAT , -0 ); -if (oldval != format) { -msleep (20 ); -snd_hda_codec_write (codec, nid,0 , -AC_VERB_SET_STREAM_FORMAT , - format); - } - - oldval =snd_hda_codec_read (codec, nid,0 ,AC_VERB_GET_CONV ,0 ); - newval = (stream_tag <<4 ) | channel_id; -if (oldval != newval) { -snd_hda_codec_write (codec, nid,0 , -AC_VERB_SET_CHANNEL_STREAMID , - newval); - } -} - -static void ca0132_cleanup_stream (struct hda_codec *codec,hda_nid_t nid) -{ -unsigned int val; - -if (!nid) -return ; - -snd_printdd (KERN_INFO "ca0132_cleanup_stream: NID=0x%x\n" , nid); - - val =snd_hda_codec_read (codec, nid,0 ,AC_VERB_GET_CONV ,0 ); -if (!val) -return ; - -snd_hda_codec_write (codec, nid,0 ,AC_VERB_SET_STREAM_FORMAT ,0 ); -snd_hda_codec_write (codec, nid,0 ,AC_VERB_SET_CHANNEL_STREAMID ,0 ); -} - -/* * PCM callbacks */ static int ca0132_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
@@ -2726,7 +2672,7 @@ static int ca0132_playback_pcm_prepare(s {struct ca0132_spec *spec = codec->spec; -ca0132_setup_stream (codec, spec->dacs[0 ], stream_tag,0 , format); +snd_hda_codec_setup_stream (codec, spec->dacs[0 ], stream_tag,0 , format);return 0 ; }
@@ -2745,7 +2691,7 @@ static int ca0132_playback_pcm_cleanup(sif (spec->effects_switch[PLAY_ENHANCEMENT -EFFECT_START_NID ])msleep (50 ); -ca0132_cleanup_stream (codec, spec->dacs[0 ]); +snd_hda_codec_cleanup_stream (codec, spec->dacs[0 ]);return 0 ; }
@@ -2824,8 +2770,8 @@ static int ca0132_capture_pcm_prepare(st {struct ca0132_spec *spec = codec->spec; -ca0132_setup_stream (codec, spec->adcs[substream->number], - stream_tag,0 , format); +snd_hda_codec_setup_stream (codec, spec->adcs[substream->number], + stream_tag,0 , format);return 0 ; }
@@ -2839,7 +2785,7 @@ static int ca0132_capture_pcm_cleanup(stif (spec->dsp_state ==DSP_DOWNLOADING )return 0 ; -ca0132_cleanup_stream (codec, hinfo->nid); +snd_hda_codec_cleanup_stream (codec, hinfo->nid);return 0 ; }
@@ -4742,6 +4688,8 @@ static int patch_ca0132(struct hda_codecreturn err; codec->patch_ops = ca0132_patch_ops; + codec->pcm_format_first =1 ; + codec->no_sticky_stream =1 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 42/97 ALSA: hda/ca0132 - Fix recording from mode id 0x8
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsin-Yu Chao <[email protected]>
commit 13c12dbe3a2ce17227f7ddef652b6a53c78fa51f upstream.
Incorrect ADC is picked in ca0132_capture_pcm_prepare(), where it assumes multiple streams while there is one stream per ADC. Note that ca0132_capture_pcm_cleanup() already does the right thing.
The Chromebook Pixel has a microphone under the keyboard that is attached to node id 0x8. Before this fix, recording would always go to the main internal mic (node id 0x7).
--- sound/pci/hda/patch_ca0132.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/pci/hda/patch_ca0132.c +1 -3
@@ -2768,9 +2768,7 @@ static int ca0132_capture_pcm_prepare(stunsigned int format, struct snd_pcm_substream *substream) { - struct ca0132_spec *spec = codec->spec; - -snd_hda_codec_setup_stream (codec, spec->adcs[substream->number], + snd_hda_codec_setup_stream(codec, hinfo->nid, stream_tag, 0, format);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 43/97 ALSA: hda - Enable front audio jacks on one HP desktop model
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Wang <[email protected]>
commit 1de7ca5e844866f56bebb2fc47fa18e090677e88 upstream.
The front headphone and mic jackes on a HP desktop model (Vendor Id:0x111d76c7 Subsystem Id: 0x103c2b17) can not work, the codec on this machine has 8 physical ports, 6 of them are routed to rear jackes and all of them work very well, while the remaining 2 ports are routed to front headphone and mic jackes, but the corresponding pin complex node are not defined correctly.
After apply this fix, the front audio jackes can work very well.
[trivial fix of enum definition by tiwai]
--- sound/pci/hda/patch_sigmatel.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
sound/pci/hda/patch_sigmatel.c +13 -0
@@ -83,6 +83,7 @@ enum {STAC_DELL_M6_BOTH ,STAC_DELL_EQ ,STAC_ALIENWARE_M17X , +STAC_92HD89XX_HP_FRONT_JACK , STAC_92HD73XX_MODELS };
@@ -1775,6 +1776,12 @@ static const struct hda_pintbl intel_dg4 {} }; +static const struct hda_pintbl stac92hd89xx_hp_front_jack_pin_configs[] = { + {0x0a ,0x02214030 }, + {0x0b ,0x02A19010 }, + {} +}; +static void stac92hd73xx_fixup_ref (struct hda_codec *codec,const struct hda_fixup *fix,int action) {
@@ -1893,6 +1900,10 @@ static const struct hda_fixup stac92hd73 [STAC_92HD73XX_NO_JD ] = { .type =HDA_FIXUP_FUNC , .v.func = stac92hd73xx_fixup_no_jd, + }, + [STAC_92HD89XX_HP_FRONT_JACK ] = { + .type =HDA_FIXUP_PINS , + .v.pins = stac92hd89xx_hp_front_jack_pin_configs, } };
@@ -1953,6 +1964,8 @@ static const struct snd_pci_quirk stac92 "Alienware M17x", STAC_ALIENWARE_M17X), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490, "Alienware M17x R3", STAC_DELL_EQ), + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x2b17, + "unknown HP", STAC_92HD89XX_HP_FRONT_JACK), {}/* terminator */ };
Greg Kroah-Hartman
maintainerPATCH 44/97 kvm: x86: fix emulator buffer overflow (CVE-2014-0049)
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Honig <[email protected]>
commit a08d3b3b99efd509133946056531cdf8f3a0c09b upstream.
The problem occurs when the guest performs a pusha with the stack address pointing to an mmio address (or an invalid guest physical address) to start with, but then extending into an ordinary guest physical address. When doing repeated emulated pushes emulator_read_write sets mmio_needed to 1 on the first one. On a later push when the stack points to regular memory, mmio_nr_fragments is set to 0, but mmio_is_needed is not set to 0.
As a result, KVM exits to userspace, and then returns to complete_emulated_mmio. In complete_emulated_mmio vcpu->mmio_cur_fragment is incremented. The termination condition of vcpu->mmio_cur_fragment == vcpu->mmio_nr_fragments is never achieved. The code bounces back and fourth to userspace incrementing mmio_cur_fragment past it's buffer. If the guest does nothing else it eventually leads to a a crash on a memcpy from invalid memory address.
However if a guest code can cause the vm to be destroyed in another vcpu with excellent timing, then kvm_clear_async_pf_completion_queue can be used by the guest to control the data that's pointed to by the call to cancel_work_item, which can be used to gain execution.
--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/x86.c +1 -1
@@ -5982,7 +5982,7 @@ static int complete_emulated_mmio(struct frag->len -= len; } -if (vcpu->mmio_cur_fragment == vcpu->mmio_nr_fragments) { +if (vcpu->mmio_cur_fragment >= vcpu->mmio_nr_fragments) { vcpu->mmio_needed =0 ;if (vcpu->mmio_is_write)return 1 ;
Greg Kroah-Hartman
maintainerPATCH 45/97 ASoC: max98090: sync regcache on entering STANDBY
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dylan Reid <[email protected]>
commit c42c8922c46d33ed769e99618bdfba06866a0c72 upstream.
Sync regcache when entering STANDBY from OFF. ON isn't entered with OFF as the current state, so the registers were not being re-synced after suspend/resume.
The 98088 and 98095 already call regcache_sync from STANDBY.
--- sound/soc/codecs/max98090.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
sound/soc/codecs/max98090.c +10 -10
@@ -1755,16 +1755,6 @@ static int max98090_set_bias_level(strucswitch (level) {case SND_SOC_BIAS_ON : -if (codec->dapm.bias_level ==SND_SOC_BIAS_OFF ) { - ret =regcache_sync (max98090->regmap); - -if (ret !=0 ) { -dev_err (codec->dev, -"Failed to sync cache: %d\n" , ret); -return ret; - } - } -if (max98090->jack_state ==M98090_JACK_STATE_HEADSET ) {/* * Set to normal bias level.
@@ -1778,6 +1768,16 @@ static int max98090_set_bias_level(strucbreak ;case SND_SOC_BIAS_STANDBY : +if (codec->dapm.bias_level ==SND_SOC_BIAS_OFF ) { + ret =regcache_sync (max98090->regmap); +if (ret !=0 ) { +dev_err (codec->dev, +"Failed to sync cache: %d\n" , ret); +return ret; + } + } +break ; +case SND_SOC_BIAS_OFF :/* Set internal pull-up to lowest power mode */ snd_soc_update_bits(codec, M98090_REG_JACK_DETECT,
Greg Kroah-Hartman
maintainerPATCH 46/97 ASoC: wm8770: Fix wrong number of enum items
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 7a6c0a58dc824523966f212c76322d47c5b0e6fe upstream.
wm8770 codec driver defines ain_enum with a wrong number of items.
Use SOC_ENUM_DOUBLE_DECL() macro and it's automatically fixed.
--- sound/soc/codecs/wm8770.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8770.c +2 -2
@@ -196,8 +196,8 @@ static const char *ain_text[] = {"AIN5" ,"AIN6" ,"AIN7" ,"AIN8" }; -static const struct soc_enum ain_enum = -SOC_ENUM_DOUBLE (WM8770_ADCMUX ,0 ,4 ,8 , ain_text); +static SOC_ENUM_DOUBLE_DECL(ain_enum, + WM8770_ADCMUX, 0, 4, ain_text);static const struct snd_kcontrol_new ain_mux =SOC_DAPM_ENUM ("Capture Mux" , ain_enum);
Greg Kroah-Hartman
maintainerPATCH 47/97 ASoC: da732x: Mark DC offset control registers volatile
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Brown <[email protected]>
commit 75306820248e26d15d84acf4e297b9fb27dd3bb2 upstream.
The driver reads from the DC offset control registers during callibration but since the registers are marked as volatile and there is a register cache the values will not be read from the hardware after the first reading rendering the callibration ineffective.
It appears that the driver was originally written for the ASoC level register I/O code but converted to regmap prior to merge and this issue was missed during the conversion as the framework level volatile register functionality was not being used.
--- sound/soc/codecs/da732x.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
sound/soc/codecs/da732x.c +12 -0
@@ -1268,11 +1268,23 @@ static struct snd_soc_dai_driver da732x_ }, }; +static bool da732x_volatile (struct device *dev,unsigned int reg) +{ +switch (reg) { +case DA732X_REG_HPL_DAC_OFF_CNTL : +case DA732X_REG_HPR_DAC_OFF_CNTL : +return true; +default : +return false; + } +} +static const struct regmap_config da732x_regmap = { .reg_bits =8 , .val_bits =8 , .max_register =DA732X_MAX_REG , + .volatile_reg = da732x_volatile, .reg_defaults = da732x_reg_cache, .num_reg_defaults =ARRAY_SIZE (da732x_reg_cache), .cache_type =REGCACHE_RBTREE ,
Greg Kroah-Hartman
maintainerPATCH 48/97 ASoC: sta32x: Fix cache sync
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit 70ff00f82a6af0ff68f8f7b411738634ce2f20d0 upstream.
codec->control_data contains a pointer to the regmap struct of the device, not to the device private data. Use snd_soc_codec_get_drvdata() instead.
The issue was introduced in commit 29fdf4fbbe ("ASoC: sta32x: Convert to regmap").
--- sound/soc/codecs/sta32x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/sta32x.c +1 -1
@@ -331,7 +331,7 @@ static int sta32x_sync_coef_shadow(strucstatic int sta32x_cache_sync (struct snd_soc_codec *codec) { -struct sta32x_priv *sta32x = codec->control_data; +struct sta32x_priv *sta32x =snd_soc_codec_get_drvdata (codec);unsigned int mute;int rc;
Greg Kroah-Hartman
maintainerPATCH 50/97 ASoC: sta32x: Fix array access overflow
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 025c3fa9256d4c54506b7a29dc3befac54f5c68d upstream.
Preset EQ enum of sta32x codec driver declares too many number of items and it may lead to the access over the actual array size.
Use SOC_ENUM_SINGLE_DECL() helper and it's automatically fixed.
--- sound/soc/codecs/sta32x.c | 72 +++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 36 deletions(-)
sound/soc/codecs/sta32x.c +36 -36
@@ -187,42 +187,42 @@ static const unsigned int sta32x_limiter 13, 16, TLV_DB_SCALE_ITEM(-1500, 300, 0), }; -static const struct soc_enum sta32x_drc_ac_enum = -SOC_ENUM_SINGLE (STA32X_CONFD ,STA32X_CONFD_DRC_SHIFT , -2 , sta32x_drc_ac); -static const struct soc_enum sta32x_auto_eq_enum = -SOC_ENUM_SINGLE (STA32X_AUTO1 ,STA32X_AUTO1_AMEQ_SHIFT , -3 , sta32x_auto_eq_mode); -static const struct soc_enum sta32x_auto_gc_enum = -SOC_ENUM_SINGLE (STA32X_AUTO1 ,STA32X_AUTO1_AMGC_SHIFT , -4 , sta32x_auto_gc_mode); -static const struct soc_enum sta32x_auto_xo_enum = -SOC_ENUM_SINGLE (STA32X_AUTO2 ,STA32X_AUTO2_XO_SHIFT , -16 , sta32x_auto_xo_mode); -static const struct soc_enum sta32x_preset_eq_enum = -SOC_ENUM_SINGLE (STA32X_AUTO3 ,STA32X_AUTO3_PEQ_SHIFT , -32 , sta32x_preset_eq_mode); -static const struct soc_enum sta32x_limiter_ch1_enum = -SOC_ENUM_SINGLE (STA32X_C1CFG , STA32X_CxCFG_LS_SHIFT, -3 , sta32x_limiter_select); -static const struct soc_enum sta32x_limiter_ch2_enum = -SOC_ENUM_SINGLE (STA32X_C2CFG , STA32X_CxCFG_LS_SHIFT, -3 , sta32x_limiter_select); -static const struct soc_enum sta32x_limiter_ch3_enum = -SOC_ENUM_SINGLE (STA32X_C3CFG , STA32X_CxCFG_LS_SHIFT, -3 , sta32x_limiter_select); -static const struct soc_enum sta32x_limiter1_attack_rate_enum = -SOC_ENUM_SINGLE (STA32X_L1AR , STA32X_LxA_SHIFT, -16 , sta32x_limiter_attack_rate); -static const struct soc_enum sta32x_limiter2_attack_rate_enum = -SOC_ENUM_SINGLE (STA32X_L2AR , STA32X_LxA_SHIFT, -16 , sta32x_limiter_attack_rate); -static const struct soc_enum sta32x_limiter1_release_rate_enum = -SOC_ENUM_SINGLE (STA32X_L1AR , STA32X_LxR_SHIFT, -16 , sta32x_limiter_release_rate); -static const struct soc_enum sta32x_limiter2_release_rate_enum = -SOC_ENUM_SINGLE (STA32X_L2AR , STA32X_LxR_SHIFT, -16 , sta32x_limiter_release_rate); +static SOC_ENUM_SINGLE_DECL(sta32x_drc_ac_enum, + STA32X_CONFD, STA32X_CONFD_DRC_SHIFT, + sta32x_drc_ac); +static SOC_ENUM_SINGLE_DECL(sta32x_auto_eq_enum, + STA32X_AUTO1, STA32X_AUTO1_AMEQ_SHIFT, + sta32x_auto_eq_mode); +static SOC_ENUM_SINGLE_DECL(sta32x_auto_gc_enum, + STA32X_AUTO1, STA32X_AUTO1_AMGC_SHIFT, + sta32x_auto_gc_mode); +static SOC_ENUM_SINGLE_DECL(sta32x_auto_xo_enum, + STA32X_AUTO2, STA32X_AUTO2_XO_SHIFT, + sta32x_auto_xo_mode); +static SOC_ENUM_SINGLE_DECL(sta32x_preset_eq_enum, + STA32X_AUTO3, STA32X_AUTO3_PEQ_SHIFT, + sta32x_preset_eq_mode); +static SOC_ENUM_SINGLE_DECL(sta32x_limiter_ch1_enum, + STA32X_C1CFG, STA32X_CxCFG_LS_SHIFT, + sta32x_limiter_select); +static SOC_ENUM_SINGLE_DECL(sta32x_limiter_ch2_enum, + STA32X_C2CFG, STA32X_CxCFG_LS_SHIFT, + sta32x_limiter_select); +static SOC_ENUM_SINGLE_DECL(sta32x_limiter_ch3_enum, + STA32X_C3CFG, STA32X_CxCFG_LS_SHIFT, + sta32x_limiter_select); +static SOC_ENUM_SINGLE_DECL(sta32x_limiter1_attack_rate_enum, + STA32X_L1AR, STA32X_LxA_SHIFT, + sta32x_limiter_attack_rate); +static SOC_ENUM_SINGLE_DECL(sta32x_limiter2_attack_rate_enum, + STA32X_L2AR, STA32X_LxA_SHIFT, + sta32x_limiter_attack_rate); +static SOC_ENUM_SINGLE_DECL(sta32x_limiter1_release_rate_enum, + STA32X_L1AR, STA32X_LxR_SHIFT, + sta32x_limiter_release_rate); +static SOC_ENUM_SINGLE_DECL(sta32x_limiter2_release_rate_enum, + STA32X_L2AR, STA32X_LxR_SHIFT, + sta32x_limiter_release_rate);/* byte array controls for setting biquad, mixer, scaling coefficients; * for biquads all five coefficients need to be set in one go,
Greg Kroah-Hartman
maintainerPATCH 51/97 ASoC: wm8958-dsp: Fix firmware block loading
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit 548da08fc1e245faf9b0d7c41ecd8e07984fc332 upstream.
The codec->control_data contains a pointer to the device's regmap struct. But wm8994_bulk_write() expects a pointer to the parent wm8998 device.
The issue was introduced in commit d9a7666f ("ASoC: Remove ASoC-specific WM8994 I/O code").
--- sound/soc/codecs/wm8958-dsp2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm8958-dsp2.c +1 -1
@@ -153,7 +153,7 @@ static int wm8958_dsp2_fw(struct snd_soc data32 &=0xffffff ; -wm8994_bulk_write (codec->control_data, +wm8994_bulk_write (wm8994->wm8994, data32 &0xffffff , block_len /2 , (void *)(data +8 ));
Greg Kroah-Hartman
maintainerPATCH 52/97 SUNRPC: Fix races in xs_nospace()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit 06ea0bfe6e6043cb56a78935a19f6f8ebc636226 upstream.
When a send failure occurs due to the socket being out of buffer space, we call xs_nospace() in order to have the RPC task wait until the socket has drained enough to make it worth while trying again. The current patch fixes a race in which the socket is drained before we get round to setting up the machinery in xs_nospace(), and which is reported to cause hangs.
--- net/sunrpc/xprtsock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/sunrpc/xprtsock.c +5 -1
@@ -502,6 +502,7 @@ static int xs_nospace(struct rpc_task *tstruct rpc_rqst *req = task->tk_rqstp;struct rpc_xprt *xprt = req->rq_xprt; struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); +struct sock *sk = transport->inet;int ret = -EAGAIN ; dprintk("RPC: %5u xmit incomplete (%u left of %u)\n",
@@ -519,7 +520,7 @@ static int xs_nospace(struct rpc_task *t* window size */ set_bit (SOCK_NOSPACE , &transport->sock->flags); - transport->inet->sk_write_pending++; + sk->sk_write_pending++;/* ...and wait for more buffer space */ xprt_wait_for_buffer_space (task, xs_nospace_callback); }
@@ -529,6 +530,9 @@ static int xs_nospace(struct rpc_task *t }spin_unlock_bh (&xprt->transport_lock); + +/* Race breaker in case memory is freed before above code is called */ + sk->sk_write_space (sk);return ret; }
Greg Kroah-Hartman
maintainerPATCH 53/97 powerpc/le: Ensure that the stop-self RTAS token is handled correctly
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Breeds <[email protected]>
commit 41dd03a94c7d408d2ef32530545097f7d1befe5c upstream.
Currently we're storing a host endian RTAS token in rtas_stop_self_args.token. We then pass that directly to rtas. This is fine on big endian however on little endian the token is not what we expect.
This will typically result in hitting:
panic("Alas, I survived.\n");To fix this we always use the stop-self token in host order and always convert it to be32 before passing this to rtas.
--- arch/powerpc/platforms/pseries/hotplug-cpu.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/powerpc/platforms/pseries/hotplug-cpu.c +11 -11
@@ -34,12 +34,7 @@#include "offline_states.h" /* This version can't take the spinlock, because it never returns */ -static struct rtas_args rtas_stop_self_args = { - .token =RTAS_UNKNOWN_SERVICE , - .nargs =0 , - .nret =1 , - .rets = &rtas_stop_self_args.args[0 ], -}; +static int rtas_stop_self_token =RTAS_UNKNOWN_SERVICE ; static DEFINE_PER_CPU(enum cpu_state_vals, preferred_offline_state) =CPU_STATE_OFFLINE ;
@@ -92,15 +87,20 @@ void set_default_offline_state(int cpu)static void rtas_stop_self (void ) { -struct rtas_args *args = &rtas_stop_self_args; +struct rtas_args args = { + .token =cpu_to_be32 (rtas_stop_self_token), + .nargs =0 , + .nret =1 , + .rets = &args.args[0 ], + };local_irq_disable (); -BUG_ON (args->token ==RTAS_UNKNOWN_SERVICE ); +BUG_ON (rtas_stop_self_token ==RTAS_UNKNOWN_SERVICE );printk ("cpu %u (hwid %u) Ready to die...\n" ,smp_processor_id (),hard_smp_processor_id ()); -enter_rtas (__pa (args)); +enter_rtas (__pa (&args));panic ("Alas, I survived.\n" ); }
@@ -391,10 +391,10 @@ static int __init pseries_cpu_hotplug_in } } - rtas_stop_self_args.token =rtas_token ("stop-self" ); + rtas_stop_self_token =rtas_token ("stop-self" ); qcss_tok =rtas_token ("query-cpu-stopped-state" ); -if (rtas_stop_self_args.token ==RTAS_UNKNOWN_SERVICE || +if (rtas_stop_self_token ==RTAS_UNKNOWN_SERVICE || qcss_tok ==RTAS_UNKNOWN_SERVICE ) {printk (KERN_INFO "CPU Hotplug not supported by firmware " "- disabling.\n" );
Greg Kroah-Hartman
maintainerPATCH 54/97 powerpc/crashdump : Fix page frame number check in copy_oldmem_page
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Dufour <[email protected]>
commit f5295bd8ea8a65dc5eac608b151386314cb978f1 upstream.
In copy_oldmem_page, the current check using max_pfn and min_low_pfn to decide if the page is backed or not, is not valid when the memory layout is not continuous.
This happens when running as a QEMU/KVM guest, where RTAS is mapped higher in the memory. In that case max_pfn points to the end of RTAS, and a hole between the end of the kdump kernel and RTAS is not backed by PTEs. As a consequence, the kdump kernel is crashing in copy_oldmem_page when accessing in a direct way the pages in that hole.
This fix relies on the memblock's service memblock_is_region_memory to check if the read page is part or not of the directly accessible memory.
--- arch/powerpc/kernel/crash_dump.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/powerpc/kernel/crash_dump.c +5 -3
@@ -108,17 +108,19 @@ ssize_t copy_oldmem_page(unsigned long p size_t csize, unsigned long offset, int userbuf) { void *vaddr; +phys_addr_t paddr;if (!csize)return 0 ; csize =min_t (size_t, csize,PAGE_SIZE ); + paddr = pfn <<PAGE_SHIFT ; -if ((min_low_pfn < pfn) && (pfn < max_pfn)) { - vaddr =__va (pfn <<PAGE_SHIFT ); +if (memblock_is_region_memory (paddr, csize)) { + vaddr =__va (paddr); csize =copy_oldmem_vaddr (vaddr, buf, csize, offset, userbuf); }else { - vaddr =__ioremap (pfn <<PAGE_SHIFT ,PAGE_SIZE ,0 ); + vaddr =__ioremap (paddr,PAGE_SIZE ,0 ); csize =copy_oldmem_vaddr (vaddr, buf, csize, offset, userbuf);iounmap (vaddr); }
Greg Kroah-Hartman
maintainerPATCH 55/97 ahci: disable NCQ on Samsung pci-e SSDs on macbooks
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Levente Kurusa <[email protected]>
commit 67809f85d31eac600f6b28defa5386c9d2a13b1d upstream.
Samsung's pci-e SSDs with device ID 0x1600 which are found on some macbooks time out on NCQ commands. Blacklist NCQ on the device so that the affected machines can at least boot.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=60731
--- drivers/ata/ahci.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/ata/ahci.c +14 -0
@@ -61,6 +61,7 @@ enum board_ids {/* board IDs by feature in alphabetical order */ board_ahci, board_ahci_ign_iferr, + board_ahci_noncq, board_ahci_nosntf, board_ahci_yes_fbs,
@@ -119,6 +120,13 @@ static const struct ata_port_info ahci_p .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, + [board_ahci_noncq] = { + AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ), + .flags = AHCI_FLAG_COMMON, + .pio_mask = ATA_PIO4, + .udma_mask = ATA_UDMA6, + .port_ops = &ahci_ops, + }, [board_ahci_nosntf] = { AHCI_HFLAGS (AHCI_HFLAG_NO_SNTF), .flags = AHCI_FLAG_COMMON,
@@ -450,6 +458,12 @@ static const struct pci_device_id ahci_p { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci }, /* ASM1061 */ { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1062 */ +/* +* Samsung SSDs found on some macbooks. NCQ times out. +* https://bugzilla.kernel.org/show_bug.cgi?id=60731 +*/ + { PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_noncq }, +/* Enmotus */ { PCI_DEVICE(0x1c44, 0x8000), board_ahci },
Greg Kroah-Hartman
maintainerPATCH 56/97 x86: dma-mapping: fix GFP_ATOMIC macro usage
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
commit c091c71ad2218fc50a07b3d1dab85783f3b77efd upstream.
GFP_ATOMIC is not a single gfp flag, but a macro which expands to the other flags, where meaningful is the LACK of __GFP_WAIT flag. To check if caller wants to perform an atomic allocation, the code must test for a lack of the __GFP_WAIT flag. This patch fixes the issue introduced in v3.5-rc1.
--- arch/x86/kernel/pci-dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kernel/pci-dma.c +3 -1
@@ -100,8 +100,10 @@ void *dma_generic_alloc_coherent(struct flag |= __GFP_ZERO; again: page =NULL ; -if (!(flag &GFP_ATOMIC )) +/* CMA can be used only in the context which permits sleeping */ +if (flag & __GFP_WAIT) page =dma_alloc_from_contiguous (dev, count,get_order (size)); +/* fallback */ if (!page) page =alloc_pages_node (dev_to_node (dev), flag,get_order (size));if (!page)
Greg Kroah-Hartman
maintainerPATCH 57/97 perf/x86: Fix event scheduling
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 26e61e8939b1fe8729572dabe9a9e97d930dd4f6 upstream.
Vince "Super Tester" Weaver reported a new round of syscall fuzzing (Trinity) failures, with perf WARN_ON()s triggering. He also provided traces of the failures.
This is I think the relevant bit:
> pec_1076_warn-2804 [000] d... 147.926153: x86_pmu_disable: x86_pmu_disable
> pec_1076_warn-2804 [000] d... 147.926153: x86_pmu_state: Events: {
> pec_1076_warn-2804 [000] d... 147.926156: x86_pmu_state: 0: state: .R config: ffffffffffffffff ( (null))
> pec_1076_warn-2804 [000] d... 147.926158: x86_pmu_state: 33: state: AR config: 0 (ffff88011ac99800)
> pec_1076_warn-2804 [000] d... 147.926159: x86_pmu_state: }
> pec_1076_warn-2804 [000] d... 147.926160: x86_pmu_state: n_events: 1, n_added: 0, n_txn: 1
> pec_1076_warn-2804 [000] d... 147.926161: x86_pmu_state: Assignment: {
> pec_1076_warn-2804 [000] d... 147.926162: x86_pmu_state: 0->33 tag: 1 config: 0 (ffff88011ac99800)
> pec_1076_warn-2804 [000] d... 147.926163: x86_pmu_state: }
> pec_1076_warn-2804 [000] d... 147.926166: collect_events: Adding event: 1 (ffff880119ec8800)So we add the insn:p event (fd[23]).
At this point we should have:
n_events = 2, n_added = 1, n_txn = 1
> pec_1076_warn-2804 [000] d... 147.926170: collect_events: Adding event: 0 (ffff8800c9e01800) > pec_1076_warn-2804 [000] d... 147.926172: collect_events: Adding event: 4 (ffff8800cbab2c00)
We try and add the {BP,cycles,br_insn} group (fd[3], fd[4], fd[15]). These events are 0:cycles and 4:br_insn, the BP event isn't x86_pmu so that's not visible.
group_sched_in() pmu->start_txn() /* nop - BP pmu */ event_sched_in() event->pmu->add()
So here we should end up with:
0: n_events = 3, n_added = 2, n_txn = 2
4: n_events = 4, n_added = 3, n_txn = 3
But seeing the below state on x86_pmu_enable(), the must have failed, because the 0 and 4 events aren't there anymore.
Looking at group_sched_in(), since the BP is the leader, its event_sched_in() must have succeeded, for otherwise we would not have seen the sibling adds.
But since neither 0 or 4 are in the below state; their event_sched_in() must have failed; but I don't see why, the complete state: 0,0,1:p,4 fits perfectly fine on a core2.
However, since we try and schedule 4 it means the 0 event must have succeeded! Therefore the 4 event must have failed, its failure will have put group_sched_in() into the fail path, which will call:
event_sched_out() event->pmu->del()
on 0 and the BP event.
Now x86_pmu_del() will reduce n_events; but it will not reduce n_added; giving what we see below:
n_event = 2, n_added = 2, n_txn = 2
> pec_1076_warn-2804 [000] d... 147.926177: x86_pmu_enable: x86_pmu_enable
> pec_1076_warn-2804 [000] d... 147.926177: x86_pmu_state: Events: {
> pec_1076_warn-2804 [000] d... 147.926179: x86_pmu_state: 0: state: .R config: ffffffffffffffff ( (null))
> pec_1076_warn-2804 [000] d... 147.926181: x86_pmu_state: 33: state: AR config: 0 (ffff88011ac99800)
> pec_1076_warn-2804 [000] d... 147.926182: x86_pmu_state: }
> pec_1076_warn-2804 [000] d... 147.926184: x86_pmu_state: n_events: 2, n_added: 2, n_txn: 2
> pec_1076_warn-2804 [000] d... 147.926184: x86_pmu_state: Assignment: {
> pec_1076_warn-2804 [000] d... 147.926186: x86_pmu_state: 0->33 tag: 1 config: 0 (ffff88011ac99800)
> pec_1076_warn-2804 [000] d... 147.926188: x86_pmu_state: 1->0 tag: 1 config: 1 (ffff880119ec8800)
> pec_1076_warn-2804 [000] d... 147.926188: x86_pmu_state: }
> pec_1076_warn-2804 [000] d... 147.926190: x86_pmu_enable: S0: hwc->idx: 33, hwc->last_cpu: 0, hwc->last_tag: 1 hwc->state: 0So the problem is that x86_pmu_del(), when called from a group_sched_in() that fails (for whatever reason), and without x86_pmu TXN support (because the leader is !x86_pmu), will corrupt the n_added state.
--- arch/x86/kernel/cpu/perf_event.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kernel/cpu/perf_event.c +3 -0
@@ -1165,6 +1165,9 @@ static void x86_pmu_del(struct perf_evenfor (i =0 ; i < cpuc->n_events; i++) {if (event == cpuc->event_list[i]) { +if (i >= cpuc->n_events - cpuc->n_added) + --cpuc->n_added; +if (x86_pmu.put_event_constraints) x86_pmu.put_event_constraints (cpuc, event);
Greg Kroah-Hartman
maintainerPATCH 58/97 ata: enable quirk from jmicron JMB350 for JMB394
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Denis V. Lunev" <[email protected]>
commit efb9e0f4f43780f0ae0c6428d66bd03e805c7539 upstream.
Without the patch the kernel generates the following error.
ata11.15: SATA link up 1.5 Gbps (SStatus 113 SControl 310) ata11.15: Port Multiplier vendor mismatch '0x197b' != '0x123' ata11.15: PMP revalidation failed (errno=-19) ata11.15: failed to recover PMP after 5 tries, giving up
This patch helps to bypass this error and the device becomes functional.
--- drivers/ata/libata-pmp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/ata/libata-pmp.c +5 -2
@@ -447,8 +447,11 @@ static void sata_pmp_quirks(struct ata_p* otherwise. Don't try hard to recover it. */ ap->pmp_link[ap->nr_pmp_links -1 ].flags |=ATA_LFLAG_NO_RETRY ; - }else if (vendor ==0x197b && devid ==0x2352 ) { -/* chip found in Thermaltake BlackX Duet, jmicron JMB350? */ + }else if (vendor ==0x197b && (devid ==0x2352 || devid ==0x0325 )) { +/* +* 0x2352: found in Thermaltake BlackX Duet, jmicron JMB350? +* 0x0325: jmicron JMB394. +*/ ata_for_each_link (link, ap,EDGE ) {/* SRST breaks detection and disks get misclassified * LPM disabled to avoid potential problems
Greg Kroah-Hartman
maintainerPATCH 59/97 sata_sil: apply MOD15WRITE quirk to TOSHIBA MK2561GSYN
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 9f9c47f00ce99329b1a82e2ac4f70f0fe3db549c upstream.
It's a bit odd to see a newer device showing mod15write; however, the reported behavior is highly consistent and other factors which could contribute seem to have been verified well enough. Also, both sata_sil itself and the drive are fairly outdated at this point making the risk of this change fairly low. It is possible, probably likely, that other drive models in the same family have the same problem; however, for now, let's just add the specific model which was tested.
References: http://lkml.kernel.org/g/[email protected]
--- drivers/ata/sata_sil.c | 1 + 1 file changed, 1 insertion(+)
drivers/ata/sata_sil.c +1 -0
@@ -157,6 +157,7 @@ static const struct sil_drivelist { { "ST380011ASL", SIL_QUIRK_MOD15WRITE }, { "ST3120022ASL", SIL_QUIRK_MOD15WRITE }, { "ST3160021ASL", SIL_QUIRK_MOD15WRITE }, + { "TOSHIBA MK2561GSYN", SIL_QUIRK_MOD15WRITE }, { "Maxtor 4D060H3", SIL_QUIRK_UDMA5MAX }, { } };
Greg Kroah-Hartman
maintainerPATCH 60/97 cpufreq: powernow-k8: Initialize per-cpu data-structures properly
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Srivatsa S. Bhat" <[email protected]>
commit c3274763bfc3bf1ececa269ed6e6c4d7ec1c3e5e upstream.
The powernow-k8 driver maintains a per-cpu data-structure called powernow_data that is used to perform the frequency transitions. It initializes this data structure only for the policy->cpu. So, accesses to this data structure by other CPUs results in various problems because they would have been uninitialized.
Specifically, if a cpu (!= policy->cpu) invokes the drivers' ->get() function, it returns 0 as the KHz value, since its per-cpu memory doesn't point to anything valid. This causes problems during suspend/resume since cpufreq_update_policy() tries to enforce this (0 KHz) as the current frequency of the CPU, and this madness gets propagated to adjust_jiffies() as well. Eventually, lots of things start breaking down, including the r8169 ethernet card, in one particularly interesting case reported by Pierre Ossman.
Fix this by initializing the per-cpu data-structures of all the CPUs in the policy appropriately.
References: https://bugzilla.kernel.org/show_bug.cgi?id=70311
--- drivers/cpufreq/powernow-k8.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/cpufreq/powernow-k8.c +7 -3
@@ -1100,7 +1100,7 @@ static int __cpuinit powernowk8_cpu_init {struct powernow_k8_data *data;struct init_on_cpu init_on_cpu; -int rc; +int rc, cpu;smp_call_function_single (pol->cpu, check_supported_cpu, &rc,1 );if (rc)
@@ -1169,7 +1169,9 @@ static int __cpuinit powernowk8_cpu_initpr_debug ("cpu_init done, current fid 0x%x, vid 0x%x\n" , data->currfid, data->currvid); -per_cpu (powernow_data, pol->cpu) = data; +/* Point all the CPUs in this policy to the same data */ +for_each_cpu (cpu, pol->cpus) +per_cpu (powernow_data, cpu) = data;return 0 ;
@@ -1184,6 +1186,7 @@ err_out:static int powernowk8_cpu_exit (struct cpufreq_policy *pol) {struct powernow_k8_data *data =per_cpu (powernow_data, pol->cpu); +int cpu;if (!data)return -EINVAL ;
@@ -1194,7 +1197,8 @@ static int powernowk8_cpu_exit(struct cpkfree (data->powernow_table);kfree (data); -per_cpu (powernow_data, pol->cpu) =NULL ; +for_each_cpu (cpu, pol->cpus) +per_cpu (powernow_data, cpu) =NULL ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 61/97 PCI: Enable INTx if BIOS left them disabled
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Helgaas <[email protected]>
commit 1f42db786b14a31bf807fc41ee5583a00c08fcb1 upstream.
Some firmware leaves the Interrupt Disable bit set even if the device uses INTx interrupts. Clear Interrupt Disable so we get those interrupts.
Based on the report mentioned below, if the user selects the "EHCI only" option in the Intel Baytrail BIOS, the EHCI device is handed off to the OS with the PCI_COMMAND_INTX_DISABLE bit set.
--- drivers/pci/pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pci/pci.c +10 -0
@@ -1119,6 +1119,8 @@ EXPORT_SYMBOL_GPL(pci_load_and_free_savestatic int do_pci_enable_device (struct pci_dev *dev,int bars) {int err; +u16 cmd; +u8 pin; err =pci_set_power_state (dev,PCI_D0 );if (err <0 && err != -EIO )
@@ -1128,6 +1130,14 @@ static int do_pci_enable_device(struct preturn err;pci_fixup_device (pci_fixup_enable, dev); +pci_read_config_byte (dev,PCI_INTERRUPT_PIN , &pin); +if (pin) { +pci_read_config_word (dev,PCI_COMMAND , &cmd); +if (cmd &PCI_COMMAND_INTX_DISABLE ) +pci_write_config_word (dev,PCI_COMMAND , + cmd & ~PCI_COMMAND_INTX_DISABLE ); + } +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 62/97 ACPI / PCI: Fix memory leak in acpi_pci_irq_enable()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Nowicki <[email protected]>
commit b685f3b1744061aa9ad822548ba9c674de5be7c6 upstream.
acpi_pci_link_allocate_irq() can return negative gsi even if entry != NULL. For that case we have a memory leak, so free entry before returning from acpi_pci_irq_enable() for gsi < 0.
--- drivers/acpi/pci_irq.c | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/pci_irq.c +1 -0
@@ -432,6 +432,7 @@ int acpi_pci_irq_enable(struct pci_dev * pin_name(pin)); } +kfree (entry);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 63/97 i7core_edac: Fix PCI device reference count
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean Delvare <[email protected]>
commit c0f5eeed0f4cef4f05b74883a7160e7edde58b6a upstream.
The reference count changes done by pci_get_device can be a little misleading when the usage diverges from the most common scheme. The reference count of the device passed as the last parameter is always decreased, even if the function returns no new device. So if we are going to try alternative device IDs, we must manually increment the device reference count before each retry. If we don't, we end up decreasing the reference count, and after a few modprobe/rmmod cycles the PCI devices will vanish.
In other words and as Alan put it: without this fix the EDAC code corrupts the PCI device list.
This fixes kernel bug #50491:
https://bugzilla.kernel.org/show_bug.cgi?id=50491
--- drivers/edac/i7core_edac.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/edac/i7core_edac.c +7 -2
@@ -1334,14 +1334,19 @@ static int i7core_get_onedevice(struct p* is at addr 8086:2c40, instead of 8086:2c41. So, we need * to probe for the alternate address in case of failure */ -if (dev_descr->dev_id ==PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev) +if (dev_descr->dev_id ==PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev) { +pci_dev_get (*prev);/* pci_get_device will put it */ pdev =pci_get_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT , *prev); + } -if (dev_descr->dev_id ==PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE && !pdev) +if (dev_descr->dev_id ==PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE && + !pdev) { +pci_dev_get (*prev);/* pci_get_device will put it */ pdev =pci_get_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT , *prev); + }if (!pdev) {if (*prev) {
Greg Kroah-Hartman
maintainerPATCH 64/97 ACPI / video: Filter the _BCL table for duplicate brightness values
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit bd8ba20597f0cfef3ef65c3fd2aa92ab23d4c8e1 upstream.
Some devices have duplicate entries in there brightness levels table, ie on my Dell Latitude E6430 the table looks like this:
[ 3.686060] acpi backlight index 0, val 80 [ 3.686095] acpi backlight index 1, val 50 [ 3.686122] acpi backlight index 2, val 5 [ 3.686147] acpi backlight index 3, val 5 [ 3.686172] acpi backlight index 4, val 5 [ 3.686197] acpi backlight index 5, val 5 [ 3.686223] acpi backlight index 6, val 5 [ 3.686248] acpi backlight index 7, val 5 [ 3.686273] acpi backlight index 8, val 6 [ 3.686332] acpi backlight index 9, val 7 [ 3.686356] acpi backlight index 10, val 8 [ 3.686380] acpi backlight index 11, val 9
etc.
Notice that brightness values 0-5 are all mapped to 5. This means that if userspace writes any value between 0 and 5 to the brightness sysfs attribute and then reads it, it will always return 0, which is somewhat unexpected.
This is a problem for ie gnome-settings-daemon, which uses read-modify-write logic when the users presses the brightness up or down keys. This is done this way to take brightness changes from other sources into account.
On this specific laptop what happens once the brightness has been set to 0, is that gsd reads 0, adds 5, writes 5, and on the next brightness up key press again reads 0, so things get stuck at the lowest brightness setting.
Filtering out the duplicate table entries, makes any write to brightness read back as the written value as one would expect, fixing this.
--- drivers/acpi/video.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/acpi/video.c +7 -1
@@ -733,6 +733,7 @@ acpi_video_init_brightness(struct acpi_vunion acpi_object *o;struct acpi_video_device_brightness *br =NULL ;int result = -EINVAL ; +u32 value;if (!ACPI_SUCCESS (acpi_video_device_lcd_query_levels (device, &obj))) { ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query available "
@@ -763,7 +764,12 @@ acpi_video_init_brightness(struct acpi_v printk(KERN_ERR PREFIX "Invalid data\n");continue ; } - br->levels[count] = (u32 ) o->integer.value; + value = (u32 ) o->integer.value; +/* Skip duplicate entries */ +if (count >2 && br->levels[count -1 ] == value) +continue ; + + br->levels[count] = value;if (br->levels[count] > max_level) max_level = br->levels[count];
Greg Kroah-Hartman
maintainerPATCH 65/97 ACPI / processor: Rework processor throttling with work_on_cpu()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lan Tianyu <[email protected]>
commit f3ca4164529b875374c410193bbbac0ee960895f upstream.
acpi_processor_set_throttling() uses set_cpus_allowed_ptr() to make sure that the (struct acpi_processor)->acpi_processor_set_throttling() callback will run on the right CPU. However, the function may be called from a worker thread already bound to a different CPU in which case that won't work.
Make acpi_processor_set_throttling() use work_on_cpu() as appropriate instead of abusing set_cpus_allowed_ptr().
--- drivers/acpi/processor_throttling.c | 69 ++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 37 deletions(-)
drivers/acpi/processor_throttling.c +32 -37
@@ -59,6 +59,12 @@ struct throttling_tstate {int target_state;/* target T-state */ }; +struct acpi_processor_throttling_arg { +struct acpi_processor *pr; +int target_state; +bool force; +}; +#define THROTTLING_PRECHANGE (1)#define THROTTLING_POSTCHANGE (2)
@@ -1063,16 +1069,24 @@ static int acpi_processor_set_throttlingreturn 0 ; } +static long acpi_processor_throttling_fn (void *data) +{ +struct acpi_processor_throttling_arg *arg = data; +struct acpi_processor *pr = arg->pr; + +return pr->throttling.acpi_processor_set_throttling (pr, + arg->target_state, arg->force); +} +int acpi_processor_set_throttling (struct acpi_processor *pr,int state,bool force) { -cpumask_var_t saved_mask;int ret =0 ;unsigned int i;struct acpi_processor *match_pr;struct acpi_processor_throttling *p_throttling; +struct acpi_processor_throttling_arg arg;struct throttling_tstate t_state; -cpumask_var_t online_throttling_cpus;if (!pr)return -EINVAL ;
@@ -1083,14 +1097,6 @@ int acpi_processor_set_throttling(structif ((state <0 ) || (state > (pr->throttling.state_count -1 )))return -EINVAL ; -if (!alloc_cpumask_var (&saved_mask,GFP_KERNEL )) -return -ENOMEM ; - -if (!alloc_cpumask_var (&online_throttling_cpus,GFP_KERNEL )) { -free_cpumask_var (saved_mask); -return -ENOMEM ; - } -if (cpu_is_offline (pr->id)) {/* * the cpu pointed by pr->id is offline. Unnecessary to change
@@ -1099,17 +1105,15 @@ int acpi_processor_set_throttling(structreturn -ENODEV ; } -cpumask_copy (saved_mask, ¤t->cpus_allowed); t_state.target_state = state; p_throttling = &(pr->throttling); -cpumask_and (online_throttling_cpus, cpu_online_mask, - p_throttling->shared_cpu_map); +/* * The throttling notifier will be called for every * affected cpu in order to get one proper T-state. * The notifier event is THROTTLING_PRECHANGE. */ -for_each_cpu (i, online_throttling_cpus) { +for_each_cpu_and (i, cpu_online_mask, p_throttling->shared_cpu_map) { t_state.cpu = i;acpi_processor_throttling_notifier (THROTTLING_PRECHANGE , &t_state);
@@ -1121,21 +1125,18 @@ int acpi_processor_set_throttling(struct* it can be called only for the cpu pointed by pr. */ if (p_throttling->shared_type ==DOMAIN_COORD_TYPE_SW_ANY ) { -/* FIXME: use work_on_cpu() */ -if (set_cpus_allowed_ptr (current,cpumask_of (pr->id))) { -/* Can't migrate to the pr->id CPU. Exit */ - ret = -ENODEV ; - goto exit; - } - ret = p_throttling->acpi_processor_set_throttling (pr, - t_state.target_state, force); + arg.pr = pr; + arg.target_state = state; + arg.force = force; + ret =work_on_cpu (pr->id, acpi_processor_throttling_fn, &arg); }else {/* * When the T-state coordination is SW_ALL or HW_ALL, * it is necessary to set T-state for every affected * cpus. */ -for_each_cpu (i, online_throttling_cpus) { +for_each_cpu_and (i, cpu_online_mask, + p_throttling->shared_cpu_map) { match_pr =per_cpu (processors, i);/* * If the pointer is invalid, we will report the
@@ -1156,13 +1157,12 @@ int acpi_processor_set_throttling(struct "on CPU %d\n", i));continue ; } - t_state.cpu = i; -/* FIXME: use work_on_cpu() */ -if (set_cpus_allowed_ptr (current,cpumask_of (i))) -continue ; - ret = match_pr->throttling. -acpi_processor_set_throttling ( - match_pr, t_state.target_state, force); + + arg.pr = match_pr; + arg.target_state = state; + arg.force = force; + ret =work_on_cpu (pr->id, acpi_processor_throttling_fn, + &arg); } }/*
@@ -1171,17 +1171,12 @@ int acpi_processor_set_throttling(struct* affected cpu to update the T-states. * The notifier event is THROTTLING_POSTCHANGE */ -for_each_cpu (i, online_throttling_cpus) { +for_each_cpu_and (i, cpu_online_mask, p_throttling->shared_cpu_map) { t_state.cpu = i;acpi_processor_throttling_notifier (THROTTLING_POSTCHANGE , &t_state); } -/* restore the previous state */ -/* FIXME: use work_on_cpu() */ -set_cpus_allowed_ptr (current, saved_mask); -exit: -free_cpumask_var (online_throttling_cpus); -free_cpumask_var (saved_mask); +return ret; }
Greg Kroah-Hartman
maintainerPATCH 66/97 can: kvaser_usb: check number of channels returned by HW
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olivier Sobrie <[email protected]>
commit 862474f8b46f6c1e600d4934e40ba40646c696ec upstream.
It is needed to check the number of channels returned by the HW because it cannot be greater than MAX_NET_DEVICES otherwise it will crash.
--- drivers/net/can/usb/kvaser_usb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/can/usb/kvaser_usb.c +2 -0
@@ -474,6 +474,8 @@ static int kvaser_usb_get_card_info(strureturn err; dev->nchannels = msg.u.cardinfo.nchannels; +if (dev->nchannels >MAX_NET_DEVICES ) +return -EINVAL ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 67/97 usb: chipidea: need to mask when writting endptflush and endptprime
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu CASTET <[email protected]>
commit 5bf5dbeda2454296f1984adfbfc8e6f5965ac389 upstream.
ENDPTFLUSH and ENDPTPRIME registers are set by software and clear by hardware. There is a bit for each endpoint. When we are setting a bit for an endpoint we should make sure we do not touch other endpoint bit. There is a race condition if the hardware clear the bit between the read and the write in hw_write.
--- drivers/usb/chipidea/udc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/chipidea/udc.c +2 -2
@@ -103,7 +103,7 @@ static int hw_ep_flush(struct ci13xxx *cdo {/* flush any pending transfer */ -hw_write (ci,OP_ENDPTFLUSH ,BIT (n),BIT (n)); +hw_write (ci,OP_ENDPTFLUSH , ~0 ,BIT (n));while (hw_read (ci,OP_ENDPTFLUSH ,BIT (n)))cpu_relax (); }while (hw_read (ci,OP_ENDPTSTAT ,BIT (n)));
@@ -203,7 +203,7 @@ static int hw_ep_prime(struct ci13xxx *cif (is_ctrl && dir ==RX &&hw_read (ci,OP_ENDPTSETUPSTAT ,BIT (num)))return -EAGAIN ; -hw_write (ci,OP_ENDPTPRIME ,BIT (n),BIT (n)); +hw_write (ci,OP_ENDPTPRIME , ~0 ,BIT (n));while (hw_read (ci,OP_ENDPTPRIME ,BIT (n)))cpu_relax ();
Greg Kroah-Hartman
maintainerPATCH 68/97 usb: gadget: bcm63xx_udc: fix build failure on DMA channel code
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
commit 2d1f7af3d60dd09794e0738a915d272c6c27abc5 upstream.
Commit 3dc6475 ("bcm63xx_enet: add support Broadcom BCM6345 Ethernet") changed the ENETDMA[CS] macros such that they are no longer macros, but actual register offset definitions. The bcm63xx_udc driver was not updated, and as a result, causes the following build error to pop up:
CC drivers/usb/gadget/u_ether.odrivers/usb/gadget/bcm63xx_udc.c: In function 'iudma_write':drivers/usb/gadget/bcm63xx_udc.c:642:24: error: called object '0' is not a functiondrivers/usb/gadget/bcm63xx_udc.c: In function 'iudma_reset_channel':drivers/usb/gadget/bcm63xx_udc.c:698:46: error: called object '0' is not a functiondrivers/usb/gadget/bcm63xx_udc.c:700:49: error: called object '0' is not a function
Fix this by updating usb_dmac_{read,write}l and usb_dmas_{read,write}l to take an extra channel argument, and use the channel width (ENETDMA_CHAN_WIDTH) to offset the register we want to access, hence doing again what the macro implicitely did for us.
--- drivers/usb/gadget/bcm63xx_udc.c | 58 +++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 26 deletions(-)
drivers/usb/gadget/bcm63xx_udc.c +32 -26
@@ -361,24 +361,30 @@ static inline void usb_dma_writel(structbcm_writel (val, udc->iudma_regs + off); } -static inline u32 usb_dmac_readl (struct bcm63xx_udc *udc,u32 off) +static inline u32 usb_dmac_readl (struct bcm63xx_udc *udc,u32 off,int chan) { -return bcm_readl (udc->iudma_regs +IUDMA_DMAC_OFFSET + off); +return bcm_readl (udc->iudma_regs +IUDMA_DMAC_OFFSET + off + + (ENETDMA_CHAN_WIDTH * chan)); } -static inline void usb_dmac_writel (struct bcm63xx_udc *udc,u32 val,u32 off) +static inline void usb_dmac_writel (struct bcm63xx_udc *udc,u32 val,u32 off, +int chan) { -bcm_writel (val, udc->iudma_regs +IUDMA_DMAC_OFFSET + off); +bcm_writel (val, udc->iudma_regs +IUDMA_DMAC_OFFSET + off + + (ENETDMA_CHAN_WIDTH * chan)); } -static inline u32 usb_dmas_readl (struct bcm63xx_udc *udc,u32 off) +static inline u32 usb_dmas_readl (struct bcm63xx_udc *udc,u32 off,int chan) { -return bcm_readl (udc->iudma_regs +IUDMA_DMAS_OFFSET + off); +return bcm_readl (udc->iudma_regs +IUDMA_DMAS_OFFSET + off + + (ENETDMA_CHAN_WIDTH * chan)); } -static inline void usb_dmas_writel (struct bcm63xx_udc *udc,u32 val,u32 off) +static inline void usb_dmas_writel (struct bcm63xx_udc *udc,u32 val,u32 off, +int chan) { -bcm_writel (val, udc->iudma_regs +IUDMA_DMAS_OFFSET + off); +bcm_writel (val, udc->iudma_regs +IUDMA_DMAS_OFFSET + off + + (ENETDMA_CHAN_WIDTH * chan)); }static inline void set_clocks (struct bcm63xx_udc *udc,bool is_enabled)
@@ -639,7 +645,7 @@ static void iudma_write(struct bcm63xx_u }while (!last_bd);usb_dmac_writel (udc,ENETDMAC_CHANCFG_EN_MASK , -ENETDMAC_CHANCFG_REG (iudma->ch_idx)); +ENETDMAC_CHANCFG_REG , iudma->ch_idx); }/**
@@ -695,9 +701,9 @@ static void iudma_reset_channel(struct bbcm63xx_fifo_reset_ep (udc,max (0 , iudma->ep_num));/* stop DMA, then wait for the hardware to wrap up */ -usb_dmac_writel (udc,0 ,ENETDMAC_CHANCFG_REG (ch_idx)); +usb_dmac_writel (udc,0 ,ENETDMAC_CHANCFG_REG , ch_idx); -while (usb_dmac_readl (udc,ENETDMAC_CHANCFG_REG (ch_idx)) & +while (usb_dmac_readl (udc,ENETDMAC_CHANCFG_REG , ch_idx) &ENETDMAC_CHANCFG_EN_MASK ) {udelay (1 );
@@ -714,10 +720,10 @@ static void iudma_reset_channel(struct bdev_warn (udc->dev,"forcibly halting IUDMA channel %d\n" , ch_idx);usb_dmac_writel (udc,ENETDMAC_CHANCFG_BUFHALT_MASK , -ENETDMAC_CHANCFG_REG (ch_idx)); +ENETDMAC_CHANCFG_REG , ch_idx); } } -usb_dmac_writel (udc, ~0 ,ENETDMAC_IR_REG (ch_idx)); +usb_dmac_writel (udc, ~0 ,ENETDMAC_IR_REG , ch_idx);/* don't leave "live" HW-owned entries for the next guy to step on */ for (d = iudma->bd_ring; d <= iudma->end_bd; d++)
@@ -729,11 +735,11 @@ static void iudma_reset_channel(struct b/* set up IRQs, UBUS burst size, and BD base for this channel */ usb_dmac_writel (udc,ENETDMAC_IR_BUFDONE_MASK , -ENETDMAC_IRMASK_REG (ch_idx)); -usb_dmac_writel (udc,8 ,ENETDMAC_MAXBURST_REG (ch_idx)); +ENETDMAC_IRMASK_REG , ch_idx); +usb_dmac_writel (udc,8 ,ENETDMAC_MAXBURST_REG , ch_idx); -usb_dmas_writel (udc, iudma->bd_ring_dma,ENETDMAS_RSTART_REG (ch_idx)); -usb_dmas_writel (udc,0 ,ENETDMAS_SRAM2_REG (ch_idx)); +usb_dmas_writel (udc, iudma->bd_ring_dma,ENETDMAS_RSTART_REG , ch_idx); +usb_dmas_writel (udc,0 ,ENETDMAS_SRAM2_REG , ch_idx); }/**
@@ -2036,7 +2042,7 @@ static irqreturn_t bcm63xx_udc_data_isr(spin_lock (&udc->lock);usb_dmac_writel (udc,ENETDMAC_IR_BUFDONE_MASK , -ENETDMAC_IR_REG (iudma->ch_idx)); +ENETDMAC_IR_REG , iudma->ch_idx); bep = iudma->bep; rc =iudma_read (udc, iudma);
@@ -2176,18 +2182,18 @@ static int bcm63xx_iudma_dbg_show(structseq_printf (s," [ep%d]:\n" ,max_t (int, iudma_defaults[ch_idx].ep_num,0 ));seq_printf (s," cfg: %08x; irqstat: %08x; irqmask: %08x; maxburst: %08x\n" , -usb_dmac_readl (udc,ENETDMAC_CHANCFG_REG (ch_idx)), -usb_dmac_readl (udc,ENETDMAC_IR_REG (ch_idx)), -usb_dmac_readl (udc,ENETDMAC_IRMASK_REG (ch_idx)), -usb_dmac_readl (udc,ENETDMAC_MAXBURST_REG (ch_idx))); +usb_dmac_readl (udc,ENETDMAC_CHANCFG_REG , ch_idx), +usb_dmac_readl (udc,ENETDMAC_IR_REG , ch_idx), +usb_dmac_readl (udc,ENETDMAC_IRMASK_REG , ch_idx), +usb_dmac_readl (udc,ENETDMAC_MAXBURST_REG , ch_idx)); - sram2 =usb_dmas_readl (udc,ENETDMAS_SRAM2_REG (ch_idx)); - sram3 =usb_dmas_readl (udc,ENETDMAS_SRAM3_REG (ch_idx)); + sram2 =usb_dmas_readl (udc,ENETDMAS_SRAM2_REG , ch_idx); + sram3 =usb_dmas_readl (udc,ENETDMAS_SRAM3_REG , ch_idx);seq_printf (s," base: %08x; index: %04x_%04x; desc: %04x_%04x %08x\n" , -usb_dmas_readl (udc,ENETDMAS_RSTART_REG (ch_idx)), +usb_dmas_readl (udc,ENETDMAS_RSTART_REG , ch_idx), sram2 >>16 , sram2 &0xffff , sram3 >>16 , sram3 &0xffff , -usb_dmas_readl (udc,ENETDMAS_SRAM4_REG (ch_idx))); +usb_dmas_readl (udc,ENETDMAS_SRAM4_REG , ch_idx));seq_printf (s," desc: %d/%d used" , iudma->n_bds_used, iudma->n_bds);
Greg Kroah-Hartman
maintainerPATCH 69/97 USB: serial: option: blacklist interface 4 for Cinterion PHS8 and PXS8
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksander Morgado <[email protected]>
commit 12df84d4a80278a5b1abfec3206795291da52fc9 upstream.
This interface is to be handled by the qmi_wwan driver.
--- drivers/usb/serial/option.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/serial/option.c +2 -1
@@ -1526,7 +1526,8 @@ static const struct usb_device_id option/* Cinterion */ { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) }, - { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8) }, + { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX) }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX), .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
Greg Kroah-Hartman
maintainerPATCH 70/97 usb: ehci: fix deadlock when threadirqs option is used
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit a1227f3c1030e96ebc51d677d2f636268845c5fb upstream.
ehci_irq() and ehci_hrtimer_func() can deadlock on ehci->lock when threadirqs option is used. To prevent the deadlock use spin_lock_irqsave() in ehci_irq().
This change can be reverted when hrtimer callbacks become threaded.
--- drivers/usb/host/ehci-hcd.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/usb/host/ehci-hcd.c +10 -3
@@ -686,8 +686,15 @@ static irqreturn_t ehci_irq (struct usb_struct ehci_hcd *ehci =hcd_to_ehci (hcd);u32 status, masked_status, pcd_status =0 , cmd;int bh; +unsigned long flags; -spin_lock (&ehci->lock); +/* +* For threadirqs option we use spin_lock_irqsave() variant to prevent +* deadlock with ehci hrtimer callback, because hrtimer callbacks run +* in interrupt context even when threadirqs is specified. We can go +* back to spin_lock() variant when hrtimer callbacks become threaded. +*/ +spin_lock_irqsave (&ehci->lock, flags); status =ehci_readl (ehci, &ehci->regs->status);
@@ -705,7 +712,7 @@ static irqreturn_t ehci_irq (struct usb_/* Shared IRQ? */ if (!masked_status ||unlikely (ehci->rh_state ==EHCI_RH_HALTED )) { -spin_unlock (&ehci->lock); +spin_unlock_irqrestore (&ehci->lock, flags);return IRQ_NONE ; }
@@ -823,7 +830,7 @@ dead:if (bh)ehci_work (ehci); -spin_unlock (&ehci->lock); +spin_unlock_irqrestore (&ehci->lock, flags);if (pcd_status)usb_hcd_poll_rh_status (hcd);return IRQ_HANDLED ;
Greg Kroah-Hartman
maintainerPATCH 71/97 USB: ftdi_sio: add Cressi Leonardo PID
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joerg Dorchain <[email protected]>
commit 6dbd46c849e071e6afc1e0cad489b0175bca9318 upstream.
Hello,
the following patch adds an entry for the PID of a Cressi Leonardo diving computer interface to kernel 3.13.0.
It is detected as FT232RL.
Works with subsurface.
--- drivers/usb/serial/ftdi_sio.c | 2 ++ drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ 2 files changed, 8 insertions(+)
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -910,6 +910,8 @@ static struct usb_device_id id_table_com/* Crucible Devices */ { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) }, { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) }, +/* Cressi Devices */ + { USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) }, { }, /* Optional parameter entry */ { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -1320,3 +1320,9 @@* Manufacturer: Smart GSM Team */ #define FTDI_Z3X_PID 0x0011 + +/* +* Product: Cressi PC Interface +* Manufacturer: Cressi +*/ +#define FTDI_CRESSI_PID 0x87d0
Greg Kroah-Hartman
maintainerPATCH 72/97 mei: set clients read_cb to NULL when flow control fails
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Bi <[email protected]>
commit accb884b32e82f943340688c9cd30290531e73e0 upstream.
In mei_cl_read_start(), if it fails to send flow control request, it will release "cl->read_cb" but forget to set pointer to NULL, leaving "cl->read_cb" still pointing to random memory, next time this client is operated like mei_release(), it has chance to refer to this wrong pointer.
[228781.826904] Call Trace: [228781.829737] [<c16249b8>] ? mei_cl_unlink+0x48/0xa0 [228781.835283] [<c1624487>] mei_io_cb_free+0x17/0x30 [228781.840733] [<c16265d8>] mei_release+0xa8/0x180 [228781.845989] [<c135c610>] ? __fsnotify_parent+0xa0/0xf0 [228781.851925] [<c1325a69>] __fput+0xd9/0x200 [228781.856696] [<c1325b9d>] ____fput+0xd/0x10 [228781.861467] [<c125cae1>] task_work_run+0x81/0xb0 [228781.866821] [<c1242e53>] do_exit+0x283/0xa00 [228781.871786] [<c1a82b36>] ? kprobe_flush_task+0x66/0xc0 [228781.877722] [<c124eeb8>] ? __dequeue_signal+0x18/0x1a0 [228781.883657] [<c124f072>] ? dequeue_signal+0x32/0x190 [228781.889397] [<c1243744>] do_group_exit+0x34/0xa0 [228781.894750] [<c12517b6>] get_signal_to_deliver+0x206/0x610 [228781.901075] [<c12018d8>] do_signal+0x38/0x100 [228781.906136] [<c1626d1c>] ? mei_read+0x42c/0x4e0 [228781.911393] [<c12600a0>] ? wake_up_bit+0x30/0x30 [228781.916745] [<c16268f0>] ? mei_poll+0x120/0x120 [228781.922001] [<c1324be9>] ? vfs_read+0x89/0x160 [228781.927158] [<c16268f0>] ? mei_poll+0x120/0x120 [228781.932414] [<c133ca34>] ? fget_light+0x44/0xe0 [228781.937670] [<c1324e58>] ? SyS_read+0x68/0x80 [228781.942730] [<c12019f5>] do_notify_resume+0x55/0x70 [228781.948376] [<c1a7de5d>] work_notifysig+0x29/0x30 [228781.953827] [<c1a70000>] ? bad_area+0x5/0x3e
--- drivers/misc/mei/client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/misc/mei/client.c +3 -1
@@ -664,7 +664,6 @@ int mei_cl_read_start(struct mei_cl *cl, goto err; cb->fop_type =MEI_FOP_READ ; - cl->read_cb = cb;if (dev->hbuf_is_ready) { dev->hbuf_is_ready = false;if (mei_hbm_cl_flow_control_req (dev, cl)) {
@@ -675,6 +674,9 @@ int mei_cl_read_start(struct mei_cl *cl, }else {list_add_tail (&cb->list, &dev->ctrl_wr_list.list); } + + cl->read_cb = cb; +return rets; err:mei_io_cb_free (cb);
Greg Kroah-Hartman
maintainerPATCH 73/97 hwmon: (max1668) Fix writing the minimum temperature
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
commit 500a91571f0a5d0d3242d83802ea2fd1faccc66e upstream.
When trying to set the minimum temperature, the driver was erroneously writing the maximum temperature into the chip.
--- drivers/hwmon/max1668.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/max1668.c +1 -1
@@ -243,7 +243,7 @@ static ssize_t set_temp_min(struct devic data->temp_min[index] =clamp_val (temp/1000 ,-128 ,127 );if (i2c_smbus_write_byte_data (client,MAX1668_REG_LIML_WR (index), - data->temp_max[index])) + data->temp_min[index])) count = -EIO ;mutex_unlock (&data->update_lock);
Greg Kroah-Hartman
maintainerPATCH 74/97 workqueue: ensure @task is valid across kthread_stop()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lai Jiangshan <[email protected]>
commit 5bdfff96c69a4d5ab9c49e60abf9e070ecd2acbb upstream.
When a kworker should die, the kworkre is notified through WORKER_DIE flag instead of kthread_should_stop(). This, IIRC, is primarily to keep the test synchronized inside worker_pool lock. WORKER_DIE is first set while holding pool->lock, the lock is dropped and kthread_stop() is called.
Unfortunately, this means that there's a slight chance that the target kworker may see WORKER_DIE before kthread_stop() finishes and exits and frees the target task before or during kthread_stop().
Fix it by pinning the target task before setting WORKER_DIE and putting it after kthread_stop() is done.
tj: Improved patch description and comment. Moved pinning above
WORKER_DIE for better signify what it's protecting.
--- kernel/workqueue.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/workqueue.c +7 -0
@@ -1823,6 +1823,12 @@ static void destroy_worker(struct workerif (worker->flags &WORKER_IDLE ) pool->nr_idle--; +/* +* Once WORKER_DIE is set, the kworker may destroy itself at any +* point. Pin to ensure the task stays until we're done with it. +*/ +get_task_struct (worker->task); +list_del_init (&worker->entry); worker->flags |=WORKER_DIE ;
@@ -1831,6 +1837,7 @@ static void destroy_worker(struct workerspin_unlock_irq (&pool->lock);kthread_stop (worker->task); +put_task_struct (worker->task);kfree (worker);spin_lock_irq (&pool->lock);
Greg Kroah-Hartman
maintainerPATCH 76/97 iio:gyro: bug on L3GD20H gyroscope support
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Denis CIOCCA <[email protected]>
commit a0657716416f834ef7710a9044614d50a36c3bdc upstream.
The driver was not able to manage the sensor: during probe function and wai check, the driver stops and writes: "device name and WhoAmI mismatch." The correct value of L3GD20H wai is 0xd7 instead of 0xd4.
Dropped support for the sensor.
--- drivers/iio/gyro/Kconfig | 2 +- drivers/iio/gyro/st_gyro.h | 1 - drivers/iio/gyro/st_gyro_core.c | 9 ++++----- drivers/iio/gyro/st_gyro_i2c.c | 1 - drivers/iio/gyro/st_gyro_spi.c | 1 - 5 files changed, 5 insertions(+), 9 deletions(-)
drivers/iio/gyro/Kconfig +1 -1
@@ -50,7 +50,7 @@ config IIO_ST_GYRO_3AXIS select IIO_ST_GYRO_BUFFER if (IIO_TRIGGERED_BUFFER) help Say yes here to build support for STMicroelectronics gyroscopes: - L3G4200D, LSM330DL, L3GD20, L3GD20H, LSM330DLC, L3G4IS, LSM330. + L3G4200D, LSM330DL, L3GD20, LSM330DLC, L3G4IS, LSM330. This driver can also be built as a module. If so, will be created these modules:
drivers/iio/gyro/st_gyro.h +0 -1
@@ -19,7 +19,6 @@#define LSM330DL_GYRO_DEV_NAME "lsm330dl_gyro"#define LSM330DLC_GYRO_DEV_NAME "lsm330dlc_gyro"#define L3GD20_GYRO_DEV_NAME "l3gd20" -#define L3GD20H_GYRO_DEV_NAME "l3gd20h"#define L3G4IS_GYRO_DEV_NAME "l3g4is_ui"#define LSM330_GYRO_DEV_NAME "lsm330_gyro"
drivers/iio/gyro/st_gyro_core.c +4 -5
@@ -162,11 +162,10 @@ static const struct st_sensors st_gyro_s .wai = ST_GYRO_2_WAI_EXP, .sensors_supported = { [0] = L3GD20_GYRO_DEV_NAME, - [1] = L3GD20H_GYRO_DEV_NAME, - [2] = LSM330D_GYRO_DEV_NAME, - [3] = LSM330DLC_GYRO_DEV_NAME, - [4] = L3G4IS_GYRO_DEV_NAME, - [5] = LSM330_GYRO_DEV_NAME, + [1] = LSM330D_GYRO_DEV_NAME, + [2] = LSM330DLC_GYRO_DEV_NAME, + [3] = L3G4IS_GYRO_DEV_NAME, + [4] = LSM330_GYRO_DEV_NAME, }, .ch = (struct iio_chan_spec *)st_gyro_16bit_channels, .odr = {
drivers/iio/gyro/st_gyro_i2c.c +0 -1
@@ -61,7 +61,6 @@ static const struct i2c_device_id st_gyr { LSM330DL_GYRO_DEV_NAME }, { LSM330DLC_GYRO_DEV_NAME }, { L3GD20_GYRO_DEV_NAME }, - { L3GD20H_GYRO_DEV_NAME }, { L3G4IS_GYRO_DEV_NAME }, { LSM330_GYRO_DEV_NAME }, {},
drivers/iio/gyro/st_gyro_spi.c +0 -1
@@ -60,7 +60,6 @@ static const struct spi_device_id st_gyr { LSM330DL_GYRO_DEV_NAME }, { LSM330DLC_GYRO_DEV_NAME }, { L3GD20_GYRO_DEV_NAME }, - { L3GD20H_GYRO_DEV_NAME }, { L3G4IS_GYRO_DEV_NAME }, { LSM330_GYRO_DEV_NAME }, {},
Greg Kroah-Hartman
maintainerPATCH 77/97 perf: Fix hotplug splat
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit e3703f8cdfcf39c25c4338c3ad8e68891cca3731 upstream.
Drew Richardson reported that he could make the kernel go *boom* when hotplugging while having perf events active.
It turned out that when you have a group event, the code in __perf_event_exit_context() fails to remove the group siblings from the context.
We then proceed with destroying and freeing the event, and when you re-plug the CPU and try and add another event to that CPU, things go *boom* because you've still got dead entries there.
--- kernel/events/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/events/core.c +6 -6
@@ -7421,14 +7421,14 @@ static void perf_pmu_rotate_stop(structstatic void __perf_event_exit_context (void *__info) {struct perf_event_context *ctx = __info; -struct perf_event *event, *tmp; +struct perf_event *event;perf_pmu_rotate_stop (ctx->pmu); -list_for_each_entry_safe (event, tmp, &ctx->pinned_groups, group_entry) -__perf_remove_from_context (event); -list_for_each_entry_safe (event, tmp, &ctx->flexible_groups, group_entry) +rcu_read_lock (); +list_for_each_entry_rcu (event, &ctx->event_list, event_entry)__perf_remove_from_context (event); +rcu_read_unlock (); }static void perf_event_exit_cpu_context (int cpu)
@@ -7452,11 +7452,11 @@ static void perf_event_exit_cpu(int cpu) {struct swevent_htable *swhash = &per_cpu (swevent_htable, cpu); +perf_event_exit_cpu_context (cpu); +mutex_lock (&swhash->hlist_mutex);swevent_hlist_release (swhash);mutex_unlock (&swhash->hlist_mutex); - -perf_event_exit_cpu_context (cpu); }#else static inline void perf_event_exit_cpu (int cpu) { }
Greg Kroah-Hartman
maintainerPATCH 78/97 ALSA: hda - Add a fixup for HP Folio 13 mute LED
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 37c367ecdb9a01c9acc980e6e17913570a1788a7 upstream.
HP Folio 13 may have a broken BIOS that doesn't set up the mute LED GPIO properly, and the driver guesses it wrongly, too. Add a new fixup entry for setting the GPIO pin statically for this laptop.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=70991
--- sound/pci/hda/patch_sigmatel.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
sound/pci/hda/patch_sigmatel.c +20 -0
@@ -98,6 +98,7 @@ enum {STAC_92HD83XXX_HP_LED ,STAC_92HD83XXX_HP_INV_LED ,STAC_92HD83XXX_HP_MIC_LED , +STAC_HP_LED_GPIO10 ,STAC_92HD83XXX_HEADSET_JACK ,STAC_92HD83XXX_HP , STAC_HP_ENVY_BASS,
@@ -2107,6 +2108,17 @@ static void stac92hd83xxx_fixup_hp_mic_l spec->mic_mute_led_gpio =0x08 ;/* GPIO3 */ } +static void stac92hd83xxx_fixup_hp_led_gpio10 (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +struct sigmatel_spec *spec = codec->spec; + +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) { + spec->gpio_led =0x10 ;/* GPIO4 */ + spec->default_polarity =0 ; + } +} +static void stac92hd83xxx_fixup_headset_jack (struct hda_codec *codec,const struct hda_fixup *fix,int action) {
@@ -2173,6 +2185,12 @@ static const struct hda_fixup stac92hd83 .chained = true, .chain_id = STAC_92HD83XXX_HP, }, + [STAC_HP_LED_GPIO10] = { + .type = HDA_FIXUP_FUNC, + .v.func = stac92hd83xxx_fixup_hp_led_gpio10, + .chained = true, + .chain_id = STAC_92HD83XXX_HP, + }, [STAC_92HD83XXX_HEADSET_JACK] = { .type = HDA_FIXUP_FUNC, .v.func = stac92hd83xxx_fixup_headset_jack,
@@ -2244,6 +2262,8 @@ static const struct snd_pci_quirk stac92 "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),SND_PCI_QUIRK (PCI_VENDOR_ID_HP ,0x1888 ,"HP Envy Spectre" ,STAC_HP_ENVY_BASS ), +SND_PCI_QUIRK (PCI_VENDOR_ID_HP ,0x1899 , +"HP Folio 13" ,STAC_HP_LED_GPIO10 ),SND_PCI_QUIRK (PCI_VENDOR_ID_HP ,0x18df ,"HP Folio" ,STAC_92HD83XXX_HP_MIC_LED ), SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x1900,
Greg Kroah-Hartman
maintainerPATCH 79/97 xtensa: introduce spill_registers_kernel macro
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Filippov <[email protected]>
commit e2fd1374c705abe4661df3fb6fadb3879c7c1846 upstream.
Most in-kernel users want registers spilled on the kernel stack and don't require PS.EXCM to be set. That means that they don't need fixup routine and could reuse regular window overflow mechanism for that, which makes spill routine very simple.
--- arch/xtensa/include/asm/traps.h | 44 ++++++++++++++++++----------- arch/xtensa/kernel/entry.S | 60 ++++++++++++++++++++++++++++++++-------- 2 files changed, 76 insertions(+), 28 deletions(-)
arch/xtensa/include/asm/traps.h +28 -16
@@ -22,25 +22,37 @@ extern void do_unhandled(struct pt_regsstatic inline void spill_registers (void ) { - +#if XCHAL_NUM_AREGS >16 __asm__ __volatile__ ( - "movi a14, "__stringify((1 << PS_EXCM_BIT) | LOCKLEVEL)"\n\t" - "mov a12, a0\n\t" - "rsr a13, sar\n\t" - "xsr a14, ps\n\t" - "movi a0, _spill_registers\n\t" - "rsync\n\t" - "callx0 a0\n\t" - "mov a0, a12\n\t" - "wsr a13, sar\n\t" - "wsr a14, ps\n\t" - : : -#if defined(CONFIG_FRAME_POINTER ) - : "a2", "a3", "a4", "a11", "a12", "a13", "a14", "a15", +" call12 1f\n" +" _j 2f\n" +" retw\n" +" .align 4\n" +"1:\n" +" _entry a1, 48\n" +" addi a12, a0, 3\n" +#if XCHAL_NUM_AREGS > 32 + " .rept (" __stringify(XCHAL_NUM_AREGS) " - 32) / 12\n" +" _entry a1, 48\n" +" mov a12, a0\n" + " .endr\n" +#endif + " _entry a1, 48\n" +#if XCHAL_NUM_AREGS %12 ==0 + " mov a8, a8\n" +#elif XCHAL_NUM_AREGS %12 ==4 + " mov a12, a12\n" +#elif XCHAL_NUM_AREGS %12 ==8 + " mov a4, a4\n" +#endif + " retw\n" + "2:\n" + : : : "a12", "a13", "memory");#else - : "a2", "a3", "a4", "a7", "a11", "a12", "a13", "a14", "a15", + __asm__ __volatile__ ( +" mov a12, a12\n" + : : :"memory" );#endif - "memory"); }#endif /* _XTENSA_TRAPS_H */
arch/xtensa/kernel/entry.S +48 -12
95 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 80/97 SELinux: bigendian problems with filename trans rules
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Paris <[email protected]>
commit 9085a6422900092886da8c404e1c5340c4ff1cbf upstream.
When writing policy via /sys/fs/selinux/policy I wrote the type and class of filename trans rules in CPU endian instead of little endian. On x86_64 this works just fine, but it means that on big endian arch's like ppc64 and s390 userspace reads the policy and converts it from le32_to_cpu. So the values are all screwed up. Write the values in le format like it should have been to start.
--- security/selinux/ss/policydb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
security/selinux/ss/policydb.c +4 -4
@@ -3258,10 +3258,10 @@ static int filename_write_helper(void *kif (rc)return rc; - buf[0 ] = ft->stype; - buf[1 ] = ft->ttype; - buf[2 ] = ft->tclass; - buf[3 ] = otype->otype; + buf[0 ] =cpu_to_le32 (ft->stype); + buf[1 ] =cpu_to_le32 (ft->ttype); + buf[2 ] =cpu_to_le32 (ft->tclass); + buf[3 ] =cpu_to_le32 (otype->otype); rc =put_entry (buf,sizeof (u32),4 , fp);if (rc)
Greg Kroah-Hartman
maintainerPATCH 81/97 quota: Fix race between dqput() and dquot_scan_active()
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 1362f4ea20fa63688ba6026e586d9746ff13a846 upstream.
Currently last dqput() can race with dquot_scan_active() causing it to call callback for an already deactivated dquot. The race is as follows:
CPU1 CPU2
dqput()
spin_lock(&dq_list_lock);
if (atomic_read(&dquot->dq_count) > 1) {
- not taken
if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
spin_unlock(&dq_list_lock);
->release_dquot(dquot);
if (atomic_read(&dquot->dq_count) > 1)
- not taken
dquot_scan_active()
spin_lock(&dq_list_lock);
if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))
- not taken
atomic_inc(&dquot->dq_count);
spin_unlock(&dq_list_lock);
- proceeds to release dquot
ret = fn(dquot, priv);
- called for inactive dquotFix the problem by making sure possible ->release_dquot() is finished by the time we call the callback and new calls to it will notice reference dquot_scan_active() has taken and bail out.
--- fs/quota/dquot.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
fs/quota/dquot.c +11 -3
@@ -581,9 +581,17 @@ int dquot_scan_active(struct super_blockdqstats_inc (DQST_LOOKUPS );dqput (old_dquot); old_dquot = dquot; - ret =fn (dquot, priv); -if (ret <0 ) - goto out; +/* +* ->release_dquot() can be racing with us. Our reference +* protects us from new calls to it so just wait for any +* outstanding call and recheck the DQ_ACTIVE_B after that. +*/ +wait_on_dquot (dquot); +if (test_bit (DQ_ACTIVE_B , &dquot->dq_flags)) { + ret =fn (dquot, priv); +if (ret <0 ) + goto out; + }spin_lock (&dq_list_lock);/* We are safe to continue now because our dquot could not * be moved out of the inuse list while we hold the reference */
Greg Kroah-Hartman
maintainerPATCH 82/97 ipc,mqueue: remove limits for the amount of system-wide queues
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davidlohr Bueso <[email protected]>
commit f3713fd9cff733d9df83116422d8e4af6e86b2bb upstream.
Commit 93e6f119c0ce ("ipc/mqueue: cleanup definition names and locations") added global hardcoded limits to the amount of message queues that can be created. While these limits are per-namespace, reality is that it ends up breaking userspace applications. Historically users have, at least in theory, been able to create up to INT_MAX queues, and limiting it to just 1024 is way too low and dramatic for some workloads and use cases. For instance, Madars reports:
"This update imposes bad limits on our multi-process application. As
our app uses approaches that each process opens its own set of queues (usually something about 3-5 queues per process). In some scenarios we might run up to 3000 processes or more (which of-course for linux is not a problem). Thus we might need up to 9000 queues or more. All processes run under one user."
Other affected users can be found in launchpad bug #1155695:
https://bugs.launchpad.net/ubuntu/+source/manpages/+bug/1155695
Instead of increasing this limit, revert it entirely and fallback to the original way of dealing queue limits -- where once a user's resource limit is reached, and all memory is used, new queues cannot be created.
--- include/linux/ipc_namespace.h | 2 -- ipc/mq_sysctl.c | 18 ++++++++++++------ ipc/mqueue.c | 6 +++--- 3 files changed, 15 insertions(+), 11 deletions(-)
include/linux/ipc_namespace.h +0 -2
@@ -119,9 +119,7 @@ extern int mq_init_ns(struct ipc_namespa* the new maximum will handle anyone else. I may have to revisit this * in the future. */ -#define MIN_QUEUESMAX 1#define DFLT_QUEUESMAX 256 -#define HARD_QUEUESMAX 1024#define MIN_MSGMAX 1#define DFLT_MSG 10U#define DFLT_MSGMAX 10
ipc/mq_sysctl.c +12 -6
@@ -22,6 +22,16 @@ static void *get_mq(ctl_table *table)return which; } +static int proc_mq_dointvec (ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +struct ctl_table mq_table; +memcpy (&mq_table, table,sizeof (mq_table)); + mq_table.data =get_mq (table); + +return proc_dointvec (&mq_table, write, buffer, lenp, ppos); +} +static int proc_mq_dointvec_minmax (ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) {
@@ -33,12 +43,10 @@ static int proc_mq_dointvec_minmax(ctl_t lenp, ppos); }#else +#define proc_mq_dointvec NULL#define proc_mq_dointvec_minmax NULL#endif -static int msg_queues_limit_min =MIN_QUEUESMAX ; -static int msg_queues_limit_max =HARD_QUEUESMAX ; -static int msg_max_limit_min =MIN_MSGMAX ;static int msg_max_limit_max =HARD_MSGMAX ;
@@ -51,9 +59,7 @@ static ctl_table mq_sysctls[] = { .data = &init_ipc_ns.mq_queues_max, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_mq_dointvec_minmax, - .extra1 = &msg_queues_limit_min, - .extra2 = &msg_queues_limit_max, + .proc_handler = proc_mq_dointvec, }, { .procname = "msg_max",
ipc/mqueue.c +3 -3
@@ -433,9 +433,9 @@ static int mqueue_create(struct inode *d error = -EACCES ; goto out_unlock; } -if (ipc_ns->mq_queues_count >=HARD_QUEUESMAX || - (ipc_ns->mq_queues_count >= ipc_ns->mq_queues_max && - !capable (CAP_SYS_RESOURCE ))) { + +if (ipc_ns->mq_queues_count >= ipc_ns->mq_queues_max && + !capable (CAP_SYS_RESOURCE )) { error = -ENOSPC ; goto out_unlock; }
Greg Kroah-Hartman
maintainerPATCH 83/97 Input - arizona-haptics: Fix double lock of dapm_mutex
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
commit c4204960e9d0ba99459dbf1db918f99a45e7a62a upstream.
snd_soc_dapm_sync takes the dapm_mutex internally, but we currently take it externally as well. This patch fixes this.
--- drivers/input/misc/arizona-haptics.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/input/misc/arizona-haptics.c +4 -7
@@ -77,16 +77,14 @@ static void arizona_haptics_work(structreturn ; } +mutex_unlock (dapm_mutex); + ret =snd_soc_dapm_sync (arizona->dapm);if (ret !=0 ) {dev_err (arizona->dev,"Failed to sync DAPM: %d\n" , ret); -mutex_unlock (dapm_mutex);return ; } - -mutex_unlock (dapm_mutex); - }else {/* This disable sequence will be a noop if already enabled */ mutex_lock_nested (dapm_mutex,SND_SOC_DAPM_CLASS_RUNTIME );
@@ -99,16 +97,15 @@ static void arizona_haptics_work(structreturn ; } +mutex_unlock (dapm_mutex); + ret =snd_soc_dapm_sync (arizona->dapm);if (ret !=0 ) {dev_err (arizona->dev,"Failed to sync DAPM: %d\n" , ret); -mutex_unlock (dapm_mutex);return ; } -mutex_unlock (dapm_mutex); - ret = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1, ARIZONA_HAP_CTRL_MASK,
Greg Kroah-Hartman
maintainerPATCH 84/97 irq-metag*: stop set_affinity vectoring to offline cpus
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Hogan <[email protected]>
commit f229006ec6beabf7b844653d92fa61f025fe3dcf upstream.
Fix irq_set_affinity callbacks in the Meta IRQ chip drivers to AND cpu_online_mask into the cpumask when picking a CPU to vector the interrupt to.
As Thomas pointed out, the /proc/irq/$N/smp_affinity interface doesn't filter out offline CPUs, so without this patch if you offline CPU0 and set an IRQ affinity to 0x3 it vectors the interrupt onto CPU0 even though it is offline.
--- drivers/irqchip/irq-metag-ext.c | 2 +- drivers/irqchip/irq-metag.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-metag-ext.c +1 -1
@@ -515,7 +515,7 @@ static int meta_intc_set_affinity(struct* one cpu (the interrupt code doesn't support it), so we just * pick the first cpu we find in 'cpumask'. */ - cpu =cpumask_any (cpumask); + cpu =cpumask_any_and (cpumask, cpu_online_mask); thread = cpu_2_hwthread_id[cpu];metag_out32 (TBI_TRIG_VEC (TBID_SIGNUM_TR2 (thread)), vec_addr);
drivers/irqchip/irq-metag.c +1 -1
@@ -201,7 +201,7 @@ static int metag_internal_irq_set_affini* one cpu (the interrupt code doesn't support it), so we just * pick the first cpu we find in 'cpumask'. */ - cpu =cpumask_any (cpumask); + cpu =cpumask_any_and (cpumask, cpu_online_mask); thread = cpu_2_hwthread_id[cpu]; metag_out32(TBI_TRIG_VEC(TBID_SIGNUM_TR1(thread)),
Greg Kroah-Hartman
maintainerPATCH 85/97 ARM64: unwind: Fix PC calculation
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olof Johansson <[email protected]>
commit e306dfd06fcb44d21c80acb8e5a88d55f3d1cf63 upstream.
The frame PC value in the unwind code used to just take the saved LR value and use that. That's incorrect as a stack trace, since it shows the return path stack, not the call path stack.
In particular, it shows faulty information in case the bl is done as the very last instruction of one label, since the return point will be in the next label. That can easily be seen with tail calls to panic(), which is marked __noreturn and thus doesn't have anything useful after it.
Easiest here is to just correct the unwind code and do a -4, to get the actual call site for the backtrace instead of the return site.
--- arch/arm64/kernel/stacktrace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/kernel/stacktrace.c +5 -1
@@ -48,7 +48,11 @@ int unwind_frame(struct stackframe *fram frame->sp = fp +0x10 ; frame->fp = *(unsigned long *)(fp); - frame->pc = *(unsigned long *)(fp +8 ); +/* +* -4 here because we care about the PC at time of bl, +* not where the return will go. +*/ + frame->pc = *(unsigned long *)(fp +8 ) -4 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 86/97 ARM: tegra: only run PL310 init on systems with one
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Warren <[email protected]>
commit 8859685785bfafadf9bc922dd3a2278e59886947 upstream.
Fix tegra_init_cache() to check whether the system has a PL310 cache before touching the PL310 registers. This prevents access to non-existent registers on Tegra114 and later.
Note for stable kernels:
In <= v3.12, the file to patch is arch/arm/mach-tegra/common.c.
--- arch/arm/mach-tegra/common.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/mach-tegra/common.c +11 -0
@@ -22,6 +22,7 @@#include <linux/io.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/of.h> #include <linux/irqchip.h> #include <linux/clk/tegra.h>
@@ -80,10 +81,20 @@ void tegra_assert_system_reset(char modestatic void __init tegra_init_cache (void ) {#ifdef CONFIG_CACHE_L2X0 +static const struct of_device_id pl310_ids[]__initconst = { + { .compatible ="arm,pl310-cache" , }, + {} + }; + +struct device_node *np;int ret;void __iomem *p =IO_ADDRESS (TEGRA_ARM_PERIF_BASE ) +0x3000 ;u32 aux_ctrl, cache_type; + np =of_find_matching_node (NULL , pl310_ids); +if (!np) +return ; + cache_type =readl (p +L2X0_CACHE_TYPE ); aux_ctrl = (cache_type &0x700 ) << (17 -8 ); aux_ctrl |=0x7C400001 ;
Greg Kroah-Hartman
maintainerPATCH 87/97 ARM: 7749/1: spinlock: retry trylock operation if strex fails on free lock
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Will Deacon <[email protected]>
commit 15e7e5c1ebf556cd620c9b091e121091ac760f6d upstream.
An exclusive store instruction may fail for reasons other than lock contention (e.g. a cache eviction during the critical section) so, in line with other architectures using similar exclusive instructions (alpha, mips, powerpc), retry the trylock operation if the lock appears to be free but the strex reported failure.
--- arch/arm/include/asm/spinlock.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
arch/arm/include/asm/spinlock.h +13 -10
@@ -97,19 +97,22 @@ static inline void arch_spin_lock(arch_sstatic inline int arch_spin_trylock (arch_spinlock_t *lock) { -unsigned long tmp; +unsigned long contended, res;u32 slock; - __asm__ __volatile__( -" ldrex %0, [%2]\n" -" subs %1, %0, %0, ror #16\n" -" addeq %0, %0, %3\n" -" strexeq %1, %0, [%2]" - :"=&r" (slock),"=&r" (tmp) - :"r" (&lock->slock),"I" (1 <<TICKET_SHIFT ) - :"cc" ); +do { + __asm__ __volatile__( +" ldrex %0, [%3]\n" +" mov %2, #0\n" +" subs %1, %0, %0, ror #16\n" +" addeq %0, %0, %4\n" +" strexeq %2, %0, [%3]" + :"=&r" (slock),"=&r" (contended),"=r" (res) + :"r" (&lock->slock),"I" (1 <<TICKET_SHIFT ) + :"cc" ); + }while (res); -if (tmp ==0 ) { +if (!contended) {smp_mb ();return 1 ; }else {
Greg Kroah-Hartman
maintainerPATCH 88/97 ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lock
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Will Deacon <[email protected]>
commit 00efaa0250939dc148e2d3104fb3c18395d24a2d upstream.
Commit 15e7e5c1ebf5 ("ARM: 7749/1: spinlock: retry trylock operation if strex fails on free lock") modifying our arch_spin_trylock to retry the acquisition if the lock appeared uncontended, but the strex failed.
This patch does the same for rwlocks, which were missed by the original patch.
--- arch/arm/include/asm/spinlock.h | 49 ++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 19 deletions(-)
arch/arm/include/asm/spinlock.h +30 -19
@@ -168,17 +168,20 @@ static inline void arch_write_lock(arch_static inline int arch_write_trylock (arch_rwlock_t *rw) { -unsigned long tmp; +unsigned long contended, res; - __asm__ __volatile__( -" ldrex %0, [%1]\n" -" teq %0, #0\n" -" strexeq %0, %2, [%1]" - :"=&r" (tmp) - :"r" (&rw->lock),"r" (0x80000000 ) - :"cc" ); +do { + __asm__ __volatile__( +" ldrex %0, [%2]\n" +" mov %1, #0\n" +" teq %0, #0\n" +" strexeq %1, %3, [%2]" + :"=&r" (contended),"=&r" (res) + :"r" (&rw->lock),"r" (0x80000000 ) + :"cc" ); + }while (res); -if (tmp ==0 ) { +if (!contended) {smp_mb ();return 1 ; }else {
@@ -254,18 +257,26 @@ static inline void arch_read_unlock(archstatic inline int arch_read_trylock (arch_rwlock_t *rw) { -unsigned long tmp, tmp2 =1 ; +unsigned long contended, res; - __asm__ __volatile__( -" ldrex %0, [%2]\n" -" adds %0, %0, #1\n" -" strexpl %1, %0, [%2]\n" - :"=&r" (tmp),"+r" (tmp2) - :"r" (&rw->lock) - :"cc" ); +do { + __asm__ __volatile__( +" ldrex %0, [%2]\n" +" mov %1, #0\n" +" adds %0, %0, #1\n" +" strexpl %1, %0, [%2]" + :"=&r" (contended),"=&r" (res) + :"r" (&rw->lock) + :"cc" ); + }while (res); -smp_mb (); -return tmp2 ==0 ; +/* If the lock is negative, then it is already held for write. */ +if (contended <0x80000000 ) { +smp_mb (); +return 1 ; + }else { +return 0 ; + } }/* read_can_lock - would read_trylock() succeed? */
Greg Kroah-Hartman
maintainerPATCH 89/97 qla2xxx: Fix kernel panic on selective retransmission request
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Dr. Greg Wettstein" <[email protected]>
commit 6f58c780e5a5b43a6d2121e0d43cdcba1d3cc5fc upstream.
A selective retransmission request (SRR) is a fibre-channel protocol control request which provides support for requesting retransmission of a data sequence in response to an issue such as frame loss or corruption. These events are experienced infrequently in fibre-channel based networks which makes it difficult to test and assess codepaths which handle these events.
We were fortunate enough, for some definition of fortunate, to have a metro-area single-mode SAN link which, at 10 GBPS sustained load levels, would consistently generate SRR's in a SCST based target implementation using our SCST/in-kernel Qlogic target interface driver. In response to an SRR the in-kernel Qlogic target driver immediately panics resulting in a catastrophic storage failure for serviced initiators.
The culprit was a debug statement in the qla_target.c file which does not verify that a pointer to the SCSI CDB is not null. The unchecked pointer dereference results in the kernel panic and resultant system failure.
The other two references to the SCSI CDB by the SRR handling code use a ternary operator to verify a non-null pointer is being acted on. This patch simply adds a similar test to the implicated debug statement.
This patch is a candidate for any stable kernel being maintained since it addresses a potentially catastrophic event with minimal downside.
--- drivers/scsi/qla2xxx/qla_target.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_target.c +2 -1
@@ -3339,7 +3339,8 @@ restart:ql_dbg (ql_dbg_tgt_mgt, vha,0xf02c ,"SRR cmd %p (se_cmd %p, tag %d, op %x), " "sg_cnt=%d, offset=%d" , cmd, &cmd->se_cmd, cmd->tag, - se_cmd->t_task_cdb[0 ], cmd->sg_cnt, cmd->offset); + se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0 ] :0 , + cmd->sg_cnt, cmd->offset);qlt_handle_srr (vha, sctio, imm);
Greg Kroah-Hartman
maintainerPATCH 90/97 i7300_edac: Fix device reference count
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean Delvare <[email protected]>
commit 75135da0d68419ef8a925f4c1d5f63d8046e314d upstream.
pci_get_device() decrements the reference count of "from" (last argument) so when we break off the loop successfully we have only one device reference - and we don't know which device we have. If we want a reference to each device, we must take them explicitly and let the pci_get_device() walk complete to avoid duplicate references.
This is serious, as over-putting device references will cause the device to eventually disappear. Without this fix, the kernel crashes after a few insmod/rmmod cycles.
Tested on an Intel S7000FC4UR system with a 7300 chipset.
--- drivers/edac/i7300_edac.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-)
drivers/edac/i7300_edac.c +20 -18
@@ -943,33 +943,35 @@ static int i7300_get_devices(struct mem_/* Attempt to 'get' the MCH register we want */ pdev =NULL ; -while (!pvt->pci_dev_16_1_fsb_addr_map || - !pvt->pci_dev_16_2_fsb_err_regs) { - pdev =pci_get_device (PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_I7300_MCH_ERR , pdev); -if (!pdev) { -/* End of list, leave */ -i7300_printk (KERN_ERR , -"'system address,Process Bus' " -"device not found:" -"vendor 0x%x device 0x%x ERR funcs " -"(broken BIOS?)\n" , -PCI_VENDOR_ID_INTEL , -PCI_DEVICE_ID_INTEL_I7300_MCH_ERR ); - goto error; - } - +while ((pdev =pci_get_device (PCI_VENDOR_ID_INTEL , +PCI_DEVICE_ID_INTEL_I7300_MCH_ERR , + pdev))) {/* Store device 16 funcs 1 and 2 */ switch (PCI_FUNC (pdev->devfn)) {case 1 : - pvt->pci_dev_16_1_fsb_addr_map = pdev; +if (!pvt->pci_dev_16_1_fsb_addr_map) + pvt->pci_dev_16_1_fsb_addr_map = +pci_dev_get (pdev);break ;case 2 : - pvt->pci_dev_16_2_fsb_err_regs = pdev; +if (!pvt->pci_dev_16_2_fsb_err_regs) + pvt->pci_dev_16_2_fsb_err_regs = +pci_dev_get (pdev);break ; } } +if (!pvt->pci_dev_16_1_fsb_addr_map || + !pvt->pci_dev_16_2_fsb_err_regs) { +/* At least one device was not found */ +i7300_printk (KERN_ERR , +"'system address,Process Bus' device not found:" +"vendor 0x%x device 0x%x ERR funcs (broken BIOS?)\n" , +PCI_VENDOR_ID_INTEL , +PCI_DEVICE_ID_INTEL_I7300_MCH_ERR ); + goto error; + } + edac_dbg(1, "System Address, processor bus- PCI Bus ID: %s %x:%x\n", pci_name(pvt->pci_dev_16_0_fsb_ctlr), pvt->pci_dev_16_0_fsb_ctlr->vendor,
Greg Kroah-Hartman
maintainerPATCH 91/97 dma: ste_dma40: dont dereference free:d descriptor
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
commit e9baa9d9d520fb0e24cca671e430689de2d4a4b2 upstream.
It appears that in the DMA40 driver the DMA tasklet will very often dereference memory for a descriptor just free:d from the DMA40 slab. Nothing happens because no other part of the driver has yet had a chance to claim this memory, but it's really nasty to dereference free:d memory, so let's check the flag before the descriptor is free and store it in a bool variable.
--- drivers/dma/ste_dma40.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/ste_dma40.c +3 -1
@@ -1587,6 +1587,7 @@ static void dma_tasklet(unsigned long dastruct d40_chan *d40c = (struct d40_chan *) data;struct d40_desc *d40d;unsigned long flags; +bool callback_active;dma_async_tx_callback callback;void *callback_param;
@@ -1614,6 +1615,7 @@ static void dma_tasklet(unsigned long da }/* Callback to client */ + callback_active = !!(d40d->txd.flags &DMA_PREP_INTERRUPT ); callback = d40d->txd.callback; callback_param = d40d->txd.callback_param;
@@ -1636,7 +1638,7 @@ static void dma_tasklet(unsigned long daspin_unlock_irqrestore (&d40c->lock, flags); -if (callback && (d40d->txd.flags &DMA_PREP_INTERRUPT )) +if (callback_active && callback)callback (callback_param);return ;
Greg Kroah-Hartman
maintainerPATCH 92/97 dm mpath: fix stalls when handling invalid ioctls
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Reinecke <[email protected]>
commit a1989b330093578ea5470bea0a00f940c444c466 upstream.
An invalid ioctl will never be valid, irrespective of whether multipath has active paths or not. So for invalid ioctls we do not have to wait for multipath to activate any paths, but can rather return an error code immediately. This fix resolves numerous instances of:
udevd[]: worker [] unexpectedly returned with status 0x0100
that have been seen during testing.
--- drivers/md/dm-mpath.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/md/dm-mpath.c +5 -2
@@ -1608,8 +1608,11 @@ static int multipath_ioctl(struct dm_tar/* * Only pass ioctls through if the device sizes match exactly. */ -if (!r && ti->len !=i_size_read (bdev->bd_inode) >>SECTOR_SHIFT ) - r =scsi_verify_blk_ioctl (NULL , cmd); +if (!bdev || ti->len !=i_size_read (bdev->bd_inode) >>SECTOR_SHIFT ) { +int err =scsi_verify_blk_ioctl (NULL , cmd); +if (err) + r = err; + }if (r == -ENOTCONN && !fatal_signal_pending (current))queue_work (kmultipathd, &m->process_queued_ios);
Greg Kroah-Hartman
maintainerPATCH 93/97 dm thin: avoid metadata commit if a pools thin devices havent changed
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Snitzer <[email protected]>
commit 4d1662a30dde6e545086fe0e8fd7e474c4e0b639 upstream.
Commit 905e51b ("dm thin: commit outstanding data every second") introduced a periodic commit. This commit occurs regardless of whether any thin devices have made changes.
Fix the periodic commit to check if any of a pool's thin devices have changed using dm_pool_changed_this_transaction().
--- drivers/md/dm-thin-metadata.c | 17 +++++++++++++++++ drivers/md/dm-thin-metadata.h | 2 ++ drivers/md/dm-thin.c | 3 ++- 3 files changed, 21 insertions(+), 1 deletion(-)
drivers/md/dm-thin-metadata.c +17 -0
@@ -1489,6 +1489,23 @@ bool dm_thin_changed_this_transaction(streturn r; } +bool dm_pool_changed_this_transaction (struct dm_pool_metadata *pmd) +{ +bool r = false; +struct dm_thin_device *td, *tmp; + +down_read (&pmd->root_lock); +list_for_each_entry_safe (td, tmp, &pmd->thin_devices, list) { +if (td->changed) { + r = td->changed; +break ; + } + } +up_read (&pmd->root_lock); + +return r; +} +bool dm_thin_aborted_changes (struct dm_thin_device *td) {bool r;
drivers/md/dm-thin-metadata.h +2 -0
@@ -161,6 +161,8 @@ int dm_thin_remove_block(struct dm_thin_*/ bool dm_thin_changed_this_transaction (struct dm_thin_device *td); +bool dm_pool_changed_this_transaction (struct dm_pool_metadata *pmd); +bool dm_thin_aborted_changes (struct dm_thin_device *td); int dm_thin_get_highest_mapped_block(struct dm_thin_device *td,
drivers/md/dm-thin.c +2 -1
@@ -1344,7 +1344,8 @@ static void process_deferred_bios(structbio_list_init (&pool->deferred_flush_bios);spin_unlock_irqrestore (&pool->lock, flags); -if (bio_list_empty (&bios) && !need_commit_due_to_time (pool)) +if (bio_list_empty (&bios) && + !(dm_pool_changed_this_transaction (pool->pmd) &&need_commit_due_to_time (pool)))return ;if (commit_or_fallback (pool)) {
Greg Kroah-Hartman
maintainerPATCH 94/97 dm thin: fix the error path for the thin device constructor
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Snitzer <[email protected]>
commit 1acacc0784aab45627b6009e0e9224886279ac0b upstream.
dm_pool_close_thin_device() must be called if dm_set_target_max_io_len() fails in thin_ctr(). Otherwise __pool_destroy() will fail because the pool will still have an open thin device:
device-mapper: thin metadata: attempt to close pmd when 1 device(s) are still open
device-mapper: thin: __pool_destroy: dm_pool_metadata_close() failed.
Also, must establish error code if failing thin_ctr() because the pool is in fail_io mode.
--- drivers/md/dm-thin.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/md/dm-thin.c +4 -1
@@ -2784,6 +2784,7 @@ static int thin_ctr(struct dm_target *tiif (get_pool_mode (tc->pool) ==PM_FAIL ) { ti->error ="Couldn't open thin device, Pool is in fail mode" ; + r = -EINVAL ; goto bad_thin_open; }
@@ -2795,7 +2796,7 @@ static int thin_ctr(struct dm_target *ti r =dm_set_target_max_io_len (ti, tc->pool->sectors_per_block);if (r) - goto bad_thin_open; + goto bad_target_max_io_len; ti->num_flush_bios =1 ; ti->flush_supported = true;
@@ -2816,6 +2817,8 @@ static int thin_ctr(struct dm_target *tireturn 0 ; +bad_target_max_io_len: +dm_pool_close_thin_device (tc->td); bad_thin_open:__pool_dec (tc->pool); bad_pool_lookup:
Greg Kroah-Hartman
maintainerPATCH 95/97 drm/radeon: print the supported atpx function mask
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 9f050c7f9738ffa746c63415136645ad231b1348 upstream.
Print the supported functions mask in addition to the version. This is useful in debugging PX problems since we can see what functions are available.
--- drivers/gpu/drm/radeon/radeon_atpx_handler.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_atpx_handler.c +2 -1
@@ -215,7 +215,8 @@ static int radeon_atpx_verify_interface(memcpy (&output, info->buffer.pointer, size);/* TODO: check version? */ -printk ("ATPX version %u\n" , output.version); +printk ("ATPX version %u, functions 0x%08x\n" , + output.version, output.function_bits);radeon_atpx_parse_functions (&atpx->functions, output.function_bits);
Greg Kroah-Hartman
maintainerPATCH 97/97 drm/radeon: disable pll sharing for DP on DCE4.1
In reply to Greg Kroah-Hartman3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 9ef4e1d000a5b335fcebfcf8aef3405e59574c89 upstream.
Causes display problems. We had already disabled
sharing for non-DP displays.
Based on a patch from:
Niels Ole Salscheider <[email protected]>
bug:
https://bugzilla.kernel.org/show_bug.cgi?id=58121
--- drivers/gpu/drm/radeon/atombios_crtc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/atombios_crtc.c +15 -1
@@ -1661,6 +1661,20 @@ static int radeon_atom_pick_pll(struct dreturn ATOM_PPLL1 ;DRM_ERROR ("unable to allocate a PPLL\n" );return ATOM_PPLL_INVALID ; + }else if (ASIC_IS_DCE41 (rdev)) { +/* Don't share PLLs on DCE4.1 chips */ +if (ENCODER_MODE_IS_DP (atombios_get_encoder_mode (radeon_crtc->encoder))) { +if (rdev->clock.dp_extclk) +/* skip PPLL programming if using ext clock */ +return ATOM_PPLL_INVALID ; + } + pll_in_use =radeon_get_pll_use_mask (crtc); +if (!(pll_in_use & (1 <<ATOM_PPLL1 ))) +return ATOM_PPLL1 ; +if (!(pll_in_use & (1 <<ATOM_PPLL2 ))) +return ATOM_PPLL2 ; +DRM_ERROR ("unable to allocate a PPLL\n" ); +return ATOM_PPLL_INVALID ; }else if (ASIC_IS_DCE4 (rdev)) {/* in DP mode, the DP ref clock can come from PPLL, DCPLL, or ext clock, * depending on the asic:
@@ -1688,7 +1702,7 @@ static int radeon_atom_pick_pll(struct dif (pll !=ATOM_PPLL_INVALID )return pll; } - }else if (!ASIC_IS_DCE41 (rdev)) {/* Don't share PLLs on DCE4.1 chips */ + }else {/* use the same PPLL for all monitors with the same clock */ pll =radeon_get_shared_nondp_ppll (crtc);if (pll !=ATOM_PPLL_INVALID )
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.10.33 release. There are 97 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 6 20:03:11 UTC 2014. Anything received after that time might be too late.
Build results:
total: 126 pass: 121 skipped: 4 fail: 1
qemu tests all passed.
Results are as expected. Details are available at http://server.roeck-us.net:8010/builders.
Guenter
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.10.33 release. There are 97 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Mar 6 20:03:11 UTC 2014. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.10.33-rc1.gzand the diffstat can be found below.
thanks,
greg k-h
Compile tests and boot tests passed. No dmesg regressions: emerg, crit, alert, err are clean. No regressions in warn.
-- Shuah
Signature · 4 lines
Shuah Khan Senior Linux Kernel Developer - Open Source Group Samsung Research America(Silicon Valley) [email protected] | (970) 672-0658