4.12.4-stable review
Subsystems (6)
Greg Kroah-Hartman
maintainercover 4.12.4-stable review
This is the start of the stable review cycle for the 4.12.4 release. There are 196 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 Jul 27 19:20:09 UTC 2017. 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/v4.x/stable-review/patch-4.12.4-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.12.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.12.4-rc1
Thomas Gleixner <[email protected]>
smp/hotplug: Replace BUG_ON and react useful
Thomas Gleixner <[email protected]>
smp/hotplug: Move unparking of percpu threads to the control CPU
Gabriel Krisman Bertazi <[email protected]>
drm/i915: reintroduce VLV/CHV PFI programming power domain workaround
[email protected] <[email protected]>
drm/i915: Hold RPM wakelock while initializing OA buffer
Chris Wilson <[email protected]>
drm/i915/fbdev: Check for existence of ifbdev->vma before operations
Chunyu Hu <[email protected]>
tracing: Fix kmemleak in instance_rmdir
Sudeep Holla <[email protected]>
PM / Domains: defer dev_pm_domain_set() until genpd->attach_dev succeeds if present
Philipp Zabel <[email protected]>
drm/imx: parallel-display: Accept drm_of_find_panel_or_bridge failure
Dan Williams <[email protected]>
device-dax: fix sysfs duplicate warnings
Jan Kara <[email protected]>
reiserfs: Don't clear SGID when inheriting ACLs
Bjorn Andersson <[email protected]>
spmi: Include OF based modalias in device uevent
Srinivas Pandruvada <[email protected]>
cpufreq: intel_pstate: Correct the busy calculation for KNL
Stephen Hemminger <[email protected]>
vmbus: re-enable channel tasklet
Prarit Bhargava <[email protected]>
acpi/nfit: Fix memory corruption/Unregister mce decoder on failure
Christoph Lameter <[email protected]>
kernel/fork.c: virtually mapped stacks: do not disable interrupts
Nikolay Borisov <[email protected]>
writeback: rework wb_[dec|inc]_stat family of functions
Nikolay Borisov <[email protected]>
percpu_counter: Rename __percpu_counter_add to percpu_counter_add_batch
Jeffrey Hugo <[email protected]>
sched/fair: Fix load_balance() affinity redo path
Wanpeng Li <[email protected]>
sched/cputime: Accumulate vtime on top of nsec clocksource
Frederic Weisbecker <[email protected]>
sched/cputime: Move the vtime task fields to their own struct
Frederic Weisbecker <[email protected]>
sched/cputime: Rename vtime fields
Frederic Weisbecker <[email protected]>
sched/cputime: Always set tsk->vtime_snap_whence after accounting vtime
Frederic Weisbecker <[email protected]>
vtime, sched/cputime: Remove vtime_account_user()
Jan Kara <[email protected]>
hfsplus: Don't clear SGID when inheriting ACLs
Bart Van Assche <[email protected]>
mlx5: Avoid that mlx5_ib_sg_to_klms() overflows the klms[] array
Maarten Lankhorst <[email protected]>
drm/i915: Make DP-MST connector info work
Imre Deak <[email protected]>
drm/mst: Avoid processing partially received up/down message transactions
Imre Deak <[email protected]>
drm/mst: Avoid dereferencing a NULL mstb in drm_dp_mst_handle_up_req()
Imre Deak <[email protected]>
drm/mst: Fix error handling during MST sideband message reception
Ismail, Mustafa <[email protected]>
RDMA/core: Initialize port_num in qp_attr
Ismail, Mustafa <[email protected]>
RDMA/uverbs: Fix the check for port number
Yan, Zheng <[email protected]>
ceph: fix race in concurrent readdir
Arnd Bergmann <[email protected]>
staging: lustre: ko2iblnd: check copy_from_iter/copy_to_iter return code
Teddy Wang <[email protected]>
staging: sm750fb: avoid conflicting vesafb
Ian Abbott <[email protected]>
staging: comedi: ni_mio_common: fix AO timer off-by-one regression
Michael Gugino <[email protected]>
staging: rtl8188eu: add TL-WN722N v2 support
Ingo Molnar <[email protected]>
Revert "perf/core: Drop kernel samples even though :u is specified"
Alexander Shishkin <[email protected]>
perf/core: Fix scheduling regression of pinned groups
Jin Yao <[email protected]>
perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target
Nicholas Bellinger <[email protected]>
iser-target: Avoid isert_conn->cm_id dereference in isert_login_recv_done
Jiang Yi <[email protected]>
target: Fix COMPARE_AND_WRITE caw_sem leak during se_cmd quiesce
Jan Kara <[email protected]>
udf: Fix deadlock between writeback and udf_setsize()
Jan Kara <[email protected]>
udf: Fix races with i_size changes during readpage
NeilBrown <[email protected]>
NFS: only invalidate dentrys that are clearly invalid.
Olga Kornievskaia <[email protected]>
PNFS fix EACCESS on commit to DS handling
Benjamin Coddington <[email protected]>
NFS: Fix initialization of nfs_page_array->npages
NeilBrown <[email protected]>
net/sunrpc/xprt_sock: fix regression in connection error reporting.
Jason A. Donenfeld <[email protected]>
sunrpc: use constant time memory comparison for mac
Moni Shoua <[email protected]>
IB/core: Namespace is mandatory input for address resolution
Vladimir Neyelov <[email protected]>
IB/iser: Fix connection teardown race condition
Chen Hong <[email protected]>
Input: i8042 - fix crash at boot time
Maciej W. Rozycki <[email protected]>
MIPS: Fix a typo: s/preset/present/ in r2-to-r6 emulation error message
Maciej W. Rozycki <[email protected]>
MIPS: Send SIGILL for R6 branches in `__compute_return_epc_for_insn'
Maciej W. Rozycki <[email protected]>
MIPS: Send SIGILL for linked branches in `__compute_return_epc_for_insn'
Maciej W. Rozycki <[email protected]>
MIPS: Rename sigill_r6' to sigill_r2r6' in `__compute_return_epc_for_insn'
Maciej W. Rozycki <[email protected]>
MIPS: Send SIGILL for BPOSGE32 in `__compute_return_epc_for_insn'
Maciej W. Rozycki <[email protected]>
MIPS: math-emu: Prevent wrong ISA mode instruction emulation
Maciej W. Rozycki <[email protected]>
MIPS: Fix unaligned PC interpretation in `compute_return_epc'
Maciej W. Rozycki <[email protected]>
MIPS: Actually decode JALX in `__compute_return_epc_for_insn'
James Hogan <[email protected]>
MIPS: Save static registers before sysmips
Maciej W. Rozycki <[email protected]>
MIPS: Fix MIPS I ISA /proc/cpuinfo reporting
Seunghun Han <[email protected]>
x86/ioapic: Pass the correct data to unmask_ioapic_irq()
Seunghun Han <[email protected]>
x86/acpi: Prevent out of bound access caused by broken ACPI tables
Lv Zheng <[email protected]>
Revert "ACPI / EC: Enable event freeze mode..." to fix a regression
Lv Zheng <[email protected]>
ACPI / EC: Drop EC noirq hooks to fix a regression
Richard Weinberger <[email protected]>
ubifs: Set double hash cookie also for RENAME_EXCHANGE
David Gstir <[email protected]>
ubifs: Don't encrypt special files on creation
Richard Weinberger <[email protected]>
ubifs: Don't leak kernel memory to the MTD
Richard Weinberger <[email protected]>
ubifs: Correctly evict xattr inodes
Boris Brezillon <[email protected]>
mtd: nand: tango: Fix incorrect use of SEQIN command
James Hogan <[email protected]>
MIPS: Negate error syscall return in trace
James Hogan <[email protected]>
MIPS: Fix mips_atomic_set() with EVA
James Hogan <[email protected]>
MIPS: Fix mips_atomic_set() retry condition
Maarten Lankhorst <[email protected]>
drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb
Chuanxiao Dong <[email protected]>
drm/i915/gvt: Fix inconsistent locks holding sequence
Robin Murphy <[email protected]>
iommu/arm-smmu: Plumb in new ACPI identifiers
Dan Carpenter <[email protected]>
ftrace: Fix uninitialized variable in match_records()
Marta Rybczynska <[email protected]>
nvme-rdma: remove race conditions from IB signalling
Alex Williamson <[email protected]>
vfio: Remove unnecessary uses of vfio_container.group_lock
Alex Williamson <[email protected]>
vfio: New external user group/file match
Alex Williamson <[email protected]>
vfio: Fix group release deadlock
Ville Syrjälä <[email protected]>
drm/i915: Disable MSI for all pre-gen5
Hawking Zhang <[email protected]>
drm/amd/powerplay: fix memory leak in cz_hwmgr backend
Amir Goldstein <[email protected]>
ovl: fix random return value on mount
Amir Goldstein <[email protected]>
ovl: mark parent impure on ovl_link()
Dan Carpenter <[email protected]>
serial: sh-sci: Uninitialized variables in sysfs files
Dan Carpenter <[email protected]>
serial: st-asc: Potential error pointer dereference
Jaegeuk Kim <[email protected]>
f2fs: Don't clear SGID when inheriting ACLs
Chao Yu <[email protected]>
f2fs: use spin_{,un}lock_irq{save,restore}Jin Qian <[email protected]>
f2fs: sanity check size of nat and sit cache
Damien Le Moal <[email protected]>
f2fs: Do not issue small discards in LFS mode
Jaegeuk Kim <[email protected]>
f2fs: try to freeze in gc and discard threads
Jin Qian <[email protected]>
f2fs: sanity check checkpoint segno and blkoff
Chao Yu <[email protected]>
f2fs: wake up all waiters in f2fs_submit_discard_endio
Jaegeuk Kim <[email protected]>
f2fs: load inode's flag from disk
Pavel Shilovsky <[email protected]>
CIFS: Reconnect expired SMB sessions
Jan Kara <[email protected]>
xfs: Don't clear SGID when inheriting ACLs
Corey Minyard <[email protected]>
ipmi:ssif: Add missing unlock in error branch
Tony Camuso <[email protected]>
ipmi: use rcu lock around call to intf->handlers->sender()
Eric Anholt <[email protected]>
drm/etnaviv: Expose our reservation object when exporting a dmabuf.
John Brooks <[email protected]>
drm/ttm: Fix use-after-free in ttm_bo_clean_mm
Mario Kleiner <[email protected]>
drm/radeon: Fix eDP for single-display iMac10,1 (v2)
Alex Deucher <[email protected]>
drm/radeon/ci: disable mclk switching for high refresh rates (v2)
John Brooks <[email protected]>
drm/amdgpu: Don't call amd_powerplay_destroy() if we don't have powerplay
Huang Rui <[email protected]>
drm/amdgpu: fix the memory corruption on S3
Tom St Denis <[email protected]>
drm/amd/amdgpu: Return error if initiating read out of range on vram
Alex Deucher <[email protected]>
drm/amdgpu/cgs: always set reference clock in mode_info
Alex Deucher <[email protected]>
drm/amdgpu: fix vblank_time when displays are off
Alex Deucher <[email protected]>
drm/amdgpu/gfx8: drop per-APU CU limits
Jiri Olsa <[email protected]>
s390/syscalls: Fix out of bounds arguments access
Xiao Ni <[email protected]>
Raid5 should update rdev->sectors after reshape
Heinz Mauelshagen <[email protected]>
dm raid: stop using BUG() in __rdev_sectors()
Jan Kara <[email protected]>
ext2: Don't clear SGID when inheriting ACLs
Toshi Kani <[email protected]>
libnvdimm: fix badblock range handling of ARS range
Vishal Verma <[email protected]>
libnvdimm: fix the clear-error check in nsio_rw_bytes
Vishal Verma <[email protected]>
libnvdimm, btt: fix btt_rw_page not returning errors
Yasunori Goto <[email protected]>
tools/testing/nvdimm: fix nfit_test buffer overflow
David Härdeman <[email protected]>
rc-core: fix input repeat handling
Devin Heitmueller <[email protected]>
cx88: Fix regression in initial video standard setting
Marek Marczykowski-Górecki <[email protected]>
x86/xen: allow userspace access during hypercalls
NeilBrown <[email protected]>
md: fix deadlock between mddev_suspend() and md_write_start()
Mikulas Patocka <[email protected]>
md: don't use flush_signals in userspace processes
Dmitry Torokhov <[email protected]>
HID: multitouch: do not blindly set EV_KEY or EV_ABS bits
Yoshihiro Shimoda <[email protected]>
usb: renesas_usbhs: gadget: disable all eps when the driver stops
Yoshihiro Shimoda <[email protected]>
usb: renesas_usbhs: fix usbhsc_resume() for !USBHSF_RUNTIME_PWCTRL
Johan Hovold <[email protected]>
USB: cdc-acm: add device-id for quirky printer
Colin Ian King <[email protected]>
usb: storage: return on error to avoid a null pointer dereference
Devin Heitmueller <[email protected]>
mxl111sf: Fix driver to use heap allocate buffers for USB messages
Jiahau Chang <[email protected]>
xhci: Bad Ethernet performance plugged in ASM1042A host
Mathias Nyman <[email protected]>
xhci: Fix NULL pointer dereference when cleaning up streams for removed host
Mathias Nyman <[email protected]>
xhci: fix 20000ms port resume timeout
Shu Wang <[email protected]>
xhci: fix memleak in xhci_run()
Peter Chen <[email protected]>
usb: xhci: fix spinlock recursion for USB2 test mode
Michael Hernandez <[email protected]>
PCI/MSI: Ignore affinity if pre/post vector count is more than min_vecs
Chen Yu <[email protected]>
PCI/PM: Restore the status of PCI devices across hibernation
Shawn Lin <[email protected]>
PCI: rockchip: Use normal register bank for config accessors
Bjorn Helgaas <[email protected]>
PCI: Work around poweroff & suspend-to-RAM issue on Macbook Pro 11
Jon Derrick <[email protected]>
PCI: vmd: Move SRCU cleanup after bus, child device removal
Juergen Gross <[email protected]>
xen/x86: fix cpu hotplug
Madhavan Srinivasan <[email protected]>
powerpc/perf: Fix SDAR_MODE value for continous sampling on Power9
Benjamin Herrenschmidt <[email protected]>
powerpc/mm/radix: Properly clear process table entry
Oliver O'Halloran <[email protected]>
powerpc/asm: Mark cr0 as clobbered in mftb()
Anton Blanchard <[email protected]>
powerpc: Fix emulation of mfocrf in emulate_step()
Anton Blanchard <[email protected]>
powerpc: Fix emulation of mcrf in emulate_step()
Michael Ellerman <[email protected]>
powerpc/64: Fix atomic64_inc_not_zero() to return an int
Balbir Singh <[email protected]>
powerpc/mm/radix: Fix execute permissions for interrupt_vectors
Balbir Singh <[email protected]>
powerpc/pseries: Fix passing of pp0 in updatepp() and updateboltedpp()
Michael Ellerman <[email protected]>
powerpc/mm/radix: Only add X for pages overlapping kernel text
Paolo Bonzini <[email protected]>
scsi: virtio_scsi: always read VPD pages for multiqueue too
Bart Van Assche <[email protected]>
xen/scsiback: Fix a TMR related use-after-free
Nicholas Bellinger <[email protected]>
iscsi-target: Add login_keys_workaround attribute for non RFC initiators
Bart Van Assche <[email protected]>
scsi: Avoid that scsi_exit_rq() triggers a use-after-free
Ewan D. Milne <[email protected]>
scsi: Add STARGET_CREATED_REMOVE state to scsi_target_state
Quinn Tran <[email protected]>
scsi: qla2xxx: Allow ABTS, PURX, RIDA on ATIOQ for ISP83XX/27XX
Paolo Bonzini <[email protected]>
scsi: virtio_scsi: let host do exception handling
Maurizio Lombardi <[email protected]>
scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails.
Krzysztof Kozlowski <[email protected]>
PM / Domains: Fix unsafe iteration over modified list of domains
Krzysztof Kozlowski <[email protected]>
PM / Domains: Fix unsafe iteration over modified list of domain providers
Krzysztof Kozlowski <[email protected]>
PM / Domains: Fix unsafe iteration over modified list of device links
Peter Rosin <[email protected]>
ASoC: atmel: tse850: fix off-by-one in the "ANA" enumeration count
Satish Babu Patakokila <[email protected]>
ASoC: compress: Derive substream from stream based on direction
Shawn Guo <[email protected]>
ASoC: zx-i2s: flip I2S master/slave mode
Cyrille Pitchen <[email protected]>
spi: atmel: fix corrupted data issue on SAM9 family SoCs
Matwey V Kornilov <[email protected]>
igb: Explicitly select page 0 at initialization
Filipe Manana <[email protected]>
Btrfs: incremental send, fix invalid memory access
Jan Kara <[email protected]>
btrfs: Don't clear SGID when inheriting ACLs
Filipe Manana <[email protected]>
Btrfs: fix invalid extent maps due to hole punching
Brian Norris <[email protected]>
mwifiex: fixup error cases in mwifiex_add_virtual_intf()
Ankit Kumar <[email protected]>
pstore: Don't warn if data is uncompressed and type is not PSTORE_TYPE_DMESG
Arnd Bergmann <[email protected]>
wlcore: fix 64K page support
Jason A. Donenfeld <[email protected]>
Bluetooth: use constant time memory comparison for secret values
Adrian Hunter <[email protected]>
perf intel-pt: Clear FUP flag on error
Adrian Hunter <[email protected]>
perf intel-pt: Use FUP always when scanning for an IP
Adrian Hunter <[email protected]>
perf intel-pt: Ensure never to set 'last_ip' when packet 'count' is zero
Adrian Hunter <[email protected]>
perf intel-pt: Fix last_ip usage
Adrian Hunter <[email protected]>
perf intel-pt: Ensure IP is zero when state is INTEL_PT_STATE_NO_IP
Adrian Hunter <[email protected]>
perf intel-pt: Fix missing stack clear
Adrian Hunter <[email protected]>
perf intel-pt: Improve sample timestamp
Adrian Hunter <[email protected]>
perf intel-pt: Move decoder error setting into one condition
Mateusz Jurczyk <[email protected]>
NFC: Add sockaddr length checks before accessing sa_family in bind handlers
Mateusz Jurczyk <[email protected]>
nfc: Fix the sockaddr length sanitization in llcp_sock_connect
Mateusz Jurczyk <[email protected]>
nfc: Ensure presence of required attributes in the activate_target handler
Johan Hovold <[email protected]>
NFC: nfcmrvl: fix firmware-management initialisation
Johan Hovold <[email protected]>
NFC: nfcmrvl: use nfc-device for firmware download
Johan Hovold <[email protected]>
NFC: nfcmrvl: do not use device-managed resources
Johan Hovold <[email protected]>
NFC: nfcmrvl_uart: add missing tty-device sanity check
Johan Hovold <[email protected]>
NFC: fix broken device allocation
Emmanuel Grumbach <[email protected]>
iwlwifi: mvm: fix the recovery flow while connecting
Miaoqing Pan <[email protected]>
ath9k: fix an invalid pointer dereference in ath9k_rng_stop()
Miaoqing Pan <[email protected]>
ath9k: fix tx99 bus error
Miaoqing Pan <[email protected]>
ath9k: fix tx99 use after free
Viresh Kumar <[email protected]>
thermal: cpu_cooling: Avoid accessing potentially freed structures
Johan Hovold <[email protected]>
thermal: max77620: fix device-node reference imbalance
Mauro Carvalho Chehab <[email protected]>
s5p-jpeg: don't return a random width/height
Arnd Bergmann <[email protected]>
ir-core: fix gcc-7 warning on bool arithmetic
Linus Torvalds <[email protected]>
disable new gcc-7.1.1 warnings for now
-------------
Diffstat:
Makefile | 7 +- arch/mips/include/asm/branch.h | 5 +- arch/mips/kernel/branch.c | 71 +++++---- arch/mips/kernel/proc.c | 2 +- arch/mips/kernel/ptrace.c | 2 +- arch/mips/kernel/scall32-o32.S | 2 +- arch/mips/kernel/scall64-64.S | 2 +- arch/mips/kernel/scall64-n32.S | 2 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/mips/kernel/syscall.c | 15 +- arch/mips/math-emu/cp1emu.c | 38 +++++ arch/powerpc/include/asm/atomic.h | 4 +- arch/powerpc/include/asm/reg.h | 2 +- arch/powerpc/lib/sstep.c | 19 ++- arch/powerpc/mm/mmu_context_book3s64.c | 12 +- arch/powerpc/mm/pgtable-radix.c | 15 +- arch/powerpc/perf/isa207-common.c | 6 +- arch/powerpc/platforms/pseries/lpar.c | 11 +- arch/s390/include/asm/syscall.h | 6 + arch/x86/include/asm/xen/hypercall.h | 9 +- arch/x86/kernel/acpi/boot.c | 8 ++ arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/pci/fixup.c | 32 +++++ arch/x86/xen/smp_pv.c | 3 +- drivers/acpi/ec.c | 21 +-- drivers/acpi/nfit/core.c | 10 +- drivers/base/power/domain.c | 20 +-- drivers/char/ipmi/ipmi_msghandler.c | 5 + drivers/char/ipmi/ipmi_ssif.c | 5 + drivers/cpufreq/intel_pstate.c | 21 ++- drivers/dax/device-dax.h | 2 +- drivers/dax/device.c | 24 ++-- drivers/dax/pmem.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 71 +-------- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 6 + drivers/gpu/drm/drm_dp_mst_topology.c | 41 ++++-- drivers/gpu/drm/drm_framebuffer.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 + drivers/gpu/drm/i915/gvt/kvmgt.c | 14 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 8 +- drivers/gpu/drm/i915/i915_perf.c | 12 +- drivers/gpu/drm/i915/intel_cdclk.c | 20 +++ drivers/gpu/drm/i915/intel_fbdev.c | 11 +- drivers/gpu/drm/imx/parallel-display.c | 2 +- drivers/gpu/drm/radeon/atombios_encoders.c | 13 +- drivers/gpu/drm/radeon/ci_dpm.c | 6 + drivers/gpu/drm/ttm/ttm_bo.c | 4 +- drivers/hid/hid-multitouch.c | 16 +-- drivers/hv/channel.c | 2 + drivers/infiniband/core/addr.c | 6 +- drivers/infiniband/core/cma.c | 2 + drivers/infiniband/core/uverbs_cmd.c | 3 +- drivers/infiniband/hw/mlx5/mr.c | 2 +- drivers/infiniband/ulp/iser/iscsi_iser.c | 11 ++ drivers/infiniband/ulp/isert/ib_isert.c | 2 +- drivers/input/serio/i8042.c | 12 +- drivers/iommu/arm-smmu.c | 16 +++ drivers/md/dm-raid.c | 13 +- drivers/md/faulty.c | 5 +- drivers/md/linear.c | 7 +- drivers/md/md.c | 22 ++- drivers/md/md.h | 4 +- drivers/md/multipath.c | 8 +- drivers/md/raid0.c | 7 +- drivers/md/raid1.c | 16 ++- drivers/md/raid10.c | 10 +- drivers/md/raid5.c | 26 ++-- drivers/media/pci/cx88/cx88-cards.c | 9 +- drivers/media/pci/cx88/cx88-video.c | 2 +- drivers/media/platform/s5p-jpeg/jpeg-core.c | 8 +- drivers/media/rc/imon.c | 2 +- drivers/media/rc/rc-main.c | 20 +-- drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 4 +- drivers/media/usb/dvb-usb-v2/mxl111sf.c | 32 +++-- drivers/media/usb/dvb-usb-v2/mxl111sf.h | 8 +- drivers/misc/enclosure.c | 14 +- drivers/mtd/nand/tango_nand.c | 2 +- drivers/net/ethernet/intel/igb/e1000_82575.c | 1 + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 - drivers/net/wireless/ath/ath9k/rng.c | 4 +- drivers/net/wireless/ath/ath9k/tx99.c | 13 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 32 ++++- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 71 +++++---- drivers/net/wireless/ti/wlcore/spi.c | 6 +- drivers/nfc/nfcmrvl/fw_dnld.c | 7 +- drivers/nfc/nfcmrvl/main.c | 35 +++-- drivers/nfc/nfcmrvl/uart.c | 8 +- drivers/nvdimm/btt.c | 9 +- drivers/nvdimm/claim.c | 3 +- drivers/nvdimm/core.c | 7 +- drivers/nvme/host/rdma.c | 20 +-- drivers/pci/host/pcie-rockchip.c | 13 +- drivers/pci/host/vmd.c | 2 +- drivers/pci/msi.c | 14 +- drivers/pci/pci-driver.c | 1 + drivers/scsi/qla2xxx/qla_init.c | 7 +- drivers/scsi/scsi_lib.c | 47 +++--- drivers/scsi/scsi_scan.c | 5 +- drivers/scsi/scsi_sysfs.c | 8 +- drivers/scsi/virtio_scsi.c | 13 ++ drivers/spi/spi-atmel.c | 24 +++- drivers/spmi/spmi.c | 12 ++ drivers/staging/comedi/drivers/ni_mio_common.c | 3 +- .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 19 ++- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + drivers/staging/sm750fb/sm750.c | 24 ++++ drivers/target/iscsi/iscsi_target_configfs.c | 2 + drivers/target/iscsi/iscsi_target_nego.c | 6 +- drivers/target/iscsi/iscsi_target_parameters.c | 41 ++++-- drivers/target/iscsi/iscsi_target_parameters.h | 2 +- drivers/target/iscsi/iscsi_target_tpg.c | 19 +++ drivers/target/iscsi/iscsi_target_tpg.h | 1 + drivers/target/target_core_transport.c | 9 ++ drivers/thermal/cpu_cooling.c | 4 +- drivers/thermal/max77620_thermal.c | 10 +- drivers/tty/serial/sh-sci.c | 12 +- drivers/tty/serial/st-asc.c | 1 + drivers/usb/class/cdc-acm.c | 3 + drivers/usb/host/pci-quirks.c | 54 +++++++ drivers/usb/host/pci-quirks.h | 2 + drivers/usb/host/xhci-hub.c | 5 + drivers/usb/host/xhci-pci.c | 6 + drivers/usb/host/xhci-ring.c | 11 +- drivers/usb/host/xhci.c | 10 +- drivers/usb/host/xhci.h | 1 + drivers/usb/renesas_usbhs/common.c | 4 +- drivers/usb/renesas_usbhs/mod_gadget.c | 31 +++- drivers/usb/storage/isd200.c | 5 +- drivers/vfio/vfio.c | 84 ++++++----- drivers/xen/xen-scsiback.c | 33 ++--- fs/btrfs/acl.c | 13 +- fs/btrfs/disk-io.c | 12 +- fs/btrfs/extent_io.c | 6 +- fs/btrfs/file.c | 5 +- fs/btrfs/inode.c | 8 +- fs/btrfs/send.c | 7 +- fs/ceph/dir.c | 5 + fs/cifs/cifsglob.h | 2 + fs/cifs/cifssmb.c | 7 + fs/cifs/connect.c | 7 + fs/cifs/smb2ops.c | 23 +++ fs/ext2/acl.c | 36 +++-- fs/f2fs/acl.c | 2 +- fs/f2fs/checkpoint.c | 11 +- fs/f2fs/f2fs.h | 18 ++- fs/f2fs/file.c | 1 + fs/f2fs/gc.c | 9 +- fs/f2fs/inode.c | 2 +- fs/f2fs/segment.c | 37 +++-- fs/f2fs/super.c | 16 +++ fs/fs-writeback.c | 8 +- fs/hfsplus/posix_acl.c | 30 ++-- fs/nfs/dir.c | 12 +- fs/nfs/filelayout/filelayout.c | 3 +- fs/nfs/inode.c | 4 +- fs/nfs/pagelist.c | 1 + fs/overlayfs/dir.c | 22 ++- fs/overlayfs/super.c | 1 + fs/pstore/platform.c | 5 +- fs/reiserfs/xattr_acl.c | 12 +- fs/ubifs/dir.c | 1 + fs/ubifs/journal.c | 12 +- fs/ubifs/tnc.c | 2 + fs/ubifs/ubifs.h | 1 + fs/ubifs/xattr.c | 22 +++ fs/udf/file.c | 9 +- fs/udf/inode.c | 4 +- fs/xfs/xfs_acl.c | 6 +- fs/xfs/xfs_acl.h | 1 + fs/xfs/xfs_iops.c | 4 +- fs/xfs/xfs_mount.c | 4 +- include/linux/backing-dev.h | 26 +--- include/linux/blk-cgroup.h | 6 +- include/linux/init_task.h | 6 +- include/linux/interrupt.h | 4 +- include/linux/mman.h | 2 +- include/linux/percpu_counter.h | 7 +- include/linux/sched.h | 29 ++-- include/linux/vfio.h | 2 + include/linux/vtime.h | 9 +- include/net/inet_frag.h | 4 +- include/scsi/scsi_cmnd.h | 1 + include/scsi/scsi_device.h | 1 + include/target/iscsi/iscsi_target_core.h | 9 ++ kernel/cpu.c | 38 ++--- kernel/events/core.c | 28 +--- kernel/fork.c | 22 ++- kernel/irq/affinity.c | 13 +- kernel/sched/cputime.c | 158 +++++++++++++-------- kernel/sched/fair.c | 32 +++-- kernel/trace/ftrace.c | 2 +- kernel/trace/trace.c | 1 + lib/flex_proportions.c | 6 +- lib/percpu_counter.c | 11 +- mm/page-writeback.c | 10 +- net/bluetooth/smp.c | 39 ++--- net/nfc/core.c | 31 ++-- net/nfc/llcp_sock.c | 9 +- net/nfc/nci/core.c | 3 +- net/nfc/netlink.c | 4 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 +- net/sunrpc/xprtsock.c | 2 + sound/soc/atmel/tse850-pcm5142.c | 4 +- sound/soc/soc-compress.c | 6 +- sound/soc/zte/zx-i2s.c | 10 +- tools/perf/ui/browser.c | 2 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 78 +++++++--- tools/testing/nvdimm/test/nfit.c | 2 +- virt/kvm/vfio.c | 27 ++-- 216 files changed, 1789 insertions(+), 951 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/196 disable new gcc-7.1.1 warnings for now
4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit bd664f6b3e376a8ef4990f87d08271cc2d01ba9a upstream.
I made the mistake of upgrading my desktop to the new Fedora 26 that comes with gcc-7.1.1.
There's nothing wrong per se that I've noticed, but I now have 1500 lines of warnings, mostly from the new format-truncation warning triggering all over the tree.
We use 'snprintf()' and friends in a lot of places, and often know that the numbers are fairly small (ie a controller index or similar), but gcc doesn't know that, and sees an 'int', and thinks that it could be some huge number. And then complains when our buffers are not able to fit the name for the ten millionth controller.
These warnings aren't necessarily bad per se, and we probably want to look through them subsystem by subsystem, but at least during the merge window they just mean that I can't even see if somebody is introducing any *real* problems when I pull.
So warnings disabled for now.
--- Makefile | 3 +++ 1 file changed, 3 insertions(+)
Makefile +3 -0
@@ -631,6 +631,9 @@ include arch/$(SRCARCH)/Makefile KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) +KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation) +KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) +KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE KBUILD_CFLAGS += $(call cc-option,-Oz,-Os)
Greg Kroah-Hartman
maintainerPATCH 2/196 ir-core: fix gcc-7 warning on bool arithmetic
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit bd7e31bbade02bc1e92aa00d5cf2cee2da66838a upstream.
gcc-7 suggests that an expression using a bitwise not and a bitmask on a 'bool' variable is better written using boolean logic:
drivers/media/rc/imon.c: In function 'imon_incoming_scancode':drivers/media/rc/imon.c:1725:22: error: '~' on a boolean expression [-Werror=bool-operation]
ictx->pad_mouse = ~(ictx->pad_mouse) & 0x1;
^drivers/media/rc/imon.c:1725:22: note: did you mean to use logical not?
I agree.
--- drivers/media/rc/imon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/imon.c +1 -1
@@ -1722,7 +1722,7 @@ static void imon_incoming_scancode(strucif (kc ==KEY_KEYBOARD && !ictx->release_code) { ictx->last_keycode = kc;if (!nomouse) { - ictx->pad_mouse = ~(ictx->pad_mouse) &0x1 ; + ictx->pad_mouse = !ictx->pad_mouse;dev_dbg (dev,"toggling to %s mode\n" , ictx->pad_mouse ?"mouse" :"keyboard" );spin_unlock_irqrestore (&ictx->kc_lock, flags);
Greg Kroah-Hartman
maintainerPATCH 3/196 s5p-jpeg: dont return a random width/height
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
commit a16e37726c444cbda91e73ed5f742e717bfe866f upstream.
Gcc 7.1 complains about:
drivers/media/platform/s5p-jpeg/jpeg-core.c: In function 's5p_jpeg_parse_hdr.isra.9':drivers/media/platform/s5p-jpeg/jpeg-core.c:1207:12: warning: 'width' may be used uninitialized in this function [-Wmaybe-uninitialized]
result->w = width;
~~~~~~~~~~^~~~~~~drivers/media/platform/s5p-jpeg/jpeg-core.c:1208:12: warning: 'height' may be used uninitialized in this function [-Wmaybe-uninitialized]
result->h = height;
~~~~~~~~~~^~~~~~~~
Indeed the code would allow it to return a random value (although it shouldn't happen, in practice). So, explicitly set both to zero, just in case.
--- drivers/media/platform/s5p-jpeg/jpeg-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/platform/s5p-jpeg/jpeg-core.c +4 -4
@@ -1099,10 +1099,10 @@ static bool s5p_jpeg_parse_hdr(struct s5 struct s5p_jpeg_ctx *ctx) {int c, components =0 , notfound, n_dht =0 , n_dqt =0 ; -unsigned int height, width, word, subsampling =0 , sos =0 , sof =0 , - sof_len =0 ; -unsigned int dht[S5P_JPEG_MAX_MARKER ], dht_len[S5P_JPEG_MAX_MARKER ], - dqt[S5P_JPEG_MAX_MARKER ], dqt_len[S5P_JPEG_MAX_MARKER ]; +unsigned int height =0 , width =0 , word, subsampling =0 ; +unsigned int sos =0 , sof =0 , sof_len =0 ; +unsigned int dht[S5P_JPEG_MAX_MARKER ], dht_len[S5P_JPEG_MAX_MARKER ]; +unsigned int dqt[S5P_JPEG_MAX_MARKER ], dqt_len[S5P_JPEG_MAX_MARKER ];long length;struct s5p_jpeg_buffer jpeg_buffer;
Greg Kroah-Hartman
maintainerPATCH 4/196 thermal: max77620: fix device-node reference imbalance
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit c592fafbdbb6b1279b76a54722d1465ca77e5bde upstream.
The thermal child device reuses the parent MFD-device device-tree node when registering a thermal zone, but did not take a reference to the node.
This leads to a reference imbalance, and potential use-after-free, when the node reference is dropped by the platform-bus device destructor (once for the child and later again for the parent).
Fix this by dropping any reference already held to a device-tree node and getting a reference to the parent's node which will be balanced on reprobe or on platform-device release, whichever comes first.
Note that simply clearing the of_node pointer on probe errors and on driver unbind would not allow the use of device-managed resources as specifically thermal_zone_of_sensor_unregister() claims that a valid device-tree node pointer is needed during deregistration (even if it currently does not seem to use it).
--- drivers/thermal/max77620_thermal.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/thermal/max77620_thermal.c +8 -2
@@ -104,8 +104,6 @@ static int max77620_thermal_probe(structreturn -EINVAL ; } - pdev->dev.of_node = pdev->dev.parent->of_node; - mtherm->dev = &pdev->dev; mtherm->rmap =dev_get_regmap (pdev->dev.parent,NULL );if (!mtherm->rmap) {
@@ -113,6 +111,14 @@ static int max77620_thermal_probe(structreturn -ENODEV ; } +/* +* Drop any current reference to a device-tree node and get a +* reference to the parent's node which will be balanced on reprobe or +* on platform-device release. +*/ +of_node_put (pdev->dev.of_node); + pdev->dev.of_node =of_node_get (pdev->dev.parent->of_node); + mtherm->tz_device =devm_thermal_zone_of_sensor_register (&pdev->dev,0 , mtherm, &max77620_thermal_ops);if (IS_ERR (mtherm->tz_device)) {
Greg Kroah-Hartman
maintainerPATCH 5/196 thermal: cpu_cooling: Avoid accessing potentially freed structures
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viresh Kumar <[email protected]>
commit 289d72afddf83440117c35d864bf0c6309c1d011 upstream.
After the lock is dropped, it is possible that the cpufreq_dev gets freed before we call get_level() and that can cause kernel to crash.
Drop the lock after we are done using the structure.
--- drivers/thermal/cpu_cooling.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/thermal/cpu_cooling.c +3 -1
@@ -153,8 +153,10 @@ unsigned long cpufreq_cooling_get_level(mutex_lock (&cooling_list_lock);list_for_each_entry (cpufreq_dev, &cpufreq_dev_list, node) {if (cpumask_test_cpu (cpu, &cpufreq_dev->allowed_cpus)) { +unsigned long level =get_level (cpufreq_dev, freq); +mutex_unlock (&cooling_list_lock); -return get_level (cpufreq_dev, freq); +return level; } }mutex_unlock (&cooling_list_lock);
Greg Kroah-Hartman
maintainerPATCH 6/196 ath9k: fix tx99 use after free
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miaoqing Pan <[email protected]>
commit cf8ce1ea61b75712a154c93e40f2a5af2e4dd997 upstream.
One scenario that could lead to UAF is two threads writing simultaneously to the "tx99" debug file. One of them would set the "start" value to true and follow to ath9k_tx99_init(). Inside the function it would set the sc->tx99_state to true after allocating sc->tx99skb. Then, the other thread would execute write_file_tx99() and call ath9k_tx99_deinit(). sc->tx99_state would be freed. After that, the first thread would continue inside ath9k_tx99_init() and call
r = ath9k_tx99_send(sc, sc->tx99_skb, &txctl);
that would make use of the freed sc->tx99_skb memory.
--- drivers/net/wireless/ath/ath9k/tx99.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath9k/tx99.c +9 -4
@@ -189,22 +189,27 @@ static ssize_t write_file_tx99(struct fiif (strtobool (buf, &start))return -EINVAL ; +mutex_lock (&sc->mutex); +if (start == sc->tx99_state) {if (!start) -return count; + goto out;ath_dbg (common,XMIT ,"Resetting TX99\n" );ath9k_tx99_deinit (sc); }if (!start) {ath9k_tx99_deinit (sc); -return count; + goto out; } r =ath9k_tx99_init (sc); -if (r) +if (r) { +mutex_unlock (&sc->mutex);return r; - + } +out: +mutex_unlock (&sc->mutex);return count; }
Greg Kroah-Hartman
maintainerPATCH 7/196 ath9k: fix tx99 bus error
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miaoqing Pan <[email protected]>
commit bde717ab473668377fc65872398a102d40cb2d58 upstream.
The hard coded register 0x9864 and 0x9924 are invalid for ar9300 chips.
--- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_phy.c +0 -2
@@ -1821,8 +1821,6 @@ static void ar9003_hw_spectral_scan_waitstatic void ar9003_hw_tx99_start (struct ath_hw *ah,u32 qnum) {REG_SET_BIT (ah,AR_PHY_TEST ,PHY_AGC_CLR ); -REG_SET_BIT (ah,0x9864 ,0x7f000 ); -REG_SET_BIT (ah,0x9924 ,0x7f00fe );REG_CLR_BIT (ah,AR_DIAG_SW ,AR_DIAG_RX_DIS );REG_WRITE (ah,AR_CR ,AR_CR_RXD );REG_WRITE (ah,AR_DLCL_IFS (qnum),0 );
Greg Kroah-Hartman
maintainerPATCH 8/196 ath9k: fix an invalid pointer dereference in ath9k_rng_stop()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miaoqing Pan <[email protected]>
commit 07246c115801c27652700e3679bb58661ef7ed65 upstream.
The bug was triggered when do suspend/resuming continuously on Dell XPS L322X/0PJHXN version 9333 (2013) with kernel 4.12.0-041200rc4-generic. But can't reproduce on DELL E5440 + AR9300 PCIE chips.
The warning is caused by accessing invalid pointer sc->rng_task. sc->rng_task is not be cleared after kthread_stop(sc->rng_task) be called in ath9k_rng_stop(). Because the kthread is stopped before ath9k_rng_kthread() be scheduled.
So set sc->rng_task to null after kthread_stop(sc->rng_task) to resolve this issue.
WARNING: CPU: 0 PID: 984 at linux/kernel/kthread.c:71 kthread_stop+0xf1/0x100 CPU: 0 PID: 984 Comm: NetworkManager Not tainted 4.12.0-041200rc4-generic #201706042031 Hardware name: Dell Inc. Dell System XPS L322X/0PJHXN, BIOS A09 05/15/2013 task: ffff950170fdda00 task.stack: ffffa22c01538000 RIP: 0010:kthread_stop+0xf1/0x100 RSP: 0018:ffffa22c0153b5b0 EFLAGS: 00010246 RAX: ffffffffa6257800 RBX: ffff950171b79560 RCX: 0000000000000000 RDX: 0000000080000000 RSI: 000000007fffffff RDI: ffff9500ac9a9680 RBP: ffffa22c0153b5c8 R08: 0000000000000000 R09: 0000000000000000 R10: ffffa22c0153b648 R11: ffff9501768004b8 R12: ffff9500ac9a9680 R13: ffff950171b79f70 R14: ffff950171b78780 R15: ffff9501749dc018 FS: 00007f0d6bfd5540(0000) GS:ffff95017f200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fc190161a08 CR3: 0000000232906000 CR4: 00000000001406f0 Call Trace: ath9k_rng_stop+0x1a/0x20 [ath9k] ath9k_stop+0x3b/0x1d0 [ath9k] drv_stop+0x33/0xf0 [mac80211] ieee80211_stop_device+0x43/0x50 [mac80211] ieee80211_do_stop+0x4f2/0x810 [mac80211]
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196043
--- drivers/net/wireless/ath/ath9k/rng.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/rng.c +3 -1
@@ -120,6 +120,8 @@ void ath9k_rng_start(struct ath_softc *svoid ath9k_rng_stop (struct ath_softc *sc) { -if (sc->rng_task) +if (sc->rng_task) {kthread_stop (sc->rng_task); + sc->rng_task =NULL ; + } }
Greg Kroah-Hartman
maintainerPATCH 9/196 iwlwifi: mvm: fix the recovery flow while connecting
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emmanuel Grumbach <[email protected]>
commit 6b28f9784c394f0692e160f81b07c82cb64af160 upstream.
In BSS mode in the disconnection flow, mac80211 removes the AP station before the vif is set to unassociated. Our firmware wants it the other way around: first set the vif as unassociated, and then remove the AP station.
In order to bridge between those two different behaviors, iwlmvm doesn't remove the station from the firmware when mac80211 removes it, but only after the vif is set to unassociated. The implementation is in iwl_mvm_bss_info_changed_station:
if (assoc state was modified && mvmvif->ap_sta_id is VALID
&& assoc state is now UNASSC) remove_the_station_from_the_firmware()
During the recovery flow, mac80211 re-adds the AP station and then reconfigures the vif. Since the vif is not associated, and then, we enter the if above (which was intended to be taken in the disconnection flow only) and remove the station we just added. This defeats the recovery flow.
Fix this by not removing the AP station in this flow if we are in recovery flow.
--- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 32 +++++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +25 -7
@@ -1974,14 +1974,32 @@ static void iwl_mvm_bss_info_changed_staWARN_ONCE (iwl_mvm_sf_update (mvm, vif, false),"Failed to update SF upon disassociation\n" ); -/* remove AP station now that the MAC is unassoc */ - ret =iwl_mvm_rm_sta_id (mvm, vif, mvmvif->ap_sta_id); -if (ret) -IWL_ERR (mvm,"failed to remove AP station\n" ); +/* +* If we get an assert during the connection (after the +* station has been added, but before the vif is set +* to associated), mac80211 will re-add the station and +* then configure the vif. Since the vif is not +* associated, we would remove the station here and +* this would fail the recovery. +*/ +if (!test_bit (IWL_MVM_STATUS_IN_HW_RESTART , + &mvm->status)) { +/* +* Remove AP station now that +* the MAC is unassoc +*/ + ret =iwl_mvm_rm_sta_id (mvm, vif, + mvmvif->ap_sta_id); +if (ret) +IWL_ERR (mvm, +"failed to remove AP station\n" ); + +if (mvm->d0i3_ap_sta_id == mvmvif->ap_sta_id) + mvm->d0i3_ap_sta_id = +IWL_MVM_INVALID_STA ; + mvmvif->ap_sta_id =IWL_MVM_INVALID_STA ; + } -if (mvm->d0i3_ap_sta_id == mvmvif->ap_sta_id) - mvm->d0i3_ap_sta_id =IWL_MVM_INVALID_STA ; - mvmvif->ap_sta_id =IWL_MVM_INVALID_STA ;/* remove quota for this interface */ ret =iwl_mvm_update_quotas (mvm, false,NULL );if (ret)
Greg Kroah-Hartman
maintainerPATCH 10/196 NFC: fix broken device allocation
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 20777bc57c346b6994f465e0d8261a7fbf213a09 upstream.
Commit 7eda8b8e9677 ("NFC: Use IDR library to assing NFC devices IDs") moved device-id allocation and struct-device initialisation from nfc_allocate_device() to nfc_register_device().
This broke just about every nfc-device-registration error path, which continue to call nfc_free_device() that tries to put the device reference of the now uninitialised (but zeroed) struct device:
kobject: '(null)' (ce316420): is not initialized, yet kobject_put() is being called.
The late struct-device initialisation also meant that various work queues whose names are derived from the nfc device name were also misnamed:
421 root 0 SW< [(null)_nci_cmd_] 422 root 0 SW< [(null)_nci_rx_w] 423 root 0 SW< [(null)_nci_tx_w]
Move the id-allocation and struct-device initialisation back to nfc_allocate_device() and fix up the single call site which did not use nfc_free_device() in its error path.
--- net/nfc/core.c | 31 ++++++++++++++++++------------- net/nfc/nci/core.c | 3 +-- 2 files changed, 19 insertions(+), 15 deletions(-)
net/nfc/core.c +18 -13
@@ -982,6 +982,8 @@ static void nfc_release(struct device *dkfree (se); } +ida_simple_remove (&nfc_index_ida, dev->idx); +kfree (dev); }
@@ -1056,6 +1058,7 @@ struct nfc_dev *nfc_allocate_device(stru int tx_headroom, int tx_tailroom) {struct nfc_dev *dev; +int rc;if (!ops->start_poll || !ops->stop_poll || !ops->activate_target || !ops->deactivate_target || !ops->im_transceive)
@@ -1068,6 +1071,15 @@ struct nfc_dev *nfc_allocate_device(struif (!dev)return NULL ; + rc =ida_simple_get (&nfc_index_ida,0 ,0 ,GFP_KERNEL ); +if (rc <0 ) + goto err_free_dev; + dev->idx = rc; + + dev->dev.class = &nfc_class; +dev_set_name (&dev->dev,"nfc%d" , dev->idx); +device_initialize (&dev->dev); + dev->ops = ops; dev->supported_protocols = supported_protocols; dev->tx_headroom = tx_headroom;
@@ -1090,6 +1102,11 @@ struct nfc_dev *nfc_allocate_device(stru }return dev; + +err_free_dev: +kfree (dev); + +return ERR_PTR (rc); }EXPORT_SYMBOL (nfc_allocate_device);
@@ -1104,14 +1121,6 @@ int nfc_register_device(struct nfc_dev *pr_debug ("dev_name=%s\n" ,dev_name (&dev->dev)); - dev->idx =ida_simple_get (&nfc_index_ida,0 ,0 ,GFP_KERNEL ); -if (dev->idx <0 ) -return dev->idx; - - dev->dev.class = &nfc_class; -dev_set_name (&dev->dev,"nfc%d" , dev->idx); -device_initialize (&dev->dev); -mutex_lock (&nfc_devlist_mutex); nfc_devlist_generation++; rc =device_add (&dev->dev);
@@ -1149,12 +1158,10 @@ EXPORT_SYMBOL(nfc_register_device);*/ void nfc_unregister_device (struct nfc_dev *dev) { -int rc, id; +int rc;pr_debug ("dev_name=%s\n" ,dev_name (&dev->dev)); - id = dev->idx; -if (dev->rfkill) {rfkill_unregister (dev->rfkill);rfkill_destroy (dev->rfkill);
@@ -1179,8 +1186,6 @@ void nfc_unregister_device(struct nfc_de nfc_devlist_generation++;device_del (&dev->dev);mutex_unlock (&nfc_devlist_mutex); - -ida_simple_remove (&nfc_index_ida, id); }EXPORT_SYMBOL (nfc_unregister_device);
net/nfc/nci/core.c +1 -2
@@ -1173,8 +1173,7 @@ struct nci_dev *nci_allocate_device(strureturn ndev; free_nfc: -kfree (ndev->nfc_dev); - +nfc_free_device (ndev->nfc_dev); free_nci:kfree (ndev);return NULL ;
Greg Kroah-Hartman
maintainerPATCH 11/196 NFC: nfcmrvl_uart: add missing tty-device sanity check
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 15e0c59f1535926a939d1df66d6edcf997d7c1b9 upstream.
Make sure to check the tty-device pointer before trying to access the parent device to avoid dereferencing a NULL-pointer when the tty is one end of a Unix98 pty.
--- drivers/nfc/nfcmrvl/uart.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/nfc/nfcmrvl/uart.c +4 -4
@@ -109,6 +109,7 @@ static int nfcmrvl_nci_uart_open(structstruct nfcmrvl_private *priv;struct nfcmrvl_platform_data *pdata =NULL ;struct nfcmrvl_platform_data config; +struct device *dev = nu->tty->dev;/* * Platform data cannot be used here since usually it is already used
@@ -116,9 +117,8 @@ static int nfcmrvl_nci_uart_open(struct* and check if DT entries were added. */ -if (nu->tty->dev->parent && nu->tty->dev->parent->of_node) -if (nfcmrvl_uart_parse_dt (nu->tty->dev->parent->of_node, - &config) ==0 ) +if (dev && dev->parent && dev->parent->of_node) +if (nfcmrvl_uart_parse_dt (dev->parent->of_node, &config) ==0 ) pdata = &config;if (!pdata) {
@@ -131,7 +131,7 @@ static int nfcmrvl_nci_uart_open(struct } priv =nfcmrvl_nci_register_dev (NFCMRVL_PHY_UART , nu, &uart_ops, - nu->tty->dev, pdata); + dev, pdata);if (IS_ERR (priv))return PTR_ERR (priv);
Greg Kroah-Hartman
maintainerPATCH 12/196 NFC: nfcmrvl: do not use device-managed resources
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 0cbe40112f42cf5e008f9127f6cd5952ba3946c7 upstream.
This specifically fixes resource leaks in the registration error paths.
Device-managed resources is a bad fit for this driver as devices can be registered from the n_nci line discipline. Firstly, a tty may not even have a corresponding device (should it be part of a Unix98 pty) something which would lead to a NULL-pointer dereference when registering resources.
Secondly, if the tty has a class device, its lifetime exceeds that of the line discipline, which means that resources would leak every time the line discipline is closed (or if registration fails).
Currently, the devres interface was only being used to request a reset gpio despite the fact that it was already explicitly freed in nfcmrvl_nci_unregister_dev() (along with the private data), something which also prevented the resource leak at close.
Note that the driver treats gpio number 0 as invalid despite it being perfectly valid. This will be addressed in a follow-up patch.
--- drivers/nfc/nfcmrvl/main.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/nfc/nfcmrvl/main.c +11 -8
@@ -124,12 +124,13 @@ struct nfcmrvl_private *nfcmrvl_nci_regimemcpy (&priv->config, pdata,sizeof (*pdata));if (priv->config.reset_n_io) { - rc =devm_gpio_request_one (dev, - priv->config.reset_n_io, -GPIOF_OUT_INIT_LOW , -"nfcmrvl_reset_n" ); -if (rc <0 ) + rc =gpio_request_one (priv->config.reset_n_io, +GPIOF_OUT_INIT_LOW , +"nfcmrvl_reset_n" ); +if (rc <0 ) { + priv->config.reset_n_io =0 ;nfc_err (dev,"failed to request reset_n io\n" ); + } }if (phy ==NFCMRVL_PHY_SPI ) {
@@ -154,7 +155,7 @@ struct nfcmrvl_private *nfcmrvl_nci_regiif (!priv->ndev) {nfc_err (dev,"nci_allocate_device failed\n" ); rc = -ENOMEM ; - goto error; + goto error_free_gpio; }nci_set_drvdata (priv->ndev, priv);
@@ -179,7 +180,9 @@ struct nfcmrvl_private *nfcmrvl_nci_regi error_free_dev:nci_free_device (priv->ndev); -error: +error_free_gpio: +if (priv->config.reset_n_io) +gpio_free (priv->config.reset_n_io);kfree (priv);return ERR_PTR (rc); }
@@ -195,7 +198,7 @@ void nfcmrvl_nci_unregister_dev(struct nnfcmrvl_fw_dnld_deinit (priv);if (priv->config.reset_n_io) -devm_gpio_free (priv->dev, priv->config.reset_n_io); +gpio_free (priv->config.reset_n_io);nci_unregister_device (ndev);nci_free_device (ndev);
Greg Kroah-Hartman
maintainerPATCH 13/196 NFC: nfcmrvl: use nfc-device for firmware download
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit e5834ac22948169bbd7c45996d8d4905edd20f5e upstream.
Use the nfc- rather than phy-device in firmware-management code that needs a valid struct device.
This specifically fixes a NULL-pointer dereference in nfcmrvl_fw_dnld_init() during registration when the underlying tty is one end of a Unix98 pty.
Note that the driver still uses the phy device for any debugging, which is fine for now.
--- drivers/nfc/nfcmrvl/fw_dnld.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/nfc/nfcmrvl/fw_dnld.c +5 -2
@@ -458,7 +458,7 @@ int nfcmrvl_fw_dnld_init(struct nfcmrvl_INIT_WORK (&priv->fw_dnld.rx_work, fw_dnld_rx_work);snprintf (name,sizeof (name),"%s_nfcmrvl_fw_dnld_rx_wq" , -dev_name (priv->dev)); +dev_name (&priv->ndev->nfc_dev->dev)); priv->fw_dnld.rx_wq =create_singlethread_workqueue (name);if (!priv->fw_dnld.rx_wq)return -ENOMEM ;
@@ -495,6 +495,7 @@ int nfcmrvl_fw_dnld_start(struct nci_dev {struct nfcmrvl_private *priv =nci_get_drvdata (ndev);struct nfcmrvl_fw_dnld *fw_dnld = &priv->fw_dnld; +int res;if (!priv->support_fw_dnld)return -ENOTSUPP ;
@@ -510,7 +511,9 @@ int nfcmrvl_fw_dnld_start(struct nci_dev*/ /* Retrieve FW binary */ -if (request_firmware (&fw_dnld->fw, firmware_name, priv->dev) <0 ) { + res =request_firmware (&fw_dnld->fw, firmware_name, + &ndev->nfc_dev->dev); +if (res <0 ) {nfc_err (priv->dev,"failed to retrieve FW %s" , firmware_name);return -ENOENT ; }
Greg Kroah-Hartman
maintainerPATCH 14/196 NFC: nfcmrvl: fix firmware-management initialisation
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 45dd39b974f6632222dd5cdcbea7358a077ab0b0 upstream.
The nci-device was never deregistered in the event that fw-initialisation failed.
Fix this by moving the firmware initialisation before device registration since the firmware work queue should be available before registering.
Note that this depends on a recent fix that moved device-name initialisation back to to nci_allocate_device() as the firmware-workqueue name is now derived from the nfc-device name.
--- drivers/nfc/nfcmrvl/main.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/nfc/nfcmrvl/main.c +9 -7
@@ -158,26 +158,28 @@ struct nfcmrvl_private *nfcmrvl_nci_regi goto error_free_gpio; } + rc =nfcmrvl_fw_dnld_init (priv); +if (rc) { +nfc_err (dev,"failed to initialize FW download %d\n" , rc); + goto error_free_dev; + } +nci_set_drvdata (priv->ndev, priv); rc =nci_register_device (priv->ndev);if (rc) {nfc_err (dev,"nci_register_device failed %d\n" , rc); - goto error_free_dev; + goto error_fw_dnld_deinit; }/* Ensure that controller is powered off */ nfcmrvl_chip_halt (priv); - rc =nfcmrvl_fw_dnld_init (priv); -if (rc) { -nfc_err (dev,"failed to initialize FW download %d\n" , rc); - goto error_free_dev; - } -nfc_info (dev,"registered with nci successfully\n" );return priv; +error_fw_dnld_deinit: +nfcmrvl_fw_dnld_deinit (priv); error_free_dev:nci_free_device (priv->ndev); error_free_gpio:
Greg Kroah-Hartman
maintainerPATCH 15/196 nfc: Ensure presence of required attributes in the activate_target handler
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Jurczyk <[email protected]>
commit a0323b979f81ad2deb2c8836eab506534891876a upstream.
Check that the NFC_ATTR_TARGET_INDEX and NFC_ATTR_PROTOCOLS attributes (in addition to NFC_ATTR_DEVICE_INDEX) are provided by the netlink client prior to accessing them. This prevents potential unhandled NULL pointer dereference exceptions which can be triggered by malicious user-mode programs, if they omit one or both of these attributes.
--- net/nfc/netlink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/nfc/netlink.c +3 -1
@@ -907,7 +907,9 @@ static int nfc_genl_activate_target(struu32 device_idx, target_idx, protocol;int rc; -if (!info->attrs[NFC_ATTR_DEVICE_INDEX ]) +if (!info->attrs[NFC_ATTR_DEVICE_INDEX ] || + !info->attrs[NFC_ATTR_TARGET_INDEX ] || + !info->attrs[NFC_ATTR_PROTOCOLS ])return -EINVAL ; device_idx =nla_get_u32 (info->attrs[NFC_ATTR_DEVICE_INDEX ]);
Greg Kroah-Hartman
maintainerPATCH 16/196 nfc: Fix the sockaddr length sanitization in llcp_sock_connect
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Jurczyk <[email protected]>
commit 608c4adfcabab220142ee335a2a003ccd1c0b25b upstream.
Fix the sockaddr length verification in the connect() handler of NFC/LLCP sockets, to compare against the size of the actual structure expected on input (sockaddr_nfc_llcp) instead of its shorter version (sockaddr_nfc).
Both structures are defined in include/uapi/linux/nfc.h. The fields specific to the _llcp extended struct are as follows:
276 __u8 dsap; /* Destination SAP, if known */
277 __u8 ssap; /* Source SAP to be bound to */
278 char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */;
279 size_t service_name_len;
If the caller doesn't provide a sufficiently long sockaddr buffer, these fields remain uninitialized (and they currently originate from the stack frame of the top-level sys_connect handler). They are then copied by llcp_sock_connect() into internal storage (nfc_llcp_sock structure), and could be subsequently read back through the user-mode getsockname() function (handled by llcp_sock_getname()). This would result in the disclosure of up to ~70 uninitialized bytes from the kernel stack to user-mode clients capable of creating AFC_NFC sockets.
--- net/nfc/llcp_sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/nfc/llcp_sock.c +1 -2
@@ -662,8 +662,7 @@ static int llcp_sock_connect(struct sockpr_debug ("sock %p sk %p flags 0x%x\n" , sock, sk, flags); -if (!addr || len <sizeof (struct sockaddr_nfc ) || - addr->sa_family !=AF_NFC ) +if (!addr || len <sizeof (*addr) || addr->sa_family !=AF_NFC )return -EINVAL ;if (addr->service_name_len ==0 && addr->dsap ==0 )
Greg Kroah-Hartman
maintainerPATCH 17/196 NFC: Add sockaddr length checks before accessing sa_family in bind handlers
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Jurczyk <[email protected]>
commit f6a5885fc4d68e7f25ffb42b9d8d80aebb3bacbb upstream.
Verify that the caller-provided sockaddr structure is large enough to contain the sa_family field, before accessing it in bind() handlers of the AF_NFC socket. Since the syscall doesn't enforce a minimum size of the corresponding memory region, very short sockaddrs (zero or one byte long) result in operating on uninitialized memory while referencing .sa_family.
--- net/nfc/llcp_sock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/nfc/llcp_sock.c +4 -2
@@ -77,7 +77,8 @@ static int llcp_sock_bind(struct socketstruct sockaddr_nfc_llcp llcp_addr;int len, ret =0 ; -if (!addr || addr->sa_family !=AF_NFC ) + if (!addr || alen < offsetofend(struct sockaddr, sa_family) || + addr->sa_family !=AF_NFC )return -EINVAL ;pr_debug ("sk %p addr %p family %d\n" , sk, addr, addr->sa_family);
@@ -151,7 +152,8 @@ static int llcp_raw_sock_bind(struct socstruct sockaddr_nfc_llcp llcp_addr;int len, ret =0 ; -if (!addr || addr->sa_family !=AF_NFC ) + if (!addr || alen < offsetofend(struct sockaddr, sa_family) || + addr->sa_family !=AF_NFC )return -EINVAL ;pr_debug ("sk %p addr %p family %d\n" , sk, addr, addr->sa_family);
Greg Kroah-Hartman
maintainerPATCH 18/196 perf intel-pt: Move decoder error setting into one condition
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 22c06892332d8916115525145b78e606e9cc6492 upstream.
Move decoder error setting into one condition.
Cc'ed to stable because later fixes depend on it.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +7 -4
@@ -2130,15 +2130,18 @@ const struct intel_pt_state *intel_pt_de } }while (err == -ENOLINK ); - decoder->state.err = err ?intel_pt_ext_err (err) :0 ; +if (err) { + decoder->state.err =intel_pt_ext_err (err); + decoder->state.from_ip = decoder->ip; + }else { + decoder->state.err =0 ; + } + decoder->state.timestamp = decoder->timestamp; decoder->state.est_timestamp =intel_pt_est_timestamp (decoder); decoder->state.cr3 = decoder->cr3; decoder->state.tot_insn_cnt = decoder->tot_insn_cnt; -if (err) - decoder->state.from_ip = decoder->ip; -return &decoder->state; }
Greg Kroah-Hartman
maintainerPATCH 19/196 perf intel-pt: Improve sample timestamp
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 3f04d98e972b59706bd43d6cc75efac91f8fba50 upstream.
The decoder uses its current timestamp in samples. Usually that is a timestamp that has already passed, but in some cases it is a timestamp for a branch that the decoder is walking towards, and consequently hasn't reached. Improve that situation by using the pkt_state to determine when to use the current or previous timestamp.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 34 ++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +31 -3
@@ -64,6 +64,25 @@ enum intel_pt_pkt_state { INTEL_PT_STATE_FUP_NO_TIP, }; +static inline bool intel_pt_sample_time (enum intel_pt_pkt_state pkt_state) +{ +switch (pkt_state) { +case INTEL_PT_STATE_NO_PSB : +case INTEL_PT_STATE_NO_IP : +case INTEL_PT_STATE_ERR_RESYNC : +case INTEL_PT_STATE_IN_SYNC : +case INTEL_PT_STATE_TNT : +return true; +case INTEL_PT_STATE_TIP : +case INTEL_PT_STATE_TIP_PGD : +case INTEL_PT_STATE_FUP : +case INTEL_PT_STATE_FUP_NO_TIP : +return false; +default : +return true; + }; +} +#ifdef INTEL_PT_STRICT #define INTEL_PT_STATE_ERR1 INTEL_PT_STATE_NO_PSB#define INTEL_PT_STATE_ERR2 INTEL_PT_STATE_NO_PSB
@@ -99,6 +118,7 @@ struct intel_pt_decoder {uint64_t timestamp;uint64_t tsc_timestamp;uint64_t ref_timestamp; +uint64_t sample_timestamp;uint64_t ret_addr;uint64_t ctc_timestamp;uint64_t ctc_delta;
@@ -139,6 +159,7 @@ struct intel_pt_decoder {unsigned int fup_tx_flags;unsigned int tx_flags;uint64_t timestamp_insn_cnt; +uint64_t sample_insn_cnt;uint64_t stuck_ip;int no_progress;int stuck_ip_prd;
@@ -898,6 +919,7 @@ static int intel_pt_walk_insn(struct int decoder->tot_insn_cnt += insn_cnt; decoder->timestamp_insn_cnt += insn_cnt; + decoder->sample_insn_cnt += insn_cnt; decoder->period_insn_cnt += insn_cnt;if (err) {
@@ -2069,7 +2091,7 @@ static int intel_pt_sync(struct intel_ptstatic uint64_t intel_pt_est_timestamp (struct intel_pt_decoder *decoder) { -uint64_t est = decoder->timestamp_insn_cnt <<1 ; +uint64_t est = decoder->sample_insn_cnt <<1 ;if (!decoder->cbr || !decoder->max_non_turbo_ratio) goto out;
@@ -2077,7 +2099,7 @@ static uint64_t intel_pt_est_timestamp(s est *= decoder->max_non_turbo_ratio; est /= decoder->cbr; out: -return decoder->timestamp + est; +return decoder->sample_timestamp + est; }const struct intel_pt_state *intel_pt_decode (struct intel_pt_decoder *decoder)
@@ -2133,11 +2155,17 @@ const struct intel_pt_state *intel_pt_deif (err) { decoder->state.err =intel_pt_ext_err (err); decoder->state.from_ip = decoder->ip; + decoder->sample_timestamp = decoder->timestamp; + decoder->sample_insn_cnt = decoder->timestamp_insn_cnt; }else { decoder->state.err =0 ; +if (intel_pt_sample_time (decoder->pkt_state)) { + decoder->sample_timestamp = decoder->timestamp; + decoder->sample_insn_cnt = decoder->timestamp_insn_cnt; + } } - decoder->state.timestamp = decoder->timestamp; + decoder->state.timestamp = decoder->sample_timestamp; decoder->state.est_timestamp =intel_pt_est_timestamp (decoder); decoder->state.cr3 = decoder->cr3; decoder->state.tot_insn_cnt = decoder->tot_insn_cnt;
Greg Kroah-Hartman
maintainerPATCH 20/196 perf intel-pt: Fix missing stack clear
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 12b7080609097753fd8198cc1daf589be3ec1cca upstream.
The return compression stack must be cleared whenever there is a PSB. Fix one case where that was not happening.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +1 -0
@@ -1932,6 +1932,7 @@ static int intel_pt_walk_to_ip(struct inbreak ;case INTEL_PT_PSB : +intel_pt_clear_stack (&decoder->stack); err =intel_pt_walk_psb (decoder);if (err)return err;
Greg Kroah-Hartman
maintainerPATCH 21/196 perf intel-pt: Ensure IP is zero when state is INTEL_PT_STATE_NO_IP
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit ad7167a8cd174ba7d8c0d0ed8d8410521206d104 upstream.
A value of zero is used to indicate that there is no IP. Ensure the value is zero when the state is INTEL_PT_STATE_NO_IP.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +1 -0
@@ -2117,6 +2117,7 @@ const struct intel_pt_state *intel_pt_debreak ;case INTEL_PT_STATE_NO_IP : decoder->last_ip =0 ; + decoder->ip =0 ;/* Fall through */ case INTEL_PT_STATE_ERR_RESYNC : err =intel_pt_sync_ip (decoder);
Greg Kroah-Hartman
maintainerPATCH 22/196 perf intel-pt: Fix last_ip usage
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit ee14ac0ef6827cd6f9a572cc83dd0191ea17812c upstream.
Intel PT uses IP compression based on the last IP. For decoding purposes, 'last IP' is considered to be reset to zero whenever there is a synchronization packet (PSB). The decoder wasn't doing that, and was treating the zero value to mean that there was no last IP, whereas compression can be done against the zero value. Fix by setting last_ip to zero when a PSB is received and keep track of have_last_ip.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +11 -2
@@ -111,6 +111,7 @@ struct intel_pt_decoder {bool have_tma;bool have_cyc;bool fixup_last_mtc; +bool have_last_ip;uint64_t pos;uint64_t last_ip;uint64_t ip;
@@ -419,6 +420,7 @@ static uint64_t intel_pt_calc_ip(const sstatic inline void intel_pt_set_last_ip (struct intel_pt_decoder *decoder) { decoder->last_ip =intel_pt_calc_ip (&decoder->packet, decoder->last_ip); + decoder->have_last_ip = true; }static inline void intel_pt_set_ip (struct intel_pt_decoder *decoder)
@@ -1672,6 +1674,8 @@ next:break ;case INTEL_PT_PSB : + decoder->last_ip =0 ; + decoder->have_last_ip = true;intel_pt_clear_stack (&decoder->stack); err =intel_pt_walk_psbend (decoder);if (err == -EAGAIN )
@@ -1752,7 +1756,7 @@ next:static inline bool intel_pt_have_ip (struct intel_pt_decoder *decoder) { -return decoder->last_ip || decoder->packet.count ==0 || +return decoder->have_last_ip || decoder->packet.count ==0 || decoder->packet.count ==3 || decoder->packet.count ==6 ; }
@@ -1882,7 +1886,7 @@ static int intel_pt_walk_to_ip(struct inif (decoder->ip)return 0 ; } -if (decoder->packet.count) +if (decoder->packet.count && decoder->have_last_ip)intel_pt_set_last_ip (decoder);break ;
@@ -1932,6 +1936,8 @@ static int intel_pt_walk_to_ip(struct inbreak ;case INTEL_PT_PSB : + decoder->last_ip =0 ; + decoder->have_last_ip = true;intel_pt_clear_stack (&decoder->stack); err =intel_pt_walk_psb (decoder);if (err)
@@ -2066,6 +2072,7 @@ static int intel_pt_sync(struct intel_pt decoder->pge = false; decoder->continuous_period = false; + decoder->have_last_ip = false; decoder->last_ip =0 ; decoder->ip =0 ;intel_pt_clear_stack (&decoder->stack);
@@ -2074,6 +2081,7 @@ static int intel_pt_sync(struct intel_ptif (err)return err; + decoder->have_last_ip = true; decoder->pkt_state =INTEL_PT_STATE_NO_IP ; err =intel_pt_walk_psb (decoder);
@@ -2116,6 +2124,7 @@ const struct intel_pt_state *intel_pt_de err =intel_pt_sync (decoder);break ;case INTEL_PT_STATE_NO_IP : + decoder->have_last_ip = false; decoder->last_ip =0 ; decoder->ip =0 ;/* Fall through */
Greg Kroah-Hartman
maintainerPATCH 23/196 perf intel-pt: Ensure never to set last_ip when packet count is zero
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit f952eaceb089b691eba7c4e13686e742a8f26bf5 upstream.
Intel PT uses IP compression based on the last IP. For decoding purposes, 'last IP' is not updated when a branch target has been suppressed, which is indicated by IPBytes == 0. IPBytes is stored in the packet 'count', so ensure never to set 'last_ip' when packet 'count' is zero.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +5 -3
@@ -1470,7 +1470,8 @@ static int intel_pt_walk_psbend(struct icase INTEL_PT_FUP : decoder->pge = true; -intel_pt_set_last_ip (decoder); +if (decoder->packet.count) +intel_pt_set_last_ip (decoder);break ;case INTEL_PT_MODE_TSX :
@@ -1756,8 +1757,9 @@ next:static inline bool intel_pt_have_ip (struct intel_pt_decoder *decoder) { -return decoder->have_last_ip || decoder->packet.count ==0 || - decoder->packet.count ==3 || decoder->packet.count ==6 ; +return decoder->packet.count && + (decoder->have_last_ip || decoder->packet.count ==3 || + decoder->packet.count ==6 ); }/* Walk PSB+ packets to get in sync. */
Greg Kroah-Hartman
maintainerPATCH 24/196 perf intel-pt: Use FUP always when scanning for an IP
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 622b7a47b843c78626f40c1d1aeef8483383fba2 upstream.
The decoder will try to use branch packets to find an IP to start decoding or to recover from errors. Currently the FUP packet is used only in the case of an overflow, however there is no reason for that to be a special case. So just use FUP always when scanning for an IP.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +4 -8
@@ -1882,14 +1882,10 @@ static int intel_pt_walk_to_ip(struct inbreak ;case INTEL_PT_FUP : -if (decoder->overflow) { -if (intel_pt_have_ip (decoder)) -intel_pt_set_ip (decoder); -if (decoder->ip) -return 0 ; - } -if (decoder->packet.count && decoder->have_last_ip) -intel_pt_set_last_ip (decoder); +if (intel_pt_have_ip (decoder)) +intel_pt_set_ip (decoder); +if (decoder->ip) +return 0 ;break ;case INTEL_PT_MTC :
Greg Kroah-Hartman
maintainerPATCH 25/196 perf intel-pt: Clear FUP flag on error
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 6a558f12dbe85437acbdec5e149ea07b5554eced upstream.
Sometimes a FUP packet is associated with a TSX transaction and a flag is set to indicate that. Ensure that flag is cleared on any error condition because at that point the decoder can no longer assume it is correct.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +2 -0
@@ -1962,6 +1962,8 @@ static int intel_pt_sync_ip(struct intel {int err; + decoder->set_fup_tx_flags = false; +intel_pt_log ("Scanning for full IP\n" ); err =intel_pt_walk_to_ip (decoder);if (err)
Greg Kroah-Hartman
maintainerPATCH 26/196 Bluetooth: use constant time memory comparison for secret values
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason A. Donenfeld <[email protected]>
commit 329d82309824ff1082dc4a91a5bbed8c3bec1580 upstream.
This file is filled with complex cryptography. Thus, the comparisons of MACs and secret keys and curve points and so forth should not add timing attacks, which could either result in a direct forgery, or, given the complexity, some other type of attack.
--- net/bluetooth/smp.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-)
net/bluetooth/smp.c +20 -19
@@ -23,6 +23,7 @@#include <linux/debugfs.h> #include <linux/scatterlist.h> #include <linux/crypto.h> +#include <crypto/algapi.h> #include <crypto/b128ops.h> #include <crypto/hash.h>
@@ -523,7 +524,7 @@ bool smp_irk_matches(struct hci_dev *hdeif (err)return false; -return !memcmp (bdaddr->b, hash,3 ); +return !crypto_memneq (bdaddr->b, hash,3 ); }int smp_generate_rpa (struct hci_dev *hdev,const u8 irk[16 ],bdaddr_t *rpa)
@@ -579,7 +580,7 @@ int smp_generate_oob(struct hci_dev *hde/* This is unlikely, but we need to check that * we didn't accidentially generate a debug key. */ -if (memcmp (smp->local_sk, debug_sk,32 )) +if (crypto_memneq (smp->local_sk, debug_sk,32 ))break ; } smp->debug_key = false;
@@ -993,7 +994,7 @@ static u8 smp_random(struct smp_chan *smif (ret)return SMP_UNSPECIFIED ; -if (memcmp (smp->pcnf, confirm,sizeof (smp->pcnf)) !=0 ) { +if (crypto_memneq (smp->pcnf, confirm,sizeof (smp->pcnf))) {BT_ERR ("Pairing failed (confirmation values mismatch)" );return SMP_CONFIRM_FAILED ; }
@@ -1512,7 +1513,7 @@ static u8 sc_passkey_round(struct smp_ch smp->rrnd, r, cfm))return SMP_UNSPECIFIED ; -if (memcmp (smp->pcnf, cfm,16 )) +if (crypto_memneq (smp->pcnf, cfm,16 ))return SMP_CONFIRM_FAILED ; smp->passkey_round++;
@@ -1908,7 +1909,7 @@ static u8 sc_send_public_key(struct smp_/* This is unlikely, but we need to check that * we didn't accidentially generate a debug key. */ -if (memcmp (smp->local_sk, debug_sk,32 )) +if (crypto_memneq (smp->local_sk, debug_sk,32 ))break ; } }
@@ -2176,7 +2177,7 @@ static u8 smp_cmd_pairing_random(structif (err)return SMP_UNSPECIFIED ; -if (memcmp (smp->pcnf, cfm,16 )) +if (crypto_memneq (smp->pcnf, cfm,16 ))return SMP_CONFIRM_FAILED ; }else { smp_send_cmd(conn, SMP_CMD_PAIRING_RANDOM, sizeof(smp->prnd),
@@ -2660,7 +2661,7 @@ static int smp_cmd_public_key(struct l2cif (err)return SMP_UNSPECIFIED ; -if (memcmp (cfm.confirm_val, smp->pcnf,16 )) +if (crypto_memneq (cfm.confirm_val, smp->pcnf,16 ))return SMP_CONFIRM_FAILED ; }
@@ -2693,7 +2694,7 @@ static int smp_cmd_public_key(struct l2celse hcon->pending_sec_level =BT_SECURITY_FIPS ; -if (!memcmp (debug_pk, smp->remote_pk,64 )) +if (!crypto_memneq (debug_pk, smp->remote_pk,64 ))set_bit (SMP_FLAG_DEBUG_KEY , &smp->flags);if (smp->method ==DSP_PASSKEY ) {
@@ -2792,7 +2793,7 @@ static int smp_cmd_dhkey_check(struct l2if (err)return SMP_UNSPECIFIED ; -if (memcmp (check->e, e,16 )) +if (crypto_memneq (check->e, e,16 ))return SMP_DHKEY_CHECK_FAILED ;if (!hcon->out) {
@@ -3506,10 +3507,10 @@ static int __init test_debug_key(void)if (!generate_ecdh_keys (pk, sk))return -EINVAL ; -if (memcmp (sk, debug_sk,32 )) +if (crypto_memneq (sk, debug_sk,32 ))return -EINVAL ; -if (memcmp (pk, debug_pk,64 )) +if (crypto_memneq (pk, debug_pk,64 ))return -EINVAL ;return 0 ;
@@ -3529,7 +3530,7 @@ static int __init test_ah(struct crypto_if (err)return err; -if (memcmp (res, exp,3 )) +if (crypto_memneq (res, exp,3 ))return -EINVAL ;return 0 ;
@@ -3559,7 +3560,7 @@ static int __init test_c1(struct crypto_if (err)return err; -if (memcmp (res, exp,16 )) +if (crypto_memneq (res, exp,16 ))return -EINVAL ;return 0 ;
@@ -3584,7 +3585,7 @@ static int __init test_s1(struct crypto_if (err)return err; -if (memcmp (res, exp,16 )) +if (crypto_memneq (res, exp,16 ))return -EINVAL ;return 0 ;
@@ -3616,7 +3617,7 @@ static int __init test_f4(struct crypto_if (err)return err; -if (memcmp (res, exp,16 )) +if (crypto_memneq (res, exp,16 ))return -EINVAL ;return 0 ;
@@ -3650,10 +3651,10 @@ static int __init test_f5(struct crypto_if (err)return err; -if (memcmp (mackey, exp_mackey,16 )) +if (crypto_memneq (mackey, exp_mackey,16 ))return -EINVAL ; -if (memcmp (ltk, exp_ltk,16 )) +if (crypto_memneq (ltk, exp_ltk,16 ))return -EINVAL ;return 0 ;
@@ -3686,7 +3687,7 @@ static int __init test_f6(struct crypto_if (err)return err; -if (memcmp (res, exp,16 )) +if (crypto_memneq (res, exp,16 ))return -EINVAL ;return 0 ;
@@ -3740,7 +3741,7 @@ static int __init test_h6(struct crypto_if (err)return err; -if (memcmp (res, exp,16 )) +if (crypto_memneq (res, exp,16 ))return -EINVAL ;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 27/196 wlcore: fix 64K page support
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit 4a4274bf2dbbd1c7a45be0c89a1687c9d2eef4a0 upstream.
In the stable linux-3.16 branch, I ran into a warning in the wlcore driver:
drivers/net/wireless/ti/wlcore/spi.c: In function 'wl12xx_spi_raw_write':drivers/net/wireless/ti/wlcore/spi.c:315:1: error: the frame size of 12848 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
Newer kernels no longer show the warning, but the bug is still there, as the allocation is based on the CPU page size rather than the actual capabilities of the hardware.
This replaces the PAGE_SIZE macro with the SZ_4K macro, i.e. 4096 bytes per buffer.
--- drivers/net/wireless/ti/wlcore/spi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ti/wlcore/spi.c +3 -3
@@ -70,10 +70,10 @@#define WSPI_MAX_CHUNK_SIZE 4092/* -* wl18xx driver aggregation buffer size is (13 * PAGE_SIZE) compared to -* (4 * PAGE_SIZE) for wl12xx, so use the larger buffer needed for wl18xx +* wl18xx driver aggregation buffer size is (13 * 4K) compared to +* (4 * 4K) for wl12xx, so use the larger buffer needed for wl18xx */ -#define SPI_AGGR_BUFFER_SIZE (13 * PAGE_SIZE) +#define SPI_AGGR_BUFFER_SIZE (13 * SZ_4K)/* Maximum number of SPI write chunks */ #define WSPI_MAX_NUM_OF_CHUNKS \
Greg Kroah-Hartman
maintainerPATCH 28/196 pstore: Dont warn if data is uncompressed and type is not PSTORE_TYPE_DMESG
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ankit Kumar <[email protected]>
commit 4a16d1cb245c56e72fd40a28f3cdb394cde4b341 upstream.
commit 9abdcccc3d5f ("pstore: Extract common arguments into structure") moved record decompression to function. decompress_record() gets called without checking type and compressed flag. Warning will be reported if data is uncompressed. Pstore type PSTORE_TYPE_PPC_OPAL, PSTORE_TYPE_PPC_COMMON doesn't contain compressed data and warning get printed part of dmesg.
Partial dmesg log:
[ 35.848914] pstore: ignored compressed record type 6 [ 35.848927] pstore: ignored compressed record type 8
Above warning should not get printed as it is known that data won't be compressed for above type and it is valid condition.
This patch returns if data is not compressed and print warning only if data is compressed and type is not PSTORE_TYPE_DMESG.
--- fs/pstore/platform.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/pstore/platform.c +4 -1
@@ -770,8 +770,11 @@ static void decompress_record(struct pstint unzipped_len;char *decompressed; +if (!record->compressed) +return ; +/* Only PSTORE_TYPE_DMESG support compression. */ -if (!record->compressed || record->type !=PSTORE_TYPE_DMESG ) { +if (record->type !=PSTORE_TYPE_DMESG ) {pr_warn ("ignored compressed record type %d\n" , record->type);return ; }
Greg Kroah-Hartman
maintainerPATCH 29/196 mwifiex: fixup error cases in mwifiex_add_virtual_intf()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Norris <[email protected]>
commit 8535107aa4ef92520cbb9a4739563b389c5f8e2c upstream.
If we fail to add an interface in mwifiex_add_virtual_intf(), we might hit a BUG_ON() in the networking code, because we didn't tear things down properly. Among the problems:
(a) when failing to allocate workqueues, we fail to unregister the netdev before calling free_netdev()
(b) even if we do try to unregister the netdev, we're still holding the rtnl lock, so the device never properly unregistered; we'll be at state NETREG_UNREGISTERING, and then hit free_netdev()'s:
BUG_ON(dev->reg_state != NETREG_UNREGISTERED);
(c) we're allocating some dependent resources (e.g., DFS workqueues) after we've registered the interface; this may or may not cause problems, but it's good practice to allocate these before registering
(d) we're not even trying to unwind anything when mwifiex_send_cmd() or mwifiex_sta_init_cmd() fail
To fix these issues, let's:
* add a stacked set of error handling labels, to keep error handling consistent and properly ordered (resolving (a) and (d))
* move the workqueue allocations before the registration (to resolve (c); also resolves (b) by avoiding error cases where we have to unregister)
[Incidentally, it's pretty easy to interrupt the alloc_workqueue() in, e.g., the following:
iw phy phy0 interface add mlan0 type station
by sending it SIGTERM.]
This bugfix covers commits like commit 7d652034d1a0 ("mwifiex: channel switch support for mwifiex"), but parts of this bug exist all the way back to the introduction of dynamic interface handling in commit 93a1df48d224 ("mwifiex: add cfg80211 handlers add/del_virtual_intf").
--- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 71 +++++++++++------------- 1 file changed, 35 insertions(+), 36 deletions(-)
drivers/net/wireless/marvell/mwifiex/cfg80211.c +35 -36
@@ -2964,10 +2964,8 @@ struct wireless_dev *mwifiex_add_virtualif (!dev) {mwifiex_dbg (adapter,ERROR ,"no memory available for netdevice\n" ); -memset (&priv->wdev,0 ,sizeof (priv->wdev)); - priv->wdev.iftype =NL80211_IFTYPE_UNSPECIFIED ; - priv->bss_mode =NL80211_IFTYPE_UNSPECIFIED ; -return ERR_PTR (-ENOMEM ); + ret = -ENOMEM ; + goto err_alloc_netdev; }mwifiex_init_priv_params (priv, dev);
@@ -2976,11 +2974,11 @@ struct wireless_dev *mwifiex_add_virtual ret =mwifiex_send_cmd (priv, HostCmd_CMD_SET_BSS_MODE, HostCmd_ACT_GEN_SET,0 ,NULL , true);if (ret) -return ERR_PTR (ret); + goto err_set_bss_mode; ret =mwifiex_sta_init_cmd (priv, false, false);if (ret) -return ERR_PTR (ret); + goto err_sta_init;mwifiex_setup_ht_caps (&wiphy->bands[NL80211_BAND_2GHZ ]->ht_cap, priv);if (adapter->is_hw_11ac_capable)
@@ -3011,31 +3009,14 @@ struct wireless_dev *mwifiex_add_virtualSET_NETDEV_DEV (dev, adapter->dev); -/* Register network device */ -if (register_netdevice (dev)) { -mwifiex_dbg (adapter,ERROR , -"cannot register virtual network device\n" ); -free_netdev (dev); - priv->bss_mode =NL80211_IFTYPE_UNSPECIFIED ; - priv->netdev =NULL ; -memset (&priv->wdev,0 ,sizeof (priv->wdev)); - priv->wdev.iftype =NL80211_IFTYPE_UNSPECIFIED ; -return ERR_PTR (-EFAULT ); - } - priv->dfs_cac_workqueue =alloc_workqueue ("MWIFIEX_DFS_CAC%s" ,WQ_HIGHPRI |WQ_MEM_RECLAIM |WQ_UNBOUND ,1 , name);if (!priv->dfs_cac_workqueue) { -mwifiex_dbg (adapter,ERROR , -"cannot register virtual network device\n" ); -free_netdev (dev); - priv->bss_mode =NL80211_IFTYPE_UNSPECIFIED ; - priv->netdev =NULL ; -memset (&priv->wdev,0 ,sizeof (priv->wdev)); - priv->wdev.iftype =NL80211_IFTYPE_UNSPECIFIED ; -return ERR_PTR (-ENOMEM ); +mwifiex_dbg (adapter,ERROR ,"cannot alloc DFS CAC queue\n" ); + ret = -ENOMEM ; + goto err_alloc_cac; }INIT_DELAYED_WORK (&priv->dfs_cac_work, mwifiex_dfs_cac_work_queue);
@@ -3044,16 +3025,9 @@ struct wireless_dev *mwifiex_add_virtualWQ_HIGHPRI |WQ_UNBOUND | WQ_MEM_RECLAIM, 1, name);if (!priv->dfs_chan_sw_workqueue) { -mwifiex_dbg (adapter,ERROR , -"cannot register virtual network device\n" ); -free_netdev (dev); - priv->bss_mode =NL80211_IFTYPE_UNSPECIFIED ; - priv->netdev =NULL ; -memset (&priv->wdev,0 ,sizeof (priv->wdev)); - priv->wdev.iftype =NL80211_IFTYPE_UNSPECIFIED ; -destroy_workqueue (priv->dfs_cac_workqueue); - priv->dfs_cac_workqueue =NULL ; -return ERR_PTR (-ENOMEM ); +mwifiex_dbg (adapter,ERROR ,"cannot alloc DFS channel sw queue\n" ); + ret = -ENOMEM ; + goto err_alloc_chsw; } INIT_DELAYED_WORK(&priv->dfs_chan_sw_work,
@@ -3061,6 +3035,13 @@ struct wireless_dev *mwifiex_add_virtualsema_init (&priv->async_sem,1 ); +/* Register network device */ +if (register_netdevice (dev)) { +mwifiex_dbg (adapter,ERROR ,"cannot register network device\n" ); + ret = -EFAULT ; + goto err_reg_netdev; + } +mwifiex_dbg (adapter,INFO ,"info: %s: Marvell 802.11 Adapter\n" , dev->name);
@@ -3081,11 +3062,29 @@ struct wireless_dev *mwifiex_add_virtual adapter->curr_iface_comb.p2p_intf++;break ;default : +/* This should be dead code; checked above */ mwifiex_dbg (adapter,ERROR ,"type not supported\n" );return ERR_PTR (-EINVAL ); }return &priv->wdev; + +err_reg_netdev: +destroy_workqueue (priv->dfs_chan_sw_workqueue); + priv->dfs_chan_sw_workqueue =NULL ; +err_alloc_chsw: +destroy_workqueue (priv->dfs_cac_workqueue); + priv->dfs_cac_workqueue =NULL ; +err_alloc_cac: +free_netdev (dev); + priv->netdev =NULL ; +err_sta_init: +err_set_bss_mode: +err_alloc_netdev: +memset (&priv->wdev,0 ,sizeof (priv->wdev)); + priv->wdev.iftype =NL80211_IFTYPE_UNSPECIFIED ; + priv->bss_mode =NL80211_IFTYPE_UNSPECIFIED ; +return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (mwifiex_add_virtual_intf);
Greg Kroah-Hartman
maintainerPATCH 30/196 Btrfs: fix invalid extent maps due to hole punching
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 609805d809733d0c669f21f710bdac308cc63cba upstream.
While punching a hole in a range that is not aligned with the sector size (currently the same as the page size) we can end up leaving an extent map in memory with a length that is smaller then the sector size or with a start offset that is not aligned to the sector size. Both cases are not expected and can lead to problems. This issue is easily detected after the patch from commit a7e3b975a0f9 ("Btrfs: fix reported number of inode blocks"), introduced in kernel 4.12-rc1, in a scenario like the following for example:
$ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt $ xfs_io -c "pwrite -S 0xaa -b 100K 0 100K" /mnt/foo $ xfs_io -c "fpunch 60K 90K" /mnt/foo $ xfs_io -c "pwrite -S 0xbb -b 100K 50K 100K" /mnt/foo $ xfs_io -c "pwrite -S 0xcc -b 50K 100K 50K" /mnt/foo $ umount /mnt
After the unmount operation we can see several warnings emmitted due to underflows related to space reservation counters:
[ 2837.443299] ------------[ cut here ]------------ [ 2837.447395] WARNING: CPU: 8 PID: 2474 at fs/btrfs/inode.c:9444 btrfs_destroy_inode+0xe8/0x27e [btrfs] [ 2837.452108] Modules linked in: dm_flakey dm_mod ppdev parport_pc psmouse parport sg pcspkr acpi_cpufreq tpm_tis tpm_tis_core i2c_piix4 i2c_core evdev tpm button se rio_raw sunrpc loop autofs4 ext4 crc16 jbd2 mbcache btrfs raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor raid6_pq libcrc32c crc32c_gene ric raid1 raid0 multipath linear md_mod sr_mod cdrom sd_mod ata_generic virtio_scsi ata_piix libata virtio_pci virtio_ring virtio e1000 scsi_mod floppy [ 2837.458389] CPU: 8 PID: 2474 Comm: umount Tainted: G W 4.10.0-rc8-btrfs-next-43+ #1 [ 2837.459754] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.1-0-gb3ef39f-prebuilt.qemu-project.org 04/01/2014 [ 2837.462379] Call Trace: [ 2837.462379] dump_stack+0x68/0x92 [ 2837.462379] __warn+0xc2/0xdd [ 2837.462379] warn_slowpath_null+0x1d/0x1f [ 2837.462379] btrfs_destroy_inode+0xe8/0x27e [btrfs] [ 2837.462379] destroy_inode+0x3d/0x55 [ 2837.462379] evict+0x177/0x17e [ 2837.462379] dispose_list+0x50/0x71 [ 2837.462379] evict_inodes+0x132/0x141 [ 2837.462379] generic_shutdown_super+0x3f/0xeb [ 2837.462379] kill_anon_super+0x12/0x1c [ 2837.462379] btrfs_kill_super+0x16/0x21 [btrfs] [ 2837.462379] deactivate_locked_super+0x30/0x68 [ 2837.462379] deactivate_super+0x36/0x39 [ 2837.462379] cleanup_mnt+0x58/0x76 [ 2837.462379] __cleanup_mnt+0x12/0x14 [ 2837.462379] task_work_run+0x77/0x9b [ 2837.462379] prepare_exit_to_usermode+0x9d/0xc5 [ 2837.462379] syscall_return_slowpath+0x196/0x1b9 [ 2837.462379] entry_SYSCALL_64_fastpath+0xab/0xad [ 2837.462379] RIP: 0033:0x7f3ef3e6b9a7 [ 2837.462379] RSP: 002b:00007ffdd0d8de58 EFLAGS: 00000246 ORIG_RAX: 00000000000000a6 [ 2837.462379] RAX: 0000000000000000 RBX: 0000556f76a39060 RCX: 00007f3ef3e6b9a7 [ 2837.462379] RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000556f76a3f910 [ 2837.462379] RBP: 0000556f76a3f910 R08: 0000556f76a3e670 R09: 0000000000000015 [ 2837.462379] R10: 00000000000006b4 R11: 0000000000000246 R12: 00007f3ef436ce64 [ 2837.462379] R13: 0000000000000000 R14: 0000556f76a39240 R15: 00007ffdd0d8e0e0 [ 2837.519355] ---[ end trace e79345fe24b30b8d ]--- [ 2837.596256] ------------[ cut here ]------------ [ 2837.597625] WARNING: CPU: 8 PID: 2474 at fs/btrfs/extent-tree.c:5699 btrfs_free_block_groups+0x246/0x3eb [btrfs] [ 2837.603547] Modules linked in: dm_flakey dm_mod ppdev parport_pc psmouse parport sg pcspkr acpi_cpufreq tpm_tis tpm_tis_core i2c_piix4 i2c_core evdev tpm button serio_raw sunrpc loop autofs4 ext4 crc16 jbd2 mbcache btrfs raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor raid6_pq libcrc32c crc32c_generic raid1 raid0 multipath linear md_mod sr_mod cdrom sd_mod ata_generic virtio_scsi ata_piix libata virtio_pci virtio_ring virtio e1000 scsi_mod floppy [ 2837.659372] CPU: 8 PID: 2474 Comm: umount Tainted: G W 4.10.0-rc8-btrfs-next-43+ #1 [ 2837.663359] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.1-0-gb3ef39f-prebuilt.qemu-project.org 04/01/2014 [ 2837.663359] Call Trace: [ 2837.663359] dump_stack+0x68/0x92 [ 2837.663359] __warn+0xc2/0xdd [ 2837.663359] warn_slowpath_null+0x1d/0x1f [ 2837.663359] btrfs_free_block_groups+0x246/0x3eb [btrfs] [ 2837.663359] close_ctree+0x1dd/0x2e1 [btrfs] [ 2837.663359] ? evict_inodes+0x132/0x141 [ 2837.663359] btrfs_put_super+0x15/0x17 [btrfs] [ 2837.663359] generic_shutdown_super+0x6a/0xeb [ 2837.663359] kill_anon_super+0x12/0x1c [ 2837.663359] btrfs_kill_super+0x16/0x21 [btrfs] [ 2837.663359] deactivate_locked_super+0x30/0x68 [ 2837.663359] deactivate_super+0x36/0x39 [ 2837.663359] cleanup_mnt+0x58/0x76 [ 2837.663359] __cleanup_mnt+0x12/0x14 [ 2837.663359] task_work_run+0x77/0x9b [ 2837.663359] prepare_exit_to_usermode+0x9d/0xc5 [ 2837.663359] syscall_return_slowpath+0x196/0x1b9 [ 2837.663359] entry_SYSCALL_64_fastpath+0xab/0xad [ 2837.663359] RIP: 0033:0x7f3ef3e6b9a7 [ 2837.663359] RSP: 002b:00007ffdd0d8de58 EFLAGS: 00000246 ORIG_RAX: 00000000000000a6 [ 2837.663359] RAX: 0000000000000000 RBX: 0000556f76a39060 RCX: 00007f3ef3e6b9a7 [ 2837.663359] RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000556f76a3f910 [ 2837.663359] RBP: 0000556f76a3f910 R08: 0000556f76a3e670 R09: 0000000000000015 [ 2837.663359] R10: 00000000000006b4 R11: 0000000000000246 R12: 00007f3ef436ce64 [ 2837.663359] R13: 0000000000000000 R14: 0000556f76a39240 R15: 00007ffdd0d8e0e0 [ 2837.739445] ---[ end trace e79345fe24b30b8e ]--- [ 2837.745595] ------------[ cut here ]------------ [ 2837.746412] WARNING: CPU: 8 PID: 2474 at fs/btrfs/extent-tree.c:5700 btrfs_free_block_groups+0x261/0x3eb [btrfs] [ 2837.747955] Modules linked in: dm_flakey dm_mod ppdev parport_pc psmouse parport sg pcspkr acpi_cpufreq tpm_tis tpm_tis_core i2c_piix4 i2c_core evdev tpm button serio_raw sunrpc loop autofs4 ext4 crc16 jbd2 mbcache btrfs raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor raid6_pq libcrc32c crc32c_generic raid1 raid0 multipath linear md_mod sr_mod cdrom sd_mod ata_generic virtio_scsi ata_piix libata virtio_pci virtio_ring virtio e1000 scsi_mod floppy [ 2837.755395] CPU: 8 PID: 2474 Comm: umount Tainted: G W 4.10.0-rc8-btrfs-next-43+ #1 [ 2837.756769] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.1-0-gb3ef39f-prebuilt.qemu-project.org 04/01/2014 [ 2837.758526] Call Trace: [ 2837.758925] dump_stack+0x68/0x92 [ 2837.759383] __warn+0xc2/0xdd [ 2837.759383] warn_slowpath_null+0x1d/0x1f [ 2837.759383] btrfs_free_block_groups+0x261/0x3eb [btrfs] [ 2837.759383] close_ctree+0x1dd/0x2e1 [btrfs] [ 2837.759383] ? evict_inodes+0x132/0x141 [ 2837.759383] btrfs_put_super+0x15/0x17 [btrfs] [ 2837.759383] generic_shutdown_super+0x6a/0xeb [ 2837.759383] kill_anon_super+0x12/0x1c [ 2837.759383] btrfs_kill_super+0x16/0x21 [btrfs] [ 2837.759383] deactivate_locked_super+0x30/0x68 [ 2837.759383] deactivate_super+0x36/0x39 [ 2837.759383] cleanup_mnt+0x58/0x76 [ 2837.759383] __cleanup_mnt+0x12/0x14 [ 2837.759383] task_work_run+0x77/0x9b [ 2837.759383] prepare_exit_to_usermode+0x9d/0xc5 [ 2837.759383] syscall_return_slowpath+0x196/0x1b9 [ 2837.759383] entry_SYSCALL_64_fastpath+0xab/0xad [ 2837.759383] RIP: 0033:0x7f3ef3e6b9a7 [ 2837.759383] RSP: 002b:00007ffdd0d8de58 EFLAGS: 00000246 ORIG_RAX: 00000000000000a6 [ 2837.759383] RAX: 0000000000000000 RBX: 0000556f76a39060 RCX: 00007f3ef3e6b9a7 [ 2837.759383] RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000556f76a3f910 [ 2837.759383] RBP: 0000556f76a3f910 R08: 0000556f76a3e670 R09: 0000000000000015 [ 2837.759383] R10: 00000000000006b4 R11: 0000000000000246 R12: 00007f3ef436ce64 [ 2837.759383] R13: 0000000000000000 R14: 0000556f76a39240 R15: 00007ffdd0d8e0e0 [ 2837.777063] ---[ end trace e79345fe24b30b8f ]--- [ 2837.778235] ------------[ cut here ]------------ [ 2837.778856] WARNING: CPU: 8 PID: 2474 at fs/btrfs/extent-tree.c:9825 btrfs_free_block_groups+0x348/0x3eb [btrfs] [ 2837.791385] Modules linked in: dm_flakey dm_mod ppdev parport_pc psmouse parport sg pcspkr acpi_cpufreq tpm_tis tpm_tis_core i2c_piix4 i2c_core evdev tpm button serio_raw sunrpc loop autofs4 ext4 crc16 jbd2 mbcache btrfs raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor raid6_pq libcrc32c crc32c_generic raid1 raid0 multipath linear md_mod sr_mod cdrom sd_mod ata_generic virtio_scsi ata_piix libata virtio_pci virtio_ring virtio e1000 scsi_mod floppy [ 2837.797711] CPU: 8 PID: 2474 Comm: umount Tainted: G W 4.10.0-rc8-btrfs-next-43+ #1 [ 2837.798594] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.1-0-gb3ef39f-prebuilt.qemu-project.org 04/01/2014 [ 2837.800118] Call Trace: [ 2837.800515] dump_stack+0x68/0x92 [ 2837.801015] __warn+0xc2/0xdd [ 2837.801471] warn_slowpath_null+0x1d/0x1f [ 2837.801698] btrfs_free_block_groups+0x348/0x3eb [btrfs] [ 2837.801698] close_ctree+0x1dd/0x2e1 [btrfs] [ 2837.801698] ? evict_inodes+0x132/0x141 [ 2837.801698] btrfs_put_super+0x15/0x17 [btrfs] [ 2837.801698] generic_shutdown_super+0x6a/0xeb [ 2837.801698] kill_anon_super+0x12/0x1c [ 2837.801698] btrfs_kill_super+0x16/0x21 [btrfs] [ 2837.801698] deactivate_locked_super+0x30/0x68 [ 2837.801698] deactivate_super+0x36/0x39 [ 2837.801698] cleanup_mnt+0x58/0x76 [ 2837.801698] __cleanup_mnt+0x12/0x14 [ 2837.801698] task_work_run+0x77/0x9b [ 2837.801698] prepare_exit_to_usermode+0x9d/0xc5 [ 2837.801698] syscall_return_slowpath+0x196/0x1b9 [ 2837.801698] entry_SYSCALL_64_fastpath+0xab/0xad [ 2837.801698] RIP: 0033:0x7f3ef3e6b9a7 [ 2837.801698] RSP: 002b:00007ffdd0d8de58 EFLAGS: 00000246 ORIG_RAX: 00000000000000a6 [ 2837.801698] RAX: 0000000000000000 RBX: 0000556f76a39060 RCX: 00007f3ef3e6b9a7 [ 2837.801698] RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000556f76a3f910 [ 2837.801698] RBP: 0000556f76a3f910 R08: 0000556f76a3e670 R09: 0000000000000015 [ 2837.801698] R10: 00000000000006b4 R11: 0000000000000246 R12: 00007f3ef436ce64 [ 2837.801698] R13: 0000000000000000 R14: 0000556f76a39240 R15: 00007ffdd0d8e0e0 [ 2837.818441] ---[ end trace e79345fe24b30b90 ]--- [ 2837.818991] BTRFS info (device sdc): space_info 1 has 7974912 free, is not full [ 2837.819830] BTRFS info (device sdc): space_info total=8388608, used=417792, pinned=0, reserved=0, may_use=18446744073709547520, readonly=0
What happens in the above example is the following:
1) When punching the hole, at btrfs_punch_hole(), the variable tail_len is set to 2048 (as tail_start is 148Kb + 1 and offset + len is 150Kb). This results in the creation of an extent map with a length of 2Kb starting at file offset 148Kb, through find_first_non_hole() -> btrfs_get_extent().
2) The second write (first write after the hole punch operation), sets the range [50Kb, 152Kb[ to delalloc.
3) The third write, at btrfs_find_new_delalloc_bytes(), sees the extent map covering the range [148Kb, 150Kb[ and ends up calling set_extent_bit() for the same range, which results in splitting an existing extent state record, covering the range [148Kb, 152Kb[ into two 2Kb extent state records, covering the ranges [148Kb, 150Kb[ and [150Kb, 152Kb[.
4) Finally at lock_and_cleanup_extent_if_need(), immediately after calling btrfs_find_new_delalloc_bytes() we clear the delalloc bit from the range [100Kb, 152Kb[ which results in the btrfs_clear_bit_hook() callback being invoked against the two 2Kb extent state records that cover the ranges [148Kb, 150Kb[ and [150Kb, 152Kb[. When called against the first 2Kb extent state, it calls btrfs_delalloc_release_metadata() with a length argument of 2048 bytes. That function rounds up the length to a sector size aligned length, so it ends up considering a length of 4096 bytes, and then calls calc_csum_metadata_size() which results in decrementing the inode's csum_bytes counter by 4096 bytes, so after it stays a value of 0 bytes. Then the same happens when btrfs_clear_bit_hook() is called against the second extent state that has a length of 2Kb, covering the range [150Kb, 152Kb[, the length is rounded up to 4096 and calc_csum_metadata_size() ends up being called to decrement 4096 bytes from the inode's csum_bytes counter, which at that time has a value of 0, leading to an underflow, which is exactly what triggers the first warning, at btrfs_destroy_inode(). All the other warnings relate to several space accounting counters that underflow as well due to similar reasons.
A similar case but where the hole punching operation creates an extent map with a start offset not aligned to the sector size is the following:
$ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt $ xfs_io -f -c "fpunch 695K 820K" $SCRATCH_MNT/bar $ xfs_io -c "pwrite -S 0xaa 1008K 307K" $SCRATCH_MNT/bar $ xfs_io -c "pwrite -S 0xbb -b 630K 1073K 630K" $SCRATCH_MNT/bar $ xfs_io -c "pwrite -S 0xcc -b 459K 1068K 459K" $SCRATCH_MNT/bar $ umount /mnt
During the unmount operation we get similar traces for the same reasons as in the first example.
So fix the hole punching operation to make sure it never creates extent maps with a length that is not aligned to the sector size nor with a start offset that is not aligned to the sector size, as this breaks all assumptions and it's a land mine.
--- fs/btrfs/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/btrfs/file.c +4 -1
@@ -2390,10 +2390,13 @@ out:*/ static int find_first_non_hole (struct inode *inode,u64 *start,u64 *len) { +struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct extent_map *em;int ret =0 ; - em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , *start, *len,0 ); + em =btrfs_get_extent (BTRFS_I (inode),NULL ,0 , +round_down (*start, fs_info->sectorsize), +round_up (*len, fs_info->sectorsize),0 );if (IS_ERR (em))return PTR_ERR (em);
Greg Kroah-Hartman
maintainerPATCH 31/196 btrfs: Dont clear SGID when inheriting ACLs
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit b7f8a09f8097db776b8d160862540e4fc1f51296 upstream.
When new directory 'DIR1' is created in a directory 'DIR0' with SGID bit set, DIR1 is expected to have SGID bit set (and owning group equal to the owning group of 'DIR0'). However when 'DIR0' also has some default ACLs that 'DIR1' inherits, setting these ACLs will result in SGID bit on 'DIR1' to get cleared if user is not member of the owning group.
Fix the problem by moving posix_acl_update_mode() out of __btrfs_set_acl() into btrfs_set_acl(). That way the function will not be called when inheriting ACLs which is what we want as it prevents SGID bit clearing and the mode has been properly set by posix_acl_create() anyway.
--- fs/btrfs/acl.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
fs/btrfs/acl.c +7 -6
@@ -78,12 +78,6 @@ static int __btrfs_set_acl(struct btrfs_switch (type) {case ACL_TYPE_ACCESS : name =XATTR_NAME_POSIX_ACL_ACCESS ; -if (acl) { - ret =posix_acl_update_mode (inode, &inode->i_mode, &acl); -if (ret) -return ret; - } - ret =0 ;break ;case ACL_TYPE_DEFAULT :if (!S_ISDIR (inode->i_mode))
@@ -119,6 +113,13 @@ out:int btrfs_set_acl (struct inode *inode,struct posix_acl *acl,int type) { +int ret; + +if (type ==ACL_TYPE_ACCESS && acl) { + ret =posix_acl_update_mode (inode, &inode->i_mode, &acl); +if (ret) +return ret; + }return __btrfs_set_acl (NULL , inode, acl, type); }
Greg Kroah-Hartman
maintainerPATCH 32/196 Btrfs: incremental send, fix invalid memory access
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 24e52b11e0ca788513b945a87b57cc0522a92933 upstream.
When doing an incremental send, while processing an extent that changed between the parent and send snapshots and that extent was an inline extent in the parent snapshot, it's possible to access a memory region beyond the end of leaf if the inline extent is very small and it is the first item in a leaf.
An example scenario is described below.
The send snapshot has the following leaf:
leaf 33865728 items 33 free space 773 generation 46 owner 5 fs uuid ab7090d8-dafd-4fb9-9246-723b6d2e2fb7 chunk uuid 2d16478c-c704-4ab9-b574-68bff2281b1f
(...)
item 14 key (335 EXTENT_DATA 0) itemoff 3052 itemsize 53
generation 36 type 1 (regular)
extent data disk byte 12791808 nr 4096
extent data offset 0 nr 4096 ram 4096
extent compression 0 (none)
item 15 key (335 EXTENT_DATA 8192) itemoff 2999 itemsize 53
generation 36 type 1 (regular)
extent data disk byte 138170368 nr 225280
extent data offset 0 nr 225280 ram 225280
extent compression 0 (none)
(...)And the parent snapshot has the following leaf:
leaf 31272960 items 17 free space 17 generation 31 owner 5
fs uuid ab7090d8-dafd-4fb9-9246-723b6d2e2fb7
chunk uuid 2d16478c-c704-4ab9-b574-68bff2281b1f
item 0 key (335 EXTENT_DATA 0) itemoff 3951 itemsize 44
generation 31 type 0 (inline)
inline extent data size 23 ram_bytes 613 compression 1 (zlib)
(...)
When computing the send stream, it is detected that the extent of inode 335, at file offset 0, and at fs/btrfs/send.c:is_extent_unchanged() we grab the leaf from the parent snapshot and access the inline extent item. However, before jumping to the 'out' label, we access the 'offset' and 'disk_bytenr' fields of the extent item, which should not be done for inline extents since the inlined data starts at the offset of the 'disk_bytenr' field and can be very small. For example accessing the 'offset' field of the file extent item results in the following trace:
[ 599.705368] general protection fault: 0000 [#1] PREEMPT SMP [ 599.706296] Modules linked in: btrfs psmouse i2c_piix4 ppdev acpi_cpufreq serio_raw parport_pc i2c_core evdev tpm_tis tpm_tis_core sg pcspkr parport tpm button su$ [ 599.709340] CPU: 7 PID: 5283 Comm: btrfs Not tainted 4.10.0-rc8-btrfs-next-46+ #1 [ 599.709340] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.1-0-gb3ef39f-prebuilt.qemu-project.org 04/01/2014 [ 599.709340] task: ffff88023eedd040 task.stack: ffffc90006658000 [ 599.709340] RIP: 0010:read_extent_buffer+0xdb/0xf4 [btrfs] [ 599.709340] RSP: 0018:ffffc9000665ba00 EFLAGS: 00010286 [ 599.709340] RAX: db73880000000000 RBX: 0000000000000000 RCX: 0000000000000001 [ 599.709340] RDX: ffffc9000665ba60 RSI: db73880000000000 RDI: ffffc9000665ba5f [ 599.709340] RBP: ffffc9000665ba30 R08: 0000000000000001 R09: ffff88020dc5e098 [ 599.709340] R10: 0000000000001000 R11: 0000160000000000 R12: 6db6db6db6db6db7 [ 599.709340] R13: ffff880000000000 R14: 0000000000000000 R15: ffff88020dc5e088 [ 599.709340] FS: 00007f519555a8c0(0000) GS:ffff88023f3c0000(0000) knlGS:0000000000000000 [ 599.709340] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 599.709340] CR2: 00007f1411afd000 CR3: 0000000235f8e000 CR4: 00000000000006e0 [ 599.709340] Call Trace: [ 599.709340] btrfs_get_token_64+0x93/0xce [btrfs] [ 599.709340] ? printk+0x48/0x50 [ 599.709340] btrfs_get_64+0xb/0xd [btrfs] [ 599.709340] process_extent+0x3a1/0x1106 [btrfs] [ 599.709340] ? btree_read_extent_buffer_pages+0x5/0xef [btrfs] [ 599.709340] changed_cb+0xb03/0xb3d [btrfs] [ 599.709340] ? btrfs_get_token_32+0x7a/0xcc [btrfs] [ 599.709340] btrfs_compare_trees+0x432/0x53d [btrfs] [ 599.709340] ? process_extent+0x1106/0x1106 [btrfs] [ 599.709340] btrfs_ioctl_send+0x960/0xe26 [btrfs] [ 599.709340] btrfs_ioctl+0x181b/0x1fed [btrfs] [ 599.709340] ? trace_hardirqs_on_caller+0x150/0x1ac [ 599.709340] vfs_ioctl+0x21/0x38 [ 599.709340] ? vfs_ioctl+0x21/0x38 [ 599.709340] do_vfs_ioctl+0x611/0x645 [ 599.709340] ? rcu_read_unlock+0x5b/0x5d [ 599.709340] ? __fget+0x6d/0x79 [ 599.709340] SyS_ioctl+0x57/0x7b [ 599.709340] entry_SYSCALL_64_fastpath+0x18/0xad [ 599.709340] RIP: 0033:0x7f51945eec47 [ 599.709340] RSP: 002b:00007ffc21c13e98 EFLAGS: 00000202 ORIG_RAX: 0000000000000010 [ 599.709340] RAX: ffffffffffffffda RBX: ffffffff81096459 RCX: 00007f51945eec47 [ 599.709340] RDX: 00007ffc21c13f20 RSI: 0000000040489426 RDI: 0000000000000004 [ 599.709340] RBP: ffffc9000665bf98 R08: 00007f519450d700 R09: 00007f519450d700 [ 599.709340] R10: 00007f519450d9d0 R11: 0000000000000202 R12: 0000000000000046 [ 599.709340] R13: ffffc9000665bf78 R14: 0000000000000000 R15: 00007f5195574040 [ 599.709340] ? trace_hardirqs_off_caller+0x43/0xb1 [ 599.709340] Code: 29 f0 49 39 d8 4c 0f 47 c3 49 03 81 58 01 00 00 44 89 c1 4c 01 c2 4c 29 c3 48 c1 f8 03 49 0f af c4 48 c1 e0 0c 4c 01 e8 48 01 c6 <f3> a4 31 f6 4$ [ 599.709340] RIP: read_extent_buffer+0xdb/0xf4 [btrfs] RSP: ffffc9000665ba00 [ 599.762057] ---[ end trace fe00d7af61b9f49e ]---
This is because the 'offset' field starts at an offset of 37 bytes (offsetof(struct btrfs_file_extent_item, offset)), has a length of 8 bytes and therefore attemping to read it causes a 1 byte access beyond the end of the leaf, as the first item's content in a leaf is located at the tail of the leaf, the item size is 44 bytes and the offset of that field plus its length (37 + 8 = 45) goes beyond the item's size by 1 byte.
So fix this by accessing the 'offset' and 'disk_bytenr' fields after jumping to the 'out' label if we are processing an inline extent. We move the reading operation of the 'disk_bytenr' field too because we have the same problem as for the 'offset' field explained above when the inline data is less then 8 bytes. The access to the 'generation' field is also moved but just for the sake of grouping access to all the fields.
--- fs/btrfs/send.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/btrfs/send.c +4 -3
@@ -5190,15 +5190,12 @@ static int is_extent_unchanged(struct se goto out; } - right_disknr =btrfs_file_extent_disk_bytenr (eb, ei);if (right_type ==BTRFS_FILE_EXTENT_INLINE ) { right_len =btrfs_file_extent_inline_len (eb, slot, ei); right_len =PAGE_ALIGN (right_len); }else { right_len =btrfs_file_extent_num_bytes (eb, ei); } - right_offset =btrfs_file_extent_offset (eb, ei); - right_gen =btrfs_file_extent_generation (eb, ei);/* * Are we at extent 8? If yes, we know the extent is changed.
@@ -5223,6 +5220,10 @@ static int is_extent_unchanged(struct se goto out; } + right_disknr =btrfs_file_extent_disk_bytenr (eb, ei); + right_offset =btrfs_file_extent_offset (eb, ei); + right_gen =btrfs_file_extent_generation (eb, ei); + left_offset_fixed = left_offset;if (key.offset < ekey->offset) {/* Fix the right offset for 2a and 7. */
Greg Kroah-Hartman
maintainerPATCH 33/196 igb: Explicitly select page 0 at initialization
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matwey V Kornilov <[email protected]>
commit 440aeca4b9858248d8f16d724d9fa87a4f65fa33 upstream.
The functions igb_read_phy_reg_gs40g/igb_write_phy_reg_gs40g (which were removed in 2a3cdea) explicitly selected the required page at every phy_reg access. Currently, igb_get_phy_id_82575 relays on the fact that page 0 is already selected. The assumption is not fulfilled for my Lex 3I380CW motherboard with integrated dual i211 based gigabit ethernet. This leads to igb initialization failure and network interfaces are not working:
igb: Intel(R) Gigabit Ethernet Network Driver - version 5.4.0-k
igb: Copyright (c) 2007-2014 Intel Corporation.
igb: probe of 0000:01:00.0 failed with error -2
igb: probe of 0000:02:00.0 failed with error -2In order to fix it, we explicitly select page 0 before first access to phy registers.
See also: https://bugzilla.suse.com/show_bug.cgi?id=1009911
See also: http://www.lex.com.tw/products/pdf/3I380A&3I380CW.pdf
--- drivers/net/ethernet/intel/igb/e1000_82575.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/igb/e1000_82575.c +1 -0
@@ -257,6 +257,7 @@ static s32 igb_init_phy_params_82575(str }/* Set phy->phy_addr and phy->id. */ +igb_write_phy_reg_82580 (hw,I347AT4_PAGE_SELECT ,0 ); ret_val =igb_get_phy_id_82575 (hw);if (ret_val)return ret_val;
Greg Kroah-Hartman
maintainerPATCH 34/196 spi: atmel: fix corrupted data issue on SAM9 family SoCs
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cyrille Pitchen <[email protected]>
commit 7094576ccdc3acfe1e06a1e2ab547add375baf7f upstream.
This patch disables the use of the DMA for data transfer and forces the use of PIO transfers instead as a quick fixup to solve the cache aliasing issue on ARM9 based cores, which embeds a VIVT data cache.
Indeed in the case of VIVT data caches, it is not safe to call dma_map_*() functions to map buffers for DMA transfers when those buffers have been allocated by vmalloc() or from any DMA-unsafe area.
Further patches may propose a better solution based on the use of a bounce buffer at the SPI sub-system level but such solution needs more time to be discussed. Then the use of DMA transfers could be enabled again to improve the performances but before that, this patch already solves the issue.
--- drivers/spi/spi-atmel.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/spi/spi-atmel.c +23 -1
@@ -269,6 +269,7 @@ struct atmel_spi_caps {bool is_spi2;bool has_wdrbt;bool has_dma_support; +bool has_pdc_support; };/*
@@ -1426,7 +1427,28 @@ static void atmel_get_caps(struct atmel_ as->caps.is_spi2 = version >0x121 ; as->caps.has_wdrbt = version >=0x210 ; +#ifdef CONFIG_SOC_SAM_V4_V5 +/* +* Atmel SoCs based on ARM9 (SAM9x) cores should not use spi_map_buf() +* since this later function tries to map buffers with dma_map_sg() +* even if they have not been allocated inside DMA-safe areas. +* On SoCs based on Cortex A5 (SAMA5Dx), it works anyway because for +* those ARM cores, the data cache follows the PIPT model. +* Also the L2 cache controller of SAMA5D2 uses the PIPT model too. +* In case of PIPT caches, there cannot be cache aliases. +* However on ARM9 cores, the data cache follows the VIVT model, hence +* the cache aliases issue can occur when buffers are allocated from +* DMA-unsafe areas, by vmalloc() for instance, where cache coherency is +* not taken into account or at least not handled completely (cache +* lines of aliases are not invalidated). +* This is not a theorical issue: it was reproduced when trying to mount +* a UBI file-system on a at91sam9g35ek board. +*/ + as->caps.has_dma_support = false; +#else as->caps.has_dma_support = version >=0x212 ; +#endif + as->caps.has_pdc_support = version <0x212 ; }/*-------------------------------------------------------------------------*/
@@ -1567,7 +1589,7 @@ static int atmel_spi_probe(struct platfo }else if (ret == -EPROBE_DEFER ) {return ret; } - }else { + }else if (as->caps.has_pdc_support) { as->use_pdc = true; }
Greg Kroah-Hartman
maintainerPATCH 35/196 ASoC: zx-i2s: flip I2S master/slave mode
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shawn Guo <[email protected]>
commit a205c159f9e2db586a5ea475f4d22fa22e78fed8 upstream.
The SND_SOC_DAIFMT_MASTER bits are defined to specify the master/slave mode for Codec, not I2S. So the I2S master/slave mode should be flipped according to SND_SOC_DAIFMT_MASTER bits.
--- sound/soc/zte/zx-i2s.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
sound/soc/zte/zx-i2s.c +6 -4
@@ -203,13 +203,15 @@ static int zx_i2s_set_fmt(struct snd_socswitch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) {case SND_SOC_DAIFMT_CBM_CFM : - i2s->master =1 ; - val |=ZX_I2S_TIMING_MAST ; -break ; -case SND_SOC_DAIFMT_CBS_CFS : +/* Codec is master, and I2S is slave. */ i2s->master =0 ; val |=ZX_I2S_TIMING_SLAVE ;break ; +case SND_SOC_DAIFMT_CBS_CFS : +/* Codec is slave, and I2S is master. */ + i2s->master =1 ; + val |=ZX_I2S_TIMING_MAST ; +break ;default :dev_err (cpu_dai->dev,"Unknown master/slave format\n" );return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 36/196 ASoC: compress: Derive substream from stream based on direction
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satish Babu Patakokila <[email protected]>
commit 01b8cedfd0422326caae308641dcadaa85e0ca72 upstream.
Currently compress driver hardcodes direction as playback to get substream from the stream. This results in getting the incorrect substream for compressed capture usecase.
To fix this, remove the hardcoding and derive substream based on the stream direction.
--- sound/soc/soc-compress.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/soc-compress.c +4 -2
@@ -81,7 +81,8 @@ out:static int soc_compr_open_fe (struct snd_compr_stream *cstream) {struct snd_soc_pcm_runtime *fe = cstream->private_data; -struct snd_pcm_substream *fe_substream = fe->pcm->streams[0 ].substream; +struct snd_pcm_substream *fe_substream = + fe->pcm->streams[cstream->direction].substream;struct snd_soc_platform *platform = fe->platform;struct snd_soc_dai *cpu_dai = fe->cpu_dai;struct snd_soc_dpcm *dpcm;
@@ -467,7 +468,8 @@ static int soc_compr_set_params_fe(struc struct snd_compr_params *params) {struct snd_soc_pcm_runtime *fe = cstream->private_data; -struct snd_pcm_substream *fe_substream = fe->pcm->streams[0 ].substream; +struct snd_pcm_substream *fe_substream = + fe->pcm->streams[cstream->direction].substream;struct snd_soc_platform *platform = fe->platform;struct snd_soc_dai *cpu_dai = fe->cpu_dai;int ret =0 , stream;
Greg Kroah-Hartman
maintainerPATCH 37/196 ASoC: atmel: tse850: fix off-by-one in the "ANA" enumeration count
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Rosin <[email protected]>
commit a00cebf51d5ceed8ba9f6fac5fb189b38cd5a7c2 upstream.
At some point I added the "Low" entry at the beginning of the array without bumping the enumeration count from 9 to 10. Fix this. While at it, fix the anti-pattern for the other enumeration (used by MUX{1,2}).
--- sound/soc/atmel/tse850-pcm5142.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/atmel/tse850-pcm5142.c +2 -2
@@ -227,7 +227,7 @@ int tse850_put_ana(struct snd_kcontrol *static const char *const mux_text[] = {"Mixer" ,"Loop" };static const struct soc_enum mux_enum = -SOC_ENUM_SINGLE (SND_SOC_NOPM ,0 ,2 , mux_text); +SOC_ENUM_SINGLE (SND_SOC_NOPM ,0 ,ARRAY_SIZE (mux_text), mux_text);static const struct snd_kcontrol_new mux1 =SOC_DAPM_ENUM_EXT ("MUX1" , mux_enum, tse850_get_mux1, tse850_put_mux1);
@@ -252,7 +252,7 @@ static const char * const ana_text[] = { };static const struct soc_enum ana_enum = -SOC_ENUM_SINGLE (SND_SOC_NOPM ,0 ,9 , ana_text); +SOC_ENUM_SINGLE (SND_SOC_NOPM ,0 ,ARRAY_SIZE (ana_text), ana_text);static const struct snd_kcontrol_new out =SOC_DAPM_ENUM_EXT ("ANA" , ana_enum, tse850_get_ana, tse850_put_ana);
Greg Kroah-Hartman
maintainerPATCH 38/196 PM / Domains: Fix unsafe iteration over modified list of device links
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit c6e83cac3eda5f7dd32ee1453df2f7abb5c6cd46 upstream.
pm_genpd_remove_subdomain() iterates over domain's master_links list and removes matching element thus it has to use safe version of list iteration.
--- drivers/base/power/domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/power/domain.c +2 -2
@@ -1393,7 +1393,7 @@ EXPORT_SYMBOL_GPL(pm_genpd_add_subdomainint pm_genpd_remove_subdomain (struct generic_pm_domain *genpd,struct generic_pm_domain *subdomain) { -struct gpd_link *link; +struct gpd_link *l, *link;int ret = -EINVAL ;if (IS_ERR_OR_NULL (genpd) ||IS_ERR_OR_NULL (subdomain))
@@ -1409,7 +1409,7 @@ int pm_genpd_remove_subdomain(struct gen goto out; } -list_for_each_entry (link, &genpd->master_links, master_node) { +list_for_each_entry_safe (link, l, &genpd->master_links, master_node) {if (link->slave != subdomain)continue ;
Greg Kroah-Hartman
maintainerPATCH 39/196 PM / Domains: Fix unsafe iteration over modified list of domain providers
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit b556b15dc04e9b9b98790f04c21acf5e24f994b2 upstream.
of_genpd_del_provider() iterates over list of domain provides and removes matching element thus it has to use safe version of list iteration.
--- drivers/base/power/domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/power/domain.c +2 -2
@@ -1780,12 +1780,12 @@ EXPORT_SYMBOL_GPL(of_genpd_add_provider_*/ void of_genpd_del_provider (struct device_node *np) { -struct of_genpd_provider *cp; +struct of_genpd_provider *cp, *tmp;struct generic_pm_domain *gpd;mutex_lock (&gpd_list_lock);mutex_lock (&of_genpd_mutex); -list_for_each_entry (cp, &of_genpd_providers, link) { +list_for_each_entry_safe (cp, tmp, &of_genpd_providers, link) {if (cp->node == np) {/* * For each PM domain associated with the
Greg Kroah-Hartman
maintainerPATCH 40/196 PM / Domains: Fix unsafe iteration over modified list of domains
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit a7e2d1bce4c1db471f1cbc0c4666a3112bbf0994 upstream.
of_genpd_remove_last() iterates over list of domains and removes matching element thus it has to use safe version of list iteration.
--- drivers/base/power/domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/power/domain.c +2 -2
@@ -1925,14 +1925,14 @@ EXPORT_SYMBOL_GPL(of_genpd_add_subdomain*/ struct generic_pm_domain *of_genpd_remove_last (struct device_node *np) { -struct generic_pm_domain *gpd, *genpd =ERR_PTR (-ENOENT ); +struct generic_pm_domain *gpd, *tmp, *genpd =ERR_PTR (-ENOENT );int ret;if (IS_ERR_OR_NULL (np))return ERR_PTR (-EINVAL );mutex_lock (&gpd_list_lock); -list_for_each_entry (gpd, &gpd_list, gpd_list_node) { +list_for_each_entry_safe (gpd, tmp, &gpd_list, gpd_list_node) {if (gpd->provider == &np->fwnode) { ret =genpd_remove (gpd); genpd = ret ?ERR_PTR (ret) : gpd;
Greg Kroah-Hartman
maintainerPATCH 41/196 scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails.
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maurizio Lombardi <[email protected]>
commit 62e62ffd95539b9220894a7900a619e0f3ef4756 upstream.
The enclosure_add_device() function should fail if it can't create the relevant sysfs links.
--- drivers/misc/enclosure.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/misc/enclosure.c +10 -4
@@ -375,6 +375,7 @@ int enclosure_add_device(struct enclosur struct device *dev) {struct enclosure_component *cdev; +int err;if (!edev || component >= edev->components)return -EINVAL ;
@@ -384,12 +385,17 @@ int enclosure_add_device(struct enclosurif (cdev->dev == dev)return -EEXIST ; -if (cdev->dev) +if (cdev->dev) {enclosure_remove_links (cdev); - -put_device (cdev->dev); +put_device (cdev->dev); + } cdev->dev =get_device (dev); -return enclosure_add_links (cdev); + err =enclosure_add_links (cdev); +if (err) { +put_device (cdev->dev); + cdev->dev =NULL ; + } +return err; }EXPORT_SYMBOL_GPL (enclosure_add_device);
Greg Kroah-Hartman
maintainerPATCH 42/196 scsi: virtio_scsi: let host do exception handling
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Bonzini <[email protected]>
commit e72c9a2a67a6400c8ef3d01d4c461dbbbfa0e1f0 upstream.
virtio_scsi tries to do exception handling after the default 30 seconds timeout expires. However, it's better to let the host control the timeout, otherwise with a heavy I/O load it is likely that an abort will also timeout. This leads to fatal errors like filesystems going offline.
Disable the 'sd' timeout and allow the host to do exception handling, following the precedent of the storvsc driver.
Hannes has a proposal to introduce timeouts in virtio, but this provides an immediate solution for stable kernels too.
[mkp: fixed typo]
--- drivers/scsi/virtio_scsi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/scsi/virtio_scsi.c +12 -0
@@ -796,6 +796,16 @@ static int virtscsi_map_queues(struct Screturn blk_mq_virtio_map_queues (&shost->tag_set, vscsi->vdev,2 ); } +/* +* The host guarantees to respond to each command, although I/O +* latencies might be higher than on bare metal. Reset the timer +* unconditionally to give the host a chance to perform EH. +*/ +static enum blk_eh_timer_return virtscsi_eh_timed_out (struct scsi_cmnd *scmnd) +{ +return BLK_EH_RESET_TIMER ; +} +static struct scsi_host_template virtscsi_host_template_single = { .module =THIS_MODULE , .name ="Virtio SCSI HBA" ,
@@ -806,6 +816,7 @@ static struct scsi_host_template virtscs .change_queue_depth = virtscsi_change_queue_depth, .eh_abort_handler = virtscsi_abort, .eh_device_reset_handler = virtscsi_device_reset, + .eh_timed_out = virtscsi_eh_timed_out, .slave_alloc = virtscsi_device_alloc, .can_queue = 1024,
@@ -826,6 +837,7 @@ static struct scsi_host_template virtscs .change_queue_depth = virtscsi_change_queue_depth, .eh_abort_handler = virtscsi_abort, .eh_device_reset_handler = virtscsi_device_reset, + .eh_timed_out = virtscsi_eh_timed_out, .can_queue = 1024, .dma_boundary = UINT_MAX,
Greg Kroah-Hartman
maintainerPATCH 43/196 scsi: qla2xxx: Allow ABTS, PURX, RIDA on ATIOQ for ISP83XX/27XX
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
commit 3c4810ffdc8e4f34d387f59baf0abefcfa4ada6a upstream.
Driver added mechanism to move ABTS/PUREX/RIDA mailbox to ATIO queue as part of commit id 41dc529a4602ac737020f423f84686a81de38e6d ("qla2xxx: Improve RSCN handling in driver").
This patch adds a check to only allow ABTS/PURX/RIDA to be moved to ATIO Queue for ISP83XX and ISP27XX.
--- drivers/scsi/qla2xxx/qla_init.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +5 -2
@@ -2946,7 +2946,8 @@ qla24xx_update_fw_options(scsi_qla_host_ }/* Move PUREX, ABTS RX & RIDA to ATIOQ */ -if (ql2xmvasynctoatio) { +if (ql2xmvasynctoatio && + (IS_QLA83XX (ha) ||IS_QLA27XX (ha))) {if (qla_tgt_mode_enabled (vha) ||qla_dual_mode_enabled (vha)) ha->fw_options[2 ] |=BIT_11 ;
@@ -2958,7 +2959,9 @@ qla24xx_update_fw_options(scsi_qla_host_"%s, add FW options 1-3 = 0x%04x 0x%04x 0x%04x mode %x\n" , __func__, ha->fw_options[1 ], ha->fw_options[2 ], ha->fw_options[3], vha->host->active_mode); -qla2x00_set_fw_options (vha, ha->fw_options); + +if (ha->fw_options[1 ] || ha->fw_options[2 ] || ha->fw_options[3 ]) +qla2x00_set_fw_options (vha, ha->fw_options);/* Update Serial Link options. */ if ((le16_to_cpu (ha->fw_seriallink_options24[0 ]) &BIT_0 ) ==0 )
Greg Kroah-Hartman
maintainerPATCH 44/196 scsi: Add STARGET_CREATED_REMOVE state to scsi_target_state
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ewan D. Milne <[email protected]>
commit f9279c968c257ee39b0d7bd2571a4d231a67bcc1 upstream.
The addition of the STARGET_REMOVE state had the side effect of introducing a race condition that can cause a crash.
scsi_target_reap_ref_release() checks the starget->state to see if it still in STARGET_CREATED, and if so, skips calling transport_remove_device() and device_del(), because the starget->state is only set to STARGET_RUNNING after scsi_target_add() has called device_add() and transport_add_device().
However, if an rport loss occurs while a target is being scanned, it can happen that scsi_remove_target() will be called while the starget is still in the STARGET_CREATED state. In this case, the starget->state will be set to STARGET_REMOVE, and as a result, scsi_target_reap_ref_release() will take the wrong path. The end result is a panic:
[ 1255.356653] Oops: 0000 [#1] SMP [ 1255.360154] Modules linked in: x86_pkg_temp_thermal kvm_intel kvm irqbypass crc32c_intel ghash_clmulni_i [ 1255.393234] CPU: 5 PID: 149 Comm: kworker/u96:4 Tainted: G W 4.11.0+ #8 [ 1255.401879] Hardware name: Dell Inc. PowerEdge R320/08VT7V, BIOS 2.0.22 11/19/2013 [ 1255.410327] Workqueue: scsi_wq_6 fc_scsi_scan_rport [scsi_transport_fc] [ 1255.417720] task: ffff88060ca8c8c0 task.stack: ffffc900048a8000 [ 1255.424331] RIP: 0010:kernfs_find_ns+0x13/0xc0 [ 1255.429287] RSP: 0018:ffffc900048abbf0 EFLAGS: 00010246 [ 1255.435123] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 [ 1255.443083] RDX: 0000000000000000 RSI: ffffffff8188d659 RDI: 0000000000000000 [ 1255.451043] RBP: ffffc900048abc10 R08: 0000000000000000 R09: 0000012433fe0025 [ 1255.459005] R10: 0000000025e5a4b5 R11: 0000000025e5a4b5 R12: ffffffff8188d659 [ 1255.466972] R13: 0000000000000000 R14: ffff8805f55e5088 R15: 0000000000000000 [ 1255.474931] FS: 0000000000000000(0000) GS:ffff880616b40000(0000) knlGS:0000000000000000 [ 1255.483959] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1255.490370] CR2: 0000000000000068 CR3: 0000000001c09000 CR4: 00000000000406e0 [ 1255.498332] Call Trace: [ 1255.501058] kernfs_find_and_get_ns+0x31/0x60 [ 1255.505916] sysfs_unmerge_group+0x1d/0x60 [ 1255.510498] dpm_sysfs_remove+0x22/0x60 [ 1255.514783] device_del+0xf4/0x2e0 [ 1255.518577] ? device_remove_file+0x19/0x20 [ 1255.523241] attribute_container_class_device_del+0x1a/0x20 [ 1255.529457] transport_remove_classdev+0x4e/0x60 [ 1255.534607] ? transport_add_class_device+0x40/0x40 [ 1255.540046] attribute_container_device_trigger+0xb0/0xc0 [ 1255.546069] transport_remove_device+0x15/0x20 [ 1255.551025] scsi_target_reap_ref_release+0x25/0x40 [ 1255.556467] scsi_target_reap+0x2e/0x40 [ 1255.560744] __scsi_scan_target+0xaa/0x5b0 [ 1255.565312] scsi_scan_target+0xec/0x100 [ 1255.569689] fc_scsi_scan_rport+0xb1/0xc0 [scsi_transport_fc] [ 1255.576099] process_one_work+0x14b/0x390 [ 1255.580569] worker_thread+0x4b/0x390 [ 1255.584651] kthread+0x109/0x140 [ 1255.588251] ? rescuer_thread+0x330/0x330 [ 1255.592730] ? kthread_park+0x60/0x60 [ 1255.596815] ret_from_fork+0x29/0x40 [ 1255.600801] Code: 24 08 48 83 42 40 01 5b 41 5c 5d c3 66 66 66 2e 0f 1f 84 00 00 00 00 00 66 66 66 66 90 [ 1255.621876] RIP: kernfs_find_ns+0x13/0xc0 RSP: ffffc900048abbf0 [ 1255.628479] CR2: 0000000000000068 [ 1255.632756] ---[ end trace 34a69ba0477d036f ]---
Fix this by adding another scsi_target state STARGET_CREATED_REMOVE to distinguish this case.
--- drivers/scsi/scsi_scan.c | 5 +++-- drivers/scsi/scsi_sysfs.c | 8 ++++++-- include/scsi/scsi_device.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-)
drivers/scsi/scsi_scan.c +3 -2
@@ -384,11 +384,12 @@ static void scsi_target_reap_ref_release = container_of(kref, struct scsi_target, reap_ref);/* -* if we get here and the target is still in the CREATED state that +* if we get here and the target is still in a CREATED state that * means it was allocated but never made visible (because a scan * turned up no LUNs), so don't call device_del() on it. */ -if (starget->state !=STARGET_CREATED ) { +if ((starget->state !=STARGET_CREATED ) && + (starget->state !=STARGET_CREATED_REMOVE )) {transport_remove_device (&starget->dev);device_del (&starget->dev); }
drivers/scsi/scsi_sysfs.c +6 -2
@@ -1370,11 +1370,15 @@ restart:spin_lock_irqsave (shost->host_lock, flags);list_for_each_entry (starget, &shost->__targets, siblings) {if (starget->state ==STARGET_DEL || - starget->state ==STARGET_REMOVE ) + starget->state ==STARGET_REMOVE || + starget->state ==STARGET_CREATED_REMOVE )continue ;if (starget->dev.parent == dev || &starget->dev == dev) {kref_get (&starget->reap_ref); - starget->state =STARGET_REMOVE ; +if (starget->state ==STARGET_CREATED ) + starget->state =STARGET_CREATED_REMOVE ; +else + starget->state =STARGET_REMOVE ;spin_unlock_irqrestore (shost->host_lock, flags);__scsi_remove_target (starget);scsi_target_reap (starget);
include/scsi/scsi_device.h +1 -0
@@ -248,6 +248,7 @@ enum scsi_target_state {STARGET_CREATED =1 ,STARGET_RUNNING ,STARGET_REMOVE , +STARGET_CREATED_REMOVE , STARGET_DEL, };
Greg Kroah-Hartman
maintainerPATCH 45/196 scsi: Avoid that scsi_exit_rq() triggers a use-after-free
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
commit 8e6882545d8c06f99e9e117741cc87f3338b0bef upstream.
Dereferencing shost from scsi_exit_rq() is not safe because the SCSI host may already have been freed when scsi_exit_rq() is called. Increasing the shost reference count in scsi_init_rq() and dropping that reference in scsi_exit_rq() is nontrivial since scsi_host_dev_release() may sleep and since scsi_exit_rq() may be called from interrupt context. Since scsi_exit_rq() only needs a single bit from shost, copy that bit into struct scsi_cmnd.
--- drivers/scsi/scsi_lib.c | 47 +++++++++++++++++++++++++++++------------------ include/scsi/scsi_cmnd.h | 1 + 2 files changed, 30 insertions(+), 18 deletions(-)
drivers/scsi/scsi_lib.c +29 -18
@@ -45,23 +45,23 @@ static struct kmem_cache *scsi_sense_isastatic DEFINE_MUTEX (scsi_sense_cache_mutex);static inline struct kmem_cache * -scsi_select_sense_cache (struct Scsi_Host *shost) +scsi_select_sense_cache (bool unchecked_isa_dma) { -return shost->unchecked_isa_dma ? - scsi_sense_isadma_cache : scsi_sense_cache; +return unchecked_isa_dma ? scsi_sense_isadma_cache : scsi_sense_cache; } -static void scsi_free_sense_buffer (struct Scsi_Host *shost, -unsigned char *sense_buffer) +static void scsi_free_sense_buffer (bool unchecked_isa_dma, +unsigned char *sense_buffer) { -kmem_cache_free (scsi_select_sense_cache (shost), sense_buffer); +kmem_cache_free (scsi_select_sense_cache (unchecked_isa_dma), + sense_buffer); } -static unsigned char *scsi_alloc_sense_buffer (struct Scsi_Host *shost, +static unsigned char *scsi_alloc_sense_buffer (bool unchecked_isa_dma,gfp_t gfp_mask,int numa_node) { -return kmem_cache_alloc_node (scsi_select_sense_cache (shost), gfp_mask, - numa_node); +return kmem_cache_alloc_node (scsi_select_sense_cache (unchecked_isa_dma), + gfp_mask, numa_node); }int scsi_init_sense_cache (struct Scsi_Host *shost)
@@ -69,7 +69,7 @@ int scsi_init_sense_cache(struct Scsi_Hostruct kmem_cache *cache;int ret =0 ; - cache =scsi_select_sense_cache (shost); + cache =scsi_select_sense_cache (shost->unchecked_isa_dma);if (cache)return 0 ;
@@ -1138,6 +1138,7 @@ void scsi_init_command(struct scsi_devic {void *buf = cmd->sense_buffer;void *prot = cmd->prot_sdb; +unsigned int unchecked_isa_dma = cmd->flags &SCMD_UNCHECKED_ISA_DMA ;unsigned long flags;/* zero out the cmd, except for the embedded scsi_request */
@@ -1147,6 +1148,7 @@ void scsi_init_command(struct scsi_devic cmd->device = dev; cmd->sense_buffer = buf; cmd->prot_sdb = prot; + cmd->flags = unchecked_isa_dma;INIT_DELAYED_WORK (&cmd->abort_work, scmd_eh_abort_handler); cmd->jiffies_at_alloc = jiffies;
@@ -1847,6 +1849,7 @@ static int scsi_mq_prep_fn(struct requesstruct scsi_device *sdev = req->q->queuedata;struct Scsi_Host *shost = sdev->host;unsigned char *sense_buf = cmd->sense_buffer; +unsigned int unchecked_isa_dma = cmd->flags &SCMD_UNCHECKED_ISA_DMA ;struct scatterlist *sg;/* zero out the cmd, except for the embedded scsi_request */
@@ -1858,6 +1861,7 @@ static int scsi_mq_prep_fn(struct reques cmd->request = req; cmd->device = sdev; cmd->sense_buffer = sense_buf; + cmd->flags = unchecked_isa_dma; cmd->tag = req->tag;
@@ -2004,10 +2008,13 @@ static int scsi_init_request(struct blk_ unsigned int hctx_idx, unsigned int numa_node) { struct Scsi_Host *shost = set->driver_data; +const bool unchecked_isa_dma = shost->unchecked_isa_dma;struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (rq); - cmd->sense_buffer = -scsi_alloc_sense_buffer (shost,GFP_KERNEL , numa_node); +if (unchecked_isa_dma) + cmd->flags |=SCMD_UNCHECKED_ISA_DMA ; + cmd->sense_buffer =scsi_alloc_sense_buffer (unchecked_isa_dma, +GFP_KERNEL , numa_node);if (!cmd->sense_buffer)return -ENOMEM ; cmd->req.sense = cmd->sense_buffer;
@@ -2017,10 +2024,10 @@ static int scsi_init_request(struct blk_static void scsi_exit_request (struct blk_mq_tag_set *set,struct request *rq,unsigned int hctx_idx) { -struct Scsi_Host *shost = set->driver_data;struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (rq); -scsi_free_sense_buffer (shost, cmd->sense_buffer); +scsi_free_sense_buffer (cmd->flags &SCMD_UNCHECKED_ISA_DMA , + cmd->sense_buffer); }static int scsi_map_queues (struct blk_mq_tag_set *set)
@@ -2093,11 +2100,15 @@ EXPORT_SYMBOL_GPL(__scsi_init_queue);static int scsi_init_rq (struct request_queue *q,struct request *rq,gfp_t gfp) {struct Scsi_Host *shost = q->rq_alloc_data; +const bool unchecked_isa_dma = shost->unchecked_isa_dma;struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (rq);memset (cmd,0 ,sizeof (*cmd)); - cmd->sense_buffer =scsi_alloc_sense_buffer (shost, gfp,NUMA_NO_NODE ); +if (unchecked_isa_dma) + cmd->flags |=SCMD_UNCHECKED_ISA_DMA ; + cmd->sense_buffer =scsi_alloc_sense_buffer (unchecked_isa_dma, gfp, +NUMA_NO_NODE );if (!cmd->sense_buffer) goto fail; cmd->req.sense = cmd->sense_buffer;
@@ -2111,19 +2122,19 @@ static int scsi_init_rq(struct request_qreturn 0 ; fail_free_sense: -scsi_free_sense_buffer (shost, cmd->sense_buffer); +scsi_free_sense_buffer (unchecked_isa_dma, cmd->sense_buffer); fail:return -ENOMEM ; }static void scsi_exit_rq (struct request_queue *q,struct request *rq) { -struct Scsi_Host *shost = q->rq_alloc_data;struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (rq);if (cmd->prot_sdb)kmem_cache_free (scsi_sdb_cache, cmd->prot_sdb); -scsi_free_sense_buffer (shost, cmd->sense_buffer); +scsi_free_sense_buffer (cmd->flags &SCMD_UNCHECKED_ISA_DMA , + cmd->sense_buffer); }struct request_queue *scsi_alloc_queue (struct scsi_device *sdev)
include/scsi/scsi_cmnd.h +1 -0
@@ -56,6 +56,7 @@ struct scsi_pointer {/* for scmd->flags */ #define SCMD_TAGGED (1 << 0) +#define SCMD_UNCHECKED_ISA_DMA (1 << 1)struct scsi_cmnd {struct scsi_request req;
Greg Kroah-Hartman
maintainerPATCH 46/196 iscsi-target: Add login_keys_workaround attribute for non RFC initiators
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 138d351eefb727ab9e41a3dc5f112ceb4f6e59f2 upstream.
This patch re-introduces part of a long standing login workaround that was recently dropped by:
commit 1c99de981f30b3e7868b8d20ce5479fa1c0fea46
Author: Nicholas Bellinger <[email protected]>
Date: Sun Apr 2 13:36:44 2017 -0700
iscsi-target: Drop work-around for legacy GlobalSAN initiator
Namely, the workaround for FirstBurstLength ended up being required by Mellanox Flexboot PXE boot ROMs as reported by Robert.
So this patch re-adds the work-around for FirstBurstLength within iscsi_check_proposer_for_optional_reply(), and makes the key optional to respond when the initiator does not propose, nor respond to it.
Also as requested by Arun, this patch introduces a new TPG attribute named 'login_keys_workaround' that controls the use of both the FirstBurstLength workaround, as well as the two other existing workarounds for gPXE iSCSI boot client.
By default, the workaround is enabled with login_keys_workaround=1, since Mellanox FlexBoot requires it, and Arun has verified the Qlogic MSFT initiator already proposes FirstBurstLength, so it's uneffected by this re-adding this part of the original work-around.
--- drivers/target/iscsi/iscsi_target_configfs.c | 2 + drivers/target/iscsi/iscsi_target_nego.c | 6 ++- drivers/target/iscsi/iscsi_target_parameters.c | 41 +++++++++++++++++-------- drivers/target/iscsi/iscsi_target_parameters.h | 2 - drivers/target/iscsi/iscsi_target_tpg.c | 19 +++++++++++ drivers/target/iscsi/iscsi_target_tpg.h | 1 include/target/iscsi/iscsi_target_core.h | 9 +++++ 7 files changed, 64 insertions(+), 16 deletions(-)
drivers/target/iscsi/iscsi_target_configfs.c +2 -0
@@ -781,6 +781,7 @@ DEF_TPG_ATTRIB(default_erl);DEF_TPG_ATTRIB (t10_pi);DEF_TPG_ATTRIB (fabric_prot_type);DEF_TPG_ATTRIB (tpg_enabled_sendtargets); +DEF_TPG_ATTRIB (login_keys_workaround);static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = { &iscsi_tpg_attrib_attr_authentication,
@@ -796,6 +797,7 @@ static struct configfs_attribute *lio_ta &iscsi_tpg_attrib_attr_t10_pi, &iscsi_tpg_attrib_attr_fabric_prot_type, &iscsi_tpg_attrib_attr_tpg_enabled_sendtargets, + &iscsi_tpg_attrib_attr_login_keys_workaround, NULL, };
drivers/target/iscsi/iscsi_target_nego.c +4 -2
@@ -886,7 +886,8 @@ static int iscsi_target_handle_csg_zero(SENDER_TARGET , login->rsp_buf, &login->rsp_length, - conn->param_list); + conn->param_list, + conn->tpg->tpg_attrib.login_keys_workaround);if (ret <0 )return -1 ;
@@ -956,7 +957,8 @@ static int iscsi_target_handle_csg_one(sSENDER_TARGET , login->rsp_buf, &login->rsp_length, - conn->param_list); + conn->param_list, + conn->tpg->tpg_attrib.login_keys_workaround);if (ret <0 ) {iscsit_tx_login_rsp (conn,ISCSI_STATUS_CLS_INITIATOR_ERR ,ISCSI_LOGIN_STATUS_INIT_ERR );
drivers/target/iscsi/iscsi_target_parameters.c +28 -13
68 lines not on this page · raw message
drivers/target/iscsi/iscsi_target_parameters.h +1 -1
@@ -46,7 +46,7 @@ extern int iscsi_extract_key_value(charextern int iscsi_update_param_value (struct iscsi_param *,char *);extern int iscsi_decode_text_input (u8 ,u8 ,char *,u32 ,struct iscsi_conn *);extern int iscsi_encode_text_output (u8 ,u8 ,char *,u32 *, -struct iscsi_param_list *); +struct iscsi_param_list *,bool );extern int iscsi_check_negotiated_keys (struct iscsi_param_list *);extern void iscsi_set_connection_parameters (struct iscsi_conn_ops *,struct iscsi_param_list *);
drivers/target/iscsi/iscsi_target_tpg.c +19 -0
@@ -227,6 +227,7 @@ static void iscsit_set_default_tpg_attri a->t10_pi =TA_DEFAULT_T10_PI ; a->fabric_prot_type =TA_DEFAULT_FABRIC_PROT_TYPE ; a->tpg_enabled_sendtargets =TA_DEFAULT_TPG_ENABLED_SENDTARGETS ; + a->login_keys_workaround =TA_DEFAULT_LOGIN_KEYS_WORKAROUND ; }int iscsit_tpg_add_portal_group (struct iscsi_tiqn *tiqn,struct iscsi_portal_group *tpg)
@@ -899,3 +900,21 @@ int iscsit_ta_tpg_enabled_sendtargets(return 0 ; } + +int iscsit_ta_login_keys_workaround ( +struct iscsi_portal_group *tpg, +u32 flag) +{ +struct iscsi_tpg_attrib *a = &tpg->tpg_attrib; + +if ((flag !=0 ) && (flag !=1 )) { +pr_err ("Illegal value %d\n" , flag); +return -EINVAL ; + } + + a->login_keys_workaround = flag; +pr_debug ("iSCSI_TPG[%hu] - TPG enabled bit for login keys workaround: %s " , + tpg->tpgt, (a->login_keys_workaround) ?"ON" :"OFF" ); + +return 0 ; +}
drivers/target/iscsi/iscsi_target_tpg.h +1 -0
@@ -48,5 +48,6 @@ extern int iscsit_ta_default_erl(structextern int iscsit_ta_t10_pi (struct iscsi_portal_group *,u32 );extern int iscsit_ta_fabric_prot_type (struct iscsi_portal_group *,u32 );extern int iscsit_ta_tpg_enabled_sendtargets (struct iscsi_portal_group *,u32 ); +extern int iscsit_ta_login_keys_workaround (struct iscsi_portal_group *,u32 );#endif /* ISCSI_TARGET_TPG_H */
include/target/iscsi/iscsi_target_core.h +9 -0
@@ -66,6 +66,14 @@ struct sock;#define TA_DEFAULT_FABRIC_PROT_TYPE 0/* TPG status needs to be enabled to return sendtargets discovery endpoint info */ #define TA_DEFAULT_TPG_ENABLED_SENDTARGETS 1 +/* +* Used to control the sending of keys with optional to respond state bit, +* as a workaround for non RFC compliant initiators,that do not propose, +* nor respond to specific keys required for login to complete. +* +* See iscsi_check_proposer_for_optional_reply() for more details. +*/ +#define TA_DEFAULT_LOGIN_KEYS_WORKAROUND 1#define ISCSI_IOV_DATA_BUFFER 5
@@ -769,6 +777,7 @@ struct iscsi_tpg_attrib {u8 t10_pi;u32 fabric_prot_type;u32 tpg_enabled_sendtargets; +u32 login_keys_workaround;struct iscsi_portal_group *tpg; };
Greg Kroah-Hartman
maintainerPATCH 47/196 xen/scsiback: Fix a TMR related use-after-free
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
commit 9f4ab18ac51dc87345a9cbd2527e6acf7a0a9335 upstream.
scsiback_release_cmd() must not dereference se_cmd->se_tmr_req because that memory is freed by target_free_cmd_mem() before scsiback_release_cmd() is called. Fix this use-after-free by inlining struct scsiback_tmr into struct vscsibk_pend.
--- drivers/xen/xen-scsiback.c | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-)
drivers/xen/xen-scsiback.c +9 -24
@@ -134,9 +134,7 @@ struct vscsibk_pend {struct page *pages[VSCSI_MAX_GRANTS ];struct se_cmd se_cmd; -}; -struct scsiback_tmr {atomic_t tmr_complete;wait_queue_head_t tmr_wait; };
@@ -599,26 +597,20 @@ static void scsiback_device_action(strucstruct scsiback_tpg *tpg = pending_req->v2p->tpg;struct scsiback_nexus *nexus = tpg->tpg_nexus;struct se_cmd *se_cmd = &pending_req->se_cmd; -struct scsiback_tmr *tmr;u64 unpacked_lun = pending_req->v2p->lun;int rc, err =FAILED ; - tmr =kzalloc (sizeof (struct scsiback_tmr ),GFP_KERNEL ); -if (!tmr) { -target_put_sess_cmd (se_cmd); - goto err; - } - -init_waitqueue_head (&tmr->tmr_wait); +init_waitqueue_head (&pending_req->tmr_wait); rc =target_submit_tmr (&pending_req->se_cmd, nexus->tvn_se_sess, &pending_req->sense_buffer[0 ], - unpacked_lun, tmr, act,GFP_KERNEL , + unpacked_lun,NULL , act,GFP_KERNEL , tag,TARGET_SCF_ACK_KREF );if (rc) goto err; -wait_event (tmr->tmr_wait,atomic_read (&tmr->tmr_complete)); +wait_event (pending_req->tmr_wait, +atomic_read (&pending_req->tmr_complete)); err = (se_cmd->se_tmr_req->response ==TMR_FUNCTION_COMPLETE ) ?SUCCESS :FAILED ;
@@ -626,9 +618,8 @@ static void scsiback_device_action(strucscsiback_do_resp_with_sense (NULL , err,0 , pending_req);transport_generic_free_cmd (&pending_req->se_cmd,1 );return ; + err: -if (tmr) -kfree (tmr);scsiback_do_resp_with_sense (NULL , err,0 , pending_req); }
@@ -1389,12 +1380,6 @@ static int scsiback_check_stop_free(strustatic void scsiback_release_cmd (struct se_cmd *se_cmd) {struct se_session *se_sess = se_cmd->se_sess; -struct se_tmr_req *se_tmr = se_cmd->se_tmr_req; - -if (se_tmr && se_cmd->se_cmd_flags &SCF_SCSI_TMR_CDB ) { -struct scsiback_tmr *tmr = se_tmr->fabric_tmr_ptr; -kfree (tmr); - }percpu_ida_free (&se_sess->sess_tag_pool, se_cmd->map_tag); }
@@ -1455,11 +1440,11 @@ static int scsiback_queue_status(structstatic void scsiback_queue_tm_rsp (struct se_cmd *se_cmd) { -struct se_tmr_req *se_tmr = se_cmd->se_tmr_req; -struct scsiback_tmr *tmr = se_tmr->fabric_tmr_ptr; +struct vscsibk_pend *pending_req =container_of (se_cmd, + struct vscsibk_pend, se_cmd); -atomic_set (&tmr->tmr_complete,1 ); -wake_up (&tmr->tmr_wait); +atomic_set (&pending_req->tmr_complete,1 ); +wake_up (&pending_req->tmr_wait); }static void scsiback_aborted_task (struct se_cmd *se_cmd)
Greg Kroah-Hartman
maintainerPATCH 48/196 scsi: virtio_scsi: always read VPD pages for multiqueue too
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Bonzini <[email protected]>
commit a680f1d463aeaeb00d22af257a56e111967c2f18 upstream.
Multi-queue virtio-scsi uses a different scsi_host_template struct. Add the .device_alloc field there, too.
--- drivers/scsi/virtio_scsi.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/virtio_scsi.c +1 -0
@@ -838,6 +838,7 @@ static struct scsi_host_template virtscs .eh_abort_handler = virtscsi_abort, .eh_device_reset_handler = virtscsi_device_reset, .eh_timed_out = virtscsi_eh_timed_out, + .slave_alloc = virtscsi_device_alloc, .can_queue = 1024, .dma_boundary = UINT_MAX,
Greg Kroah-Hartman
maintainerPATCH 49/196 powerpc/mm/radix: Only add X for pages overlapping kernel text
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
commit 9abcc981de9775659a0f6e4a52a3448ea72e59da upstream.
Currently we map the whole linear mapping with PAGE_KERNEL_X. Instead we should check if the page overlaps the kernel text and only then add PAGE_KERNEL_X.
Note that we still use 1G pages if they're available, so this will typically still result in a 1G executable page at KERNELBASE. So this fix is primarily useful for catching stray branches to high linear mapping addresses.
Without this patch, we can execute at 1G in xmon using:
0:mon> m c000000040000000
c000000040000000 00 l c000000040000000 00000000 01006038 c000000040000004 00000000 2000804e c000000040000008 00000000 x 0:mon> di c000000040000000 c000000040000000 38600001 li r3,1 c000000040000004 4e800020 blr
0:mon> p c000000040000000
return value is 0x1
After we get a 400 as expected:
0:mon> p c000000040000000
*** 400 exception occurred
--- arch/powerpc/mm/pgtable-radix.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
arch/powerpc/mm/pgtable-radix.c +11 -3
@@ -19,6 +19,7 @@#include <asm/mmu.h> #include <asm/firmware.h> #include <asm/powernv.h> +#include <asm/sections.h> #include <trace/events/thp.h>
@@ -121,7 +122,8 @@ static inline void __meminit print_mappistatic int __meminit create_physical_mapping (unsigned long start,unsigned long end) { -unsigned long addr, mapping_size =0 ; +unsigned long vaddr, addr, mapping_size =0 ; +pgprot_t prot; start =_ALIGN_UP (start,PAGE_SIZE );for (addr = start; addr < end; addr += mapping_size) {
@@ -145,8 +147,14 @@ static int __meminit create_physical_map start = addr; } - rc =radix__map_kernel_page ((unsigned long )__va (addr), addr, -PAGE_KERNEL_X , mapping_size); + vaddr = (unsigned long )__va (addr); + +if (overlaps_kernel_text (vaddr, vaddr + mapping_size)) + prot =PAGE_KERNEL_X ; +else + prot =PAGE_KERNEL ; + + rc =radix__map_kernel_page (vaddr, addr, prot, mapping_size);if (rc)return rc; }
Greg Kroah-Hartman
maintainerPATCH 50/196 powerpc/pseries: Fix passing of pp0 in updatepp() and updateboltedpp()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Balbir Singh <[email protected]>
commit e71ff982ae4c17d176e9f0132157d54973788377 upstream.
Once upon a time there were only two PP (page protection) bits. In ISA 2.03 an additional PP bit was added, but because of the layout of the HPTE it could not be made contiguous with the existing PP bits.
The result is that we now have three PP bits, named pp0, pp1, pp2, where pp0 occupies bit 63 of dword 1 of the HPTE and pp1 and pp2 occupy bits 1 and 0 respectively. Until recently Linux hasn't used pp0, however with the addition of _PAGE_KERNEL_RO we started using it.
The problem arises in the LPAR code, where we need to translate the PP bits into the argument for the H_PROTECT hypercall. Currently the code only passes bits 0-2 of newpp, which covers pp1, pp2 and N (no execute), meaning pp0 is not passed to the hypervisor at all.
We can't simply pass it through in bit 63, as that would collide with a different field in the flags argument, as defined in PAPR. Instead we have to shift it down to bit 8 (IBM bit 55).
--- arch/powerpc/platforms/pseries/lpar.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
arch/powerpc/platforms/pseries/lpar.c +10 -1
@@ -301,7 +301,7 @@ static long pSeries_lpar_hpte_updatepp(u int ssize, unsigned long inv_flags) { unsigned long lpar_rc; -unsigned long flags = (newpp &7 ) |H_AVPN ; +unsigned long flags;unsigned long want_v; want_v =hpte_encode_avpn (vpn, psize, ssize);
@@ -309,6 +309,11 @@ static long pSeries_lpar_hpte_updatepp(upr_devel (" update: avpnv=%016lx, hash=%016lx, f=%lx, psize: %d ..." , want_v, slot, flags, psize); + flags = (newpp &7 ) |H_AVPN ; +if (mmu_has_feature (MMU_FTR_KERNEL_RO )) +/* Move pp0 into bit 8 (IBM 55) */ + flags |= (newpp &HPTE_R_PP0 ) >>55 ; + lpar_rc =plpar_pte_protect (flags, slot, want_v);if (lpar_rc ==H_NOT_FOUND ) {
@@ -380,6 +385,10 @@ static void pSeries_lpar_hpte_updateboltBUG_ON (slot ==-1 ); flags = newpp &7 ; +if (mmu_has_feature (MMU_FTR_KERNEL_RO )) +/* Move pp0 into bit 8 (IBM 55) */ + flags |= (newpp &HPTE_R_PP0 ) >>55 ; + lpar_rc =plpar_pte_protect (flags, slot,0 );BUG_ON (lpar_rc !=H_SUCCESS );
Greg Kroah-Hartman
maintainerPATCH 51/196 powerpc/mm/radix: Fix execute permissions for interrupt_vectors
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Balbir Singh <[email protected]>
commit 7f6d498ed3354740cfd100e4aa99e388f1a95be7 upstream.
Commit 9abcc981de97 ("powerpc/mm/radix: Only add X for pages overlapping kernel text") changed the linear mapping on Radix to only mark the kernel text executable.
However if the kernel is run relocated, for example as a kdump kernel, then the exception vectors are split from the kernel text, ie. they remain at real address 0.
We tend to get away with it, because the kernel itself will usually be below 1G, which means the 1G page at 0-1G is marked executable and everything works OK. However if the kernel is loaded above 1G, or the system has less than 1G in total (meaning we can't use a 1G page), then the exception vectors will not be marked executable and the kernel will fail to boot.
Fix it by also checking if the address range overlaps the exception vectors when deciding if we should add PAGE_KERNEL_X.
--- arch/powerpc/mm/pgtable-radix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/mm/pgtable-radix.c +2 -1
@@ -149,7 +149,8 @@ static int __meminit create_physical_map vaddr = (unsigned long )__va (addr); -if (overlaps_kernel_text (vaddr, vaddr + mapping_size)) +if (overlaps_kernel_text (vaddr, vaddr + mapping_size) || +overlaps_interrupt_vector_text (vaddr, vaddr + mapping_size)) prot =PAGE_KERNEL_X ;else prot =PAGE_KERNEL ;
Greg Kroah-Hartman
maintainerPATCH 52/196 powerpc/64: Fix atomic64_inc_not_zero() to return an int
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
commit 01e6a61aceb82e13bec29502a8eb70d9574f97ad upstream.
Although it's not documented anywhere, there is an expectation that atomic64_inc_not_zero() returns a result which fits in an int. This is the behaviour implemented on all arches except powerpc.
This has caused at least one bug in practice, in the percpu-refcount code, where the long result from our atomic64_inc_not_zero() was truncated to an int leading to lost references and stuck systems. That was worked around in that code in commit 966d2b04e070 ("percpu-refcount:
fix reference leak during percpu-atomic transition").
To the best of my grepping abilities there are no other callers in-tree which truncate the value, but we should fix it anyway. Because the breakage is subtle and potentially very harmful I'm also tagging it for stable.
Code generation is largely unaffected because in most cases the callers are just using the result for a test anyway. In particular the case of fget() that was mentioned in commit a6cf7ed5119f ("powerpc/atomic: Implement atomic*_inc_not_zero") generates exactly the same code.
--- arch/powerpc/include/asm/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/atomic.h +2 -2
@@ -560,7 +560,7 @@ static __inline__ int atomic64_add_unles* Atomically increments @v by 1, so long as @v is non-zero. * Returns non-zero if @v was non-zero, and zero otherwise. */ -static __inline__long atomic64_inc_not_zero (atomic64_t *v) +static __inline__int atomic64_inc_not_zero (atomic64_t *v) {long t1, t2;
@@ -579,7 +579,7 @@ static __inline__ long atomic64_inc_not_ : "r" (&v->counter) : "cc", "xer", "memory"); - return t1; + return t1 != 0; }#endif /* __powerpc64__ */
Greg Kroah-Hartman
maintainerPATCH 53/196 powerpc: Fix emulation of mcrf in emulate_step()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Blanchard <[email protected]>
commit 87c4b83e0fe234a1f0eed131ab6fa232036860d5 upstream.
The mcrf emulation code was using the CR field number directly as the shift value, without taking into account that CR fields are numbered from 0-7 starting at the high bits. That meant it was looking at the CR fields in the reverse order.
--- arch/powerpc/lib/sstep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/powerpc/lib/sstep.c +4 -2
@@ -683,8 +683,10 @@ int analyse_instr(struct instruction_opcase 19 :switch ((instr >>1 ) &0x3ff ) {case 0 :/* mcrf */ - rd = (instr >>21 ) &0x1c ; - ra = (instr >>16 ) &0x1c ; + rd =7 - ((instr >>23 ) &0x7 ); + ra =7 - ((instr >>18 ) &0x7 ); + rd *=4 ; + ra *=4 ; val = (regs->ccr >> ra) &0xf ; regs->ccr = (regs->ccr & ~(0xfUL << rd)) | (val << rd); goto instr_done;
Greg Kroah-Hartman
maintainerPATCH 54/196 powerpc: Fix emulation of mfocrf in emulate_step()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Blanchard <[email protected]>
commit 64e756c55aa46fc18fd53e8f3598b73b528d8637 upstream.
Quoted 1 line
Quoted 1 line
From POWER4 onwards,
mfocrf()only places the specified CR field into
the destination GPR, and the rest of it is set to 0. The PowerPC AS from version 3.0 now requires this behaviour.
The emulation code currently puts the entire CR into the destination GPR. Fix it.
--- arch/powerpc/lib/sstep.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/powerpc/lib/sstep.c +13 -0
@@ -966,6 +966,19 @@ int analyse_instr(struct instruction_op#endif case 19 :/* mfcr */ +if ((instr >>20 ) &1 ) { + imm =0xf0000000UL ; +for (sh =0 ; sh <8 ; ++sh) { +if (instr & (0x80000 >> sh)) { + regs->gpr[rd] = regs->ccr & imm; +break ; + } + imm >>=4 ; + } + + goto instr_done; + } + regs->gpr[rd] = regs->ccr; regs->gpr[rd] &=0xffffffffUL ; goto instr_done;
Greg Kroah-Hartman
maintainerPATCH 55/196 powerpc/asm: Mark cr0 as clobbered in mftb()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver O'Halloran <[email protected]>
commit 2400fd822f467cb4c886c879d8ad99feac9cf319 upstream.
The workaround for the CELL timebase bug does not correctly mark cr0 as being clobbered. This means GCC doesn't know that the asm block changes cr0 and might leave the result of an unrelated comparison in cr0 across the block, which we then trash, leading to basically random behaviour.
--- arch/powerpc/include/asm/reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/reg.h +1 -1
@@ -1303,7 +1303,7 @@ static inline void msr_check_and_clear(u " .llong 0\n" \ ".previous" \ : "=r" (rval) \ - : "i" (CPU_FTR_CELL_TB_BUG), "i" (SPRN_TBRL)); \ + : "i" (CPU_FTR_CELL_TB_BUG), "i" (SPRN_TBRL) : "cr0"); \ rval;}) #else #define mftb() ({unsigned long rval; \
Greg Kroah-Hartman
maintainerPATCH 56/196 powerpc/mm/radix: Properly clear process table entry
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Herrenschmidt <[email protected]>
commit c6bb0b8d426a8cf865ca9c8a532cc3a2927cfceb upstream.
On radix, the process table entry we want to clear when destroying a context is entry 0, not entry 1. This has no *immediate* consequence on Power9, but it can cause other bugs to become worse.
--- arch/powerpc/mm/mmu_context_book3s64.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/powerpc/mm/mmu_context_book3s64.c +9 -3
@@ -223,9 +223,15 @@ void destroy_context(struct mm_struct *m mm->context.cop_lockp =NULL ;#endif /* CONFIG_PPC_ICSWX */ -if (radix_enabled ()) - process_tb[mm->context.id].prtb1 =0 ; -else +if (radix_enabled ()) { +/* +* Radix doesn't have a valid bit in the process table +* entries. However we know that at least P9 implementation +* will avoid caching an entry with an invalid RTS field, +* and 0 is invalid. So this will do. +*/ + process_tb[mm->context.id].prtb0 =0 ; + }else subpage_prot_free (mm);destroy_pagetable_page (mm);__destroy_context (mm->context.id);
Greg Kroah-Hartman
maintainerPATCH 57/196 powerpc/perf: Fix SDAR_MODE value for continous sampling on Power9
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Madhavan Srinivasan <[email protected]>
commit 20dd4c624d25156d5ec3345bbb690b98175ef879 upstream.
In case of continous sampling (non-marked), the code currently sets MMCRA[SDAR_MODE] to 0b01 (Update on TLB miss) for Power9 DD1.
On DD2 and later it copies the sdar_mode value from the event code, which for most events is 0b00 (No updates).
However we must set a non-zero value for SDAR_MODE when doing continuous sampling, so honor the event code, unless it's zero, in which case we use use 0b01 (Update on TLB miss).
--- arch/powerpc/perf/isa207-common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/powerpc/perf/isa207-common.c +4 -2
@@ -90,13 +90,15 @@ static void mmcra_sdar_mode(u64 event, u* MMCRA[SDAR_MODE] will be set to 0b01 * For rest * MMCRA[SDAR_MODE] will be set from event code. +* If sdar_mode from event is zero, default to 0b01. Hardware +* requires that we set a non-zero value. */ if (cpu_has_feature (CPU_FTR_ARCH_300 )) {if (is_event_marked (event) || (*mmcra &MMCRA_SAMPLE_ENABLE )) *mmcra &=MMCRA_SDAR_MODE_NO_UPDATES ; -else if (!cpu_has_feature (CPU_FTR_POWER9_DD1 )) +else if (!cpu_has_feature (CPU_FTR_POWER9_DD1 ) &&p9_SDAR_MODE (event)) *mmcra |=p9_SDAR_MODE (event) <<MMCRA_SDAR_MODE_SHIFT ; -else if (cpu_has_feature (CPU_FTR_POWER9_DD1 )) +else *mmcra |=MMCRA_SDAR_MODE_TLB ; }else *mmcra |=MMCRA_SDAR_MODE_TLB ;
Greg Kroah-Hartman
maintainerPATCH 58/196 xen/x86: fix cpu hotplug
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juergen Gross <[email protected]>
commit c185ddec54657c145a0c2055e4b87918da24974f upstream.
Commit dc6416f1d711eb4c1726e845d653235dcaae12e1 ("xen/x86: Call cpu_startup_entry(CPUHP_AP_ONLINE_IDLE) from xen_play_dead()") introduced an error leading to a stack overflow of the idle task when a cpu was brought offline/online many times: by calling cpu_startup_entry() instead of returning at the end of xen_play_dead() do_idle() would be entered again and again.
Don't use cpu_startup_entry(), but cpuhp_online_idle() instead allowing to return from xen_play_dead().
--- arch/x86/xen/smp_pv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/xen/smp_pv.c +2 -1
@@ -19,6 +19,7 @@#include <linux/irq_work.h> #include <linux/tick.h> #include <linux/nmi.h> +#include <linux/cpuhotplug.h> #include <asm/paravirt.h> #include <asm/desc.h>
@@ -417,7 +418,7 @@ static void xen_pv_play_dead(void) /* us*/ tick_nohz_idle_enter (); - cpu_startup_entry(CPUHP_AP_ONLINE_IDLE); + cpuhp_online_idle(CPUHP_AP_ONLINE_IDLE); }#else /* !CONFIG_HOTPLUG_CPU */
Greg Kroah-Hartman
maintainerPATCH 59/196 PCI: vmd: Move SRCU cleanup after bus, child device removal
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jon Derrick <[email protected]>
commit 0cb259c47a4df466d641c1f07ae3eccaa9ba3ccb upstream.
Recent __call_srcu() changes have exposed that we need to cleanup SRCU structures after pci_stop_root_bus() calls into vmd_msi_free().
--- drivers/pci/host/vmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/host/vmd.c +1 -1
@@ -733,10 +733,10 @@ static void vmd_remove(struct pci_dev *dstruct vmd_dev *vmd =pci_get_drvdata (dev);vmd_detach_resources (vmd); -vmd_cleanup_srcu (vmd);sysfs_remove_link (&vmd->dev->dev.kobj,"domain" );pci_stop_root_bus (vmd->bus);pci_remove_root_bus (vmd->bus); +vmd_cleanup_srcu (vmd);vmd_teardown_dma_ops (vmd);irq_domain_remove (vmd->irq_domain); }
Greg Kroah-Hartman
maintainerPATCH 60/196 PCI: Work around poweroff & suspend-to-RAM issue on Macbook Pro 11
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Helgaas <[email protected]>
commit 13cfc732160f7bc7e596128ce34cda361c556966 upstream.
Neither soft poweroff (transition to ACPI power state S5) nor suspend-to-RAM (transition to state S3) works on the Macbook Pro 11,4 and 11,5.
The problem is related to the [mem 0x7fa00000-0x7fbfffff] space. When we use that space, e.g., by assigning it to the 00:1c.0 Root Port, the ACPI Power Management 1 Control Register (PM1_CNT) at [io 0x1804] doesn't work anymore.
Linux does a soft poweroff (transition to S5) by writing to PM1_CNT. The theory about why this doesn't work is:
- The write to PM1_CNT causes an SMI
- The BIOS SMI handler depends on something in
[mem 0x7fa00000-0x7fbfffff]
- When Linux assigns [mem 0x7fa00000-0x7fbfffff] to the 00:1c.0 Port, it covers up whatever the SMI handler uses, so the SMI handler no longer works correctly
Reserve the [mem 0x7fa00000-0x7fbfffff] space so we don't assign it to anything.
This is voodoo programming, since we don't know what the real conflict is, but we've failed to find the root cause.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
--- arch/x86/pci/fixup.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
arch/x86/pci/fixup.c +32 -0
@@ -571,3 +571,35 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INDECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_INTEL ,0x6f60 , pci_invalid_bar);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_INTEL ,0x6fa0 , pci_invalid_bar);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_INTEL ,0x6fc0 , pci_invalid_bar); + +/* +* Apple MacBook Pro: Avoid [mem 0x7fa00000-0x7fbfffff] +* +* Using the [mem 0x7fa00000-0x7fbfffff] region, e.g., by assigning it to +* the 00:1c.0 Root Port, causes a conflict with [io 0x1804], which is used +* for soft poweroff and suspend-to-RAM. +* +* As far as we know, this is related to the address space, not to the Root +* Port itself. Attaching the quirk to the Root Port is a convenience, but +* it could probably also be a standalone DMI quirk. +* +* https://bugzilla.kernel.org/show_bug.cgi?id=103211 +*/ +static void quirk_apple_mbp_poweroff (struct pci_dev *pdev) +{ +struct device *dev = &pdev->dev; +struct resource *res; + +if ((!dmi_match (DMI_PRODUCT_NAME ,"MacBookPro11,4" ) && + !dmi_match (DMI_PRODUCT_NAME ,"MacBookPro11,5" )) || + pdev->bus->number !=0 || pdev->devfn !=PCI_DEVFN (0x1c ,0 )) +return ; + + res =request_mem_region (0x7fa00000 ,0x200000 , +"MacBook Pro poweroff workaround" ); +if (res) +dev_info (dev,"claimed %s %pR\n" , res->name, res); +else +dev_info (dev,"can't work around MacBook Pro poweroff issue\n" ); +} +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x8c10 , quirk_apple_mbp_poweroff);
Greg Kroah-Hartman
maintainerPATCH 61/196 PCI: rockchip: Use normal register bank for config accessors
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shawn Lin <[email protected]>
commit dc8cca5ef25ac4cb0dfc37467521a759767ff361 upstream.
Rockchip's RC has two banks of registers for the root port: a normal bank that is strictly compatible with the PCIe spec, and a privileged bank that can be used to change RO bits of root port registers.
When probing the RC driver, we use the privileged bank to do some basic setup work as some RO bits are hw-inited to wrong value. But we didn't change to the normal bank after probing the driver.
This leads to a serious problem when the PME code tries to clear the PME status by writing PCI_EXP_RTSTA_PME to the register of PCI_EXP_RTSTA. Per PCIe 3.0 spec, section 7.8.14, the PME status bit is RW1C. So the PME code is doing the right thing to clear the PME status but we find the RC doesn't clear it but actually setting it to one. So finally the system trap in pcie_pme_work_fn() as PCI_EXP_RTSTA_PME is true now forever. This issue can be reproduced by booting kernel with pci=nomsi.
Use the normal register bank for the PCI config accessors. The privileged bank is used only internally by this driver.
--- drivers/pci/host/pcie-rockchip.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/pci/host/pcie-rockchip.c +9 -4
@@ -139,6 +139,7 @@ PCIE_CORE_INT_CT | PCIE_CORE_INT_UTC | \ PCIE_CORE_INT_MMVC) +#define PCIE_RC_CONFIG_NORMAL_BASE 0x800000#define PCIE_RC_CONFIG_BASE 0xa00000#define PCIE_RC_CONFIG_RID_CCR (PCIE_RC_CONFIG_BASE + 0x08)#define PCIE_RC_CONFIG_SCC_SHIFT 16
@@ -295,7 +296,9 @@ static int rockchip_pcie_valid_device(ststatic int rockchip_pcie_rd_own_conf (struct rockchip_pcie *rockchip,int where,int size,u32 *val) { -void __iomem *addr = rockchip->apb_base +PCIE_RC_CONFIG_BASE + where; +void __iomem *addr; + + addr = rockchip->apb_base +PCIE_RC_CONFIG_NORMAL_BASE + where;if (!IS_ALIGNED ((uintptr_t )addr, size)) { *val =0 ;
@@ -319,11 +322,13 @@ static int rockchip_pcie_wr_own_conf(str int where, int size, u32 val) { u32 mask, tmp, offset; +void __iomem *addr; offset = where & ~0x3 ; + addr = rockchip->apb_base +PCIE_RC_CONFIG_NORMAL_BASE + offset;if (size ==4 ) { -writel (val, rockchip->apb_base +PCIE_RC_CONFIG_BASE + offset); +writel (val, addr);return PCIBIOS_SUCCESSFUL ; }
@@ -334,9 +339,9 @@ static int rockchip_pcie_wr_own_conf(str* corrupt RW1C bits in adjacent registers. But the hardware * doesn't support smaller writes. */ - tmp =readl (rockchip->apb_base +PCIE_RC_CONFIG_BASE + offset) & mask; + tmp =readl (addr) & mask; tmp |= val << ((where &0x3 ) *8 ); -writel (tmp, rockchip->apb_base +PCIE_RC_CONFIG_BASE + offset); +writel (tmp, addr);return PCIBIOS_SUCCESSFUL ; }
Greg Kroah-Hartman
maintainerPATCH 62/196 PCI/PM: Restore the status of PCI devices across hibernation
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Yu <[email protected]>
commit e60514bd4485c0c7c5a7cf779b200ce0b95c70d6 upstream.
Currently we saw a lot of "No irq handler" errors during hibernation, which caused the system hang finally:
ata4.00: qc timeout (cmd 0xec)
ata4.00: failed to IDENTIFY (I/O error, err_mask=0x4) ata4.00: revalidation failed (errno=-5)
ata4: SATA link up 6.0 Gbps (SStatus 133 SControl 300)
do_IRQ: 31.151 No irq handler for vector
According to above logs, there is an interrupt triggered and it is dispatched to CPU31 with a vector number 151, but there is no handler for it, thus this IRQ will not get acked and will cause an IRQ flood which kills the system. To be more specific, the 31.151 is an interrupt from the AHCI host controller.
After some investigation, the reason why this issue is triggered is because the thaw_noirq() function does not restore the MSI/MSI-X settings across hibernation.
The scenario is illustrated below:
1. Before hibernation, IRQ 34 is the handler for the AHCI device, which is bound to CPU31.
2. Hibernation starts, the AHCI device is put into low power state.
3. All the nonboot CPUs are put offline, so IRQ 34 has to be migrated to the last alive one - CPU0.
4. After the snapshot has been created, all the nonboot CPUs are brought up again; IRQ 34 remains bound to CPU0.
5. AHCI devices are put into D0.
6. The snapshot is written to the disk.
The issue is triggered in step 6. The AHCI interrupt should be delivered to CPU0, however it is delivered to the original CPU31 instead, which causes the "No irq handler" issue.
Ying Huang has provided a clue that, in step 3 it is possible that writing to the register might not take effect as the PCI devices have been suspended.
In step 3, the IRQ 34 affinity should be modified from CPU31 to CPU0, but in fact it is not. In __pci_write_msi_msg(), if the device is already in low power state, the low level MSI message entry will not be updated but cached. During the device restore process after a normal suspend/resume, pci_restore_msi_state() writes the cached MSI back to the hardware.
But this is not the case for hibernation. pci_restore_msi_state() is not currently called in pci_pm_thaw_noirq(), although pci_save_state() has saved the necessary PCI cached information in pci_pm_freeze_noirq().
Restore the PCI status for the device during hibernation. Otherwise the status might be lost across hibernation (for example, settings for MSI, MSI-X, ATS, ACS, IOV, etc.), which might cause problems during hibernation.
--- drivers/pci/pci-driver.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/pci-driver.c +1 -0
@@ -964,6 +964,7 @@ static int pci_pm_thaw_noirq(struct devireturn pci_legacy_resume_early (dev);pci_update_current_state (pci_dev,PCI_D0 ); +pci_restore_state (pci_dev);if (drv && drv->pm && drv->pm->thaw_noirq) error = drv->pm->thaw_noirq (dev);
Greg Kroah-Hartman
maintainerPATCH 63/196 PCI/MSI: Ignore affinity if pre/post vector count is more than min_vecs
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Hernandez <[email protected]>
commit 6f9a22bc5775d231ab8fbe2c2f3c88e45e3e7c28 upstream.
min_vecs is the minimum amount of vectors needed to operate in MSI-X mode which may just include the vectors that don't need affinity.
Disabling affinity settings causes the qla2xxx driver scsi_add_host() to fail when blk_mq is enabled as the blk_mq_pci_map_queues() expects affinity masks on each vector.
--- drivers/pci/msi.c | 14 ++------------ include/linux/interrupt.h | 4 ++-- kernel/irq/affinity.c | 13 ++++++++++++- 3 files changed, 16 insertions(+), 15 deletions(-)
drivers/pci/msi.c +2 -12
@@ -1058,7 +1058,7 @@ static int __pci_enable_msi_range(structfor (;;) {if (affd) { - nvec =irq_calc_affinity_vectors (nvec, affd); + nvec =irq_calc_affinity_vectors (minvec, nvec, affd);if (nvec < minvec)return -ENOSPC ; }
@@ -1097,7 +1097,7 @@ static int __pci_enable_msix_range(strucfor (;;) {if (affd) { - nvec =irq_calc_affinity_vectors (nvec, affd); + nvec =irq_calc_affinity_vectors (minvec, nvec, affd);if (nvec < minvec)return -ENOSPC ; }
@@ -1165,16 +1165,6 @@ int pci_alloc_irq_vectors_affinity(strucif (flags &PCI_IRQ_AFFINITY ) {if (!affd) affd = &msi_default_affd; - -if (affd->pre_vectors + affd->post_vectors > min_vecs) -return -EINVAL ; - -/* -* If there aren't any vectors left after applying the pre/post -* vectors don't bother with assigning affinity. -*/ -if (affd->pre_vectors + affd->post_vectors == min_vecs) - affd =NULL ; }else {if (WARN_ON (affd)) affd =NULL ;
include/linux/interrupt.h +2 -2
@@ -291,7 +291,7 @@ extern int irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify);struct cpumask *irq_create_affinity_masks (int nvec,const struct irq_affinity *affd); -int irq_calc_affinity_vectors (int maxvec,const struct irq_affinity *affd); +int irq_calc_affinity_vectors (int minvec,int maxvec,const struct irq_affinity *affd);#else /* CONFIG_SMP */
@@ -331,7 +331,7 @@ irq_create_affinity_masks(int nvec, cons }static inline int -irq_calc_affinity_vectors (int maxvec,const struct irq_affinity *affd) +irq_calc_affinity_vectors (int minvec,int maxvec,const struct irq_affinity *affd) {return maxvec; }
kernel/irq/affinity.c +12 -1
@@ -66,6 +66,13 @@ irq_create_affinity_masks(int nvecs, construct cpumask *masks;cpumask_var_t nmsk; +/* +* If there aren't any vectors left after applying the pre/post +* vectors don't bother with assigning affinity. +*/ +if (!affv) +return NULL ; +if (!zalloc_cpumask_var (&nmsk,GFP_KERNEL ))return NULL ;
@@ -140,15 +147,19 @@ out:/** * irq_calc_affinity_vectors - Calculate the optimal number of vectors +* @minvec: The minimum number of vectors available * @maxvec: The maximum number of vectors available * @affd: Description of the affinity requirements */ -int irq_calc_affinity_vectors (int maxvec,const struct irq_affinity *affd) +int irq_calc_affinity_vectors (int minvec,int maxvec,const struct irq_affinity *affd) {int resv = affd->pre_vectors + affd->post_vectors;int vecs = maxvec - resv;int cpus; +if (resv > minvec) +return 0 ; +/* Stabilize the cpumasks */ get_online_cpus (); cpus =cpumask_weight (cpu_online_mask);
Greg Kroah-Hartman
maintainerPATCH 64/196 usb: xhci: fix spinlock recursion for USB2 test mode
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Chen <[email protected]>
commit 576d55460e7f209139545a348746c2fcadf61bc3 upstream.
Both xhci_hub_control and xhci_disable_slot tries to hold spinlock, the spinlock recursion occurs when enters USB2 test mode. Fix it by unlock spinlock before calling xhci_disable_slot.
--- drivers/usb/host/xhci-hub.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/host/xhci-hub.c +2 -0
@@ -603,12 +603,14 @@ static int xhci_enter_test_mode(struct x/* Disable all Device Slots */ xhci_dbg (xhci,"Disable all slots\n" ); +spin_unlock_irqrestore (&xhci->lock, *flags);for (i =1 ; i <=HCS_MAX_SLOTS (xhci->hcs_params1); i++) { retval =xhci_disable_slot (xhci,NULL , i);if (retval)xhci_err (xhci,"Failed to disable slot %d, %d. Enter test mode anyway\n" , i, retval); } +spin_lock_irqsave (&xhci->lock, *flags);/* Put all ports to the Disable state by clear PP */ xhci_dbg (xhci,"Disable all port (PP = 0)\n" );/* Power off USB3 ports*/
Greg Kroah-Hartman
maintainerPATCH 65/196 xhci: fix memleak in xhci_run()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shu Wang <[email protected]>
commit d6f5f071f1e13cadecf8aef1faa7e5d6fbc9f33b upstream.
Found this issue by kmemleak.xhci_run() did not check return val and free command for xhci_queue_vendor_command()
unreferenced object 0xffff88011c0be500 (size 64):
comm "kworker/0:1", pid 58, jiffies 4294670908 (age 50.420s) hex dump (first 32 bytes):
backtrace:
[<ffffffff8176166a>] kmemleak_alloc+0x4a/0xa0
[<ffffffff8121801a>] kmem_cache_alloc_trace+0xca/0x1d0
[<ffffffff81576bf4>] xhci_alloc_command+0x44/0x130
[<ffffffff8156f1cc>] xhci_run+0x4cc/0x630
[<ffffffff8153b84b>] usb_add_hcd+0x3bb/0x950
[<ffffffff8154eac8>] usb_hcd_pci_probe+0x188/0x500
[<ffffffff815851ac>] xhci_pci_probe+0x2c/0x220
[<ffffffff813d2ca5>] local_pci_probe+0x45/0xa0
[<ffffffff810a54e4>] work_for_cpu_fn+0x14/0x20
[<ffffffff810a8409>] process_one_work+0x149/0x360
[<ffffffff810a8d08>] worker_thread+0x1d8/0x3c0
[<ffffffff810ae7d9>] kthread+0x109/0x140
[<ffffffff8176d585>] ret_from_fork+0x25/0x30
[<ffffffffffffffff>] 0xffffffffffffffff--- drivers/usb/host/xhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/host/xhci.c +3 -1
@@ -622,8 +622,10 @@ int xhci_run(struct usb_hcd *hcd)if (!command)return -ENOMEM ; -xhci_queue_vendor_command (xhci, command,0 ,0 ,0 , + ret =xhci_queue_vendor_command (xhci, command,0 ,0 ,0 ,TRB_TYPE (TRB_NEC_GET_FW )); +if (ret) +xhci_free_command (xhci, command); }xhci_dbg_trace (xhci, trace_xhci_dbg_init,"Finished xhci_run for USB2 roothub" );
Greg Kroah-Hartman
maintainerPATCH 66/196 xhci: fix 20000ms port resume timeout
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
commit a54408d0a004757789863d74e29c2297edae0b4d upstream.
A uncleared PLC (port link change) bit will prevent furuther port event interrupts for that port. Leaving it uncleared caused get_port_status() to timeout after 20000ms while waiting to get the final port event interrupt for resume -> U0 state change.
This is a targeted fix for a specific case where we get a port resume event racing with xhci resume. The port event interrupt handler notices xHC is not yet running and bails out early, leaving PLC uncleared.
The whole xhci port resuming needs more attention, but while working on it it anyways makes sense to always ensure PLC is cleared in get_port_status before setting a new link state and waiting for its completion.
--- drivers/usb/host/xhci-hub.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci-hub.c +3 -0
@@ -899,6 +899,9 @@ static u32 xhci_get_port_status(struct uclear_bit (wIndex, &bus_state->resuming_ports);set_bit (wIndex, &bus_state->rexit_ports); + +xhci_test_and_clear_bit (xhci, port_array, wIndex, +PORT_PLC );xhci_set_link_state (xhci, port_array, wIndex,XDEV_U0 );
Greg Kroah-Hartman
maintainerPATCH 67/196 xhci: Fix NULL pointer dereference when cleaning up streams for removed host
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
commit 4b895868bb2da60a386a17cde3bf9ecbc70c79f4 upstream.
This off by one in stream_id indexing caused NULL pointer dereference and soft lockup on machines with USB attached SCSI devices connected to a hotpluggable xhci controller.
The code that cleans up pending URBs for dead hosts tried to dereference a stream ring at the invalid stream_id 0. ep->stream_info->stream_rings[0] doesn't point to a ring.
Start looping stream_id from 1 like in all the other places in the driver, and check that the ring exists before trying to kill URBs on it.
--- drivers/usb/host/xhci-ring.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-ring.c +7 -4
@@ -845,13 +845,16 @@ static void xhci_kill_endpoint_urbs(stru (ep->ep_state & EP_GETTING_NO_STREAMS)) {int stream_id; -for (stream_id =0 ; stream_id < ep->stream_info->num_streams; +for (stream_id =1 ; stream_id < ep->stream_info->num_streams; stream_id++) { + ring = ep->stream_info->stream_rings[stream_id]; +if (!ring) +continue ; +xhci_dbg_trace (xhci, trace_xhci_dbg_cancel_urb,"Killing URBs for slot ID %u, ep index %u, stream %u" , - slot_id, ep_index, stream_id +1 ); -xhci_kill_ring_urbs (xhci, - ep->stream_info->stream_rings[stream_id]); + slot_id, ep_index, stream_id); +xhci_kill_ring_urbs (xhci, ring); } } else { ring = ep->ring;
Greg Kroah-Hartman
maintainerPATCH 68/196 xhci: Bad Ethernet performance plugged in ASM1042A host
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiahau Chang <[email protected]>
commit 9da5a1092b13468839b1a864b126cacfb72ad016 upstream.
When USB Ethernet is plugged in ASMEDIA ASM1042A xHCI host, bad performance was manifesting in Web browser use (like download large file such as ISO image). It is known limitation of ASM1042A that is not compatible with driver scheduling, As a workaround we can modify flow control handling of ASM1042A. The register we modify is changes the behavior
--- drivers/usb/host/pci-quirks.c | 54 ++++++++++++++++++++++++++++++++++++++++++ drivers/usb/host/pci-quirks.h | 2 + drivers/usb/host/xhci-pci.c | 6 ++++ drivers/usb/host/xhci.c | 6 ++++ drivers/usb/host/xhci.h | 1 5 files changed, 69 insertions(+)
drivers/usb/host/pci-quirks.c +54 -0
@@ -77,6 +77,16 @@#define USB_INTEL_USB3_PSSEN 0xD8#define USB_INTEL_USB3PRM 0xDC +/* ASMEDIA quirk use */ +#define ASMT_DATA_WRITE0_REG 0xF8 +#define ASMT_DATA_WRITE1_REG 0xFC +#define ASMT_CONTROL_REG 0xE0 +#define ASMT_CONTROL_WRITE_BIT 0x02 +#define ASMT_WRITEREG_CMD 0x10423 +#define ASMT_FLOWCTL_ADDR 0xFA30 +#define ASMT_FLOWCTL_DATA 0xBA +#define ASMT_PSEUDO_DATA 0 +/* * amd_chipset_gen values represent AMD different chipset generations */
@@ -412,6 +422,50 @@ void usb_amd_quirk_pll_disable(void) }EXPORT_SYMBOL_GPL (usb_amd_quirk_pll_disable); +static int usb_asmedia_wait_write (struct pci_dev *pdev) +{ +unsigned long retry_count; +unsigned char value; + +for (retry_count =1000 ; retry_count >0 ; --retry_count) { + +pci_read_config_byte (pdev,ASMT_CONTROL_REG , &value); + +if (value ==0xff ) { +dev_err (&pdev->dev,"%s: check_ready ERROR" , __func__); +return -EIO ; + } + +if ((value &ASMT_CONTROL_WRITE_BIT ) ==0 ) +return 0 ; + +usleep_range (40 ,60 ); + } + +dev_warn (&pdev->dev,"%s: check_write_ready timeout" , __func__); +return -ETIMEDOUT ; +} + +void usb_asmedia_modifyflowcontrol (struct pci_dev *pdev) +{ +if (usb_asmedia_wait_write (pdev) !=0 ) +return ; + +/* send command and address to device */ +pci_write_config_dword (pdev,ASMT_DATA_WRITE0_REG ,ASMT_WRITEREG_CMD ); +pci_write_config_dword (pdev,ASMT_DATA_WRITE1_REG ,ASMT_FLOWCTL_ADDR ); +pci_write_config_byte (pdev,ASMT_CONTROL_REG ,ASMT_CONTROL_WRITE_BIT ); + +if (usb_asmedia_wait_write (pdev) !=0 ) +return ; + +/* send data to device */ +pci_write_config_dword (pdev,ASMT_DATA_WRITE0_REG ,ASMT_FLOWCTL_DATA ); +pci_write_config_dword (pdev,ASMT_DATA_WRITE1_REG ,ASMT_PSEUDO_DATA ); +pci_write_config_byte (pdev,ASMT_CONTROL_REG ,ASMT_CONTROL_WRITE_BIT ); +} +EXPORT_SYMBOL_GPL (usb_asmedia_modifyflowcontrol); +void usb_amd_quirk_pll_enable (void ) {usb_amd_quirk_pll (0 );
drivers/usb/host/pci-quirks.h +2 -0
@@ -11,6 +11,7 @@ bool usb_amd_prefetch_quirk(void);void usb_amd_dev_put (void );void usb_amd_quirk_pll_disable (void );void usb_amd_quirk_pll_enable (void ); +void usb_asmedia_modifyflowcontrol (struct pci_dev *pdev);void usb_enable_intel_xhci_ports (struct pci_dev *xhci_pdev);void usb_disable_xhci_ports (struct pci_dev *xhci_pdev);void sb800_prefetch (struct device *dev,int on);
@@ -18,6 +19,7 @@ void sb800_prefetch(struct device *dev,struct pci_dev ;static inline void usb_amd_quirk_pll_disable (void ) {}static inline void usb_amd_quirk_pll_enable (void ) {} +static inline void usb_asmedia_modifyflowcontrol (struct pci_dev *pdev) {}static inline void usb_amd_dev_put (void ) {}static inline void usb_disable_xhci_ports (struct pci_dev *xhci_pdev) {}static inline void sb800_prefetch (struct device *dev,int on) {}
drivers/usb/host/xhci-pci.c +6 -0
@@ -59,6 +59,8 @@#define PCI_DEVICE_ID_AMD_PROMONTORYA_2 0x43bb#define PCI_DEVICE_ID_AMD_PROMONTORYA_1 0x43bc +#define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142 +static const char hcd_name[] ="xhci_hcd" ;static struct hc_driver __read_mostly xhci_pci_hc_driver;
@@ -217,6 +219,10 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x1142) xhci->quirks |=XHCI_TRUST_TX_LENGTH ; +if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA && + pdev->device ==PCI_DEVICE_ID_ASMEDIA_1042A_XHCI ) + xhci->quirks |=XHCI_ASMEDIA_MODIFY_FLOWCONTROL ; +if (pdev->vendor ==PCI_VENDOR_ID_TI && pdev->device ==0x8241 ) xhci->quirks |=XHCI_LIMIT_ENDPOINT_INTERVAL_7 ;
drivers/usb/host/xhci.c +6 -0
@@ -198,6 +198,9 @@ int xhci_reset(struct xhci_hcd *xhci)if (ret)return ret; +if (xhci->quirks &XHCI_ASMEDIA_MODIFY_FLOWCONTROL ) +usb_asmedia_modifyflowcontrol (to_pci_dev (xhci_to_hcd (xhci)->self.controller)); +xhci_dbg_trace (xhci, trace_xhci_dbg_init,"Wait for controller to be ready for doorbell rings" );/*
@@ -1087,6 +1090,9 @@ int xhci_resume(struct xhci_hcd *xhci, bif ((xhci->quirks &XHCI_COMP_MODE_QUIRK ) && !comp_timer_running)compliance_mode_recovery_timer_init (xhci); +if (xhci->quirks &XHCI_ASMEDIA_MODIFY_FLOWCONTROL ) +usb_asmedia_modifyflowcontrol (to_pci_dev (hcd->self.controller)); +/* Re-enable port polling. */ xhci_dbg (xhci,"%s: starting port polling.\n" , __func__);set_bit (HCD_FLAG_POLL_RH , &xhci->shared_hcd->flags);
drivers/usb/host/xhci.h +1 -0
@@ -1820,6 +1820,7 @@ struct xhci_hcd {#define XHCI_BROKEN_PORT_PED (1 << 25)#define XHCI_LIMIT_ENDPOINT_INTERVAL_7 (1 << 26)#define XHCI_U2_DISABLE_WAKE (1 << 27) +#define XHCI_ASMEDIA_MODIFY_FLOWCONTROL (1 << 28)unsigned int num_active_eps;unsigned int limit_active_eps;
Greg Kroah-Hartman
maintainerPATCH 69/196 mxl111sf: Fix driver to use heap allocate buffers for USB messages
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Devin Heitmueller <[email protected]>
commit d90b336f3f652ff0441e631a06236f785581c8f7 upstream.
The recent changes in 4.9 to mandate USB buffers be heap allocated broke this driver, which was allocating the buffers on the stack. This resulted in the device failing at initialization.
Introduce dedicated send/receive buffers as part of the state structure, and add a mutex to protect access to them.
Note: we also had to tweak the API to mxl111sf_ctrl_msg to pass the pointer to the state struct rather than the device, since we need it inside the function to access the buffers and the mutex. This patch adjusts the callers to match the API change.
--- drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 4 +-- drivers/media/usb/dvb-usb-v2/mxl111sf.c | 32 ++++++++++++++++------------ drivers/media/usb/dvb-usb-v2/mxl111sf.h | 8 ++++++- 3 files changed, 28 insertions(+), 16 deletions(-)
drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c +2 -2
@@ -316,7 +316,7 @@ fail:static int mxl111sf_i2c_send_data (struct mxl111sf_state *state,u8 index,u8 *wdata) { -int ret =mxl111sf_ctrl_msg (state->d, wdata[0 ], +int ret =mxl111sf_ctrl_msg (state, wdata[0 ], &wdata[1 ],25 ,NULL ,0 );mxl_fail (ret);
@@ -326,7 +326,7 @@ static int mxl111sf_i2c_send_data(structstatic int mxl111sf_i2c_get_data (struct mxl111sf_state *state,u8 index,u8 *wdata,u8 *rdata) { -int ret =mxl111sf_ctrl_msg (state->d, wdata[0 ], +int ret =mxl111sf_ctrl_msg (state, wdata[0 ], &wdata[1 ],25 , rdata,24 );mxl_fail (ret);
drivers/media/usb/dvb-usb-v2/mxl111sf.c +19 -13
@@ -24,9 +24,6 @@#include "lgdt3305.h" #include "lg2160.h" -/* Max transfer size done by I2C transfer functions */ -#define MAX_XFER_SIZE 64 -int dvb_usb_mxl111sf_debug;module_param_named (debug, dvb_usb_mxl111sf_debug, int,0644 );MODULE_PARM_DESC (debug,"set debugging level (1=info, 2=xfer, 4=i2c, 8=reg, 16=adv (or-able))." );
@@ -55,27 +52,34 @@ MODULE_PARM_DESC(rfswitch, "force rf swiDVB_DEFINE_MOD_OPT_ADAPTER_NR (adapter_nr); -int mxl111sf_ctrl_msg (struct dvb_usb_device *d, +int mxl111sf_ctrl_msg (struct mxl111sf_state *state,u8 cmd,u8 *wbuf,int wlen,u8 *rbuf,int rlen) { +struct dvb_usb_device *d = state->d;int wo = (rbuf ==NULL || rlen ==0 );/* write-only */ int ret; -u8 sndbuf[MAX_XFER_SIZE ]; -if (1 + wlen >sizeof (sndbuf)) { +if (1 + wlen >MXL_MAX_XFER_SIZE ) {pr_warn ("%s: len=%d is too big!\n" , __func__, wlen);return -EOPNOTSUPP ; }pr_debug ("%s(wlen = %d, rlen = %d)\n" , __func__, wlen, rlen); -memset (sndbuf,0 ,1 +wlen); +mutex_lock (&state->msg_lock); +memset (state->sndbuf,0 ,1 +wlen); +memset (state->rcvbuf,0 , rlen); + + state->sndbuf[0 ] = cmd; +memcpy (&state->sndbuf[1 ], wbuf, wlen); + + ret = (wo) ?dvb_usbv2_generic_write (d, state->sndbuf,1 +wlen) : +dvb_usbv2_generic_rw (d, state->sndbuf,1 +wlen, state->rcvbuf, + rlen); - sndbuf[0 ] = cmd; -memcpy (&sndbuf[1 ], wbuf, wlen); +memcpy (rbuf, state->rcvbuf, rlen); +mutex_unlock (&state->msg_lock); - ret = (wo) ?dvb_usbv2_generic_write (d, sndbuf,1 +wlen) : -dvb_usbv2_generic_rw (d, sndbuf,1 +wlen, rbuf, rlen);mxl_fail (ret);return ret;
@@ -91,7 +95,7 @@ int mxl111sf_read_reg(struct mxl111sf_stu8 buf[2 ];int ret; - ret =mxl111sf_ctrl_msg (state->d,MXL_CMD_REG_READ , &addr,1 , buf,2 ); + ret =mxl111sf_ctrl_msg (state,MXL_CMD_REG_READ , &addr,1 , buf,2 );if (mxl_fail (ret)) {mxl_debug ("error reading reg: 0x%02x" , addr); goto fail;
@@ -117,7 +121,7 @@ int mxl111sf_write_reg(struct mxl111sf_spr_debug ("W: (0x%02x, 0x%02x)\n" , addr, data); - ret =mxl111sf_ctrl_msg (state->d,MXL_CMD_REG_WRITE , buf,2 ,NULL ,0 ); + ret =mxl111sf_ctrl_msg (state,MXL_CMD_REG_WRITE , buf,2 ,NULL ,0 );if (mxl_fail (ret))pr_err ("error writing reg: 0x%02x, val: 0x%02x" , addr, data);return ret;
@@ -926,6 +930,8 @@ static int mxl111sf_init(struct dvb_usb_ .len = sizeof(eeprom), .buf = eeprom }, }; +mutex_init (&state->msg_lock); + ret =get_chip_info (state);if (mxl_fail (ret))pr_err ("failed to get chip info during probe" );
drivers/media/usb/dvb-usb-v2/mxl111sf.h +7 -1
@@ -19,6 +19,9 @@#include <media/tveeprom.h> #include <media/media-entity.h> +/* Max transfer size done by I2C transfer functions */ +#define MXL_MAX_XFER_SIZE 64 +#define MXL_EP1_REG_READ 1#define MXL_EP2_REG_WRITE 2#define MXL_EP3_INTERRUPT 3
@@ -86,6 +89,9 @@ struct mxl111sf_state {struct mutex fe_lock;u8 num_frontends;struct mxl111sf_adap_state adap_state[3 ]; +u8 sndbuf[MXL_MAX_XFER_SIZE ]; +u8 rcvbuf[MXL_MAX_XFER_SIZE ]; +struct mutex msg_lock;#ifdef CONFIG_MEDIA_CONTROLLER_DVB struct media_entity tuner;struct media_pad tuner_pads[2 ];
@@ -108,7 +114,7 @@ int mxl111sf_ctrl_program_regs(struct mx/* needed for hardware i2c functions in mxl111sf-i2c.c: * mxl111sf_i2c_send_data / mxl111sf_i2c_get_data */ -int mxl111sf_ctrl_msg (struct dvb_usb_device *d, +int mxl111sf_ctrl_msg (struct mxl111sf_state *state,u8 cmd,u8 *wbuf,int wlen,u8 *rbuf,int rlen); #define mxl_printk(kern, fmt, arg...) \
Greg Kroah-Hartman
maintainerPATCH 70/196 usb: storage: return on error to avoid a null pointer dereference
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Colin Ian King <[email protected]>
commit 446230f52a5bef593554510302465eabab45a372 upstream.
When us->extra is null the driver is not initialized, however, a later call to osd200_scsi_to_ata is made that dereferences us->extra, causing a null pointer dereference. The code currently detects and reports that the driver is not initialized; add a return to avoid the subsequent dereference issue in this check.
Thanks to Alan Stern for pointing out that srb->result needs setting to DID_ERROR << 16
Detected by CoverityScan, CID#100308 ("Dereference after null check")
--- drivers/usb/storage/isd200.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/storage/isd200.c +4 -1
@@ -1529,8 +1529,11 @@ static void isd200_ata_command(struct sc/* Make sure driver was initialized */ -if (us->extra ==NULL ) +if (us->extra ==NULL ) {usb_stor_dbg (us,"ERROR Driver not initialized\n" ); + srb->result =DID_ERROR <<16 ; +return ; + }scsi_set_resid (srb,0 );/* scsi_bufflen might change in protocol translation to ata */
Greg Kroah-Hartman
maintainerPATCH 71/196 USB: cdc-acm: add device-id for quirky printer
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit fe855789d605590e57f9cd968d85ecce46f5c3fd upstream.
Add device-id entry for DATECS FP-2000 fiscal printer needing the NO_UNION_NORMAL quirk.
--- drivers/usb/class/cdc-acm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/class/cdc-acm.c +3 -0
@@ -1829,6 +1829,9 @@ static const struct usb_device_id acm_id { USB_DEVICE(0x1576, 0x03b1), /* Maretron USB100 */ .driver_info =NO_UNION_NORMAL ,/* reports zero length descriptor */ }, + { USB_DEVICE(0xfff0, 0x0100), /* DATECS FP-2000 */ + .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ + }, { USB_DEVICE(0x2912, 0x0001), /* ATOL FPrint */ .driver_info = CLEAR_HALT_CONDITIONS,
Greg Kroah-Hartman
maintainerPATCH 72/196 usb: renesas_usbhs: fix usbhsc_resume() for !USBHSF_RUNTIME_PWCTRL
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yoshihiro Shimoda <[email protected]>
commit 59a0879a0e17b2e43ecdc5e3299da85b8410d7ce upstream.
This patch fixes an issue that some registers may be not initialized after resume if the USBHSF_RUNTIME_PWCTRL is not set. Otherwise, if a cable is not connected, the driver will not enable INTENB0.VBSE after resume. And then, the driver cannot detect the VBUS.
--- drivers/usb/renesas_usbhs/common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/renesas_usbhs/common.c +3 -1
@@ -752,8 +752,10 @@ static int usbhsc_resume(struct device *struct usbhs_priv *priv =dev_get_drvdata (dev);struct platform_device *pdev =usbhs_priv_to_pdev (priv); -if (!usbhsc_flags_has (priv,USBHSF_RUNTIME_PWCTRL )) +if (!usbhsc_flags_has (priv,USBHSF_RUNTIME_PWCTRL )) {usbhsc_power_ctrl (priv,1 ); +usbhs_mod_autonomy_mode (priv); + }usbhs_platform_call (priv, phy_reset, pdev);
Greg Kroah-Hartman
maintainerPATCH 73/196 usb: renesas_usbhs: gadget: disable all eps when the driver stops
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yoshihiro Shimoda <[email protected]>
commit b8b9c974afee685789fcbb191b52d1790be3608c upstream.
A gadget driver will not disable eps immediately when ->disconnect() is called. But, since this driver assumes all eps stop after the ->disconnect(), unexpected behavior happens (especially in system suspend).
So, this patch disables all eps in usbhsg_try_stop(). After disabling eps by renesas_usbhs driver, since some functions will be called by both a gadget and renesas_usbhs driver, renesas_usbhs driver should protect uep->pipe. To protect uep->pipe easily, this patch adds a new lock in struct usbhsg_uep.
--- drivers/usb/renesas_usbhs/mod_gadget.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-)
drivers/usb/renesas_usbhs/mod_gadget.c +24 -7
@@ -37,6 +37,7 @@ struct usbhsg_gpriv;struct usbhsg_uep {struct usb_ep ep;struct usbhs_pipe *pipe; +spinlock_t lock;/* protect the pipe */ char ep_name[EP_NAME_SIZE ];
@@ -636,10 +637,16 @@ usbhsg_ep_enable_end:static int usbhsg_ep_disable (struct usb_ep *ep) {struct usbhsg_uep *uep =usbhsg_ep_to_uep (ep); -struct usbhs_pipe *pipe =usbhsg_uep_to_pipe (uep); +struct usbhs_pipe *pipe; +unsigned long flags; +int ret =0 ; -if (!pipe) -return -EINVAL ; +spin_lock_irqsave (&uep->lock, flags); + pipe =usbhsg_uep_to_pipe (uep); +if (!pipe) { + ret = -EINVAL ; + goto out; + }usbhsg_pipe_disable (uep);usbhs_pipe_free (pipe);
@@ -647,6 +654,9 @@ static int usbhsg_ep_disable(struct usb_ uep->pipe->mod_private =NULL ; uep->pipe =NULL ; +out: +spin_unlock_irqrestore (&uep->lock, flags); +return 0 ; }
@@ -696,8 +706,11 @@ static int usbhsg_ep_dequeue(struct usb_ {struct usbhsg_uep *uep =usbhsg_ep_to_uep (ep);struct usbhsg_request *ureq =usbhsg_req_to_ureq (req); -struct usbhs_pipe *pipe =usbhsg_uep_to_pipe (uep); +struct usbhs_pipe *pipe; +unsigned long flags; +spin_lock_irqsave (&uep->lock, flags); + pipe =usbhsg_uep_to_pipe (uep);if (pipe)usbhs_pkt_pop (pipe,usbhsg_ureq_to_pkt (ureq));
@@ -706,6 +719,7 @@ static int usbhsg_ep_dequeue(struct usb_* even if the pipe is NULL. */ usbhsg_queue_pop (uep, ureq, -ECONNRESET ); +spin_unlock_irqrestore (&uep->lock, flags);return 0 ; }
@@ -852,10 +866,10 @@ static int usbhsg_try_stop(struct usbhs_ {struct usbhsg_gpriv *gpriv =usbhsg_priv_to_gpriv (priv);struct usbhs_mod *mod =usbhs_mod_get_current (priv); -struct usbhsg_uep *dcp =usbhsg_gpriv_to_dcp (gpriv); +struct usbhsg_uep *uep;struct device *dev =usbhs_priv_to_dev (priv);unsigned long flags; -int ret =0 ; +int ret =0 , i;/******************** spin lock ********************/ usbhs_lock (priv, flags);
@@ -887,7 +901,9 @@ static int usbhsg_try_stop(struct usbhs_usbhs_sys_set_test_mode (priv,0 );usbhs_sys_function_ctrl (priv,0 ); -usbhsg_ep_disable (&dcp->ep); +/* disable all eps */ +usbhsg_for_each_uep_with_dcp (uep, gpriv, i) +usbhsg_ep_disable (&uep->ep);dev_dbg (dev,"stop gadget\n" );
@@ -1069,6 +1085,7 @@ int usbhs_mod_gadget_probe(struct usbhs_ ret = -ENOMEM ; goto usbhs_mod_gadget_probe_err_gpriv; } +spin_lock_init (&uep->lock); gpriv->transceiver =usb_get_phy (USB_PHY_TYPE_UNDEFINED ); dev_info(dev, "%stransceiver found\n",
Greg Kroah-Hartman
maintainerPATCH 74/196 HID: multitouch: do not blindly set EV_KEY or EV_ABS bits
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
commit 4cf56a89c696e66d10612b43b7e95852611e76c2 upstream.
Now that input core insists on having dev->absinfo when device claims to generate EV_ABS in its dev->evbit, we should not be blindly setting that bit.
The code in question might have been needed before input_set_abs_params() started setting EV_ABS in device's evbit, but not anymore, and is now breaking devices such as SMART SPNL-6075 Touchscreen.
--- drivers/hid/hid-multitouch.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/hid/hid-multitouch.c +4 -12
@@ -595,16 +595,6 @@ static int mt_touch_input_mapping(structreturn 0 ; } -static int mt_touch_input_mapped (struct hid_device *hdev,struct hid_input *hi, -struct hid_field *field,struct hid_usage *usage, -unsigned long **bit,int *max) -{ -if (usage->type ==EV_KEY || usage->type ==EV_ABS ) -set_bit (usage->type, hi->input->evbit); - -return -1 ; -} -static int mt_compute_slot (struct mt_device *td,struct input_dev *input) {__s32 quirks = td->mtclass.quirks;
@@ -905,8 +895,10 @@ static int mt_input_mapped(struct hid_dereturn 0 ;if (field->application ==HID_DG_TOUCHSCREEN || - field->application ==HID_DG_TOUCHPAD ) -return mt_touch_input_mapped (hdev, hi, field, usage, bit, max); + field->application ==HID_DG_TOUCHPAD ) { +/* We own these mappings, tell hid-input to ignore them */ +return -1 ; + }/* let hid-core decide for the others */ return 0 ;
Greg Kroah-Hartman
maintainerPATCH 75/196 md: dont use flush_signals in userspace processes
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit f9c79bc05a2a91f4fba8bfd653579e066714b1ec upstream.
The function flush_signals clears all pending signals for the process. It may be used by kernel threads when we need to prepare a kernel thread for responding to signals. However using this function for an userspaces processes is incorrect - clearing signals without the program expecting it can cause misbehavior.
The raid1 and raid5 code uses flush_signals in its request routine because it wants to prepare for an interruptible wait. This patch drops flush_signals and uses sigprocmask instead to block all signals (including SIGKILL) around the schedule() call. The signals are not lost, but the schedule() call won't respond to them.
--- drivers/md/raid1.c | 5 ++++- drivers/md/raid5.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/md/raid1.c +4 -1
@@ -1335,7 +1335,7 @@ static void raid1_write_request(struct m*/ DEFINE_WAIT (w);for (;;) { -flush_signals (current); +sigset_t full, old;prepare_to_wait (&conf->wait_barrier, &w,TASK_INTERRUPTIBLE ); if (bio_end_sector(bio) <= mddev->suspend_lo ||
@@ -1345,7 +1345,10 @@ static void raid1_write_request(struct m bio->bi_iter.bi_sector, bio_end_sector(bio)))) break; +sigfillset (&full); +sigprocmask (SIG_BLOCK , &full, &old);schedule (); +sigprocmask (SIG_SETMASK , &old,NULL ); }finish_wait (&conf->wait_barrier, &w); }
drivers/md/raid5.c +4 -1
@@ -5693,12 +5693,15 @@ static void raid5_make_request(struct md* userspace, we want an interruptible * wait. */ -flush_signals (current);prepare_to_wait (&conf->wait_for_overlap, &w,TASK_INTERRUPTIBLE );if (logical_sector >= mddev->suspend_lo && logical_sector < mddev->suspend_hi) { +sigset_t full, old; +sigfillset (&full); +sigprocmask (SIG_BLOCK , &full, &old);schedule (); +sigprocmask (SIG_SETMASK , &old,NULL ); do_prepare = true; } goto retry;
Greg Kroah-Hartman
maintainerPATCH 76/196 md: fix deadlock between mddev_suspend() and md_write_start()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
commit cc27b0c78c79680d128dbac79de0d40556d041bb upstream.
If mddev_suspend() races with md_write_start() we can deadlock with mddev_suspend() waiting for the request that is currently in md_write_start() to complete the ->make_request() call, and md_write_start() waiting for the metadata to be updated to mark the array as 'dirty'.
As metadata updates done by md_check_recovery() only happen then the mddev_lock() can be claimed, and as mddev_suspend() is often called with the lock held, these threads wait indefinitely for each other.
We fix this by having md_write_start() abort if mddev_suspend() is happening, and ->make_request() aborts if md_write_start() aborted.md_make_request() can detect this abort, decrease the ->active_io count, and wait for mddev_suspend().
Fix: 68866e425be2(MD: no sync IO while suspended)
--- drivers/md/faulty.c | 5 +++-- drivers/md/linear.c | 7 ++++--- drivers/md/md.c | 22 +++++++++++++++++----- drivers/md/md.h | 4 ++-- drivers/md/multipath.c | 8 ++++---- drivers/md/raid0.c | 7 ++++--- drivers/md/raid1.c | 11 +++++++---- drivers/md/raid10.c | 10 ++++++---- drivers/md/raid5.c | 17 +++++++++-------- 9 files changed, 56 insertions(+), 35 deletions(-)
drivers/md/faulty.c +3 -2
@@ -170,7 +170,7 @@ static void add_sector(struct faulty_con conf->nfaults = n+1 ; } -static void faulty_make_request (struct mddev *mddev,struct bio *bio) +static bool faulty_make_request (struct mddev *mddev,struct bio *bio) {struct faulty_conf *conf = mddev->private;int failit =0 ;
@@ -182,7 +182,7 @@ static void faulty_make_request(struct m* just fail immediately */ bio_io_error (bio); -return ; +return true; } if (check_sector(conf, bio->bi_iter.bi_sector,
@@ -224,6 +224,7 @@ static void faulty_make_request(struct m bio->bi_bdev = conf->rdev->bdev;generic_make_request (bio); +return true; }static void faulty_status (struct seq_file *seq,struct mddev *mddev)
drivers/md/linear.c +4 -3
@@ -245,7 +245,7 @@ static void linear_free(struct mddev *mdkfree (conf); } -static void linear_make_request (struct mddev *mddev,struct bio *bio) +static bool linear_make_request (struct mddev *mddev,struct bio *bio) {char b[BDEVNAME_SIZE ];struct dev_info *tmp_dev;
@@ -254,7 +254,7 @@ static void linear_make_request(struct mif (unlikely (bio->bi_opf &REQ_PREFLUSH )) {md_flush_request (mddev, bio); -return ; +return true; } tmp_dev =which_dev (mddev, bio_sector);
@@ -292,7 +292,7 @@ static void linear_make_request(struct mmddev_check_write_zeroes (mddev, bio);generic_make_request (bio); } -return ; +return true; out_of_bounds: pr_err("md/linear:%s: make_request: Sector %llu out of bounds on dev %s: %llu sectors, offset %llu\n",
@@ -302,6 +302,7 @@ out_of_bounds: (unsigned long long )tmp_dev->rdev->sectors, (unsigned long long)start_sector);bio_io_error (bio); +return true; }static void linear_status (struct seq_file *seq,struct mddev *mddev)
drivers/md/md.c +17 -5
@@ -277,7 +277,7 @@ static blk_qc_t md_make_request(struct rbio_endio (bio);return BLK_QC_T_NONE ; } -smp_rmb ();/* Ensure implications of 'active' are visible */ +check_suspended:rcu_read_lock ();if (mddev->suspended) {DEFINE_WAIT (__wait);
@@ -302,7 +302,11 @@ static blk_qc_t md_make_request(struct r sectors =bio_sectors (bio);/* bio could be mergeable after passing to underlayer */ bio->bi_opf &= ~REQ_NOMERGE ; - mddev->pers->make_request (mddev, bio); +if (!mddev->pers->make_request (mddev, bio)) { +atomic_dec (&mddev->active_io); +wake_up (&mddev->sb_wait); + goto check_suspended; + } cpu =part_stat_lock ();part_stat_inc (cpu, &mddev->gendisk->part0, ios[rw]);
@@ -327,6 +331,7 @@ void mddev_suspend(struct mddev *mddev)if (mddev->suspended++)return ;synchronize_rcu (); +wake_up (&mddev->sb_wait);wait_event (mddev->sb_wait,atomic_read (&mddev->active_io) ==0 ); mddev->pers->quiesce (mddev,1 );
@@ -7950,12 +7955,14 @@ EXPORT_SYMBOL(md_done_sync);* If we need to update some array metadata (e.g. 'active' flag * in superblock) before writing, schedule a superblock update * and wait for it to complete. +* A return value of 'false' means that the write wasn't recorded +* and cannot proceed as the array is being suspend. */ -void md_write_start (struct mddev *mddev,struct bio *bi) +bool md_write_start (struct mddev *mddev,struct bio *bi) {int did_change =0 ;if (bio_data_dir (bi) !=WRITE ) -return ; +return true;BUG_ON (mddev->ro ==1 );if (mddev->ro ==2 ) {
@@ -7987,7 +7994,12 @@ void md_write_start(struct mddev *mddev,if (did_change)sysfs_notify_dirent_safe (mddev->sysfs_state);wait_event (mddev->sb_wait, - !test_bit (MD_SB_CHANGE_PENDING , &mddev->sb_flags)); + !test_bit (MD_SB_CHANGE_PENDING , &mddev->sb_flags) && !mddev->suspended); +if (test_bit (MD_SB_CHANGE_PENDING , &mddev->sb_flags)) { +percpu_ref_put (&mddev->writes_pending); +return false; + } +return true; }EXPORT_SYMBOL (md_write_start);
drivers/md/md.h +2 -2
@@ -510,7 +510,7 @@ struct md_personalityint level;struct list_head list;struct module *owner; -void (*make_request)(struct mddev *mddev,struct bio *bio); +bool (*make_request)(struct mddev *mddev,struct bio *bio);int (*run)(struct mddev *mddev);void (*free)(struct mddev *mddev,void *priv);void (*status)(struct seq_file *seq,struct mddev *mddev);
@@ -649,7 +649,7 @@ extern void md_wakeup_thread(struct md_textern void md_check_recovery (struct mddev *mddev);extern void md_reap_sync_thread (struct mddev *mddev);extern int mddev_init_writes_pending (struct mddev *mddev); -extern void md_write_start (struct mddev *mddev,struct bio *bi); +extern bool md_write_start (struct mddev *mddev,struct bio *bi);extern void md_write_inc (struct mddev *mddev,struct bio *bi);extern void md_write_end (struct mddev *mddev);extern void md_done_sync (struct mddev *mddev,int blocks,int ok);
drivers/md/multipath.c +4 -4
@@ -106,7 +106,7 @@ static void multipath_end_request(structrdev_dec_pending (rdev, conf->mddev); } -static void multipath_make_request (struct mddev *mddev,struct bio * bio) +static bool multipath_make_request (struct mddev *mddev,struct bio * bio) {struct mpconf *conf = mddev->private;struct multipath_bh * mp_bh;
@@ -114,7 +114,7 @@ static void multipath_make_request(strucif (unlikely (bio->bi_opf &REQ_PREFLUSH )) {md_flush_request (mddev, bio); -return ; +return true; } mp_bh =mempool_alloc (conf->pool,GFP_NOIO );
@@ -126,7 +126,7 @@ static void multipath_make_request(strucif (mp_bh->path <0 ) {bio_io_error (bio);mempool_free (mp_bh, conf->pool); -return ; +return true; } multipath = conf->multipaths + mp_bh->path;
@@ -141,7 +141,7 @@ static void multipath_make_request(strucmddev_check_writesame (mddev, &mp_bh->bio);mddev_check_write_zeroes (mddev, &mp_bh->bio);generic_make_request (&mp_bh->bio); -return ; +return true; }static void multipath_status (struct seq_file *seq,struct mddev *mddev)
drivers/md/raid0.c +4 -3
@@ -548,7 +548,7 @@ static void raid0_handle_discard(structbio_endio (bio); } -static void raid0_make_request (struct mddev *mddev,struct bio *bio) +static bool raid0_make_request (struct mddev *mddev,struct bio *bio) {struct strip_zone *zone;struct md_rdev *tmp_dev;
@@ -559,12 +559,12 @@ static void raid0_make_request(struct mdif (unlikely (bio->bi_opf &REQ_PREFLUSH )) {md_flush_request (mddev, bio); -return ; +return true; }if (unlikely ((bio_op (bio) ==REQ_OP_DISCARD ))) {raid0_handle_discard (mddev, bio); -return ; +return true; } bio_sector = bio->bi_iter.bi_sector;
@@ -599,6 +599,7 @@ static void raid0_make_request(struct mdmddev_check_writesame (mddev, bio);mddev_check_write_zeroes (mddev, bio);generic_make_request (bio); +return true; }static void raid0_status (struct seq_file *seq,struct mddev *mddev)
drivers/md/raid1.c +7 -4
@@ -1321,7 +1321,6 @@ static void raid1_write_request(struct m* Continue immediately if no resync is active currently. */ -md_write_start (mddev, bio);/* wait on superblock update early */ if ((bio_end_sector(bio) > mddev->suspend_lo && bio->bi_iter.bi_sector < mddev->suspend_hi) ||
@@ -1553,13 +1552,13 @@ static void raid1_write_request(struct mwake_up (&conf->wait_barrier); } -static void raid1_make_request (struct mddev *mddev,struct bio *bio) +static bool raid1_make_request (struct mddev *mddev,struct bio *bio) {sector_t sectors;if (unlikely (bio->bi_opf &REQ_PREFLUSH )) {md_flush_request (mddev, bio); -return ; +return true; }/*
@@ -1574,8 +1573,12 @@ static void raid1_make_request(struct mdif (bio_data_dir (bio) ==READ )raid1_read_request (mddev, bio, sectors,NULL ); -else +else { +if (!md_write_start (mddev,bio)) +return false;raid1_write_request (mddev, bio, sectors); + } +return true; }static void raid1_status (struct seq_file *seq,struct mddev *mddev)
drivers/md/raid10.c +6 -4
@@ -1303,8 +1303,6 @@ static void raid10_write_request(structsector_t sectors;int max_sectors; -md_write_start (mddev, bio); -/* * Register the new request and wait if the reconstruction * thread has put up a bar for new requests.
@@ -1525,7 +1523,7 @@ static void __make_request(struct mddevraid10_write_request (mddev, bio, r10_bio); } -static void raid10_make_request (struct mddev *mddev,struct bio *bio) +static bool raid10_make_request (struct mddev *mddev,struct bio *bio) {struct r10conf *conf = mddev->private;sector_t chunk_mask = (conf->geo.chunk_mask & conf->prev.chunk_mask);
@@ -1534,9 +1532,12 @@ static void raid10_make_request(struct mif (unlikely (bio->bi_opf &REQ_PREFLUSH )) {md_flush_request (mddev, bio); -return ; +return true; } +if (!md_write_start (mddev, bio)) +return false; +/* * If this request crosses a chunk boundary, we need to split * it.
@@ -1553,6 +1554,7 @@ static void raid10_make_request(struct m/* In case raid10d snuck in to freeze_array */ wake_up (&conf->wait_barrier); +return true; }static void raid10_status (struct seq_file *seq,struct mddev *mddev)
drivers/md/raid5.c +9 -8
@@ -5479,7 +5479,6 @@ static void make_discard_request(struct last_sector = bi->bi_iter.bi_sector + (bi->bi_iter.bi_size>>9 ); bi->bi_next =NULL ; -md_write_start (mddev, bi); stripe_sectors = conf->chunk_sectors * (conf->raid_disks - conf->max_degraded);
@@ -5549,11 +5548,10 @@ static void make_discard_request(structrelease_stripe_plug (mddev, sh); } -md_write_end (mddev);bio_endio (bi); } -static void raid5_make_request (struct mddev *mddev,struct bio * bi) +static bool raid5_make_request (struct mddev *mddev,struct bio * bi) {struct r5conf *conf = mddev->private;int dd_idx;
@@ -5569,10 +5567,10 @@ static void raid5_make_request(struct mdint ret =r5l_handle_flush_request (conf->log, bi);if (ret ==0 ) -return ; +return true;if (ret == -ENODEV ) {md_flush_request (mddev, bi); -return ; +return true; }/* ret == -EAGAIN, fallback */ /*
@@ -5582,6 +5580,8 @@ static void raid5_make_request(struct md do_flush = bi->bi_opf &REQ_PREFLUSH ; } +if (!md_write_start (mddev, bi)) +return false;/* * If array is degraded, better not do chunk aligned read because * later we might have to read it again in order to reconstruct
@@ -5591,18 +5591,18 @@ static void raid5_make_request(struct md mddev->reshape_position == MaxSector) { bi =chunk_aligned_read (mddev, bi);if (!bi) -return ; +return true; }if (unlikely (bio_op (bi) ==REQ_OP_DISCARD )) {make_discard_request (mddev, bi); -return ; +md_write_end (mddev); +return true; } logical_sector = bi->bi_iter.bi_sector & ~((sector_t )STRIPE_SECTORS -1 ); last_sector =bio_end_sector (bi); bi->bi_next =NULL ; -md_write_start (mddev, bi);prepare_to_wait (&conf->wait_for_overlap, &w,TASK_UNINTERRUPTIBLE );for (;logical_sector < last_sector; logical_sector +=STRIPE_SECTORS ) {
@@ -5743,6 +5743,7 @@ static void raid5_make_request(struct mdif (rw ==WRITE )md_write_end (mddev);bio_endio (bi); +return true; }static sector_t raid5_size (struct mddev *mddev,sector_t sectors,int raid_disks);
Greg Kroah-Hartman
maintainerPATCH 78/196 cx88: Fix regression in initial video standard setting
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Devin Heitmueller <[email protected]>
commit 4e0973a918b9a42e217093f078e04a61e5dd95a5 upstream.
Setting initial standard at the top of cx8800_initdev would cause the first call to cx88_set_tvnorm() to return without programming any registers (leaving the driver saying it's set to NTSC but the hardware isn't programmed). Even worse, any subsequent attempt to explicitly set it to NTSC-M will return success but actually fail to program the underlying registers unless first changing the standard to something other than NTSC-M.
Set the initial standard later in the process, and make sure the field is zero at the beginning to ensure that the call always goes through.
This regression was introduced in the following commit:
commit ccd6f1d488e7 ("[media] cx88: move width, height and field to core struct")
Author: Hans Verkuil <[email protected]>
[media] cx88: move width, height and field to core struct
--- drivers/media/pci/cx88/cx88-cards.c | 9 ++++++++- drivers/media/pci/cx88/cx88-video.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/media/pci/cx88/cx88-cards.c +8 -1
@@ -3681,7 +3681,14 @@ struct cx88_core *cx88_core_create(struc core->nr = nr;sprintf (core->name,"cx88[%d]" , core->nr); - core->tvnorm =V4L2_STD_NTSC_M ; +/* +* Note: Setting initial standard here would cause first call to +* cx88_set_tvnorm() to return without programming any registers. Leave +* it blank for at this point and it will get set later in +* cx8800_initdev() +*/ + core->tvnorm =0 ; + core->width =320 ; core->height =240 ; core->field =V4L2_FIELD_INTERLACED ;
drivers/media/pci/cx88/cx88-video.c +1 -1
@@ -1435,7 +1435,7 @@ static int cx8800_initdev(struct pci_dev/* initial device configuration */ mutex_lock (&core->lock); -cx88_set_tvnorm (core, core->tvnorm); +cx88_set_tvnorm (core,V4L2_STD_NTSC_M );v4l2_ctrl_handler_setup (&core->video_hdl);v4l2_ctrl_handler_setup (&core->audio_hdl);cx88_video_mux (core,0 );
Greg Kroah-Hartman
maintainerPATCH 80/196 tools/testing/nvdimm: fix nfit_test buffer overflow
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yasunori Goto <[email protected]>
commit a117699c6c4a4b1b4e90ed51e393590986567cb4 upstream.
The root cause of panic is the num_pm of nfit_test1 is wrong. Though 1 is specified for num_pm at nfit_test_init(), it must be 2, because nfit_test1->spa_set[] array has 2 elements.
Since the array is smaller than expected, the driver breaks other area. (it is often the link list of devres).
As a result, panic occurs like the following example.
CPU: 4 PID: 2233 Comm: lt-libndctl Tainted: G O 4.12.0-rc1+ #12
RIP: 0010:__list_del_entry_valid+0x6c/0xa0
Call Trace:
release_nodes+0x76/0x260
devres_release_all+0x3c/0x50
device_release_driver_internal+0x159/0x200
device_release_driver+0x12/0x20
bus_remove_device+0xfd/0x170
device_del+0x1e8/0x330
platform_device_del+0x28/0x90
platform_device_unregister+0x12/0x30
nfit_test_exit+0x2a/0x93b [nfit_test]--- tools/testing/nvdimm/test/nfit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/nvdimm/test/nfit.c +1 -1
@@ -1943,7 +1943,7 @@ static __init int nfit_test_init(void) nfit_test->setup = nfit_test0_setup;break ;case 1 : - nfit_test->num_pm =1 ; + nfit_test->num_pm =2 ; nfit_test->dcr_idx =NUM_DCR ; nfit_test->num_dcr =2 ; nfit_test->alloc = nfit_test1_alloc;
Greg Kroah-Hartman
maintainerPATCH 81/196 libnvdimm, btt: fix btt_rw_page not returning errors
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vishal Verma <[email protected]>
commit c13c43d54f2c6a3be1c675766778ac1ad8dfbfcc upstream.
btt_rw_page was not propagating errors frm btt_do_bvec, resulting in any IO errors via the rw_page path going unnoticed. the pmem driver recently fixed this in e10624f pmem: fail io-requests to known bad blocks but same problem in BTT went neglected.
--- drivers/nvdimm/btt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/nvdimm/btt.c +6 -3
@@ -1248,10 +1248,13 @@ static int btt_rw_page(struct block_devi struct page *page, bool is_write) {struct btt *btt = bdev->bd_disk->private_data; +int rc; -btt_do_bvec (btt,NULL , page,PAGE_SIZE ,0 , is_write, sector); -page_endio (page, is_write,0 ); -return 0 ; + rc =btt_do_bvec (btt,NULL , page,PAGE_SIZE ,0 , is_write, sector); +if (rc ==0 ) +page_endio (page, is_write,0 ); + +return rc; }
Greg Kroah-Hartman
maintainerPATCH 82/196 libnvdimm: fix the clear-error check in nsio_rw_bytes
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vishal Verma <[email protected]>
commit 7e5a21dfe5524a85705d3bc7b540c849cc13e9a1 upstream.
A leftover from the 'bandaid' fix that disabled BTT error clearing in rw_bytes resulted in an incorrect check. After we converted these checks over to use the NVDIMM_IO_ATOMIC flag, the ndns->claim check was both redundant, and incorrect. Remove it.
--- drivers/nvdimm/claim.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/nvdimm/claim.c +1 -2
@@ -260,8 +260,7 @@ static int nsio_rw_bytes(struct nd_names* work around this collision. */ if (IS_ALIGNED (offset,512 ) &&IS_ALIGNED (size,512 ) - && !(flags &NVDIMM_IO_ATOMIC ) - && !ndns->claim) { + && !(flags &NVDIMM_IO_ATOMIC )) {long cleared; cleared = nvdimm_clear_poison(&ndns->dev,
Greg Kroah-Hartman
maintainerPATCH 83/196 libnvdimm: fix badblock range handling of ARS range
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Toshi Kani <[email protected]>
commit 4e3f0701f25ab194c5362576b1146a1e6cc6c2e7 upstream.
__add_badblock_range() does not account sector alignment when it sets 'num_sectors'. Therefore, an ARS error record range spanning across two sectors is set to a single sector length, which leaves the 2nd sector unprotected.
Change __add_badblock_range() to set 'num_sectors' properly.
--- drivers/nvdimm/core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/nvdimm/core.c +4 -3
@@ -421,14 +421,15 @@ static void set_badblock(struct badblockstatic void __add_badblock_range (struct badblocks *bb,u64 ns_offset,u64 len) {const unsigned int sector_size =512 ; -sector_t start_sector; +sector_t start_sector, end_sector;u64 num_sectors;u32 rem; start_sector =div_u64 (ns_offset, sector_size); - num_sectors =div_u64_rem (len, sector_size, &rem); + end_sector =div_u64_rem (ns_offset + len, sector_size, &rem);if (rem) - num_sectors++; + end_sector++; + num_sectors = end_sector - start_sector;if (unlikely (num_sectors > (u64 )INT_MAX )) {u64 remaining = num_sectors;
Greg Kroah-Hartman
maintainerPATCH 84/196 ext2: Dont clear SGID when inheriting ACLs
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit a992f2d38e4ce17b8c7d1f7f67b2de0eebdea069 upstream.
When new directory 'DIR1' is created in a directory 'DIR0' with SGID bit set, DIR1 is expected to have SGID bit set (and owning group equal to the owning group of 'DIR0'). However when 'DIR0' also has some default ACLs that 'DIR1' inherits, setting these ACLs will result in SGID bit on 'DIR1' to get cleared if user is not member of the owning group.
Fix the problem by creating __ext2_set_acl() function that does not call posix_acl_update_mode() and use it when inheriting ACLs. That prevents SGID bit clearing and the mode has been properly set by posix_acl_create() anyway.
--- fs/ext2/acl.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
fs/ext2/acl.c +22 -14
@@ -175,11 +175,8 @@ ext2_get_acl(struct inode *inode, int tyreturn acl; } -/* -* inode->i_mutex: down -*/ -int -ext2_set_acl (struct inode *inode,struct posix_acl *acl,int type) +static int +__ext2_set_acl (struct inode *inode,struct posix_acl *acl,int type) {int name_index;void *value =NULL ;
@@ -189,13 +186,6 @@ ext2_set_acl(struct inode *inode, structswitch (type) {case ACL_TYPE_ACCESS : name_index =EXT2_XATTR_INDEX_POSIX_ACL_ACCESS ; -if (acl) { - error =posix_acl_update_mode (inode, &inode->i_mode, &acl); -if (error) -return error; - inode->i_ctime =current_time (inode); -mark_inode_dirty (inode); - }break ;case ACL_TYPE_DEFAULT :
@@ -222,6 +212,24 @@ ext2_set_acl(struct inode *inode, struct }/* +* inode->i_mutex: down +*/ +int +ext2_set_acl (struct inode *inode,struct posix_acl *acl,int type) +{ +int error; + +if (type ==ACL_TYPE_ACCESS && acl) { + error =posix_acl_update_mode (inode, &inode->i_mode, &acl); +if (error) +return error; + inode->i_ctime =current_time (inode); +mark_inode_dirty (inode); + } +return __ext2_set_acl (inode, acl, type); +} + +/* * Initialize the ACLs of a new inode. Called from ext2_new_inode. * * dir->i_mutex: down
@@ -238,12 +246,12 @@ ext2_init_acl(struct inode *inode, strucreturn error;if (default_acl) { - error =ext2_set_acl (inode, default_acl,ACL_TYPE_DEFAULT ); + error =__ext2_set_acl (inode, default_acl,ACL_TYPE_DEFAULT );posix_acl_release (default_acl); }if (acl) {if (!error) - error =ext2_set_acl (inode, acl,ACL_TYPE_ACCESS ); + error =__ext2_set_acl (inode, acl,ACL_TYPE_ACCESS );posix_acl_release (acl); }return error;
Greg Kroah-Hartman
maintainerPATCH 85/196 dm raid: stop using BUG() in __rdev_sectors()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heinz Mauelshagen <[email protected]>
commit 4d49f1b4a1fcab16b6dd1c79ef14f2b6531d50a6 upstream.
Return 0 rather than BUG() if __rdev_sectors() fails and catch invalid rdev size in the constructor.
--- drivers/md/dm-raid.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/md/dm-raid.c +10 -3
@@ -1571,7 +1571,7 @@ static sector_t __rdev_sectors(struct rareturn rdev->sectors; } -BUG ();/* Constructor ensures we got some. */ +return 0 ; }/* Calculate the sectors per device and per array used for @rs */
@@ -2941,7 +2941,7 @@ static int raid_ctr(struct dm_target *tibool resize;struct raid_type *rt;unsigned int num_raid_params, num_raid_devs; -sector_t calculated_dev_sectors; +sector_t calculated_dev_sectors, rdev_sectors;struct raid_set *rs =NULL ;const char *arg;struct rs_layout rs_layout;
@@ -3017,7 +3017,14 @@ static int raid_ctr(struct dm_target *tiif (r) goto bad; - resize = calculated_dev_sectors !=__rdev_sectors (rs); + rdev_sectors =__rdev_sectors (rs); +if (!rdev_sectors) { + ti->error ="Invalid rdev size" ; + r = -EINVAL ; + goto bad; + } + + resize = calculated_dev_sectors != rdev_sectors;INIT_WORK (&rs->md.event_work, do_table_event); ti->private = rs;
Greg Kroah-Hartman
maintainerPATCH 86/196 Raid5 should update rdev->sectors after reshape
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiao Ni <[email protected]>
commit b5d27718f38843a74552e9a93d32e2391fd3999f upstream.
The raid5 md device is created by the disks which we don't use the total size. For example, the size of the device is 5G and it just uses 3G of the devices to create one raid5 device. Then change the chunksize and wait reshape to finish. After reshape finishing stop the raid and assemble it again. It fails.
mdadm -CR /dev/md0 -l5 -n3 /dev/loop[0-2] --size=3G --chunk=32 --assume-clean mdadm /dev/md0 --grow --chunk=64
wait reshape to finish
mdadm -S /dev/md0
mdadm -As
The error messages:
[197519.814302] md: loop1 does not have a valid v1.2 superblock, not importing! [197519.821686] md: md_import_device returned -22
After reshape the data offset is changed. It selects backwards direction in this condition. In function super_1_load it compares the available space of the underlying device with sb->data_size. The new data offset gets bigger after reshape. So super_1_load returns -EINVAL. rdev->sectors is updated in md_finish_reshape. Then sb->data_size is set in super_1_sync based on rdev->sectors. So add md_finish_reshape in end_reshape.
--- drivers/md/raid5.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/md/raid5.c +1 -3
@@ -7951,12 +7951,10 @@ static void end_reshape(struct r5conf *c {if (!test_bit (MD_RECOVERY_INTR , &conf->mddev->recovery)) { -struct md_rdev *rdev;spin_lock_irq (&conf->device_lock); conf->previous_raid_disks = conf->raid_disks; -rdev_for_each (rdev, conf->mddev) - rdev->data_offset = rdev->new_data_offset; +md_finish_reshape (conf->mddev);smp_wmb (); conf->reshape_progress = MaxSector; conf->mddev->reshape_position = MaxSector;
Greg Kroah-Hartman
maintainerPATCH 87/196 s390/syscalls: Fix out of bounds arguments access
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
commit c46fc0424ced3fb71208e72bd597d91b9169a781 upstream.
Zorro reported following crash while having enabled syscall tracing (CONFIG_FTRACE_SYSCALLS):
Unable to handle kernel pointer dereference at virtual ... Oops: 0011 [#1] SMP DEBUG_PAGEALLOC
SNIP
Call Trace: ([<000000000024d79c>] ftrace_syscall_enter+0xec/0x1d8) [<00000000001099c6>] do_syscall_trace_enter+0x236/0x2f8 [<0000000000730f1c>] sysc_tracesys+0x1a/0x32 [<000003fffcf946a2>] 0x3fffcf946a2 INFO: lockdep is turned off. Last Breaking-Event-Address: [<000000000022dd44>] rb_event_data+0x34/0x40 ---[ end trace 8c795f86b1b3f7b9 ]---
The crash happens in syscall_get_arguments function for syscalls with zero arguments, that will try to access first argument (args[0]) in event entry, but it's not allocated.
Bail out of there are no arguments.
--- arch/s390/include/asm/syscall.h | 6 ++++++ 1 file changed, 6 insertions(+)
arch/s390/include/asm/syscall.h +6 -0
@@ -64,6 +64,12 @@ static inline void syscall_get_arguments {unsigned long mask =-1UL ; +/* +* No arguments for this syscall, there's nothing to do. +*/ +if (!n) +return ; +BUG_ON (i + n >6 );#ifdef CONFIG_COMPAT if (test_tsk_thread_flag (task,TIF_31BIT ))
Greg Kroah-Hartman
maintainerPATCH 88/196 drm/amdgpu/gfx8: drop per-APU CU limits
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 943c05bdb53da273c43ec44eec37c6a70409b5e9 upstream.
Always use the max for the family rather than the per sku limits. This makes sure the mask is always the max size to avoid reporting the wrong number of CUs.
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 71 ---------------------------------- 1 file changed, 2 insertions(+), 69 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2 -69
@@ -1907,46 +1907,7 @@ static int gfx_v8_0_gpu_early_init(struc adev->gfx.config.max_tile_pipes =2 ; adev->gfx.config.max_sh_per_se =1 ; adev->gfx.config.max_backends_per_se =2 ; - -switch (adev->pdev->revision) { -case 0xc4 : -case 0x84 : -case 0xc8 : -case 0xcc : -case 0xe1 : -case 0xe3 : -/* B10 */ - adev->gfx.config.max_cu_per_sh =8 ; -break ; -case 0xc5 : -case 0x81 : -case 0x85 : -case 0xc9 : -case 0xcd : -case 0xe2 : -case 0xe4 : -/* B8 */ - adev->gfx.config.max_cu_per_sh =6 ; -break ; -case 0xc6 : -case 0xca : -case 0xce : -case 0x88 : -case 0xe6 : -/* B6 */ - adev->gfx.config.max_cu_per_sh =6 ; -break ; -case 0xc7 : -case 0x87 : -case 0xcb : -case 0xe5 : -case 0x89 : -default : -/* B4 */ - adev->gfx.config.max_cu_per_sh =4 ; -break ; - } - + adev->gfx.config.max_cu_per_sh =8 ; adev->gfx.config.max_texture_channel_caches =2 ; adev->gfx.config.max_gprs =256 ; adev->gfx.config.max_gs_threads =32 ;
@@ -1963,35 +1924,7 @@ static int gfx_v8_0_gpu_early_init(struc adev->gfx.config.max_tile_pipes =2 ; adev->gfx.config.max_sh_per_se =1 ; adev->gfx.config.max_backends_per_se =1 ; - -switch (adev->pdev->revision) { -case 0x80 : -case 0x81 : -case 0xc0 : -case 0xc1 : -case 0xc2 : -case 0xc4 : -case 0xc8 : -case 0xc9 : -case 0xd6 : -case 0xda : -case 0xe9 : -case 0xea : - adev->gfx.config.max_cu_per_sh =3 ; -break ; -case 0x83 : -case 0xd0 : -case 0xd1 : -case 0xd2 : -case 0xd4 : -case 0xdb : -case 0xe1 : -case 0xe2 : -default : - adev->gfx.config.max_cu_per_sh =2 ; -break ; - } - + adev->gfx.config.max_cu_per_sh =3 ; adev->gfx.config.max_texture_channel_caches =2 ; adev->gfx.config.max_gprs =256 ; adev->gfx.config.max_gs_threads =16 ;
Greg Kroah-Hartman
maintainerPATCH 97/196 drm/etnaviv: Expose our reservation object when exporting a dmabuf.
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Anholt <[email protected]>
commit 8555137e26618490cbeb12c243818539875d12f4 upstream.
Without this, polling on the dma-buf (and presumably other devices synchronizing against our rendering) would return immediately, even while the BO was busy.
--- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 +++++++ 3 files changed, 9 insertions(+)
drivers/gpu/drm/etnaviv/etnaviv_drv.c +1 -0
@@ -495,6 +495,7 @@ static struct drm_driver etnaviv_drm_dri .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import, + .gem_prime_res_obj = etnaviv_gem_prime_res_obj, .gem_prime_pin = etnaviv_gem_prime_pin, .gem_prime_unpin = etnaviv_gem_prime_unpin, .gem_prime_get_sg_table = etnaviv_gem_prime_get_sg_table,
drivers/gpu/drm/etnaviv/etnaviv_drv.h +1 -0
@@ -80,6 +80,7 @@ void *etnaviv_gem_prime_vmap(struct drm_void etnaviv_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr);int etnaviv_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma); +struct reservation_object *etnaviv_gem_prime_res_obj (struct drm_gem_object *obj);struct drm_gem_object *etnaviv_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg);int etnaviv_gem_prime_pin (struct drm_gem_object *obj);
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +7 -0
@@ -150,3 +150,10 @@ fail:return ERR_PTR (ret); } + +struct reservation_object *etnaviv_gem_prime_res_obj (struct drm_gem_object *obj) +{ +struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj); + +return etnaviv_obj->resv; +}
Greg Kroah-Hartman
maintainerPATCH 98/196 ipmi: use rcu lock around call to intf->handlers->sender()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Camuso <[email protected]>
commit cdea46566bb21ce309725a024208322a409055cc upstream.
A vendor with a system having more than 128 CPUs occasionally encounters the following crash during shutdown. This is not an easily reproduceable event, but the vendor was able to provide the following analysis of the crash, which exhibits the same footprint each time.
crash> bt
PID: 0 TASK: ffff88017c70ce70 CPU: 5 COMMAND: "swapper/5"
#0 [ffff88085c143ac8] machine_kexec at ffffffff81059c8b #1 [ffff88085c143b28] __crash_kexec at ffffffff811052e2 #2 [ffff88085c143bf8] crash_kexec at ffffffff811053d0 #3 [ffff88085c143c10] oops_end at ffffffff8168ef88
#4 [ffff88085c143c38] no_context at ffffffff8167ebb3 #5 [ffff88085c143c88] __bad_area_nosemaphore at ffffffff8167ec49 #6 [ffff88085c143cd0] bad_area_nosemaphore at ffffffff8167edb3 #7 [ffff88085c143ce0] __do_page_fault at ffffffff81691d1e #8 [ffff88085c143d40] do_page_fault at ffffffff81691ec5 #9 [ffff88085c143d70] page_fault at ffffffff8168e188
[exception RIP: unknown or invalid address]
RIP: ffffffffa053c800 RSP: ffff88085c143e28 RFLAGS: 00010206
RAX: ffff88017c72bfd8 RBX: ffff88017a8dc000 RCX: ffff8810588b5ac8
RDX: ffff8810588b5a00 RSI: ffffffffa053c800 RDI: ffff8810588b5a00
RBP: ffff88085c143e58 R8: ffff88017c70d408 R9: ffff88017a8dc000
R10: 0000000000000002 R11: ffff88085c143da0 R12: ffff8810588b5ac8
R13: 0000000000000100 R14: ffffffffa053c800 R15: ffff8810588b5a00
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
<IRQ stack>
[exception RIP: cpuidle_enter_state+82]
RIP: ffffffff81514192 RSP: ffff88017c72be50 RFLAGS: 00000202
RAX: 0000001e4c3c6f16 RBX: 000000000000f8a0 RCX: 0000000000000018
RDX: 0000000225c17d03 RSI: ffff88017c72bfd8 RDI: 0000001e4c3c6f16
RBP: ffff88017c72be78 R8: 000000000000237e R9: 0000000000000018
R10: 0000000000002494 R11: 0000000000000001 R12: ffff88017c72be20
R13: ffff88085c14f8e0 R14: 0000000000000082 R15: 0000001e4c3bb400
ORIG_RAX: ffffffffffffff10 CS: 0010 SS: 0018This is the corresponding stack trace
It has crashed because the area pointed with RIP extracted from timer element is already removed during a shutdown process.
The function is smi_timeout().
And we think ffff8810588b5a00 in RDX is a parameter struct smi_info
crash> rd ffff8810588b5a00 20
ffff8810588b5a00: ffff8810588b6000 0000000000000000 .`.X............ ffff8810588b5a10: ffff880853264400 ffffffffa05417e0 .D&S......T..... ffff8810588b5a20: 24a024a000000000 0000000000000000 .....$.$........ ffff8810588b5a30: 0000000000000000 0000000000000000 ................ ffff8810588b5a30: 0000000000000000 0000000000000000 ................ ffff8810588b5a40: ffffffffa053a040 ffffffffa053a060 @.S.....`.S..... ffff8810588b5a50: 0000000000000000 0000000100000001 ................ ffff8810588b5a60: 0000000000000000 0000000000000e00 ................ ffff8810588b5a70: ffffffffa053a580 ffffffffa053a6e0 ..S.......S..... ffff8810588b5a80: ffffffffa053a4a0 ffffffffa053a250 ..S.....P.S..... ffff8810588b5a90: 0000000500000002 0000000000000000 ................
Unfortunately the top of this area is already detroyed by someone. But because of two reasonns we think this is struct smi_info
1) The address included in between ffff8810588b5a70 and ffff8810588b5a80:
are inside of ipmi_si_intf.c see crash> module ffff88085779d2c0
2) We've found the area which point this.
It is offset 0x68 of ffff880859df4000
crash> rd ffff880859df4000 100
ffff880859df4000: 0000000000000000 0000000000000001 ................ ffff880859df4010: ffffffffa0535290 dead000000000200 .RS............. ffff880859df4020: ffff880859df4020 ffff880859df4020 @.Y.... @.Y.... ffff880859df4030: 0000000000000002 0000000000100010 ................ ffff880859df4040: ffff880859df4040 ffff880859df4040 @@.Y....@@.Y.... ffff880859df4050: 0000000000000000 0000000000000000 ................ ffff880859df4060: 0000000000000000 ffff8810588b5a00 .........Z.X.... ffff880859df4070: 0000000000000001 ffff880859df4078 [email protected]....
If we regards it as struct ipmi_smi in shutdown process it looks consistent.
The remedy for this apparent race is affixed below.
This was first introduced in 7ea0ed2b5be817 ipmi: Make the message handler easier to use for SMI interfaces where some code was moved outside of the rcu_read_lock() and the lock was not added.
--- drivers/char/ipmi/ipmi_msghandler.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/char/ipmi/ipmi_msghandler.c +5 -0
@@ -3878,6 +3878,9 @@ static void smi_recv_tasklet(unsigned lo* because the lower layer is allowed to hold locks while calling * message delivery. */ + +rcu_read_lock (); +if (!run_to_completion)spin_lock_irqsave (&intf->xmit_msgs_lock, flags);if (intf->curr_msg ==NULL && !intf->in_shutdown) {
@@ -3900,6 +3903,8 @@ static void smi_recv_tasklet(unsigned loif (newmsg) intf->handlers->sender (intf->send_info, newmsg); +rcu_read_unlock (); +handle_new_recv_msgs (intf); }
Greg Kroah-Hartman
maintainerPATCH 99/196 ipmi:ssif: Add missing unlock in error branch
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Corey Minyard <[email protected]>
commit 4495ec6d770e1bca7a04e93ac453ab6720c56c5d upstream.
When getting flags, a response to a different message would result in a deadlock because of a missing unlock. Add that unlock and a comment. Found by static analysis.
--- drivers/char/ipmi/ipmi_ssif.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/char/ipmi/ipmi_ssif.c +5 -0
@@ -761,6 +761,11 @@ static void msg_done_handler(struct ssif result, len, data[2]); }else if (data[0 ] != (IPMI_NETFN_APP_REQUEST |1 ) <<2 || data[1 ] !=IPMI_GET_MSG_FLAGS_CMD ) { +/* +* Don't abort here, maybe it was a queued +* response to a previous command. +*/ +ipmi_ssif_unlock_cond (ssif_info, flags);pr_warn (PFX "Invalid response getting flags: %x %x\n" , data[0 ], data[1 ]); }else {
Greg Kroah-Hartman
maintainerPATCH 100/196 xfs: Dont clear SGID when inheriting ACLs
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 8ba358756aa08414fa9e65a1a41d28304ed6fd7f upstream.
When new directory 'DIR1' is created in a directory 'DIR0' with SGID bit set, DIR1 is expected to have SGID bit set (and owning group equal to the owning group of 'DIR0'). However when 'DIR0' also has some default ACLs that 'DIR1' inherits, setting these ACLs will result in SGID bit on 'DIR1' to get cleared if user is not member of the owning group.
Fix the problem by calling __xfs_set_acl() instead of xfs_set_acl() when setting up inode in xfs_generic_create(). That prevents SGID bit clearing and mode is properly set by posix_acl_create() anyway. We also reorder arguments of __xfs_set_acl() to match the ordering of xfs_set_acl() to make things consistent.
--- fs/xfs/xfs_acl.c | 6 +++--- fs/xfs/xfs_acl.h | 1 + fs/xfs/xfs_iops.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-)
fs/xfs/xfs_acl.c +3 -3
@@ -170,8 +170,8 @@ xfs_get_acl(struct inode *inode, int typreturn acl; } -STATIC int -__xfs_set_acl (struct inode *inode,int type,struct posix_acl *acl) +int +__xfs_set_acl (struct inode *inode,struct posix_acl *acl,int type) {struct xfs_inode *ip =XFS_I (inode);unsigned char *ea_name;
@@ -268,5 +268,5 @@ xfs_set_acl(struct inode *inode, struct } set_acl: -return __xfs_set_acl (inode, type, acl); +return __xfs_set_acl (inode, acl, type); }
fs/xfs/xfs_acl.h +1 -0
@@ -24,6 +24,7 @@ struct posix_acl;#ifdef CONFIG_XFS_POSIX_ACL extern struct posix_acl *xfs_get_acl (struct inode *inode,int type);extern int xfs_set_acl (struct inode *inode,struct posix_acl *acl,int type); +extern int __xfs_set_acl (struct inode *inode,struct posix_acl *acl,int type);#else static inline struct posix_acl *xfs_get_acl (struct inode *inode,int type) {
fs/xfs/xfs_iops.c +2 -2
@@ -190,12 +190,12 @@ xfs_generic_create(#ifdef CONFIG_XFS_POSIX_ACL if (default_acl) { - error =xfs_set_acl (inode, default_acl,ACL_TYPE_DEFAULT ); + error =__xfs_set_acl (inode, default_acl,ACL_TYPE_DEFAULT );if (error) goto out_cleanup_inode; }if (acl) { - error =xfs_set_acl (inode, acl,ACL_TYPE_ACCESS ); + error =__xfs_set_acl (inode, acl,ACL_TYPE_ACCESS );if (error) goto out_cleanup_inode; }
Greg Kroah-Hartman
maintainerPATCH 101/196 CIFS: Reconnect expired SMB sessions
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Shilovsky <[email protected]>
commit 511c54a2f69195b28afb9dd119f03787b1625bb4 upstream.
According to the MS-SMB2 spec (3.2.5.1.6) once the client receives STATUS_NETWORK_SESSION_EXPIRED error code from a server it should reconnect the current SMB session. Currently the client doesn't do that. This can result in subsequent client requests failing by the server. The patch adds an additional logic to the demultiplex thread to identify expired sessions and reconnect them.
--- fs/cifs/cifsglob.h | 2 ++ fs/cifs/cifssmb.c | 7 +++++++ fs/cifs/connect.c | 7 +++++++ fs/cifs/smb2ops.c | 23 +++++++++++++++++++++++ 4 files changed, 39 insertions(+)
fs/cifs/cifsglob.h +2 -0
@@ -367,6 +367,8 @@ struct smb_version_operations {unsigned int (*calc_smb_size)(void *);/* check for STATUS_PENDING and process it in a positive case */ bool (*is_status_pending)(char *,struct TCP_Server_Info *,int ); +/* check for STATUS_NETWORK_SESSION_EXPIRED */ +bool (*is_session_expired)(char *);/* send oplock break response */ int (*oplock_response)(struct cifs_tcon *,struct cifs_fid *,struct cifsInodeInfo *);
fs/cifs/cifssmb.c +7 -0
@@ -1460,6 +1460,13 @@ cifs_readv_receive(struct TCP_Server_Infreturn length; server->total_read += length; +if (server->ops->is_session_expired && + server->ops->is_session_expired (buf)) { +cifs_reconnect (server); +wake_up (&server->response_q); +return -1 ; + } +if (server->ops->is_status_pending && server->ops->is_status_pending (buf, server,0 )) {cifs_discard_remaining_data (server);
fs/cifs/connect.c +7 -0
@@ -812,6 +812,13 @@ cifs_handle_standard(struct TCP_Server_Icifs_dump_mem ("Bad SMB: " , buf, min_t(unsigned int, server->total_read, 48)); +if (server->ops->is_session_expired && + server->ops->is_session_expired (buf)) { +cifs_reconnect (server); +wake_up (&server->response_q); +return -1 ; + } +if (server->ops->is_status_pending && server->ops->is_status_pending (buf, server, length))return -1 ;
fs/cifs/smb2ops.c +23 -0
@@ -1036,6 +1036,18 @@ smb2_is_status_pending(char *buf, structreturn true; } +static bool +smb2_is_session_expired (char *buf) +{ +struct smb2_sync_hdr *shdr =get_sync_hdr (buf); + +if (shdr->Status !=STATUS_NETWORK_SESSION_EXPIRED ) +return false; + +cifs_dbg (FYI ,"Session expired\n" ); +return true; +} +static int smb2_oplock_response (struct cifs_tcon *tcon,struct cifs_fid *fid,struct cifsInodeInfo *cinode)
@@ -2058,6 +2070,13 @@ handle_read_data(struct TCP_Server_Inforeturn -ENOTSUPP ; } +if (server->ops->is_session_expired && + server->ops->is_session_expired (buf)) { +cifs_reconnect (server); +wake_up (&server->response_q); +return -1 ; + } +if (server->ops->is_status_pending && server->ops->is_status_pending (buf, server,0 ))return -1 ;
@@ -2375,6 +2394,7 @@ struct smb_version_operations smb20_oper .close_dir = smb2_close_dir, .calc_smb_size = smb2_calc_size, .is_status_pending = smb2_is_status_pending, + .is_session_expired = smb2_is_session_expired, .oplock_response = smb2_oplock_response, .queryfs = smb2_queryfs, .mand_lock = smb2_mand_lock,
@@ -2458,6 +2478,7 @@ struct smb_version_operations smb21_oper .close_dir = smb2_close_dir, .calc_smb_size = smb2_calc_size, .is_status_pending = smb2_is_status_pending, + .is_session_expired = smb2_is_session_expired, .oplock_response = smb2_oplock_response, .queryfs = smb2_queryfs, .mand_lock = smb2_mand_lock,
@@ -2543,6 +2564,7 @@ struct smb_version_operations smb30_oper .close_dir = smb2_close_dir, .calc_smb_size = smb2_calc_size, .is_status_pending = smb2_is_status_pending, + .is_session_expired = smb2_is_session_expired, .oplock_response = smb2_oplock_response, .queryfs = smb2_queryfs, .mand_lock = smb2_mand_lock,
@@ -2638,6 +2660,7 @@ struct smb_version_operations smb311_ope .close_dir = smb2_close_dir, .calc_smb_size = smb2_calc_size, .is_status_pending = smb2_is_status_pending, + .is_session_expired = smb2_is_session_expired, .oplock_response = smb2_oplock_response, .queryfs = smb2_queryfs, .mand_lock = smb2_mand_lock,
Greg Kroah-Hartman
maintainerPATCH 102/196 f2fs: load inodes flag from disk
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jaegeuk Kim <[email protected]>
commit 93607124c5450148e592c3d18ac533b4e5f25b8b upstream.
This patch fixes missing inode flag loaded from disk, reported by Tom.
[tom@localhost ~]$ sudo mount /dev/loop0 /mnt/ [tom@localhost ~]$ sudo chown tom:tom /mnt/ [tom@localhost ~]$ touch /mnt/testfile [tom@localhost ~]$ sudo chattr +i /mnt/testfile [tom@localhost ~]$ echo test > /mnt/testfile
bash: /mnt/testfile: Operation not permitted [tom@localhost ~]$ rm /mnt/testfile
rm: cannot remove '/mnt/testfile': Operation not permitted [tom@localhost ~]$ sudo umount /mnt/ [tom@localhost ~]$ sudo mount /dev/loop0 /mnt/ [tom@localhost ~]$ lsattr /mnt/testfile ----i-------------- /mnt/testfile
[tom@localhost ~]$ echo test > /mnt/testfile [tom@localhost ~]$ rm /mnt/testfile [tom@localhost ~]$ sudo umount /mnt/
--- fs/f2fs/file.c | 1 + fs/f2fs/inode.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/file.c +1 -0
@@ -1493,6 +1493,7 @@ static int f2fs_ioc_setflags(struct file inode->i_ctime =current_time (inode);f2fs_set_inode_flags (inode); +f2fs_mark_inode_dirty_sync (inode, false);inode_unlock (inode); out:
fs/f2fs/inode.c +1 -1
@@ -44,7 +44,6 @@ void f2fs_set_inode_flags(struct inode * new_fl |=S_DIRSYNC ;inode_set_flags (inode, new_fl,S_SYNC |S_APPEND |S_IMMUTABLE |S_NOATIME |S_DIRSYNC ); -f2fs_mark_inode_dirty_sync (inode, false); }static void __get_inode_rdev (struct inode *inode,struct f2fs_inode *ri)
@@ -226,6 +225,7 @@ make_now: ret = -EIO ; goto bad_inode; } +f2fs_set_inode_flags (inode);unlock_new_inode (inode);trace_f2fs_iget (inode);return inode;
Greg Kroah-Hartman
maintainerPATCH 103/196 f2fs: wake up all waiters in f2fs_submit_discard_endio
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
commit e31b98215779e66a490471c6ad886ae231316699 upstream.
There could be more than one waiter waiting discard IO completion, so we need use complete_all() instead of complete() in f2fs_submit_discard_endio to avoid hungtask.
command")
--- fs/f2fs/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/segment.c +1 -1
@@ -751,7 +751,7 @@ static void f2fs_submit_discard_endio(st dc->error = bio->bi_error; dc->state =D_DONE ; -complete (&dc->wait); +complete_all (&dc->wait);bio_put (bio); }
Greg Kroah-Hartman
maintainerPATCH 104/196 f2fs: sanity check checkpoint segno and blkoff
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jin Qian <[email protected]>
commit 15d3042a937c13f5d9244241c7a9c8416ff6e82a upstream.
Make sure segno and blkoff read from raw image are valid.
--- fs/f2fs/super.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/f2fs/super.c +16 -0
@@ -1521,6 +1521,8 @@ int sanity_check_ckpt(struct f2fs_sb_infstruct f2fs_super_block *raw_super =F2FS_RAW_SUPER (sbi);struct f2fs_checkpoint *ckpt =F2FS_CKPT (sbi);unsigned int ovp_segments, reserved_segments; +unsigned int main_segs, blocks_per_seg; +int i; total =le32_to_cpu (raw_super->segment_count); fsmeta =le32_to_cpu (raw_super->segment_count_ckpt);
@@ -1542,6 +1544,20 @@ int sanity_check_ckpt(struct f2fs_sb_infreturn 1 ; } + main_segs =le32_to_cpu (raw_super->segment_count_main); + blocks_per_seg = sbi->blocks_per_seg; + +for (i =0 ; i <NR_CURSEG_NODE_TYPE ; i++) { +if (le32_to_cpu (ckpt->cur_node_segno[i]) >= main_segs || +le16_to_cpu (ckpt->cur_node_blkoff[i]) >= blocks_per_seg) +return 1 ; + } +for (i =0 ; i <NR_CURSEG_DATA_TYPE ; i++) { +if (le32_to_cpu (ckpt->cur_data_segno[i]) >= main_segs || +le16_to_cpu (ckpt->cur_data_blkoff[i]) >= blocks_per_seg) +return 1 ; + } +if (unlikely (f2fs_cp_error (sbi))) {f2fs_msg (sbi->sb,KERN_ERR ,"A bug case: need to run fsck" );return 1 ;
Greg Kroah-Hartman
maintainerPATCH 105/196 f2fs: try to freeze in gc and discard threads
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jaegeuk Kim <[email protected]>
commit 1d7be2708277edfef95171d52fb65ee26eaa076b upstream.
This allows to freeze gc and discard threads.
--- fs/f2fs/gc.c | 9 +++++---- fs/f2fs/segment.c | 25 ++++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-)
fs/f2fs/gc.c +5 -4
@@ -32,13 +32,14 @@ static int gc_thread_func(void *data) wait_ms = gc_th->min_sleep_time; +set_freezable (); do { + wait_event_interruptible_timeout(*wq, + kthread_should_stop() || freezing(current), + msecs_to_jiffies(wait_ms)); + if (try_to_freeze()) continue; - else - wait_event_interruptible_timeout(*wq, - kthread_should_stop(), - msecs_to_jiffies(wait_ms)); if (kthread_should_stop()) break;
fs/f2fs/segment.c +16 -9
@@ -16,6 +16,7 @@#include <linux/kthread.h> #include <linux/swap.h> #include <linux/timer.h> +#include <linux/freezer.h> #include "f2fs.h" #include "segment.h"
@@ -1060,18 +1061,24 @@ static int issue_discard_thread(void *dastruct f2fs_sb_info *sbi = data;struct discard_cmd_control *dcc =SM_I (sbi)->dcc_info;wait_queue_head_t *q = &dcc->discard_wait_queue; -repeat: -if (kthread_should_stop ()) -return 0 ; -__issue_discard_cmd (sbi, true); -__wait_discard_cmd (sbi, true); +set_freezable (); -congestion_wait (BLK_RW_SYNC ,HZ /50 ); +do { +wait_event_interruptible (*q,kthread_should_stop () || +freezing (current) || +atomic_read (&dcc->discard_cmd_cnt)); +if (try_to_freeze ()) +continue ; +if (kthread_should_stop ()) +return 0 ; -wait_event_interruptible (*q,kthread_should_stop () || -atomic_read (&dcc->discard_cmd_cnt)); - goto repeat; +__issue_discard_cmd (sbi, true); +__wait_discard_cmd (sbi, true); + +congestion_wait (BLK_RW_SYNC ,HZ /50 ); + }while (!kthread_should_stop ()); +return 0 ; }#ifdef CONFIG_BLK_DEV_ZONED
Greg Kroah-Hartman
maintainerPATCH 106/196 f2fs: Do not issue small discards in LFS mode
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit acfd2810c75b0625897fc119a2d3a9c26cc0e405 upstream.
clear_prefree_segments() issues small discards after discarding full segments. These small discards may not be section aligned, so not zone aligned on a zoned block device, causing __f2fs_iissue_discard_zone() to fail. Fix this by not issuing small discards for a volume mounted with the BLKZONED feature enabled.
--- fs/f2fs/segment.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/segment.c +2 -1
@@ -1329,7 +1329,8 @@ find_next: sbi->blocks_per_seg, cur_pos); len = next_pos - cur_pos; -if (force && len < cpc->trim_minlen) +if (f2fs_sb_mounted_blkzoned (sbi->sb) || + (force && len < cpc->trim_minlen)) goto skip; f2fs_issue_discard(sbi, entry->start_blkaddr + cur_pos,
Greg Kroah-Hartman
maintainerPATCH 107/196 f2fs: sanity check size of nat and sit cache
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jin Qian <[email protected]>
commit 21d3f8e1c3b7996ce239ab6fa82e9f7a8c47d84d upstream.
Make sure number of entires doesn't exceed max journal size.
--- fs/f2fs/segment.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/f2fs/segment.c +7 -0
@@ -2463,6 +2463,8 @@ static int read_normal_summaries(structstatic int restore_curseg_summaries (struct f2fs_sb_info *sbi) { +struct f2fs_journal *sit_j =CURSEG_I (sbi,CURSEG_COLD_DATA )->journal; +struct f2fs_journal *nat_j =CURSEG_I (sbi,CURSEG_HOT_DATA )->journal;int type =CURSEG_HOT_DATA ;int err;
@@ -2489,6 +2491,11 @@ static int restore_curseg_summaries(strureturn err; } +/* sanity check for summary blocks */ +if (nats_in_cursum (nat_j) >NAT_JOURNAL_ENTRIES || +sits_in_cursum (sit_j) >SIT_JOURNAL_ENTRIES ) +return -EINVAL ; +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 108/196 f2fs: use spin_{,un}lock_irq{save,restore}
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
commit d1aa245354ae4605d1183f542ed8d45811c439f6 upstream.
generic/361 reports below warning, this is because: once, there is someone entering into critical region of sbi.cp_lock, if write_end_io. f2fs_stop_checkpoint is invoked from an triggered IRQ, we will encounter deadlock.
So this patch changes to use spin_{,un}lock_irq{save,restore} to create critical region without IRQ enabled to avoid potential deadlock.
irq event stamp: 83391573
loop: Write error at byte offset 438729728, length 1024.
hardirqs last enabled at (83391573): [<c1809752>] restore_all+0xf/0x65
hardirqs last disabled at (83391572): [<c1809eac>] reschedule_interrupt+0x30/0x3c
loop: Write error at byte offset 438860288, length 1536.
softirqs last enabled at (83389244): [<c180cc4e>] __do_softirq+0x1ae/0x476
softirqs last disabled at (83389237): [<c101ca7c>] do_softirq_own_stack+0x2c/0x40
loop: Write error at byte offset 438990848, length 2048.
================================
WARNING: inconsistent lock state
4.12.0-rc2+ #30 Tainted: G O
--------------------------------
inconsistent {HARDIRQ-ON-W} -> {IN-HARDIRQ-W} usage.
xfs_io/7959 [HC1[1]:SC0[0]:HE0:SE1] takes:
(&(&sbi->cp_lock)->rlock){?.+...}, at: [<f96f96cc>] f2fs_stop_checkpoint+0x1c/0x50 [f2fs]
{HARDIRQ-ON-W} state was registered at:
__lock_acquire+0x527/0x7b0
lock_acquire+0xae/0x220
_raw_spin_lock+0x42/0x50
do_checkpoint+0x165/0x9e0 [f2fs]
write_checkpoint+0x33f/0x740 [f2fs]
__f2fs_sync_fs+0x92/0x1f0 [f2fs]
f2fs_sync_fs+0x12/0x20 [f2fs]
sync_filesystem+0x67/0x80
generic_shutdown_super+0x27/0x100
kill_block_super+0x22/0x50
kill_f2fs_super+0x3a/0x40 [f2fs]
deactivate_locked_super+0x3d/0x70
deactivate_super+0x40/0x60
cleanup_mnt+0x39/0x70
__cleanup_mnt+0x10/0x20
task_work_run+0x69/0x80
exit_to_usermode_loop+0x57/0x85
do_fast_syscall_32+0x18c/0x1b0
entry_SYSENTER_32+0x4c/0x7b
irq event stamp: 1957420
hardirqs last enabled at (1957419): [<c1808f37>] _raw_spin_unlock_irq+0x27/0x50
hardirqs last disabled at (1957420): [<c1809f9c>] call_function_single_interrupt+0x30/0x3c
softirqs last enabled at (1953784): [<c180cc4e>] __do_softirq+0x1ae/0x476
softirqs last disabled at (1953773): [<c101ca7c>] do_softirq_own_stack+0x2c/0x40other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(&(&sbi->cp_lock)->rlock);
<Interrupt>
lock(&(&sbi->cp_lock)->rlock);*** DEADLOCK ***
2 locks held by xfs_io/7959:
#0: (sb_writers#13){.+.+.+}, at: [<c11fd7ca>] vfs_write+0x16a/0x190
#1: (&sb->s_type->i_mutex_key#16){+.+.+.}, at: [<f96e33f5>] f2fs_file_write_iter+0x25/0x140 [f2fs]
stack backtrace: CPU: 2 PID: 7959 Comm: xfs_io Tainted: G O 4.12.0-rc2+ #30 Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 Call Trace: dump_stack+0x5f/0x92 print_usage_bug+0x1d3/0x1dd ? check_usage_backwards+0xe0/0xe0 mark_lock+0x23d/0x280 __lock_acquire+0x699/0x7b0 ? __this_cpu_preempt_check+0xf/0x20 ? trace_hardirqs_off_caller+0x91/0xe0 lock_acquire+0xae/0x220 ? f2fs_stop_checkpoint+0x1c/0x50 [f2fs] _raw_spin_lock+0x42/0x50 ? f2fs_stop_checkpoint+0x1c/0x50 [f2fs] f2fs_stop_checkpoint+0x1c/0x50 [f2fs] f2fs_write_end_io+0x147/0x150 [f2fs] bio_endio+0x7a/0x1e0 blk_update_request+0xad/0x410 blk_mq_end_request+0x16/0x60 lo_complete_rq+0x3c/0x70 __blk_mq_complete_request_remote+0x11/0x20 flush_smp_call_function_queue+0x6d/0x120 ? debug_smp_processor_id+0x12/0x20 generic_smp_call_function_single_interrupt+0x12/0x30 smp_call_function_single_interrupt+0x25/0x40 call_function_single_interrupt+0x37/0x3c EIP: _raw_spin_unlock_irq+0x2d/0x50 EFLAGS: 00000296 CPU: 2 EAX: 00000001 EBX: d2ccc51c ECX: 00000001 EDX: c1aacebd ESI: 00000000 EDI: 00000000 EBP: c96c9d1c ESP: c96c9d18 DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 ? inherit_task_group.isra.98.part.99+0x6b/0xb0 __add_to_page_cache_locked+0x1d4/0x290 add_to_page_cache_lru+0x38/0xb0 pagecache_get_page+0x8e/0x200 f2fs_write_begin+0x96/0xf00 [f2fs] ? trace_hardirqs_on_caller+0xdd/0x1c0 ? current_time+0x17/0x50 ? trace_hardirqs_on+0xb/0x10 generic_perform_write+0xa9/0x170 __generic_file_write_iter+0x1a2/0x1f0 ? f2fs_preallocate_blocks+0x137/0x160 [f2fs] f2fs_file_write_iter+0x6e/0x140 [f2fs] ? __lock_acquire+0x429/0x7b0 __vfs_write+0xc1/0x140 vfs_write+0x9b/0x190 SyS_pwrite64+0x63/0xa0 do_fast_syscall_32+0xa1/0x1b0 entry_SYSENTER_32+0x4c/0x7b EIP: 0xb7786c61 EFLAGS: 00000293 CPU: 2 EAX: ffffffda EBX: 00000003 ECX: 08416000 EDX: 00001000 ESI: 18b24000 EDI: 00000000 EBP: 00000003 ESP: bf9b36b0 DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b
--- fs/f2fs/checkpoint.c | 11 ++++++----- fs/f2fs/f2fs.h | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 11 deletions(-)
fs/f2fs/checkpoint.c +6 -5
@@ -1051,8 +1051,9 @@ static void update_ckpt_flags(struct f2f { unsigned long orphan_num = sbi->im[ORPHAN_INO].ino_num; struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); + unsigned long flags; - spin_lock(&sbi->cp_lock); + spin_lock_irqsave(&sbi->cp_lock, flags); if ((cpc->reason & CP_UMOUNT) && le32_to_cpu(ckpt->cp_pack_total_block_count) >
@@ -1083,14 +1084,14 @@ static void update_ckpt_flags(struct f2f/* set this flag to activate crc|cp_ver for recovery */ __set_ckpt_flags (ckpt,CP_CRC_RECOVERY_FLAG ); -spin_unlock (&sbi->cp_lock); +spin_unlock_irqrestore (&sbi->cp_lock, flags); }static int do_checkpoint (struct f2fs_sb_info *sbi,struct cp_control *cpc) {struct f2fs_checkpoint *ckpt =F2FS_CKPT (sbi);struct f2fs_nm_info *nm_i =NM_I (sbi); -unsigned long orphan_num = sbi->im[ORPHAN_INO ].ino_num; +unsigned long orphan_num = sbi->im[ORPHAN_INO ].ino_num, flags;block_t start_blk;unsigned int data_sum_blocks, orphan_blocks;__u32 crc32 =0 ;
@@ -1132,12 +1133,12 @@ static int do_checkpoint(struct f2fs_sb_/* 2 cp + n data seg summary + orphan inode blocks */ data_sum_blocks =npages_for_summary_flush (sbi, false); -spin_lock (&sbi->cp_lock); +spin_lock_irqsave (&sbi->cp_lock, flags);if (data_sum_blocks <NR_CURSEG_DATA_TYPE )__set_ckpt_flags (ckpt,CP_COMPACT_SUM_FLAG );else __clear_ckpt_flags (ckpt,CP_COMPACT_SUM_FLAG ); -spin_unlock (&sbi->cp_lock); +spin_unlock_irqrestore (&sbi->cp_lock, flags); orphan_blocks =GET_ORPHAN_BLOCKS (orphan_num); ckpt->cp_pack_start_sum = cpu_to_le32(1 + cp_payload_blks +
fs/f2fs/f2fs.h +12 -6
@@ -1228,9 +1228,11 @@ static inline void __set_ckpt_flags(strustatic inline void set_ckpt_flags (struct f2fs_sb_info *sbi,unsigned int f) { -spin_lock (&sbi->cp_lock); +unsigned long flags; + +spin_lock_irqsave (&sbi->cp_lock, flags);__set_ckpt_flags (F2FS_CKPT (sbi), f); -spin_unlock (&sbi->cp_lock); +spin_unlock_irqrestore (&sbi->cp_lock, flags); }static inline void __clear_ckpt_flags (struct f2fs_checkpoint *cp,unsigned int f)
@@ -1244,22 +1246,26 @@ static inline void __clear_ckpt_flags(ststatic inline void clear_ckpt_flags (struct f2fs_sb_info *sbi,unsigned int f) { -spin_lock (&sbi->cp_lock); +unsigned long flags; + +spin_lock_irqsave (&sbi->cp_lock, flags);__clear_ckpt_flags (F2FS_CKPT (sbi), f); -spin_unlock (&sbi->cp_lock); +spin_unlock_irqrestore (&sbi->cp_lock, flags); }static inline void disable_nat_bits (struct f2fs_sb_info *sbi,bool lock) { +unsigned long flags; +set_sbi_flag (sbi,SBI_NEED_FSCK );if (lock) -spin_lock (&sbi->cp_lock); +spin_lock_irqsave (&sbi->cp_lock, flags);__clear_ckpt_flags (F2FS_CKPT (sbi),CP_NAT_BITS_FLAG );kfree (NM_I (sbi)->nat_bits);NM_I (sbi)->nat_bits =NULL ;if (lock) -spin_unlock (&sbi->cp_lock); +spin_unlock_irqrestore (&sbi->cp_lock, flags); } static inline bool enabled_nat_bits(struct f2fs_sb_info *sbi,
Greg Kroah-Hartman
maintainerPATCH 109/196 f2fs: Dont clear SGID when inheriting ACLs
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jaegeuk Kim <[email protected]>
commit c925dc162f770578ff4a65ec9b08270382dba9e6 upstream.
This patch copies commit b7f8a09f80:
"btrfs: Don't clear SGID when inheriting ACLs" written by Jan.
--- fs/f2fs/acl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/acl.c +1 -1
@@ -211,7 +211,7 @@ static int __f2fs_set_acl(struct inode *switch (type) {case ACL_TYPE_ACCESS : name_index =F2FS_XATTR_INDEX_POSIX_ACL_ACCESS ; -if (acl) { +if (acl && !ipage) { error =posix_acl_update_mode (inode, &inode->i_mode, &acl);if (error)return error;
Greg Kroah-Hartman
maintainerPATCH 110/196 serial: st-asc: Potential error pointer dereference
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 2b01bfaeb41e1563322448d9b392ac924cbf22ef upstream.
It looks like we intended to return an error code here, because we dereference "ascport->pinctrl" on the next lines.
--- drivers/tty/serial/st-asc.c | 1 + 1 file changed, 1 insertion(+)
drivers/tty/serial/st-asc.c +1 -0
@@ -758,6 +758,7 @@ static int asc_init_port(struct asc_portif (IS_ERR (ascport->pinctrl)) { ret =PTR_ERR (ascport->pinctrl);dev_err (&pdev->dev,"Failed to get Pinctrl: %d\n" , ret); +return ret; } ascport->states[DEFAULT] =
Greg Kroah-Hartman
maintainerPATCH 111/196 serial: sh-sci: Uninitialized variables in sysfs files
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 4ab3c51e0540ba8464fe34d84cc35821bb77ae92 upstream.
The kstrtol() function returns -ERANGE as well as -EINVAL so these tests are not enough. It's not a super serious bug, but my static checker correctly complains that the "r" variable might be used uninitialized.
--- drivers/tty/serial/sh-sci.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/tty/serial/sh-sci.c +8 -4
@@ -1085,10 +1085,12 @@ static ssize_t rx_trigger_store(struct d {struct uart_port *port =dev_get_drvdata (dev);struct sci_port *sci =to_sci_port (port); +int ret;long r; -if (kstrtol (buf,0 , &r) == -EINVAL ) -return -EINVAL ; + ret =kstrtol (buf,0 , &r); +if (ret) +return ret; sci->rx_trigger =scif_set_rtrg (port, r);if (port->type ==PORT_SCIFA || port->type ==PORT_SCIFB )
@@ -1116,10 +1118,12 @@ static ssize_t rx_fifo_timeout_store(str {struct uart_port *port =dev_get_drvdata (dev);struct sci_port *sci =to_sci_port (port); +int ret;long r; -if (kstrtol (buf,0 , &r) == -EINVAL ) -return -EINVAL ; + ret =kstrtol (buf,0 , &r); +if (ret) +return ret; sci->rx_fifo_timeout = r;scif_set_rtrg (port,1 );if (r >0 )
Greg Kroah-Hartman
maintainerPATCH 112/196 ovl: mark parent impure on ovl_link()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amir Goldstein <[email protected]>
commit ea3dad18dc5f778cfd931311a91a9315aa0065a3 upstream.
When linking a file with copy up origin into a new parent, mark the new parent dir "impure".
--- fs/overlayfs/dir.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
fs/overlayfs/dir.c +18 -4
@@ -478,17 +478,30 @@ out_cleanup: }static int ovl_create_or_link (struct dentry *dentry,struct inode *inode, -struct cattr *attr,struct dentry *hardlink) +struct cattr *attr,struct dentry *hardlink, +bool origin) {int err;const struct cred *old_cred;struct cred *override_cred; +struct dentry *parent = dentry->d_parent; - err =ovl_copy_up (dentry->d_parent); + err =ovl_copy_up (parent);if (err)return err; old_cred =ovl_override_creds (dentry->d_sb); + +/* +* When linking a file with copy up origin into a new parent, mark the +* new parent dir "impure". +*/ +if (origin) { + err =ovl_set_impure (parent,ovl_dentry_upper (parent)); +if (err) + goto out_revert_creds; + } + err = -ENOMEM ; override_cred =prepare_creds ();if (override_cred) {
@@ -547,7 +560,7 @@ static int ovl_create_object(struct dentinode_init_owner (inode, dentry->d_parent->d_inode, mode); attr.mode = inode->i_mode; - err =ovl_create_or_link (dentry, inode, &attr,NULL ); + err =ovl_create_or_link (dentry, inode, &attr,NULL , false);if (err)iput (inode);
@@ -601,7 +614,8 @@ static int ovl_link(struct dentry *old, inode =d_inode (old);ihold (inode); - err =ovl_create_or_link (new, inode,NULL ,ovl_dentry_upper (old)); + err =ovl_create_or_link (new, inode,NULL ,ovl_dentry_upper (old), +ovl_type_origin (old));if (err)iput (inode);
Greg Kroah-Hartman
maintainerPATCH 113/196 ovl: fix random return value on mount
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amir Goldstein <[email protected]>
commit 8fc646b44385ff0a9853f6590497e43049eeb311 upstream.
On failure to prepare_creds(), mount fails with a random return value, as err was last set to an integer cast of a valid lower mnt pointer or set to 0 if inodes index feature is enabled.
--- fs/overlayfs/super.c | 1 + 1 file changed, 1 insertion(+)
fs/overlayfs/super.c +1 -0
@@ -946,6 +946,7 @@ static int ovl_fill_super(struct super_belse sb->s_d_op = &ovl_dentry_operations; + err = -ENOMEM ; ufs->creator_cred = cred =prepare_creds ();if (!cred) goto out_put_lower_mnt;
Greg Kroah-Hartman
maintainerPATCH 114/196 drm/amd/powerplay: fix memory leak in cz_hwmgr backend
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hawking Zhang <[email protected]>
commit b1e8b9c5b19c58e3159c2acc77167f4a4c74621f upstream.
vddc_dep_on_dal_pwrl is allocated and initialized in cz_hwmgr_backend_init Thus free the memory in cz_hwmgr_backend_fini
--- drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +6 -0
@@ -1224,6 +1224,12 @@ static int cz_hwmgr_backend_fini(structphm_destroy_table (hwmgr, &(hwmgr->disable_dynamic_state_management));phm_destroy_table (hwmgr, &(hwmgr->power_down_asic));phm_destroy_table (hwmgr, &(hwmgr->setup_asic)); + +if (NULL != hwmgr->dyn_state.vddc_dep_on_dal_pwrl) { +kfree (hwmgr->dyn_state.vddc_dep_on_dal_pwrl); + hwmgr->dyn_state.vddc_dep_on_dal_pwrl =NULL ; + } +kfree (hwmgr->backend); hwmgr->backend =NULL ; }
Greg Kroah-Hartman
maintainerPATCH 116/196 vfio: Fix group release deadlock
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit 811642d8d8a82c0cce8dc2debfdaf23c5a144839 upstream.
If vfio_iommu_group_notifier() acquires a group reference and that reference becomes the last reference to the group, then vfio_group_put introduces a deadlock code path where we're trying to unregister from the iommu notifier chain from within a callout of that chain. Use a work_struct to release this reference asynchronously.
--- drivers/vfio/vfio.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)
drivers/vfio/vfio.c +36 -1
@@ -423,6 +423,34 @@ static void vfio_group_put(struct vfio_gkref_put_mutex (&group->kref, vfio_group_release, &vfio.group_lock); } +struct vfio_group_put_work { +struct work_struct work; +struct vfio_group *group; +}; + +static void vfio_group_put_bg (struct work_struct *work) +{ +struct vfio_group_put_work *do_work; + + do_work = container_of(work, struct vfio_group_put_work, work); + +vfio_group_put (do_work->group); +kfree (do_work); +} + +static void vfio_group_schedule_put (struct vfio_group *group) +{ +struct vfio_group_put_work *do_work; + + do_work =kmalloc (sizeof (*do_work),GFP_KERNEL ); +if (WARN_ON (!do_work)) +return ; + +INIT_WORK (&do_work->work, vfio_group_put_bg); + do_work->group = group; +schedule_work (&do_work->work); +} +/* Assume group_lock or group reference is held */ static void vfio_group_get (struct vfio_group *group) {
@@ -762,7 +790,14 @@ static int vfio_iommu_group_notifier(strbreak ; } -vfio_group_put (group); +/* +* If we're the last reference to the group, the group will be +* released, which includes unregistering the iommu group notifier. +* We hold a read-lock on that notifier list, unregistering needs +* a write-lock... deadlock. Release our reference asynchronously +* to avoid that situation. +*/ +vfio_group_schedule_put (group);return NOTIFY_OK ; }
Greg Kroah-Hartman
maintainerPATCH 117/196 vfio: New external user group/file match
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit 5d6dee80a1e94cc284d03e06d930e60e8d3ecf7d upstream.
At the point where the kvm-vfio pseudo device wants to release its vfio group reference, we can't always acquire a new reference to make that happen. The group can be in a state where we wouldn't allow a new reference to be added. This new helper function allows a caller to match a file to a group to facilitate this. Given a file and group, report if they match. Thus the caller needs to already have a group reference to match to the file. This allows the deletion of a group without acquiring a new reference.
--- drivers/vfio/vfio.c | 9 +++++++++ include/linux/vfio.h | 2 ++ virt/kvm/vfio.c | 27 +++++++++++++++++++-------- 3 files changed, 30 insertions(+), 8 deletions(-)
drivers/vfio/vfio.c +9 -0
@@ -1776,6 +1776,15 @@ void vfio_group_put_external_user(struct }EXPORT_SYMBOL_GPL (vfio_group_put_external_user); +bool vfio_external_group_match_file (struct vfio_group *test_group, +struct file *filep) +{ +struct vfio_group *group = filep->private_data; + +return (filep->f_op == &vfio_group_fops) && (group == test_group); +} +EXPORT_SYMBOL_GPL (vfio_external_group_match_file); +int vfio_external_user_iommu_id (struct vfio_group *group) {return iommu_group_id (group->iommu_group);
include/linux/vfio.h +2 -0
@@ -97,6 +97,8 @@ extern void vfio_unregister_iommu_driver*/ extern struct vfio_group *vfio_group_get_external_user (struct file *filep);extern void vfio_group_put_external_user (struct vfio_group *group); +extern bool vfio_external_group_match_file (struct vfio_group *group, +struct file *filep);extern int vfio_external_user_iommu_id (struct vfio_group *group);extern long vfio_external_check_extension (struct vfio_group *group,unsigned long arg);
virt/kvm/vfio.c +19 -8
@@ -51,6 +51,22 @@ static struct vfio_group *kvm_vfio_groupreturn vfio_group; } +static bool kvm_vfio_external_group_match_file (struct vfio_group *group, +struct file *filep) +{ +bool ret, (*fn)(struct vfio_group *,struct file *); + + fn =symbol_get (vfio_external_group_match_file); +if (!fn) +return false; + + ret =fn (group, filep); + +symbol_put (vfio_external_group_match_file); + +return ret; +} +static void kvm_vfio_group_put_external_user (struct vfio_group *vfio_group) {void (*fn)(struct vfio_group *);
@@ -231,18 +247,13 @@ static int kvm_vfio_set_group(struct kvmif (!f.file)return -EBADF ; - vfio_group =kvm_vfio_group_get_external_user (f.file); -fdput (f); - -if (IS_ERR (vfio_group)) -return PTR_ERR (vfio_group); - ret = -ENOENT ;mutex_lock (&kv->lock);list_for_each_entry (kvg, &kv->group_list, node) { -if (kvg->vfio_group != vfio_group) +if (!kvm_vfio_external_group_match_file (kvg->vfio_group, + f.file))continue ;list_del (&kvg->node);
@@ -260,7 +271,7 @@ static int kvm_vfio_set_group(struct kvmmutex_unlock (&kv->lock); -kvm_vfio_group_put_external_user (vfio_group); +fdput (f);kvm_vfio_update_coherency (dev);
Greg Kroah-Hartman
maintainerPATCH 118/196 vfio: Remove unnecessary uses of vfio_container.group_lock
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit 7f56c30bd0a232822aca38d288da475613bdff9b upstream.
The original intent of vfio_container.group_lock is to protect vfio_container.group_list, however over time it's become a crutch to prevent changes in container composition any time we call into the iommu driver backend. This introduces problems when we start to have more complex interactions, for example when a user's DMA unmap request triggers a notification to an mdev vendor driver, who responds by attempting to unpin mappings within that request, re-entering the iommu backend. We incorrectly assume that the use of read-locks here allow for this nested locking behavior, but a poorly timed write-lock could in fact trigger a deadlock.
The current use of group_lock seems to fall into the trap of locking code, not data. Correct that by removing uses of group_lock that are not directly related to group_list. Note that the vfio type1 iommu backend has its own mutex, vfio_iommu.lock, which it uses to protect itself for each of these interfaces anyway. The group_lock appears to be a redundancy for these interfaces and type1 even goes so far as to release its mutex to allow for exactly the re-entrant code path above.
--- drivers/vfio/vfio.c | 38 -------------------------------------- 1 file changed, 38 deletions(-)
drivers/vfio/vfio.c +0 -38
@@ -1175,15 +1175,11 @@ static long vfio_fops_unl_ioctl(struct f ret =vfio_ioctl_set_iommu (container, arg);break ;default : -down_read (&container->group_lock); - driver = container->iommu_driver; data = container->iommu_data;if (driver)/* passthrough all unrecognized ioctls */ ret = driver->ops->ioctl (data, cmd, arg); - -up_read (&container->group_lock); }return ret;
@@ -1237,15 +1233,11 @@ static ssize_t vfio_fops_read(struct filstruct vfio_iommu_driver *driver;ssize_t ret = -EINVAL ; -down_read (&container->group_lock); - driver = container->iommu_driver;if (likely (driver && driver->ops->read)) ret = driver->ops->read (container->iommu_data, buf, count, ppos); -up_read (&container->group_lock); -return ret; }
@@ -1256,15 +1248,11 @@ static ssize_t vfio_fops_write(struct fistruct vfio_iommu_driver *driver;ssize_t ret = -EINVAL ; -down_read (&container->group_lock); - driver = container->iommu_driver;if (likely (driver && driver->ops->write)) ret = driver->ops->write (container->iommu_data, buf, count, ppos); -up_read (&container->group_lock); -return ret; }
@@ -1274,14 +1262,10 @@ static int vfio_fops_mmap(struct file *fstruct vfio_iommu_driver *driver;int ret = -EINVAL ; -down_read (&container->group_lock); - driver = container->iommu_driver;if (likely (driver && driver->ops->mmap)) ret = driver->ops->mmap (container->iommu_data, vma); -up_read (&container->group_lock); -return ret; }
@@ -1993,8 +1977,6 @@ int vfio_pin_pages(struct device *dev, u goto err_pin_pages; container = group->container; -down_read (&container->group_lock); - driver = container->iommu_driver;if (likely (driver && driver->ops->pin_pages)) ret = driver->ops->pin_pages(container->iommu_data, user_pfn,
@@ -2002,7 +1984,6 @@ int vfio_pin_pages(struct device *dev, uelse ret = -ENOTTY ; -up_read (&container->group_lock);vfio_group_try_dissolve_container (group); err_pin_pages:
@@ -2042,8 +2023,6 @@ int vfio_unpin_pages(struct device *dev, goto err_unpin_pages; container = group->container; -down_read (&container->group_lock); - driver = container->iommu_driver;if (likely (driver && driver->ops->unpin_pages)) ret = driver->ops->unpin_pages(container->iommu_data, user_pfn,
@@ -2051,7 +2030,6 @@ int vfio_unpin_pages(struct device *dev,else ret = -ENOTTY ; -up_read (&container->group_lock);vfio_group_try_dissolve_container (group); err_unpin_pages:
@@ -2073,8 +2051,6 @@ static int vfio_register_iommu_notifier(return -EINVAL ; container = group->container; -down_read (&container->group_lock); - driver = container->iommu_driver;if (likely (driver && driver->ops->register_notifier)) ret = driver->ops->register_notifier(container->iommu_data,
@@ -2082,7 +2058,6 @@ static int vfio_register_iommu_notifier(else ret = -ENOTTY ; -up_read (&container->group_lock);vfio_group_try_dissolve_container (group);return ret;
@@ -2100,8 +2075,6 @@ static int vfio_unregister_iommu_notifiereturn -EINVAL ; container = group->container; -down_read (&container->group_lock); - driver = container->iommu_driver;if (likely (driver && driver->ops->unregister_notifier)) ret = driver->ops->unregister_notifier(container->iommu_data,
@@ -2109,7 +2082,6 @@ static int vfio_unregister_iommu_notifieelse ret = -ENOTTY ; -up_read (&container->group_lock);vfio_group_try_dissolve_container (group);return ret;
@@ -2127,7 +2099,6 @@ static int vfio_register_group_notifier(unsigned long *events, struct notifier_block *nb) { - struct vfio_container *container; int ret;bool set_kvm = false;
@@ -2145,9 +2116,6 @@ static int vfio_register_group_notifier(if (ret)return -EINVAL ; - container = group->container; -down_read (&container->group_lock); - ret =blocking_notifier_chain_register (&group->notifier, nb);/*
@@ -2158,7 +2126,6 @@ static int vfio_register_group_notifier(blocking_notifier_call_chain (&group->notifier,VFIO_GROUP_NOTIFY_SET_KVM , group->kvm); -up_read (&container->group_lock);vfio_group_try_dissolve_container (group);return ret;
@@ -2167,19 +2134,14 @@ static int vfio_register_group_notifier(static int vfio_unregister_group_notifier (struct vfio_group *group,struct notifier_block *nb) { -struct vfio_container *container;int ret; ret =vfio_group_add_container_user (group);if (ret)return -EINVAL ; - container = group->container; -down_read (&container->group_lock); - ret =blocking_notifier_chain_unregister (&group->notifier, nb); -up_read (&container->group_lock);vfio_group_try_dissolve_container (group);return ret;
Greg Kroah-Hartman
maintainerPATCH 119/196 nvme-rdma: remove race conditions from IB signalling
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marta Rybczynska <[email protected]>
commit 5e599d73c1c1816af07f94ddba879499aa39b43c upstream.
This patch improves the way the RDMA IB signalling is done by using atomic operations for the signalling variable. This avoids race conditions on sig_count.
The signalling interval changes slightly and is now the largest power of two not larger than queue depth / 2.
ilog() usage idea by Bart Van Assche.
--- drivers/nvme/host/rdma.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/nvme/host/rdma.c +10 -10
@@ -88,7 +88,7 @@ enum nvme_rdma_queue_flags {struct nvme_rdma_queue {struct nvme_rdma_qe *rsp_ring; -u8 sig_count; +atomic_t sig_count;int queue_size;size_t cmnd_capsule_len;struct nvme_rdma_ctrl *ctrl;
@@ -553,6 +553,7 @@ static int nvme_rdma_init_queue(struct n queue->cmnd_capsule_len =sizeof (struct nvme_command ); queue->queue_size = queue_size; +atomic_set (&queue->sig_count,0 ); queue->cm_id =rdma_create_id (&init_net, nvme_rdma_cm_handler, queue,RDMA_PS_TCP ,IB_QPT_RC );
@@ -1040,17 +1041,16 @@ static void nvme_rdma_send_done(struct invme_rdma_wr_error (cq, wc,"SEND" ); } -static inline int nvme_rdma_queue_sig_limit (struct nvme_rdma_queue *queue) +/* +* We want to signal completion at least every queue depth/2. This returns the +* largest power of two that is not above half of (queue size + 1) to optimize +* (avoid divisions). +*/ +static inline bool nvme_rdma_queue_sig_limit (struct nvme_rdma_queue *queue) { -int sig_limit; +int limit =1 <<ilog2 ((queue->queue_size +1 ) /2 ); -/* -* We signal completion every queue depth/2 and also handle the -* degenerated case of a device with queue_depth=1, where we -* would need to signal every message. -*/ - sig_limit =max (queue->queue_size /2 ,1 ); -return (++queue->sig_count % sig_limit) ==0 ; +return (atomic_inc_return (&queue->sig_count) & (limit -1 )) ==0 ; } static int nvme_rdma_post_send(struct nvme_rdma_queue *queue,
Greg Kroah-Hartman
maintainerPATCH 120/196 ftrace: Fix uninitialized variable in match_records()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 2e028c4fe12907f226b8221815f16c2486ad3aa7 upstream.
My static checker complains that if "func" is NULL then "clear_filter" is uninitialized. This seems like it could be true, although it's possible something subtle is happening that I haven't seen.
kernel/trace/ftrace.c:3844 match_records()
error: uninitialized symbol 'clear_filter'.
--- kernel/trace/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ftrace.c +1 -1
@@ -3665,7 +3665,7 @@ match_records(struct ftrace_hash *hash,int exclude_mod =0 ;int found =0 ;int ret; -int clear_filter; +int clear_filter =0 ;if (func) { func_g.type = filter_parse_regex(func, len, &func_g.search,
Greg Kroah-Hartman
maintainerPATCH 121/196 iommu/arm-smmu: Plumb in new ACPI identifiers
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robin Murphy <[email protected]>
commit 84c24379a783c514e5ff7c8fc8a21cf8d64fd05f upstream.
Revision C of IORT now allows us to identify ARM MMU-401 and the Cavium ThunderX implementation. Wire them up so that we can probe these models once firmware starts using the new codes in place of generic ones, and so that the appropriate features and quirks get enabled when we do.
For the sake of backports and mitigating sychronisation problems with the ACPICA headers, we'll carry a backup copy of the new definitions locally for the short term to make life simpler.
--- drivers/iommu/arm-smmu.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/iommu/arm-smmu.c +16 -0
@@ -312,6 +312,14 @@ enum arm_smmu_implementation { CAVIUM_SMMUV2, }; +/* Until ACPICA headers cover IORT rev. C */ +#ifndef ACPI_IORT_SMMU_CORELINK_MMU401 +#define ACPI_IORT_SMMU_CORELINK_MMU401 0x4 +#endif +#ifndef ACPI_IORT_SMMU_CAVIUM_THUNDERX +#define ACPI_IORT_SMMU_CAVIUM_THUNDERX 0x5 +#endif +struct arm_smmu_s2cr {struct iommu_group *group;int count;
@@ -2073,6 +2081,10 @@ static int acpi_smmu_get_data(u32 model, smmu->version =ARM_SMMU_V1 ; smmu->model =GENERIC_SMMU ;break ; +case ACPI_IORT_SMMU_CORELINK_MMU401 : + smmu->version =ARM_SMMU_V1_64K ; + smmu->model =GENERIC_SMMU ; +break ;case ACPI_IORT_SMMU_V2 : smmu->version =ARM_SMMU_V2 ; smmu->model =GENERIC_SMMU ;
@@ -2081,6 +2093,10 @@ static int acpi_smmu_get_data(u32 model, smmu->version =ARM_SMMU_V2 ; smmu->model =ARM_MMU500 ;break ; +case ACPI_IORT_SMMU_CAVIUM_THUNDERX : + smmu->version =ARM_SMMU_V2 ; + smmu->model =CAVIUM_SMMUV2 ; +break ;default : ret = -ENODEV ; }
Greg Kroah-Hartman
maintainerPATCH 122/196 drm/i915/gvt: Fix inconsistent locks holding sequence
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuanxiao Dong <[email protected]>
commit f16bd3dda2c8bf6699e808cd9cc540cfab10e60e upstream.
There are two kinds of locking sequence.
One is in the thread which is started by vfio ioctl to do the iommu unmapping. The locking sequence is:
down_read(&group_lock) ----> mutex_lock(&cached_lock)
The other is in the vfio release thread which will unpin all the cached pages. The lock sequence is:
mutex_lock(&cached_lock) ---> down_read(&group_lock)
And, the cache_lock is used to protect the rb tree of the cache node and doing vfio unpin doesn't require this lock. Move the vfio unpin out of the cache_lock protected region.
v2:
- use for style instead of do{}while(1). (Zhenyu)
--- drivers/gpu/drm/i915/gvt/kvmgt.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gvt/kvmgt.c +9 -5
@@ -232,16 +232,20 @@ static void gvt_cache_destroy(struct intstruct device *dev =mdev_dev (vgpu->vdev.mdev);unsigned long gfn; -mutex_lock (&vgpu->vdev.cache_lock); -while ((node =rb_first (&vgpu->vdev.cache))) { +for (;;) { +mutex_lock (&vgpu->vdev.cache_lock); + node =rb_first (&vgpu->vdev.cache); +if (!node) { +mutex_unlock (&vgpu->vdev.cache_lock); +break ; + } dma = rb_entry(node, struct gvt_dma, node);gvt_dma_unmap_iova (vgpu, dma->iova); gfn = dma->gfn; - -vfio_unpin_pages (dev, &gfn,1 );__gvt_cache_remove_entry (vgpu, dma); +mutex_unlock (&vgpu->vdev.cache_lock); +vfio_unpin_pages (dev, &gfn,1 ); } -mutex_unlock (&vgpu->vdev.cache_lock); } static struct intel_vgpu_type *intel_gvt_find_vgpu_type(struct intel_gvt *gvt,
Greg Kroah-Hartman
maintainerPATCH 123/196 drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maarten Lankhorst <[email protected]>
commit 4086d90cffb8f48400d51fbab575fe50458512e3 upstream.
All atomic state should be cleared when drm_modeset_backoff() is called, because it drops all locks and the state becomes invalid.
The call to drm_atomic_state_clear was missing in atomic_remove_fb, so add the missing call there.
--- drivers/gpu/drm/drm_framebuffer.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_framebuffer.c +1 -0
@@ -832,6 +832,7 @@ unlock:drm_atomic_clean_old_fb (dev, plane_mask, ret);if (ret == -EDEADLK ) { +drm_atomic_state_clear (state);drm_modeset_backoff (&ctx); goto retry; }
Greg Kroah-Hartman
maintainerPATCH 124/196 MIPS: Fix mips_atomic_set() retry condition
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Hogan <[email protected]>
commit 2ec420b26f7b6ff332393f0bb5a7d245f7ad87f0 upstream.
The inline asm retry check in the MIPS_ATOMIC_SET operation of the sysmips system call has been backwards since commit f1e39a4a616c ("MIPS:
Rewrite sysmips(MIPS_ATOMIC_SET, ...) in C with inline assembler") merged in v2.6.32, resulting in the non R10000_LLSC_WAR case retrying until the operation was inatomic, before returning the new value that was probably just written multiple times instead of the old value.
Invert the branch condition to fix that particular issue.
Patchwork: https://patchwork.linux-mips.org/patch/16148/
--- arch/mips/kernel/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/syscall.c +1 -1
@@ -134,7 +134,7 @@ static inline int mips_atomic_set(unsign"1: ll %[old], (%[addr]) \n" " move %[tmp], %[new] \n" "2: sc %[tmp], (%[addr]) \n" -" bnez %[tmp], 4f \n" +" beqz %[tmp], 4f \n" "3: \n" " .insn \n" " .subsection 2 \n"
Greg Kroah-Hartman
maintainerPATCH 125/196 MIPS: Fix mips_atomic_set() with EVA
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Hogan <[email protected]>
commit 4915e1b043d6286928207b1f6968197b50407294 upstream.
EVA linked loads (LLE) and conditional stores (SCE) should be used on EVA kernels for the MIPS_ATOMIC_SET operation of the sysmips system call, or else the atomic set will apply to the kernel view of the virtual address space (potentially unmapped on EVA kernels) rather than the user view (TLB mapped).
Patchwork: https://patchwork.linux-mips.org/patch/16151/
--- arch/mips/kernel/syscall.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/mips/kernel/syscall.c +5 -2
@@ -29,6 +29,7 @@#include <linux/sched/task_stack.h> #include <asm/asm.h> +#include <asm/asm-eva.h> #include <asm/branch.h> #include <asm/cachectl.h> #include <asm/cacheflush.h>
@@ -131,9 +132,11 @@ static inline int mips_atomic_set(unsign __asm__ __volatile__ (" .set " MIPS_ISA_ARCH_LEVEL " \n" " li %[err], 0 \n" -"1: ll %[old], (%[addr]) \n" +"1: \n" + user_ll("%[old]", "(%[addr])")" move %[tmp], %[new] \n" -"2: sc %[tmp], (%[addr]) \n" +"2: \n" + user_sc("%[tmp]", "(%[addr])")" beqz %[tmp], 4f \n" "3: \n" " .insn \n"
Greg Kroah-Hartman
maintainerPATCH 126/196 MIPS: Negate error syscall return in trace
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Hogan <[email protected]>
commit 4f32a39d49b25eaa66d2420f1f03d371ea4cd906 upstream.
The sys_exit trace event takes a single return value for the system call, which MIPS passes the value of the $v0 (result) register, however MIPS returns positive error codes in $v0 with $a3 specifying that $v0 contains an error code. As a result erroring system calls are traced returning positive error numbers that can't always be distinguished from success.
Use regs_return_value() to negate the error code if $a3 is set.
Patchwork: https://patchwork.linux-mips.org/patch/16651/
--- arch/mips/kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/ptrace.c +1 -1
@@ -895,7 +895,7 @@ asmlinkage void syscall_trace_leave(struaudit_syscall_exit (regs);if (unlikely (test_thread_flag (TIF_SYSCALL_TRACEPOINT ))) -trace_sys_exit (regs, regs->regs[2 ]); +trace_sys_exit (regs,regs_return_value (regs));if (test_thread_flag (TIF_SYSCALL_TRACE ))tracehook_report_syscall_exit (regs,0 );
Greg Kroah-Hartman
maintainerPATCH 127/196 mtd: nand: tango: Fix incorrect use of SEQIN command
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Brezillon <[email protected]>
commit a186493237a9d8559997c2f97c33c4716d602fd2 upstream.
SEQIN is supposed to be used when one wants to start programming a page. What we want here is just to change the column within the page, which is done with the RNDIN command.
--- drivers/mtd/nand/tango_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/tango_nand.c +1 -1
@@ -340,7 +340,7 @@ static void aux_write(struct nand_chip *if (!*buf) {/* skip over "len" bytes */ - chip->cmdfunc (mtd,NAND_CMD_SEQIN , *pos,-1 ); + chip->cmdfunc (mtd,NAND_CMD_RNDIN , *pos,-1 ); }else {tango_write_buf (mtd, *buf, len); *buf += len;
Greg Kroah-Hartman
maintainerPATCH 128/196 ubifs: Correctly evict xattr inodes
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Weinberger <[email protected]>
commit 272eda8298dc82eb411ece82bbb2c62911087b24 upstream.
UBIFS handles extended attributes just like files, as consequence of that, they also have inodes.
Therefore UBIFS does all the inode machinery also for xattrs. Since new inodes have i_nlink of 1, a file or xattr inode will be evicted if i_nlink goes down to 0 after an unlink. UBIFS assumes this model also for xattrs, which is not correct.
One can create a file "foo" with xattr "user.test". By reading "user.test" an inode will be created, and by deleting "user.test" it will get evicted later. The assumption breaks if the file "foo", which hosts the xattrs, will be removed. VFS nor UBIFS does not remove each xattr via ubifs_xattr_remove(), it just removes the host inode from the TNC and all underlying xattr nodes too and the inode will remain in the cache and wastes memory.
To solve this problem, remove xattr inodes from the VFS inode cache in ubifs_xattr_remove() to make sure that they get evicted.
--- fs/ubifs/tnc.c | 2 ++ fs/ubifs/ubifs.h | 1 + fs/ubifs/xattr.c | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+)
fs/ubifs/tnc.c +2 -0
@@ -2802,6 +2802,8 @@ int ubifs_tnc_remove_ino(struct ubifs_indbg_tnc ("xent '%s', ino %lu" , xent->name, (unsigned long )xattr_inum); +ubifs_evict_xattr_inode (c, xattr_inum); +fname_name (&nm) = xent->name;fname_len (&nm) =le16_to_cpu (xent->nlen); err =ubifs_tnc_remove_nm (c, &key1, &nm);
fs/ubifs/ubifs.h +1 -0
@@ -1757,6 +1757,7 @@ int ubifs_xattr_set(struct inode *host, size_t size, int flags);ssize_t ubifs_xattr_get (struct inode *host,const char *name,void *buf,size_t size); +void ubifs_evict_xattr_inode (struct ubifs_info *c,ino_t xattr_inum);#ifdef CONFIG_UBIFS_FS_SECURITY extern int ubifs_init_security(struct inode *dentry, struct inode *inode,
fs/ubifs/xattr.c +22 -0
@@ -513,6 +513,28 @@ out_cancel:return err; } +/** +* ubifs_evict_xattr_inode - Evict an xattr inode. +* @c: UBIFS file-system description object +* @xattr_inum: xattr inode number +* +* When an inode that hosts xattrs is being removed we have to make sure +* that cached inodes of the xattrs also get removed from the inode cache +* otherwise we'd waste memory. This function looks up an inode from the +* inode cache and clears the link counter such that iput() will evict +* the inode. +*/ +void ubifs_evict_xattr_inode (struct ubifs_info *c,ino_t xattr_inum) +{ +struct inode *inode; + + inode =ilookup (c->vfs_sb, xattr_inum); +if (inode) { +clear_nlink (inode); +iput (inode); + } +} +static int ubifs_xattr_remove (struct inode *host,const char *name) {struct inode *inode;
Greg Kroah-Hartman
maintainerPATCH 129/196 ubifs: Dont leak kernel memory to the MTD
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Weinberger <[email protected]>
commit 4acadda74ff8b949c448c0282765ae747e088c87 upstream.
When UBIFS prepares data structures which will be written to the MTD it ensues that their lengths are multiple of 8. Since it uses kmalloc() the padded bytes are left uninitialized and we leak a few bytes of kernel memory to the MTD.
To make sure that all bytes are initialized, let's switch to kzalloc(). Kzalloc() is fine in this case because the buffers are not huge and in the IO path the performance bottleneck is anyway the MTD.
--- fs/ubifs/journal.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/ubifs/journal.c +5 -5
@@ -574,7 +574,7 @@ int ubifs_jnl_update(struct ubifs_info */* Make sure to also account for extended attributes */ len += host_ui->data_len; - dent =kmalloc (len,GFP_NOFS ); + dent =kzalloc (len,GFP_NOFS );if (!dent)return -ENOMEM ;
@@ -967,7 +967,7 @@ int ubifs_jnl_xrename(struct ubifs_infoif (twoparents) len += plen; - dent1 =kmalloc (len,GFP_NOFS ); + dent1 =kzalloc (len,GFP_NOFS );if (!dent1)return -ENOMEM ;
@@ -1117,7 +1117,7 @@ int ubifs_jnl_rename(struct ubifs_info * len = aligned_dlen1 + aligned_dlen2 +ALIGN (ilen,8 ) +ALIGN (plen,8 );if (move) len += plen; - dent =kmalloc (len,GFP_NOFS ); + dent =kzalloc (len,GFP_NOFS );if (!dent)return -ENOMEM ;
@@ -1500,7 +1500,7 @@ int ubifs_jnl_delete_xattr(struct ubifs_ hlen = host_ui->data_len +UBIFS_INO_NODE_SZ ; len = aligned_xlen +UBIFS_INO_NODE_SZ +ALIGN (hlen,8 ); - xent =kmalloc (len,GFP_NOFS ); + xent =kzalloc (len,GFP_NOFS );if (!xent)return -ENOMEM ;
@@ -1607,7 +1607,7 @@ int ubifs_jnl_change_xattr(struct ubifs_ aligned_len1 =ALIGN (len1,8 ); aligned_len = aligned_len1 +ALIGN (len2,8 ); - ino =kmalloc (aligned_len,GFP_NOFS ); + ino =kzalloc (aligned_len,GFP_NOFS );if (!ino)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 130/196 ubifs: Dont encrypt special files on creation
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Gstir <[email protected]>
commit f34e87f58dabc31eb69f61cf4a79e951d4176743 upstream.
When a new inode is created, we check if the containing folder has a encryption policy set and inherit that. This should however only be done for regular files, links and subdirectories. Not for sockes fifos etc.
--- fs/ubifs/dir.c | 1 + 1 file changed, 1 insertion(+)
fs/ubifs/dir.c +1 -0
@@ -143,6 +143,7 @@ struct inode *ubifs_new_inode(struct ubicase S_IFBLK :case S_IFCHR : inode->i_op = &ubifs_file_inode_operations; + encrypted = false;break ;default :BUG ();
Greg Kroah-Hartman
maintainerPATCH 131/196 ubifs: Set double hash cookie also for RENAME_EXCHANGE
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Weinberger <[email protected]>
commit a6664433d383eeb71cbdeb9aea2c66eeea76e742 upstream.
We developed RENAME_EXCHANGE and UBIFS_FLG_DOUBLE_HASH more or less in parallel and this case was forgotten. :-(
--- fs/ubifs/journal.c | 2 ++ 1 file changed, 2 insertions(+)
fs/ubifs/journal.c +2 -0
@@ -984,6 +984,7 @@ int ubifs_jnl_xrename(struct ubifs_info dent1->nlen =cpu_to_le16 (fname_len (snd_nm));memcpy (dent1->name,fname_name (snd_nm),fname_len (snd_nm)); dent1->name[fname_len (snd_nm)] ='\0' ; +set_dent_cookie (c, dent1);zero_dent_node_unused (dent1);ubifs_prep_grp_node (c, dent1, dlen1,0 );
@@ -996,6 +997,7 @@ int ubifs_jnl_xrename(struct ubifs_info dent2->nlen =cpu_to_le16 (fname_len (fst_nm));memcpy (dent2->name,fname_name (fst_nm),fname_len (fst_nm)); dent2->name[fname_len (fst_nm)] ='\0' ; +set_dent_cookie (c, dent2);zero_dent_node_unused (dent2);ubifs_prep_grp_node (c, dent2, dlen2,0 );
Greg Kroah-Hartman
maintainerPATCH 132/196 ACPI / EC: Drop EC noirq hooks to fix a regression
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lv Zheng <[email protected]>
commit 662591461c4b9a1e3b9b159dbf37648a585ebaae upstream.
According to bug reports, although the busy polling mode can make noirq stages execute faster, it causes abnormal fan blowing up after system resume (see the first link below for a video demonstration) on Lenovo ThinkPad X1 Carbon - the 5th Generation. The problem can be fixed by upgrading the EC firmware on that machine.
However, many reporters confirm that the problem can be fixed by stopping busy polling during suspend/resume and for some of them upgrading the EC firmware is not an option.
For this reason, drop the noirq stage hooks from the EC driver to fix the regression.
--- drivers/acpi/ec.c | 19 ------------------- 1 file changed, 19 deletions(-)
drivers/acpi/ec.c +0 -19
@@ -1812,24 +1812,6 @@ error: }#ifdef CONFIG_PM_SLEEP -static int acpi_ec_suspend_noirq (struct device *dev) -{ -struct acpi_ec *ec = -acpi_driver_data (to_acpi_device (dev)); - -acpi_ec_enter_noirq (ec); -return 0 ; -} - -static int acpi_ec_resume_noirq (struct device *dev) -{ -struct acpi_ec *ec = -acpi_driver_data (to_acpi_device (dev)); - -acpi_ec_leave_noirq (ec); -return 0 ; -} -static int acpi_ec_suspend (struct device *dev) { struct acpi_ec *ec =
@@ -1851,7 +1833,6 @@ static int acpi_ec_resume(struct device#endif static const struct dev_pm_ops acpi_ec_pm = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(acpi_ec_suspend_noirq, acpi_ec_resume_noirq)SET_SYSTEM_SLEEP_PM_OPS (acpi_ec_suspend, acpi_ec_resume) };
Greg Kroah-Hartman
maintainerPATCH 133/196 Revert "ACPI / EC: Enable event freeze mode..." to fix a regression
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lv Zheng <[email protected]>
commit 9c40f956ce9b331493347d1b3cb7e384f7dc0581 upstream.
On Lenovo ThinkPad X1 Carbon - the 5th Generation, enabling an earlier EC event freezing timing causes acpitz-virtual-0 to report a stuck 48C temparature. And with EC firmware revisioned as 1.14, without reverting back to old EC event freezing timing, the fan still blows up after a system resume.
This reverts the culprit change so that the regression can be fixed without upgrading the EC firmware.
--- drivers/acpi/ec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/ec.c +1 -1
@@ -147,7 +147,7 @@ static unsigned int ec_storm_thresholdmodule_param (ec_storm_threshold, uint,0644 );MODULE_PARM_DESC (ec_storm_threshold,"Maxim false GPE numbers not considered as GPE storm" ); -static bool ec_freeze_events__read_mostly = true; +static bool ec_freeze_events__read_mostly = false;module_param (ec_freeze_events, bool,0644 );MODULE_PARM_DESC (ec_freeze_events,"Disabling event handling during suspend/resume" );
Greg Kroah-Hartman
maintainerPATCH 134/196 x86/acpi: Prevent out of bound access caused by broken ACPI tables
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Seunghun Han <[email protected]>
commit dad5ab0db8deac535d03e3fe3d8f2892173fa6a4 upstream.
The bus_irq argument of mp_override_legacy_irq() is used as the index into the isa_irq_to_gsi[] array. The bus_irq argument originates from ACPI_MADT_TYPE_IO_APIC and ACPI_MADT_TYPE_INTERRUPT items in the ACPI tables, but is nowhere sanity checked.
That allows broken or malicious ACPI tables to overwrite memory, which might cause malfunction, panic or arbitrary code execution.
Add a sanity check and emit a warning when that triggers.
[ tglx: Added warning and rewrote changelog ]
--- arch/x86/kernel/acpi/boot.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/x86/kernel/acpi/boot.c +8 -0
@@ -347,6 +347,14 @@ static void __init mp_override_legacy_irstruct mpc_intsrc mp_irq;/* +* Check bus_irq boundary. +*/ +if (bus_irq >=NR_IRQS_LEGACY ) { +pr_warn ("Invalid bus_irq %u for legacy override\n" , bus_irq); +return ; + } + +/* * Convert 'gsi' to 'ioapic.pin'. */ ioapic =mp_find_ioapic (gsi);
Greg Kroah-Hartman
maintainerPATCH 135/196 x86/ioapic: Pass the correct data to unmask_ioapic_irq()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Seunghun Han <[email protected]>
commit e708e35ba6d89ff785b225cd07dcccab04fa954a upstream.
One of the rarely executed code pathes in check_timer() calls unmask_ioapic_irq() passing irq_get_chip_data(0) as argument.
That's wrong as unmask_ioapic_irq() expects a pointer to the irq data of interrupt 0. irq_get_chip_data(0) returns NULL, so the following dereference in unmask_ioapic_irq() causes a kernel panic.
The issue went unnoticed in the first place because irq_get_chip_data() returns a void pointer so the compiler cannot do a type check on the argument. The code path was added for machines with broken configuration, but it seems that those machines are either not running current kernels or simply do not longer exist.
Hand in irq_get_irq_data(0) as argument which provides the correct data.
[ tglx: Rewrote changelog ]
--- arch/x86/kernel/apic/io_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2115,7 +2115,7 @@ static inline void __init check_timer(voint idx; idx =find_irq_entry (apic1, pin1, mp_INT);if (idx !=-1 &&irq_trigger (idx)) -unmask_ioapic_irq (irq_get_chip_data (0 )); +unmask_ioapic_irq (irq_get_irq_data (0 )); }irq_domain_deactivate_irq (irq_data);irq_domain_activate_irq (irq_data);
Greg Kroah-Hartman
maintainerPATCH 136/196 MIPS: Fix MIPS I ISA /proc/cpuinfo reporting
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit e5f5a5b06e51a36f6ddf31a4a485358263953a3d upstream.
Correct a commit 515a6393dbac ("MIPS: kernel: proc: Add MIPS R6 support to /proc/cpuinfo") regression that caused MIPS I systems to show no ISA levels supported in /proc/cpuinfo, e.g.:
system type : Digital DECstation 2100/3100
machine : Unknown
processor : 0
cpu model : R3000 V2.0 FPU V2.0
BogoMIPS : 10.69
wait instruction : no
microsecond timers : notlb_entries : 64
extra interrupt vector : no
hardware watchpoint : no
isa :
ASEs implemented :
shadow register sets : 1
kscratch registers : 0
package : 0
core : 0
VCED exceptions : not available
VCEI exceptions : not available
and similarly exclude mips1' from the ISA list for any processors below MIPSr1. This is because the condition to show mips1' on has been made cpu_has_mips_r1' rather than newly-introduced cpu_has_mips_1'. Use the correct condition then.
Patchwork: https://patchwork.linux-mips.org/patch/16758/
--- arch/mips/kernel/proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/proc.c +1 -1
@@ -83,7 +83,7 @@ static int show_cpuinfo(struct seq_file }seq_printf (m,"isa\t\t\t:" ); -if (cpu_has_mips_r1) +if (cpu_has_mips_1)seq_printf (m," mips1" );if (cpu_has_mips_2)seq_printf (m,"%s" ," mips2" );
Greg Kroah-Hartman
maintainerPATCH 137/196 MIPS: Save static registers before sysmips
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Hogan <[email protected]>
commit 49955d84cd9ccdca5a16a495e448e1a06fad9e49 upstream.
The MIPS sysmips system call handler may return directly from the MIPS_ATOMIC_SET case (mips_atomic_set()) to syscall_exit. This path restores the static (callee saved) registers, however they won't have been saved on entry to the system call.
Use the save_static_function() macro to create a __sys_sysmips wrapper function which saves the static registers before calling sys_sysmips, so that the correct static register state is restored by syscall_exit.
Patchwork: https://patchwork.linux-mips.org/patch/16149/
--- arch/mips/kernel/scall32-o32.S | 2 +- arch/mips/kernel/scall64-64.S | 2 +- arch/mips/kernel/scall64-n32.S | 2 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/mips/kernel/syscall.c | 6 ++++++ 5 files changed, 10 insertions(+), 4 deletions(-)
arch/mips/kernel/scall32-o32.S +1 -1
@@ -371,7 +371,7 @@ EXPORT(sys_call_table) PTR sys_writev PTR sys_cacheflush PTR sys_cachectl - PTR sys_sysmips + PTR __sys_sysmips PTR sys_ni_syscall /* 4150 */ PTR sys_getsid PTR sys_fdatasync
arch/mips/kernel/scall64-64.S +1 -1
@@ -311,7 +311,7 @@ EXPORT(sys_call_table) PTR sys_sched_getaffinity PTR sys_cacheflush PTR sys_cachectl - PTR sys_sysmips + PTR __sys_sysmips PTR sys_io_setup /* 5200 */ PTR sys_io_destroy PTR sys_io_getevents
arch/mips/kernel/scall64-n32.S +1 -1
@@ -302,7 +302,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_sched_getaffinity PTR sys_cacheflush PTR sys_cachectl - PTR sys_sysmips + PTR __sys_sysmips PTR compat_sys_io_setup /* 6200 */ PTR sys_io_destroy PTR compat_sys_io_getevents
arch/mips/kernel/scall64-o32.S +1 -1
@@ -371,7 +371,7 @@ EXPORT(sys32_call_table) PTR compat_sys_writev PTR sys_cacheflush PTR sys_cachectl - PTR sys_sysmips + PTR __sys_sysmips PTR sys_ni_syscall /* 4150 */ PTR sys_getsid PTR sys_fdatasync
arch/mips/kernel/syscall.c +6 -0
@@ -195,6 +195,12 @@ static inline int mips_atomic_set(unsignunreachable (); } +/* +* mips_atomic_set() normally returns directly via syscall_exit potentially +* clobbering static registers, so be sure to preserve them. +*/ +save_static_function (sys_sysmips); + SYSCALL_DEFINE3(sysmips, long, cmd, long, arg1, long, arg2) {switch (cmd) {
Greg Kroah-Hartman
maintainerPATCH 138/196 MIPS: Actually decode JALX in `__compute_return_epc_for_insn
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit a9db101b735a9d49295326ae41f610f6da62b08c upstream.
Complement commit fb6883e5809c ("MIPS: microMIPS: Support handling of delay slots.") and actually decode the regular MIPS JALX major instruction opcode, the handling of which has been added with the said commit for EPC calculation in `__compute_return_epc_for_insn'.
Patchwork: https://patchwork.linux-mips.org/patch/16394/
--- arch/mips/kernel/branch.c | 1 + 1 file changed, 1 insertion(+)
arch/mips/kernel/branch.c +1 -0
@@ -556,6 +556,7 @@ int __compute_return_epc_for_insn(struct/* * These are unconditional and in j_format. */ +case jalx_op:case jal_op: regs->regs[31 ] = regs->cp0_epc +8 ;case j_op:
Greg Kroah-Hartman
maintainerPATCH 139/196 MIPS: Fix unaligned PC interpretation in `compute_return_epc
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit 11a3799dbeb620bf0400b1fda5cc2c6bea55f20a upstream.
Fix a regression introduced with commit fb6883e5809c ("MIPS: microMIPS:
Support handling of delay slots.") and defer to `__compute_return_epc' if the ISA bit is set in EPC with non-MIPS16, non-microMIPS hardware, which will then arrange for a SIGBUS due to an unaligned instruction reference. Returning EPC here is never correct as the API defines this function's result to be either a negative error code on failure or one of 0 and BRANCH_LIKELY_TAKEN on success.
Patchwork: https://patchwork.linux-mips.org/patch/16395/
--- arch/mips/include/asm/branch.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/mips/include/asm/branch.h +1 -4
@@ -74,10 +74,7 @@ static inline int compute_return_epc(strreturn __microMIPS_compute_return_epc (regs);if (cpu_has_mips16)return __MIPS16e_compute_return_epc (regs); -return regs->cp0_epc; - } - -if (!delay_slot (regs)) { + }else if (!delay_slot (regs)) { regs->cp0_epc +=4 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 140/196 MIPS: math-emu: Prevent wrong ISA mode instruction emulation
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit 13769ebad0c42738831787e27c7c7f982e7da579 upstream.
Terminate FPU emulation immediately whenever an ISA mode switch has been observed. This is so that we do not interpret machine code in the wrong mode, for example when a regular MIPS FPU instruction has been placed in a delay slot of a jump that switches into the MIPS16 mode, as with the following code (taken from a GCC test suite case):
00400650 <set_fast_math>:
400650: 3c020100 lui v0,0x100
400654: 03e00008 jr ra
400658: 44c2f800 ctc1 v0,c1_fcsr
40065c: 00000000 nop
[...]
004012d0 <__libc_csu_init>:
4012d0: f000 6a02 li v0,2
4012d4: f150 0b1c la v1,3f9430 <_DYNAMIC-0x6df0>
4012d8: f400 3240 sll v0,16
4012dc: e269 addu v0,v1
4012de: 659a move gp,v0
4012e0: f00c 64f6 save a0-a2,48,ra,s0-s1
4012e4: 673c move s1,gp
4012e6: f010 9978 lw v1,-32744(s1)
4012ea: d204 sw v0,16(sp) 4012ec: eb40 jalr v1 4012ee: 653b move t9,v1 4012f0: f010 997c lw v1,-32740(s1) 4012f4: f030 9920 lw s1,-32736(s1) 4012f8: e32f subu v1,s1 4012fa: 326b sra v0,v1,2 4012fc: d206 sw v0,24(sp) 4012fe: 220c beqz v0,401318 <__libc_csu_init+0x48> 401300: 6800 li s0,0 401302: 99e0 lw a3,0(s1) 401304: 4801 addiu s0,1 401306: 960e lw a2,56(sp) 401308: 4904 addiu s1,4 40130a: 950d lw a1,52(sp) 40130c: 940c lw a0,48(sp) 40130e: ef40 jalr a3 401310: 653f move t9,a3 401312: 9206 lw v0,24(sp) 401314: ea0a cmp v0,s0 401316: 61f5 btnez 401302 <__libc_csu_init+0x32> 401318: 6476 restore 48,ra,s0-s1 40131a: e8a0 jrc ra
Here set_fast_math' is called from 40130e' (40130f' with the ISA bit) and emulation triggers for the CTC1 instruction. As it is in a jump delay slot emulation continues from 401312' (`401313' with the ISA bit). However we have no path to handle MIPS16 FPU code emulation, because there are no MIPS16 FPU instructions. So the default emulation path is taken, interpreting a 32-bit word fetched by get_user' from 401313' as a regular MIPS instruction, which is:
401313: f5ea0a92 sdc1 $f10,2706(t7)
This makes the FPU emulator proceed with the supposed SDC1 instruction and consequently makes the program considered here terminate with SIGSEGV.
A similar although less severe issue exists with pure-microMIPS processors in the case where similarly an FPU instruction is emulated in a delay slot of a register jump that (incorrectly) switches into the regular MIPS mode. A subsequent instruction fetch from the jump's target is supposed to cause an Address Error exception, however instead we proceed with regular MIPS FPU emulation.
For simplicity then, always terminate the emulation loop whenever a mode change is detected, denoted by an ISA mode bit flip. As from commit 377cb1b6c16a ("MIPS: Disable MIPS16/microMIPS crap for platforms not supporting these ASEs.") the result of `get_isa16_mode' can be hardcoded to 0, so we need to examine the ISA mode bit by hand.
This complements commit 102cedc32a6e ("MIPS: microMIPS: Floating point support.") which added JALX decoding to FPU emulation.
Patchwork: https://patchwork.linux-mips.org/patch/16393/
--- arch/mips/math-emu/cp1emu.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
arch/mips/math-emu/cp1emu.c +38 -0
@@ -2524,6 +2524,35 @@ dcopuop:return 0 ; } +/* +* Emulate FPU instructions. +* +* If we use FPU hardware, then we have been typically called to handle +* an unimplemented operation, such as where an operand is a NaN or +* denormalized. In that case exit the emulation loop after a single +* iteration so as to let hardware execute any subsequent instructions. +* +* If we have no FPU hardware or it has been disabled, then continue +* emulating floating-point instructions until one of these conditions +* has occurred: +* +* - a non-FPU instruction has been encountered, +* +* - an attempt to emulate has ended with a signal, +* +* - the ISA mode has been switched. +* +* We need to terminate the emulation loop if we got switched to the +* MIPS16 mode, whether supported or not, so that we do not attempt +* to emulate a MIPS16 instruction as a regular MIPS FPU instruction. +* Similarly if we got switched to the microMIPS mode and only the +* regular MIPS mode is supported, so that we do not attempt to emulate +* a microMIPS instruction as a regular MIPS FPU instruction. Or if +* we got switched to the regular MIPS mode and only the microMIPS mode +* is supported, so that we do not attempt to emulate a regular MIPS +* instruction that should cause an Address Error exception instead. +* For simplicity we always terminate upon an ISA mode switch. +*/ int fpu_emulator_cop1Handler (struct pt_regs *xcp,struct mips_fpu_struct *ctx,int has_fpu,void *__user *fault_addr) {
@@ -2609,6 +2638,15 @@ int fpu_emulator_cop1Handler(struct pt_rbreak ;if (sig)break ; +/* +* We have to check for the ISA bit explicitly here, +* because `get_isa16_mode' may return 0 if support +* for code compression has been globally disabled, +* or otherwise we may produce the wrong signal or +* even proceed successfully where we must not. +*/ +if ((xcp->cp0_epc ^ prevepc) &0x1 ) +break ;cond_resched (); }while (xcp->cp0_epc > prevepc);
Greg Kroah-Hartman
maintainerPATCH 141/196 MIPS: Send SIGILL for BPOSGE32 in `__compute_return_epc_for_insn
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit 7b82c1058ac1f8f8b9f2b8786b1f710a57a870a8 upstream.
Fix commit e50c0a8fa60d ("Support the MIPS32 / MIPS64 DSP ASE.") and send SIGILL rather than SIGBUS whenever an unimplemented BPOSGE32 DSP ASE instruction has been encountered in `__compute_return_epc_for_insn' as our Reserved Instruction exception handler would in response to an attempt to actually execute the instruction. Sending SIGBUS only makes sense for the unaligned PC case, since moved to __compute_return_epc'. Adjust function documentation accordingly, correct formatting and use pr_info' rather than `printk' as the other exit path already does.
Patchwork: https://patchwork.linux-mips.org/patch/16396/
--- arch/mips/kernel/branch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/mips/kernel/branch.c +4 -3
@@ -399,7 +399,7 @@ int __MIPS16e_compute_return_epc(struct* * @regs: Pointer to pt_regs * @insn: branch instruction to decode -* @returns: -EFAULT on error and forces SIGBUS, and on success +* @returns: -EFAULT on error and forces SIGILL, and on success * returns 0 or BRANCH_LIKELY_TAKEN as appropriate after * evaluating the branch. *
@@ -832,8 +832,9 @@ int __compute_return_epc_for_insn(structreturn ret; sigill_dsp: -printk ("%s: DSP branch but not DSP ASE - sending SIGBUS.\n" , current->comm); -force_sig (SIGBUS , current); +pr_info ("%s: DSP branch but not DSP ASE - sending SIGILL.\n" , + current->comm); +force_sig (SIGILL , current);return -EFAULT ; sigill_r6: pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n",
Greg Kroah-Hartman
maintainerPATCH 142/196 MIPS: Rename `sigill_r6 to `sigill_r2r6 in `__compute_return_epc_for_insn
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit 1f4edde422961397cf4470b347958c13c6a740bb upstream.
Use the more accurate `sigill_r2r6' name for the label used in the case of sending SIGILL in the absence of the instruction emulator for an earlier ISA level instruction that has been removed as from the R6 ISA, so that the `sigill_r6' name is freed for the situation where an R6 instruction is not supposed to be interpreted, because the executing processor does not support the R6 ISA.
Patchwork: https://patchwork.linux-mips.org/patch/16397/
--- arch/mips/kernel/branch.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/mips/kernel/branch.c +8 -8
@@ -431,7 +431,7 @@ int __compute_return_epc_for_insn(struct/* Fall through */ case jr_op:if (NO_R6EMU && insn.r_format.func == jr_op) - goto sigill_r6; + goto sigill_r2r6; regs->cp0_epc = regs->regs[insn.r_format.rs];break ; }
@@ -446,7 +446,7 @@ int __compute_return_epc_for_insn(structswitch (insn.i_format.rt) {case bltzl_op:if (NO_R6EMU ) - goto sigill_r6; + goto sigill_r2r6;case bltz_op:if ((long )regs->regs[insn.i_format.rs] <0 ) { epc = epc +4 + (insn.i_format.simmediate <<2 );
@@ -459,7 +459,7 @@ int __compute_return_epc_for_insn(structcase bgezl_op:if (NO_R6EMU ) - goto sigill_r6; + goto sigill_r2r6;case bgez_op:if ((long )regs->regs[insn.i_format.rs] >=0 ) { epc = epc +4 + (insn.i_format.simmediate <<2 );
@@ -574,7 +574,7 @@ int __compute_return_epc_for_insn(struct*/ case beql_op:if (NO_R6EMU ) - goto sigill_r6; + goto sigill_r2r6;case beq_op:if (regs->regs[insn.i_format.rs] == regs->regs[insn.i_format.rt]) {
@@ -588,7 +588,7 @@ int __compute_return_epc_for_insn(structcase bnel_op:if (NO_R6EMU ) - goto sigill_r6; + goto sigill_r2r6;case bne_op:if (regs->regs[insn.i_format.rs] != regs->regs[insn.i_format.rt]) {
@@ -602,7 +602,7 @@ int __compute_return_epc_for_insn(structcase blezl_op:/* not really i_format */ if (!insn.i_format.rt &&NO_R6EMU ) - goto sigill_r6; + goto sigill_r2r6;case blez_op:/* * Compact branches for R6 for the
@@ -637,7 +637,7 @@ int __compute_return_epc_for_insn(structcase bgtzl_op:if (!insn.i_format.rt &&NO_R6EMU ) - goto sigill_r6; + goto sigill_r2r6;case bgtz_op:/* * Compact branches for R6 for the
@@ -836,7 +836,7 @@ sigill_dsp: current->comm);force_sig (SIGILL , current);return -EFAULT ; -sigill_r6: +sigill_r2r6:pr_info ("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n" , current->comm);force_sig (SIGILL , current);
Greg Kroah-Hartman
maintainerPATCH 143/196 MIPS: Send SIGILL for linked branches in `__compute_return_epc_for_insn
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit fef40be6da856afead4177aaa9d869a66fb3381f upstream.
Fix commit 319824eabc3f ("MIPS: kernel: branch: Do not emulate the branch likelies on MIPS R6") and also send SIGILL rather than returning -SIGILL for BLTZAL, BLTZALL, BGEZAL and BGEZALL instruction encodings no longer supported in R6, except where emulated. Returning -SIGILL is never correct as the API defines this function's result upon error to be -EFAULT and a signal actually issued.
Patchwork: https://patchwork.linux-mips.org/patch/16398/
--- arch/mips/kernel/branch.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
arch/mips/kernel/branch.c +4 -8
@@ -473,10 +473,8 @@ int __compute_return_epc_for_insn(structcase bltzal_op:case bltzall_op:if (NO_R6EMU && (insn.i_format.rs || - insn.i_format.rt == bltzall_op)) { - ret = -SIGILL ; -break ; - } + insn.i_format.rt == bltzall_op)) + goto sigill_r2r6; regs->regs[31 ] = epc +8 ;/* * OK we are here either because we hit a NAL
@@ -507,10 +505,8 @@ int __compute_return_epc_for_insn(structcase bgezal_op:case bgezall_op:if (NO_R6EMU && (insn.i_format.rs || - insn.i_format.rt == bgezall_op)) { - ret = -SIGILL ; -break ; - } + insn.i_format.rt == bgezall_op)) + goto sigill_r2r6; regs->regs[31 ] = epc +8 ;/* * OK we are here either because we hit a BAL
Greg Kroah-Hartman
maintainerPATCH 144/196 MIPS: Send SIGILL for R6 branches in `__compute_return_epc_for_insn
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit a60b1a5bf88a250f1a77977c0224e502c901c77b upstream.
Fix:
* commit 8467ca0122e2 ("MIPS: Emulate the new MIPS R6 branch compact (BC) instruction"),
* commit 84fef630127a ("MIPS: Emulate the new MIPS R6 BALC instruction"),
* commit 69b9a2fd05a3 ("MIPS: Emulate the new MIPS R6 BEQZC and JIC instructions"),
* commit 28d6f93d201d ("MIPS: Emulate the new MIPS R6 BNEZC and JIALC instructions"),
* commit c893ce38b265 ("MIPS: Emulate the new MIPS R6 BOVC, BEQC and BEQZALC instructions")
and send SIGILL rather than returning -SIGILL for R6 branch and jump instructions. Returning -SIGILL is never correct as the API defines this function's result upon error to be -EFAULT and a signal actually issued.
Patchwork: https://patchwork.linux-mips.org/patch/16399/
--- arch/mips/kernel/branch.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-)
arch/mips/kernel/branch.c +15 -20
@@ -771,35 +771,27 @@ int __compute_return_epc_for_insn(struct#else case bc6_op:/* Only valid for MIPS R6 */ -if (!cpu_has_mips_r6) { - ret = -SIGILL ; -break ; - } +if (!cpu_has_mips_r6) + goto sigill_r6; regs->cp0_epc +=8 ;break ;case balc6_op: -if (!cpu_has_mips_r6) { - ret = -SIGILL ; -break ; - } +if (!cpu_has_mips_r6) + goto sigill_r6;/* Compact branch: BALC */ regs->regs[31 ] = epc +4 ; epc +=4 + (insn.i_format.simmediate <<2 ); regs->cp0_epc = epc;break ;case pop66_op: -if (!cpu_has_mips_r6) { - ret = -SIGILL ; -break ; - } +if (!cpu_has_mips_r6) + goto sigill_r6;/* Compact branch: BEQZC || JIC */ regs->cp0_epc +=8 ;break ;case pop76_op: -if (!cpu_has_mips_r6) { - ret = -SIGILL ; -break ; - } +if (!cpu_has_mips_r6) + goto sigill_r6;/* Compact branch: BNEZC || JIALC */ if (!insn.i_format.rs) {/* JIALC: set $31/ra */
@@ -811,10 +803,8 @@ int __compute_return_epc_for_insn(structcase pop10_op:case pop30_op:/* Only valid for MIPS R6 */ -if (!cpu_has_mips_r6) { - ret = -SIGILL ; -break ; - } +if (!cpu_has_mips_r6) + goto sigill_r6;/* * Compact branches: * bovc, beqc, beqzalc, bnvc, bnec, bnezlac
@@ -837,6 +827,11 @@ sigill_r2r6: current->comm);force_sig (SIGILL , current);return -EFAULT ; +sigill_r6: +pr_info ("%s: R6 branch but no MIPSr6 ISA support - sending SIGILL.\n" , + current->comm); +force_sig (SIGILL , current); +return -EFAULT ; }EXPORT_SYMBOL_GPL (__compute_return_epc_for_insn);
Greg Kroah-Hartman
maintainerPATCH 145/196 MIPS: Fix a typo: s/preset/present/ in r2-to-r6 emulation error message
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit 27fe2200dad2de8207a694024a7b9037dff1b280 upstream.
This is a user-visible message, so we want it to be spelled correctly.
Patchwork: https://patchwork.linux-mips.org/patch/16400/
--- arch/mips/kernel/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/branch.c +1 -1
@@ -823,7 +823,7 @@ sigill_dsp:force_sig (SIGILL , current);return -EFAULT ; sigill_r2r6: -pr_info ("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n" , +pr_info ("%s: R2 branch but r2-to-r6 emulator is not present - sending SIGILL.\n" , current->comm);force_sig (SIGILL , current);return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 146/196 Input: i8042 - fix crash at boot time
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Hong <[email protected]>
commit 340d394a789518018f834ff70f7534fc463d3226 upstream.
The driver checks port->exists twice in i8042_interrupt(), first when trying to assign temporary "serio" variable, and second time when deciding whether it should call serio_interrupt(). The value of port->exists may change between the 2 checks, and we may end up calling serio_interrupt() with a NULL pointer:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000050 IP: [<ffffffff8150feaf>] _spin_lock_irqsave+0x1f/0x40 PGD 0 Oops: 0002 [#1] SMP last sysfs file: CPU 0 Modules linked in:
Pid: 1, comm: swapper Not tainted 2.6.32-358.el6.x86_64 #1 QEMU Standard PC (i440FX + PIIX, 1996)
RIP: 0010:[<ffffffff8150feaf>] [<ffffffff8150feaf>] _spin_lock_irqsave+0x1f/0x40 RSP: 0018:ffff880028203cc0 EFLAGS: 00010082 RAX: 0000000000010000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: 0000000000000282 RSI: 0000000000000098 RDI: 0000000000000050 RBP: ffff880028203cc0 R08: ffff88013e79c000 R09: ffff880028203ee0 R10: 0000000000000298 R11: 0000000000000282 R12: 0000000000000050 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000098 FS: 0000000000000000(0000) GS:ffff880028200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b CR2: 0000000000000050 CR3: 0000000001a85000 CR4: 00000000001407f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process swapper (pid: 1, threadinfo ffff88013e79c000, task ffff88013e79b500) Stack: ffff880028203d00 ffffffff813de186 ffffffffffffff02 0000000000000000 <d> 0000000000000000 0000000000000000 0000000000000000 0000000000000098 <d> ffff880028203d70 ffffffff813e0162 ffff880028203d20 ffffffff8103b8ac Call Trace: <IRQ> [<ffffffff813de186>] serio_interrupt+0x36/0xa0 [<ffffffff813e0162>] i8042_interrupt+0x132/0x3a0 [<ffffffff8103b8ac>] ? kvm_clock_read+0x1c/0x20 [<ffffffff8103b8b9>] ? kvm_clock_get_cycles+0x9/0x10 [<ffffffff810e1640>] handle_IRQ_event+0x60/0x170 [<ffffffff8103b154>] ? kvm_guest_apic_eoi_write+0x44/0x50 [<ffffffff810e3d8e>] handle_edge_irq+0xde/0x180 [<ffffffff8100de89>] handle_irq+0x49/0xa0 [<ffffffff81516c8c>] do_IRQ+0x6c/0xf0 [<ffffffff8100b9d3>] ret_from_intr+0x0/0x11 [<ffffffff81076f63>] ? __do_softirq+0x73/0x1e0 [<ffffffff8109b75b>] ? hrtimer_interrupt+0x14b/0x260 [<ffffffff8100c1cc>] ? call_softirq+0x1c/0x30 [<ffffffff8100de05>] ? do_softirq+0x65/0xa0 [<ffffffff81076d95>] ? irq_exit+0x85/0x90 [<ffffffff81516d80>] ? smp_apic_timer_interrupt+0x70/0x9b [<ffffffff8100bb93>] ? apic_timer_interrupt+0x13/0x20
To avoid the issue let's change the second check to test whether serio is NULL or not.
Also, let's take i8042_lock in i8042_start() and i8042_stop() instead of trying to be overly smart and using memory barriers.
--- drivers/input/serio/i8042.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/input/serio/i8042.c +9 -3
@@ -436,8 +436,10 @@ static int i8042_start(struct serio *ser {struct i8042_port *port = serio->port_data; +spin_lock_irq (&i8042_lock); port->exists = true; -mb (); +spin_unlock_irq (&i8042_lock); +return 0 ; }
@@ -450,16 +452,20 @@ static void i8042_stop(struct serio *ser {struct i8042_port *port = serio->port_data; +spin_lock_irq (&i8042_lock); port->exists = false; + port->serio =NULL ; +spin_unlock_irq (&i8042_lock);/* +* We need to make sure that interrupt handler finishes using +* our serio port before we return from this function. * We synchronize with both AUX and KBD IRQs because there is * a (very unlikely) chance that AUX IRQ is raised for KBD port * and vice versa. */ synchronize_irq (I8042_AUX_IRQ );synchronize_irq (I8042_KBD_IRQ ); - port->serio =NULL ; }/*
@@ -576,7 +582,7 @@ static irqreturn_t i8042_interrupt(int ispin_unlock_irqrestore (&i8042_lock, flags); -if (likely (port->exists && !filtered)) +if (likely (serio && !filtered))serio_interrupt (serio, data, dfl); out:
Greg Kroah-Hartman
maintainerPATCH 147/196 IB/iser: Fix connection teardown race condition
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Neyelov <[email protected]>
commit c8c16d3bae967f1c7af541e8d016e5c51e4f010a upstream.
Under heavy iser target(scst) start/stop stress during login/logout on iser intitiator side happened trace call provided below.
The function iscsi_iser_slave_alloc iser_conn pointer could be NULL, due to the fact that function iscsi_iser_conn_stop can be called before and free iser connection. Let's protect that flow by introducing global mutex.
BUG: unable to handle kernel paging request at 0000000000001018 IP: [<ffffffffc0426f7e>] iscsi_iser_slave_alloc+0x1e/0x50 [ib_iser] Call Trace: ? scsi_alloc_sdev+0x242/0x300 scsi_probe_and_add_lun+0x9e1/0xea0 ? kfree_const+0x21/0x30 ? kobject_set_name_vargs+0x76/0x90 ? __pm_runtime_resume+0x5b/0x70 __scsi_scan_target+0xf6/0x250 scsi_scan_target+0xea/0x100 iscsi_user_scan_session.part.13+0x101/0x130 [scsi_transport_iscsi] ? iscsi_user_scan_session.part.13+0x130/0x130 [scsi_transport_iscsi] iscsi_user_scan_session+0x1e/0x30 [scsi_transport_iscsi] device_for_each_child+0x50/0x90 iscsi_user_scan+0x44/0x60 [scsi_transport_iscsi] store_scan+0xa8/0x100 ? common_file_perm+0x5d/0x1c0 dev_attr_store+0x18/0x30 sysfs_kf_write+0x37/0x40 kernfs_fop_write+0x12c/0x1c0 __vfs_write+0x18/0x40 vfs_write+0xb5/0x1a0 SyS_write+0x55/0xc0
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/infiniband/ulp/iser/iscsi_iser.c +11 -0
@@ -83,6 +83,7 @@ static struct scsi_host_template iscsi_istatic struct iscsi_transport iscsi_iser_transport;static struct scsi_transport_template *iscsi_iser_scsi_transport;static struct workqueue_struct *release_wq; +static DEFINE_MUTEX (unbind_iser_conn_mutex);struct iser_global ig;int iser_debug_level =0 ;
@@ -550,12 +551,14 @@ iscsi_iser_conn_stop(struct iscsi_cls_co*/ if (iser_conn) {mutex_lock (&iser_conn->state_mutex); +mutex_lock (&unbind_iser_conn_mutex);iser_conn_terminate (iser_conn);iscsi_conn_stop (cls_conn, flag);/* unbind */ iser_conn->iscsi_conn =NULL ; conn->dd_data =NULL ; +mutex_unlock (&unbind_iser_conn_mutex);complete (&iser_conn->stop_completion);mutex_unlock (&iser_conn->state_mutex);
@@ -977,13 +980,21 @@ static int iscsi_iser_slave_alloc(structstruct iser_conn *iser_conn;struct ib_device *ib_dev; +mutex_lock (&unbind_iser_conn_mutex); + session =starget_to_session (scsi_target (sdev))->dd_data; iser_conn = session->leadconn->dd_data; +if (!iser_conn) { +mutex_unlock (&unbind_iser_conn_mutex); +return -ENOTCONN ; + } ib_dev = iser_conn->ib_conn.device->ib_device;if (!(ib_dev->attrs.device_cap_flags &IB_DEVICE_SG_GAPS_REG ))blk_queue_virt_boundary (sdev->request_queue, ~MASK_4K ); +mutex_unlock (&unbind_iser_conn_mutex); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 148/196 IB/core: Namespace is mandatory input for address resolution
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moni Shoua <[email protected]>
commit bebb2a473a43c8f84a8210687d1cbdde503046d7 upstream.
In function addr_resolve() the namespace is a required input parameter and not an output. It is passed later for searching the routing table and device addresses. Also, it shouldn't be copied back to the caller.
--- drivers/infiniband/core/addr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/infiniband/core/addr.c +5 -1
@@ -510,6 +510,11 @@ static int addr_resolve(struct sockaddrstruct dst_entry *dst;int ret; +if (!addr->net) { +pr_warn_ratelimited ("%s: missing namespace\n" , __func__); +return -EINVAL ; + } +if (src_in->sa_family ==AF_INET ) {struct rtable *rt =NULL ; const struct sockaddr_in *dst_in4 =
@@ -547,7 +552,6 @@ static int addr_resolve(struct sockaddr } addr->bound_dev_if = ndev->ifindex; - addr->net =dev_net (ndev);dev_put (ndev);return ret;
Greg Kroah-Hartman
maintainerPATCH 149/196 sunrpc: use constant time memory comparison for mac
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason A. Donenfeld <[email protected]>
commit 15a8b93fd5690de017ce665382ea45e5d61811a4 upstream.
Otherwise, we enable a MAC forgery via timing attack.
--- net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sunrpc/auth_gss/gss_krb5_crypto.c +2 -1
@@ -34,6 +34,7 @@* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <crypto/algapi.h> #include <crypto/hash.h> #include <crypto/skcipher.h> #include <linux/err.h>
@@ -927,7 +928,7 @@ gss_krb5_aes_decrypt(struct krb5_ctx *kcif (ret) goto out_err; -if (memcmp (pkt_hmac, our_hmac, kctx->gk5e->cksumlength) !=0 ) { +if (crypto_memneq (pkt_hmac, our_hmac, kctx->gk5e->cksumlength) !=0 ) { ret =GSS_S_BAD_SIG ; goto out_err; }
Greg Kroah-Hartman
maintainerPATCH 150/196 net/sunrpc/xprt_sock: fix regression in connection error reporting.
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
commit 3ffbc1d65583394be12801655781dd2b079ce169 upstream.
Commit 3d4762639dd3 ("tcp: remove poll() flakes when receiving RST") in v4.12 changed the order in which ->sk_state_change() and ->sk_error_report() are called when a socket is shut down - sk_state_change() is now called first.
This causes xs_tcp_state_change() -> xs_sock_mark_closed() -> xprt_disconnect_done() to wake all pending tasked with -EAGAIN. When the ->sk_error_report() callback arrives, it is too late to pass the error on, and it is lost.
As easy way to demonstrate the problem caused is to try to start rpc.nfsd while rcpbind isn't running.
nfsd will attempt a tcp connection to rpcbind. A ECONNREFUSED error is returned, but sunrpc code loses the error and keeps retrying. If it saw the ECONNREFUSED, it would abort.
To fix this, handle the sk->sk_err in the TCP_CLOSE branch of xs_tcp_state_change().
--- net/sunrpc/xprtsock.c | 2 ++ 1 file changed, 2 insertions(+)
net/sunrpc/xprtsock.c +2 -0
@@ -1624,6 +1624,8 @@ static void xs_tcp_state_change(struct sif (test_and_clear_bit (XPRT_SOCK_CONNECTING , &transport->sock_state))xprt_clear_connecting (xprt); +if (sk->sk_err) +xprt_wake_pending_tasks (xprt, -sk->sk_err);xs_sock_mark_closed (xprt); } out:
Greg Kroah-Hartman
maintainerPATCH 151/196 NFS: Fix initialization of nfs_page_array->npages
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
commit 2eb3aea7d9c43325a12df312adfc7fb25bbd636b upstream.
Commit 8ef9b0b9e1c0 open-coded nfs_pgarray_set(), and left out the initialization of the nfs_page_array's npages. This mistake didn't show up until testing with block layouts, and there shows that all pNFS reads return -EIO.
--- fs/nfs/pagelist.c | 1 + 1 file changed, 1 insertion(+)
fs/nfs/pagelist.c +1 -0
@@ -779,6 +779,7 @@ int nfs_generic_pgio(struct nfs_pageio_dgfp_t gfp_flags =GFP_KERNEL ; pagecount =nfs_page_array_len (mirror->pg_base, mirror->pg_count); + pg_array->npages = pagecount;if (pagecount <=ARRAY_SIZE (pg_array->page_array)) pg_array->pagevec = pg_array->page_array;
Greg Kroah-Hartman
maintainerPATCH 152/196 PNFS fix EACCESS on commit to DS handling
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Kornievskaia <[email protected]>
commit a0bc01e0f1fa39702b5244b3bac699bea0d4f413 upstream.
Commit fabbbee0eb0f "PNFS fix fallback to MDS if got error on commit to DS" moved the pnfs_set_lo_fail() to unhandled errors which was not correct and lead to a kernel oops on umount.
Instead, fix the original EACCESS on commit to DS error by getting the new layout and re-doing the IO.
--- fs/nfs/filelayout/filelayout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfs/filelayout/filelayout.c +2 -1
@@ -172,6 +172,7 @@ static int filelayout_async_handle_errorcase -NFS4ERR_RETRY_UNCACHED_REP :break ;/* Invalidate Layout errors */ +case -NFS4ERR_ACCESS :case -NFS4ERR_PNFS_NO_LAYOUT :case -ESTALE :/* mapped NFS4ERR_STALE */ case -EBADHANDLE :/* mapped NFS4ERR_BADHANDLE */
@@ -202,10 +203,10 @@ static int filelayout_async_handle_error task->tk_status);nfs4_mark_deviceid_unavailable (devid);pnfs_error_mark_layout_for_return (inode, lseg); +pnfs_set_lo_fail (lseg);rpc_wake_up (&tbl->slot_tbl_waitq);/* fall through */ default : -pnfs_set_lo_fail (lseg); reset:dprintk ("%s Retry through MDS. Error %d\n" , __func__, task->tk_status);
Greg Kroah-Hartman
maintainerPATCH 153/196 NFS: only invalidate dentrys that are clearly invalid.
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
commit cc89684c9a265828ce061037f1f79f4a68ccd3f7 upstream.
Since commit bafc9b754f75 ("vfs: More precise tests in d_invalidate") in v3.18, a return of '0' from ->d_revalidate() will cause the dentry to be invalidated even if it has filesystems mounted on or it or on a descendant. The mounted filesystem is unmounted.
This means we need to be careful not to return 0 unless the directory referred to truly is invalid. So -ESTALE or -ENOENT should invalidate the directory. Other errors such a -EPERM or -ERESTARTSYS should be returned from ->d_revalidate() so they are propagated to the caller.
A particular problem can be demonstrated by:
1/ mount an NFS filesystem using NFSv3 on /mnt
2/ mount any other filesystem on /mnt/foo
3/ ls /mnt/foo
4/ turn off network, or otherwise make the server unable to respond 5/ ls /mnt/foo &
6/ cat /proc/$!/stack # note that nfs_lookup_revalidate is in the call stack 7/ kill -9 $! # this results in -ERESTARTSYS being returned
8/ observe that /mnt/foo has been unmounted.
This patch changes nfs_lookup_revalidate() to only treat
-ESTALE from nfs_lookup_verify_inode() and -ESTALE or -ENOENT from ->lookup()
as indicating an invalid inode. Other errors are returned.
Also nfs_check_inode_attributes() is changed to return -ESTALE rather than -EIO. This is consistent with the error returned in similar circumstances from nfs_update_inode().
As this bug allows any user to unmount a filesystem mounted on an NFS filesystem, this fix is suitable for stable kernels.
--- fs/nfs/dir.c | 12 ++++++++---- fs/nfs/inode.c | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-)
fs/nfs/dir.c +8 -4
@@ -1115,11 +1115,13 @@ static int nfs_lookup_revalidate(struct/* Force a full look up iff the parent directory has changed */ if (!nfs_is_exclusive_create (dir, flags) &&nfs_check_verifier (dir, dentry, flags &LOOKUP_RCU )) { - -if (nfs_lookup_verify_inode (inode, flags)) { + error =nfs_lookup_verify_inode (inode, flags); +if (error) {if (flags &LOOKUP_RCU )return -ECHILD ; - goto out_zap_parent; +if (error == -ESTALE ) + goto out_zap_parent; + goto out_error; }nfs_advise_use_readdirplus (dir); goto out_valid;
@@ -1144,8 +1146,10 @@ static int nfs_lookup_revalidate(structtrace_nfs_lookup_revalidate_enter (dir, dentry, flags); error =NFS_PROTO (dir)->lookup (dir, &dentry->d_name, fhandle, fattr, label);trace_nfs_lookup_revalidate_exit (dir, dentry, flags, error); -if (error) +if (error == -ESTALE || error == -ENOENT ) goto out_bad; +if (error) + goto out_error;if (nfs_compare_fh (NFS_FH (inode), fhandle)) goto out_bad;if ((error =nfs_refresh_inode (inode, fattr)) !=0 )
fs/nfs/inode.c +2 -2
@@ -1315,9 +1315,9 @@ static int nfs_check_inode_attributes(streturn 0 ;/* Has the inode gone and changed behind our back? */ if ((fattr->valid &NFS_ATTR_FATTR_FILEID ) && nfsi->fileid != fattr->fileid) -return -EIO ; +return -ESTALE ;if ((fattr->valid &NFS_ATTR_FATTR_TYPE ) && (inode->i_mode &S_IFMT ) != (fattr->mode &S_IFMT )) -return -EIO ; +return -ESTALE ;if (!nfs_file_has_buffered_writers (nfsi)) {/* Verify a few of the more important attributes */
Greg Kroah-Hartman
maintainerPATCH 154/196 udf: Fix races with i_size changes during readpage
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 9795e0e8ac0d6a3ee092f1b555b284b57feef99e upstream.
__udf_adinicb_readpage() uses i_size several times. When truncate changes i_size while the function is running, it can observe several different values and thus e.g. expose uninitialized parts of page to userspace. Also use i_size_read() in the function since it does not hold inode_lock. Since i_size is guaranteed to be small, this cannot really cause any issues even on 32-bit archs but let's be careful.
--- fs/udf/file.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/udf/file.c +7 -2
@@ -43,10 +43,15 @@ static void __udf_adinicb_readpage(strucstruct inode *inode = page->mapping->host;char *kaddr;struct udf_inode_info *iinfo =UDF_I (inode); +loff_t isize =i_size_read (inode); +/* +* We have to be careful here as truncate can change i_size under us. +* So just sample it once and use the same value everywhere. +*/ kaddr =kmap_atomic (page); -memcpy (kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size); -memset (kaddr + inode->i_size,0 ,PAGE_SIZE - inode->i_size); +memcpy (kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, isize); +memset (kaddr + isize,0 ,PAGE_SIZE - isize);flush_dcache_page (page);SetPageUptodate (page);kunmap_atomic (kaddr);
Greg Kroah-Hartman
maintainerPATCH 155/196 udf: Fix deadlock between writeback and udf_setsize()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit f2e95355891153f66d4156bf3a142c6489cd78c6 upstream.
udf_setsize() called truncate_setsize() with i_data_sem held. Thus truncate_pagecache() called from truncate_setsize() could lock a page under i_data_sem which can deadlock as page lock ranks below i_data_sem - e. g. writeback can hold page lock and try to acquire i_data_sem to map a block.
Fix the problem by moving truncate_setsize() calls from under i_data_sem. It is safe for us to change i_size without holding i_data_sem as all the places that depend on i_size being stable already hold inode_lock.
--- fs/udf/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/udf/inode.c +2 -2
@@ -1222,8 +1222,8 @@ int udf_setsize(struct inode *inode, lofreturn err; } set_size: -truncate_setsize (inode, newsize);up_write (&iinfo->i_data_sem); +truncate_setsize (inode, newsize); }else {if (iinfo->i_alloc_type ==ICBTAG_FLAG_AD_IN_ICB ) {down_write (&iinfo->i_data_sem);
@@ -1240,9 +1240,9 @@ set_size: udf_get_block);if (err)return err; +truncate_setsize (inode, newsize);down_write (&iinfo->i_data_sem);udf_clear_extent_cache (inode); -truncate_setsize (inode, newsize);udf_truncate_extents (inode);up_write (&iinfo->i_data_sem); }
Greg Kroah-Hartman
maintainerPATCH 156/196 target: Fix COMPARE_AND_WRITE caw_sem leak during se_cmd quiesce
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiang Yi <[email protected]>
commit 1d6ef276594a781686058802996e09c8550fd767 upstream.
This patch addresses a COMPARE_AND_WRITE se_device->caw_sem leak, that would be triggered during normal se_cmd shutdown or abort via __transport_wait_for_tasks().
This would occur because target_complete_cmd() would catch this early and do complete_all(&cmd->t_transport_stop_comp), but since target_complete_ok_work() or target_complete_failure_work() are never called to invoke se_cmd->transport_complete_callback(), the COMPARE_AND_WRITE specific callbacks never release caw_sem.
To address this special case, go ahead and release caw_sem directly from target_complete_cmd().
(Remove '&& success' from check, to release caw_sem regardless
of scsi_status - nab)
--- drivers/target/target_core_transport.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/target/target_core_transport.c +9 -0
@@ -730,6 +730,15 @@ void target_complete_cmd(struct se_cmd *if (cmd->transport_state &CMD_T_ABORTED || cmd->transport_state &CMD_T_STOP ) {spin_unlock_irqrestore (&cmd->t_state_lock, flags); +/* +* If COMPARE_AND_WRITE was stopped by __transport_wait_for_tasks(), +* release se_device->caw_sem obtained by sbc_compare_and_write() +* since target_complete_ok_work() or target_complete_failure_work() +* won't be called to invoke the normal CAW completion callbacks. +*/ +if (cmd->se_cmd_flags &SCF_COMPARE_AND_WRITE ) { +up (&dev->caw_sem); + }complete_all (&cmd->t_transport_stop_comp);return ; }else if (!success) {
Greg Kroah-Hartman
maintainerPATCH 157/196 iser-target: Avoid isert_conn->cm_id dereference in isert_login_recv_done
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit fce50a2fa4e9c6e103915c351b6d4a98661341d6 upstream.
This patch fixes a NULL pointer dereference in isert_login_recv_done() of isert_conn->cm_id due to isert_cma_handler() -> isert_connect_error() resetting isert_conn->cm_id = NULL during a failed login attempt.
As per Sagi, we will always see the completion of all recv wrs posted on the qp (given that we assigned a ->done handler), this is a FLUSH error completion, we just don't get to verify that because we deref NULL before.
The issue here, was the assumption that dereferencing the connection cm_id is always safe, which is not true since:
commit 4a579da2586bd3b79b025947ea24ede2bbfede62
Author: Sagi Grimberg <[email protected]>
Date: Sun Mar 29 15:52:04 2015 +0300
iser-target: Fix possible deadlock in RDMA_CM connection error
As I see it, we have a direct reference to the isert_device from isert_conn which is the one-liner fix that we actually need like we do in isert_rdma_read_done() and isert_rdma_write_done().
--- drivers/infiniband/ulp/isert/ib_isert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/ulp/isert/ib_isert.c +1 -1
@@ -1452,7 +1452,7 @@ static void isert_login_recv_done(struct ib_cq *cq, struct ib_wc *wc) { struct isert_conn *isert_conn = wc->qp->qp_context; -struct ib_device *ib_dev = isert_conn->cm_id->device; +struct ib_device *ib_dev = isert_conn->device->ib_device;if (unlikely (wc->status !=IB_WC_SUCCESS )) {isert_print_wc (wc,"login recv" );
Greg Kroah-Hartman
maintainerPATCH 159/196 perf/core: Fix scheduling regression of pinned groups
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Shishkin <[email protected]>
commit 3bda69c1c3993a2bddbae01397d12bfef6054011 upstream.
Vince Weaver reported:
Quoted 18 lines
I was tracking down some regressions in my
perf_event_testtestsuite. Some of the tests broke in the 4.11-rc1 timeframe.I've bisected one of them, this report is about
tests/overflow/simul_oneshot_group_overflow
This test creates an event group containing two sampling events, set to overflow to a signal handler (which disables and then refreshes the event).On a good kernel you get the following:
Event perf::instructions with period 1000000 Event perf::instructions with period 2000000 fd 3 overflows: 946 (perf::instructions/1000000) fd 4 overflows: 473 (perf::instructions/2000000) Ending counts: Count 0: 946379875 Count 1: 946365218
Quoted 8 lines
With the broken kernels you get:
Event perf::instructions with period 1000000 Event perf::instructions with period 2000000 fd 3 overflows: 938 (perf::instructions/1000000) fd 4 overflows: 318 (perf::instructions/2000000) Ending counts: Count 0: 946373080 Count 1: 653373058
The root cause of the bug is that the following commit:
487f05e18a ("perf/core: Optimize event rescheduling on active contexts")
erronously assumed that event's 'pinned' setting determines whether the event belongs to a pinned group or not, but in fact, it's the group leader's pinned state that matters.
This was discovered by Vince in the test case described above, where two instruction counters are grouped, the group leader is pinned, but the other event is not; in the regressed case the counters were off by 33% (the difference between events' periods), but should be the same within the error margin.
Fix the problem by looking at the group leader's pinning.
--- kernel/events/core.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/events/core.c +7 -0
@@ -1456,6 +1456,13 @@ static enum event_type_t get_event_type(lockdep_assert_held (&ctx->lock); +/* +* It's 'group type', really, because if our group leader is +* pinned, so are we. +*/ +if (event->group_leader != event) + event = event->group_leader; + event_type = event->attr.pinned ?EVENT_PINNED :EVENT_FLEXIBLE ;if (!ctx->task) event_type |=EVENT_CPU ;
Greg Kroah-Hartman
maintainerPATCH 160/196 Revert "perf/core: Drop kernel samples even though :u is specified"
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ingo Molnar <[email protected]>
commit 6a8a75f3235724c5941a33e287b2f98966ad14c5 upstream.
This reverts commit cc1582c231ea041fbc68861dfaf957eaf902b829.
This commit introduced a regression that broke rr-project, which uses sampling events to receive a signal on overflow (but does not care about the contents of the sample). These signals are critical to the correct operation of rr.
There's been some back and forth about how to fix it - but to not keep applications in limbo queue up a revert.
--- kernel/events/core.c | 21 --------------------- 1 file changed, 21 deletions(-)
kernel/events/core.c +0 -21
@@ -7323,21 +7323,6 @@ int perf_event_account_interrupt(structreturn __perf_event_account_interrupt (event,1 ); } -static bool sample_is_allowed (struct perf_event *event,struct pt_regs *regs) -{ -/* -* Due to interrupt latency (AKA "skid"), we may enter the -* kernel before taking an overflow, even if the PMU is only -* counting user events. -* To avoid leaking information to userspace, we must always -* reject kernel samples when exclude_kernel is set. -*/ -if (event->attr.exclude_kernel && !user_mode (regs)) -return false; - -return true; -} -/* * Generic event overflow handling, sampling. */
@@ -7359,12 +7344,6 @@ static int __perf_event_overflow(struct ret =__perf_event_account_interrupt (event, throttle);/* -* For security, drop the skid kernel samples if necessary. -*/ -if (!sample_is_allowed (event, regs)) -return ret; - -/* * XXX event_limit might not quite work as expected on inherited * events */
Greg Kroah-Hartman
maintainerPATCH 161/196 staging: rtl8188eu: add TL-WN722N v2 support
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Gugino <[email protected]>
commit 5a1d4c5dd4eb2f1f8a9b30e61762f3b3b564df70 upstream.
Add support for USB Device TP-Link TL-WN722N v2.
VendorID: 0x2357, ProductID: 0x010c
--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -0
@@ -43,6 +43,7 @@ static struct usb_device_id rtw_usb_id_t {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */ {USB_DEVICE(0x2001, 0x3310)}, /* Dlink DWA-123 REV D1 */ {USB_DEVICE(0x2001, 0x3311)}, /* DLink GO-USB-N150 REV B1 */ + {USB_DEVICE(0x2357, 0x010c)}, /* TP-Link TL-WN722N v2 */ {USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */ {} /* Terminating entry */ };
Greg Kroah-Hartman
maintainerPATCH 163/196 staging: sm750fb: avoid conflicting vesafb
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Teddy Wang <[email protected]>
commit 740c433ec35187b45abe08bb6c45a321a791be8e upstream.
If vesafb is enabled in the config then /dev/fb0 is created by vesa and this sm750 driver gets fb1, fb2. But we need to be fb0 and fb1 to effectively work with xorg.
So if it has been alloted fb1, then try to remove the other fb0.
In the previous send, why #ifdef is used was asked.
https://lkml.org/lkml/2017/6/25/57
Answered at: https://lkml.org/lkml/2017/6/25/69
Also pasting here for reference.
'Did a quick research into "why".
The patch d8801e4df91e ("x86/PCI: Set IORESOURCE_ROM_SHADOW only for the default VGA device") has started setting IORESOURCE_ROM_SHADOW in flags for a default VGA device and that is being done only for x86. And so, we will need that #ifdef to check IORESOURCE_ROM_SHADOW as that needs to be checked only for a x86 and not for other arch.'
--- drivers/staging/sm750fb/sm750.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/staging/sm750fb/sm750.c +24 -0
@@ -1053,6 +1053,26 @@ release_fb:return err; } +static int lynxfb_kick_out_firmware_fb (struct pci_dev *pdev) +{ +struct apertures_struct *ap; +bool primary = false; + + ap =alloc_apertures (1 ); +if (!ap) +return -ENOMEM ; + + ap->ranges[0 ].base =pci_resource_start (pdev,0 ); + ap->ranges[0 ].size =pci_resource_len (pdev,0 ); +#ifdef CONFIG_X86 + primary = pdev->resource[PCI_ROM_RESOURCE ].flags & +IORESOURCE_ROM_SHADOW ; +#endif +remove_conflicting_framebuffers (ap,"sm750_fb1" , primary); +kfree (ap); +return 0 ; +} +static int lynxfb_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {
@@ -1061,6 +1081,10 @@ static int lynxfb_pci_probe(struct pci_dint fbidx;int err; + err =lynxfb_kick_out_firmware_fb (pdev); +if (err) +return err; +/* enable device */ err =pcim_enable_device (pdev);if (err)
Greg Kroah-Hartman
maintainerPATCH 164/196 staging: lustre: ko2iblnd: check copy_from_iter/copy_to_iter return code
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit 566e1ce22e04426fa52328b2adcdf1df49acd98e upstream.
We now get a helpful warning for code that calls copy_{from,to}_iter without checking the return value, introduced by commit aa28de275a24 ("iov_iter/hardening: move object size checks to inlined part").
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_send':drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:1643:2: error: ignoring return value of 'copy_from_iter', declared with attribute warn_unused_result [-Werror=unused-result] drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_recv':drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:1744:3: error: ignoring return value of 'copy_to_iter', declared with attribute warn_unused_result [-Werror=unused-result]
In case we get short copies here, we may get incorrect behavior. I've added failure handling for both rx and tx now, returning -EFAULT as expected.
--- drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 19 +++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +15 -4
@@ -1640,8 +1640,13 @@ kiblnd_send(struct lnet_ni *ni, void *pr ibmsg = tx->tx_msg; ibmsg->ibm_u.immediate.ibim_hdr = *hdr; -copy_from_iter (&ibmsg->ibm_u.immediate.ibim_payload,IBLND_MSG_SIZE , - &from); + rc =copy_from_iter (&ibmsg->ibm_u.immediate.ibim_payload, payload_nob, + &from); +if (rc != payload_nob) { +kiblnd_pool_free_node (&tx->tx_pool->tpo_pool, &tx->tx_list); +return -EFAULT ; + } + nob = offsetof(struct kib_immediate_msg, ibim_payload[payload_nob]);kiblnd_init_tx_msg (ni, tx,IBLND_MSG_IMMEDIATE , nob);
@@ -1741,8 +1746,14 @@ kiblnd_recv(struct lnet_ni *ni, void *prbreak ; } -copy_to_iter (&rxmsg->ibm_u.immediate.ibim_payload, -IBLND_MSG_SIZE , to); + rc =copy_to_iter (&rxmsg->ibm_u.immediate.ibim_payload, rlen, + to); +if (rc != rlen) { + rc = -EFAULT ; +break ; + } + + rc =0 ;lnet_finalize (ni, lntmsg,0 );break ;
Greg Kroah-Hartman
maintainerPATCH 165/196 ceph: fix race in concurrent readdir
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yan, Zheng <[email protected]>
commit 84583cfb973c4313955c6231cc9cb3772d280b15 upstream.
For a large directory, program needs to issue multiple readdir syscalls to get all dentries. When there are multiple programs read the directory concurrently. Following sequence of events can happen.
- program calls readdir with pos = 2. ceph sends readdir request to mds. The reply contains N1 entries. ceph adds these N1 entries to readdir cache.
- program calls readdir with pos = N1+2. The readdir is satisfied by the readdir cache, N2 entries are returned. (Other program calls readdir in the middle, which fills the cache)
- program calls readdir with pos = N1+N2+2. ceph sends readdir request to mds. The reply contains N3 entries and it reaches directory end. ceph adds these N3 entries to the readdir cache and marks directory complete.
The second readdir call does not update fi->readdir_cache_idx. ceph add the last N3 entries to wrong places.
--- fs/ceph/dir.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/ceph/dir.c +5 -0
@@ -271,6 +271,11 @@ out:if (ret <0 ) err = ret;dput (last); +/* last_name no longer match cache index */ +if (fi->readdir_cache_idx >=0 ) { + fi->readdir_cache_idx =-1 ; + fi->dir_release_count =0 ; + } }return err; }
Greg Kroah-Hartman
maintainerPATCH 166/196 RDMA/uverbs: Fix the check for port number
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ismail, Mustafa <[email protected]>
commit 5a7a88f1b488e4ee49eb3d5b82612d4d9ffdf2c3 upstream.
The port number is only valid if IB_QP_PORT is set in the mask. So only check port number if it is valid to prevent modify_qp from failing due to an invalid port number.
--- drivers/infiniband/core/uverbs_cmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/core/uverbs_cmd.c +2 -1
@@ -1931,7 +1931,8 @@ static int modify_qp(struct ib_uverbs_fi goto out; } -if (!rdma_is_port_valid (qp->device, cmd->base.port_num)) { +if ((cmd->base.attr_mask &IB_QP_PORT ) && + !rdma_is_port_valid (qp->device, cmd->base.port_num)) { ret = -EINVAL ; goto release_qp; }
Greg Kroah-Hartman
maintainerPATCH 167/196 RDMA/core: Initialize port_num in qp_attr
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ismail, Mustafa <[email protected]>
commit a62ab66b13a0f9bcb17b7b761f6670941ed5cd62 upstream.
Initialize the port_num for iWARP in rdma_init_qp_attr.
--- drivers/infiniband/core/cma.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/core/cma.c +2 -0
@@ -1044,6 +1044,8 @@ int rdma_init_qp_attr(struct rdma_cm_id }else ret =iw_cm_init_qp_attr (id_priv->cm_id.iw, qp_attr, qp_attr_mask); + qp_attr->port_num = id_priv->id.port_num; + *qp_attr_mask |=IB_QP_PORT ; }else ret = -ENOSYS ;
Greg Kroah-Hartman
maintainerPATCH 168/196 drm/mst: Fix error handling during MST sideband message reception
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Imre Deak <[email protected]>
commit 448421b5e93b9177c5698f0cf6f5e72d2995eeca upstream.
Handle any error due to partial reads, timeouts etc. to avoid parsing uninitialized data subsequently. Also bail out if the parsing itself fails.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +8 -2
@@ -2196,11 +2196,17 @@ static void drm_dp_get_one_sb_msg(struct ret =drm_dp_dpcd_read (mgr->aux, basereg + curreply, replyblock, len);if (ret != len) { -DRM_DEBUG_KMS ("failed to read a chunk\n" ); +DRM_DEBUG_KMS ("failed to read a chunk (len %d, ret %d)\n" , + len, ret); +return ; } + ret =drm_dp_sideband_msg_build (msg, replyblock, len, false); -if (ret == false) +if (!ret) {DRM_DEBUG_KMS ("failed to build sideband msg\n" ); +return ; + } + curreply += len; replylen -= len; }
Greg Kroah-Hartman
maintainerPATCH 169/196 drm/mst: Avoid dereferencing a NULL mstb in drm_dp_mst_handle_up_req()
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Imre Deak <[email protected]>
commit 7f8b3987da54cb4d41ad2545cd4d7958b9a36bdf upstream.
In case of an unknown broadcast message is sent mstb will remain unset, so check for this.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_dp_mst_topology.c +3 -1
@@ -2324,7 +2324,9 @@ static int drm_dp_mst_handle_up_req(struDRM_DEBUG_KMS ("Got RSN: pn: %d avail_pbn %d\n" , msg.u.resource_stat.port_number, msg.u.resource_stat.available_pbn); } -drm_dp_put_mst_branch_device (mstb); +if (mstb) +drm_dp_put_mst_branch_device (mstb); +memset (&mgr->up_req_recv,0 ,sizeof (struct drm_dp_sideband_msg_rx )); }return ret;
Greg Kroah-Hartman
maintainerPATCH 170/196 drm/mst: Avoid processing partially received up/down message transactions
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Imre Deak <[email protected]>
commit 636c4c3e762b62aa93632c645ca65879285b16e3 upstream.
Currently we may process up/down message transactions containing uninitialized data. This can happen if there was an error during the reception of any message in the transaction, but we happened to receive the last message correctly with the end-of-message flag set.
To avoid this abort the reception of the transaction when the first error is detected, rejecting any messages until a message with the start-of-message flag is received (which will start a new transaction). This is also what the DP 1.4 spec 2.11.8.2 calls for in this case.
In addtion this also prevents receiving bogus transactions without the first message with the the start-of-message flag set.
v2:
- unchanged
v3:
- git add the part that actually skips messages after an error in drm_dp_sideband_msg_build()
--- drivers/gpu/drm/drm_dp_mst_topology.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +24 -7
@@ -330,6 +330,13 @@ static bool drm_dp_sideband_msg_build(streturn false; } +/* +* ignore out-of-order messages or messages that are part of a +* failed transaction +*/ +if (!recv_hdr.somt && !msg->have_somt) +return false; +/* get length contained in this portion */ msg->curchunk_len = recv_hdr.msg_len; msg->curchunk_hdrlen = hdrlen;
@@ -2164,7 +2171,7 @@ out_unlock: }EXPORT_SYMBOL (drm_dp_mst_topology_mgr_resume); -static void drm_dp_get_one_sb_msg (struct drm_dp_mst_topology_mgr *mgr,bool up) +static bool drm_dp_get_one_sb_msg (struct drm_dp_mst_topology_mgr *mgr,bool up) {int len;u8 replyblock[32 ];
@@ -2179,12 +2186,12 @@ static void drm_dp_get_one_sb_msg(struct replyblock, len);if (ret != len) {DRM_DEBUG_KMS ("failed to read DPCD down rep %d %d\n" , len, ret); -return ; +return false; } ret =drm_dp_sideband_msg_build (msg, replyblock, len, true);if (!ret) {DRM_DEBUG_KMS ("sideband msg build failed %d\n" , replyblock[0 ]); -return ; +return false; } replylen = msg->curchunk_len + msg->curchunk_hdrlen;
@@ -2198,25 +2205,30 @@ static void drm_dp_get_one_sb_msg(structif (ret != len) {DRM_DEBUG_KMS ("failed to read a chunk (len %d, ret %d)\n" , len, ret); -return ; +return false; } ret =drm_dp_sideband_msg_build (msg, replyblock, len, false);if (!ret) {DRM_DEBUG_KMS ("failed to build sideband msg\n" ); -return ; +return false; } curreply += len; replylen -= len; } +return true; }static int drm_dp_mst_handle_down_rep (struct drm_dp_mst_topology_mgr *mgr) {int ret =0 ; -drm_dp_get_one_sb_msg (mgr, false); +if (!drm_dp_get_one_sb_msg (mgr, false)) { +memset (&mgr->down_rep_recv,0 , +sizeof (struct drm_dp_sideband_msg_rx )); +return 0 ; + }if (mgr->down_rep_recv.have_eomt) {struct drm_dp_sideband_msg_tx *txmsg;
@@ -2272,7 +2284,12 @@ static int drm_dp_mst_handle_down_rep(ststatic int drm_dp_mst_handle_up_req (struct drm_dp_mst_topology_mgr *mgr) {int ret =0 ; -drm_dp_get_one_sb_msg (mgr, true); + +if (!drm_dp_get_one_sb_msg (mgr, true)) { +memset (&mgr->up_req_recv,0 , +sizeof (struct drm_dp_sideband_msg_rx )); +return 0 ; + }if (mgr->up_req_recv.have_eomt) {struct drm_dp_sideband_msg_req_body msg;
Greg Kroah-Hartman
maintainerPATCH 171/196 drm/i915: Make DP-MST connector info work
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maarten Lankhorst <[email protected]>
commit 50740024bc393b608f7e391ac35e70f33938dd24 upstream.
Commit 9a148a96fc3a ("drm/i915/debugfs: add dp mst info") adds support for DP-MST to intel_connector_info, but forgot to remove the early return for DP-MST.
Remove it, and print out MST connectors directly.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -3018,7 +3018,7 @@ static void intel_connector_info(struct connector->display_info.cea_rev); } -if (!intel_encoder || intel_encoder->type ==INTEL_OUTPUT_DP_MST ) +if (!intel_encoder)return ;switch (connector->connector_type) {
Greg Kroah-Hartman
maintainerPATCH 172/196 mlx5: Avoid that mlx5_ib_sg_to_klms() overflows the klms[] array
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
commit 99975cd4fda52974a767aa44fe0b1a8f74950d9d upstream.
ib_map_mr_sg() can pass an SG-list to .map_mr_sg() that is larger than what fits into a single MR. .map_mr_sg() must not attempt to map more SG-list elements than what fits into a single MR. Hence make sure that mlx5_ib_sg_to_klms() does not write outside the MR klms[] array.
--- drivers/infiniband/hw/mlx5/mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/mr.c +1 -1
@@ -1779,7 +1779,7 @@ mlx5_ib_sg_to_klms(struct mlx5_ib_mr *mr mr->ndescs = sg_nents;for_each_sg (sgl, sg, sg_nents, i) { -if (unlikely (i > mr->max_descs)) +if (unlikely (i >= mr->max_descs))break ; klms[i].va =cpu_to_be64 (sg_dma_address (sg) + sg_offset); klms[i].bcount =cpu_to_be32 (sg_dma_len (sg) - sg_offset);
Greg Kroah-Hartman
maintainerPATCH 173/196 hfsplus: Dont clear SGID when inheriting ACLs
In reply to Greg Kroah-Hartman4.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 84969465ddc4f8aeb3b993123b571aa01c5f2683 upstream.
When new directory 'DIR1' is created in a directory 'DIR0' with SGID bit set, DIR1 is expected to have SGID bit set (and owning group equal to the owning group of 'DIR0'). However when 'DIR0' also has some default ACLs that 'DIR1' inherits, setting these ACLs will result in SGID bit on 'DIR1' to get cleared if user is not member of the owning group.
Fix the problem by creating __hfsplus_set_posix_acl() function that does not call posix_acl_update_mode() and use it when inheriting ACLs. That prevents SGID bit clearing and the mode has been properly set by posix_acl_create() anyway.
--- fs/hfsplus/posix_acl.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-)
fs/hfsplus/posix_acl.c +18 -12
@@ -51,8 +51,8 @@ struct posix_acl *hfsplus_get_posix_acl(return acl; } -int hfsplus_set_posix_acl (struct inode *inode,struct posix_acl *acl, -int type) +static int __hfsplus_set_posix_acl (struct inode *inode,struct posix_acl *acl, +int type) {int err;char *xattr_name;
@@ -64,12 +64,6 @@ int hfsplus_set_posix_acl(struct inode *switch (type) {case ACL_TYPE_ACCESS : xattr_name =XATTR_NAME_POSIX_ACL_ACCESS ; -if (acl) { - err =posix_acl_update_mode (inode, &inode->i_mode, &acl); -if (err) -return err; - } - err =0 ;break ;case ACL_TYPE_DEFAULT :
@@ -105,6 +99,18 @@ end_set_acl:return err; } +int hfsplus_set_posix_acl (struct inode *inode,struct posix_acl *acl,int type) +{ +int err; + +if (type ==ACL_TYPE_ACCESS && acl) { + err =posix_acl_update_mode (inode, &inode->i_mode, &acl); +if (err) +return err; + } +return __hfsplus_set_posix_acl (inode, acl, type); +} +int hfsplus_init_posix_acl (struct inode *inode,struct inode *dir) {int err =0 ;
@@ -122,15 +128,15 @@ int hfsplus_init_posix_acl(struct inodereturn err;if (default_acl) { - err =hfsplus_set_posix_acl (inode, default_acl, -ACL_TYPE_DEFAULT ); + err =__hfsplus_set_posix_acl (inode, default_acl, +ACL_TYPE_DEFAULT );posix_acl_release (default_acl); }if (acl) {if (!err) - err =hfsplus_set_posix_acl (inode, acl, -ACL_TYPE_ACCESS ); + err =__hfsplus_set_posix_acl (inode, acl, +ACL_TYPE_ACCESS );posix_acl_release (acl); }return err;